1 files changed, 26 insertions, 39 deletions
diff --git a/templates/default.context b/templates/default.context
index 4269d06a1..f2710a8e9 100644
--- a/templates/default.context
+++ b/templates/default.context
@@ -1,54 +1,41 @@
-\enableregime[utf]  % use UTF-8
+\startmode[*mkii]
+  \enableregime[utf-8]  
+  \setupcolors[state=start]
+\stopmode
 
-\setupcolors[state=start]
-\setupinteraction[state=start, color=middleblue] % needed for hyperlinks
+% Enable hyperlinks
+\setupinteraction[state=start, color=middleblue]
 
-\setuppapersize[letter][letter]  % use letter paper
-\setuplayout[width=middle, backspace=1.5in, cutspace=1.5in,
-             height=middle, header=0.75in, footer=0.75in] % page layout
-\setuppagenumbering[location={footer,center}]  % number pages
-\setupbodyfont[11pt]  % 11pt font
-\setupwhitespace[medium]  % inter-paragraph spacing
+\setuppapersize [letter][letter]  
+\setuplayout    [width=middle,  backspace=1.5in, cutspace=1.5in,
+                 height=middle, topspace=0.75in, bottomspace=0.75in]
 
-\setuphead[section][style=\tfc]
-\setuphead[subsection][style=\tfb]
-\setuphead[subsubsection][style=\bf]
+\setuppagenumbering[location={footer,center}]
 
-% define descr (for definition lists)
-\definedescription[descr][
-  headstyle=bold,style=normal,align=left,location=hanging,
-  width=broad,margin=1cm]
+\setupbodyfont[11pt]
 
-% prevent orphaned list intros
-\setupitemize[autointro]
+\setupwhitespace[medium]
 
-% define defaults for bulleted lists 
-\setupitemize[1][symbol=1][indentnext=no]
-\setupitemize[2][symbol=2][indentnext=no]
-\setupitemize[3][symbol=3][indentnext=no]
-\setupitemize[4][symbol=4][indentnext=no]
+\setuphead[section]      [style=\tfc$if(number-sections)$$else$,number=no$endif$]
+\setuphead[subsection]   [style=\tfb$if(number-sections)$$else$,number=no$endif$]
+\setuphead[subsubsection][style=\bf$if(number-sections)$$else$,number=no$endif$]
 
-\setupthinrules[width=15em]  % width of horizontal rules
+\definedescription
+  [description]
+  [headstyle=bold, style=normal, location=hanging, width=broad, margin=1cm]
 
-% for block quotations
-\unprotect
+\setupitemize[autointro]    % prevent orphan list intro
+\setupitemize[indentnext=no]
 
-\startvariables all
-blockquote: blockquote
-\stopvariables
-
-\definedelimitedtext
-[\v!blockquote][\v!quotation]
+\setupthinrules[width=15em] % width of horizontal rules
 
 \setupdelimitedtext
-[\v!blockquote]
-[\c!left=,
-\c!right=,
-before={\blank[medium]},
-after={\blank[medium]},
-]
+  [blockquote]
+  [before={\blank[medium]},
+   after={\blank[medium]},
+   indentnext=no,
+  ]
 
-\protect
 $for(header-includes)$
 $header-includes$
 $endfor$