stable 2004.06.10

3 files changed, 69 insertions, 72 deletions

diff --git a/tex/generic/context/m-metapo.tex b/tex/generic/context/m-metapo.tex
index 5a1baa3d3..a71c91910 100644
--- a/tex/generic/context/m-metapo.tex
+++ b/tex/generic/context/m-metapo.tex
@@ -41,7 +41,7 @@
 
 %D An example of using this module is given below: 
 %D 
-%D \starttypen
+%D \starttyping
 %D \documentclass[10pt]{article}
 %D 
 %D \usepackage{graphicx}
@@ -51,7 +51,7 @@
 %D   \includeMPgraphics{somefile.1}
 %D   \includeMPgraphics[angle=90]{somefile.2}
 %D \end{document}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This module needs \type {supp-mps} and \type {supp-mis}, 
 %D that both are present in the \CONTEXT\ path.
diff --git a/tex/generic/context/mptopdf.tex b/tex/generic/context/mptopdf.tex
index 8929ac1e4..97f2890a6 100644
--- a/tex/generic/context/mptopdf.tex
+++ b/tex/generic/context/mptopdf.tex
@@ -17,15 +17,15 @@
 %D
 %D First generate a format, which in \WEBC\ looks like:
 %D
-%D \starttypen 
+%D \starttyping 
 %D pdftex --ini mptopdf 
-%D \stoptypen 
+%D \stoptyping 
 %D
 %D or: 
 %D
-%D \starttypen 
+%D \starttyping 
 %D texexec --make --tex=pdftex --format=mptopdf --alone 
-%D \stoptypen 
+%D \stoptyping 
 %D
 %D Since this conversion only works with \PDFTEX\ or \PDFETEX, 
 %D the session is aborted when another \TEX\ is used. When 
@@ -34,9 +34,9 @@
 %D
 %D The conversion itself is accomplished by: 
 %D
-%D \starttypen 
+%D \starttyping 
 %D pdftex &mptopdf \relax filename.number 
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D The \type {\relax} is needed since we don't want to process
 %D the file directly. Instead we pick up the filename using
@@ -46,20 +46,20 @@
 %D available in the file \type {filename.pdf}. This conversion
 %D process is roughly compatible with: 
 %D
-%D \starttypen 
+%D \starttyping 
 %D texexec --pdf --fig=c --result=filename filename.number
-%D \stoptypen 
+%D \stoptyping 
 %D
 %D This uses \CONTEXT, and is therefore slower. Therefore, 
 %D we provide a small \PERL\ script that does a faster job, 
 %D using the minimal format. Given that a format is 
 %D generated, one can say: 
 %D
-%D \starttypen 
+%D \starttyping 
 %D mptopdf somefile  
 %D mptopdf somefile.123
 %D mptopdf mp*.* 
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D The results are copied into files named \type 
 %D {somefile-number}. This mechanism will also be available 
