2016-10-25 10:03:00

3 files changed, 29 insertions, 528 deletions

diff --git a/tex/context/modules/common/s-pre-11.tex b/tex/context/modules/common/s-pre-11.tex
index 551c5ebbc..48974f6c5 100644
--- a/tex/context/modules/common/s-pre-11.tex
+++ b/tex/context/modules/common/s-pre-11.tex
@@ -57,7 +57,7 @@
    \dorecurse{\CurrentMaxItem}
      {\startMPdrawing
         initialize_box(\MPpos{item-\realfolio-\recurselevel}) ;
-        linewidth := .25cm ; 
+        linewidth := .25cm ;
         q[\recurselevel] := tensecircle (wxy,hxy,linewidth) shifted cxy ;
         fill q[\recurselevel] withcolor .9white  ;
         pickup pencircle scaled linewidth ;
@@ -69,20 +69,20 @@
       \stopMPdrawing}%
    \dostepwiserecurse{2}{\CurrentTopic}{1}
      {\startMPdrawing
-        draw 
-          rt  point 3 of p[\recurselevel-1] -- 
-          lft point 7 of p[\recurselevel]  
-          withcolor \MPcolor{ArrowColor} ; 
+        draw
+          rt  point 3 of p[\recurselevel-1] --
+          lft point 7 of p[\recurselevel]
+          withcolor \MPcolor{ArrowColor} ;
       \stopMPdrawing}%
    \dostepwiserecurse{2}{\CurrentMaxItem}{1}
      {\startMPdrawing
-        draw 
-          bot point 9 of q[\recurselevel-1] -- 
-          top point 5 of q[\recurselevel]  
-          withcolor \MPcolor{ArrowColor} ; 
+        draw
+          bot point 9 of q[\recurselevel-1] --
+          top point 5 of q[\recurselevel]
+          withcolor \MPcolor{ArrowColor} ;
       \stopMPdrawing}%
    \startMPdrawing
-     draw Page 
+     draw Page
        withpen pencircle scaled .5cm
        withcolor \MPcolor{EdgeColor} ;
      StopPage ;
