From 3a429589355f35793fc8632d34379464a7cc0dc6 Mon Sep 17 00:00:00 2001
From: Aditya Mahajan <adityam@umich.edu>
Date: Tue, 23 Aug 2011 10:25:30 -0400
Subject: [PATCH 1/5] Refactoring code style

---
 default.context | 50 +++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/default.context b/default.context
index a07e7b285..449aa61dd 100644
--- a/default.context
+++ b/default.context
@@ -1,22 +1,28 @@
-\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, header=0.75in,   footer=0.75in]
 
-\setuphead[section][style=\tfc]
-\setuphead[subsection][style=\tfb]
+\setuppagenumbering[location={footer,center}]
+
+\setupbodyfont[11pt]
+
+\setupwhitespace[medium]
+
+\setuphead[section]      [style=\tfc]
+\setuphead[subsection]   [style=\tfb]
 \setuphead[subsubsection][style=\bf]
 
-% define description (for definition lists)
-\definedescription[description][
-  headstyle=bold,style=normal,location=hanging,width=broad,margin=1cm]
+\definedescription
+  [description]
+  [headstyle=bold,style=normal,location=hanging,width=broad,margin=1cm]
 
 % prevent orphaned list intros
 \setupitemize[autointro]
@@ -27,7 +33,7 @@
 \setupitemize[3][symbol=3][indentnext=no]
 \setupitemize[4][symbol=4][indentnext=no]
 
-\setupthinrules[width=15em]  % width of horizontal rules
+\setupthinrules[width=15em] % width of horizontal rules
 
 % for block quotations
 \unprotect
@@ -37,15 +43,15 @@ blockquote: blockquote
 \stopvariables
 
 \definedelimitedtext
-[\v!blockquote][\v!quotation]
+  [\v!blockquote][\v!quotation]
 
 \setupdelimitedtext
-[\v!blockquote]
-[\c!left=,
-\c!right=,
-before={\blank[medium]},
-after={\blank[medium]},
-]
+  [\v!blockquote]
+  [\c!left=,
+  \c!right=,
+  \c!before={\blank[medium]},
+  \c!after={\blank[medium]},
+  ]
 
 \protect
 $for(header-includes)$

From fd86fd4bf810128de810d5d2d79f4610ca1e55d6 Mon Sep 17 00:00:00 2001
From: Aditya Mahajan <adityam@umich.edu>
Date: Tue, 23 Aug 2011 10:26:01 -0400
Subject: [PATCH 2/5] Changing layout

header and footer do not affect the visual layout. I am assuming that the
original author meant topspace and bottomspace
---
 default.context | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.context b/default.context
index 449aa61dd..91e94d3c1 100644
--- a/default.context
+++ b/default.context
@@ -8,7 +8,7 @@
 
 \setuppapersize [letter][letter]  
 \setuplayout    [width=middle,  backspace=1.5in, cutspace=1.5in,
-                 height=middle, header=0.75in,   footer=0.75in]
+                 height=middle, topspace=0.75in, bottomspace=0.75in]
 
 \setuppagenumbering[location={footer,center}]
 

From 75c5b26f2e00de59f00bdd29deb623e8b2573b1a Mon Sep 17 00:00:00 2001
From: Aditya Mahajan <adityam@umich.edu>
Date: Tue, 23 Aug 2011 10:27:37 -0400
Subject: [PATCH 3/5] Spacing

---
 default.context | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.context b/default.context
index 91e94d3c1..0b14e22a6 100644
--- a/default.context
+++ b/default.context
@@ -22,7 +22,7 @@
 
 \definedescription
   [description]
-  [headstyle=bold,style=normal,location=hanging,width=broad,margin=1cm]
+  [headstyle=bold, style=normal, location=hanging, width=broad, margin=1cm]
 
 % prevent orphaned list intros
 \setupitemize[autointro]

From a3ceaffed42065ab33038149dc3185a7f308cf57 Mon Sep 17 00:00:00 2001
From: Aditya Mahajan <adityam@umich.edu>
Date: Tue, 23 Aug 2011 10:28:41 -0400
Subject: [PATCH 4/5] Cleaning setup

---
 default.context | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/default.context b/default.context
index 0b14e22a6..2ad7399ce 100644
--- a/default.context
+++ b/default.context
@@ -24,14 +24,8 @@
   [description]
   [headstyle=bold, style=normal, location=hanging, width=broad, margin=1cm]
 
-% prevent orphaned list intros
-\setupitemize[autointro]
-
-% 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]
+\setupitemize[autointro]    % prevent orphan list intro
+\setupitemize[indentnext=no]
 
 \setupthinrules[width=15em] % width of horizontal rules
 

From 439e7f0d419234dbb92046a3f1672d3f6498c9e4 Mon Sep 17 00:00:00 2001
From: Aditya Mahajan <adityam@umich.edu>
Date: Tue, 23 Aug 2011 10:30:57 -0400
Subject: [PATCH 5/5] Blockquote are now in the core

---
 default.context | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/default.context b/default.context
index 2ad7399ce..a9ce8e09d 100644
--- a/default.context
+++ b/default.context
@@ -29,25 +29,13 @@
 
 \setupthinrules[width=15em] % width of horizontal rules
 
-% for block quotations
-\unprotect
-
-\startvariables all
-blockquote: blockquote
-\stopvariables
-
-\definedelimitedtext
-  [\v!blockquote][\v!quotation]
-
 \setupdelimitedtext
-  [\v!blockquote]
-  [\c!left=,
-  \c!right=,
-  \c!before={\blank[medium]},
-  \c!after={\blank[medium]},
+  [blockquote]
+  [before={\blank[medium]},
+   after={\blank[medium]},
+   indentnext=no,
   ]
 
-\protect
 $for(header-includes)$
 $header-includes$
 $endfor$