2016-11-01 10:15:00

13 files changed, 130 insertions, 2695 deletions

diff --git a/tex/context/modules/common/s-pre-00.tex b/tex/context/modules/common/s-pre-00.tex
index 7f217d5bb..2acbc13b7 100644
--- a/tex/context/modules/common/s-pre-00.tex
+++ b/tex/context/modules/common/s-pre-00.tex
@@ -11,6 +11,8 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+% This might go away!
+
 %D This module provides some non core functionality that can
 %D be used in the presentations styles. This module contains
 %D experimental macros.
diff --git a/tex/context/modules/common/s-pre-01.tex b/tex/context/modules/common/s-pre-01.tex
deleted file mode 100644
index 89c5642f9..000000000
--- a/tex/context/modules/common/s-pre-01.tex
+++ /dev/null
@@ -1,404 +0,0 @@
-%D \module
-%D   [      file=s-pre-01,
-%D        version=1997.07.22,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 1,
-%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 This environment can be used to typeset interactive
-%D presentations. This module was first used at the 1997 \TUG\
-%D meeting.
-
-\usemodule[pre-general]
-
-%D \macros
-%D   {language}
-%D
-%D Because this module is defined in english, we default to the
-%D english hyphenation patterns and labels too.
-
-\language
-  [en]
-
-%D \macros
-%D   {setupbodyfont,setuplayout}
-%D
-%D For screen reading, a Lucida Bright font looks nice. We use
-%D a 14.4 point bodyfont for the main text, but switch back to
-%D 12 points for ornaments.
-
-\startmode[asintended] \setupbodyfont[lbr] \stopmode
-
-\setupbodyfont[14.4pt]
-
-\setuplayout
-  [style=smallbodyfont]
-
-%D \macros
-%D   {setupcolors,definecolor}
-%D
-%D Screen presentations without color just look dull, so we
-%D enable color support. We define ourselves a yellowish
-%D backgroundcolor and a not too dark blue interactioncolor.
-
-\setupcolors
-  [state=start]
-
-\definecolor [BackgroundColor]  [r=1,  g=1,  b=.7]
-\definecolor [InteractionColor] [r=.1, g=.5, b=.8]
-\definecolor [ContrastColor]    [r=.9, g=.5, b=.2]
-
-%D \macros
-%D   {setuppapersize,setuplayout,setupinteractionscreen}
-%D
-%D
-%D We use a nice large screen, and dedicate the right edge and
-%D bottom part to navigational tools. We automatically set
-%D the width and height of the page and start up full screen.
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [topspace=12pt,
-   header=0pt,
-   footer=0pt,
-   height=402pt, % 450 - 12 - 15 - 12 - 12 + 3
-   bottomdistance=15pt,
-   bottom=12pt,
-   backspace=12pt,
-   margin=0pt,
-   width=fit,
-   edgedistance=12pt,
-   rightedge=96pt]
-
-\setupinteractionscreen
-  [option=max]
-
-%D \macros
-%D   {setupbackgrounds}
-%D
-%D We set the pagecolor to yellow except the part of the screen
-%D that is used to display the running text. By seting the
-%D offset to 3pt the text will not touch the yellow parts. We
-%D do not set the depth.
-
-\setupbackgrounds
-  [page]
-  [background=color,
-   backgroundcolor=BackgroundColor,
-   offset=3pt]
-
-\setupbackgrounds
-  [text][text]
-  [background=color,
-   backgroundcolor=white]
-
-%D I considered the next setup too, but finaly decided to
-%D comment it out.
-%D
-%D \starttyping
-%D \setupbackgrounds
-%D   [bottom][text]
-%D   [frame=on,
-%D    framecolor=white]
-%D \stoptyping
-
-%D \macros
-%D   {setupinteraction}
-%D
-%D We did not enable interactive text support yet, so let's do
-%D that now. We force page reference to circumvent problems
-%D with named destinations in buggy viewers.
-
-\setupinteraction
-  [page=yes,
-   color=InteractionColor,
-   contrastcolor=ContrastColor,
-   menu=on,
-   state=start]
-
-%D \macros
-%D   {setupinteractionmenu,startinteractionmenu}
-%D
-%D At the bottom of the screen we show two navigational bars.
-%D At the left we show the subpage bar, at the right we use a
-%D non default backward|/|forward bar.
-
-\setupinteractionmenu
-  [bottom]
-  [leftoffset=-3pt,
-   rightoffset=-3pt]
-
-\startinteractionmenu[bottom]
-  \txt \InteractionBar \\
-  \txt \InteractionButtons \\
-\stopinteractionmenu
-
-%D \macros
-%D   {interactionbar}
-%D
-%D The left bar gets a white border (on the yellow background).
-%D Because we don't want to typeset an empty frame when no
-%D subpage bar is shown, we check for the number of subpages.
-
-\def\InteractionBar%
-  {\ifnum\nofsubpages>1
-     \framed
-       [framecolor=white,rulethickness=1pt,
-        height=\bottomheight,strut=no]
-       {\interactionbar[alternative=f,width=.5\makeupwidth,height=1ex]}
-   \fi}
-
-%D \macros
-%D   {setupinteractionbar, interactionbuttons}
-%D
-%D The right hand buttons enable us to jump backward and forward,
-%D as well as to the previous and next jump. We also enable to
-%D close the presentation.
-
-\setupinteractionbar
-  [framecolor=white,rulethickness=1pt,
-   height=\bottomheight,strut=no]
-
-\def\InteractionButtons%
-  {\interactionbuttons
-     [width=15em]
-     [PreviousJump,NextJump,
-      firstpage,
-      firstsubpage,previouspage,nextpage,lastsubpage,
-      lastpage,
-      CloseDocument]}
-
-%D \macros
-%D  {StartTitlePage, TitlePage}
-%D
-%D The titlepage is rather simple and can be typeset in two
-%D ways:
-%D
-%D \starttyping
-%D \StartTitlePage
-%D text \\ text \\ text
-%D \StopTitlepage
-%D \stoptyping
-%D
-%D or more straightforward:
-%D
-%D \starttyping
-%D \TitlePage{text\\text\\text}
-%D \stoptyping
-%D
-%D The first alternative can be used for more complicated
-%D title pages.
-
-\def\StartTitlePage%
-  {\startstandardmakeup
-   \bfd\setupinterlinespace
-   \setupalign[middle]
-   \vfil
-   \let\\=\vfil}
-
-\def\StopTitlePage%
-  {\vfil\vfil\vfil
-   \stopstandardmakeup}
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-%D \macros
-%D   {TitlePage, Topics, Topic, Subject}
-%D
-%D A presentation after loading this module looks like:
-%D
-%D \starttyping
-%D \TitlePage {About Whatever\\Topics}
-%D
-%D \Topics {Todays Talk}
-%D
-%D \Topic {Some topic}
-%D
-%D \Subject {Alfa}
-%D
-%D .....
-%D
-%D \Subject {Beta}
-%D
-%D .....
-%D \stoptyping
-
-%D \macros
-%D   {definehead}
-%D
-%D The commands \type{\Topic} and \type{\Subject} are defined
-%D as copies of head. We use \type{\Nopic} for internal
-%D purposes.
-
-\definehead [Topic]   [chapter]
-\definehead [Subject] [section]
-
-\definehead [Nopic]   [title]
-
-%D \macros
-%D   {setuphead}
-%D
-%D Because chapters and sections do not make sense in
-%D presentations, we use our own command for typesetting the
-%D titles. Sectionnumbers are of course hidden from viewing.
-%D Each topic is followed by a list of subjects that belong
-%D to the topic.
-
-\setuphead
-  [Topic, Nopic, Subject]
-  [command=\HeadLine,
-   page=yes,
-   style=\tfb,
-   after=\blank,
-   sectionnumber=no]
-
-\setuphead
-  [Topic]
-  [after=\PlaceSubjectList]
-
-\setuphead
-  [Subject]
-  [continue=no]
-
-%D \macros
-%D   {framed, midalined}
-%D
-%D The command used to typeset the head lines is rather simple.
-%D We just center the framed title. The frame macro optimizes
-%D the alignment and at the same time enables us to typeset a
-%D nice colored rule.
-
-\def\HeadLine#1#2%
-  {\midaligned
-     {\framed
-        [framecolor=BackgroundColor,rulethickness=1pt,
-         width=.8\hsize,align=middle,strut=no]
-        {#2}}}
-
-%D \macros
-%D   {setuplist}
-%D
-%D The subject list is automatically placed. We center each
-%D subject line by using one of the default alternatives (g). We
-%D could have said:
-%D
-%D \starttyping
-%D \setuplist
-%D   [Subject]
-%D   [alternative=none,
-%D    command=\SubjectListLine,
-%D    interaction=all]
-%D
-%D \def\SubjectListLine#1#2#3%
-%D   {\midaligned{#2}}
-%D \stoptyping
-%D
-%D But why should we complicate things when we can use
-%D alternative~\type{g}. The test is only needed if one
-%D does not automatically goes a new page with each subject.
-
-\def\PlaceSubjectList%
-  {\blank
-   \determinelistcharacteristics[Subject]
- % \ifnum\utilitylistlength>0 \placelist[Subject] \fi}
-   \doifmode{*list}{\placelist[Subject]}}
-
-\setuplist
-  [Subject, Topic]
-  [alternative=g,
-   interaction=all,
-   before=,
-   after=]
-
-% %D \macros
-% %D   {setuptexttexts}
-% %D
-% %D The topics will be listed in the right edge, using:
-%
-% \setuptexttexts
-%   [edge]
-%   [][\TopicList]
-
-%D \macros
-%D   {setuplist, placelist,startinteractionmenu}
-%D
-%D The actual topic list is typeset using a \type{\vbox}. We
-%D have to specify \type{criteriumcriterium=all} because otherwise no
-%D list will be typeset. (By default lists are typeset
-%D locally.)
-
-\startinteractionmenu[right]
-  \placelist
-    [Topic]
-    [alternative=f, % command, % none,
-     maxwidth=\hsize,
-     width=\hsize,
-     offset=0pt,
-     criterium=all,
-     align=left,
-     style=\setsmallbodyfont\bfx]
-\stopinteractionmenu
-
-\def\Topics#1% temporary hack
-  {\Nopic{#1}
-   \placelist[Topic][criterium=all]}
-
-\def\Subjects%
-  {}
-
-%D \macros
-%D   {setuptexttexts, button}
-%D
-%D During a presentation, we want to use the cursor to point to
-%D parts of the text. Furthermore we want to be able to jump to
-%D the next page, without the need to move the cursor on buttons.
-%D Therefore we make the text part of the screen into an
-%D invisible button.
-
-\setuptexttexts
-  [\GotoNextPage][]
-
-\def\GotoNextPage
-  {\button[width=\hsize,height=\vsize,frame=off]{}[nextpage]}
-
-%D \macros
-%D   {setupsubpagenumber}
-%D
-%D The left bottom navigation bar shows the subpages, which will
-%D be counted by text. One can change this in the preentation
-%D itself by saying \type {[way=byTopic]}.
-
-\setupsubpagenumber
-  [way=bytext, % Topic,
-   state=start]
-
-\doifnotmode{demo}{\endinput}
-
-%D The (rather silly) demo section.
-
-\starttext
-
-\TitlePage{Title Page\\pre-original}
-
-\Topics{Some Nice Quotes}
-
-\Topic{A Few}
-
-\Subject{Knuth} \input knuth
-\Subject{Tufte} \input tufte
-
-\Topic{Some More}
-
-\Subject{Zapf}   \input zapf
-\Subject{Bryson} \input bryson
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-02.tex b/tex/context/modules/common/s-pre-02.tex
deleted file mode 100644
index d7a6fe458..000000000
--- a/tex/context/modules/common/s-pre-02.tex
+++ /dev/null
@@ -1,381 +0,0 @@
-%D \module
-%D   [      file=s-pre-02,
-%D        version=1998.04.21,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 2,
-%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 This environment can be used to typeset interactive
-%D presentations. This module was first used at the 1998
-%D publishers conference of the European Portable Document
-%D Association (now merged into a graphics association).
-
-\usemodule[pre-general]
-
-%D \macros
-%D   {setupbodyfont, switchtobodyfont, setuplayout}
-%D
-%D At \PRAGMA\ we prefer using the Lucida Bright fonts, but
-%D one can of course load another typeface.
-
-\startmode[asintended] \setupbodyfont[lbr] \stopmode
-
-\setupbodyfont[14.4pt]
-
-\setuplayout
-  [style=smallbodyfont]
-
-%D \macros
-%D   {setuppapersize, setuplayout}
-%D
-%D The papersize suits the screen dimensions. The layout is
-%D rather simple. We use the whole width of the screen and only
-%D have navigational tools at the bottom of the screen.
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [backspace=1cm,
-   topspace=1cm,
-   margin=0pt,
-   header=0pt,
-   footer=0pt,
-   bottomdistance=.875cm,
-   bottom=1cm,
-   width=fit,
-   height=fit]
-
-%D \macros
-%D   {setupwhitespace, setuptyping}
-%D
-%D We don't have much height, so we use a more cramped
-%D spacing. Verbatim text looks better when indented.
-%D
-
-\setupwhitespace
-  [medium]
-
-\setuptyping
-  [margin=standard]
-
-%D \macros
-%D   {definecolor, setupcolors}
-%D
-%D Of course we enable color. We define some logical colors,
-%D of which most default to the same green shade.
-
-\definecolor [BackgroundColor]  [r=.8, g=.8, b=.8]
-\definecolor [OrnamentColor]    [r= 0, g=.7, b=.4]
-
-\setupcolors
-  [state=start]
-
-%D \macros
-%D   {setupinteraction, setupinteractionscreen}
-%D
-%D We still have to enable interaction mode. We go full
-%D screen!
-
-\setupinteraction
-  [state=start,
-   color=OrnamentColor,
-   contrastcolor=OrnamentColor]
-
-\setupinteractionscreen
-  [option=max,
-   width=fit,
-   height=fit]
-
-%D \macros
-%D   {setupitemize}
-%D
-%D And why not bring some color in itemizations too?
-
-\setupitemize
-  [color=OrnamentColor]
-
-%D \macros
-%D   {defineoverlay, setupbackgrounds}
-%D
-%D The navigational elements and the backgrounds are
-%D provided by \METAPOST.
-%D
-%D When \METAPOST\ is used, it makes sense to generate the
-%D graphics at runtime. This is supported when one enables
-%D system calls in the local \type {texmf.cnf} file and add the
-%D switch \type {\runMPgraphicstrue} to the local file \type
-%D {cont-sys.tex}. When direct processing is disabled or not
-%D supported, \TEXEXEC\ will take care of graphic generation.
-
-\startuniqueMPgraphic{PageBackground}
-  fill unitsquare
-    xyscaled(OverlayWidth,OverlayHeight)
-    withcolor OverlayColor ;
-  draw unitsquare
-    xyscaled(OverlayWidth,OverlayHeight)
-    enlarged (-2*OverlayLineWidth)
-    withpen pencircle scaled OverlayLineWidth
-    withcolor OverlayLineColor ;
-\stopuniqueMPgraphic
-
-\defineoverlay
-  [PageBackground]
-  [\uniqueMPgraphic{PageBackground}]
-
-\setupbackgrounds
-  [page]
-  [background=PageBackground,
-   backgroundcolor=BackgroundColor,
-   rulethickness=.125cm,
-   framecolor=OrnamentColor]
-
-%D \macros
-%D   {setuptexttexts}
-%D
-%D By clicking on the text area, one goes to the next page.
-%D We hook this feature into the text backgrounds.
-
-\startuniqueMPgraphic{TextBackground}
-  draw unitsquare
-    xyscaled(OverlayWidth,OverlayHeight)
-    enlarged (4*OverlayLineWidth)
-    withpen pencircle scaled OverlayLineWidth
-    withcolor OverlayLineColor ;
-\stopuniqueMPgraphic
-
-\defineoverlay
-  [TextBackground]
-  [\uniqueMPgraphic{TextBackground}]
-
-\defineoverlay
-  [NextPage]
-  [\overlaybutton{nextpage}]
-
-\setupbackgrounds
-  [text]
-  [background={TextBackground,NextPage},
-   backgroundcolor=BackgroundColor,
-   rulethickness=.0625cm,
-   framecolor=OrnamentColor]
-
-%D \macros
-%D   {setupinteractionmenu,startinteractionmenu}
-%D
-%D At the bottom of the screen, we show three buttons. These
-%D direct us to the previous or next jump or exit the document.
-
-\setupMPvariables[RightArrow][height=\bottomheight]
-\setupMPvariables[LeftArrow] [height=\bottomheight]
-\setupMPvariables[Circle]    [height=\bottomheight]
-\setupMPvariables[UpArrow]   [height=\bottomheight]
-
-\startuniqueMPgraphic{RightArrow}{height}
-  z1=(0,0) ; z2=(\MPvar{height},.5y3) ; z3=(0,\MPvar{height}) ;
-  drawfill z1--z2--z3--cycle
-    withpen pencircle scaled (\MPvar{height}/5)
-    withcolor \MPcolor{OrnamentColor} ;
-\stopuniqueMPgraphic
-
-\startuniqueMPgraphic{LeftArrow}{height}
-  z1=(\MPvar{height},0) ; z2=(0,.5y3) ; z3=(\MPvar{height},\MPvar{height}) ;
-  drawfill z1--z2--z3--cycle
-    withpen pencircle scaled (\MPvar{height}/5)
-    withcolor \MPcolor{OrnamentColor} ;
-\stopuniqueMPgraphic
-
-\startuniqueMPgraphic{Circle}{height}
-  drawfill fullcircle scaled \MPvar{height}
-    withpen pencircle scaled (\MPvar{height}/5)
-    withcolor \MPcolor{OrnamentColor} ;
-\stopuniqueMPgraphic
-
-\startuniqueMPgraphic{UpArrow}{height}
-  z1=(0,0) ; z2=(\MPvar{height},0) ; z3=(.5x2,\MPvar{height}) ;
-  drawfill z1--z2--z3--cycle
-    withpen pencircle scaled (\MPvar{height}/5)
-    withcolor \MPcolor{OrnamentColor} ;
-\stopuniqueMPgraphic
-
-\setupinteractionmenu
-  [bottom]
-  [state=start,
-   frame=off,
-   width=.3\textwidth,
-   height=\bottomheight]
-
-\setupinteraction
-  [menu=on]
-
-\def\WhateverButton
-  {\doifreferencefoundelse{Whatever}
-     {\raw [Whatever] \uniqueMPgraphic{UpArrow} \\}
-     {}}
-
-\startinteractionmenu[bottom]
-  \but [Topics]                                     \\ % secret button
-  \hfill
-  \WhateverButton                                      % user specific
-  \kern2\bottomheight
-  \raw [previouspage]  \uniqueMPgraphic{LeftArrow}  \\
-  \kern.5\bottomheight
-  \raw [CloseDocument] \uniqueMPgraphic{Circle}     \\
-  \kern.5\bottomheight
-  \raw [nextpage]      \uniqueMPgraphic{RightArrow} \\
-  \kern.5\bottomheight
-\stopinteractionmenu
-
-%D \macros
-%D   {TitlePage, Topics, Topic, Subject}
-%D
-%D A presentation after loading this module looks like:
-%D
-%D \starttyping
-%D \TitlePage {About Whatever\\Topics}
-%D
-%D \Topics {Todays Talk}
-%D
-%D \Topic {Some topic}
-%D
-%D .....
-%D
-%D \Topic {Next Topic}
-%D
-%D .....
-%D \stoptyping
-
-%D \macros
-%D  {StartTitlePage, TitlePage}
-%D
-%D The titlepage is rather simple and can be typeset in two
-%D ways:
-%D
-%D \starttyping
-%D \StartTitlePage
-%D text \\ text \\ text
-%D \StopTitlepage
-%D \stoptyping
-%D
-%D or as one||liner:
-%D
-%D \starttyping
-%D \TitlePage{text\\text\\text}
-%D \stoptyping
-%D
-%D The first alternative can be used for more complicated
-%D title pages.
-
-\def\StartTitlePage%
-  {\startstandardmakeup
-   \bfd\setupinterlinespace
-   \setupalign[middle]
-   \vfil
-   \let\\=\vfil}
-
-\def\StopTitlePage%
-  {\vfil\vfil\vfil
-   \stopstandardmakeup}
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-%D \macros
-%D   {definehead}
-%D
-%D The commands \type{\Topic} and \type{\Subject} are defined
-%D as copies of head. We use \type{\Nopic} for internal
-%D purposes.
-
-\definehead [Topic]   [chapter]
-\definehead [Subject] [section]
-
-\definehead [Nopic]   [title]
-
-%D \macros
-%D   {setuphead}
-%D
-%D We use our own command for typesetting the titles. We hide
-%D sectionnumbers from viewing. Each topic is followed by a
-%D list of subjects that belong to the topic.
-
-\setuphead
-  [Topic, Nopic]
-  [after={\blank[3*medium]},
-   number=no,
-   style=\tfb,
-   page=yes,
-   alternative=middle]
-
-\setuphead
-  [Subject]
-  [after=\blank,
-   number=no,
-   page=yes,
-   continue=no,
-   style=\tfa]
-
-%D \macros
-%D   {setuplist}
-%D
-%D When found, the subject list is automatically placed
-%D after the topic head.
-
-\setuplist
-  [Topic,Subject]
-  [alternative=g,
-   interaction=all,
-   before=,
-   after=]
-
-\setuplist
-  [Topic]
-  [criterium=all]
-
-\def\Topics#1%
-  {\determinelistcharacteristics[Topic]
-   \doifmode{*list}
-     {\Nopic[Topics]{#1}
-      \startcolumns
-      \placelist[Topic]
-      \stopcolumns}}
-
-\setuplist
-  [Subject]
-  [criterium=Topic]
-
-\def\Subjects%
-  {\determinelistcharacteristics[Subject]
-   \doifmode{*list}
-     {\placelist[Subject]}}
-
-\setuphead
-  [Topic]
-  [after={\blank[3*medium]\Subjects}]
-
-\doifnotmode{demo}{\endinput}
-
-%D The (rather silly) demo section.
-
-\starttext
-
-\TitlePage{Title Page\\pre-green}
-
-\Topics{Some Nice Quotes}
-
-\Topic{A Few}
-
-\Subject{Knuth} \input knuth
-\Subject{Tufte} \input tufte
-
-\Topic{Some More}
-
-\Subject{Zapf}   \input zapf
-\Subject{Bryson} \input bryson
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-03.tex b/tex/context/modules/common/s-pre-03.tex
deleted file mode 100644
index 19a11d24e..000000000
--- a/tex/context/modules/common/s-pre-03.tex
+++ /dev/null
@@ -1,257 +0,0 @@
-%D \module
-%D   [      file=s-pre-03,
-%D        version=1998.09.06,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 3,
-%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 This is the third environment for typesetting interactive
-%D presentations. I used this style for a talk on \TEX\ and
-%D \JAVASCRIPT\ at \TUG98, mainly because I didn't want to
-%D use the same style three times. Therefore this is a rather
-%D simple, silly style.
-
-\usemodule[pre-general]
-
-%D \macros
-%D  {setupbodyfont}
-%D
-%D We use a large bodyfont. Combined with the fancy
-%D background, this does not leave that much room for text, but
-%D presentations should use much text anyway.
-
-\startmode[asintended] \setupbodyfont[lbr] \stopmode
-
-\setupbodyfont[14.4pt]
-
-%D \macros
-%D   {setuppapersize,setuplayout,setupinteractionscreen}
-%D
-%D The page dimensions are set to size \type {S6}, being
-%D 600pt by 450pt. We use wide margins and discard headers
-%D and footers. We also launch the document full screen.
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [width=middle,
-   height=middle,
-   topspace=75pt,
-   backspace=100pt,
-   header=0pt,
-   footer=0pt]
-
-\setupinteractionscreen
-  [option=max]
-
-%D \macros
-%D   {setupcolors,definecolor}
-%D
-%D Next, color support is turned on and a dark red color is
-%D defined. Other red shades will be derived from this one
-%D color.
-
-\setupcolors
-  [state=start]
-
-\definecolor [PageColor]       [black]
-\definecolor [BackgroundColor] [s=.85]
-\definecolor [OrnamentColor]   [r=.75]
-
-%D \macros
-%D   {setupinteraction}
-%D
-%D We turn on interaction mode and use the same color for
-%D hyperlinks and redundant hyperlinks (the ones that point
-%D to the current page).
-
-\setupinteraction
-  [state=start,
-   contrastcolor=OrnamentColor,
-   color=OrnamentColor]
-
-%D \macros
-%D   {defineoverlay, setupbackgrounds}
-%D
-%D The joke in this presentation is the elliptical shape of
-%D which the bottom part includes a page indication.
-
-\defineoverlay
-  [PageShape][\useMPgraphic{PageShape}]
-
-% \startuseMPgraphic{PageShape}
-%   lin := 20pt ; off := .75lin ;
-%   wid := \overlaywidth ; hei := \overlayheight ;
-%   pos := \currentpage ; tot := \lastpage ;
-%   path bb; bb := unitsquare xscaled wid yscaled hei ;
-%   filldraw bb withcolor \MPcolor{PageColor} ;
-%   pickup pencircle xscaled .5lin yscaled lin rotated 45 ;
-%   pair r, t, l, b ;
-%   r := (wid-off,.5hei) ; t := (.5wid,hei-off) ;
-%   l := (off,.5hei) ; b := (.5wid,off) ;
-%   path p; p := superellipse(r,t,l,b,.8) ;
-%   fill p withcolor \MPcolor{Backgroundcolor} ;
-%   draw p withcolor \MPcolor{OrnamentColor} ;
-%   color contrastcolor ; contrastcolor = 2/3 * \MPcolor{OrnamentColor} ;
-%   if (pos>0) and (tot>0):
-%     pair pa ; pa := point 5 of p ;
-%     pair pb ; pb := point 7 of p ;
-%     draw pa withcolor contrastcolor ;
-%     draw pb withcolor contrastcolor ;
-%     len := 2/tot ;
-%     pair pa ; pa := point (5+len*pos) of p ;
-%     pair pb ; pb := point (5+len*(pos-1)) of p ;
-%     p := p cutafter pa ;
-%     p := p cutbefore pb ;
-%     draw p withcolor contrastcolor ;
-%   fi ;
-%   setbounds currentpicture to bb ;
-% \stopuseMPgraphic
-
-\startuseMPgraphic{PageShape}
-  StartPage ;
-    path p ; pair pa, pb ; numeric len ; color contrastcolor ;
-    fill Page withcolor \MPcolor {PageColor} ;
-    pickup pencircle rotated 45 xscaled 10pt yscaled 20pt ;
-    p := Page enlarged (-10pt,-15pt) superellipsed .8 ;
-    p := p shifted (-1.5pt,0) ; % looks better
-    fill p withcolor \MPcolor{BackgroundColor} ;
-    draw p withcolor \MPcolor{OrnamentColor} ;
-    contrastcolor = 2/3 * \MPcolor{OrnamentColor} ;
-    if (PageNumber>0) and (NOfPages>0):
-      draw point 5 of p withcolor contrastcolor ;
-      draw point 7 of p withcolor contrastcolor ;
-      len := 2/NOfPages ;
-      pa := point (5+len*PageNumber) of p ;
-      pb := point (5+len*(PageNumber-1)) of p ;
-      draw (p cutafter pa) cutbefore pb
-        withcolor contrastcolor ;
-    fi ;
-  StopPage ;
-\stopuseMPgraphic
-
-%D We use the viewer provided feature to go to the previous or
-%D next page.
-
-\defineoverlay[PrevButton][\overlaybutton{PreviousPage}]
-\defineoverlay[NextButton][\overlaybutton{NextPage}]
-
-\setupbackgrounds
-  [page]
-  [background={PageShape,PrevButton}]
-
-\setupbackgrounds
-  [text][text]
-  [background=NextButton]
-
-% or using hard coded next/prev pages:
-%
-% \defineoverlay[PrevButton][\overlaybutton{previouspage}]
-% \defineoverlay[NextButton][\overlaybutton{nextpage}]
-%
-% \setupbackgrounds[state=repeat]
-% \setupbackground[text][text][background=NextButton]
-%
-% or simply (using an repeated layer):
-%
-% \setupbackground[text][background=NextButton]
-
-%D \macros
-%D   {definehead, setuphead}
-%D
-%D Like the other presentation styles, we use \type {\Topic}
-%D instead of \type {\chapters}. This time we don't provide
-%D an additional sectioning. So we have:
-%D
-%D \starttyping
-%D \TitlePage{How nice}
-%D
-%D \Topics{This is about ...}
-%D
-%D \Topic{The first one}
-%D
-%D \Topic{Another one}
-%D \stoptyping
-
-\definehead [Topic] [chapter]
-\definehead [Nopic] [title]
-
-\setuphead
-  [Topic,Nopic]
-  [after={\blank[3*medium]},
-   number=no,
-   style=\tfb,
-   page=yes,
-   alternative=middle]
-
-\setuplist
-  [Topic]
-  [alternative=g,
-   interaction=all,
-   before=,
-   after=]
-
-\def\Subject
-  {\Topic}
-
-%D The tables of contents is associated with \type
-%D {\Topics}.
-
-\def\Topics#1%
-  {\Nopic[Topics]{#1}
-   \placelist[Topic][criterium=all]}
-
-\def\Subjects
-  {}
-
-%D Instead of \type {\TitlePage}, one can use the pair
-%D \type {\StartTitlePage} -- \type {\StopTitlePage}:
-%D
-%D \starttyping
-%D \StartTitlePage
-%D A Self Made Title
-%D \StopTitlePage
-%D \stoptyping
-
-\def\StartTitlePage%
-  {\startstandardmakeup
-   \bfd\setupinterlinespace
-   \setupalign[middle]
-   \vfil
-   \def\\{\vfil\bfb\setupinterlinespace}}
-
-\def\StopTitlePage%
-  {\vfil\vfil\vfil
-   \stopstandardmakeup}
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-\doifnotmode{demo}{\endinput}
-
-%D The (rather silly) demo section.
-
-\starttext
-
-\TitlePage{Title Page\\pre-funny}
-
-\Topics{Some Nice Quotes}
-
-\Topic{A Few}
-
-\Subject{Knuth} \input knuth
-\Subject{Tufte} \input tufte
-
-\Topic{Some More}
-
-\Subject{Zapf}   \input zapf
-\Subject{Bryson} \input bryson
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-04.tex b/tex/context/modules/common/s-pre-04.tex
deleted file mode 100644
index 088f4e510..000000000
--- a/tex/context/modules/common/s-pre-04.tex
+++ /dev/null
@@ -1,377 +0,0 @@
-%D \module
-%D   [      file=s-pre-04,
-%D        version=1998.09.06,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 4,
-%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.
-
-\usemodule[pre-general]
-
-%D \macros
-%D   {setupbodyfont}
-%D
-%D This is just another environment for typesetting interactive
-%D presentations. I wrote this module on behalf of a course I
-%D gave for the United Kingdom \TeX\ users group.
-
-\setupbodyfont[ams,pos,14.4pt]
-
-%D \macros
-%D   {setupcolors,definecolor}
-%D
-%D I started using dark blue for the navigational elements. In
-%D that context, dark red is a logical choice for the contrast
-%D color. While playing around with the navigational elements
-%D I decided to use the not so dominant color yellow for the
-%D status bar.
-%D
-%D A few days before I wrote this style, the recent acquisition
-%D of Mondriaans last painting by the Dutch governement was a
-%D hot topic in the dutch news scenary. Therefore I decided to
-%D replace the rather dull title page by something more
-%D colorful, in mondriaan colors, but far more random than any
-%D of his paintings. For consistence we remap the already
-%D defined primary colors.
-
-\setupcolors [state=start]
-
-\definecolor [NoneColor] [s=.6]
-\definecolor [GotoColor] [b=.6]        \definecolor[blue]  [GotoColor]
-\definecolor [ExitColor] [r=.6]        \definecolor[red]   [ExitColor]
-\definecolor [JumpColor] [s=.6]
-\definecolor [UserColor] [g=.6]        \definecolor[green] [UserColor]
-\definecolor [StepColor] [r=.6,g=.6]   \definecolor[yellow][StepColor]
-
-\definecolor [PageColor] [s=.80]       \definecolor[gray]  [PageColor]
-\definecolor [TextColor] [s=.90]
-
-%D \macros
-%D   {setuppapersize}
-%D
-%D As usual, we take a screen oriented paper size:
-
-\setuppapersize
-  [S6][S6]
-
-%D \macros
-%D   {setuplayout,setupinteractionscreen}
-%D
-%D The layout definition fits into this $600\times450$ point
-%D area, but the dimensions are somewhat diffused by the text
-%D background offset.
-
-\setuplayout
-  [width=530pt,
-   height=400pt,
-   header=0pt,
-   footer=0pt,
-   backspace=15pt,
-   topspace=15pt,
-   bottomdistance=15pt,
-   bottom=10pt,
-   margin=0pt,
-   rightedgedistance=15pt,
-   rightedge=30pt]
-
-\setupinteractionscreen
-  [option=max]
-
-%D \macros
-%D   {setupbackgrounds}
-%D
-%D Both the page and the text area have a gray background.
-%D The \type {[text,text]} area also has an offset. Later we
-%D will see that we have to compensate for that in the
-%D navigational areas.
-
-\setupbackgrounds
-  [page]
-  [background=color,
-   backgroundcolor=PageColor]
-
-\setupbackgrounds
-  [text][text]
-  [background=color,
-   backgroundcolor=TextColor,
-   backgroundoffset=5pt]
-
-%D \macros
-%D   {setupinteraction}
-%D
-%D For convenient navigation, we turn on interaction.
-
-\setupinteraction
-  [state=start,
-   menu=on,
-   color=UserColor,
-   contrastcolor=NoneColor]
-
-%D \macros
-%D   {setupsubpagenumber}
-%D
-%D When navigating the document, we keep the title page out
-%D of sight, therefore we use sub page numbers.
-
-\setupsubpagenumber
-  [state=start,
-   way=bytext]
-
-%D \macros
-%D   {setupinteractionmenu}
-%D
-%D There is only one interaction menu, located in the right
-%D edge of the screen. Both offsets enlarge the edge by the
-%D same amount as the text background offset.
-
-\setupinteractionmenu
-  [right]
-  [state=start,
-   frame=off,
-   strut=no,
-   offset=0pt,
-   inbetween=,
-   bottomoffset=-5pt,
-   topoffset=-5pt]
-
-%D \macros
-%D   {startinteractionmenu}
-%D
-%D The menu itself is not that spectacular. We use the
-%D start||stop alternative for setting the content. The macro
-%D \type {\interactioncolor} expands into either the
-%D interaction color or the contrast color, the latter only
-%D when no jump is possible.
-
-\startinteractionmenu[right]
-  \setupinteraction[color=GotoColor]
-  \but [previoussubpage] \Triangle {90}\framedwidth\interactioncolor \\
-  \vskip10pt
-  \but [nextsubpage]     \Triangle{270}\framedwidth\interactioncolor \\
-  \vfill
-  \but [PreviousJump]    \Triangle{180}\framedwidth{NoneColor}       \\
-  \vskip-5pt
-  \but [NextJump]        \Triangle  {0}\framedwidth{NoneColor}       \\
-\stopinteractionmenu
-
-%D \macros
-%D   {setupinteractionbar}
-%D
-%D The interaction bar at the bottom is also larger than the
-%D normal width of the bottom area.
-
-\setupinteractionbar
-  [alternative=f,
-   width=\textwidth,
-   height=\bottomheight,
-   distance=10pt,
-   color=NoneColor,
-   contrastcolor=StepColor]
-
-%D \macros
-%D   {setupbottomtexts}
-%D
-%D The bar is centered in the middle.
-
-\setupbottomtexts
-  [\interactionbar]
-
-%D We can exit viewing with a close button, located on the
-%D rightmost bottom area.
-
-\def\CloseButton
-  {\button
-     [width=\rightedgewidth,height=\bottomheight,offset=overlay,
-      background=color,backgroundcolor=ExitColor,frame=off]
-     {}%
-     [CloseDocument]}
-
-\setupbottomtexts
-  [edge][][\CloseButton]
-
-%D \macros
-%D   {definesymbol,setupitemize}
-%D
-%D Because some prominent things are rectangular or triangular,
-%D we prefer some different symbols in itemizations:
-
-\definesymbol[1][$\blacktriangleright$]
-\definesymbol[2][$\blacktriangledown$]
-\definesymbol[3][$\blacktriangleright$]
-\definesymbol[4][$\blacktriangledown$]
-
-\setupitemize[each][color=NoneColor]
-
-%D \macros
-%D   {TitlePage,defineoverlay,button,setupalign,
-%D    setupbackgrounds,setupinteraction,setupinteractionbar,
-%D    startstandardmakeup,switchtobodyfont,setupinterlinespace}
-%D
-%D Now the main layout and navigational definitions are
-%D done, it makes sense to define and tune some structuring
-%D commands. First we build the titlepage.
-
-\defineoverlay [TitleGraphic] [\useMPgraphic{title}]
-\defineoverlay [NextPage]     [\overlaybutton{nextpage}]
-
-\def\StartTitlePage
-  {\setupbackgrounds[page][background={color,TitleGraphic,NextPage}]
-   \setupbackgrounds[text][text][background=]
-   \setupinteraction[menu=off]
-   \setupinteractionbar[state=stop]
-   \startstandardmakeup
-   \switchtobodyfont[24pt]
-   \bfd\setupinterlinespace
-   \setupalign[middle]
-   \vfil
-   \let\\=\vfil}
-
-\def\StopTitlePage
-  {\vfil\vfil\vfil
-   \stopstandardmakeup
-   \setupinteraction[menu=on]
-   \setupinteractionbar[state=start]
-   \setupbackgrounds[page][background=color]
-   \setupbackgrounds[text][text][background=color]
-   \setupsubpagenumber[reset]}
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-%D \macros
-%D   {Topic, Nopic, Subject,
-%D    definehead, setuphead}
-%D
-%D We use \type {\Topic} and \type {\Subject} instead of
-%D chapters and sections. The \type {\Nopic} alternative is
-%D meant for internal use.
-
-\definehead [Topic]   [chapter]
-\definehead [Nopic]   [title]
-\definehead [Subject] [section]
-
-\setuphead
-  [Topic, Nopic]
-  [after={\blank[3*medium]},
-   number=no,
-   style=\tfb,
-   page=yes,
-   alternative=middle]
-
-\setuphead
-  [Subject]
-  [after=\blank,
-   number=no,
-   page=yes,
-   continue=no,
-   style=\tfa]
-
-%D \macros
-%D   {Topics, Subjects,
-%D    setuplist, placelist, startcolumns}
-%D
-%D This style is meant for the more large presentations, and
-%D therefore provided for a list of topics as well as local
-%D lists of subjects. When many topics are introduces, the
-%D list is typeset in columns.
-
-\setuplist
-  [Topic,Subject]
-  [alternative=g,
-   interaction=all,
-   before=,
-   after=]
-
-\setuplist
-  [Topic]
-  [criterium=all]
-
-\def\Topics#1%
-  {\determinelistcharacteristics[Topic]
-   \ifnum\utilitylistlength>0
-     \Nopic[Topics]{#1}
-     \ifnum\utilitylistlength>12
-       \startcolumns
-       \placelist[Topic]
-       \stopcolumns
-     \else
-       \placelist[Topic]
-     \fi
-   \fi}
-
-\def\Subjects%
-  {\placelist[Subject]}
-
-%D Last we define the overlays. Look at the way colors are
-%D linked into the macros.
-
-\startMPinclusions
-  def triangle (expr wid, rot, col) =
-    x1 := x3 := y1 := 0 ; x2 := y3 := wid ; y2 := .5y3 ;
-    fill (z1--z2--z3--cycle) rotated rot withcolor col ;
-    currentpicture := currentpicture xysized (wid,wid) ;
-  enddef ;
-\stopMPinclusions
-
-\setupMPvariables
-  [triangle]
-  [width=1cm,
-   rotation=0,
-   color=black]
-
-\startuniqueMPgraphic{triangle}{width,rotation,color}
-  triangle(\MPvar{width},\MPvar{rotation},\MPvar{color}) ;
-\stopuniqueMPgraphic
-
-\def\Triangle#1#2#3%
-  {\uniqueMPgraphic{triangle}{rotation=#1,width=#2,color=#3}}
-
-\startuseMPgraphic{title} % can be simplified with "randomized"
-  color c ; path p ;
-  for i=1 upto 250 :
-    x0 := uniformdeviate \overlaywidth ;
-    y0 := uniformdeviate \overlayheight ;
-    sx := uniformdeviate 20 ;
-    sy := uniformdeviate 20 ;
-    cc := round(uniformdeviate 2) ;
-    if cc=0 : c := \MPcolor{GotoColor} fi ;
-    if cc=1 : c := \MPcolor{ExitColor} fi ;
-    if cc=2 : c := \MPcolor{StepColor} fi ;
-    qq := round(uniformdeviate 1) ;
-    if qq=0 :
-      p := unitsquare xscaled sx yscaled sy ;
-    else :
-      rr := round(uniformdeviate 3) * 90 ;
-      x1 := x3 := y1 := 0 ; x2 := y3 := sx; y2 := .5y3 ;
-      p := (z1--z2--z3--cycle) rotated rr ;
-    fi ;
-    fill p shifted z0 withcolor c ;
-  endfor ;
-\stopuseMPgraphic
-
-\doifnotmode{demo}{\endinput}
-
-%D The (rather silly) demo section.
-
-\starttext
-
-\TitlePage{Title Page\\pre-colorfull}
-
-\Topics{Some Nice Quotes}
-
-\Topic{A Few}
-
-\Subject{Knuth} \input knuth
-\Subject{Tufte} \input tufte
-
-\Topic{Some More}
-
-\Subject{Zapf}   \input zapf
-\Subject{Bryson} \input bryson
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-05.tex b/tex/context/modules/common/s-pre-05.tex
deleted file mode 100644
index ccffd1f4d..000000000
--- a/tex/context/modules/common/s-pre-05.tex
+++ /dev/null
@@ -1,240 +0,0 @@
-%D \module
-%D   [      file=s-pre-05,
-%D        version=1998.12.12,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 5,
-%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.
-
-\usemodule[pre-general]
-
-%D As all styles sofar, this one has the same structuring
-%D commands.
-
-\startmode[asintended] \setupbodyfont[ludicaot] \stopmode
-
-\setupbodyfont[14.4pt]
-
-\setupcolors [state=start]
-
-\definecolor [BackgroundColor] [s=.95]
-\definecolor [OrnamentColor]   [r=.6,g=.7,b=.8]
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [width=430pt,
-   height=400pt,
-   header=0pt,
-   footer=0pt,
-   margin=0pt,
-   backspace=25pt,
-   topspace=25pt,
-   rightedgedistance=20pt,
-   rightedge=110pt]
-
-\setupinteractionscreen
-  [option=max]
-
-\setupbackgrounds
-  [state=repeat]
-
-\setupbackgrounds
-  [page]
-  [backgroundcolor=white]
-
-\setupbackgrounds
-  [text][text]
-  [background={HashFrameA,NextPage},
-   backgroundoffset=20pt]
-
-\defineoverlay
-  [HashFrameA]
-  [\useMPgraphic{HashFrameA}]
-
-\defineoverlay
-  [HashFrameB]
-  [\useMPgraphic{HashFrameB}]
-
-\setupinteraction
-  [state=start,
-   menu=on,
-   color=OrnamentColor,
-   contrastcolor=OrnamentColor]
-
-%D Watch how we use a list alternative that matches the
-%D menu.
-
-\setupinteractionmenu
-  [right]
-  [background=HashFrameB,
-   style=smallbold,
-   frame=off,
-   offset=10pt,
-   height=35pt,
-   before=,
-   after=,
-   inbetween=\endgraf,
-   width=\rightedgewidth]
-
-\startinteractionmenu[right]
-  \placelist
-    [Topic]
-    [criterium=all,
-     alternative=right,
-     maxwidth=.8\rightedgewidth,
-     interaction=all,
-     before=,
-     after=]
-  \vfill
-  \setupinteractionmenu
-    [right]
-    [height=30pt]
-  \but [CloseDocument] Close \\
-\stopinteractionmenu
-
-\setupwhitespace
-  [big]
-
-\setupblank
-  [big]
-
-%D \macros
-%D   {TitlePage}
-%D
-%D Now the main layout and navigational definitions are
-%D done, it makes sense to define and tune some structuring
-%D commands. First we build the titlepage.
-
-\defineoverlay [TitleGraphic] [\useMPgraphic{TitleGraphic}]
-\defineoverlay [NextPage]     [\overlaybutton{forward}]
-
-\unexpanded\def\StartTitlePage
-  {\setupbackgrounds[page][background={color,TitleGraphic,NextPage}]
-   \setupbackgrounds[text][text][background=]
-   \setupinteraction[menu=off]
-   \setupinteractionbar[state=stop]
-   \setuplayout[width=550pt,rightedge=0pt]
-   \startstandardmakeup
-   \switchtobodyfont[24pt]
-   \bfd\setupinterlinespace
-   \setupalign[middle]
-   \vfil
-   \let\\=\vfil}
-
-\unexpanded\def\StopTitlePage
-  {\vfil\vfil\vfil
-   \stopstandardmakeup
-   \setuplayout[width=430pt,rightedge=110pt]
-   \setupinteraction[menu=on]
-   \setupinteractionbar[state=start]
-   \setupbackgrounds[page][background=color]
-   \setupbackgrounds[text][text][background={HashFrameA,NextPage}]}
-
-\unexpanded\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-%D \macros
-%D   {Topics,Subjects}
-%D
-%D Since the lists are in the menu, we don't honor list
-%D placement macros.
-
-\unexpanded\def\Topics#1{}
-\unexpanded\def\Subjects{}
-
-%D \macros
-%D   {Topic, Nopic, Subject}
-%D
-%D Since t his style is meant for rather flat structured
-%D documents, only \type {\Topic} makes sense.
-
-\definehead [Topic]   [chapter]
-\definehead [Nopic]   [title]
-\definehead [Subject] [section]
-
-\setuphead
-  [Topic, Nopic]
-  [after={\blank[3*medium]},
-   number=no,
-   style=\tfb,
-   page=yes,
-   alternative=middle]
-
-\setuphead
-  [Subject]
-  [after=\blank,
-   number=no,
-   page=yes,
-   continue=no,
-   style=\tfa]
-
-%D We use only one kind of base graphic, which is sligthly
-%D tuned for the different usage.
-
-\startMPinclusions
-  def random_hash_frame (expr width, height, offset, linewidth ) =
-
-    def delta = ((uniformdeviate .5offset) + .25offset) enddef ;
-    x1 := offset ; y1 := offset ; x2 := width-offset ; y2 := height-offset ;
-
-    drawoptions(withpen pencircle scaled linewidth withcolor \MPcolor{BackgroundColor}) ;
-    fill z1--(x2,y1)--z2--(x1,y2)--cycle ;
-
-    drawoptions(withpen pencircle scaled linewidth withcolor \MPcolor{OrnamentColor}) ;
-    draw (x1-delta,y1)--(x2+delta,y1) ;
-    draw (x2,y1-delta)--(x2,y2+delta) ;
-    draw (x2+delta,y2)--(x1-delta,y2) ;
-    draw (x1,y2+delta)--(x1,y1-delta) ;
-
-    drawoptions();
-    setbounds currentpicture to unitsquare xscaled width yscaled height ;
-  enddef ;
-\stopMPinclusions
-
-\startuseMPgraphic{HashFrameA}
-  random_hash_frame(OverlayWidth,OverlayHeight,15pt,2pt) ;
-\stopuseMPgraphic
-
-\startuseMPgraphic{HashFrameB}
-  random_hash_frame(OverlayWidth,OverlayHeight, 5pt,2pt) ;
-\stopuseMPgraphic
-
-\startuseMPgraphic{TitleGraphic}
-  for i=1 upto 300 :
-    offset := uniformdeviate 10pt ;
-    width  := 2*offset + 30pt + uniformdeviate 30pt ;
-    height := 2*offset + 10pt + uniformdeviate 10pt ;
-    addto currentpicture also
-      image(random_hash_frame(width,height,offset,1pt)) shifted
-      (uniformdeviate OverlayWidth, uniformdeviate OverlayHeight) ;
-  endfor ;
-\stopuseMPgraphic
-
-\continueifinputfile{s-pre-05.tex}
-
-%D The (rather silly) demo section.
-
-\starttext
-
-\TitlePage{Title Page\\pre-fuzzy}
-
-\Topics{Some Nice Quotes}
-
-\Topic{A Few}
-
-\Subject{Knuth} \input knuth
-\Subject{Tufte} \input tufte
-
-\Topic{Some More}
-
-\Subject{Zapf}   \input zapf
-\Subject{Bryson} \input bryson
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-09.tex b/tex/context/modules/common/s-pre-09.tex
deleted file mode 100644
index a20b9f31a..000000000
--- a/tex/context/modules/common/s-pre-09.tex
+++ /dev/null
@@ -1,380 +0,0 @@
-%D \module
-%D   [      file=s-pre-09,
-%D        version=unknown,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 9,
-%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 I made this style when I had to give a presentation on
-%D the \MAPS\ bibliography production for several user group
-%D meetings. This style is rather tuned for combinations of
-%D examples and explanations. The colors match the \MAPS\
-%D bibliography colors.
-
-\startmode[asintended] \setupbodyfont[lbr] \stopmode
-
-\setupbodyfont[14.4pt]
-
-%D A couple of years later, in 2001 this style was documented
-%D and made public. While documenting, I also changed box
-%D building on top of overlays into the now available layer
-%D positioning. So, this styles demonstrates quite some
-%D tricks.
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [topspace=0cm,
-   backspace=0cm,
-   header=0pt,
-   footer=0pt,
-   width=middle,
-   height=middle]
-
-%D Local environments can be set by using the setups commands.
-%D For downward compatibility, we keep supporting the \type
-%D {\...Settings} hooks. Using local environments is seldom
-%D needed.
-
-\let\TextSettings  \empty
-\let\SampleSettings\empty
-
-\startsetups [text]   \TextSettings   \stopsetups
-\startsetups [sample] \SampleSettings \stopsetups
-
-%D The dimensions are kind of fixed.
-
-\def\FrameWidth  {448pt}
-\def\FrameHeight {348pt}
-\def\FrameOffset {24pt}
-\def\FrameSkip   {12pt}
-
-%D But they {\em can} and {\em will} be changed.
-
-\def\FrameWidth  {408pt}
-\def\FrameHeight {318pt}
-
-%D The funny values come from the $3:4$ display aspect
-%D ratio.
-
-\setupcolors
-  [state=start]
-
-\definecolor[PageColor]       [s=.40]
-\definecolor[TextColor]       [s=.90]
-\definecolor[InteractionColor][r=.40]
-\definecolor[LineColor]       [r=.60,g=.60]
-
-%D Of course we go interactive and since we will probably
-%D open other documents, we make sure that the viewer opens a
-%D new window.
-
-\setupinteraction
-  [color=InteractionColor,
-   contrastcolor=LineColor,
-   display=new,
-   state=start]
-
-\setupinteractionscreen
-  [option=max]
-
-%D Before we come to the real macros, we do a little bit of
-%D tuning.
-
-\setupitemize
-  [1][packed]
-
-\setuptyping
-  [blank=medium]
-
-%D Apart from the titlepage, the page gets a simple colored
-%D background. Later we will activate the background.
-
-\setupbackgrounds
-  [page]
-  [backgroundcolor=PageColor]
-
-%D Everything gets frames by a nice \METAPOST\ frame.
-
-\defineoverlay [background] [\uniqueMPgraphic{background}]
-
-\startuniqueMPgraphic{background}
-  path p ; color c, w, d ;
-  c := \MPcolor{PageColor} ;
-  w := \MPcolor{TextColor} ;
-  d := \MPcolor{LineColor} ;
-  p := unitsquare xscaled OverlayWidth yscaled OverlayHeight ;
-  pickup pencircle scaled (1.5*\FrameSkip) ;
-  draw p withcolor c ;
-  pickup pencircle scaled \FrameSkip ;
-  fill p withcolor w ;
-  draw p withcolor d ;
-\stopuniqueMPgraphic
-
-%D We will present samples and explanation pair||wise, so
-%D we need a hyperlink that skips a page.
-
-\defineoverlay [nextpage]     [\overlaybutton{nextpage}]
-\defineoverlay [previouspage] [\overlaybutton{previouspage}]
-\defineoverlay [skippage]     [\overlaybutton{page(+2)}]
-
-%D Layers are normally used to position multiple content on
-%D a specific overlay. Here we will use them to position
-%D only and since the samples and text will swap place, we
-%D will use quite a few layers.
-
-\defineoverlay [text]   [\composedlayer{text}]
-\defineoverlay [sample] [\composedlayer{sample}]
-\defineoverlay [common] [\composedlayer{common}]
-
-%D There are three positions. When combined, the sample and
-%D text windows overlap, otherwise the lone window is
-%D centered. We could have used one layer and reversed the
-%D order by setting the \type {direction} parameter, but
-%D this approach is more readable.
-
-\definelayer
-  [text]
-  [x=\makeupwidth,y=\makeupheight,location=lt,
-   hoffset=-\FrameSkip,voffset=-\FrameSkip]
-
-\definelayer
-  [sample]
-  [hoffset=\FrameSkip,voffset=\FrameSkip]
-
-\definelayer
-  [common]
-  [x=.5\makeupwidth,y=.5\makeupheight,location=c]
-
-%D The topic is put in the lower right corner of the text
-%D window.
-
-\defineoverlay [topic] [\composedlayer{topic}]
-
-\definelayer
-  [topic]
-  [x=\FrameWidth,y=\FrameHeight,location=lt,
-   hoffset=-\FrameOffset,voffset=-\FrameSkip]
-
-%D The topic is put in a framed box. That way we can make
-%D sure that it gets a background, which looks better when
-%D it covers something else. Otherwise we could have stuct
-%D to:
-%D
-%D \starttyping
-%D \def\Topic#1%
-%D   {\setlayer[topic]{\color[PageColor]{\bfb\setstrut#1}}}
-%D \stoptyping
-%D
-%D But, we go for the nice alternative:
-
-\def\Topic#1%
-  {\doifsomething{#1}
-     {\setlayer [topic]
-        {\bfb\setstrut
-         \inframed
-           [frame=off,foregroundcolor=PageColor,offset=0pt,
-            background=color,backgroundcolor=TextColor]
-           {#1}}}}
-
-%D The sample as well as the explanation will be collected in
-%D a buffer. That way we can reuse the content. We could
-%D have used a box instead, but can we be sure that the content
-%D is not adapting itself? So, buffers we use.
-
-\resetbuffer[sample]
-\resetbuffer[text]
-
-%D Both the sample and explanation are kind of windowed.
-
-\defineframedtext
-  [SampleText]
-  [width=\FrameWidth,height=\FrameHeight,offset=\FrameOffset,
-   frame=off,align=normal,strut=no,before=,after=,
-   background={background,nextpage}]
-
-%D We safe some keying in by combining things in one macro.
-
-\def\DoSampleText#1#2#3% kind layer overlays
-  {\setupframedtexts[SampleText][background={background,#3}]
-   \setlayer[#2]
-     {\startSampleText[none]
-        \setups[#1]
-        \getbuffer[#1]
-      \stopSampleText}}
-
-\def\StartSample{\dostartbuffer[sample][StartSample][StopSample]}
-\def\StartText  {\dostartbuffer[text]  [StartText]  [StopText]}
-
-%D The following definitions apply at the outer level.
-
-\def\StopSample
-  {\startstandardmakeup
-     \DoSampleText{sample}{common}{nextpage}
-   \stopstandardmakeup
-   \resetbuffer[sample]}
-
-\def\StopText
-  {\startstandardmakeup
-     \DoSampleText{text}{common}{topic,nextpage}
-   \stopstandardmakeup
-   \resetbuffer[text]}
-
-\setupbackgrounds[page][background={color,nextpage}]
-\setupbackgrounds[text][background=common]
-
-%D When we combine sample and text, we get slightly
-%D different definitions. As you can see we generate two
-%D pages. Watch how we manipulate the order of the
-%D overlays and teh nature of the buttons. Here data
-%D abstraction really pays off.
-
-\def\StartIdea
-  {\bgroup
-   \let\StopSample\relax
-   \let\StopText  \relax}
-
-\def\StopIdea%
-  {\setupbackgrounds[page][background={color,skippage}]
-   \setupbackgrounds[text][background={text,sample}]
-   \startstandardmakeup
-     \DoSampleText{sample}{sample}{previouspage}
-     \DoSampleText{text}  {text}  {topic,nextpage}
-   \stopstandardmakeup
-   \setupbackgrounds[page][background={color,nextpage}]
-   \setupbackgrounds[text][background={sample,text}]
-   \startstandardmakeup
-     \DoSampleText{sample}{sample}{previouspage}
-     \DoSampleText{text}  {text}  {topic,nextpage}
-   \stopstandardmakeup
-   \egroup}
-
-%D The rest of the definitions takes care of the title page.
-%D Please don't steal this one for your own documents.
-
-\defineoverlay[joke] [\useMPgraphic{joke}{n=0}] % not to be changed!
-
-\startuseMPgraphic{joke}{n}
-  StartPage ;
-  path p, q ; numeric w ; pair xy ;
-  set_grid(OverlayWidth,OverlayHeight,OverlayWidth/8,OverlayHeight/8) ;
-  if \MPvar{n}=1 :
-    p := fulldiamond ; fill Page withcolor \MPcolor{TextColor} ;
-  else :
-    p := fullsquare  ; fill Page withcolor \MPcolor{PageColor} ;
-  fi ;
-  forever :
-    xy := center Page randomized (OverlayWidth,OverlayHeight) ;
-    if new_on_grid(xpart xy, ypart xy) :
-      q := (p xyscaled (OverlayWidth/5,OverlayHeight/5))
-           randomized (\FrameSkip,\FrameSkip)
-           shifted xy ;
-      w := (\FrameSkip) randomized (\FrameSkip/2) ;
-      draw q withcolor \MPcolor{PageColor} withpen pencircle scaled (1.5w) ;
-      fill q withcolor \MPcolor{TextColor} ;
-      draw q withcolor \MPcolor{LineColor} withpen pencircle scaled (   w) ;
-    fi ;
-    exitif grid_full ;
-  endfor ;
-  StopPage ;
-\stopuseMPgraphic
-
-\defineoverlay[fuzzy][\useMPgraphic{fuzzy}]
-
-\startuseMPgraphic{fuzzy}
-  path p ; numeric w ;
-  p := (fullsquare xyscaled (OverlayWidth,OverlayHeight))
-       randomized (\FrameSkip,\FrameSkip) ;
-  w := (\FrameSkip) randomized (\FrameSkip/2) ;
-  draw p withcolor \MPcolor{PageColor} withpen pencircle scaled (1.5w) ;
-  fill p withcolor \MPcolor{TextColor} ;
-  draw p withcolor \MPcolor{LineColor} withpen pencircle scaled (   w) ;
-\stopuseMPgraphic
-
-%D This time we use a fit window, but with a slightly randomized
-%D frame, our trademark so to say.
-
-\def\StartTitlePage
-  {\bgroup
-   \setupbackgrounds[page][background={joke,nextpage}]
-   \startstandardmakeup
-   \switchtobodyfont[big]
-   \setupframedtexts
-     [SampleText]
-     [background=fuzzy,
-      foregroundcolor=PageColor,
-      width=fit,
-      height=fit,
-      align=middle]
-   \startSampleText[middle]
-   \bfd\setupinterlinespace
-   \def\\{\bfb\setupinterlinespace\vfil\def\\{\vfil}}}
-
-\def\StopTitlePage
-  {\stopSampleText
-   \stopstandardmakeup
-   \egroup}
-
-\def\TitlePage#1%
-  {\StartTitlePage#1\StopTitlePage}
-
-%D Let's nill some error prone presentation macros.
-
-\let\Subject  \Topic
-\let\Topics   \gobbleoneargument
-\let\Subjects \relax
-
-%D We will avoid \quote {overfull} messages.
-
-\dontcomplain
-
-\doifnotmode{demo}{\endinput}
-
-%D The (rather silly) demo section.
-
-\starttext
-
-\setupbodyfont[12pt]
-
-\TitlePage{Quotes, Quotes\\and more quotes}
-
-\StartIdea
-  \StartSample
-    \input knuth \par
-  \StopSample
-  \StartText
-    \Topic{Tufte}
-    \input tufte \par
-  \StopText
- \StopIdea
-
-\StartIdea
-  \StartSample
-    \input materie \par
-  \StopSample
-  \StartText
-    \input reich   \par
-  \StopText
-\StopIdea
-
-\StartText
-  \input tufte \par
-\StopText
-
-\StartIdea
-  \StartSample
-    \input knuth \par
-  \StopSample
-  \StartText
-    \input tufte \par
-  \StopText
-\StopIdea
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-10.tex b/tex/context/modules/common/s-pre-10.tex
deleted file mode 100644
index a92e5af01..000000000
--- a/tex/context/modules/common/s-pre-10.tex
+++ /dev/null
@@ -1,308 +0,0 @@
-%D \module
-%D   [      file=s-pre-10,
-%D        version=unknown,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 10,
-%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 This style is derived from the ninth style, which was
-%D used first at \EUROTEX\ 99 and later at \TUG\ 2000. This
-%D alternative build up a page.
-
-\startmode [demo]
-  \disablemode[demo] \usemodule[pre-09] \enablemode[demo]
-\stopmode
-
-\startnotmode [demo]
-  \usemodule[pre-09]
-\stopnotmode
-
-%D We use blue colors instead of yellow ones. Since we have
-%D used symbolic names, we can easily overload the existing
-%D scheme.
-
-\definecolor[LineColor][r=.40,g=.40,b=1.00]
-
-%D Here we don't use fixed dimensions, but fit the sample
-%D windows and derive the text windows's width from this one.
-
-\setupframedtexts
-  [SampleText]
-  [width=fit,height=fit,
-   background={background,nextpage}]
-
-%D The topic goes to the top right corner of the screen which
-%D means that it is positioned left down to the reference
-%D point. Watch how we make data on this layer (here only
-%D the topic but it can be more) persistent.
-
-\setuplayer
-  [topic]
-  [y=0pt,x=\makeupwidth,location=lb,state=repeat,
-   hoffset=-\FrameSkip,voffset=\FrameSkip]
-
-%D Clicking on the page brings us back.
-
-\setupbackgrounds
-  [page]
-  [background={previouspage,color,topic}]
-
-%D All layers end up on the text area. This could have been
-%D the page area too since these have the same dimensions.
-
-\setupbackgrounds
-  [text]
-  [background={common,sample,text}]
-
-%D Because we build up the text window step by step, we will
-%D separate the entries by white space.
-
-\startsetups [always]
-  \setupwhitespace[big]
-  \setupblank[big]
-\stopsetups
-
-%D The \type {\Topic} commands can be simplified to:
-
-\def\Topic#1%
-  {\resetlayer[topic]
-   \setlayer[topic]{\bfb\setstrut\color[TextColor]{#1}}}
-
-%D We also provide a way to erase the topic.
-
-\def\NoTopic
-  {\resetlayer[topic]}
-
-%D We have to redefine the structuring commands to support
-%D the resetting of buffer counters.
-
-\newcounter\TextN
-
-\def\StartSample
-  {\doglobal\newcounter\TextN
-   \dostartbuffer[sample][StartSample][StopSample]}
-
-\def\StartText
-  {\doglobal\newcounter\TextN
-   \dostartbuffer[text][StartText][StopText]}
-
-\def\StartSubText
-  {\doglobal\increment\TextN
-   \dostartbuffer[text-\TextN][StartSubText][StopSubText]}
-
-\def\StopText
-  {\startstandardmakeup
-     \DoSampleText{text}{common}{nextpage}
-   \stopstandardmakeup}
-
-\def\StopSubText
-  {\startstandardmakeup
-     \DoSampleText{text}{common}{nextpage}
-   \stopstandardmakeup}
-
-%D The \type {\DoSampleText} command is adapted to support
-%D addition of subtexts (each subtext goes into its own
-%D buffer).
-
-\def\DoSampleText#1#2#3%
-  {\setupframedtexts[SampleText][background={background,#3}]
-   \bgroup
-   \setups[#1]%
-   \setups[always]%
-   \setbox\nextbox=\hbox
-     {\startSampleText[none]
-        \getbuffer[#1]\par
-        \doif{#1}{text}
-          {\dorecurse{\TextN}{\getbuffer[text-\recurselevel]\par}}
-      \stopSampleText}
-   \xdef\SampleTextWidth{\the\wd\nextbox}
-   \setlayer[#2]{\box\nextbox}%
-   \egroup}
-
-%D Since we are no longer swapping windows, we end up with a
-%D much simplier \type {\Stopidea} macro. We don't reset
-%D samples at the inner level.
-
-\def\StartIdea%
-  {\bgroup
-   \let\StopSample \relax
-   \let\StopText   \relax
-   \let\StopSubText\relax
-   \def\StartSample{\dostartbuffer[sample][StartSample][StopSample]}}
-
-\def\StopIdea%
-  {\startstandardmakeup
-     \DoSampleText{sample}{sample}{nextpage}
-     \SetTextWidth
-     \DoSampleText{text}  {text}  {nextpage}
-   \stopstandardmakeup
-   \egroup}
-
-%D Here we determine the width of the text window. It is
-%D derived from the width of the sample and stays the same
-%D within a sequence.
-
-\def\SetTextWidth
-  {\ifnum\TextN<1 % yes or no, may change
-     \scratchdimen=\makeupwidth
-     \advance\scratchdimen by -\SampleTextWidth
-     \advance\scratchdimen by  \FrameSkip
-     \xdef\SampleWidth{\the\scratchdimen}%
-   \fi
-   \setupframedtexts
-     [SampleText]
-     [width=\SampleWidth]}
-
-%D We use the (already implemented) second alternative of
-%D the titlepage graphic. Please don't change this.
-
-\defineoverlay[joke] [\useMPgraphic{joke}{n=1}] % not to be changed !
-
-\doifnotmode{demo}{\endinput}
-
-%D The demo section. The original presentation uses proper
-%D graphics and has better spacing.
-
-\def\SomeSymbol#1#2{\definedfont[ContextNavigation at #1]\char#2}
-
-\setupcombinations[distance=\FrameOffset,inbetween=\vskip\FrameOffset]
-
-\starttext
-
-\TitlePage{Some Famous Symbols}
-
-\Topic{Symbols}
-
-\StartSample
-  \startcombination[2*2]
-    {\SomeSymbol{5cm}{1}} {}
-    {\SomeSymbol{5cm}{3}} {}
-    {\SomeSymbol{5cm}{2}} {}
-    {\SomeSymbol{5cm}{4}} {}
-  \stopcombination
-\StopSample
-
-\Topic{Previous}
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{7cm}{1}
-  \StopSample
-  \StartText
-    This symbol can be used to indicate a hyperlink to a
-    previous page.
-  \StopText
-\StopIdea
-
-\StartIdea
-  \StartSubText
-    As one can expect there is also a symbol for going to
-    the next page.
-  \StopSubText
-\StopIdea
-
-\Topic{Previous}
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{9cm}{2}
-  \StopSample
-  \StartText
-     This symbol is actually just a mirrored version of the
-     first symbol we showed.
-  \StopText
-\StopIdea
-
-\NoTopic
-
-\StartText
-  Is this nice or not?
-\StopText
-
-\Topic{First and Last}
-
-\StartSample
-  \SomeSymbol{11cm}{3}
-\StopSample
-
-\StartSample
-  \SomeSymbol{11cm}{4}
-\StopSample
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{5cm}{3}
-  \StopSample
-  \StartText
-    A few screens back, we saw this symbol.
-  \StopText
-\StopIdea
-
-\StartIdea
-  \StartSubText
-    This symbol represents the beginning of something.
-  \StopSubText
-\StopIdea
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{5cm}{4}
-  \StopSample
-  \StartSubText
-    Just like this one represents an end.
-  \StopSubText
-\StopIdea
-
-\StartIdea
-  \StartSubText
-    They look just like the symbols found on audio and
-    video players.
-  \StopSubText
-\StopIdea
-
-\Topic{Summary}
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{6cm}{1}
-  \StopSample
-  \StartText
-    So we have a symbol for previous \unknown
-  \StopText
-\StopIdea
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{6cm}{2}
-  \StopSample
-  \StartSubText
-    \unknown\ and one for next \unknown
-  \StopSubText
-\StopIdea
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{6cm}{3}
-  \StopSample
-  \StartSubText
-    \unknown\ and yet another for first \unknown
-  \StopSubText
-\StopIdea
-
-\StartIdea
-  \StartSample
-    \SomeSymbol{6cm}{4}
-  \StopSample
-  \StartSubText
-    \unknown\ and of course for last.
-  \StopSubText
-\StopIdea
-
-\stoptext
-
diff --git a/tex/context/modules/common/s-pre-11.tex b/tex/context/modules/common/s-pre-11.tex
deleted file mode 100644
index 48974f6c5..000000000
--- a/tex/context/modules/common/s-pre-11.tex
+++ /dev/null
@@ -1,220 +0,0 @@
-%D \module
-%D   [      file=s-pre-11,
-%D        version=1999.08.20,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=Presentation Environment 11,
-%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.
-
-\setuppapersize
-  [S6][S6]
-
-\setuplayout
-  [topspace=0cm,
-   backspace=0cm,
-   header=0pt,
-   footer=0pt,
-   width=middle,
-   height=middle]
-
-\setupbodyfont
-  [14.4pt,lbr]
-
-\setupcolors
-  [state=start]
-
-\setupinteraction
-  [click=no,
-   display=new,
-   state=start]
-
-\setupinteractionscreen
-  [option=max]
-
-\def\SomeShape%
-  {\resetMPdrawing
-   \startMPdrawing
-     path p[], q[] ; pair a, b ;
-     StartPage ;
-   \stopMPdrawing
-   \dorecurse{\CurrentTopic}
-     {\startMPdrawing
-        initialize_box(\MPpos{topic-\realfolio-\recurselevel}) ;
-        p[\recurselevel] := tensecircle (wxy,hxy,.25cm) shifted cxy ;
-        fill p[\recurselevel] withcolor .9white  ;
-        pickup pencircle scaled .25cm ;
-        \ifnum\recurselevel=\CurrentTopic\space
-          draw p[\recurselevel] withcolor \MPcolor{ShowColor} ;
-        \else
-          draw p[\recurselevel] withcolor \MPcolor{DoneColor} ;
-        \fi
-      \stopMPdrawing}%
-   \dorecurse{\CurrentMaxItem}
-     {\startMPdrawing
-        initialize_box(\MPpos{item-\realfolio-\recurselevel}) ;
-        linewidth := .25cm ;
-        q[\recurselevel] := tensecircle (wxy,hxy,linewidth) shifted cxy ;
-        fill q[\recurselevel] withcolor .9white  ;
-        pickup pencircle scaled linewidth ;
-        \ifnum\recurselevel=\CurrentMaxItem\space
-          draw q[\recurselevel] withcolor \MPcolor{ShowColor} ;
-        \else
-          draw q[\recurselevel] withcolor \MPcolor{DoneColor} ;
-        \fi
-      \stopMPdrawing}%
-   \dostepwiserecurse{2}{\CurrentTopic}{1}
-     {\startMPdrawing
-        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} ;
-      \stopMPdrawing}%
-   \startMPdrawing
-     draw Page
-       withpen pencircle scaled .5cm
-       withcolor \MPcolor{EdgeColor} ;
-     StopPage ;
-   \stopMPdrawing
-   \MPdrawingdonetrue
-   \getMPdrawing}
-
-\def\TitlePage#1%
-  {\startstandardmakeup
-     \setupalign[middle]
-     \def\\{\vfil\bfb\setupinterlinespace}
-     \bfd\setupinterlinespace
-     \vfil#1\vfil\vfil
-   \stopstandardmakeup}
-
-\definecolor[PageColor][r=.5,g=.4,b=.3]
-\definecolor[LineColor][r=.7,g=.6,b=.5]
-
-\definecolor[PageColor]  [s=.60]
-\definecolor[ShowColor]  [r=.40]
-\definecolor[EdgeColor]  [g=.40]
-\definecolor[DoneColor]  [r=.40,g=.40]
-\definecolor[ArrowColor] [b=.40]
-\definecolor[LineColor]  [r=.60,g=.60]
-\definecolor[GotoColor]  [ArrowColor]
-
-\setupinteraction[color=GotoColor,contrastcolor=GotoColor]
-
-\defineoverlay [shape] [\SomeShape]
-\defineoverlay [next]  [\overlaybutton{forward}] % [{nextpage}]
-
-\setupbackgrounds
-  [page]
-  [background={color,next,shape},
-   backgroundcolor=PageColor]
-
-\doglobal\newcounter\CurrentMaxItem
-\doglobal\newcounter\CurrentItem
-\doglobal\newcounter\CurrentTopic
-
-\def\StartIdea%
-  {\doglobal\newcounter\CurrentItem}
-
-\def\StartTopic%
-  {\doglobal\increment\CurrentTopic
-   \dostartbuffer[topic-\CurrentTopic][StartTopic][StopTopic]}
-
-\def\StopIdea%
-  {\dorecurse{\CurrentItem}
-     {\let\CurrentMaxItem\recurselevel
-      \doStopIdea}}
-
-\def\doStopIdea%
-  {\startstandardmakeup
-   \dontcomplain
-   \vskip.875cm
-   \hbox to \makeupwidth
-     {\hfill
-      \dorecurse{\CurrentTopic}
-        {\edef\Topic{topic-\realfolio-\recurselevel}%
-         \hpos
-           {\Topic}
-           {\framed
-              [frame=off,align=middle,offset=.25cm]
-              {\getbuffer[topic-\recurselevel]}}%
-         \ifnum\recurselevel<\CurrentTopic
-           \hskip.875cm
-         \fi}%
-      \hfill}
-   \vskip.875cm
-   \vfilll
-   \dorecurse{\CurrentMaxItem}
-     {\edef\Item{item-\realfolio-\recurselevel}
-      \hbox to \makeupwidth
-        {\hfill
-         \hpos
-           {\Item}
-           {\framed
-              [width=.75\makeupwidth,
-               frame=off,
-               align=middle,offset=.125cm]
-              {\getbuffer[item-\recurselevel]}}%
-          \hfill}
-      \vskip.875cm}
-   \vfilll
-   \stopstandardmakeup}
-
-\def\StartItem%
-  {\doglobal\increment\CurrentItem
-   \dostartbuffer[item-\CurrentItem][StartItem][StopItem]}
-
-\lefthyphenmin =\maxdimen
-\righthyphenmin=\maxdimen
-
-\doifnotmode{demo}{\endinput}
-
-\starttext
-
-\StartIdea
-  \StartTopic
-     A Nice Idea
-  \StopTopic
-  \StartItem
-    \input reich \relax
-  \StopItem
-  \StartItem
-    \input reich \relax
-  \StopItem
-  \StartItem
-    \input reich \relax
-  \StopItem
-\StopIdea
-
-\StartIdea
-  \StartTopic
-     One More Nice Idea
-  \StopTopic
-  \StartItem
-    \input reich \relax
-  \StopItem
-  \StartItem
-    \input reich \relax
-  \StopItem
-\StopIdea
-
-\StartIdea
-  \StartTopic
-     The Last Idea
-  \StopTopic
-  \StartItem
-    \input tufte \relax
-  \StopItem
-\StopIdea
-
-\stoptext
diff --git a/tex/context/modules/common/s-pre-12.tex b/tex/context/modules/common/s-pre-12.tex
index 23418fbba..64949e30c 100644
--- a/tex/context/modules/common/s-pre-12.tex
+++ b/tex/context/modules/common/s-pre-12.tex
@@ -63,7 +63,7 @@
    \dorecurse{\CurrentMaxItem}
      {\startMPdrawing
         initialize_box(\MPpos{item-\realfolio-\recurselevel}) ;
-        linewidth := .25cm ; 
+        linewidth := .25cm ;
         p := tensecircle (wxy,hxy,linewidth) shifted cxy ;
         fill p withcolor .9white  ;
         pickup pencircle scaled linewidth ;
@@ -73,8 +73,8 @@
         \else
           draw p withcolor \MPcolor{DoneColor} ;
         \fi
-        dxab := xpart a-xpart b ; 
-        dyab := ypart a-ypart b ; 
+        dxab := xpart a-xpart b ;
+        dyab := ypart a-ypart b ;
         sign := if dyab>0 : - fi 1 ;
         drawarrow
           a --
@@ -82,7 +82,7 @@
           if abs(dyab)>4linewidth :
             a shifted (-dxab/2,+sign*2linewidth) --
             b shifted (+dxab/2,-sign*2linewidth) ..
-          fi 
+          fi
           {left} b shifted (-2linewidth+dxab/2,0) --
           b
           withcolor \MPcolor{ArrowColor} ;
@@ -107,7 +107,7 @@
 \setupinteraction[color=GotoColor,contrastcolor=GotoColor]
 
 \defineoverlay [shape] [\SomeShape]
-\defineoverlay [next]  [\overlaybutton{forward}] 
+\defineoverlay [next]  [\overlaybutton{forward}]
 
 \setupbackgrounds
   [page]
@@ -183,44 +183,44 @@
      \vfil#1\vfil\vfil
    \stopstandardmakeup}
 
-\endinput 
-
-% \starttext
-% 
-% \StartIdea
-%   \StartTopic
-%      What a topic
-%   \StopTopic
-%   \StartItem
-%     \input reich \relax
-%   \StopItem
-%   \StartItem
-%     \input reich \relax
-%   \StopItem
-%   \StartItem
-%     \input reich \relax
-%   \StopItem
-% \StopIdea
-% 
-% \StartIdea
-%   \StartTopic
-%      One More Nice Idea
-%   \StopTopic
-%   \StartItem
-%     \input reich \relax
-%  \StopItem
-%   \StartItem
-%     \input reich \relax
-%   \StopItem
-% \StopIdea
-% 
-% \StartIdea
-%   \StartTopic
-%      The Last Idea
-%   \StopTopic
-%   \StartItem
-%     \input tufte \relax
-%   \StopItem
-% \StopIdea
-% 
-% \stoptext
+\doifnotmode{demo}{\endinput}
+
+\starttext
+
+\StartIdea
+  \StartTopic
+     What a topic
+  \StopTopic
+  \StartItem
+    \input reich \relax
+  \StopItem
+  \StartItem
+    \input reich \relax
+  \StopItem
+  \StartItem
+    \input reich \relax
+  \StopItem
+\StopIdea
+
+\StartIdea
+  \StartTopic
+     One More Nice Idea
+  \StopTopic
+  \StartItem
+    \input reich \relax
+ \StopItem
+  \StartItem
+    \input reich \relax
+  \StopItem
+\StopIdea
+
+\StartIdea
+  \StartTopic
+     The Last Idea
+  \StopTopic
+  \StartItem
+    \input tufte \relax
+  \StopItem
+\StopIdea
+
+\stoptext
diff --git a/tex/context/modules/common/s-pre-15.tex b/tex/context/modules/common/s-pre-15.tex
index 25fb35783..90d428243 100644
--- a/tex/context/modules/common/s-pre-15.tex
+++ b/tex/context/modules/common/s-pre-15.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [      file=s-pre-15,
-%D        version=1999.09.01, 
+%D        version=1999.09.01,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 15,
 %D         author=Hans Hagen,
@@ -11,17 +11,17 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D This is one of the styles I made for the presentation on 
+%D This is one of the styles I made for the presentation on
 %D the \NTS\ project at Euro\TeX\ 1998. You need balls to let
-%D \TEX\ typeset graphics, but this style demonstrates that it 
-%D can be done. 
-%D 
+%D \TEX\ typeset graphics, but this style demonstrates that it
+%D can be done.
+%D
 %D This presentation is meant for presentations that build up
-%D an idea stepwise. 
-%D 
+%D an idea stepwise.
+%D
 %D \starttyping
 %D \TitlePage{Do you know \TEX ?}
-%D 
+%D
 %D \StartIdea
 %D   \StartItem We use \TEX\ for typesetting       \unknown \StopItem
 %D   \StartItem mathematical text                  \unknown \StopItem
@@ -29,10 +29,10 @@
 %D   \StartItem or presentations like this         \unknown \StopItem
 %D   \StartItem and whatever you can come up with!          \StopItem
 %D \StopIdea
-%D \stoptyping 
+%D \stoptyping
 
-%D The basic layout is rather simple and used as much of the 
-%D screen as possible. 
+%D The basic layout is rather simple and used as much of the
+%D screen as possible.
 
 \setuppapersize
   [S6][S6]
@@ -48,10 +48,10 @@
 \setupinteraction
   [state=start,
    display=new,
-   color=LineColor, 
+   color=LineColor,
    contrastcolor=LineColor,
    click=no]
-  
+
 \setupinteractionscreen
   [option=max]
 
@@ -59,8 +59,8 @@
 
 \setupbodyfont[14.4pt]
 
-%D We use a lot of color. You can remap them if you want 
-%D differend ones. The ideas circulate over the colors. 
+%D We use a lot of color. You can remap them if you want
+%D differend ones. The ideas circulate over the colors.
 
 \setupcolors
   [state=start]
@@ -73,12 +73,12 @@
 \definecolor[green][g=.4]        \definecolor[magenta][r=.4,b=.4]
 \definecolor[blue] [b=.4]        \definecolor[yellow] [r=.4,g=.4]
 
-\definecolor[linecolor 1][red]   \definecolor[linecolor 5][cyan]    
-\definecolor[linecolor 2][green] \definecolor[linecolor 6][magenta] 
-\definecolor[linecolor 3][blue]  \definecolor[linecolor 4][yellow]  
+\definecolor[linecolor 1][red]   \definecolor[linecolor 5][cyan]
+\definecolor[linecolor 2][green] \definecolor[linecolor 6][magenta]
+\definecolor[linecolor 3][blue]  \definecolor[linecolor 4][yellow]
 
-%D We use variables to make sure that the graphics are reused 
-%D but unique.  
+%D We use variables to make sure that the graphics are reused
+%D but unique.
 
 \setupMPvariables[pageframe][pagecolor=PageColor,linecolor=LineColor]
 \setupMPvariables[textframe][textcolor=TextColor,linecolor=LineColor]
@@ -93,35 +93,35 @@
 
 \startuniqueMPgraphic{pageframe}{pagecolor,linecolor}
   path p ; p := fullsquare xyscaled (\overlaywidth,\overlayheight) ;
-  pickup pencircle scaled 10pt ; 
-  fill p withcolor \MPvar{pagecolor} ; 
-  draw p withcolor \MPvar{linecolor} ; 
+  pickup pencircle scaled 10pt ;
+  fill p withcolor \MPvar{pagecolor} ;
+  draw p withcolor \MPvar{linecolor} ;
 \stopuniqueMPgraphic
 
 \startuniqueMPgraphic{textframe}{textcolor,linecolor}
   path p ; p := fullcircle xyscaled (\overlaywidth,\overlayheight) ;
-  pickup pencircle scaled 10pt ; 
-  fill p withcolor \MPvar{textcolor} ; 
-  draw p withcolor \MPvar{linecolor} ; 
+  pickup pencircle scaled 10pt ;
+  fill p withcolor \MPvar{textcolor} ;
+  draw p withcolor \MPvar{linecolor} ;
 \stopuniqueMPgraphic
 
 %D The rest of the file implements the nasty part: typesetting
 %D text embedded in a graphic. The text is collected in a box
-%D so that we can reuse it. 
+%D so that we can reuse it.
 
 \newbox\CollectedIdeas
 \newcounter\CurrentTopic
 
-\def\StartItem% 
+\def\StartItem%
   {\setbox\CollectedIdeas=\hbox\bgroup
      \ifdim\wd\CollectedIdeas>0pt \unhbox\CollectedIdeas\hskip25pt \fi
      \setbox\scratchbox=\hbox\bgroup
-       \framed      
+       \framed
          [width=160pt,height=160pt,align=middle,frame=off,
           background=textframe,offset=15pt,top=\vfill,bottom=\vfill]
         \bgroup}
 
-\def\StopItem% 
+\def\StopItem%
   {\egroup
    \egroup
    \setbox\scratchbox=\hbox{\lower.5\ht\scratchbox\box\scratchbox}%
@@ -134,12 +134,12 @@
      \leftskip       0pt plus 50pt
      \rightskip      0pt plus 50pt
      \parfillskip    0pt
-     \baselineskip 100pt 
+     \baselineskip 100pt
      \unhcopy\CollectedIdeas
    \stopstandardmakeup}
 
 \def\StartIdea%
-  {\ifnum\CurrentTopic=6 \doglobal\newcounter\CurrentTopic \fi 
+  {\ifnum\CurrentTopic=6 \doglobal\newcounter\CurrentTopic \fi
    \doglobal\increment\CurrentTopic
    \definecolor[LineColor][linecolor \CurrentTopic]
    \setbox\CollectedIdeas=\null}
@@ -163,15 +163,15 @@
 
 \doifnotmode{demo}{\endinput}
 
-%D A simple test on functionality. 
+%D A simple test on functionality.
 
 \setupoutput[pdftex]
 
-\starttext 
+\starttext
 
 \TitlePage{Do you know \TEX ?}
 
-\startbuffer 
+\startbuffer
 \StartIdea
   \StartItem We use \TEX\ for typesetting       \unknown \StopItem
   \StartItem mathematical text                  \unknown \StopItem
diff --git a/tex/context/modules/common/s-pre-16.tex b/tex/context/modules/common/s-pre-16.tex
index 715936890..a7e127828 100644
--- a/tex/context/modules/common/s-pre-16.tex
+++ b/tex/context/modules/common/s-pre-16.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [      file=s-pre-16,
-%D        version=1999.09.01, 
+%D        version=1999.09.01,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 16,
 %D         author=Hans Hagen,
@@ -13,7 +13,7 @@
 
 %D The first version of this style was made late summer 1999,
 %D but its first usage was during a course I gave in BRNO.
-%D It's a rather simple style with a dominating background. 
+%D It's a rather simple style with a dominating background.
 
 \setuppapersize
   [S6][S6]
@@ -42,11 +42,11 @@
   [state=start]
 
 \definecolor[gray] [s=.4]
-\definecolor[white][s=.8] 
+\definecolor[white][s=.8]
 
-\definecolor[red]  [r=.8] \definecolor[cyan]   [g=.8,b=.8] 
-\definecolor[green][g=.8] \definecolor[magenta][r=.8,b=.8] 
-\definecolor[blue] [b=.8] \definecolor[yellow] [r=.8,g=.8] 
+\definecolor[red]  [r=.8] \definecolor[cyan]   [g=.8,b=.8]
+\definecolor[green][g=.8] \definecolor[magenta][r=.8,b=.8]
+\definecolor[blue] [b=.8] \definecolor[yellow] [r=.8,g=.8]
 
 \definecolor[PageColor][gray]
 \definecolor[TextColor][yellow]
@@ -66,49 +66,49 @@
    symbol=FuzzyDot]
 
 \startuseMPgraphic{FuzzyCircle}
-  path p ; numeric w, h, l ; 
-  w := OverlayWidth ; h := OverlayHeight ; 
-  def dd = (1 randomized (1/5)) enddef ; 
+  path p ; numeric w, h, l ;
+  w := OverlayWidth ; h := OverlayHeight ;
+  def dd = (1 randomized (1/5)) enddef ;
   pickup pencircle xscaled 10pt yscaled 2pt rotated 30;
-  for i:=1 upto 50 : 
-    p := (-dd,-dd)..(dd,-dd)..(dd,dd)..(-dd,dd)..cycle ; 
-    p := p rotatedaround (center p, uniformdeviate 360) ;   
-    p := p xscaled (w/2) yscaled (h/2) ; 
-    l := length(p)/2 ; 
-    p := p cutbefore point   (uniformdeviate l) of p ;   
-    p := p cutafter  point (l+uniformdeviate l) of p ;   
+  for i:=1 upto 50 :
+    p := (-dd,-dd)..(dd,-dd)..(dd,dd)..(-dd,dd)..cycle ;
+    p := p rotatedaround (center p, uniformdeviate 360) ;
+    p := p xscaled (w/2) yscaled (h/2) ;
+    l := length(p)/2 ;
+    p := p cutbefore point   (uniformdeviate l) of p ;
+    p := p cutafter  point (l+uniformdeviate l) of p ;
     draw p withcolor \MPcolor{LineColor} randomized (.4,1) ;
-  endfor ; 
+  endfor ;
   picture s ; s := currentpicture xysized (w-15,h-15) ;
   currentpicture := nullpicture ;
-  fill boundingbox s enlarged 60pt withcolor \MPcolor{PageColor} ; 
-  addto currentpicture also s ; 
+  fill boundingbox s enlarged 60pt withcolor \MPcolor{PageColor} ;
+  addto currentpicture also s ;
 \stopuseMPgraphic
 
 \startuseMPgraphic{FuzzyDot}
-  path p ; numeric w ; 
-  w := BodyFontSize/2 ; 
-  def dd = (w randomized (w/2)) enddef ; 
+  path p ; numeric w ;
+  w := BodyFontSize/2 ;
+  def dd = (w randomized (w/2)) enddef ;
   pickup pencircle xscaled (w/2) yscaled (w/3) rotated 30 ;
-  for i=0 step 45 until 135 : 
+  for i=0 step 45 until 135 :
     p := (-dd,0)--(dd,0) ;
     p := p rotatedaround (origin,i-w+uniformdeviate w) ;
     draw p withcolor \MPcolor{LineColor} randomized (.3,.8) ;
-  endfor ; 
+  endfor ;
 \stopuseMPgraphic
 
 \defineoverlay [FuzzyCircle] [\useMPgraphic{FuzzyCircle}]
 \defineoverlay [GoOn]        [{\setupinteraction[click=no]\overlaybutton{forward}}]
 \defineoverlay [Again]       [\overlaybutton{firstpage}]
 
-\definesymbol 
-  [FuzzyDot] 
+\definesymbol
+  [FuzzyDot]
   [\lower\dp\strutbox\hbox{\useMPgraphic{FuzzyDot}}]
 
 \def\Item%
   {\par\noindent\symbol[FuzzyDot]\hskip.5em\nobreak}
 
-\setupitemize 
+\setupitemize
   [all]
   [packed]
   [symbol=FuzzyDot]
@@ -134,15 +134,15 @@
   [alternative=g,
    interaction=all]
 
-%D Since we want a colored text, and since color directive 
-%D can spoil the spacing, we use a foregroundcolor. 
+%D Since we want a colored text, and since color directive
+%D can spoil the spacing, we use a foregroundcolor.
 
 \setupbackgrounds
   [text]
   [foregroundcolor=TextColor]
 
-%D Unfortunately this does not work when on the page colors 
-%D are set, so we play safe and say: 
+%D Unfortunately this does not work when on the page colors
+%D are set, so we play safe and say:
 
 \setupmakeup
   [standard]
@@ -165,13 +165,13 @@
    \stopcolumns
    \page}
 
-%D Some fakes. 
+%D Some fakes.
 
 \def\Subject  {\Topic}
 \def\Subjects {}
 
-%D A bonus (copied from \type {s-pre-02} but with a different 
-%D vertical alignment. 
+%D A bonus (copied from \type {s-pre-02} but with a different
+%D vertical alignment.
 
 \def\StartTitlePage%
   {\startstandardmakeup
@@ -188,16 +188,16 @@
   {\StartTitlePage#1\StopTitlePage}
 
 \doifnotmode{demo}{\endinput}
-
-\starttext 
+
+\starttext
 
 \Topics{...}
 
-\StartIdea 
+\StartIdea
   \Topic{...}
-  ... 
-  \NextIdea 
+  ...
+  \NextIdea
   ...
 \StopIdea
 
-\stoptext 
+\stoptext
diff --git a/tex/context/modules/common/s-pre-23.tex b/tex/context/modules/common/s-pre-23.tex
index f9983a89e..c5ae82eed 100644
--- a/tex/context/modules/common/s-pre-23.tex
+++ b/tex/context/modules/common/s-pre-23.tex
@@ -14,7 +14,7 @@
 %D This style looks a lot like number 22. This time we don't
 %D cycle but build up the page. One can click on the text go
 %D to the page wanted. Clicking on the titl ebrings you to the
-%D previous page. 
+%D previous page.
 
 \startmode [demo]
   \disablemode[demo] \usemodule[pre-22] \enablemode[demo]
@@ -24,13 +24,13 @@
   \usemodule[pre-22]
 \stopnotmode
 
-%D We use a simple two||color scheme. 
+%D We use a simple two||color scheme.
 
 \definecolor[DotColor][r=.5,g=.6,b=.7]
 \definecolor[TopColor][r=.7,g=.6,b=.5]
 \definecolor[BotColor][TopColor]
 
-%D We will not delay page building. 
+%D We will not delay page building.
 
 \let\BuildPage\relax
 
@@ -51,14 +51,14 @@
    \setlayer[temp]{\foundbox{Subtext}\CurrentSummary}
    \stopstandardmakeup}
 
-%D The title page is not added to the main layer (or 
-%D actually, it is, but we erase the layer before it's 
-%D used). 
+%D The title page is not added to the main layer (or
+%D actually, it is, but we erase the layer before it's
+%D used).
 
 \long\def\MakeTitlePage#1#2%
   {\startstandardmakeup
    \definereference[thispage][]
-   \switchtobodyfont[32pt] 
+   \switchtobodyfont[32pt]
    \StartSummary{#1}{}#2\StopSummary
    \resetlayer[main]
    \setlayer[temp]{\foundbox{Summary}\CurrentSummary}