2018-05-24 15:56:00

9 files changed, 168 insertions, 16 deletions

diff --git a/tex/context/modules/mkiv/m-oldfun.mkiv b/tex/context/modules/mkiv/m-oldfun.mkiv
index 3f2ec0263..7ec779c41 100644
--- a/tex/context/modules/mkiv/m-oldfun.mkiv
+++ b/tex/context/modules/mkiv/m-oldfun.mkiv
@@ -355,14 +355,14 @@
       \ifdim\wd2=\zeropoint
         \setbox0\emptybox
         \setbox2\emptybox
-        \@EA\grabfirstline
+        \expandafter\grabfirstline
       \else\ifdim\wd2>\hsize
         \hbox to \hsize{\strut\unhbox0}#2\egroup
         \break##1\
         \egroup
       \else
         \setbox0\box2
-        \@EAEAEA\grabfirstline
+        \doubleexpandafter\grabfirstline
       \fi\fi}%
    \grabfirstline}
 
diff --git a/tex/context/modules/mkiv/m-oldnum.mkiv b/tex/context/modules/mkiv/m-oldnum.mkiv
index 382c56eb6..658c28051 100644
--- a/tex/context/modules/mkiv/m-oldnum.mkiv
+++ b/tex/context/modules/mkiv/m-oldnum.mkiv
@@ -210,7 +210,7 @@
 \fi
 
 \def\doscandigit#1%