@@ -139,7 +139,7 @@
   {\startstandardmakeup
    \dontcomplain
    \vskip.875cm
-   \hbox to \makeupwidth 
+   \hbox to \makeupwidth
      {\hfill
       \dorecurse{\CurrentTopic}
         {\edef\Topic{topic-\realfolio-\recurselevel}%
@@ -156,7 +156,7 @@
    \vfilll
    \dorecurse{\CurrentMaxItem}
      {\edef\Item{item-\realfolio-\recurselevel}
-      \hbox to \makeupwidth 
+      \hbox to \makeupwidth
         {\hfill
          \hpos
            {\Item}
@@ -179,42 +179,42 @@
 
 \doifnotmode{demo}{\endinput}
 
-\starttext 
+\starttext
 
-\StartIdea 
+\StartIdea
   \StartTopic
      A Nice Idea
   \StopTopic
-  \StartItem 
+  \StartItem
     \input reich \relax
-  \StopItem 
-  \StartItem 
+  \StopItem
+  \StartItem
     \input reich \relax
-  \StopItem 
-  \StartItem 
+  \StopItem
+  \StartItem
     \input reich \relax
-  \StopItem 
+  \StopItem
 \StopIdea
 
-\StartIdea 
+\StartIdea
   \StartTopic
      One More Nice Idea
   \StopTopic
-  \StartItem 
+  \StartItem
     \input reich \relax
-  \StopItem 
-  \StartItem 
+  \StopItem
+  \StartItem
     \input reich \relax
-  \StopItem 
+  \StopItem
 \StopIdea
 
-\StartIdea 
+\StartIdea
   \StartTopic
      The Last Idea
   \StopTopic
-  \StartItem 
+  \StartItem
     \input tufte \relax
-  \StopItem 
+  \StopItem
 \StopIdea
 
-\stoptext 
+\stoptext
diff --git a/tex/context/modules/common/s-pre-61.tex b/tex/context/modules/common/s-pre-61.tex
deleted file mode 100644
index 48b9d09a0..000000000
--- a/tex/context/modules/common/s-pre-61.tex
+++ /dev/null
@@ -1,275 +0,0 @@
-%D \module
-%D   [      file=s-pre-61,
-%D        version=2004.03.15,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 61,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D Optima
-
-\usemodule[pre-60]
-
-\doifmodeelse {mkiv} {
-    \usetypescriptfile[ghz]
-    \definetypeface[mainface][ss][sans][optima-nova][default]
-} {
-    \usetypescriptfile[type-ghz]
-    \definetypeface[mainface][ss][sans][optima-nova][default][encoding=\defaultencoding]
-}
-
-\setupbodyfont[mainface,ss,18pt]
-\setupinterlinespace[line=3.25ex]
-
-\setuppapersize
-  [S6][S6]
-
-% \setuppapersize
-%   [SW][SW]
-
-\setuplayout
-  [topspace=10pt,
-   header=30pt,
-   headerdistance=20pt,
-   height=middle,
-   footerdistance=20pt,
-   footer=0pt,
-   bottomdistance=20pt,
-   bottom=20pt,
-   bottomspace=50pt,
-   backspace=30pt,
-   width=middle]
-
-\setupinteraction
-  [state=start,
-   click=off,
-   menu=on,
-   style=,
-   color=interactioncolor,
-   contrastcolor=interactioncolor]
-
-\setupinteractionscreen
-  [option=max]
-
-\setupinteractionmenu
-  [bottom]
-  [color=maincolor,
-   contrastcolor=maincolor,
-   style=\tfa, % acceptable
-   left=\hfill,
-   middle=,
-   right=,
-   height=\bottomheight,
-   width=2\bottomheight,
-   offset=overlay,
-   frame=off]
-
-\startinteractionmenu[bottom]
-  \but [firstpage]               \symbol[firstpage]      \\
-  \but [previouspage]            \symbol[previouspage]   \\
-  \but [InvokeStepper] \StartBusy\symbol[PauseRendering]\StopBusy \\
-  \but [nextpage]                \symbol[nextpage]       \\
-  \but [lastpage]                \symbol[lastpage]       \\
-  \but [CloseDocument]           \symbol[CloseDocument]  \\
-\stopinteractionmenu
-
-% maybe in colo-sjk : \setupcolor[sjk]
-
-\definecolor [dark]   [s=.4]
-\definecolor [bright] [s=.9]
-
-\definecolor [red]    [r=.4,g=.2,b=.2]
-\definecolor [green]  [r=.2,g=.4,b=.2]
-\definecolor [blue]   [r=.2,g=.2,b=.4]
-
-\definecolor [cyan]   [r=.2,g=.4,b=.4]
-\definecolor [magenta][r=.4,g=.2,b=.4]
-\definecolor [yellow] [r=.4,g=.4,b=.2]
-
-\definecolor [pagecolor] [dark]
-\definecolor [maincolor] [bright]
-\definecolor [textcolor] [red]
-
-\definecolor [interactioncolor] [r=.8,g=.8,b=.6]
-
-\setupcolors
-  [state=start,
-   textcolor=maincolor]
-
-\setupbackgrounds
-  [page]
-  [background=page,
-   backgroundcolor=textcolor]
-
-\setupbackgrounds
-  [text]% [text]
-  [background={comments,text,invoke}]
-
-\definelayer
-  [text]
-  [width=\textwidth,
-   height=\textheight]
-
-\defineoverlay
-  [comments]
-  [{\setlayer[text][preset=middle]{\placecomments}}]
-
-\defineoverlay[page][\uniqueMPgraphic{page-\ifcase\realpageno\or one\else plus\fi}]
-
-\startuniqueMPgraphic{page-one}
-  StartPage ;
-    fill Page
-      enlarged 4pt
-      withcolor \MPcolor{pagecolor} ;
-    fill Field[Text][Text]
-      enlarged 10pt
-%       topenlarged   (HeaderHeight+HeaderDistance)
-      leftenlarged  (BackSpace+4pt)
-      rightenlarged (CutSpace +4pt)
-      withcolor OverlayColor ;
-  StopPage ;
-\stopuniqueMPgraphic
-
-\startuniqueMPgraphic{page-plus}
-  StartPage ;
-    fill Page
-      enlarged 4pt
-      withcolor \MPcolor{pagecolor} ;
-    fill Field[Text][Text]
-      enlarged 10pt
-      leftenlarged  (BackSpace+4pt)
-      rightenlarged (CutSpace+4pt)
-      withcolor OverlayColor ;
-  StopPage ;
-\stopuniqueMPgraphic
-
-% this needs to be sorted out !
-
-\appendtoks
-    \NormalizeFontHeight \HeadFont        {\setstrut\strut\quad} {1.0\headerheight} {SansBold}
-    \NormalizeFontHeight \TitleFont       {\setstrut\strut\quad} {2.0\headerheight} {SansBold}
-    \NormalizeFontHeight \SubTitleFont    {\setstrut\strut\quad} {1.5\headerheight} {SansBold}
-    \NormalizeFontHeight \SubSubTitleFont {\setstrut\strut\quad} {1.0\headerheight} {SansBold}
-\to \everystarttext
-
-\appendtoks
-    \NormalizeFontHeight \HeadFont        {\setstrut\strut\quad} {1.0\headerheight} {SansBold}
-    \NormalizeFontHeight \TitleFont       {\setstrut\strut\quad} {2.0\headerheight} {SansBold}
-    \NormalizeFontHeight \SubTitleFont    {\setstrut\strut\quad} {1.5\headerheight} {SansBold}
-    \NormalizeFontHeight \SubSubTitleFont {\setstrut\strut\quad} {1.0\headerheight} {SansBold}
-\to \everystoptext
-
-\setuphead
-  [chapter]
-  [placehead=empty,
-   after={\blank[medium]},
-   color=maincolor,
-   placenumber=no,
-   style=\HeadFont]
-
-\setupheadertexts
-  [\doiftextelse{\currentheadnumber}{\placeheadtext[Topic]}{\placeheadtext[Nopic]}]
-  []
-
-\setuppagenumbering
-  [location=]
-
-\definesymbol
-  [emdash]
-  [\emdash]
-
-\setupitemize
-  [each]
-  [loose,serried,joinedup,broad]
-  [symbol=emdash]
-
-\setupalign
-  [broad,right]
-
-\def\doTitlePage#1#2#3%
-  {\startstandardmakeup[headerstate=high]
-     \def\\{\def\\{\endgraf\quad\quad}\endgraf\quad\ignorespaces#2}%
-     #1\setstrut\setupinterlinespace\vfil#3\vfil\vfil
-   \stopstandardmakeup}
-
-\def\TitlePage   {\doTitlePage\TitleFont\relax}
-\def\SubTitlePage{\doTitlePage\TitleFont\SubTitleFont}
-
-\definehead[Topic][chapter]
-\definehead[Nopic][title]
-
-\def\Topics#1%
-  {\Nopic[topics]{#1}
-   \startcolumns
-     \placelist[Topic]
-   \stopcolumns}
-
-\setuplist
-  [Topic]
-  [alternative=f,
-   color=maincolor,
-   contrastcolor=maincolor,
-   criterium=all]
-
-\defineoverlay[topics][\overlaybutton{topics}]
-
-\setupbackgrounds
-  [bottom] [text]
-  [background=topics]
-
-\continueifinputfile{s-pre-61.tex}
-
-\starttext
-
-\TitlePage{Stepwise\\Refinement}
-
-\Topics{Topics}
-
-\Topic{Female Artists}
-
-\StartSteps
-
-\startitemize
-\item Fiona Apple \FlushStep
-\item Tori Amos \FlushStep
-\item Kate Bush \FlushStep
-\item Heather Nova \FlushStep
-\item Alanis Morissette \FlushStep
-\item Suzanne Vega \FlushStep
-\stopitemize
-
-\StopSteps
-
-\Topic{Male Composers}
-
-\StartSteps
-
-\startitemize
-\item John Adams \FlushStep
-\item Steve Reich \FlushStep
-\item Louis Andriessen \FlushStep
-\item Olivier Messiaen \FlushStep
-\stopitemize
-
-\StopSteps
-
-\Topic{And Some More}
-
-\StartSteps
-
-\startitemize
-\item Mark Hollis   \FlushStep
-\item Roger Waters  \FlushStep
-\item David Gilmore \FlushStep
-\item Peter Gabriel \FlushStep
-\item Randy Newman  \FlushStep
-\stopitemize
-
-\StopSteps
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-62.tex b/tex/context/modules/common/s-pre-62.tex
deleted file mode 100644
index a1a405c23..000000000
--- a/tex/context/modules/common/s-pre-62.tex
+++ /dev/null
@@ -1,224 +0,0 @@
-%D \module
-%D   [      file=s-pre-62,
-%D        version=2005.03.04,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 62,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D Melior
-
-\usemodule[pre-60]
-
-\usetypescriptfile
-  [type-ghz]
-
-\doifmodeelse {mkiv} {
-
-    \definetypeface[mainface][rm][serif][melior]  [default]
-    \definetypeface[mainface][tt][mono] [modern]  [default][rscale=1.05]
-    \definetypeface[mainface][ss][serif][melior]  [default]
-    \definetypeface[mainface][mm][math] [palatino][default][rscale=0.95]
-
-} {
-
-    \definetypeface[mainface][rm][serif][melior]  [default][encoding=texnansi]
-    \definetypeface[mainface][tt][mono] [modern]  [default][encoding=texnansi,rscale=1.05]
-    \definetypeface[mainface][ss][serif][melior]  [default][encoding=texnansi]
-    \definetypeface[mainface][mm][math] [palatino][default][encoding=texnansi,rscale=0.95]
-
-}
-
-\setupbodyfont
-  [mainface,14.4pt]
-
-\setuppapersize
-  [S6][S6]
-
-\setvariables[layout][dx=0,dy=1,nx=2,ny=2,step=64]
-
-\definemeasure[layoutwd][\dimexpr\paperwidth /\getvariable{layout}{step}\relax]
-\definemeasure[layoutht][\dimexpr\paperheight/\getvariable{layout}{step}\relax]
-
-\setuplayout
-  [      width=middle,
-        height=middle,
-        header=0pt,
-        footer=0pt,
-        margin=0pt,
-     backspace=5\measure{layoutwd},
-      topspace=5\measure{layoutht}]
-
-\definelayout
-  [step]
-  [  backspace=\numexpr2+                         \getvariable{layout}{dx}\relax\measure{layoutwd},
-      cutspace=\numexpr3+\getvariable{layout}{nx}-\getvariable{layout}{dx}\relax\measure{layoutwd},
-      topspace=\numexpr2+                         \getvariable{layout}{dy}\relax\measure{layoutht},
-   bottomspace=\numexpr3+\getvariable{layout}{ny}-\getvariable{layout}{dy}\relax\measure{layoutht}]
-
-\definecolor[layout:left]  [t=.5,a=1,b=1]
-\definecolor[layout:right] [t=.5,a=1,r=1]
-\definecolor[layout:top]   [t=.5,a=1,g=1]
-\definecolor[layout:bottom][t=.5,a=1,y=1]
-\definecolor[layout:page]  [s=.75]
-
-\definehspace[menu][\measure{layoutwd}]
-
-\setupinteraction
-  [state=start,
-   click=off,
-   style=,
-   color=interactioncolor,
-   contrastcolor=interactioncolor]
-
-\setupinteractionscreen
-  [option=max]
-
-\setupbuttons
-  [color=maincolor,
-   contrastcolor=maincolor,
-   style=\tf, % acceptable
-   height=2\measure{layoutht},
-   width=2\measure{layoutwd},
-   offset=overlay,
-   frame=off]
-
-\definecolor[interactioncolor][darkgray]
-\definecolor[maincolor]       [lightgray]
-
-\setuptexttexts
-  []
-  [\vbox to \textheight{\vfill\hfill\setups{menu:content}}]
-
-\startsetups menu:content
-
-  \button{\symbol[firstpage]}[firstpage]
-  \hspace[menu]
-  \button{\symbol[previouspage]}[previouspage]
-  \hspace[menu]
-  \button{\StartBusy\symbol[PauseRendering]\StopBusy}[InvokeStepper]
-  \hspace[menu]
-  \button{\symbol[nextpage]}[nextpage]
-  \hspace[menu]
-  \button{\symbol[lastpage]}[lastpage]
-  \hspace[menu]
-  \button{\symbol[CloseDocument]}[CloseDocument]
-
-\stopsetups
-
-\startuseMPgraphic{page}{step}
-  StartPage ;
-    numeric dx, dy ; dx := PaperWidth/\MPvar{step} ; dy := PaperHeight/\MPvar{step} ;
-    fill Page withcolor .5white ;
-    fill
-      ulcorner Page -- urcorner Page --
-      urcorner Page shifted (0,-TopSpace+dy) -- ulcorner Page shifted (0,-TopSpace+dy) -- cycle
-      withcolor \MPcolor{layout:top} ;
-    fill
-      llcorner Page -- lrcorner Page --
-      lrcorner Page shifted (0,BottomSpace-dy) -- llcorner Page shifted (0,BottomSpace-dy) -- cycle
-      withcolor \MPcolor{layout:bottom} ;
-    fill
-      ulcorner Page -- llcorner Page --
-      llcorner Page shifted (BackSpace-dx,0) -- ulcorner Page shifted (BackSpace-dx,0) -- cycle
-      withcolor \MPcolor{layout:left} ;
-    fill
-      urcorner Page -- lrcorner Page --
-      lrcorner Page shifted (-CutSpace+dx,0) -- urcorner Page shifted (-CutSpace+dx,0) -- cycle
-      withcolor \MPcolor{layout:right} ;
-    fill Field[Text][Text] enlarged (dx,dy) withcolor white ;
-    fill Field[Text][Text] enlarged (dx,dy) withcolor \MPcolor{layout:page} ;
-  StopPage ;
-\stopuseMPgraphic
-
-\defineoverlay[page][\useMPgraphic{page}{step=\getvariable{layout}{step}}]
-
-\setupbackgrounds
-  [page]
-  [background=page]
-
-\setupcolors
-  [state=start]
-
-\startsetups nextstep
-  % pagebreak handlers are grouped, so we need to set global
-  \ifnum\getvariable{layout}{dx}=\getvariable{layout}{nx}\relax
-    \ifnum\getvariable{layout}{dy}=\getvariable{layout}{ny}\relax
-      \setxvariables[layout][dy=1]
-    \else
-      \setxvariables[layout][dy=\the\numexpr\getvariable{layout}{dy}+1\relax]
-    \fi
-    \setxvariables[layout][dx=1]
-  \else
-    \setxvariables[layout][dx=\the\numexpr\getvariable{layout}{dx}+1\relax]
-  \fi
-  % global anyway
-  \setuplayout[step]
-\stopsetups
-
-\definefontsynonym[MainTitleFont][SerifBold]
-
-\definefont[ChapterTitleFont][MainTitleFont sa 2]
-
-\appendtoks
-  \NormalizeFontHeight \TitleFont         {\setstrut\strut\quad} {4\lineheight} {MainTitleFont}
-  \NormalizeFontHeight \SubTitleFont      {\setstrut\strut\quad} {3\lineheight} {MainTitleFont}
-  \NormalizeFontHeight \ChapterNumberFont {XVI}                  {4\lineheight} {MainTitleFont}
-\to \everystarttext
-
-\setupsection
-  [section-2]
-  [bodypartconversion=Romannumerals]
-
-\installpagebreakhandler {step} {\setups{nextstep}}
-
-\definepagebreak[chapter][yes,step]
-
-\setuphead
-  [chapter]
-  [page=chapter,
-   command=\MyChapterCommand]
-
-\definehead[Topic][chapter]
-\definehead[Nopic][title]
-
-\setuphead[chapter,Topic,Nopic]
-  [numberstyle=\ChapterNumberFont,
-   textstyle=\ChapterTitleFont,
-   numbercolor=lightgray,
-   textcolor=darkgray]
-
-\def\MyChapterCommand#1#2%
-  {\hbox \bgroup % we need to nil the strut added by the headplacement
-     \setupframed[frame=off,lines=4,offset=overlay]%
-     \rlap{\hskip2\lineheight\framed{\setnostrut#1}}\framed{#2}%
-   \egroup}
-
-\setupitemize
-  [each]
-  [R,broad]
-  [stopper=,
-   color=lightgray]
-
-\def\doTitlePage#1#2#3%
-  {\startstandardmakeup[headerstate=high,textstate=stop]
-     \setupalign[middle]
-     \def\\{\def\\{\endgraf}\endgraf\vfil\ignorespaces#2}%
-     \startcolor[darkgray]
-     #1\setstrut\setupinterlinespace\vfil#3\vfil
-     \stopcolor
-   \stopstandardmakeup}
-
-\def\TitlePage   {\doTitlePage\TitleFont\relax}
-\def\SubTitlePage{\doTitlePage\TitleFont\SubTitleFont}
-
-\long\def\StartTitlePage   #1\StopTitlePage   {\TitlePage   {#1}}
-\long\def\StartSubTitlePage#1\StopSubTitlePage{\SubTitlePage{#1}}
-
-\endinput
-