diff --git a/tex/generic/context/ppchtex.noc b/tex/generic/context/ppchtex.noc
index 12cc676af..4ae710279 100644
--- a/tex/generic/context/ppchtex.noc
+++ b/tex/generic/context/ppchtex.noc
@@ -9,38 +9,37 @@
 %D    suggestions={Tobias Burnus, Dirk Kuypers \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See licen-en.pdf for 
-%C details. 
-
-%D This module facilitates the use of \PPCHTEX\ in macro 
-%D packages other than \CONTEXT. One of the features of 
-%D \CONTEXT\ is that the user interface can be in any 
-%D language. This language is defined at loading time. 
-%D 
-%D This module is indeed a surrogate one and is only a poor 
-%D man's alternative to the more extensive \type{mult-***} 
-%D modules of \CONTEXT. The extra overhead in terms of macros 
-%D and functionality that these modules offer is only useful 
-%D in \CONTEXT. 
-%D 
-%D Two interfaces are supported here, but others can easily be 
+%C therefore copyrighted by \PRAGMA. See licen-en.pdf for
+%C details.
+
+%D This module facilitates the use of \PPCHTEX\ in macro
+%D packages other than \CONTEXT. One of the features of
+%D \CONTEXT\ is that the user interface can be in any
+%D language. This language is defined at loading time.
+%D
+%D This module is indeed a surrogate one and is only a poor
+%D man's alternative to the more extensive \type{mult-***}
+%D modules of \CONTEXT. The extra overhead in terms of macros
+%D and functionality that these modules offer is only useful
+%D in \CONTEXT.
+%D
+%D Two interfaces are supported here, but others can easily be
 %D defined. This module expects the general system macros to be
-%D loaded as wel as a interface switch \type{\ifalternativeinterface} 
-%D to be set. 
+%D loaded as wel as a interface switch \type{\ifalternativeinterface}
+%D to be set.
 
 %D First we load some auxiliary macro's:
 
 \input supp-mis.tex  \let\writestatus\undefined
-\input syst-gen.tex 
+\input syst-gen.tex
 
-%D after which we can go on with: 
+%D after which we can go on with:
 
 \unprotect
 
-%D 0 = english 
-%D 1 = dutch 
-%D 2 = german 
-%D 3 = czech (not yet implemented here)
+%D 0 = english
+%D 1 = dutch
+%D 2 = german
 
 \ifx\interfacenumber\undefined
   \chardef\interfacenumber=0
@@ -52,40 +51,40 @@
 \def\definesystemconstant #1 %
   {\setvalue{s!#1}{#1}}
 
-\def\definevariable #1 #2 #3 %
+\def\definevariable #1 #2 #3 % en nl de
   {\ifcase\interfacenumber
-     \setvalue{v!#2}{#1}
+     \setvalue{v!#1}{#1}
    \or
-     \setvalue{v!#2}{#2}
+     \setvalue{v!#1}{#2}
    \or
-     \setvalue{v!#2}{#3}
+     \setvalue{v!#1}{#3}
    \fi}
 
-\def\defineconstant #1 #2 #3 %
+\def\defineconstant #1 #2 #3 % en nl de
   {\ifcase\interfacenumber
-     \setvalue{c!#2}{#2} 
      \setvalue{c!#1}{#2}
-   \or
      \setvalue{c!#2}{#2}
    \or
-     \setvalue{c!#2}{#2} 
+     \setvalue{c!#1}{#2}
+   \or
+     \setvalue{c!#1}{#2}
      \setvalue{c!#3}{#2}
    \fi}
 
 \def\definecommand #1 #2 #3 %
   {\ifcase\interfacenumber
-     % core commands are english 
+     % core commands are english
    \or
      \doifnot{#1}{#2}{\setvalue{#2}{\getvalue{#1}}}
    \or
      \doifnot{#1}{#3}{\setvalue{#3}{\getvalue{#1}}}
    \fi}
 
-\long\def\startcommands#1\stopcommands%
+\long\def\startcommands#1\stopcommands
   {}
 
 \def\dosetvalue#1#2#3%
-  {\p!doifundefined{\c!prefix!#2}% 
+  {\p!doifundefined{\c!prefix!#2}%
      \let\donottest=\doprocesstest
      \@EA\def\csname#1#2\endcsname{#3}%
    \else
@@ -124,7 +123,7 @@
 \defineconstant width           breedte          breite
 \defineconstant size            formaat          groesse
 \defineconstant number          getal            nummer
-\defineconstant height          hoogte           hoehe   
+\defineconstant height          hoogte           hoehe
 \defineconstant frame           kader            rahmen
 %defineconstant framecolor      kaderkleur       rahmenfarbe
 \defineconstant color           kleur            farbe
@@ -132,24 +131,24 @@
 \defineconstant style           letter           schriftstil
 \defineconstant rulethickness   lijndikte        liniendicke
 \defineconstant rulecolor       lijnkleur        linienfarbe
-\defineconstant left            links            links 
+\defineconstant left            links            links
 \defineconstant offset          offset           offset
 \defineconstant bottom          onder            unten
 \defineconstant option          optie            option
 \defineconstant location        plaats           platz
 \defineconstant right           rechts           rechts
 \defineconstant resolution      resolutie        aufloesung
-\defineconstant scale           schaal           format 
+\defineconstant scale           schaal           format
 \defineconstant status          status           status
 \defineconstant text            tekst            text
 \defineconstant textcolor       tekstkleur       tekstfarbe
-\defineconstant textsize        tekstformaat     textgroesse       
+\defineconstant textsize        tekstformaat     textgroesse
 \defineconstant alternative     variant          alternative
 \defineconstant x               x                x
 \defineconstant y               y                y
 
 \definevariable on              aan              an
-\definevariable big             groot            gross 
+\definevariable big             groot            gross
 \definevariable intext          intekst          imtext
 \definevariable small           klein            klein
 \definevariable medium          middel           mittel
@@ -159,53 +158,51 @@
 \definevariable test            test             test
 \definevariable off             uit              aus
 
-\definecommand  definechemical  definieerchemie  definierechemie 
-\definecommand  setupchemical   stelchemiein     stellechemieein 
-\definecommand  chemical        chemie           chemie          
-\definecommand  tochemical      naarchemie       zurchemie        
-\definecommand  startchemical   startchemie      startchemie     
-\definecommand  stopchemical    stopchemie       stopchemie      
-\definecommand  toptext         boventekst       textueber 
+\definecommand  definechemical  definieerchemie  definierechemie
+\definecommand  setupchemical   stelchemiein     stellechemieein
+\definecommand  chemical        chemie           chemie
+\definecommand  tochemical      naarchemie       zurchemie
+\definecommand  startchemical   startchemie      startchemie
+\definecommand  stopchemical    stopchemie       stopchemie
+\definecommand  toptext         boventekst       textueber
 \definecommand  bottext         ondertekst       textunter
 \definecommand  midtext         middentekst      textmitte
 
 \protect
 
-%D After those definitions we actually load \PPCHTEX: 
+%D After those definitions we actually load \PPCHTEX:
 
 \input ppchtex.tex
 
-%D We also change some setup values. Let's hope that the next 
-%D setups forever suits \LATEX. 
+%D We also change some setup values. Let's hope that the next
+%D setups forever suits \LATEX.
 
 \unprotect
 
 \ifx\bodyfontsize\undefined
   \ifx\f@size\undefined
     \ifx\@ptsize\undefined
-      \setupchemical[\c!korps=11pt]
+      \setupchemical[\c!bodyfont=11pt]
     \else
-      \setupchemical[\c!korps=1\@ptsize pt]
+      \setupchemical[\c!bodyfont=1\@ptsize pt]
     \fi
   \else
-    \setupchemical[\c!korps=\f@size pt]
+    \setupchemical[\c!bodyfont=\f@size pt]
   \fi
 \else
-  \setupchemical[\c!korps=\bodyfontsize]
+  \setupchemical[\c!bodyfont=\bodyfontsize]
 \fi
 
 \ifx\mathrm\undefined
-  \setupchemical[\c!letter=\rm]
+  \setupchemical[\c!style=\rm]
 \else
-  \setupchemical[\c!letter=\mathrm]
+  \setupchemical[\c!style=\mathrm]
 \fi
 
 \ifx\outputresolution\undefined
-  \setupchemical[\c!resolutie=300]
+  \setupchemical[\c!resolution=300]
 \else
-  \setupchemical[\c!resolutie=\outputresolution]
+  \setupchemical[\c!resolution=\outputresolution]
 \fi
 
-\protect 
-
-\endinput
+\protect \endinput