-  {\ifcase\skipdigit\@EA\hbox\else\@EA\hphantom\fi\bgroup
+  {\ifcase\skipdigit\expandafter\hbox\else\expandafter\hphantom\fi\bgroup
      \mathematics % brr, needed because of stored punctuation
        {\ifnum\digitinputmode=#1\relax
         \ifcase\digitoutputmode
diff --git a/tex/context/modules/mkiv/m-units.mkiv b/tex/context/modules/mkiv/m-units.mkiv
index f85a8ba8a..4f25fffc6 100644
--- a/tex/context/modules/mkiv/m-units.mkiv
+++ b/tex/context/modules/mkiv/m-units.mkiv
@@ -212,7 +212,7 @@
      \setbox2\hbox{m}%
      \ifdim\wd0=\wd2
        \endgroup
-       \@EAEAEA\gobbleoneargument
+       \doubleexpandafter\gobbleoneargument
      \else
        \endgroup
      \fi
@@ -220,8 +220,8 @@
 
 \unexpanded\def\dimension#1%
   {\begingroup
-   \global\let\savedthedimensionprefix\thedimensionprefix
-   \global\let\savedthedimensionpower\thedimensionpower
+   \glet\savedthedimensionprefix\thedimensionprefix
+   \glet\savedthedimensionpower\thedimensionpower
    \unexpanded\def\dimension##1{\global\nesteddimensiontrue}%
    \let\dimensionprefix\dimension
    \let\dimensionmidfix\dimension
@@ -229,8 +229,8 @@
    \let\dimensionpower \dimension
    \global\nesteddimensionfalse
    \setbox\scratchbox\hbox{\ustartmathmode#1\ustopmathmode}% pre-roll
-   \global\let\thedimensionprefix\savedthedimensionprefix
-   \global\let\thedimensionpower \savedthedimensionpower
+   \glet\thedimensionprefix\savedthedimensionprefix
+   \glet\thedimensionpower \savedthedimensionpower
    \endgroup
    \ifnesteddimension#1\else\dodimension{#1}\fi}
 
@@ -278,8 +278,8 @@
    \else
      \hskip\dimensionpowersignal
    \fi
-   \global\let\thedimensionprefix\empty
-   \global\let\thedimensionpower\empty}
+   \glet\thedimensionprefix\empty
+   \glet\thedimensionpower\empty}
 
 %D \macros
 %D   {dontbreakdimension,
diff --git a/tex/context/modules/mkiv/ppchtex.mkiv b/tex/context/modules/mkiv/ppchtex.mkiv
index d1167d414..5348d2e1a 100644
--- a/tex/context/modules/mkiv/ppchtex.mkiv
+++ b/tex/context/modules/mkiv/ppchtex.mkiv
@@ -1747,7 +1747,7 @@
 
 \def\dosimplechemicalA#1#2#3% % evt: {#1,\relax}
   {\let\chemicalspace=\relax
-   \@EA\dosimplechemical\@EA{\@@chemicalchemicaloffset,#1}{#2}{#3}%
+   \expandafter\dosimplechemical\expandafter{\@@chemicalchemicaloffset,#1}{#2}{#3}%
    \egroup}
 
 \def\dosimplechemicalB#1#2#3%
@@ -1849,9 +1849,9 @@
    \setevalue{\??chemical\c!text\the\levchemical}{\the\txtchemical}%
    \txtchemical=0
    \dodochemical[#1][#2]%
-   % \@EA\txtchemical\@EA\csname\??chemical\c!text\the\levchemical\endcsname
+   % \expandafter\txtchemical\expandafter\csname\??chemical\c!text\the\levchemical\endcsname
    \txtchemical\csname\??chemical\c!text\the\levchemical\endcsname
-   \@EA\let\@EA\unknownchemical\csname\??chemical\s!unknown\the\levchemical\endcsname
+   \expandafter\let\expandafter\unknownchemical\csname\??chemical\s!unknown\the\levchemical\endcsname
    \advance\levchemical -1
    %\egroup
    \ignorespaces}
@@ -2099,7 +2099,7 @@
      \verchemical=\getvalue{\s!chemical y1}\relax
    \else
      \restorechemicalvalues{\getvalue{\s!chemical n\the\chemicalstack}}%
-     %\@EA\let\@EA\@@chemicalpostponed\@EA=\csname\s!chemical p\the\chemicalstack\endcsname
+     %\expandafter\let\expandafter\@@chemicalpostponed\expandafter=\csname\s!chemical p\the\chemicalstack\endcsname
      \let\@@chemicalpostponed=\relax
      \horchemical=\getvalue{\s!chemical x\the\chemicalstack}\relax
      \verchemical=\getvalue{\s!chemical y\the\chemicalstack}\relax
diff --git a/tex/context/modules/mkiv/s-article-basic.mkiv b/tex/context/modules/mkiv/s-article-basic.mkiv
index 69a577961..677867381 100644
--- a/tex/context/modules/mkiv/s-article-basic.mkiv
+++ b/tex/context/modules/mkiv/s-article-basic.mkiv
@@ -11,6 +11,21 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+
+% \usemodule[article-basic,article-titletop]
+% \usemodule[article-basic,article-titlepage]
+%
+% \startdocument
+%   [title={Some title},
+%    subject={Some Subject},
+%    author={Hans \& Ton},
+%    affiliation={PRAGMA ADE},
+%    date=\currentdate]
+%
+%     \samplefile{ward}
+%
+% \stopdocument
+
 \startmodule[article-basic]
 
 \unprotect
@@ -70,6 +85,10 @@
 \setuplist
   [\c!interaction=\v!all]
 
+\setupdocument
+  [\c!before=\directsetup{document:titlepage}]
+
 \protect
 
 \stopmodule
+
diff --git a/tex/context/modules/mkiv/s-article-titlepage.mkiv b/tex/context/modules/mkiv/s-article-titlepage.mkiv
new file mode 100644
index 000000000..abfb957c2
--- /dev/null
+++ b/tex/context/modules/mkiv/s-article-titlepage.mkiv
@@ -0,0 +1,65 @@
+%D \module
+%D   [      file=s-article-titlepage,
+%D        version=2018.05.20,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Article Title Page,
+%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.
+
+\startmodule[article-titlepage]
+
+\unprotect
+
+% \startalignment[middle]
+%     \let\\=\par
+%     \bfb
+%     \setupinterlinespace
+%     \documentvariable {subject}
+%     \par
+% \stopalignment
+
+\defineframed
+  [titlepageframed]
+  [\c!frame=\v!off,
+   \c!align=\v!middle]
+
+\startsetups document:titlepage
+    \startstandardmakeup[\c!align=\v!middle]
+        \doifdocumentvariable {title} {
+            \dontleavehmode \titlepageframed
+                [\c!foregroundstyle=\bfd\setupinterlinespace]
+                {\documentvariable {title}}
+        }
+        \doifdocumentvariable {subject} {
+            \blank[2*\v!big]
+            \dontleavehmode \titlepageframed
+                [\c!foregroundstyle=\bfb\setupinterlinespace]
+                {\documentvariable {subject}}
+        }
+        \doifdocumentvariable {author} {
+            \blank[4*\v!big]
+            \dontleavehmode \titlepageframed
+                [\c!foregroundstyle=\bfa\setupinterlinespace]
+                {\documentvariable {author}}
+        }
+        \vfill
+        \doifdocumentvariable {affiliation} {
+            \dontleavehmode \titlepageframed
+                [\c!foregroundstyle=\bfa\setupinterlinespace]
+                {\documentvariable {affiliation}}
+        }
+        \doifdocumentvariable {date} {
+            \blank[\v!big]
+            \dontleavehmode \titlepageframed
+                [\c!foregroundstyle=\bfa\setupinterlinespace]
+                {\documentvariable {date}}
+        }
+    \stopstandardmakeup
+\stopsetups
+
+\stopmodule
diff --git a/tex/context/modules/mkiv/s-article-titletop.mkiv b/tex/context/modules/mkiv/s-article-titletop.mkiv
new file mode 100644
index 000000000..e68bed79b
--- /dev/null
+++ b/tex/context/modules/mkiv/s-article-titletop.mkiv
@@ -0,0 +1,68 @@
+%D \module
+%D   [      file=s-article-titletop,
+%D        version=2018.05.20,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=Article Top Title,
+%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.
+
+\startmodule[article-titletop]
+
+\unprotect
+
+\defineframed
+  [titlepageframed]
+  [\c!frame=\v!off,
+   \c!align=\v!middle]
+
+\startsetups document:titlepage
+    \setupheader[\c!state=\v!high]
+    \start
+        \forgetall
+        \startalignment[\v!middle]
+            \doifdocumentvariable {title} {
+                \dontleavehmode \titlepageframed
+                    [\c!foregroundstyle=\bfd\setupinterlinespace]
+                    {\documentvariable {title}}
+                \par
+            }
+            \doifdocumentvariable {subject} {
+                \dontleavehmode \titlepageframed
+                    [\c!foregroundstyle=\bfb\setupinterlinespace]
+                    {\documentvariable {subject}}
+                \par
+            }
+            \doifdocumentvariable {author} {
+                \dontleavehmode \titlepageframed
+                    [\c!foregroundstyle=\bfa\setupinterlinespace]
+                    {\documentvariable {author}}
+            \par
+            }
+            \doifdocumentvariable {affiliation} {
+                \dontleavehmode \titlepageframed
+                    [\c!foregroundstyle=\bfa\setupinterlinespace]
+                    {\documentvariable {affiliation}}
+            \par
+            }
+            \doifdocumentvariable {date} {
+                \dontleavehmode \titlepageframed
+                    [\c!foregroundstyle=\bfa\setupinterlinespace]
+                    {\documentvariable {date}}
+            \par
+            }
+            \blank[3*\v!big]
+        \stopalignment
+    \stop
+\stopsetups
+
+\setupdocument
+  [\c!before=\directsetup{document:titlepage}]
+
+\protect
+
+\stopmodule
diff --git a/tex/context/modules/mkiv/s-fonts-shapes.mkiv b/tex/context/modules/mkiv/s-fonts-shapes.mkiv
index d05438f3d..05515ae37 100644
--- a/tex/context/modules/mkiv/s-fonts-shapes.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-shapes.mkiv
@@ -30,7 +30,7 @@
 \startsetups module:showallglyphshapes:start
 
     \unexpanded\def\modulefontsstartshowglyphshape##1##2##3{
-        \startTEXpage[\c!offset=\exheight,\c!frame=\v!on]
+        \startTEXpage[\c!offset=\exheight] % ,\c!frame=\v!on]
         \edef\lastshownglyphshapefieldunicode{##1}%
         \edef\lastshownglyphshapefieldname   {##2}%
         \edef\lastshownglyphshapefieldindex  {##3}%
diff --git a/tex/context/modules/mkiv/x-mathml.mkiv b/tex/context/modules/mkiv/x-mathml.mkiv
index ea7f7d2e9..adc494314 100644
--- a/tex/context/modules/mkiv/x-mathml.mkiv
+++ b/tex/context/modules/mkiv/x-mathml.mkiv
@@ -350,7 +350,7 @@
 %
 % \def\postponedMMLactions
 %   {\global\setfalse\somepostponedMMLactions
-%    \@EA\global\@EA\@@postponedMMLactions\@EA\emptytoks
+%    \expandafter\global\expandafter\@@postponedMMLactions\expandafter\emptytoks
 %    \the\@@postponedMMLactions}
 
 \startxmlsetups mml:apply