From 0fece0253ad71930dc23890d1ae3e1f76b296acb Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Wed, 12 Jan 2005 00:00:00 +0100 Subject: stable 2005.01.12 --- tex/context/base/colo-ini.tex | 33 +- tex/context/base/colo-pra.tex | 77 - tex/context/base/cont-new.tex | 425 +- tex/context/base/cont-usr.ori | 3 + tex/context/base/context.tex | 2 +- tex/context/base/core-con.tex | 65 +- tex/context/base/core-fig.tex | 64 +- tex/context/base/core-fnt.tex | 10 +- tex/context/base/core-grd.tex | 42 + tex/context/base/core-int.tex | 46 +- tex/context/base/core-lst.tex | 356 +- tex/context/base/core-ltb.tex | 58 +- tex/context/base/core-mis.tex | 191 +- tex/context/base/core-new.tex | 15 + tex/context/base/core-ntb.tex | 179 +- tex/context/base/core-ref.tex | 8 +- tex/context/base/core-reg.tex | 124 +- tex/context/base/core-sec.tex | 34 +- tex/context/base/core-spa.tex | 39 +- tex/context/base/core-syn.tex | 6 +- tex/context/base/core-sys.tex | 51 +- tex/context/base/enco-ini.tex | 9 +- tex/context/base/enco-pdf.tex | 182 + tex/context/base/hand-def.tex | 36 +- tex/context/base/hand-ini.tex | 125 +- tex/context/base/lang-vn.tex | 22 +- tex/context/base/m-subsub.tex | 123 + tex/context/base/math-ini.tex | 53 +- tex/context/base/math-run.tex | 2 +- tex/context/base/mult-com.tex | 10 +- tex/context/base/mult-con.tex | 3 + tex/context/base/mult-sys.tex | 1 + tex/context/base/page-flt.tex | 135 +- tex/context/base/page-imp.tex | 6 +- tex/context/base/page-ini.tex | 100 +- tex/context/base/page-lin.tex | 20 +- tex/context/base/page-one.tex | 133 - tex/context/base/page-set.tex | 46 +- tex/context/base/ppchtex.tex | 6 +- tex/context/base/s-abr-01.tex | 2 + tex/context/base/s-mod-00.tex | 14 +- tex/context/base/setupa.tex | 739 --- tex/context/base/setupb.tex | 9077 ------------------------------------- tex/context/base/setupd.tex | 184 - tex/context/base/setupe.tex | 324 -- tex/context/base/spec-fdf.tex | 34 +- tex/context/base/spec-tpd.tex | 42 +- tex/context/base/supp-box.tex | 99 +- tex/context/base/supp-dir.tex | 3 +- tex/context/base/supp-fil.tex | 53 +- tex/context/base/symb-nav.tex | 36 +- tex/context/base/syst-ext.tex | 87 +- tex/context/base/syst-gen.tex | 8 +- tex/context/base/syst-new.tex | 126 +- tex/context/base/type-enc.tex | 129 +- tex/context/base/type-exa.tex | 79 +- tex/context/base/type-map.tex | 12 +- tex/context/base/type-siz.tex | 210 +- tex/context/base/type-syn.tex | 202 +- tex/context/base/unic-032.tex | 2 +- tex/context/base/x-set-11.tex | 4 +- tex/context/base/x-set-12.tex | 2 +- tex/context/base/xtag-ini.tex | 5 +- tex/context/bib/bibl-apa.tex | 379 ++ tex/context/bib/bibl-aps.tex | 431 ++ tex/context/bib/t-bib.tex | 1177 +++++ tex/context/bib/t-bibltx.tex | 75 + tex/context/config/cont-usr.tex | 3 + tex/context/interface/cont-cz.xml | 1008 ++-- tex/context/interface/cont-de.xml | 988 ++-- tex/context/interface/cont-en.xml | 4 + tex/context/interface/cont-it.xml | 1044 ++--- tex/context/interface/cont-nl.xml | 1042 ++--- tex/context/interface/cont-ro.xml | 1014 ++--- tex/context/interface/keys-cz.xml | 7 +- tex/context/interface/keys-de.xml | 7 +- tex/context/interface/keys-en.xml | 7 +- tex/context/interface/keys-it.xml | 7 +- tex/context/interface/keys-nl.xml | 9 +- tex/context/interface/keys-ro.xml | 7 +- tex/generic/context/ppchtex.noc | 12 +- 81 files changed, 7065 insertions(+), 14469 deletions(-) delete mode 100644 tex/context/base/colo-pra.tex create mode 100644 tex/context/base/m-subsub.tex delete mode 100644 tex/context/base/setupa.tex delete mode 100644 tex/context/base/setupb.tex delete mode 100644 tex/context/base/setupd.tex delete mode 100644 tex/context/base/setupe.tex create mode 100644 tex/context/bib/bibl-apa.tex create mode 100644 tex/context/bib/bibl-aps.tex create mode 100644 tex/context/bib/t-bib.tex create mode 100644 tex/context/bib/t-bibltx.tex (limited to 'tex') diff --git a/tex/context/base/colo-ini.tex b/tex/context/base/colo-ini.tex index 93c258897..e7c5a5a8f 100644 --- a/tex/context/base/colo-ini.tex +++ b/tex/context/base/colo-ini.tex @@ -239,6 +239,13 @@ % \let\@@cl@@t\@@cl@@z\let\@@cl@@a\@@cl@@z % \let\@@cl@@h\empty \let\@@cl@@n\empty} +% r g b : rbg +% c m y k : cmyk +% s : gray +% p n d f : spot +% h : hexadecimal +% t a : transparency + \def\@@resetcolorparameters {\let\@@cl@@r\@@cl@@z \let\@@cl@@g\@@cl@@z \let\@@cl@@b\@@cl@@z \let\@@cl@@c\@@cl@@z \let\@@cl@@m\@@cl@@z \let\@@cl@@y\@@cl@@z \let\@@cl@@k\@@cl@@z @@ -422,8 +429,14 @@ \scratchcounter\zerocount \processcommacommand[#2]\dododefinemultitonecolor \bgroup - \lccode`\.=`\_\lccode`\,=`\_\lccode`\:=`\_\lccode`\;=`\_% - \lccode`\+=`\_\lccode`\-=`\_\lccode`\*=`\_\lccode`\/=`\_% + \lccode`\.=`\_% + \lccode`\,=`\_% + \lccode`\:=`\_% + \lccode`\;=`\_% + \lccode`\+=`\_% + \lccode`\-=`\_% + \lccode`\*=`\_% + \lccode`\/=`\_% % not needed, other attribute in driver: % % \@@resetcolorparameters @@ -821,9 +834,9 @@ % \exectransparency} \def\doexeccolorP#1:#2:#3:#4:% - {\edef\@@cl@@n{#1}% - \edef\@@cl@@f{#2}% - \edef\@@cl@@d{#3}% + {\edef\@@cl@@n{#1}% name + \edef\@@cl@@f{#2}% fractions + \edef\@@cl@@d{#3}% definitions \edef\@@cl@@p{#4}% \ifx\@@cl@@d\empty \let\@@cl@@d\@@cl@@n @@ -1101,10 +1114,12 @@ \flushatshipout{\hbox{\localcolortrue\color[#1]}}% index one \egroup} -\def\checkpredefinedcolor[#1]% - {\ifcase\internalspotcolorsize{#1}\relax - \@EA\predefinecolor\or\@EA\predefinecolor\else\@EA\predefineindexcolor - \fi[#1]} +% \def\checkpredefinedcolor[#1]% +% {\ifcase\internalspotcolorsize{#1}\relax +% \@EA\predefinecolor\or\@EA\predefinecolor\else\@EA\predefineindexcolor +% \fi[#1]} + +\let\checkpredefinedcolor\predefineindexcolor % we need an index in order to negate bitmaps %D \startbuffer %D \definecolor [blue] [c=1,m=.38,y=0,k=.64] % pantone pms 2965 uncoated m diff --git a/tex/context/base/colo-pra.tex b/tex/context/base/colo-pra.tex deleted file mode 100644 index b7717cb75..000000000 --- a/tex/context/base/colo-pra.tex +++ /dev/null @@ -1,77 +0,0 @@ -%D \module -%D [ file=colo-pra, -%D version=1997.01.03, -%D title=\CONTEXT\ Color Macros, -%D subtitle=PRAGMA, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] -%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 module is not meant for third party use and defines -%D some \PRAGMA\ specific colors. - -% company colors - -\definecolor [pragmaburcolor] [r=1,g=.62,b=.06] % (Pantone 138 CV) -\definecolor [pragmaburkleur] [pragmaburcolor] - -\definecolor [pragmaadecolor] [r=1,g=.62,b=.06] % (Pantone 138 CV) -\definecolor [pragmaadekleur] [pragmaadecolor] - -\definecolor [pragmapodcolor] [r=.6,g=.7,b=.8] % (no pantone here) -\definecolor [pragmapodkleur] [pragmapodcolor] - -\definecolor [pragmacolor] [pragmaburcolor] -\definecolor [pragmakleur] [pragmaburcolor] - -% pretty printing - -\definecolor [texprettyone] [r=.8,g=0, b=0] % red -\definecolor [texprettytwo] [r=0, g=.6,b=0] % green -\definecolor [texprettythree] [r=.0,g=.0,b=.9] % blue -\definecolor [texprettyfour] [r=.8,g=.8,b=.6] % yellow - -% all kind of colors - -\definecolor [BackgroundColor] [r=1, g=1, b=.7] -\definecolor [InteractionColor] [r=.1, g=.5, b=.8] - -\definecolor [AchtergrondKleur] [BackgroundColor] -\definecolor [InteractieKleur] [InteractionColor] - -\definecolor [DemoRed] [r=1,g=.6,b=.6] -\definecolor [DemoRood] [DemoRed] - -\definecolor [DemoBlue] [r=.6,g=.8,b=1] -\definecolor [DemoBlauw] [DemoBlue] - -\definecolor [DemoYellow] [BackgroundColor] -\definecolor [DemoGeel] [BackgroundColor] - -% more colors - -\definecolor [cyaan:x] [r=.3,g=.85,b=1] -\definecolor [cyaan:y] [r=.4,g=.80,b=1] -\definecolor [cyaan:z] [r=.5,g=.75,b=1] - -% even more colors - -\definecolor [screenred] [r=.8] -\definecolor [screengreen] [g=.8] -\definecolor [screenblue] [r=.8] -\definecolor [screencyan] [g=.8,b=.8] -\definecolor [screenmagenta] [r=.8,b=.8] -\definecolor [screenyellow] [r=.8,g=.8] - -\definecolor [schermrood] [screenred] -\definecolor [schermgroen] [screengreen] -\definecolor [schermblauw] [screenblue] -\definecolor [schermcyaan] [screencyan] -\definecolor [schermmagenta] [screenmagenta] -\definecolor [schermgeel] [screenyellow] - -\endinput diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 8b21feee7..787bbd111 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -16,6 +16,7 @@ %D features. % todo: mp-new +% caption: grid=top|bottom in xml defs \unprotect @@ -23,6 +24,39 @@ \ifx\normalcompound\undefined \let\normalcompound=| \fi +\beginETEX + +% fallback to math when in text mode (handy for unicode vectors) + +\def\dohandlemathtoken#1% + {\csname + \ifmmode + \ifcsname\@mt@\mathcollection#1\endcsname + \@mt@\mathcollection + \else\ifcsname\@mt@\nomathcollection#1\endcsname + \@mt@\nomathcollection + \else\ifcsname\characterencoding#1\endcsname + \characterencoding + \else + \nocharacterencoding + \fi\fi\fi + \else + \ifcsname\characterencoding#1\endcsname + \characterencoding + \else\ifcsname\nocharacterencoding#1\endcsname + \nocharacterencoding + \else\ifcsname\@mt@\mathcollection#1\endcsname + \strippedcsname\mathematics\expandafter\endcsname\csname\@mt@\mathcollection + \else\ifcsname\@mt@\nomathcollection#1\endcsname + \strippedcsname\mathematics\expandafter\endcsname\csname\@mt@\nomathcollection + \else + \nocharacterencoding + \fi\fi\fi\fi + \fi + #1\endcsname} + +\endETEX + \def\defXMLattributestring#1#2#3#4% {\ifcsname\@@XMLvariable:#2:#3\endcsname \@EA\convertcommand\csname\@@XMLvariable:#2:#3\endcsname\to#1% @@ -38,54 +72,6 @@ \gdef\parseXMLattributes #1#2{\dogetXMLarguments{#1}#2>} \egroup - -\def\setupTBLcell#1#2% cell over col over row - {\setupTBLsection % already forgotten - \getvalue{\@@tblprefix\c!y\v!each}% - \getvalue{\@@tblprefix\c!x\v!each}% - \getvalue{\@@tblprefix\c!y\v!oddeven{#1}}% - \getvalue{\@@tblprefix\c!x\v!oddeven{#2}}% - \getvalue{\@@tblprefix\c!x\v!oddeven{#2}\c!y\v!oddeven{#1}}% - \ifnum#1=\plusone - \getvalue{\@@tblprefix\c!y\v!first}% - \executeifdefined{\@@tblprefix\c!x#2\c!y\v!first}\donothing - \fi - \ifnum#2=\plusone - \getvalue{\@@tblprefix\c!x\v!first}% - \executeifdefined{\@@tblprefix\c!x\v!first\c!y#1}\donothing - \fi - \ifnum#1=\maximumrow\relax - \getvalue{\@@tblprefix\c!y\v!last}% - \executeifdefined{\@@tblprefix\c!x#2\c!y\v!last}\donothing - \fi - \ifnum#2=\maximumcol\relax - \getvalue{\@@tblprefix\c!x\v!last}% - \executeifdefined{\@@tblprefix\c!x\v!last\c!y#1}\donothing - \fi - \ifnum#1=\maximumrow\relax\ifnum#2=\maximumcol\relax - \getvalue{\@@tblprefix\c!x\v!last\c!y\v!last}% - \fi\fi - \ifnum#1=\plusone \ifnum#2=\plusone - \getvalue{\@@tblprefix\c!x\v!first\c!y\v!first}% - \fi\fi - \ifnum#1>\noftblhdnxlines\else - \executeifdefined{\@@tblprefix\v!header\v!each}\donothing - \executeifdefined{\@@tblprefix\v!header#2}\donothing - \fi - \executeifdefined{\@@tblprefix\c!y#1}\donothing -\getvalue{\@@tbl\@@tbl\c!extras}\letvalue{\@@tbl\@@tbl\c!extras}\relax - \executeifdefined{\@@tblprefix\c!x#2}\donothing -\getvalue{\@@tbl\@@tbl\c!extras}\letvalue{\@@tbl\@@tbl\c!extras}\relax - \executeifdefined{\@@tblprefix\c!x#2\c!y#1}\donothing - \global\letcscsname\@@tblsplitafter\csname\@@tbl\@@tbl\c!after\endcsname - \relax} - -\newbox\@@dlhbox - -\def\dontleavehmode - {\ifhmode\else \ifmmode\else - \setbox\@@dlhbox\hbox{\mathsurround\zeropoint\everymath\emptytoks$ $}\unhbox\@@dlhbox - \fi \fi} % in xtag-ini: @@ -262,19 +248,6 @@ \egroup \dodoglobal\let#1\globalascii} -\def\resetsetups[#1]% - {\ifundefined{\??su\ifgridsnapping\v!grid\fi:#1}% - \letbeundefined{\??su:#1}% - \else - \letbeundefined{\??su\ifgridsnapping\v!grid\fi:#1}% - \fi} - -% \def\resetsetups[#1]% -% {\letbeundefined -% {\??su:% -% \ifundefined{\??su\ifgridsnapping\v!grid\fi:#1}#1\else\ifgridsnapping\v!grid\fi% -% #1}} - \ifx\pagediscards\undefined \let\pagediscards\relax \fi \installoutput\synchronizeoutput % maybe add pagediscards @@ -283,69 +256,6 @@ \pagediscards \fi} -\def\testpage {\dotripleempty\dotestpage[\plusone]} -\def\testpageonly {\dotripleempty\dotestpage[\plustwo]} - -\chardef\testpagetrigger=0 - -\def\dotestpage[#1][#2][#3]% - {%\relax % needed before \if - \ifpaginageblokkeerd - \endgraf - \else - % new from here - \ifcase\testpagetrigger - \endgraf - \or - \ifvmode - \dosomebreak\allowbreak - \else % indeed? - \vadjust{\allowbreak}% - \endgraf - \fi - \fi - % till here - \ifdim\pagegoal<\maxdimen \relax - \ifdim\pagetotal<\pagegoal \relax - \scratchdimen\lineheight - \multiply\scratchdimen#2\relax - \advance\scratchdimen \pagetotal - \ifdim\lastskip<\parskip - \advance\scratchdimen \parskip - \fi - \ifthirdargument - \advance\scratchdimen#3\relax - \fi - \ifcase\testpagemethod - \ifdim\scratchdimen>.99\pagegoal - \penalty-\!!tenthousand\relax - \fi - \or - \advance\scratchdimen-\pagegoal - \ifdim\scratchdimen>-\lineheight - \penalty-\!!tenthousand\relax - \fi - \or - \getnoflines\pagegoal - \advance\scratchdimen-\noflines\lineheight \relax - \ifdim\scratchdimen>-\lineheight - \penalty-\!!tenthousand\relax - \fi - \or % same as 0 but more accurate - \advance\scratchdimen-10\s!sp\relax - \ifdim\scratchdimen>\pagegoal - \penalty-\!!tenthousand\relax - \fi - \fi - \else - % force page break / new / does not work as expected - % never: \penalty-\!!tenthousand\relax - \fi - \else - \ifnum#1=\plusone\goodbreak\fi - \fi - \fi} - % temp hack, else no proper default fall back (like \textmultiply); todo: sync encoding \appendtoks @@ -361,156 +271,6 @@ % % \processseparatedlist[aap noot][]\ruledhbox -% \startbuffer -% \scratchdimen\dimexpr(3pt) \getnoflines\scratchdimen 1=\the\noflines \endgraf -% \scratchdimen\dimexpr(10\lineheight) \getnoflines\scratchdimen 10=\the\noflines \endgraf -% \scratchdimen\dimexpr(10.1\lineheight) \getnoflines\scratchdimen 11=\the\noflines \endgraf -% \scratchdimen\dimexpr(10.5\lineheight) \getnoflines\scratchdimen 11=\the\noflines \endgraf -% \scratchdimen\dimexpr(10.9\lineheight) \getnoflines\scratchdimen 11=\the\noflines \endgraf -% \scratchdimen\dimexpr(10\lineheight+3pt) \getnoflines\scratchdimen 11=\the\noflines \endgraf -% \scratchdimen\dimexpr(10\lineheight+3sp) \getnoflines\scratchdimen 10=\the\noflines \endgraf -% \scratchdimen\dimexpr(10\lineheight-3sp) \getnoflines\scratchdimen 10=\the\noflines \endgraf -% -% \scratchdimen\dimexpr(3pt) \getrawnoflines\scratchdimen 0=\the\noflines \endgraf -% \scratchdimen\dimexpr(10\lineheight) \getrawnoflines\scratchdimen 10=\the\noflines \endgraf -% \scratchdimen\dimexpr(10.1\lineheight) \getrawnoflines\scratchdimen 10=\the\noflines \endgraf -% \scratchdimen\dimexpr(10.5\lineheight) \getrawnoflines\scratchdimen 11=\the\noflines \endgraf -% \scratchdimen\dimexpr(10.9\lineheight) \getrawnoflines\scratchdimen 11=\the\noflines \endgraf -% \scratchdimen\dimexpr(10\lineheight+3pt) \getrawnoflines\scratchdimen 10=\the\noflines \endgraf -% \scratchdimen\dimexpr(10\lineheight+3sp) \getrawnoflines\scratchdimen 10=\the\noflines \endgraf -% \scratchdimen\dimexpr(10\lineheight-3sp) \getrawnoflines\scratchdimen 10=\the\noflines \endgraf -% \stopbuffer -% -% \typebuffer \getbuffer - -\ifx\roundingeps\undefined \newdimen\roundingeps \roundingeps=10sp \fi - -\def\getnoflines {\xdogetnoflines\plusone } % compensated -\def\getroundednoflines{\xdogetnoflines\plustwo } % rounded -\def\getrawnoflines {\xdogetnoflines\plusthree} % truncated - -\def\xdogetnoflines#1#2% - {\noflinesheight#2\relax - \ifzeropt\noflinesheight - \noflines\zerocount - \else\ifdim#2>\zeropoint - \ifcase#1\or - \advance\noflinesheight-\roundingeps - \divide\noflinesheight\openlineheight - \noflines\noflinesheight - \advance\noflines\plusone - \or - \advance\noflinesheight\roundingeps - \divide\noflinesheight\openlineheight - \noflines\noflinesheight - \or - \advance\noflinesheight\roundingeps - \advance\noflinesheight.5\openlineheight - \divide\noflinesheight\openlineheight - \noflines\noflinesheight - \fi - \else - \ifcase#1\or - \advance\noflinesheight\roundingeps - \divide\noflinesheight\openlineheight - \noflines\noflinesheight - \advance\noflines\minusone - \or - \advance\noflinesheight-\roundingeps - \divide\noflinesheight\openlineheight - \noflines\noflinesheight - \or - \advance\noflinesheight-\roundingeps - \advance\noflinesheight-.5\openlineheight - \divide\noflinesheight\openlineheight - \noflines\noflinesheight - \fi - \fi\fi} - -\def\splittblboxb#1% - {\scratchdimen-\extratblsplitheight - \advance\scratchdimen-\tbltblsplitoffset - \expanded{\testpage[2][\the\scratchdimen]}% quite save since a row is > 1 lineheight and we don't want one-liners - \setbox\TABLEsplitbox\vbox{#1}% - \setbox8\vbox{\doifsomething\tbltblspaceinbetween{\blanko[\tbltblspaceinbetween]}}% - \dimen8\ht8\advance\dimen8\dp8 - \ifmultipleTBLheads - \setbox2\vbox{}% - \setbox4\vbox{}% - \dorecurse\noftblheadlines - {\setbox0\vsplit\TABLEsplitbox to \lineheight - \setbox2\vbox{\unvcopy2\unvcopy0}}% - \dorecurse\noftblnextlines - {\setbox0\vsplit\TABLEsplitbox to \lineheight - \setbox4\vbox{\unvcopy4\unvcopy0}}% - \fi - \!!doneafalse - \doloop - {\ifdim\pagegoal<\maxdimen - \scratchdimen\pagegoal - \advance\scratchdimen-\pagetotal - \else - \scratchdimen\textheight - \fi - \advance\scratchdimen-\dimen8 - \advance\scratchdimen-\extratblsplitheight - \advance\scratchdimen-\tbltblsplitoffset - \setbox\finaltblbox\vbox - {\ifmultipleTBLheads - \ifcase\noftblheadlines\else - \unvcopy2 \doifsomething\tbltblspaceinbetween{\blank[\tbltblspaceinbetween]}% - \fi - \fi}% - \if!!donea\else\ifcase\noftblnextlines\else - \setbox2\box4 - \fi\fi - \!!doneatrue - % alternatively we could use a kind of balancing like splitter - % first to scratchdimen and then smaller etc; more code and copy -) - \doloop - {\setbox\scratchbox\vsplit\TABLEsplitbox to \onepoint - \setbox\scratchbox\vbox{\unvbox\scratchbox}% - \bgroup - \advance\scratchdimen-\ht\scratchbox - \advance\scratchdimen-\dp\scratchbox - \advance\scratchdimen-\ht\finaltblbox - \advance\scratchdimen-\dp\finaltblbox\relax - \ifdim\scratchdimen>\zeropoint - \egroup - \setbox\finaltblbox\vbox - {\unvbox\finaltblbox - \unvbox\scratchbox}% - \ifvoid\TABLEsplitbox \exitloop \fi - \else - \egroup - \setbox\TABLEsplitbox\vbox - {\unvbox\scratchbox - \ifvoid\TABLEsplitbox\else\unvbox\TABLEsplitbox\allowbreak\fi}% - \exitloop - \fi}% - % - \postprocessTABLEsplitbox\finaltblbox - \ifvoid\TABLEsplitbox - \beforeTABLEsplitbox - \box\finaltblbox - \afterTABLEsplitbox - \@@tblsplitafter - \exitloop - \else - % hack - \ifdim\pagegoal<\maxdimen - \scratchdimen\pagegoal - \advance\scratchdimen \lineheight - \global\pagegoal\scratchdimen - \fi - % brrr - \beforeTABLEsplitbox - \box\finaltblbox - \afterTABLEsplitbox - \@@tblsplitafter - \pagina - \fi}} - % this will be activated when % \newinsert\thispageinsert % <- installinsertion @@ -574,6 +334,26 @@ \def\stophanging {\endgraf \egroup} + +% experimental + +\def\stophangaround + {\endgraf + \egroup} + +\def\starthangaround + {\noindent\bgroup + \dowithnextbox + {\ifdim\nextboxht>\strutht\setbox\nextbox\tbox{\flushnextbox}\fi + \setbox\nextbox\hbox{\flushnextbox\hskip\@@hadistance}% + \getboxheight\scratchdimen\of\box\nextbox + \getnoflines\scratchdimen + \nextboxht\strutht + \nextboxdp\strutdp + \hangindent\nextboxwd + \hangafter-\noflines + \llap{\flushnextbox}\ignorespaces} + \hbox} \def\modevalue#1#2#3% {\@EA\ifx\csname\@mode@\systemmodeprefix#1\endcsname\endcsname\enabledmode#2\else#2\fi} @@ -587,59 +367,8 @@ {\long\def\currentcommalistcommand##1{\def\currentcommalistitem{##1}#2}% \processcommalist[#1]\currentcommalistcommand} -\long\def\startexpanded#1\stopexpanded % beware, this time no \noexpand before #1 - {\long\xdef\@@expanded{#1}\@@expanded} - % \tracefonthandlingtrue -\def\parseTR[#1][#2]% [#2] is dummy that kills spaces / no #3 argument - {\def\currentcol{0}\increment\maximumrow - \let\currentcolpos\currentcol - \let\eTR\relax - \setupTABLE[\v!row][\maximumrow][#1]} - -\long\def\parseTD[#1][#2]#3\eTD % [#2] is dummy that kills spaces - {\getparameters[\@@tbl][\c!ny=\tblnr,\c!nx=\tblnc,nc=1,nr=1,\c!n=\currentcol,#1]% - % goto first cell % NEW, n=cellnumber - \increment\currentcolpos - \doifvaluesomething{\@@tbl\c!n} - {\ifnum\getvalue{\@@tbl\c!n}=\currentcol\else - \scratchcounter\getvalue{\@@tbl\c!n}% - \advance\scratchcounter-\currentcol - \advance\scratchcounter\plusone - \expanded{\parseTD[][\c!nx=\the\scratchcounter]}\eTD - \getparameters[\@@tbl][\c!ny=\tblnr,\c!nx=\tblnc,nc=1,nr=1,\c!n=\currentcol,#1]% - \fi}% - \doloop - {\increment\currentcol - \doifnottbltag\maximumrow\currentcol\exitloop}% - % fill r*c cells and set span - \let\row\maximumrow - \let\col\currentcol - \dorecurse\tblny - {\let\col\currentcol - \settblcol\row\col\tblnx - \ifnum\tblnx>\maximumrowspan\relax - \let\maximumrowspan\tblnx - \fi - \dorecurse\tblnx - {\settbltag\row\col\tblnone - \increment\col}% - \increment\row}% - % check max column - \decrement\col - \ifnum\col>\maximumcol\relax - \let\maximumcol\col - \fi - % set values - \settbltag\maximumrow\currentcol\tblcell - \settblcol\maximumrow\currentcol\tblnx - \settblrow\maximumrow\currentcol\tblny - % save text - \edef\celltag{{\maximumrow}{\currentcol}}% - \@EA\settbltxt\@EA\maximumrow\@EA\currentcol\@EA - {\@EA\handleTBLcell\celltag[#1]{#3}}} - % new, still to be improved % % \dorecurse{10} @@ -664,6 +393,8 @@ \setuplabeltext [placeholder={, moved}] +% etex only, of course we could just parse (scan for \% in string) + \newif\ifpercentdimendone \bgroup % usage: \setpercentdimen\somedimen{% or dimen} todo: pct @@ -678,15 +409,36 @@ \catcode`%=\@@active \catcode`\\=\@@escape \let%\%| -\scratchdimen#1| -\xdef\@@expanded{\@@expanded\scratchdimen\!!zeropoint}| trick: when 1.2 => .2\scratchdimen and 0pt typeset -\startnointerference - \global\globalscratchdimen\scantokens\@EA{\@@expanded}| i'm lazy and use etex -\stopnointerference + \scratchdimen#1| + \xdef\@@expanded{\@@expanded\scratchdimen\!!zeropoint}| trick: when 1.2 => .2\scratchdimen and 0pt typeset + \startnointerference + \global\globalscratchdimen\scantokens\@EA{\@@expanded}| i'm lazy and use etex + \stopnointerference \egroup #1\globalscratchdimen \fi} \egroup + +% TEX alternative, in principle accurate enough and also a bit faster + +% \bgroup +% +% \catcode`\%=\@@other +% \catcode`\|=\@@comment +% +% \gdef\setpercentdimen#1#2| +% {\beforesplitstring#2\at%\to\ascii +% \doifelse\ascii{#2} +% {#1=#2} +% {\divide#1by100\relax#1=\ascii#1\relax}} | or: {#1=\ascii#1\divide#1by100\relax}} +% +% \egroup +% +% \dimen0=1000pt \setpercentdimen{\dimen0}{10%} \the\dimen0 +% \dimen0= 100pt \setpercentdimen{\dimen0}{10%} \the\dimen0 +% \dimen0= 95pt \setpercentdimen{\dimen0}{10%} \the\dimen0 +% \dimen0= 10pt \setpercentdimen{\dimen0}{10%} \the\dimen0 +% \dimen0= 1pt \setpercentdimen{\dimen0}{10%} \the\dimen0 \bgroup @@ -1329,9 +1081,9 @@ \let\currentrendering\empty -\definereference[StartCurrentRendering] [\v!StartRendering{\currentrendering}] -\definereference[StopCurrentRendering] [\v!StopRendering {\currentrendering}] -\definereference[PauseCurrentRendering] [\v!PauseRendering{\currentrendering}] +\definereference[StartCurrentRendering] [\v!StartRendering {\currentrendering}] +\definereference[StopCurrentRendering] [\v!StopRendering {\currentrendering}] +\definereference[PauseCurrentRendering] [\v!PauseRendering {\currentrendering}] \definereference[ResumeCurrentRendering][\v!ResumeRendering{\currentrendering}] \newcounter\nofexternalrenderings @@ -1793,11 +1545,8 @@ \def\startdisplay{\displaybreak\ignorespaces\startpacked} \def\stopdisplay {\stoppacked\displaybreak\ignorespaces} -\def\tightvbox - {\dowithnextbox{\nextboxdp\zeropoint\flushnextbox}\vbox} - -\def\tightvtop - {\dowithnextbox{\nextboxht\zeropoint\flushnextbox}\vtop} +\def\tightvbox{\dowithnextbox{\nextboxdp\zeropoint\flushnextbox}\vbox} +\def\tightvtop{\dowithnextbox{\nextboxht\zeropoint\flushnextbox}\vtop} % pretty important (esp since we now ignore shipouts) % diff --git a/tex/context/base/cont-usr.ori b/tex/context/base/cont-usr.ori index 50556c463..4d09e6414 100644 --- a/tex/context/base/cont-usr.ori +++ b/tex/context/base/cont-usr.ori @@ -53,6 +53,9 @@ \definefilesynonym [lang-en.pat] [ushyphen.tex] % symbolic name, see below \definefilesynonym [lang-us.pat] [ushyphen.tex] % symbolic name, see below +%definefilesynonym [czhyph.pat] [czhyphen.tex] % safeguard +%definefilesynonym [skhyph.pat] [skhyphen.tex] % safeguard + \definefilesynonym [lang-cz.pat] [czhyphen.tex] % in a different part of the tree, sigh \definefilesynonym [lang-sk.pat] [skhyphen.tex] % in a different part of the tree, sigh diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 05033cb1b..b1bbf8725 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -31,7 +31,7 @@ %D 2004.8.30 the low level interface is english. Watch out and adapt %D your styles an modules. -\def\contextversion{2004.12.17} +\def\contextversion{2005.01.12} %D Welcome to the main module. When this module is ran through %D \type{initex} or \type {tex -i} or \type {whatevertex} using diff --git a/tex/context/base/core-con.tex b/tex/context/base/core-con.tex index bfe3783d1..39e13ed44 100644 --- a/tex/context/base/core-con.tex +++ b/tex/context/base/core-con.tex @@ -539,19 +539,64 @@ \hskip\datesignal\relax \fi} +% \def\complexcurrentdate[#1]% +% {\bgroup +% \let\labellanguage\currentlanguage +% \def\betweendates{\let\betweendates\dobetweendates}% +% \lowercase{\edef\!!stringa{#1}}% permits usage in \smallcapped +% \@EA\processallactionsinset\@EA +% [\!!stringa] +% [ \v!day=>\betweendates\the\normalday, +% %\v!day+=>\betweendates\ordinaldaynumber\normalday, +% \v!day+=>\betweendates\convertnumber{\v!day+}\normalday, +% \v!month=>\betweendates\month\normalmonth, +% \v!year=>\betweendates\the\normalyear, +% \v!space=>\unskip\ \hskip\datesignal,% optimization -) +% \ =>\unskip\ \hskip\datesignal,% optimization -) +% d=>\convertnumber\v!day\normalday, +% %d+=>\ordinaldaynumber\normalday, +% d+=>\convertnumber{\v!day+}\normalday, +% m=>\convertnumber\v!month\normalmonth, +% j=>\convertnumber\v!year\normalyear, +% y=>\convertnumber\v!year\normalyear, +% w=>\betweendates\dayoftheweek\normalday\normalmonth\normalyear, +% dd=>\ifnum\normalday >9 \else0\fi\the\normalday, +% %dd+=>\ordinaldaynumber{\ifnum\normalday >9 \else0\fi\the\normalday}, +% dd+=>\convertnumber{\v!day+}{\ifnum\normalday >9 \else0\fi\the\normalday}, +% mm=>\ifnum\normalmonth>9 \else0\fi\the\normalmonth, +% jj=>\expandafter\gobbletwoarguments\the\normalyear, +% yy=>\expandafter\gobbletwoarguments\the\normalyear, +% \v!weekday=>\betweendates\dayoftheweek\normalday\normalmonth\normalyear, +% \v!referral=>\expanded{\complexcurrentdate[\kenmerkdatumpatroon]}, +% \s!unknown=>\unskip +% \commalistelement +% \hskip\datesignal +% \def\betweendates{\let\betweendates\dobetweendates}]% +% \ifdim\lastskip=\datesignal\relax +% \unskip +% \fi +% \egroup} + \def\complexcurrentdate[#1]% {\bgroup \let\labellanguage\currentlanguage \def\betweendates{\let\betweendates\dobetweendates}% - \lowercase{\edef\!!stringa{#1}}% permits usage in \smallcapped - \@EA\processallactionsinset\@EA - [\!!stringa] + \processcommacommand[#1]\docomplexcurrentdate + \ifdim\lastskip=\datesignal\relax + \unskip + \fi + \egroup} + +\def\docomplexcurrentdate#1% + {\lowercase{\edef\!!stringa{#1}}% permits usage in \smallcapped + \processaction + [#1] [ \v!day=>\betweendates\the\normalday, %\v!day+=>\betweendates\ordinaldaynumber\normalday, \v!day+=>\betweendates\convertnumber{\v!day+}\normalday, \v!month=>\betweendates\month\normalmonth, \v!year=>\betweendates\the\normalyear, - \v!space=>\unskip\ \hskip\datesignal,% optimization -) + \v!space=>\unskip\ \hskip\datesignal,% optimization -) \ =>\unskip\ \hskip\datesignal,% optimization -) d=>\convertnumber\v!day\normalday, %d+=>\ordinaldaynumber\normalday, @@ -567,15 +612,13 @@ jj=>\expandafter\gobbletwoarguments\the\normalyear, yy=>\expandafter\gobbletwoarguments\the\normalyear, \v!weekday=>\betweendates\dayoftheweek\normalday\normalmonth\normalyear, - \v!referral=>\expanded{\complexcurrentdate[\kenmerkdatumpatroon]}, + \v!referral=>\expanded{\complexcurrentdate[\kenmerkdatumpatroon]}, \s!unknown=>\unskip - \commalistelement + % #1 and not the lowercased \commalistelement, vietnamese has text + % {} because #1 can have comma, like: {\ ,} + {#1}% \hskip\datesignal - \def\betweendates{\let\betweendates\dobetweendates}]% - \ifdim\lastskip=\datesignal\relax - \unskip - \fi - \egroup} + \def\betweendates{\let\betweendates\dobetweendates}]} \def\simplecurrentdate {\expanded{\complexcurrentdate[\currentdatespecification]}} diff --git a/tex/context/base/core-fig.tex b/tex/context/base/core-fig.tex index 8c6446002..2cfe7573c 100644 --- a/tex/context/base/core-fig.tex +++ b/tex/context/base/core-fig.tex @@ -894,20 +894,38 @@ \newbox\foundexternalfigure -\def\presetundefinedfigure#1% - {\let\@@eftype #1% - \let\@@efextension #1% +% \def\presetundefinedfigure#1% +% {\let\@@eftype #1% +% \let\@@efextension #1% +% \let\@@efobject \v!no +% \let\@@efpreset \v!no +% \ifx\@@efwidth\empty +% \def\@@efwidth{8\lineheight}% 4cm +% \fi +% \ifx\@@efheight\empty +% \def\@@efheight{6\lineheight}% 3cm +% \fi} + +% \def\presetfiguremov{\presetundefinedfigure\c!mov} +% \def\presetfigureavi{\presetundefinedfigure\c!avi} + +\def\presetundefinedfigure#1#2% + {\let\@@eftype #2% + \let\@@efextension #2% \let\@@efobject \v!no - \let\@@efpreset \v!no - \ifx\@@efwidth\empty - \def\@@efwidth{8\lineheight}% 4cm - \fi - \ifx\@@efheight\empty - \def\@@efheight{6\lineheight}% 3cm + \ifcase#1\or + \let\@@efpreset \v!no + \ifx\@@efwidth\empty + \def\@@efwidth{8\lineheight}% 4cm + \fi + \ifx\@@efwidth\empty + \def\@@efwidth{6\lineheight}% 3cm + \fi \fi} -\def\presetfiguremov{\presetundefinedfigure\c!mov} -\def\presetfigureavi{\presetundefinedfigure\c!avi} +\def\presetfiguresvg{\presetundefinedfigure0\c!svg} +\def\presetfiguremov{\presetundefinedfigure1\c!mov} +\def\presetfigureavi{\presetundefinedfigure1\c!avi} % The page number (frame) is passed as first option. @@ -957,8 +975,9 @@ % nil path search in case of path spec \expanded{\checkfilename{\expandedfigurename}}% \ifcase\kindoffile\else \let\figurepathlist\empty \fi - \expandafter\beforesplitstring\expandedfigurename\at.\to\@@effilename - \expandafter\aftersplitstring \expandedfigurename\at.\to\@@efextension +% \expandafter\beforesplitstring\expandedfigurename\at.\to\@@effilename +% \expandafter\aftersplitstring \expandedfigurename\at.\to\@@efextension +\greedysplitstring\expandedfigurename\at.\to\@@effilename\and\@@efextension \doifelse\@@effilename{mprun} {\edef\@@effilepref{\bufferprefix}} {\let \@@effilepref\empty}% @@ -988,6 +1007,7 @@ \c!factor=,\c!hfactor=,\c!wfactor=]% \doif\@@efextension\c!mov\presetfiguremov \doif\@@efextension\c!avi\presetfigureavi + \doif\@@efextension\c!svg\presetfiguresvg #1[#4][#5][#6]% % new, somehow needed when \textwidth is used: \doifsomething\@@efmaxwidth {\freezedimenmacro\@@efmaxwidth }% @@ -1020,12 +1040,13 @@ \doregisterfigurecolor\@@efcolor}}% \donothing % - \doif\@@efreset\v!yes \resetexternalfigures + \doif\@@efreset\v!yes\resetexternalfigures \doif\@@eftype \c!mov\presetfiguremov \doif\@@eftype \c!avi\presetfigureavi + \doif\@@eftype \c!svg\presetfiguresvg % hack - \doif\@@efmethod\c!mov - {\doifsomething\@@efextension{\presetundefinedfigure\@@efextension}}% + \doif\@@efmethod\c!mov{\doifsomething\@@efextension{\presetundefinedfigure1\@@efextension}}% + \doif\@@efmethod\c!svg{\doifsomething\@@efextension{\presetundefinedfigure0\@@efextension}}% % \doif\@@eftype\v!buffer {\ifx\@@efextension\empty @@ -1041,7 +1062,8 @@ \edef\@@effilepref{\bufferprefix}% \edef\@@effilename{\@@effilepref\@@effilename}, \c!avi=>\presetfigureavi, - \c!mov=>\presetfiguremov]}% + \c!mov=>\presetfiguremov, + \c!svg=>\presetfiguresvg]}% \edef\figuretypes{\figuretypes,\c!tex}% \ifx\@@eftype\c!tex % Since tex code can have positional stuff and worse, @@ -1158,7 +1180,7 @@ \setdimensionfiguresize \processaction [\@@efgrid] - [ \v!yes=>\getnoflines\fighei + [ \v!yes=>\getnoflines\fighei \edef\@@efheight{\the\noflines\lineheight}% \global\gridfiguretrue, \v!height=>\getrawnoflines\fighei @@ -1166,17 +1188,17 @@ \advance\scratchdimen\strutdepth \edef\@@efheight{\the\scratchdimen}% \global\gridfiguretrue, - \v!depth=>\getrawnoflines\fighei + \v!depth=>\getrawnoflines\fighei \scratchdimen\noflines\lineheight \advance\scratchdimen-\strutdepth \edef\@@efheight{\the\scratchdimen}% \global\gridfiguretrue, - \v!halfline=>\getrawnoflines\fighei + \v!halfline=>\getrawnoflines\fighei \scratchdimen\noflines\lineheight \advance\scratchdimen+.5\lineheight \edef\@@efheight{\the\scratchdimen}% \global\gridfiguretrue, - \v!fit=>\getrawnoflines\fighei + \v!fit=>\getrawnoflines\fighei \edef\@@efheight{\the\noflines\lineheight}% \global\gridfiguretrue]% \ifgridfigure diff --git a/tex/context/base/core-fnt.tex b/tex/context/base/core-fnt.tex index 47c08451b..85fc02952 100644 --- a/tex/context/base/core-fnt.tex +++ b/tex/context/base/core-fnt.tex @@ -503,11 +503,11 @@ % \processisolatedwords{#2}\dodounderbar % \egroup} -% \unexpanded\def\underbar -% {\bgroup -% \increment\underbarlevel -% \donetrue -% \dounderbar\betweenunderbarwords} +\unexpanded\def\underbar + {\bgroup + \increment\underbarlevel + \donetrue + \dounderbar\betweenunderbarwords} \unexpanded\def\dounderbar#1% {\let\betweenisolatedwords#1% diff --git a/tex/context/base/core-grd.tex b/tex/context/base/core-grd.tex index 3056e69d7..ff69c925a 100644 --- a/tex/context/base/core-grd.tex +++ b/tex/context/base/core-grd.tex @@ -1013,6 +1013,48 @@ \global\chardef\fuzzysnappedleft0 \fi\fi\fi} +%D New, experimental, used in caption snapping: +%D +%D \starttyping +%D \startcolumnset +%D +%D \setupcaption[figure][style=\tfx\setupinterlinespace,inbetween=,grid=top] +%D +%D \placefigure [lrtb] {\dorecurse{5}{green gras}} +%D {\externalfigure[dummy][width=\textwidth,height=3cm,grid=height]} +%D \placefigure [lrtb] {\dorecurse{15}{green gras}} +%D {\externalfigure[dummy][width=\textwidth,height=3cm,grid=height]} +%D +%D \setupcaption[figure][style=\tfx\setupinterlinespace,inbetween=,grid=bottom] +%D +%D \placefigure [rltb] {\dorecurse{5}{green gras}} +%D {\externalfigure[dummy][width=\textwidth,height=3cm,grid=height]} +%D \placefigure [rltb] {\dorecurse{15}{green gras}} +%D {\externalfigure[dummy][width=\textwidth,height=3cm,grid=height]} +%D +%D \input thuan +%D +%D \stopcolumnset +%D \stoptyping + +\def\moveboxontogrid#1#2#3% box method firstlineht % experimental ! ! ! + {\doifsomething{#2} + {\getnoflines{\ht#1}% no depth taken into account, depth preserved + \scratchdimen\noflines\lineheight + \advance\scratchdimen-\strutdp + \bgroup + \advance\scratchdimen-\onepoint % be a bit tolerant + \ifdim\scratchdimen>\ht#1\relax + \egroup + \doif{#2}\v!top {\setbox#1\vbox to \scratchdimen{\vskip-#3\vskip\strutht\box#1\vfill}}% + \doif{#2}\v!bottom{\setbox#1\vbox to \scratchdimen{\vfill\box#1\removedepth}}% + \dp#1\strutdp + \else + \egroup + \ht#1\scratchdimen + \dp#1\strutdp + \fi}} + %D New: \let\checkgridsnapping\relax diff --git a/tex/context/base/core-int.tex b/tex/context/base/core-int.tex index 223ca6c40..8a89dc9dc 100644 --- a/tex/context/base/core-int.tex +++ b/tex/context/base/core-int.tex @@ -333,10 +333,9 @@ \def\doinitializeidentity#1% {%\iflocation \doprepareidentity - \expanded - {\dosetupidentity - {\@@iatitle}{\@@iasubtitle}{\@@iaauthor}{#1}% - {\@@iadate}{\@@iakeyword}}% + \dosetupidentity % no \expanded{..} will be done in special (else no pdfdoc) + {\@@iatitle}{\@@iasubtitle}{\@@iaauthor}{#1}% + {\@@iadate}{\@@iakeyword}% \global\let\initializeidentity\relax }%\fi} @@ -446,23 +445,28 @@ % \appendtoks\flushpostponedbookmark\to\everypar % \appendtoks\flushpostponedbookmark\to\neverypar +% +% \let\flushpostponedbookmark\relax +% +% \def\simplebookmark#1% +% {\ifx\flushpostponedbookmark\relax \else +% \bgroup +% \convertargument#1\to\ascii +% \writestatus\m!systems{clashing bookmarks: \ascii}% ECHTE MESSAGE MAKEN +% \egroup +% \fi +% \doglobal\prependtoks +% \writetolist[\@@bookmark]{}{#1}% +% \to\postponedbookmarks} \newtoks\postponedbookmarks -%\let\flushpostponedbookmark\relax - \def\flushpostponedbookmark {\the\postponedbookmarks \global\postponedbookmarks\emptytoks} \def\simplebookmark#1% - {\ifx\flushpostponedbookmark\relax \else - \bgroup - \convertargument#1\to\ascii - \writestatus\m!systems{clashing bookmarks: \ascii}% ECHTE MESSAGE MAKEN - \egroup - \fi - \doglobal\prependtoks + {\doglobal\prependtoks \writetolist[\@@bookmark]{}{#1}% \to\postponedbookmarks} @@ -490,7 +494,7 @@ \global\let\bookmarklevellist\empty \def\bookmarklevelcount{0}% \doprocessbookmarks[#1]\dogetbookmarkelement - \dolijstelement{}{}{}{}{}{}% needed to finish the first pass + \dolistelement{}{}{}{}{}{}% needed to finish the first pass \doprocessbookmarks[#1]\doputbookmarkelement \flushbookmark \egroup @@ -500,7 +504,7 @@ \fi} \def\doprocessbookmarks[#1]#2% - {\let\dolijstelement#2\relax + {\let\dolistelement#2\relax \scratchcounter\zerocount \def\docommando##1% {\advance\scratchcounter \plusone @@ -1123,7 +1127,7 @@ \def\dodefineinteractionmenu[#1][#2]% compatibility hack {\convertargument#2\to\ascii % will disappear soon \doifinstringelse[\ascii - \dodostelinteractielijstmenuinx + \dodosetupinteractionlistmenux \dododefineinteractionmenu [#1][#2]} @@ -1135,8 +1139,8 @@ \letvalue{\??am\c!menu#1}\empty % \setvalue{\??am\c!menu#1}% % {\extendedmenufalse\dointeractionmenu{#1}{}}% - \setvalue{\@@dodolijstelement#1}% - {\def\dosomelijstelement{\dodomenulistelement{#1}}}% + \setvalue{\@@dodolistelement#1}% + {\def\dosomelistelement{\dodomenulistelement{#1}}}% \presetlocalframed[\??am#1]% % register location \expanded{\addtocommalist{#1}\@EA\noexpand\csname\??am#2\endcsname}% @@ -1157,13 +1161,13 @@ \def\dosetupinteractionmenu[#1][% compatibillity hack {\doifnextcharelse\bgroup % will disappear soon - {\dodostelinteractielijstmenuiny[#1][} + {\dodosetupinteractionlistmenuy[#1][} {\dodosetupinteractionmenu [#1][}} -\def\dodostelinteractielijstmenuinx[#1][#2][#3]% compatibillity hack +\def\dodosetupinteractionlistmenux[#1][#2][#3]% compatibillity hack {\setvalue{\??am\c!menu#1}{\extendedmenufalse\dointeractionmenu{#1}{#2}}} -\def\dodostelinteractielijstmenuiny[#1][#2]% compatibillity hack +\def\dodosetupinteractionlistmenuy[#1][#2]% compatibillity hack {\setvalue{\??am\c!menu#1}% {\extendedmenufalse\dointeractionmenu{#1}{#2}}} diff --git a/tex/context/base/core-lst.tex b/tex/context/base/core-lst.tex index 9f7fec285..36010cfb6 100644 --- a/tex/context/base/core-lst.tex +++ b/tex/context/base/core-lst.tex @@ -41,17 +41,17 @@ {\begingroup \expanded{\everylistentry\emptytoks\the\everylistentry}% \emptytoks, else loop \def\currentlist{#1}% - \convertexpanded{\??li\currentlist}{#3}\asciilistentry + \convertexpanded{\getvalue{\??li\currentlist\c!expansion}}{#3}\asciilistentry \makesectionformat \doifelse\@@nmstate\v!start - {\def\dopaginanummer{\noexpand\pagenumber}} - {\def\dopaginanummer{0}}% + {\def\dopagenummer{\noexpand\pagenumber}} + {\def\dopagenummer{0}}% % niet waterdicht, wat te doen met figuren en zo % first hack: scheelt rommel, second hack: alleen koppen \doifelsevalue{\??rf\currentlist\c!state}\v!start {\doif{\@@sectionlevel\@@sectie}{0}\autocrossdocumentfalse} {\autocrossdocumentfalse}% - % blijft nog wat zwakjes en inefficient + % weak and inefficient \ifautocrossdocument \bgroup \thisisnextinternal\currentlist @@ -63,20 +63,19 @@ \else \thisisnextinternal\currentlist \fi - \edef\next % \schrijfwegnaarlijst% + \expanded {\writeutilitycommand% - {\listentry% + {\noexpand\listentry% {\currentlist}% {\nextinternalreference}% {#2}% {\asciilistentry}% - {\sectionformat\sectionseparator\sectionseparator\dopaginanummer}% + {\sectionformat\sectionseparator\sectionseparator\dopagenummer}% {\noexpand\realfolio}}}% - \next % \schrijfwegnaarlijst \endgroup} \def\dododowritetolist#1% - {\def\docommando##1% + {\def\docommand##1% {\doifvalue{\??rf##1\c!state}\v!start {\setsectieenkoppeling{##1}% \def\level{\@@sectionlevel\@@sectie}% @@ -85,7 +84,7 @@ \else\ifnum\level=\currentlevel \expanded{\definereference[#1::##1][#1::{##1::\sectionformat}]}% \fi\fi}}% - \processcommacommand[\crossdocumentelements]\docommando} + \processcommacommand[\crossdocumentelements]\docommand} % so far @@ -95,23 +94,22 @@ \convertargument#2\to\ascii \makesectionformat \doifelse{\@@nmstate}\v!start - {\def\dopaginanummer{\noexpand\pagenumber}} - {\def\dopaginanummer{0}}% - \edef\next % \schrijfwegnaarlijst + {\def\dopagenummer{\noexpand\pagenumber}} + {\def\dopagenummer{0}}% + \expanded {\writeutilitycommand% - {\listbetween% + {\noexpand\listbetween% {#1}% {\ascii}% - {\sectionformat\sectionseparator\sectionseparator\dopaginanummer}% + {\sectionformat\sectionseparator\sectionseparator\dopagenummer}% {\noexpand\realfolio}}}% - \next % \schrijfwegnaarlijst \endgroup}} % experimental (no nodes in mvl), needed for naw \def\immediatetolist[#1]#2#3#4% {\begingroup - \convertexpanded{\??li#1}{#3}\asciilistentry + \convertexpanded{\getvalue{\??li#1\c!expansion}}{#3}\asciilistentry \makesectionformat \immediatewriteutilitycommand {\listentry @@ -132,7 +130,7 @@ \endgroup} \def\setlistentries - {\def\listentry ##1{\executeifdefined{##1\c!list }\gobblefivearguments }% + {\def\listentry ##1{\executeifdefined{##1\c!list }\gobblefivearguments }% \def\listbetween##1{\executeifdefined{##1\c!inbetween}\gobblethreearguments}} \def\resetlistentries @@ -143,54 +141,48 @@ \addutilityreset{listentries} -%\def\@@livariantaa% nr - tit - pag -% {\def\lijstfill{\hskip .5em}% -% \def\lijstskip{0em}% -% \def\lijstwidth{0pt}} +\setvalue{\??li\c!alternative a}% nr - tit - pag +% {\def\listfill {\hskip 1.75em}% was \hskip.5em\hskip 1.25em + {\def\listfill {\hskip .25em}% omdat nu check + \def\listskip {0em}% + \def\listwidth{2em}} -\def\@@livarianta% nr - tit - pag -% {\def\lijstfill{\hskip 1.75em}% was \hskip.5em\hskip 1.25em - {\def\lijstfill{\hskip .25em}% omdat nu check - \def\lijstskip{0em}% - \def\lijstwidth{2em}} +\setvalue{\??li\c!alternative b}% nr - tit - fill - pag + {\def\listfill {\hfill}% was \hskip.5em\hfill + \def\listskip {5em}% + \def\listwidth{2em}} -\def\@@livariantb% nr - tit - fill - pag - {\def\lijstfill{\hfill}% was \hskip.5em\hfill - \def\lijstskip{5em}% - \def\lijstwidth{2em}} +\setvalue{\??li\c!alternative c}% nr - tit - dots - pag + {\def\listfill {\hskip.5em\listdots\hskip.5em}% + \def\listskip {5em}% + \def\listwidth{0pt}} -\def\@@livariantc% nr - tit - dots - pag - {\def\lijstfill{\hskip.5em\lijstdots\hskip.5em}% - \def\lijstskip{5em}% - \def\lijstwidth{0pt}} +\def\listdots{\leaders\hbox to .5em{\hss.\hss}\hfill} -\def\lijstdots{\leaders\hbox to .5em{\hss.\hss}\hfill} +\setvalue{\??li\c!alternative}{\getvalue{\??li\c!alternative b}} -\def\@@lialternative% - {\lijstvariantb} - -\@@livariantb +\getvalue{\??li\c!alternative} \def\setlistparameter#1#2{\@EA\def\csname\??li#1#2\endcsname} \def\dosetuplist[#1][#2]% slow -) - {\def\docommando##1% + {\def\docommand##1% {\getparameters[\??li##1][#2]% \preparepageprefix{\??li##1}}% - \processcommalist[#1]\docommando} + \processcommalist[#1]\docommand} \def\setuplist {\dodoubleargument\dosetuplist} -\def\dodosetlijst#1% +\def\dodosetlist#1% {\def\nolist{\splitsequence{\getvalue{\??li#1\c!limittext}}}% - \setvalue{#1\c!inbetween}{\dotussenlijst {#1}}% - \setvalue{#1\c!list }{\dolijstelement{#1}}} + \setvalue{#1\c!inbetween}{\dobetweenlist{#1}}% + \setvalue{#1\c!list }{\dolistelement{#1}}} -\def\dodoresetlijst#1% +\def\dodoresetlist#1% {\let\nolist\empty \setvalue{#1\c!inbetween}{\gobblefourarguments{#1}}% - \setvalue{#1\c!list }{\gobblesixarguments {#1}}} + \setvalue{#1\c!list }{\gobblesixarguments {#1}}} \let\nolist\empty @@ -215,9 +207,9 @@ \c!textcolor=\getvalue{\??li#1\c!color}, \c!numbercolor=\getvalue{\??li#1\c!color}, \c!pagecolor=\getvalue{\??li#1\c!color}, - \c!numbercommand=\lijstnummercommando, - \c!textcommand=\lijsttekstcommando, - \c!pagecommand=\lijstpaginacommando, + \c!numbercommand=\listnumbercommand, + \c!textcommand=\listtextcommand, + \c!pagecommand=\listpagecommand, \c!pagenumber=\v!yes, \c!pageboundaries=, \c!margin=\!!zeropoint, @@ -236,7 +228,7 @@ \c!expansion=]% \doifassignmentelse{#2} {\getparameters[\??li#1][#2]} - {\ConvertToConstant\doifnot{#2}{} + {\ConvertToConstant\doifnot{#2}{} % not \doifsomething ivm Convert... {\copyparameters % interactie ? [\??li#1][\??li#2] [\c!state,\c!width,\c!alternative,\c!style,\c!color, @@ -248,19 +240,19 @@ \c!aligntitle,\c!before,\c!after,\c!inbetween,\v!part\c!number,\c!label]% \getparameters[\??li#1][#3]}}% \addutilityreset{#1}% - \setvalue{\s!set #1}{\dodosetlijst {#1}}% - \setvalue{\s!reset#1}{\dodoresetlijst{#1}}} + \setvalue{\s!set #1}{\dodosetlist {#1}}% + \setvalue{\s!reset#1}{\dodoresetlist{#1}}} \def\definelist {\dotripleempty\dodefinelist} -\def\iflijstgeplaatst{\ifutilitydone} +\def\iflijstgeplaatst{\ifutilitydone} % is now a mode \def\placelist {\dodoubleempty\doplacelist} -\def\plaatsruwelijst - {\dodoubleempty\doplaatsruwelijst} +\def\placerawlist + {\dodoubleempty\doplacerawlist} \def\dobeginoflist {\begingroup @@ -272,10 +264,10 @@ \def\doplacelist[#1][#2]% {\dobeginoflist - \plaatsruwelijst[#1][#2]% + \doplacerawlist[#1][#2]% \doendoflist} -\def\plaatsruwelijst[#1][#2]% +\def\doplacerawlist[#1][#2]% {\begingroup \dogetcommalistelement1\from#1\to\firstlistelement \dosetuplist[#1][#2]% @@ -318,7 +310,7 @@ \fi} \def\dosetlistmode - {\iflijstgeplaatst + {\ifutilitydone \setsystemmode \v!list \else \resetsystemmode\v!list @@ -334,10 +326,10 @@ \def\completelist {\dodoubleempty\docompletelist} -\def\lijstelementen {} % bevat lijst met paginaovergangen -\def\lijstnummercommando #1{#1} % geen strut i.v.m. intractieve versie -\def\lijsttekstcommando #1{\begstrut#1\endstrut} -\def\lijstpaginacommando #1{\strut#1} +\def\listelements {} % list of page breaks +\def\listnumbercommand #1{#1} % no strut due to interactive version +\def\listtextcommand #1{\begstrut#1\endstrut} +\def\listpagecommand #1{\strut#1} \def\doassigndimen#1#2#3% {\doifinsetelse{#2}{\v!fit,\v!broad} @@ -374,9 +366,9 @@ \def\listsymbol@three#1#2% {\def\currentlistsymbol % very slow - {{\doassigndimen{\dimen0}{\getvalue{\??li#1\c!width}}{1.5em}% + {{\doassigndimen{\dimen0}{\getvalue{\??li#1\c!width }}{1.5em}% \doassigndimen{\dimen2}{\getvalue{\??li#1\c!height}}{1ex}% - \doassigndimen{\dimen4}{\getvalue{\??li#1\c!depth}}{0pt}% + \doassigndimen{\dimen4}{\getvalue{\??li#1\c!depth }}{0pt}% \vrule\!!width\dimen0\!!height\dimen2\!!depth\dimen4}}} \def\listsymbol@default#1#2% @@ -398,47 +390,47 @@ % so far for list symbols -\def\@@dodolijstelement{dodolijstelement} +\def\@@dodolistelement{dodolistelement} -\def\dosomelijstelement#1#2#3{#1 #2 \translatednumber[#3]} +\def\dosomelistelement#1#2#3{#1 #2 \translatednumber[#3]} -\setvalue{\@@dodolijstelement a}{\let\dosomelijstelement\dodofixdlijstelementABC} -\setvalue{\@@dodolijstelement b}{\let\dosomelijstelement\dodofixdlijstelementABC} -\setvalue{\@@dodolijstelement c}{\let\dosomelijstelement\dodofixdlijstelementABC} -\setvalue{\@@dodolijstelement d}{\let\dosomelijstelement\dodofixdlijstelementD} -\setvalue{\@@dodolijstelement e}{\let\dosomelijstelement\dodofixdlijstelementE} -\setvalue{\@@dodolijstelement f}{\let\dosomelijstelement\dodofixdlijstelementF} -\setvalue{\@@dodolijstelement g}{\let\dosomelijstelement\dodofixdlijstelementG} +\setvalue{\@@dodolistelement a}{\let\dosomelistelement\dodofixdlistelementABC} +\setvalue{\@@dodolistelement b}{\let\dosomelistelement\dodofixdlistelementABC} +\setvalue{\@@dodolistelement c}{\let\dosomelistelement\dodofixdlistelementABC} +\setvalue{\@@dodolistelement d}{\let\dosomelistelement\dodofixdlistelementD} +\setvalue{\@@dodolistelement e}{\let\dosomelistelement\dodofixdlistelementE} +\setvalue{\@@dodolistelement f}{\let\dosomelistelement\dodofixdlistelementF} +\setvalue{\@@dodolistelement g}{\let\dosomelistelement\dodofixdlistelementG} -\setvalue{\@@dodolijstelement\v!none }{\def\dosomelijstelement{\dodofreevlijstelement}} -\setvalue{\@@dodolijstelement\v!vertical }{\def\dosomelijstelement{\dodofreevlijstelement}} -\setvalue{\@@dodolijstelement\v!horizontal}{\def\dosomelijstelement{\dodofreehlijstelement}} -\setvalue{\@@dodolijstelement\v!command }{\let\dosomelijstelement\dodocommandlijstelement} +\setvalue{\@@dodolistelement\v!none }{\def\dosomelistelement{\dodofreevlistelement}} +\setvalue{\@@dodolistelement\v!vertical }{\def\dosomelistelement{\dodofreevlistelement}} +\setvalue{\@@dodolistelement\v!horizontal}{\def\dosomelistelement{\dodofreehlistelement}} +\setvalue{\@@dodolistelement\v!command }{\let\dosomelistelement\dodocommandlistelement} % don't mess arround with endgraf/grouping else we loose leftskip -% \strippedcsname\dodolijstelement +% \strippedcsname\dodolistelement \def\newlineinlist{\space} -\def\dolijstelement#1#2#3#4#5#6% pas op: wordt ook elders gedefinieerd - {\doiftoclevelelse[#5]{\dodolijstelement{#1}{#2}{#3}{#4}{#5}{#6}}{}} +\def\dolistelement#1#2#3#4#5#6% pas op: wordt ook elders gedefinieerd + {\doiftoclevelelse[#5]{\dodolistelement{#1}{#2}{#3}{#4}{#5}{#6}}{}} -\def\dodolijstelement#1#2#3#4#5#6% - {\getvalue{\@@dodolijstelement\getvalue{\??li#1\c!alternative}}% +\def\dodolistelement#1#2#3#4#5#6% + {\getvalue{\@@dodolistelement\getvalue{\??li#1\c!alternative}}% %\showcomposition \let\@@iawidth\!!zeropoint % moet boolean worden \bgroup - \edef\lijstelementen + \edef\listelements {\getvalue{\??li#1\c!pageboundaries}}% - \ExpandBothAfter\doifinset{#3}\lijstelementen + \ExpandBothAfter\doifinset{#3}\listelements {\showmessage\m!systems{14}{#3}% \page}% \egroup \dontcomplain \setfullsectionnumber{\??li#1}% \dosetlistsymbol{#1}{#3}% - \dosomelijstelement{#1}{#2}{#3}{#4}{#5}{#6}% + \dosomelistelement{#1}{#2}{#3}{#4}{#5}{#6}% \global\utilitydonetrue} \def\dolistattributes#1#2#3% @@ -447,14 +439,14 @@ \resetinteractionparameter\c!contrastcolor}% \doattributes{\??li#1}{#2}{#3}} -\def\dodocommandlijstelement#1#2#3#4#5#6% +\def\dodocommandlistelement#1#2#3#4#5#6% {\doifdefinedelse{\??li#1\c!command} {\getvalue{\??li#1\c!command}% {#3}{#4}{\pageprefix\??li#1[#5]\translatednumber[#5]}} {[#1: #3 - #4 - \pageprefix\??li#1[#5]\translatednumber[#5]]}} -\def\dodofreelijstelement#1#2#3#4#5#6#7#8% - {\def\makelijstelement##1##2% +\def\dodofreelistelement#1#2#3#4#5#6#7#8% + {\def\makelistelement##1##2% {\noindent % new and needed \hbox {\doifelsevalue{\??li#1\c!interaction}{##1} % \??li ipv \??ia @@ -463,7 +455,7 @@ {##2}}}% \getvalue{\??li#1\c!before}% can be \hskip \doifdefinedelse{\??li#1\c!command} - {\makelijstelement{\getvalue{\??li#1\c!interaction}}% this forces all + {\makelistelement{\getvalue{\??li#1\c!interaction}}% this forces all {\getvalue{\??li#1\c!command}% {#3}% geen conversies etc {#4}% geen conversies etc @@ -472,18 +464,18 @@ {#7% \vbox {\forgetall - \makelijstelement\v!all - {\makelijstelement\v!sectionnumber + \makelistelement\v!all + {\makelistelement\v!sectionnumber {\dolistattributes{#1}\c!numberstyle\c!numbercolor {\getvalue{\??li#1\c!numbercommand}{\currentlistsymbol}}}% - \makelijstelement\v!text + \makelistelement\v!text {\dolistattributes{#1}\c!textstyle\c!textcolor {\let\\=\newlineinlist \dontconvertfont \getvalue{\??li#1\c!textcommand}{#4}}}% \doifvalue{\??li#1\c!pagenumber}\v!yes {\doifsomething{#5} - {\makelijstelement\v!pagenumber + {\makelistelement\v!pagenumber {\dolistattributes{#1}\c!pagestyle\c!pagecolor {\getvalue{\??li#1\c!pagecommand} {\pageprefix\??li#1[#5]% @@ -491,14 +483,14 @@ #8}% \getvalue{\??li#1\c!after}} -\def\dodofreehlijstelement#1#2#3#4#5#6% - {\dodofreelijstelement{#1}{#2}{#3}{#4}{#5}{#6} +\def\dodofreehlistelement#1#2#3#4#5#6% + {\dodofreelistelement{#1}{#2}{#3}{#4}{#5}{#6} {\noindent}{}} -\def\dodofreevlijstelement#1#2#3#4#5#6% % \nointerlineskip nodig, - {\dodofreelijstelement{#1}{#2}{#3}{#4}{#5}{#6} % anders verkeerde spatiering - {\ifvmode\nointerlineskip\fi} % bij multi-line lijsten - {\nointerlineskip\endgraf\allowbreak}} % +\def\dodofreevlistelement#1#2#3#4#5#6% % \nointerlineskip needed, + {\dodofreelistelement{#1}{#2}{#3}{#4}{#5}{#6} % otherwise wrong spacing + {\ifvmode\nointerlineskip\fi} % at multi-line lists + {\nointerlineskip\endgraf\allowbreak}} % % to be documented: uitlijnen, hang @@ -513,7 +505,7 @@ {\getvalue{\??li#1\c!maxwidth}}% {\splitsymbol{\getvalue{\??li#1\c!limittext}}}}}} -\def\dodofixdlijstelementABC#1#2#3#4#5#6% weeden +\def\dodofixdlistelementABC#1#2#3#4#5#6% weeden {\endgraf \leftskip\getvalue{\??li#1\c!margin}% na de \endgraf ! \getvalue{\??li#1\c!before}% @@ -528,31 +520,31 @@ {\!!widtha\getvalue{\??li#1\c!width}}}% \getvalue{\??li\c!alternative\getvalue{\??li#1\c!alternative}}% \endgraf - \def\makelijstelement##1##2% + \def\makelistelement##1##2% {\doifelsevalue{\??li#1\c!interaction}{##1} {\setbox0\hbox{\showcontrastlocation\??ia{#6}{##2}}% \linklisttoelement{#1}{#2}{#5}{#6}{\box0}}%{\copy0}}% {\hbox{##2}}}% \doifvalue{\??li#1\c!interaction}\v!text % not supported {\setlistparameter{#1}\c!interaction\v!all}% -% \makelijstelement\v!all +% \makelistelement\v!all % {\hbox to \hsize - \makelijstelement\v!all + \makelistelement\v!all {\setlocalhsize \hsize\localhsize \hbox to \hsize {\forgetall \dostartattributes{\??li#1}\c!style\c!color\empty \!!widthb\hsize \setbox2\hbox \ifdim\!!widtha>\zeropoint to \!!widtha \fi - {\makelijstelement\v!sectionnumber + {\makelistelement\v!sectionnumber {\dolistattributes{#1}\c!numberstyle\c!numbercolor {\getvalue{\??li#1\c!numbercommand}{\currentlistsymbol}}% \hfill}}% \setbox4\hbox {\doifvalue{\??li#1\c!pagenumber}\v!yes - {\doifsomething{#5} % \lijstwidth is new ; temp hack - {\hbox \ifdim\lijstwidth>\zeropoint to \lijstwidth\fi + {\doifsomething{#5} % \listwidth is new ; temp hack + {\hbox \ifdim\listwidth>\zeropoint to \listwidth\fi {\hfill - \makelijstelement\v!pagenumber + \makelistelement\v!pagenumber {\dolistattributes{#1}\c!pagestyle\c!pagecolor {\getvalue{\??li#1\c!pagecommand}% {\pageprefix\??li#1[#5]% @@ -569,8 +561,8 @@ \ifdim\wd4=\zeropoint % \ifvoid4 % we kunnen gewoon afbreken aan het eind \else - \ifdim\lijstskip>\zeropoint\relax - \rightskip=\lijstskip\!!plus10em\relax + \ifdim\listskip>\zeropoint\relax + \rightskip=\listskip\!!plus10em\relax \parfillskip=-\rightskip \fi \fi @@ -592,7 +584,7 @@ \ifdim\wd4=\zeropoint\relax % \ifvoid4 % \ifdim\!!widtha<\hsize \hfill\strut \fi % spoils align \else - \nobreak\lijstfill + \nobreak\listfill \box4\relax \relax \fi}% @@ -628,7 +620,7 @@ % overrulen interactie kan sneller, bv door hulpconstanten % te gebruiken en die te letten -\def\dodofixdlijstelementD#1#2#3#4#5#6% +\def\dodofixdlistelementD#1#2#3#4#5#6% {%\leftskip=\getvalue{\??li#1\c!margin}% \ifvmode \advance\leftskip\getvalue{\??li#1\c!margin}% AANGEPAST @@ -641,7 +633,7 @@ {\setlistparameter{#1}\c!interaction\v!sectionnumber}% \doifvalue{\??li#1\c!interaction}\v!all % not supported {\setlistparameter{#1}\c!interaction\v!sectionnumber}% - \def\makelijstelement##1##2% + \def\makelistelement##1##2% {\doifelsevalue{\??li#1\c!interaction}{##1} {\setbox0\hbox{\showcontrastlocation\??ia{#6}{##2}}% \linklisttoelement{#1}{#2}{#5}{#6}{\box0}}%{\copy0}}% @@ -649,7 +641,7 @@ \setbox4=\hbox {\doifvalue{\??li#1\c!pagenumber}\v!yes {\doifsomething{#5} - {\makelijstelement\v!pagenumber + {\makelistelement\v!pagenumber {\dolistattributes{#1}\c!pagestyle\c!pagecolor {\getvalue{\??li#1\c!pagecommand} {\pageprefix\??li#1[#5]% @@ -659,7 +651,7 @@ \ifdone \hbox {\getvalue{\??li#1\c!left}% - \makelijstelement\v!sectionnumber + \makelistelement\v!sectionnumber {\dolistattributes{#1}\c!numberstyle\c!numbercolor {\getvalue{\??li#1\c!numbercommand}{\currentlistsymbol}}}% \getvalue{\??li#1\c!right}% @@ -686,25 +678,25 @@ \fi \egroup} -\def\dodofixdlijstelementE#1% - {\dodofixdlijstelementEFG +\def\dodofixdlistelementE#1% + {\dodofixdlistelementEFG {\setupinteraction[\c!strut=\v!no]} {\localframed[\??li#1][\c!depth=\!!zeropoint,\c!color=]} {#1}} -\def\dodofixdlijstelementF#1% - {\dodofixdlijstelementEFG +\def\dodofixdlistelementF#1% + {\dodofixdlistelementEFG {} {\dosetraggedhbox{\getvalue{\??li#1\c!align}}\raggedbox} {#1}} -\def\dodofixdlijstelementG#1% - {\dodofixdlijstelementEFG +\def\dodofixdlistelementG#1% + {\dodofixdlistelementEFG {} \midaligned {#1}} -\def\dodofixdlijstelementEFG#1#2#3#4#5#6#7#8% +\def\dodofixdlistelementEFG#1#2#3#4#5#6#7#8% {\noindent \hbox {#1% in case E nils the strut @@ -743,7 +735,7 @@ {\convertargument#2\to\firstlistelement \@EA\dowritetolist\@EA{#1}{\firstlistelement}{#3}{\v!head}}} -\def\dotussenlijst#1#2#3#4% pas op: wordt ook elders gedefinieerd +\def\dobetweenlist#1#2#3#4% pas op: wordt ook elders gedefinieerd {\doiftoclevelelse[#3]{#2}{}} \def\writebetweenlist[#1]#2% @@ -759,7 +751,7 @@ \def\utilitylistwidth {0pt} \def\utilitylistheight {0pt} -\def\dolijstelementX#1#2#3#4#5#6% +\def\dolistelementX#1#2#3#4#5#6% {\doiftoclevelelse[#5] {\doglobal\increment\utilitylistlength \hbox @@ -774,7 +766,7 @@ \def\dodeterminelistcharacteristics[#1][#2]% {\begingroup \doglobal\newcounter\utilitylistlength - \let\dolijstelement\dolijstelementX + \let\dolistelement\dolistelementX \dosetuplist[#1][#2]% \dogetcommalistelement1\from#1\to\commalistelement \dosettoclevel\??li\commalistelement @@ -787,29 +779,29 @@ \def\determinelistcharacteristics {\dodoubleempty\dodeterminelistcharacteristics} -% \definieerreferentielijst +% \definerreferencelist % [externalfigure] -% [commando=\toongrootfiguur, -% voor=\pagina, -% na=\pagina] +% [command=\showbigfigure, +% before=\page, +% after=\page] % -% \definieerreferentielijst +% \definereferencelist % [externaltable] -% [commando=\toongrotetabel, -% voor=\pagina, -% na=\pagina] +% [command=\showbigtable, +% before=\page, +% after=\page] % -% \def\toongrootfiguur#1% -% {\externfiguur[#1][kader=aan,factor=max]} +% \def\showbigfigure#1% +% {\externalfigure[#1][frame=on,factor=max]} % -% \def\toongrotetabel#1% -% {\switchtobodyfont[12pt]\haalbuffer[#1]} +% \def\showbigtable#1% +% {\switchtobodyfont[12pt]\getbuffer[#1]} % -% \schrijfnaarreferentielijst[externalfigure]{koe}{\externfiguur[koe][breedte=3cm,kader=aan]} -% \schrijfnaarreferentielijst[externalfigure]{paard}{\externfiguur[paard][breedte=3cm,kader=aan]} +% \writetoreferencelist[externalfigure]{koe} {\externalfigure[koe] [width=3cm,frame=on]} +% \writetoreferencelist[externalfigure]{paard}{\externalfigure[paard][width=3cm,frame=on]} % % \startbuffer[kanweg] -% \starttabel[|||] +% \starttable[|||] % \HL % \VL test \VL test \VL\SR % \HL @@ -817,19 +809,18 @@ % \VL test \VL test \VL\MR % \VL test \VL test \VL\LR % \HL -% \stoptabel +% \stoptable % \stopbuffer % -% \schrijfnaarreferentielijst[externaltable]{kanweg}{\switchtbodyfont[5pt]\haalbuffer[kanweg]} +% \writetoreferencelist[externaltable]{kanweg}{\switchtbodyfont[5pt]\getbuffer[kanweg]} % -% \plaatsreferentielijst -% [externalfigure,externaltable] +% \placereferencelist[externalfigure,externaltable] % algemeen -\def\referentiebutton#1[#2]% - {\hbox\bgroup % the \hbox is needed to bypass - \let\referenceprefix=\empty % \dontleavehmode in \gotobox +\def\referencebutton#1[#2]% + {\hbox\bgroup % the \hbox is needed to bypass + \let\referenceprefix\empty % \dontleavehmode in \gotobox \setupinteraction[\c!color=,\c!contrastcolor=,\c!strut=]% \setupreferencing[\c!prefix=]% \gotobox{\hbox{\ignorespaces#1}}[#2]% @@ -837,51 +828,49 @@ \newcounter\referencecounter -\def\doreferentielijstelement#1#2#3#4#5% +\def\doreferencelistelement#1#2#3#4#5% {\doiftoclevelelse[#4] {\getvalue{\??rl#1\c!before}% - \referentiebutton + \referencebutton {\getvalue{\??rl#1\c!command}{#3}\pagereference[\r!to#2]}% [\r!from#2]% \global\utilitydonetrue \getvalue{\??rl#1\c!after}} {}} -\def\doplaatsreferentielijst[#1][#2]% +\def\doplacereferencelist[#1][#2]% {\begingroup -% \let\doschrijfnaarreferentielijst=\gobblethreearguments \setupreferencelist[#1][#2,\c!state=\v!stop]% \dogetcommalistelement1\from#1\to\commalistelement \dosettoclevel\??rl\commalistelement \doutilities{listentries,#1}\jobname{#1}\relax\par \endgroup} -\def\plaatsreferentielijst% - {\dodoubleempty\doplaatsreferentielijst} +\def\placereferencelist + {\dodoubleempty\doplacereferencelist} \def\dowritetoreferencelist#1#2#3% {\doifvalue{\??rl#1\c!state}\v!start {\begingroup \makesectionformat \doifelse{\@@nmstate}\v!start - {\def\dopaginanummer{\noexpand\pagenumber}} - {\def\dopaginanummer{0}}% - \edef\schrijfwegnaarlijst% + {\def\dopagenummer{\noexpand\pagenumber}} + {\def\dopagenummer{0}}% + \expanded {\writeutilitycommand% - {\referencelistentry% + {\noexpand\referencelistentry% {#1}% tag {#2}% number {#3}% data - {\sectionformat\sectionseparator\sectionseparator\dopaginanummer}% + {\sectionformat\sectionseparator\sectionseparator\dopagenummer}% {\noexpand\realfolio}}}% - \schrijfwegnaarlijst \endgroup}} \def\writetoreferencelist[#1]#2% #1=class #2=data #3=visualization {\dowithnextbox {\doifelsevalue{\??rl#1\c!state}\v!start {\doglobal\increment\referencecounter % must be resolved due to #2 - \referentiebutton + \referencebutton {\flushnextbox \pagereference[\r!from\referencecounter]% \dowritetoreferencelist{#1}{\referencecounter}{#2}}% @@ -892,10 +881,10 @@ \def\referencelistentry#1% {\executeifdefined{#1\c!list}\gobblefourarguments} -\def\dodosetreferentielijst#1% - {\setvalue{#1\c!list}{\doreferentielijstelement{#1}}} +\def\dodosetreferencelist#1% + {\setvalue{#1\c!list}{\doreferencelistelement{#1}}} -\def\dodoresetreferentielijst#1% +\def\dodoresetreferencelist#1% {\setvalue{#1\c!list}{\gobblefourarguments}} \def\dodefinereferencelist[#1][#2]% @@ -908,16 +897,16 @@ #2]% \setcounter{#1}{0}% \addutilityreset{#1}% - \setvalue{\s!set #1}{\dodosetreferentielijst {#1}}% - \setvalue{\s!reset#1}{\dodoresetreferentielijst{#1}}} + \setvalue{\s!set #1}{\dodosetreferencelist {#1}}% + \setvalue{\s!reset#1}{\dodoresetreferencelist{#1}}} -\def\definereferencelist% +\def\definereferencelist {\dodoubleempty\dodefinereferencelist} \def\dosetupreferencelist[#1][#2]% {\getparameters[\??rl#1][#2]} -\def\setupreferencelist% +\def\setupreferencelist {\dodoubleempty\dosetupreferencelist} \def\dosetupcombinedlist[#1][#2]% @@ -931,28 +920,27 @@ {\begingroup \getparameters[\??ih#1][#2]% \dosettoclevel\??ih{#1}% - \edef\samengesteldelijst{\getvalue{\??ih#1\c!list}}% - %\stripspaces\from\samengesteldelijst\to\samengesteldelijst - \doifelsevalue{\??ih#1\c!level}\v!current % criterium=vorige,niveau=huidige + \edef\combinedlist{\getvalue{\??ih#1\c!list}}% + \doifelsevalue{\??ih#1\c!level}\v!current % {\!!counta=0\@@kolevel} % hm: \@@kolevel {\fullexpandoneargafter\doifnumberelse{\getvalue{\??ih#1\c!level}}% in verband {\!!counta\getvalue{\??ih#1\c!level}% met de vorige implementatie \advance\!!counta \plusone % accepteren we ook nummers (0==deel) - \getfromcommacommand[\samengesteldelijst][\!!counta]% - \edef\maximumlijst{\commalistelement}}% - {\edef\maximumlijst{\getvalue{\??ih#1\c!level}}}% - \!!counta\getvalue{\??se\getvalue{\??ko\maximumlijst\c!section}\c!level}}% - \let\!!stringa\samengesteldelijst - \let\samengesteldelijst\empty - \def\docommando##1% + \getfromcommacommand[\combinedlist][\!!counta]% + \edef\maximumlist{\commalistelement}}% + {\edef\maximumlist{\getvalue{\??ih#1\c!level}}}% + \!!counta\getvalue{\??se\getvalue{\??ko\maximumlist\c!section}\c!level}}% + \let\!!stringa\combinedlist + \let\combinedlist\empty + \def\docommand##1% {\ifnum\getvalue{\??se\getvalue{\??ko##1\c!section}\c!level}>\!!counta \else - \addtocommalist{##1}\samengesteldelijst + \addtocommalist{##1}\combinedlist \fi}% - \processcommacommand[\!!stringa]\docommando + \processcommacommand[\!!stringa]\docommand \doifvalue{\??ih#1\c!coupling}\v!on {\startlistreferences{#1}}% - \ExpandFirstAfter\dodoplacecombinedlist[\samengesteldelijst][#2]% + \ExpandFirstAfter\dodoplacecombinedlist[\combinedlist][#2]% \stoplistreferences{#1}% \endgroup \dosetlistmode} @@ -963,13 +951,13 @@ \doutilities{listentries,#1}\jobname{#1}\relax\par \doendoflist} -\def\dovolledigesamengesteldelijst[#1][#2]% +\def\docompletecombinedlist[#1][#2]% {\expanded{\systemsuppliedtitle[#1]{\noexpand\headtext{#1}}}% expansion due to v! vs french ! \doplacecombinedlist[#1][#2]} \def\dodefinecombinedlist[#1][#2][#3]% - {\makerawcommalist[#2]\samengesteldelijst % for fast processing - \letvalue{\??ih#1\c!list}\samengesteldelijst + {\makerawcommalist[#2]\combinedlist % for fast processing + \letvalue{\??ih#1\c!list}\combinedlist \getcommalistsize[#2]% \getfromcommalist[#2][\commalistsize]% \doeassign[\??ih#1][\c!level=\commalistelement]% @@ -981,7 +969,7 @@ \setvalue{\e!place#1}% {\dodoubleempty\doplacecombinedlist[#1]}% \setvalue{\e!complete#1}% - {\dodoubleempty\dovolledigesamengesteldelijst[#1]}} + {\dodoubleempty\docompletecombinedlist[#1]}} \def\definecombinedlist% {\dotripleempty\dodefinecombinedlist} diff --git a/tex/context/base/core-ltb.tex b/tex/context/base/core-ltb.tex index ee00501a1..209f5434e 100644 --- a/tex/context/base/core-ltb.tex +++ b/tex/context/base/core-ltb.tex @@ -11,6 +11,8 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +% testfile: tfmetrics.tex + % todo: als nx>1, dan in geval van rek tussenruimte berekenen en optellen % bij breedte, dus: nx nog niet gebruiken in combinatie met rek ! ! ! ! ! @@ -167,20 +169,19 @@ \def\setnoftableslines {\doifelse{\linetableparameter\c!lines}\v!fit - {% nearly the same as core-tab, so same bugs + {% whitespace already added by vertical strut \ifdim\pagegoal<\maxdimen \scratchdimen\pagegoal \advance\scratchdimen -\pagetotal \else \scratchdimen\textheight \fi - \advance\scratchdimen -\strutdp - \ifdim\prevdepth<\maxdimen\ifdim\prevdepth>\zeropoint - \global\advance\scratchdimen -\strutdp - \global\advance\scratchdimen -\parskip - \fi\fi \getrawnoflines\scratchdimen - \xdef\noflinetablelines{\the\noflines}} + \xdef\noflinetablelines{\the\noflines} +\iflinetablepreroll \else \ifnum\noflinetablelines<\plustwo + \page \setnoftableslines +\fi \fi +} {\xdef\noflinetablelines{\linetableparameter\c!lines}}} \def\startlinetablecell @@ -290,23 +291,15 @@ \iflinetablepreroll % forget about them \else - \doifelse{\linetableparameter\c!lines}\v!fit - {\scratchdimen\pagetotal}% - {\scratchdimen\zeropoint}% \dorecurse\noflinetableparts {\let\linetablepart\recurselevel - \ifdim\scratchdimen>\zeropoint - \ifnum\recurselevel>\plusone - \setbox\scratchbox\vbox to \scratchdimen{\vss}% - \dp\scratchbox\strutdepth - \wd\scratchbox\hsize - \box\scratchbox - \else - \obeydepth - \fi - \fi \dp\tablebox\linetablepart\strutdepth - \hbox to \hsize{\box\tablebox\linetablepart\hss}% + % noindent en endgraf needed else whitespace mess-up! + \whitespace % here not after verticalstrut + \ifdim\topskipgap=\zeropoint\else + \verticalstrut\nobreak\kern-\struttotal\kern-\parskip\nobreak\nointerlineskip % fix topskip + \fi + \noindent\strut\hbox to \hsize{\box\tablebox\linetablepart\hss}\endgraf \ifnum\linetablepart<\noflinetableparts\relax \linetableparameter\c!inbetween \fi}% @@ -327,26 +320,6 @@ \setnoftableslines \fi} -% \def\startlinetablepart -% {\global\linetablesubcol\zerocount -% \setbox\scratchbox\hbox\bgroup\ignorespaces} - -% \def\stoplinetablepart -% {\ifnum\linetablepart>\zerocount -% \unskip \unskip % remove last intercolumn skip (distance+fill) -% \fi -% \egroup -% \iflinetablepreroll \else -% \ifcase\linetablepart -% % we're collecting the repeater -% \else -% \scratchdimen\hsize \advance\scratchdimen-\wd\scratchbox\relax -% \ifdim\scratchdimen>\linetableparameter\c!rek\else -% \setbox\scratchbox\hbox to \hsize{\unhbox\scratchbox}% -% \fi -% \fi -% \fi} - \def\startlinetablepart {\global\linetablesubcol\zerocount \setbox\scratchbox\hbox\bgroup @@ -516,6 +489,9 @@ \global\linetablecolumn \zerocount \global\linetablesubcol \zerocount \global\linetablewidth \zeropoint +\iflinetablepreroll \else \ifdim\pagetotal>\zeropoint + \verticalstrut\kern-\struttotal +\fi \fi \setnoftableslines \checklinetablepage \let\BR\linetableBR diff --git a/tex/context/base/core-mis.tex b/tex/context/base/core-mis.tex index 701da14f6..690dfd4f4 100644 --- a/tex/context/base/core-mis.tex +++ b/tex/context/base/core-mis.tex @@ -81,14 +81,16 @@ %appendtoks \def\executesynonym#1#2#3#4{#3}\to\simplifiedcommands %appendtoks \def\executesort#1#2#3{#3}\to\simplifiedcommands -\appendtoks \def\ { }\to\simplifiedcommands -\appendtoks\def\type#1{\string\\\strippedcsname#1}\to\simplifiedcommands -\appendtoks \def\TeX{TeX}\to\simplifiedcommands -\appendtoks \def\ConTeXt{ConTeXt}\to\simplifiedcommands -\appendtoks \def\MetaPost{MetaPost}\to\simplifiedcommands -\appendtoks \def\MetaFont{MetaFont}\to\simplifiedcommands -\appendtoks \def\MetaFun{MetaFun}\to\simplifiedcommands -\appendtoks \def||{-}\to\simplifiedcommands +\appendtoks \def\ { }\to\simplifiedcommands +\appendtoks \def\type#1{\string\\\strippedcsname#1}\to\simplifiedcommands +\appendtoks \def\TeX{TeX}\to\simplifiedcommands +\appendtoks \def\ConTeXt{ConTeXt}\to\simplifiedcommands +\appendtoks \def\MetaPost{MetaPost}\to\simplifiedcommands +\appendtoks \def\MetaFont{MetaFont}\to\simplifiedcommands +\appendtoks \def\MetaFun{MetaFun}\to\simplifiedcommands +\appendtoks \def||{-}\to\simplifiedcommands + +\appendtoks\let\buildtextaccent\secondoftwoarguments\to\simplifiedcommands % THIS WAS MAIN-002.TEX @@ -1002,83 +1004,42 @@ \popmacro\currentdelimitedtext}} % \definedelimitedtext -% [\v!citaat] -% [\c!links={\symbol[\c!leftquotation]}, -% \c!rechts={\symbol[\c!rightquotation]}, -% \c!linkermarge=\v!standaard] +% [\v!quotation] +% [\c!left={\symbol[\c!leftquotation]}, +% \c!right={\symbol[\c!rightquotation]}, +% \c!leftmargin=\v!standard] % % \definedelimitedtext -% [\v!citeer][\v!citaat] +% [\v!quote][\v!quotation] % % \setupdelimitedtext -% [\v!citeer] -% [\c!plaats=\v!tekst, -% \c!links={\symbol[\c!leftquote]}, -% \c!rechts={\symbol[\c!rightquote]}] +% [\v!quote] +% [\c!location=\v!text, +% \c!left={\symbol[\c!leftquote]}, +% \c!right={\symbol[\c!rightquote]}] % % \definedelimitedtext -% [\v!spraak][\v!citaat] +% [\v!speech][\v!quotation] % % \setupdelimitedtext -% [\v!spraak] -% [\c!herhaal=\v!ja, -% \c!links={\symbol[\c!leftspeech]}, -% \c!midden={\symbol[\c!middlespeech]}, -% \c!rechts={\symbol[\c!rightspeech]}] +% [\v!speech] +% [\c!repeat=\v!yes, +% \c!left={\symbol[\c!leftspeech]}, +% \c!middle={\symbol[\c!middlespeech]}, +% \c!right={\symbol[\c!rightspeech]}] % -% % how do we call an tight quote -% % -% % \definedelimitedtext -% % [x\v!citaat][\v!citaat] -% % -% % \setupdelimitedtext -% % [x\v!citaat] -% % [\c!springvolgendein=\v!nee, -% % \c!voorwit=\v!geenwit] +% how do we call an tight quote % -% \def\stelciterenin{\setupdelimitedtext[\v!citaat]} -% \def\stelcitatenin{\setupdelimitedtext[\v!citeer]} - -% seldom used, move from kernel to run time module - -% Tijden horen hier niet thuis en zullen in een aparte -% module worden ondergebracht. voorlopig handhaven we ze nog -% even. Een implementatie met \doordefinieren zou beter voldoen -% omdat een en ander dan instelbaar wordt. Het is trouwens -% zowieso beter het commando \tijd te reserveren voor de -% systeemtijd. - -\def\tijd#1% - {\setbox0=\hbox{00.00}% - \hbox to \wd0{\hfill#1}} - -\def\tijdspan#1#2% - {\hbox{\tijd{#1}~---~\tijd{#2}}} - -\def\activiteit#1#2% - {\activity{\tijdspan{#1}{#2}}} - -\def\activiteit#1#2% - {\sym{\tijdspan{#1}{#2}}} - -% seldom used, move from kernel to run time module - -\def\doadding#1% - {\def\next{#1}% - \dorecurse{#1}{\inleft{\next~+}\let\next\empty\crlf}} - -\def\complexadding[#1]% - {\blank - \processaction - [#1] - [ \v!small=>\doadding{3}, - \v!medium=>\doadding{6}, - \v!big=>\doadding{9}, - \s!default=>\doadding{6}, - \s!unknown=>\doadding{#1}] - \blank} - -\definecomplexorsimpleempty\adding +% \definedelimitedtext +% [\v!quotation][\v!quotation] +% +% \setupdelimitedtext +% [\v!quotation] +% [\c!indentnext=\v!no, +% \c!spacebefore=\v!nowhite] +% +% \def\setupquotation{\setupdelimitedtext[\v!quotation]} +% \def\setupquote {\setupdelimitedtext[\v!quote]} % seldom used, move from kernel to run time module @@ -1213,6 +1174,8 @@ % % eigenlijk kan ook door... zo worden uitgebreid! +% old, will become obsolete or module, replace by bib module + \defineenumeration [@publicatie] [\c!location=\v!left, @@ -1317,43 +1280,43 @@ \def\referral {\dosingleargument\doreferral} -% NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW -% NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW - -\def\??ri{@@ri} - -\def\stelrijenin - {\dodoubleargument\getparameters[\??ri]} - -\def\complexstartrijen[#1]% - {\bgroup - \stelrijenin[#1]% - \let\do@@rionder\relax - \def\rij - {\do@@rionder - \egroup - \dimen0\vsize - \divide\dimen0 \@@rin - \advance\dimen0 -\lineskip - \vbox to \dimen0 - \bgroup - \@@riboven - \let\do@@rionder\@@rionder - \ignorespaces}% - \bgroup - \rij} - -\definecomplexorsimpleempty\startrijen - -\def\stoprijen - {\do@@rionder - \egroup - \egroup} - -\stelrijenin - [\c!n=2, - \c!top=, - \c!bottom=\vfill] +% FUZZY OLD STUFF: will be removed when not used in some manual; +% rows instead of columns, i'd forgotten that this code exist +% +% \definesystemvariable{ri} +% +% \def\setuprows +% {\dodoubleargument\getparameters[\??ri]} +% +% \definecomplexorsimpleempty\startrows +% +% \def\complexstartrows[#1]% +% {\bgroup +% \setuprows[#1]% +% \let\do@@ribottom\relax +% \def\row +% {\do@@ribottom +% \egroup +% \dimen0\vsize +% \divide\dimen0 \@@rin +% \advance\dimen0 -\lineskip +% \vbox to \dimen0 +% \bgroup +% \@@ritop +% \let\do@@ribottom\@@ribottom +% \ignorespaces}% +% \bgroup +% \row} +% +% \def\stoprows +% {\do@@ribottom +% \egroup +% \egroup} +% +% \setuprows +% [\c!n=2, +% \c!top=, +% \c!bottom=\vfill] % THIS WAS MAIN-003.TEX @@ -1585,8 +1548,8 @@ \c!inbetween={\blank[\v!medium]}, \c!width=\hsize, \c!height=\vsize, - \c!maxwidth=\makeupwidth, - \c!maxheight=\makeupheight, + \c!maxwidth=\textwidth, % \makeupwidth, + \c!maxheight=\textheight, % \makeupheight, \c!bodyfont=, \c!align=, \c!location=\v!bottom, diff --git a/tex/context/base/core-new.tex b/tex/context/base/core-new.tex index 3909356d2..339cfde40 100644 --- a/tex/context/base/core-new.tex +++ b/tex/context/base/core-new.tex @@ -323,6 +323,21 @@ \def\systemsetupsprefix{*} \def\systemsetups#1{\dosetups{\systemsetupsprefix#1}} + +\def\resetsetups[#1]% see x-fo for usage + {\ifundefined{\??su\ifgridsnapping\v!grid\fi:#1}% + \letbeundefined{\??su:#1}% + \else + \letbeundefined{\??su\ifgridsnapping\v!grid\fi:#1}% + \fi} + +% or +% +% \def\resetsetups[#1]% +% {\letbeundefined +% {\??su:% +% \ifundefined{\??su\ifgridsnapping\v!grid\fi:#1}#1\else\ifgridsnapping\v!grid\fi% +% #1}} % new % diff --git a/tex/context/base/core-ntb.tex b/tex/context/base/core-ntb.tex index 9edc7b431..c136b737a 100644 --- a/tex/context/base/core-ntb.tex +++ b/tex/context/base/core-ntb.tex @@ -260,7 +260,9 @@ \executeifdefined{\@@tblprefix\v!header#2}\donothing \fi \executeifdefined{\@@tblprefix\c!y#1}\donothing +\getvalue{\@@tbl\@@tbl\c!extras}\letvalue{\@@tbl\@@tbl\c!extras}\relax % new, see x-fo \executeifdefined{\@@tblprefix\c!x#2}\donothing +\getvalue{\@@tbl\@@tbl\c!extras}\letvalue{\@@tbl\@@tbl\c!extras}\relax % new, see x-fo \executeifdefined{\@@tblprefix\c!x#2\c!y#1}\donothing \global\letcscsname\@@tblsplitafter\csname\@@tbl\@@tbl\c!after\endcsname \relax} @@ -278,14 +280,57 @@ % \long\def\parseTR[#1][#2]#3\eTR% [#2] is dummy that kills spaces % {\def\currentcol{0}\increment\maximumrow#3} -\long\def\parseTR[#1][#2]#3\eTR% [#2] is dummy that kills spaces +\def\parseTR[#1][#2]% [#2] is dummy that kills spaces / no #3 argument {\def\currentcol{0}\increment\maximumrow \let\currentcolpos\currentcol - \setupTABLE[\v!row][\maximumrow][#1]#3} + \let\eTR\relax % handy in \expanded + \setupTABLE[\v!row][\maximumrow][#1]} + +% \long\def\parseTD[#1][#2]#3\eTD % [#2] is dummy that kills spaces +% {\getparameters[\@@tbl][\c!ny=\tblnr,\c!nx=\tblnc,nc=1,nr=1,#1]% +% % goto first cell +% \doloop +% {\increment\currentcol +% \doifnottbltag\maximumrow\currentcol\exitloop}% +% % fill r*c cells and set span +% \let\row\maximumrow +% \let\col\currentcol +% \dorecurse\tblny +% {\let\col\currentcol +% \settblcol\row\col\tblnx +% \ifnum\tblnx>\maximumrowspan\relax +% \let\maximumrowspan\tblnx +% \fi +% \dorecurse\tblnx +% {\settbltag\row\col\tblnone +% \increment\col}% +% \increment\row}% +% % check max column +% \decrement\col +% \ifnum\col>\maximumcol\relax +% \let\maximumcol\col +% \fi +% % set values +% \settbltag\maximumrow\currentcol\tblcell +% \settblcol\maximumrow\currentcol\tblnx +% \settblrow\maximumrow\currentcol\tblny +% % save text +% \edef\celltag{{\maximumrow}{\currentcol}}% +% \@EA\settbltxt\@EA\maximumrow\@EA\currentcol\@EA +% {\@EA\handleTBLcell\celltag[#1]{#3}}} \long\def\parseTD[#1][#2]#3\eTD % [#2] is dummy that kills spaces - {\getparameters[\@@tbl][\c!ny=\tblnr,\c!nx=\tblnc,nc=1,nr=1,#1]% - % goto first cell + {\getparameters[\@@tbl][\c!ny=\tblnr,\c!nx=\tblnc,nc=1,nr=1,\c!n=\currentcol,#1]% + % goto first cell % NEW, n=cellnumber + \increment\currentcolpos + \doifvaluesomething{\@@tbl\c!n} + {\ifnum\getvalue{\@@tbl\c!n}=\currentcol\else + \scratchcounter\getvalue{\@@tbl\c!n}% + \advance\scratchcounter-\currentcol + \advance\scratchcounter\plusone + \expanded{\parseTD[][\c!nx=\the\scratchcounter]}\eTD + \getparameters[\@@tbl][\c!ny=\tblnr,\c!nx=\tblnc,nc=1,nr=1,\c!n=\currentcol,#1]% + \fi}% \doloop {\increment\currentcol \doifnottbltag\maximumrow\currentcol\exitloop}% @@ -831,10 +876,81 @@ \let\extratblsplitheight\zeropoint % additional space taken by before/afterTABLEsplitbox +% \def\splittblboxb#1% +% {\testpage[2]% quite save since a row is > 1 lineheight and we don't want one-liners +% \setbox\TABLEsplitbox\vbox{#1}% +% \setbox8\vbox{\doifsomething\tbltblspaceinbetween{\blank[\tbltblspaceinbetween]}}% +% \ifmultipleTBLheads +% \setbox2\vbox{}% +% \setbox4\vbox{}% +% \dorecurse\noftblheadlines +% {\setbox0\vsplit\TABLEsplitbox to \lineheight +% \setbox2\vbox{\unvcopy2\unvcopy0}}% +% \dorecurse\noftblnextlines +% {\setbox0\vsplit\TABLEsplitbox to \lineheight +% \setbox4\vbox{\unvcopy4\unvcopy0}}% +% \fi +% \!!doneafalse +% \doloop +% {\ifdim\pagegoal<\maxdimen +% \scratchdimen\pagegoal +% \advance\scratchdimen-\pagetotal +% \else +% \scratchdimen\textheight +% \fi +% \ifmultipleTBLheads +% \ifcase\noftblheadlines\else +% \advance\scratchdimen-\ht2 +% \fi +% \fi +% \advance\scratchdimen-\ht8 +% \getnoflines\scratchdimen +% \ifdim\noflines\lineheight>\scratchdimen +% \advance\scratchdimen-\lineheight +% \fi +% \advance\scratchdimen-\extratblsplitheight +% \setbox\finaltblbox\vbox +% {\ifmultipleTBLheads +% \ifcase\noftblheadlines\else +% \unvcopy2 +% \doifsomething\tbltblspaceinbetween{\blank[\tbltblspaceinbetween]}% +% \fi +% \fi +% \setbox0\vsplit\TABLEsplitbox to\scratchdimen +% \unvbox0}% +% \if!!donea\else\ifcase\noftblnextlines\else +% \setbox2\box4 +% \fi\fi +% \!!doneatrue +% \postprocessTABLEsplitbox\finaltblbox +% \ifvoid\TABLEsplitbox +% \beforeTABLEsplitbox +% \box\finaltblbox +% \afterTABLEsplitbox +% \@@tblsplitafter +% \exitloop +% \else +% % hack +% \scratchdimen\pagegoal +% \ifdim\scratchdimen<\maxdimen +% \advance\scratchdimen \lineheight +% \global\pagegoal\scratchdimen +% \fi +% % brrr +% \beforeTABLEsplitbox +% \box\finaltblbox +% \afterTABLEsplitbox +% \@@tblsplitafter +% \page +% \fi}} + \def\splittblboxb#1% - {\testpage[2]% quite save since a row is > 1 lineheight and we don't want one-liners + {\scratchdimen-\extratblsplitheight + \advance\scratchdimen-\tbltblsplitoffset + \expanded{\testpage[2][\the\scratchdimen]}% quite save since a row is > 1 lineheight and we don't want one-liners \setbox\TABLEsplitbox\vbox{#1}% - \setbox8\vbox{\doifsomething\tbltblspaceinbetween{\blank[\tbltblspaceinbetween]}}% + \setbox8\vbox{\doifsomething\tbltblspaceinbetween{\blanko[\tbltblspaceinbetween]}}% + \dimen8\ht8\advance\dimen8\dp8 \ifmultipleTBLheads \setbox2\vbox{}% \setbox4\vbox{}% @@ -853,30 +969,43 @@ \else \scratchdimen\textheight \fi - \ifmultipleTBLheads - \ifcase\noftblheadlines\else - \advance\scratchdimen-\ht2 - \fi - \fi - \advance\scratchdimen-\ht8 - \getnoflines\scratchdimen - \ifdim\noflines\lineheight>\scratchdimen - \advance\scratchdimen-\lineheight - \fi + \advance\scratchdimen-\dimen8 \advance\scratchdimen-\extratblsplitheight + \advance\scratchdimen-\tbltblsplitoffset \setbox\finaltblbox\vbox {\ifmultipleTBLheads \ifcase\noftblheadlines\else - \unvcopy2 - \doifsomething\tbltblspaceinbetween{\blank[\tbltblspaceinbetween]}% + \unvcopy2 \doifsomething\tbltblspaceinbetween{\blank[\tbltblspaceinbetween]}% \fi - \fi - \setbox0\vsplit\TABLEsplitbox to\scratchdimen - \unvbox0}% + \fi}% \if!!donea\else\ifcase\noftblnextlines\else \setbox2\box4 \fi\fi \!!doneatrue + % alternatively we could use a kind of balancing like splitter + % first to scratchdimen and then smaller etc; more code and copy -) + \doloop + {\setbox\scratchbox\vsplit\TABLEsplitbox to \onepoint + \setbox\scratchbox\vbox{\unvbox\scratchbox}% + \bgroup + \advance\scratchdimen-\ht\scratchbox + \advance\scratchdimen-\dp\scratchbox + \advance\scratchdimen-\ht\finaltblbox + \advance\scratchdimen-\dp\finaltblbox\relax + \ifdim\scratchdimen>\zeropoint + \egroup + \setbox\finaltblbox\vbox + {\unvbox\finaltblbox + \unvbox\scratchbox}% + \ifvoid\TABLEsplitbox \exitloop \fi + \else + \egroup + \setbox\TABLEsplitbox\vbox + {\unvbox\scratchbox + \ifvoid\TABLEsplitbox\else\unvbox\TABLEsplitbox\allowbreak\fi}% + \exitloop + \fi}% + % \postprocessTABLEsplitbox\finaltblbox \ifvoid\TABLEsplitbox \beforeTABLEsplitbox @@ -885,9 +1014,9 @@ \@@tblsplitafter \exitloop \else - % hack - \scratchdimen\pagegoal - \ifdim\scratchdimen<\maxdimen + % hack + \ifdim\pagegoal<\maxdimen + \scratchdimen\pagegoal \advance\scratchdimen \lineheight \global\pagegoal\scratchdimen \fi @@ -896,7 +1025,7 @@ \box\finaltblbox \afterTABLEsplitbox \@@tblsplitafter - \page + \pagina \fi}} % ! ! ! ! TODO: naast \postprocessTABLEsplitbox ook evt \postprocessTABLEbox voor niet split diff --git a/tex/context/base/core-ref.tex b/tex/context/base/core-ref.tex index 238fd3390..49f8c4e24 100644 --- a/tex/context/base/core-ref.tex +++ b/tex/context/base/core-ref.tex @@ -164,7 +164,7 @@ \def\dotextreference[#1]#2% {\bgroup \def\asciia{#1}% - \convertexpanded\??rf{#2}\asciib + \convertexpanded\@@rfexpansion{#2}\asciib \@EA\rawtextreference\@EA\s!txt\@EA\asciia\@EA{\asciib}% \egroup} @@ -174,7 +174,7 @@ \def\doreference[#1]#2% {\bgroup \def\asciia{#1}% - \convertexpanded\??rf{#2}\asciib + \convertexpanded\@@rfexpansion{#2}\asciib \@EA\rawreference\@EA\s!ref\@EA\asciia\@EA{\asciib}% \egroup} @@ -2884,6 +2884,8 @@ \def\douseURL[#1][#2]% {\egroup\doquadrupleempty\dodouseURL[#1][#2]} +\let\useurl\useURL + % \def\dodouseURL[#1][#2][#3][#4]% % {\iffirstargument % \iffourthargument\setgvalue{\v!file:::#1}{\doexternaldocument{#2}{#3}{#4}}\else @@ -3410,7 +3412,7 @@ \def\docoupledocument[#1][#2][#3][#4]% is this :/- safe ? {\ifthirdargument \begingroup - \def\dolijstelement##1##2##3##4##5##6% 2=aut 6=pag / 2 goes into text ref slot + \def\dolistelement##1##2##3##4##5##6% 2=aut 6=pag / 2 goes into text ref slot {\global\utilitydonetrue %{Watch the braces here below!} \setglobalcrossreference{{##1::\@@filterblocknumberpart[##5]}}{}{##6}{##2}}% \def\usereferences[##1]% diff --git a/tex/context/base/core-reg.tex b/tex/context/base/core-reg.tex index d9a94631d..9bf43bf45 100644 --- a/tex/context/base/core-reg.tex +++ b/tex/context/base/core-reg.tex @@ -74,26 +74,34 @@ \processseparatedlist[#1][+]\docommando \!!stringa} +% \enableregime[windows] \setupregister[index][keyexpansion=strict] +% +% \index[Ätsch]{Ätsch} test \index{QÄtsch} test \index[ratsch]{RÄtsch} test + \def\doprocesspageregister[#1]#2#3% key altnum entry {\begingroup \thisisnextinternal\s!ind \ifduplicate\getlastregisterentry{#3}\fi - \convertexpanded{\??id\currentregister}{#3}\asciiregisterentry + \convertexpanded{\getvalue{\??id\currentregister\c!keyexpansion}}{#1}\asciiregisterentryA + \convertexpanded{\getvalue{\??id\currentregister\c!expansion }}{#3}\asciiregisterentryB +\doifvaluesomething{\??id\currentregister\c!keyexpansion} + {\ifx\asciiregisterentryA\empty + \convertexpanded{\getvalue{\??id\currentregister\c!keyexpansion}}{#3}\asciiregisterentryA + \fi}% \makesectionformat \doifelsevalue{\??id\currentregister\c!ownnumber}\v!yes \donetrue\donefalse % the spaces between } { are essential for texutil's split - \edef\schrijfwegnaarregister% + \expanded {\writeutility% {r \ifcase\registerpagestatus\space\or e \or f \or t \fi {\currentregister} % {\nextinternalreference} % - {#1} % - {\asciiregisterentry} % + {\asciiregisterentryA} % + {\asciiregisterentryB} % {\sectionformat\sectionseparator\sectionseparator \ifdone#2\else\noexpand\pagenumber\fi} % {\noexpand\realfolio}}}% - \schrijfwegnaarregister \getfirstcharacter\currentregister \registerinfo{> \firstcharacter}{#3}% \endgroup} @@ -140,54 +148,32 @@ \def\dostopregister[#1][#2]% {\getvalue{\??id#1\??id#2}\setgvalue{\??id#1\??id#2}{}} -%\def\dodostopregister[#1][#2]% -% {\chardef\registerpagestatus=3 -% \def\currentregister{#1}% -% \complexdoregister[#2]} - \def\dodostopregister[#1][#2]% {\chardef\registerpagestatus3 \def\currentregister{#1}% \donoregister[#2]} -% \def\complexdozieregister[#1]#2#3% -% {\begingroup -% \thisisnextinternal\s!ind -% \ifduplicate\getlastregisterentry{#2}\fi -% \convertexpanded{\??id\currentregister}{#2}\asciiregisterentryA -% \convertexpanded{\??id\currentregister}{#3}\asciiregisterentryB -% \makesectionformat -% \edef\schrijfwegnaarregister% -% {\writeutility% -% {r s % -% {\currentregister} % -% {\nextinternalreference} % -% {#1} % -% {\asciiregisterentryA} % -% {\asciiregisterentryB} % -% {\sectionformat}}}% -% \schrijfwegnaarregister -% \endgroup -% \registerinfo{> zie}{#2}% -% \GotoPar} - \def\complexdozieregister[#1]#2#3% {\begingroup \thisisnextinternal\s!ind \ifduplicate\getlastregisterentry{#2}\fi - \convertexpanded{\??id\currentregister}{#2}\asciiregisterentryA - \convertexpanded{\??id\currentregister}{#3}\asciiregisterentryB + \convertexpanded{\getvalue{\??id\currentregister\c!keyexpansion}}{#1}\asciiregisterentryA + \convertexpanded{\getvalue{\??id\currentregister\c!expansion }}{#2}\asciiregisterentryB + \convertexpanded{\getvalue{\??id\currentregister\c!expansion }}{#3}\asciiregisterentryC +\doifvaluesomething{\??id\currentregister\c!keyexpansion} + {\ifx\asciiregisterentryA\empty + \convertexpanded{\getvalue{\??id\currentregister\c!keyexpansion}}{#2}\asciiregisterentryA + \fi}% \makesectionformat - \edef\schrijfwegnaarregister% + \expanded {\writeutility% {r s % {\currentregister} % {\nextinternalreference} % - {#1} % {\asciiregisterentryA} % {\asciiregisterentryB} % + {\asciiregisterentryC} % {\sectionformat}}}% - \schrijfwegnaarregister \endgroup \registerinfo{> zie}{#2}% \GotoPar} @@ -196,10 +182,6 @@ {\def\currentregister{#1}% \complexorsimpleempty\dozieregister} -%\def\doschrijfnaarregister[#1]% % de twee-traps-aanroep is nodig -% {\edef\currentregister{#1}% % om gebruik van \ExpandBothAfter -% \doprocesspageregister} % mogelijk te maken - \def\dowritetoregister[#1]% % de twee-traps-aanroep is nodig {\edef\currentregister{#1}% % om gebruik van \ExpandBothAfter \doprocesspageregister{}} % mogelijk te maken @@ -308,61 +290,6 @@ \def\dosetpageregisterpage#1#2#3#4#5#6% {\doifreglevelelse[#5]{\dodosetpageregisterpage{#1}{#2}{#3}{#4}{#5}{#6}}{}} -% \def\dodosetpageregisterpage#1#2#3#4#5#6% -% {\global\utilitydonetrue -% \c!entryletter -% \setregisterhowto[#3]% -% \def\dohandleregisterentry##1% -% {\bgroup -% \if!!donea % \strut nieuw -% \setbox0\hbox{\showlocation{\doregistertexthowto{#2} -% {\strut\limitedregisterentry{#2}{##1}}}}% -% \gotonextinternal{\s!ind}{#4}{#6}{\box0}% -% \else -% \doregistertexthowto{#2}{##1}% -% \fi -% \egroup -% \!!doneafalse}% -% \!!doneafalse -% \doifelsevalue{\??id#2\c!interactie}\v!tekst -% {\ifcase\currententrylevel \or -% \!!doneatrue\c!entrya\c!entryb\c!entryc \or -% \c!entrya\!!doneatrue\c!entryb\c!entryc \or -% \c!entrya\c!entryb\!!doneatrue\c!entryc \fi} -% {\c!entrya\c!entryb\c!entryc}% -% \global\let\c!entrya\relax -% \global\let\c!entryb\relax -% \global\let\c!entryc\relax -% \global\let\c!entryletter\relax -% \global\let\c!entryreference\relax -% % \global\firstregisterentrytrue -% \iffirstregisterpage -% \global\chardef\lastregisterpagestatus\zerocount -% \expandafter\hskip\getvalue{\??id#2\c!afstand}\relax -% \donetrue -% \else\ifnum#1=3 -% |--|\relax % -- ! -% \donetrue -% \else\ifnum\lastregisterpagestatus=2 -% \donefalse % waiting for "to" pagenumber -% \else -% \registerpageseparator -% |\space|\relax % \relax needed because | looks ahead -% \donetrue -% \fi\fi\fi -% \ifdone -% \doifelsevalue{\??id#2\c!interactie}\v!paginanummer -% {\bgroup -% \setbox0\hbox -% {\showlocation{\doregisterpage{#2}[#5]\ifnum#1=2\/\fi}}% -% \gotonextinternal\s!ind{#4}{#6}{\box0}%{\copy0}% -% \egroup} -% {\hbox{\doregisterpage{#2}[#5]\ifnum#1=2\/\fi}}% -% \ignorespaces -% \global\chardef\lastregisterpagestatus#1\relax -% \fi -% \global\firstregisterpagefalse} - \def\dodosetpageregisterpage#1#2#3#4#5#6% {\global\utilitydonetrue \c!entryletter @@ -557,7 +484,7 @@ {\dosetfilterlevel{\getvalue{\??id#1\c!criterium}}\empty} \def\getalllistreferences#1#2% - {\doglobal\convertexpanded{\??id#1}{#2}\currentregisterentry + {\doglobal\convertexpanded{\getvalue{\??id#1\c!expansion}}{#2}\currentregisterentry \doifdefinedelse{\??id#1\??id\currentregisterentry} {\edef\alllistreferences% {\getvalue{\??id#1\??id\currentregisterentry}}% @@ -959,7 +886,8 @@ \c!maxwidth=, \c!number=\v!no, \c!unknownreference=\v!empty, - \c!expansion=]% + \c!expansion=, + \c!keyexpansion=]% \presetheadtext[#1=\Word{#1}]% \addutilityreset{#1}% \setvalue{#1}{\doregister{#1}}% @@ -971,7 +899,7 @@ \setvalue{\e!complete#1}{\completeregister[#1]}% \setvalue{\e!setup#1\e!endsetup}[##1]{\getparameters[\??id#1][##1]}} -\def\defineregister% +\def\defineregister {\dodoubleargument\dodefineregister} \def\registerlengte{\utilityregisterlength} diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex index 9b07ba067..47d04e399 100644 --- a/tex/context/base/core-sec.tex +++ b/tex/context/base/core-sec.tex @@ -608,9 +608,9 @@ % % meaner % -% \stellijstin -% [hoofdstuk] -% [na={\startkolommen\plaatslijst[paragraaf]\stopkolommen}] +% \setuplist +% [chapter] +% [after={\startcolumns\placelist[section]\stopcolumns}] \def\somesavedlevel{0} @@ -1151,7 +1151,7 @@ {\begingroup \setsectieenkoppeling{#1}% \xdef\foundsectionnumber{1}% - \def\dolijstelement##1##2##3##4##5##6% + \def\dolistelement##1##2##3##4##5##6% {\doif{##1}{#1} {\ConvertConstantAfter\doif{##4}{#3} {\global\utilitydonetrue @@ -1374,7 +1374,7 @@ \else \headnumberfalse \fi - \convertexpanded{\??ko#1}{#4}\asciititle + \convertexpanded{\getvalue{\??ko#1\c!expansion}}{#4}\asciititle % \gdef\currentheadtext{#4}% scheelt args \globallet\currentheadnumber\empty @@ -1585,8 +1585,8 @@ \def\stoplistreferences{\dostoplistreferences}} \def\dostoplistreferences#1% - {\iflijstgeplaatst - \addtocommalist{#1}\updatedlistreferences % nog global (\doglobal) + {\ifutilitydone + \addtocommalist{#1}\updatedlistreferences % nog global (\doglobal) \globallet\updatedlistreferences\updatedlistreferences % een noodverbandje \gdef\updatelistreferences% {\def\docommando####1% @@ -1606,9 +1606,9 @@ % \prevdepth\strutdp % is belangrijk, vergelijk naast elkaar: % -% \onderwerp{test} \input tufte -% \onderwerp{test} \strut \input tufte -% \onderwerp{test} \plaatslijst[...] +% \subject{test} \input tufte +% \subject{test} \strut \input tufte +% \subject{test} \placelist[...] % todo: kap @@ -2187,13 +2187,13 @@ \definesectionblock [\v!frontpart] [\v!frontmatter] [\c!number=\v!no] \definesectionblock [\v!backpart] [\v!backmatter] [\c!number=\v!no] -\definesection[\v!sectionlevel-1] % deel -\definesection[\v!sectionlevel-2] % hoofdstuk -\definesection[\v!sectionlevel-3] % paragraaf -\definesection[\v!sectionlevel-4] % subparagraaf -\definesection[\v!sectionlevel-5] % subsubparagraaf -\definesection[\v!sectionlevel-6] % subsubsubparagraaf -\definesection[\v!sectionlevel-7] % subsubsubsubparagraaf +\definesection[\v!sectionlevel-1] % part +\definesection[\v!sectionlevel-2] % chapter +\definesection[\v!sectionlevel-3] % section +\definesection[\v!sectionlevel-4] % subsection +\definesection[\v!sectionlevel-5] % subsubsection +\definesection[\v!sectionlevel-6] % subsubsubsection +\definesection[\v!sectionlevel-7] % subsubsubsubsection % \c!eigennummer ook hier? diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex index 3ebc072e8..488b63c88 100644 --- a/tex/context/base/core-spa.tex +++ b/tex/context/base/core-spa.tex @@ -152,7 +152,7 @@ \ifdim\scratchdimen>\onepoint \showmessage\m!layouts{10}{\@@itheight,\@@itdepth}% \let\@@itheight\strutheightfactor - \let\@@itdepth\strutdepthfactor + \let\@@itdepth \strutdepthfactor \else \let\strutheightfactor\@@itheight \let\strutdepthfactor \@@itdepth @@ -161,7 +161,9 @@ \let\minimumstrutdepth \@@itmindepth \let\minimallinedistance\@@itdistance \let\normallineheight \@@itline % let ! ! ! ! ! ivm ex - \let\topskipfactor \@@ittop + \doifelse\@@ittop\v!height % new, topskip does more bad than good + {\let\topskipfactor \@@itheight} + {\let\topskipfactor \@@ittop }% \let\maxdepthfactor \@@itbottom \let\baselinegluefactor \@@itstretch \setfontparameters % redundant, can be \setstrut, test first @@ -220,7 +222,7 @@ \def\normalskipamount {\openlineheight \ifgridsnapping \else \ifblankoflexibel - \!!plus\skipgluefactor\openlineheight + \!!plus \skipgluefactor\openlineheight \!!minus\skipgluefactor\openlineheight \fi \fi \relax} @@ -912,7 +914,7 @@ \fi \iflokaalblankoflexibel \blankoskip1\blankoskip - \!!plus\skipgluefactor\blankoskip + \!!plus \skipgluefactor\blankoskip \!!minus\skipgluefactor\blankoskip \fi \ifdim\lastkern=\noblanksignal\relax % controlled and grid @@ -1463,17 +1465,17 @@ \def\definewhitespacemethod[#1]#2{\setvalue{\??ws\??ws#1}{#2}} -\definewhitespacemethod [\v!fix] {} -\definewhitespacemethod [\v!fixed] {\witruimteflexibelfalse} -\definewhitespacemethod [\v!flexible] {\witruimteflexibeltrue} -\definewhitespacemethod [\v!line] {\ctxparskip \baselineskip} +\definewhitespacemethod [\v!fix] {} +\definewhitespacemethod [\v!fixed] {\witruimteflexibelfalse} +\definewhitespacemethod [\v!flexible] {\witruimteflexibeltrue} +\definewhitespacemethod [\v!line] {\ctxparskip \baselineskip} \definewhitespacemethod [\v!halfline] {\ctxparskip.5\baselineskip} -\definewhitespacemethod [\v!none] {\ctxparskip \zeropoint} +\definewhitespacemethod [\v!none] {\ctxparskip \zeropoint} \definewhitespacemethod [\v!big] {\ctxparskip \blankogrootmaat} -\definewhitespacemethod [\v!medium] {\ctxparskip \blankomiddelmaat} -\definewhitespacemethod [\v!small] {\ctxparskip \blankokleinmaat} +\definewhitespacemethod [\v!medium] {\ctxparskip \blankomiddelmaat} +\definewhitespacemethod [\v!small] {\ctxparskip \blankokleinmaat} -\definewhitespacemethod [\s!default] {\stelwitruimteopnieuwin} +\definewhitespacemethod [\s!default] {\stelwitruimteopnieuwin} \def\dowhitespacemethod#1% {\executeifdefined{\??ws\??ws#1}{\ctxparskip#1}\relax} @@ -1580,9 +1582,8 @@ % Ze spelen een rol bij de spatiering rond omkaderde teksten % en/of boxen zonder diepte. -\def\toonregelcorrectie {\showbaselinecorrection} -\def\regelcorrectie {\baselinecorrection} - +\def\toonregelcorrectie{\showbaselinecorrection} +\def\regelcorrectie {\baselinecorrection} % \prevdepth crosses pageboundaries! @@ -1758,8 +1759,8 @@ {\maxdepth\systemmaxdepthfactor\globalbodyfontsize} \def\normalbaselines - {\baselineskip\normalbaselineskip - \lineskip\normallineskip + {\baselineskip \normalbaselineskip + \lineskip \normallineskip \lineskiplimit\normallineskiplimit} % \def\setnormalbaselines @@ -1802,8 +1803,10 @@ \endgroup \fi \normalbaselineskip\openlineheight - \!!plus\baselinegluefactor\openlineheight +\ifgridsnapping\else + \!!plus \baselinegluefactor\openlineheight \!!minus\baselinegluefactor\openlineheight +\fi \normallineskip\minimallinedistance\relax % \onepoint\relax \normallineskiplimit\zeropoint\relax \normalbaselines} diff --git a/tex/context/base/core-syn.tex b/tex/context/base/core-syn.tex index 8d49b0196..7f8a35149 100644 --- a/tex/context/base/core-syn.tex +++ b/tex/context/base/core-syn.tex @@ -105,8 +105,8 @@ \def\dowritesynonym#1#2#3#4% {\begingroup % anders in mathmode lege \hbox - \convertexpanded{\??sm#1}{#3}\asciisynonym - \convertexpanded{\??sm#1}{#4}\asciimeaning + \convertexpanded{\getvalue{\??sm#1\c!expansion}}{#3}\asciisynonym + \convertexpanded{\getvalue{\??sm#1\c!expansion}}{#4}\asciimeaning \immediatewriteutility{s e {#1} {#2} {\asciisynonym} {\asciimeaning}}% \endgroup} @@ -247,7 +247,7 @@ \def\dowritesort#1#2#3% {\bgroup - \convertexpanded{\??so#1}{#3}\asciisynonym + \convertexpanded{\getvalue{\??so#1\c!expansion}}{#3}\asciisynonym \immediatewriteutility{s e {#1} {#2} {\asciisynonym} {}}% \egroup} diff --git a/tex/context/base/core-sys.tex b/tex/context/base/core-sys.tex index 9fc3f034b..459330694 100644 --- a/tex/context/base/core-sys.tex +++ b/tex/context/base/core-sys.tex @@ -234,43 +234,44 @@ \newif\ifforcefileexpansion % handy for document level overload -% \def\convertexpanded#1#2#3% watch the double \v!ja expansion ! -% {\ExpandFirstAfter\processaction -% [\ifforcefileexpansion\v!ja\else\getvalue{#1\c!expansie}\fi] -% [ \v!ja=>{{\honorunexpanded -% \dontexpandencoding % new -% \xdef\@@globalexpanded{#2}% -% \xdef\@@globalexpanded{\@@globalexpanded}}% -% \convertcommand\@@globalexpanded\to#3}, -% \v!commando=>{\convertcommand #2\to#3}, -% \s!default=>{\convertargument#2\to#3}, -% \s!unknown=>{\convertargument#2\to#3}]} - -%D The next implementation is about 4 times as fast on an -%D string of average length. Since this feature is used in -%D XML processing, it made sense to support this faster -%D alternative. +%D The next implementation is about 4 times as faster than a +%D processaction alternative on an string of average length. +%D Since this feature is used in XML processing, it made sense +%D to support this faster alternative. It's installable as well. \def\installexpander#1{\setvalue{\s!do\c!expansion#1}} +% \long\def\convertexpanded#1#2#3% hm, first we need to make sure +% {\csname % that we assign all exp a value +% \s!do\c!expansion +% \ifforcefileexpansion +% \v!yes +% \else\@EA\ifx\csname\s!do\c!expansion\csname#1\c!expansion\endcsname\endcsname\relax +% \s!default +% \else +% \csname#1\c!expansion\endcsname +% \fi\fi +% \endcsname#2\to#3} + \long\def\convertexpanded#1#2#3% hm, first we need to make sure {\csname % that we assign all exp a value \s!do\c!expansion \ifforcefileexpansion \v!yes - \else\@EA\ifx\csname\s!do\c!expansion\csname#1\c!expansion\endcsname\endcsname\relax + \else\@EA\ifx\csname\s!do\c!expansion#1\endcsname\relax \s!default \else - \csname#1\c!expansion\endcsname + #1% \fi\fi \endcsname#2\to#3} -\installexpander\v!yes {\convertmeaning } -\installexpander\v!yes {\convertmeaning } \installexpander\v!command{\convertcommand } -\installexpander\s!default {\convertargument} -\installexpander\empty {\convertargument} +\installexpander\s!default{\convertargument} +\installexpander\empty {\convertargument} \installexpander\v!no {\convertargument} +\installexpander\v!yes {\convertmeaning } +\installexpander\v!yes {\convertmeaning } +\installexpander\v!strict {\reduceargument} \def\convertmeaning#1\to % watch the double expansion ! {\bgroup @@ -280,6 +281,12 @@ \xdef\@@globalexpanded{\@@globalexpanded}% \egroup \convertcommand\@@globalexpanded\to} + +\def\reduceargument#1\to#2% + {\begingroup + \reducetocoding[raw]% + \edef\ascii{#1}% + \expandafter\endgroup\expandafter\edef\expandafter#2\expandafter{\ascii}} % \setvalue{statevalue\v!stop }{0} % \setvalue{statevalue\v!start }{1} diff --git a/tex/context/base/enco-ini.tex b/tex/context/base/enco-ini.tex index 85ba61ad7..8c0dd176e 100644 --- a/tex/context/base/enco-ini.tex +++ b/tex/context/base/enco-ini.tex @@ -1308,12 +1308,17 @@ \let\normalmathaccent\mathaccent \let\normalchar \char -\def\buildtextaccent +% ** we will explicitly embrace the two arguments, since in definitions +% this may not be the case, and we don't want faulty expansions like +% "\dobuildtextaccent \char 18 a" but "\dobuildtextaccent {\char 18}{a}" +% instead + +\def\buildtextaccent#1#2% ** {\ifignoreaccent \expandafter\nobuildtextaccent \else \expandafter\dobuildtextaccent - \fi} + \fi{#1}{#2}} \unexpanded\def\dobuildtextaccent#1#2% {{\let\char\normalaccent#1\let\char\normalchar#2}} diff --git a/tex/context/base/enco-pdf.tex b/tex/context/base/enco-pdf.tex index f6d5b2265..a03e81df2 100644 --- a/tex/context/base/enco-pdf.tex +++ b/tex/context/base/enco-pdf.tex @@ -91,6 +91,188 @@ \definecharacter Ohungarumlaut {\Ocircumflex} \definecharacter ohungarumlaut {\ocircumflex} +\definecharacter Aogonek {A} +\definecharacter aogonek {a} +\definecharacter Eogonek {E} +\definecharacter eogonek {e} +\definecharacter Iogonek {I} +\definecharacter iogonek {i} +\definecharacter Uogonek {U} +\definecharacter uogonek {u} + +\definecharacter Aring {A} +\definecharacter aring {a} +\definecharacter Uring {U} +\definecharacter uring {u} + +\definecharacter Abreve {A} +\definecharacter abreve {a} +\definecharacter Ebreve {E} +\definecharacter ebreve {e} +\definecharacter Gbreve {G} +\definecharacter gbreve {g} +\definecharacter Ibreve {I} +\definecharacter ibreve {i} +\definecharacter Obreve {O} +\definecharacter obreve {o} +\definecharacter Ubreve {U} +\definecharacter ubreve {u} + +\definecharacter Ccaron {C} +\definecharacter ccaron {c} +\definecharacter Dcaron {D} +\definecharacter dcaron {d} +\definecharacter Ecaron {E} +\definecharacter ecaron {e} +\definecharacter Lcaron {L} +\definecharacter lcaron {l} +\definecharacter Ncaron {N} +\definecharacter ncaron {n} +\definecharacter Rcaron {R} +\definecharacter rcaron {r} +\definecharacter Scaron {S} +\definecharacter scaron {s} +\definecharacter Tcaron {T} +\definecharacter tcaron {t} +\definecharacter Ycaron {Y} +\definecharacter ycaron {y} +\definecharacter Zcaron {Z} +\definecharacter zcaron {z} + +\definecharacter Lstroke {L} +\definecharacter lstroke {l} +\definecharacter Ostroke {O} +\definecharacter ostroke {o} + +\definecharacter aumlaut {\adiaeresis} +\definecharacter eumlaut {\ediaeresis} +\definecharacter iumlaut {\idiaeresis} +\definecharacter oumlaut {\odiaeresis} +\definecharacter uumlaut {\udiaeresis} + +\definecharacter Aumlaut {\Adiaeresis} +\definecharacter Eumlaut {\Ediaeresis} +\definecharacter Iumlaut {\Idiaeresis} +\definecharacter Oumlaut {\Odiaeresis} +\definecharacter Uumlaut {\Udiaeresis} + +\definecharacter scommaaccent {s} +\definecharacter Scommaaccent {S} +\definecharacter tcommaaccent {t} +\definecharacter Tcommaaccent {T} + +\definecharacter Etilde {E} +\definecharacter etilde {e} + +\definecharacter Ahook {A} +\definecharacter ahook {a} +\definecharacter Ehook {E} +\definecharacter ehook {e} +\definecharacter Ihook {I} +\definecharacter ihook {i} +\definecharacter Ohook {O} +\definecharacter ohook {o} +\definecharacter Uhook {U} +\definecharacter uhook {u} +\definecharacter Yhook {Y} +\definecharacter yhook {y} + +\definecharacter Acircumflexgrave {\Acircumflex} +\definecharacter Acircumflexacute {\Acircumflex} +\definecharacter Acircumflextilde {\Acircumflex} +\definecharacter Acircumflexhook {\Acircumflex} +\definecharacter acircumflexgrave {\acircumflex} +\definecharacter acircumflexacute {\acircumflex} +\definecharacter acircumflextilde {\acircumflex} +\definecharacter acircumflexhook {\acircumflex} +\definecharacter Ecircumflexgrave {\Ecircumflex} +\definecharacter Ecircumflexacute {\Ecircumflex} +\definecharacter Ecircumflextilde {\Ecircumflex} +\definecharacter Ecircumflexhook {\Ecircumflex} +\definecharacter ecircumflexgrave {\ecircumflex} +\definecharacter ecircumflexacute {\ecircumflex} +\definecharacter ecircumflextilde {\ecircumflex} +\definecharacter ecircumflexhook {\ecircumflex} +\definecharacter Ocircumflexgrave {\Ocircumflex} +\definecharacter Ocircumflexacute {\Ocircumflex} +\definecharacter Ocircumflextilde {\Ocircumflex} +\definecharacter Ocircumflexhook {\Ocircumflex} +\definecharacter ocircumflexgrave {\ocircumflex} +\definecharacter ocircumflexacute {\ocircumflex} +\definecharacter ocircumflextilde {\ocircumflex} +\definecharacter ocircumflexhook {\ocircumflex} + +\definecharacter Abrevegrave {A} +\definecharacter Abreveacute {A} +\definecharacter Abrevetilde {A} +\definecharacter Abrevehook {A} +\definecharacter abrevegrave {a} +\definecharacter abreveacute {a} +\definecharacter abrevetilde {a} +\definecharacter abrevehook {a} + +\definecharacter Adotbelow {A} +\definecharacter adotbelow {a} +\definecharacter Edotbelow {E} +\definecharacter edotbelow {e} +\definecharacter Idotbelow {I} +\definecharacter idotbelow {i} +\definecharacter Odotbelow {O} +\definecharacter odotbelow {o} +\definecharacter Udotbelow {U} +\definecharacter udotbelow {u} +\definecharacter Ydotbelow {Y} +\definecharacter ydotbelow {y} +\definecharacter Ohorndotbelow {O} +\definecharacter ohorndotbelow {o} +\definecharacter Uhorndotbelow {U} +\definecharacter uhorndotbelow {u} + +\definecharacter Acircumflexdotbelow {\Acircumflex} +\definecharacter acircumflexdotbelow {\acircumflex} +\definecharacter Ecircumflexdotbelow {\Ecircumflex} +\definecharacter ecircumflexdotbelow {\ecircumflex} +\definecharacter Ocircumflexdotbelow {\Ocircumflex} +\definecharacter ocircumflexdotbelow {\ocircumflex} +\definecharacter Abrevedotbelow {\Abreve} +\definecharacter abrevedotbelow {\abreve} + +\definecharacter Ohorn {O} +\definecharacter Ohorngrave {O} +\definecharacter Ohornacute {O} +\definecharacter Ohorntilde {O} +\definecharacter Ohornhook {O} + +\definecharacter ohorn {o} +\definecharacter ohorngrave {o} +\definecharacter ohornacute {o} +\definecharacter ohorntilde {o} +\definecharacter ohornhook {o} + +\definecharacter Uhorn {U} +\definecharacter Uhorngrave {U} +\definecharacter Uhornacute {U} +\definecharacter Uhorntilde {U} +\definecharacter Uhornhook {U} + +\definecharacter uhorn {u} +\definecharacter uhorngrave {u} +\definecharacter uhornacute {u} +\definecharacter uhorntilde {u} +\definecharacter uhornhook {u} + +\definecharacter Utilde {U} +\definecharacter utilde {u} +\definecharacter Itilde {I} +\definecharacter itilde {i} +\definecharacter Ygrave {Y} +\definecharacter ygrave {y} +\definecharacter Ytilde {Y} +\definecharacter ytilde {y} + +\definecharacter dstroke {d} +\definecharacter Dstroke {D} + \stopencoding \endinput diff --git a/tex/context/base/hand-def.tex b/tex/context/base/hand-def.tex index e73a8aa20..8cc5ff1d6 100644 --- a/tex/context/base/hand-def.tex +++ b/tex/context/base/hand-def.tex @@ -75,6 +75,8 @@ \stopfonthandling +% ogoneks may need another treatment + \startfonthandling [extended] \inherithandling Acircumflex A @@ -487,25 +489,39 @@ % protruding variants -- slanted/italic is yet incomplete -\definefonthandling [pure] [pure] [\c!type=\v!hanging] -\definefonthandling [normal] [punctuation,alpha,extended] [\c!type=\v!hanging] -\definefonthandling [bold] [punctuation,alpha,extended] [\c!type=\v!hanging] -\definefonthandling [slanted] [punctuation] [\c!type=\v!hanging,\c!right=1.5] -\definefonthandling [italic] [punctuation] [\c!type=\v!hanging,\c!right=1.5] -\definefonthandling [boldslanted] [punctuation] [\c!type=\v!hanging,\c!right=1.5] -\definefonthandling [bolditalic] [punctuation] [\c!type=\v!hanging,\c!right=1.5] +\definefonthandling [pure] [pure] [\c!type=\v!hanging] +\definefonthandling [purebold] [pure] [\c!type=\v!hanging] +\definefonthandling [pureslanted] [pure] [\c!type=\v!hanging,\c!right=1.5] +\definefonthandling [pureitalic] [pure] [\c!type=\v!hanging,\c!right=1.5] +\definefonthandling [pureboldslanted] [pure] [\c!type=\v!hanging,\c!right=1.5] +\definefonthandling [purebolditalic] [pure] [\c!type=\v!hanging,\c!right=1.5] + +\definefonthandling [normal] [punctuation,alpha,extended] [\c!type=\v!hanging] +\definefonthandling [normalbold] [punctuation,alpha,extended] [\c!type=\v!hanging] +\definefonthandling [normalslanted] [punctuation,alpha,extended] [\c!type=\v!hanging,\c!right=1.5] +\definefonthandling [normalitalic] [punctuation,alpha,extended] [\c!type=\v!hanging,\c!right=1.5] +\definefonthandling [normalboldslanted] [punctuation,alpha,extended] [\c!type=\v!hanging,\c!right=1.5] +\definefonthandling [normalbolditalic] [punctuation,alpha,extended] [\c!type=\v!hanging,\c!right=1.5] + +% for old times sake + +\definefonthandling [bold] [punctuation,alpha,extended] [\c!type=\v!hanging] +\definefonthandling [slanted] [punctuation,alpha,extended] [\c!type=\v!hanging,\c!right=1.5] +\definefonthandling [italic] [punctuation,alpha,extended] [\c!type=\v!hanging,\c!right=1.5] +\definefonthandling [boldslanted] [punctuation,alpha,extended] [\c!type=\v!hanging,\c!right=1.5] +\definefonthandling [bolditalic] [punctuation,alpha,extended] [\c!type=\v!hanging,\c!right=1.5] % hz variants -\definefonthandling [hz] [hz,extended] [\c!type=\v!hz] +\definefonthandling [hz] [hz,extended] [\c!type=\v!hz] % combined variants -\definefonthandling [quality] [hz,pure] +\definefonthandling [quality] [hz,pure] % noligs (xml) : \definefonthandling [default] [noligs] -\definefonthandling [noligs] [noligs] [\c!type=tag] +\definefonthandling [noligs] [noligs] [\c!type=tag] % A special case of guillemots, beware: when used ungrouped, % it overloads all successive (current) encoding vector diff --git a/tex/context/base/hand-ini.tex b/tex/context/base/hand-ini.tex index 3ff52ee34..9ccb4c8cc 100644 --- a/tex/context/base/hand-ini.tex +++ b/tex/context/base/hand-ini.tex @@ -129,32 +129,18 @@ \appendtoks \disableadjusting \to \everyforgetall % Here or not here? -% \def\dodefineadjustfactor#1#2 #3 % -% {\ifskiphandlingdef \else -% \doifelsenothing{#2} -% {\doifnumberelse{\string#1} -% {\dododefineadjustfactor {#1}{#3}} -% {\dododefineadjustfactor{`#1}{#3}}} -% {\pushmacro\char \let\char\empty -% \doifnumberelse{\csname#1#2\endcsname} -% {\dododefineadjustfactor{\csname#1#2\endcsname}{#3}} -% \donothing -% \popmacro\char}% -% \fi} - -% \def\doinheritadjustfactor#1 #2 % -% {\ifskiphandlingdef \else -% \pushmacro\char \let\char\empty -% \doifnumberelse{\csname#1\endcsname} -% {\dodoinheritadjustfactor{\csname#1\endcsname}{`#2}} -% \donothing -% \popmacro\char -% \fi} - \def\dododefineadjustfactor#1#2% {\adjustdimen#2pt\multiply\adjustdimen\plusthousand\divide\adjustdimen\maxcard\relax \efcode\handledfont#1\adjustdimen} + \beginETEX + + \def\dododefineadjustfactor#1#2% +% {\efcode\handledfont#1\dimexpr#2pt*\plusthousand/\maxcard\relax} + {\efcode\handledfont#1\dimexpr#2\onepoint*\plusthousand/\maxcard\relax} + + \endETEX + \def\dodoinheritadjustfactor#1#2% {\efcode\handledfont#1\efcode\handledfont#2\relax} @@ -220,67 +206,80 @@ \def\setprotrudingfactor#1% {\doifvalue{\@fha@\@fha@#1\c!type}\v!hanging{\dosetprotrudingfactor{#1}}} - \def\dosetprotrudingfactor#1% mo \onepoint instead of pt + \beginTEX + + \def\dosetprotrudingfactor#1% no \onepoint instead of pt {\lproddimen\csname\@fha@\@fha@#1\c!left\endcsname\s!pt \multiply\lproddimen\plusthousand\divide\lproddimen\maxcard\relax \rproddimen\csname\@fha@\@fha@#1\c!right\endcsname\s!pt \multiply\rproddimen\plusthousand\divide\rproddimen\maxcard\relax \iftracefonthandling\showprotrudingfactor{#1}\fi} + \endTEX + + \beginETEX \dimexpr + + \def\dosetprotrudingfactor#1% no \onepoint instead of pt + {\lproddimen\dimexpr\csname\@fha@\@fha@#1\c!left \endcsname\onepoint*\plusthousand/\maxcard\relax + \rproddimen\dimexpr\csname\@fha@\@fha@#1\c!right\endcsname\onepoint*\plusthousand/\maxcard\relax + \iftracefonthandling\showprotrudingfactor{#1}\fi} + + \endETEX + \def\showprotrudingfactor#1% {\writestatus\m!handlings{[protrude]\space#1\space \csname\@fha@\@fha@#1\c!left \endcsname\space \csname\@fha@\@fha@#1\c!right\endcsname\space \fontname\handledfont}} -% \def\dodefineprotrudefactor#1#2 #3 #4 % -% {\ifskiphandlingdef \else -% \doifelsenothing{#2} -% {\doifnumberelse{\string#1} -% {\dododefineprotrudefactor {#1}{#3}{#4}} -% {\dododefineprotrudefactor{`#1}{#3}{#4}}} -% {\pushmacro\char \let\char\empty -% \doifnumberelse{\csname#1#2\endcsname} -% {\dododefineprotrudefactor{\csname#1#2\endcsname}{#3}{#4}} -% \donothing -% \popmacro\char}% -% \fi} - -% \def\doinheritprotrudefactor#1 #2 % -% {\ifskiphandlingdef \else -% \pushmacro\char \let\char\empty -% \doifnumberelse{\csname#1\endcsname} -% {\dodoinheritprotrudefactor{\csname#1\endcsname}{`#2}} -% \donothing -% \popmacro\char -% \fi} - \beginETEX \fontcharwd % division before multiplication, else overflow with "sa>5" \newdimen\protrudethreshold \protrudethreshold=36pt - \def\redodefineprotrudefactor#1% - {\ifdim\fontdimen6\font>\protrudethreshold - \divide\scratchdimen\fontdimen6\font - \multiply\scratchdimen\fontcharwd\handledfont#1\relax - \else - \multiply\scratchdimen\fontcharwd\handledfont#1\relax - \divide\scratchdimen\fontdimen6\font - \fi} +% keep this + +% \def\redodefineprotrudefactor#1% +% {\ifdim\fontdimen6\font>\protrudethreshold +% \divide\scratchdimen\fontdimen6\font +% \multiply\scratchdimen\fontcharwd\handledfont#1\relax +% \else +% \multiply\scratchdimen\fontcharwd\handledfont#1\relax +% \divide\scratchdimen\fontdimen6\font +% \fi} + +% \def\dododefineprotrudefactor#1#2#3% +% {\scratchdimen#2\lproddimen +% \ifembasedprotruding \else +% \redodefineprotrudefactor{#1}% +% \fi +% \lpcode\handledfont#1\scratchdimen +% \scratchdimen#3\rproddimen +% \ifembasedprotruding \else +% \redodefineprotrudefactor{#1}% +% \fi +% \rpcode\handledfont#1\scratchdimen} \def\dododefineprotrudefactor#1#2#3% - {\scratchdimen#2\lproddimen - \ifembasedprotruding \else - \redodefineprotrudefactor{#1}% - \fi - \lpcode\handledfont#1\scratchdimen - \scratchdimen#3\rproddimen - \ifembasedprotruding \else - \redodefineprotrudefactor{#1}% - \fi - \rpcode\handledfont#1\scratchdimen} + {\lpcode\handledfont#1\dimexpr#2\lproddimen + \ifembasedprotruding \else + \ifdim\fontdimen6\font>\protrudethreshold + /\fontdimen6\font*\fontcharwd\handledfont#1% + \else + *\fontcharwd\handledfont#1/\fontdimen6\font + \fi + \fi + \relax + \rpcode\handledfont#1\dimexpr#3\rproddimen + \ifembasedprotruding \else + \ifdim\fontdimen6\font>\protrudethreshold + /\fontdimen6\font*\fontcharwd\handledfont#1% + \else + *\fontcharwd\handledfont#1/\fontdimen6\font + \fi + \fi + \relax} \endETEX diff --git a/tex/context/base/lang-vn.tex b/tex/context/base/lang-vn.tex index cf8536e70..cebcedb2a 100644 --- a/tex/context/base/lang-vn.tex +++ b/tex/context/base/lang-vn.tex @@ -34,11 +34,11 @@ \c!rightsentence=---, \c!leftsubsentence=---, \c!rightsubsentence=---, - \c!leftquote=\lowerleftsingleninequote, - \c!rightquote=\upperrightsingleninequote, - \c!leftquotation=\lowerleftdoubleninequote, - \c!rightquotation=\upperrightdoubleninequote, - \c!date={{Ng\agrave y },dd,{ th\aacute ng },\v!month,{ n\abreve m },yy}, + \c!leftquote=\quoteleft, + \c!rightquote=\quoteright, + \c!leftquotation=\quotedblleft, + \c!rightquotation=\quotedblright, + \c!date={{ },dd,{/},mm,{/},yy}, \c!state=\v!stop] \installlanguage [vietnamese] [\s!vn] @@ -46,18 +46,18 @@ \setupheadtext [\s!vn] [\v!content=M\udotbelow c l\udotbelow c] \setupheadtext [\s!vn] [\v!tables=Danh s\aacute ch b\ahook ng] \setupheadtext [\s!vn] [\v!figures=Danh s\aacute ch h\igrave nh v\etilde] -\setupheadtext [\s!vn] [\v!graphics=\Dstroke\ocircumflexgrave\ th\idotbelow] % D +\setupheadtext [\s!vn] [\v!graphics=\Dstroke\ocircumflexgrave\ th\idotbelow] \setupheadtext [\s!vn] [\v!intermezzi=Intermezzos] \setupheadtext [\s!vn] [\v!index=Ch\ihook\ s\ocircumflexacute] \setupheadtext [\s!vn] [\v!abbreviations=Ch\uhorntilde\ vi\ecircumflexacute t t\abreveacute t] \setupheadtext [\s!vn] [\v!logos=Bi\ecircumflexhook u t\uhorn \ohorndotbelow ng] -\setupheadtext [\s!vn] [\v!units=\Dstroke\ohorn n v\idotbelow] % D +\setupheadtext [\s!vn] [\v!units=\Dstroke\ohorn n v\idotbelow] -\setuplabeltext [\s!vn] [\v!table=B\ahook ng] -\setuplabeltext [\s!vn] [\v!figure=H\igrave nh] +\setuplabeltext [\s!vn] [\v!table=B\ahook ng ] +\setuplabeltext [\s!vn] [\v!figure=H\igrave nh ] \setuplabeltext [\s!vn] [\v!intermezzo=intermezzo] -\setuplabeltext [\s!vn] [\v!graphic=\Dstroke\ocircumflexgrave\ th\idotbelow] % D -\setuplabeltext [\s!vn] [\v!chapter=Ch\uhorn \ohorn ng] +\setuplabeltext [\s!vn] [\v!graphic=\Dstroke\ocircumflexgrave\ th\idotbelow] +\setuplabeltext [\s!vn] [\v!chapter=Ch\uhorn \ohorn ng ] \setuplabeltext [\s!vn] [\v!section=] % not set \setuplabeltext [\s!vn] [\v!subsection=] % not set \setuplabeltext [\s!vn] [\v!subsubsection=] % not set diff --git a/tex/context/base/m-subsub.tex b/tex/context/base/m-subsub.tex new file mode 100644 index 000000000..3a29bc69f --- /dev/null +++ b/tex/context/base/m-subsub.tex @@ -0,0 +1,123 @@ +%D \module +%D [ file=m-subsub, +%D version=2000.12.14, +%D title=\CONTEXT\ Private Modules, +%D subtitle=More Section Levels, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. This module is not public. + +\unprotect + +\startvariables dutch english + german czech + italian romanian + + subsubsubsubsubsection: subsubsubsubsubparagraaf subsubsubsubsubsection + unterunterunterunterunterabsatz podpodpodpodpodsekce + sottosottosottosottosottocapoverso subsubsubsubsubsectiune + + subsubsubsubsubsubsection: subsubsubsubsubsubparagraaf subsubsubsubsubsubsection + unterunterunterunterunterunterabsatz podpodpodpodpodpodsekce + sottosottosottosottosottosottocapoverso subsubsubsubsubsubsectiune + + subsubsubsubsubsubsubsection: subsubsubsubsubsubsubparagraaf subsubsubsubsubsubsubsection + unterunterunterunterunterunterunterabsatz podpodpodpodpodpodpodsekce + sottosottosottosottosottosottosottocapoverso subsubsubsubsubsubsubsectiune + + subsubsubsubsubsubsubsubsection: subsubsubsubsubsubsubsubparagraaf subsubsubsubsubsubsubsubsection + unterunterunterunterunterunterunterunterabsatz podpodpodpodpodpodpodpodsekce + sottosottosottosottosottosottosottosottocapoverso subsubsubsubsubsubsubsubsectiune + +subsubsubsubsubsubsubsubsubsection: subsubsubsubsubsubsubsubsubparagraaf subsubsubsubsubsubsubsubsubsection + unterunterunterunterunterunterunterunterunterabsatz podpodpodpodpodpodpodpodpodsekce + sottosottosottosottosottosottosottosottosottocapoverso subsubsubsubsubsubsubsubsubsectiune + + subsubsubsubsubsubject: subsubsubsubsubonderwerp subsubsubsubsubsubject + unterunterunterunterunterthema podpodpodpodpodtema + sottosottosottosottosottoargomento subsubsubsubsubsubiect + + subsubsubsubsubsubsubject: subsubsubsubsubsubonderwerp subsubsubsubsubsubsubject + unterunterunterunterunterunterthema podpodpodpodpodpodtema + sottosottosottosottosottosottoargomento subsubsubsubsubsubsubiect + + subsubsubsubsubsubsubsubject: subsubsubsubsubsubsubonderwerp subsubsubsubsubsubsubsubject + unterunterunterunterunterunterunterthema podpodpodpodpodpodpodtema + sottosottosottosottosottosottosottoargomento subsubsubsubsubsubsubsubiect + + subsubsubsubsubsubsubsubsubject: subsubsubsubsubsubsubsubonderwerp subsubsubsubsubsubsubsubsubject + unterunterunterunterunterunterunterunterthema podpodpodpodpodpodpodpodtema + sottosottosottosottosottosottosottosottoargomento subsubsubsubsubsubsubsubsubiect + +subsubsubsubsubsubsubsubsubsubject: subsubsubsubsubsubsubsubsubonderwerp subsubsubsubsubsubsubsubsubsubject + unterunterunterunterunterunterunterunterunterthema podpodpodpodpodpodpodpodpodtema + sottosottosottosottosottosottosottosottosottoargomento subsubsubsubsubsubsubsubsubsubiect + +\stopvariables + + +\definesection[\v!sectionlevel-8] +\definesection[\v!sectionlevel-9] +\definesection[\v!sectionlevel-10] +\definesection[\v!sectionlevel-11] +\definesection[\v!sectionlevel-12] + +\definehead + [\v!subsubsubsubsubsection] + [\c!section=\v!sectionlevel-8, + \c!default=\v!subsubsubsubsection] + +\definehead + [\v!subsubsubsubsubsubsection] + [\c!section=\v!sectionlevel-9, + \c!default=\v!subsubsubsubsubsection] + +\definehead + [\v!subsubsubsubsubsubsubsection] + [\c!section=\v!sectionlevel-10, + \c!default=\v!subsubsubsubsubsubsection] + +\definehead + [\v!subsubsubsubsubsubsubsubsection] + [\c!section=\v!sectionlevel-11, + \c!default=\v!subsubsubsubsubsubsubsection] + +\definehead + [\v!subsubsubsubsubsubsubsubsubsection] + [\c!section=\v!sectionlevel-12, + \c!default=\v!subsubsubsubsubsubsubsubsection] + +\definehead + [\v!subsubsubsubsubsubject] + [\c!coupling=\v!subsubsubsubsubsection, + \c!default=\v!subsubsubsubsubsection, + \c!incrementnumber=\v!no] + +\definehead + [\v!subsubsubsubsubsubsubject] + [\c!coupling=\v!subsubsubsubsubsubsection, + \c!default=\v!subsubsubsubsubsubsection, + \c!incrementnumber=\v!no] + +\definehead + [\v!subsubsubsubsubsubsubsubject] + [\c!coupling=\v!subsubsubsubsubsubsubsection, + \c!default=\v!subsubsubsubsubsubsubsection, + \c!incrementnumber=\v!no] + +\definehead + [\v!subsubsubsubsubsubsubsubsubject] + [\c!coupling=\v!subsubsubsubsubsubsubsubsection, + \c!default=\v!subsubsubsubsubsubsubsubsection, + \c!incrementnumber=\v!no] + +\definehead + [\v!subsubsubsubsubsubsubsubsubsubject] + [\c!coupling=\v!subsubsubsubsubsubsubsubsubsection, + \c!default=\v!subsubsubsubsubsubsubsubsubsection, + \c!incrementnumber=\v!no] + +\protect \endinput diff --git a/tex/context/base/math-ini.tex b/tex/context/base/math-ini.tex index 375fce3aa..8be7fdeb2 100644 --- a/tex/context/base/math-ini.tex +++ b/tex/context/base/math-ini.tex @@ -247,7 +247,7 @@ \endgraf}% \fi} -\def\definemathcharacter% +\def\definemathcharacter {\dosixtupleempty\dodefinemathcharacter} \def\dodefinemathcharacter[#1][#2][#3][#4][#5][#6]% @@ -256,19 +256,17 @@ \doifnumberelse{#1} {\scratchcounter#1} {\scratchcounter\@EA`\string#1}% - \expanded - {\appendtoks - \ifsixthargument - \delcode\the\scratchcounter="% - \ifnum\puremathcode{#2}>7 0\else\puremathcode{#2}\fi - \purefamilyhex{#3}\uchexnumbers{#4}% - \purefamilyhex{#5}\uchexnumbers{#6}\space - \else\iffourthargument - \mathcode\the\scratchcounter="% - \ifnum\puremathcode{#2}>7 0\else\puremathcode{#2}\fi - \purefamilyhex{#3}\uchexnumbers{#4}\space - \fi\fi - \noexpand\to \noexpand\mathtoks}% + \appendetoks + \ifsixthargument + \delcode\the\scratchcounter="% + \ifnum\puremathcode{#2}>7 0\else\puremathcode{#2}\fi + \purefamilyhex{#3}\uchexnumbers{#4}% + \purefamilyhex{#5}\uchexnumbers{#6}\space + \else\iffourthargument + \mathcode\the\scratchcounter="% + \ifnum\puremathcode{#2}>7 0\else\puremathcode{#2}\fi + \purefamilyhex{#3}\uchexnumbers{#4}\space + \fi\fi\to\mathtoks \let\purefamilyhex\normalpurefamilyhex \tracemathcharacter{#1}} @@ -308,7 +306,7 @@ \setmathcollection{#1}} \def\setmathcollection#1% - {\def\mathcollection{#1}% + {\edef\mathcollection{#1}% \doifundefined{\@ml@\mathcollection} {\expandafter\newtoks\csname\@ml@\mathcollection\endcsname}} @@ -341,9 +339,24 @@ \definefilesynonym[\f!mathprefix\s!default][\f!mathprefix tex] -\def\usemathcollection[#1]% - {\doinputonce{\truefilename{\f!mathprefix#1}}% - \doifsomething\fontclass{\setvalue{\@mc@\fontclass\@mc@}{#1}}} +\def\usemathcollection + {\dodoubleempty\dousemathcollection} + +\def\dousemathcollection[#1][#2]% + {\pushmacro\fontclass + \pushmacro\mathclass + \ifsecondargument + \edef\fontclass{#1}% + \edef\mathclass{#2}% + \else + \edef\mathclass{#1}% + \fi + \doinputonce{\truefilename{\f!mathprefix\mathclass}}% + \doifsomething\fontclass{\setevalue{\@mc@\fontclass\@mc@}{\mathclass}}% + \popmacro\mathclass + \popmacro\fontclass} + +\let\mathclass\nomathcollection \letvalue{\@mc@\@mc@}\nomathcollection @@ -430,8 +443,8 @@ \enablemathcollection[default] -\usemathcollection[tex] % actually this is 'default' -\usemathcollection[ams] % actually this is 'default' +\usemathcollection [default] [tex] +\usemathcollection [default] [ams] \enablemathcollection[default] diff --git a/tex/context/base/math-run.tex b/tex/context/base/math-run.tex index b41ea3c64..acb5bce3f 100644 --- a/tex/context/base/math-run.tex +++ b/tex/context/base/math-run.tex @@ -48,7 +48,7 @@ \dimen0=\hsize \advance\dimen0 2em \advance\dimen2 2em - \ifcase\showmathmodern\or\advance\dimen2 2em\fi + \ifcase\showmathmodern\or\advance\dimen2 4em\fi \divide \dimen0 by \dimen2 \advance\dimen0 1sp \edef\enccols{\number\dimen0} \startcolumns[\c!n=\enccols,\c!distance=2em] diff --git a/tex/context/base/mult-com.tex b/tex/context/base/mult-com.tex index 975c8ed18..83f3115df 100644 --- a/tex/context/base/mult-com.tex +++ b/tex/context/base/mult-com.tex @@ -1103,7 +1103,7 @@ listsymbol: lijstsymbool listsymbol placelist: plaatslijst placelist platziereliste umistiseznam mettielenco punelista - plaatsruwelijst: plaatslruweijst placerawlist + plaatsruwelijst: plaatsruwelijst placerawlist placerawlist placerawlist placerawlist placerawlist placecombinedlist: plaatssamengesteldelijst placecombinedlist @@ -1399,10 +1399,10 @@ determineregistercharacteristics: bepaalregisterkenmerken determineregi usereferences: gebruikreferenties usereferences verwendereferenzen uzijodkazy usariferimenti folosestereferinte - reflijst: reflijst reflist - refliste seznamodkazu - listarif listaref - stelreferentielijstin: stelreferentielijstin setupreferencelist + placereferencelist: plaatsreferentielijst placereferencelist + placereferencelist placereferencelist + placereferencelist placereferencelist + setupreferencelist: stelreferentielijstin setupreferencelist stellereferenzlisteein nastavseznamodkazu impostalistariferimenti seteazalistareferinte setupreferencing: stelrefererenin setupreferencing diff --git a/tex/context/base/mult-con.tex b/tex/context/base/mult-con.tex index fe2c647f9..6541696ac 100644 --- a/tex/context/base/mult-con.tex +++ b/tex/context/base/mult-con.tex @@ -632,6 +632,9 @@ component: component component expansion: expansie expansion expansion expanzen espansione expansiune +keyexpansion: sleutelexpansie keyexpansion + keyexpansion keyexpansion + keyexpansion keyexpansion factor: factor factor faktor faktor fattore factor diff --git a/tex/context/base/mult-sys.tex b/tex/context/base/mult-sys.tex index e77aa1328..62cb8a4c8 100644 --- a/tex/context/base/mult-sys.tex +++ b/tex/context/base/mult-sys.tex @@ -744,6 +744,7 @@ \defineinterfaceconstant {png} {png} \defineinterfaceconstant {avi} {avi} \defineinterfaceconstant {mov} {mov} +\defineinterfaceconstant {svg} {svg} \defineinterfaceconstant {tex} {tex} \defineinterfaceconstant {tmp} {tmp} diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex index 3fa99850f..3d395eb88 100644 --- a/tex/context/base/page-flt.tex +++ b/tex/context/base/page-flt.tex @@ -279,21 +279,21 @@ \processaction [\getvalue{\??fl#1\c!sidealign}] [\v!height=>\global\chardef\sidefloatalign\plusone,% - \v!line=>\global\chardef\sidefloatalign\plustwo,% (***) - \v!depth=>\global\chardef\sidefloatalign\plusthree,% + \v!line=>\global\chardef\sidefloatalign\plustwo,% (***) + \v!depth=>\global\chardef\sidefloatalign\plusthree,% \v!grid=>\global\chardef\sidefloatalign4,% - \v!halfline=>\global\chardef\sidefloatalign5]% + \v!halfline=>\global\chardef\sidefloatalign5]% % todo (test first): \doifinset\v!lokaal{#2}{\chardef\sidefloatalign\zerocount}% \ifcase\sidefloatalign\relax % todo: optie v!lokaal => \else - \doifinset\v!height {#2}{\global\chardef\sidefloatalign\plusone}% - \doifinset\v!line {#2}{\global\chardef\sidefloatalign\plustwo}% - \doifinset\v!depth {#2}{\global\chardef\sidefloatalign\plusthree}% - \doifinset\v!grid {#2}{\global\chardef\sidefloatalign4}% + \doifinset\v!height {#2}{\global\chardef\sidefloatalign\plusone}% + \doifinset\v!line {#2}{\global\chardef\sidefloatalign\plustwo}% + \doifinset\v!depth {#2}{\global\chardef\sidefloatalign\plusthree}% + \doifinset\v!grid {#2}{\global\chardef\sidefloatalign4}% \doifinset\v!halfline{#2}{\global\chardef\sidefloatalign5}% meant for 'none' \fi \doifinset\v!high{#2}{\global\sidefloattopskip \zeropoint}% - \doifinset\v!low{#2}{\global\sidefloatbottomskip\zeropoint}% - \doifinset\v!fit{#2} + \doifinset\v!low {#2}{\global\sidefloatbottomskip\zeropoint}% + \doifinset\v!fit {#2} {\global\sidefloattopskip \zeropoint \global\sidefloatbottomskip\zeropoint \global\floatsideskip \zeropoint}% @@ -565,6 +565,7 @@ \setupcaption [#1] [\c!location=\@@kjlocation, + \c!grid=\@@kjgrid, %\c!before=\@@kjbefore, \c!inbetween=\@@kjinbetween, %\c!after=\@@kjafter, @@ -1158,6 +1159,29 @@ % \floatparameter +% \def\putcompletecaption#1#2#3#4% +% {\noindent +% \xdef\lastcaptiontag{\strut#2\floatcaptionsuffix}% +% \xdef\floatcaptionnumber{#1}% +% \dostartattributes{\??kj#1}\c!style\c!color\empty +% \ifnofloatnumber +% \else +% \hbox{\doattributes{\??kj#1}\c!headstyle\c!headcolor{\strut#2\floatcaptionsuffix}}% +% \ifnofloatcaption \else \ifemptyfloatcaption \else +% \ifcase#4\relax +% \scratchskip\@@kjkjdistance\relax +% \dotfskip\scratchskip\emergencystretch.5\scratchskip +% \else +% \ifx\@@kjkjinbetween\empty\else\unskip\@@kjkjinbetween\fi +% \fi +% \fi \fi +% \fi +% \ifnofloatcaption \else +% \doattributes{\??kj#1}\c!textstyle\c!textcolor +% {\begstrut#3\endstrut\endgraf}% +% \fi +% \dostopattributes} + \def\putcompletecaption#1#2#3#4% {\noindent \xdef\lastcaptiontag{\strut#2\floatcaptionsuffix}% @@ -1175,11 +1199,19 @@ \fi \fi \fi \fi - \ifnofloatcaption \else + \ifnofloatcaption + \globallet\lastcaptionht\!!zeropoint + \globallet\lastcaptiondp\!!zeropoint + \else \doattributes{\??kj#1}\c!textstyle\c!textcolor - {\begstrut#3\endstrut\endgraf}% + {\xdef\lastcaptionht{\strutheight}% + \xdef\lastcaptiondp{\strutdepth}% + \begstrut#3\endstrut\endgraf}% \fi \dostopattributes} + +\let\lastcaptionht\!!zeropoint +\let\lastcaptiondp\!!zeropoint % new @@ -1205,6 +1237,10 @@ \fi \fi} +% minwidth=fit,width=max : no overshoot, as wide as graphic + +\ifx\moveboxontogrid\undefined \let\movecaptionontogrid\gobblethreearguments \fi + \def\dosetpagfloat#1#2#3#4% \copy wegwerken {\bgroup \setlocalfloathsize @@ -1241,6 +1277,7 @@ \edef\width{\the\wd\tempfloatbox}% \addlocalbackgroundtobox\tempfloatbox \setbox\tempcaptionbox\hbox{\@@kjkjcommand{\box\tempcaptionbox}}% + \moveboxontogrid\tempcaptionbox\@@kjkjgrid\lastcaptionht \addlocalbackgroundtobox\tempcaptionbox \buildfloatbox \fi @@ -1287,72 +1324,11 @@ \def\dopreparestackcaptionmin#1#2#3#4% {\raggedcenter % the default - \dosetraggedvbox\@@kjkjalign % when given + \dosetraggedvbox\@@kjkjalign % when given \setbox\tempcaptionbox\raggedbox % vbox, keeps footnotes {\hsize\wd\tempfloatbox \putcompletecaption{#4}{#2}{#3}{0}}} -% \def\dopreparestackcaptionaut#1#2#3#4% -% {\doifsomething\@@kjkjalign -% {\ExpandBothAfter\doifnotinset\v!middle\@@kjkjalign -% {\let\captionovershoot\!!zeropoint}}% -% \ifdim\wd\tempfloatbox>\hsize -% % float is wider than \hsize -% \dosetraggedvbox\@@kjkjalign -% \setbox\scratchbox\raggedbox % trial run -% {\hsize\wd\tempfloatbox -% \notesenabledfalse -% \putcompletecaption{#4}{#2}{#3}{0}}% -% \ifdim\ht\scratchbox>\lineheight % more lines -% \dosetraggedvbox\@@kjkjalign -% \setbox\tempcaptionbox\raggedbox -% {\hsize\wd\tempfloatbox -% \advance\hsize -\captionovershoot\relax -% \ifdim\hsize<\captionminwidth\relax -% \hsize\wd\tempfloatbox -% \fi -% \putcompletecaption{#4}{#2}{#3}{0}}% -% \else -% \setbox\tempcaptionbox\raggedbox -% {\hsize\wd\tempfloatbox -% \putcompletecaption{#4}{#2}{#3}{0}}% -% \fi -% \else -% % float is smaller of equal to \hsize -% \ifdim\wd\tempfloatbox<\captionminwidth\relax -% \scratchdimen\captionminwidth % float smaller than min width -% \else -% \scratchdimen\wd\tempfloatbox % float width -% \fi -% \setbox\scratchbox\vbox % test with overshoot -% {\advance\scratchdimen \captionovershoot -% \advance\scratchdimen 3em % an average word length -% \ifdim\scratchdimen<\hsize \hsize\scratchdimen \fi -% \notesenabledfalse -% \putcompletecaption{#4}{#2}{#3}{0}}% -% \ifdim\ht\scratchbox>\lineheight -% % at least an average word longer than a line -% \dosetraggedvbox\@@kjkjalign -% \setbox\tempcaptionbox\raggedbox -% {\advance\scratchdimen \captionovershoot -% \ifdim\scratchdimen<\hsize \hsize\scratchdimen \fi -% \putcompletecaption{#4}{#2}{#3}{0}}% -% \else -% % just over a line, don't use an overshoot -% % \doifinsetelse\@@kjkjalign{\v!left,\v!right} -% \expanded{\doifcommonelse{\@@kjkjalign}}{\v!left,\v!right,\v!flushleft,\v!flushright} -% {\dosetraggedvbox\@@kjkjalign -% \setbox\tempcaptionbox\raggedbox -% {\hsize\scratchdimen -% % strange : \raggedcenter -% \putcompletecaption{#4}{#2}{#3}{0}}} -% {% nicer -% \setbox\tempcaptionbox\cbox -% {\hsize\scratchdimen -% \putcompletecaption{#4}{#2}{#3}{0}}}% -% \fi -% \fi} - \def\dopreparestackcaptionaut#1#2#3#4% {\doifsomething\@@kjkjalign {\ExpandBothAfter\doifnotinset\v!middle\@@kjkjalign @@ -1436,10 +1412,10 @@ \forgetall \processaction [\@@kjkjlocation] - [ \v!top=>\locatefloat{\box\tempcaptionbox}% + [ \v!top=>\locatefloat{\box\tempcaptionbox}% \endgraf\nointerlineskip\@@kjkjinbetween \locatefloat{\box\tempfloatbox}, - \v!bottom=>\locatefloat{\box\tempfloatbox}% + \v!bottom=>\locatefloat{\box\tempfloatbox}% \endgraf\nointerlineskip\@@kjkjinbetween \locatefloat{\box\tempcaptionbox}, \v!high=>\locatefloat @@ -1450,7 +1426,7 @@ {\vbox to\ht\tempfloatbox{\@@kjkjinbetween\box\tempcaptionbox\vfill}% \tfskip \box\tempfloatbox}}, - \v!low=>\locatefloat + \v!low=>\locatefloat {\doifelse\@@flfllocation\v!left {\box\tempfloatbox \dotfskip\@@kjkjdistance @@ -1583,6 +1559,7 @@ \setbox\tempcaptionbox\raggedbox {\hsize\wd\tempfloatbox\putcompletecaption{#4}{#2}{#3}{0}}}}% \setbox\tempcaptionbox\hbox{\@@kjkjcommand{\box\tempcaptionbox}}% + \moveboxontogrid\tempcaptionbox\@@kjkjgrid\lastcaptionht \addlocalbackgroundtobox\tempcaptionbox % no \doglobal \global\setbox\floatbox\vbox {\processaction @@ -1607,10 +1584,11 @@ {\ifvisible \par \edef\@@kjkjlocation {\getvalue{\??kj#4\c!location}}% + \edef\@@kjkjgrid {\getvalue{\??kj#4\c!grid}}% new \def\@@kjkjinbetween{\getvalue{\??kj#4\c!inbetween}}% no \edef - \def\@@kjkjcommand {\getvalue{\??kj#4\c!command}}% no \edef + \def\@@kjkjcommand {\getvalue{\??kj#4\c!command}}% no \edef \edef\@@kjkjwidth {\getvalue{\??kj#4\c!width}}% - \edef\@@kjkjminwidth {\getvalue{\??kj#4\c!minwidth}}% in geval van automatisch + \edef\@@kjkjminwidth {\getvalue{\??kj#4\c!minwidth}}% in geval van automatisch \edef\@@kjkjdistance {\getvalue{\??kj#4\c!distance}}% \edef\@@kjkjalign {\getvalue{\??kj#4\c!align}}% \edef\@@flfllocation {\getvalue{\??fl#4\c!location}}% @@ -2023,6 +2001,7 @@ \setupcaptions [\c!location=\v!bottom, + \c!grid=, \c!before=\blank, \c!inbetween={\blank[\v!medium]}, \c!after=\blank, diff --git a/tex/context/base/page-imp.tex b/tex/context/base/page-imp.tex index d4d201f06..1525f3784 100644 --- a/tex/context/base/page-imp.tex +++ b/tex/context/base/page-imp.tex @@ -242,10 +242,10 @@ \gdef\arrangedrotationE{180}% \processallactionsinset [#1] - [ \v!mirrored=>\global\mirrorarrangedtrue, - \v!doublesided=>\global\doublearrangedtrue, + [ \v!mirrored=>\global\mirrorarrangedtrue, + \v!doublesided=>\global\doublearrangedtrue, \v!negative=>\global\negatearrangedtrue, - \v!rotated=>\gdef\arrangedrotationO {90}\gdef\arrangedrotationE{270}, + \v!rotated=>\gdef\arrangedrotationO {90}\gdef\arrangedrotationE{270}, 90=>\gdef\arrangedrotationO {90}\gdef\arrangedrotationE{270}, 180=>\gdef\arrangedrotationO{180}\gdef\arrangedrotationE{0}, 270=>\gdef\arrangedrotationO{270}\gdef\arrangedrotationE{90}, diff --git a/tex/context/base/page-ini.tex b/tex/context/base/page-ini.tex index 530102cca..96703a789 100644 --- a/tex/context/base/page-ini.tex +++ b/tex/context/base/page-ini.tex @@ -1073,7 +1073,7 @@ \offinterlineskip \vskip\topspace \hsize\paperwidth - \hfill\hbox{\plaatstestinfo\hskip.5cm}\vss + \hfill\hbox{\placetestinfo\hskip.5cm}\vss \settexthoffset\hskip\texthoffset % brrrr %\tlap{\plaatsversieaanduiding}\vskip.5cm}} \vbox to 1cm{\vss\plaatsversieaanduiding\vss}}} @@ -1115,7 +1115,7 @@ \def\registerinfo {\dotestinfo\registerinfobox} \def\floatinfo {\dotestinfo\floatinfobox} -\def\plaatstestinfo +\def\placetestinfo {\ifvoorlopig \vbox to \makeupheight {\forgetall @@ -1354,18 +1354,82 @@ \newif\ifpaginageblokkeerd \paginageblokkeerdfalse -\def\testpage {\dotripleempty\dotestpage[\plusone]} -\def\testpageonly {\dotripleempty\dotestpage[\plustwo]} - -\chardef\testpagemethod=0 % todo: \testnewpage[method=,lines=,voffset=] - -\def\dotestpage[#1][#2][#3]% - {%\relax % needed before \if - \endgraf +% \chardef\testpagemethod=0 % todo: \testnewpage[method=,lines=,voffset=] +% +% \def\testpage {\dotripleempty\dotestpage[\plusone]} +% \def\testpageonly{\dotripleempty\dotestpage[\plustwo]} +% +% \def\dotestpage[#1][#2][#3]% +% {%\relax % needed before \if +% \endgraf +% \ifpaginageblokkeerd +% % do nothing +% \else +% %ifnum#1=\plusone\synchronizeoutput\fi +% \ifdim\pagegoal<\maxdimen \relax +% \ifdim\pagetotal<\pagegoal \relax +% \scratchdimen\lineheight +% \multiply\scratchdimen#2\relax +% \advance\scratchdimen \pagetotal +% \ifdim\lastskip<\parskip +% \advance\scratchdimen \parskip +% \fi +% \ifthirdargument +% \advance\scratchdimen#3\relax +% \fi +% \ifcase\testpagemethod +% \ifdim\scratchdimen>.99\pagegoal +% \vfill\eject % \penalty-\!!tenthousand\relax +% \fi +% \or +% \advance\scratchdimen-\pagegoal +% \ifdim\scratchdimen>-\lineheight +% \vfill\eject % \penalty-\!!tenthousand\relax +% \fi +% \or +% \getnoflines\pagegoal +% \advance\scratchdimen-\noflines\lineheight \relax +% \ifdim\scratchdimen>-\lineheight +% \vfill\eject % \penalty-\!!tenthousand\relax +% \fi +% \or % same as 0 but more accurate +% \advance\scratchdimen-10\s!sp\relax +% \ifdim\scratchdimen>\pagegoal +% \vfill\eject % \penalty-\!!tenthousand\relax +% \fi +% \fi +% \else +% % force page break / new +% % \vfill\eject % \penalty-\!!tenthousand\relax +% \fi +% \else +% \ifnum#1=\plusone\goodbreak\fi +% \fi +% \fi} + +\chardef\testpagemethod \zerocount % todo: \testnewpage[method=,lines=,voffset=] +\chardef\testpagetrigger\zerocount + +\def\testpage {\dotripleempty\dotestpage[\plusone]} % +\def\testpageonly{\dotripleempty\dotestpage[\plustwo]} % no penalties added to the mvl + +\def\dotestpage[#1][#2][#3]% don't change, only add more methods + {%\relax % needed before \if \ifpaginageblokkeerd - % do nothing + \endgraf \else -% \ifnum#1=\plusone\synchronizeoutput\fi + % new from here + \ifcase\testpagetrigger + \endgraf + \or + \ifvmode + \dosomebreak\allowbreak + \else % indeed? + \vadjust{\allowbreak}% + \endgraf + \fi + \fi + % till here \ifdim\pagegoal<\maxdimen \relax \ifdim\pagetotal<\pagegoal \relax \scratchdimen\lineheight @@ -1379,28 +1443,28 @@ \fi \ifcase\testpagemethod \ifdim\scratchdimen>.99\pagegoal - \vfill\eject % \penalty-\!!tenthousand\relax + \penalty-\!!tenthousand\relax \fi \or \advance\scratchdimen-\pagegoal \ifdim\scratchdimen>-\lineheight - \vfill\eject % \penalty-\!!tenthousand\relax + \penalty-\!!tenthousand\relax \fi \or \getnoflines\pagegoal \advance\scratchdimen-\noflines\lineheight \relax \ifdim\scratchdimen>-\lineheight - \vfill\eject % \penalty-\!!tenthousand\relax + \penalty-\!!tenthousand\relax \fi \or % same as 0 but more accurate \advance\scratchdimen-10\s!sp\relax \ifdim\scratchdimen>\pagegoal - \vfill\eject % \penalty-\!!tenthousand\relax + \penalty-\!!tenthousand\relax \fi \fi \else - % force page break / new - % \vfill\eject % \penalty-\!!tenthousand\relax + % force page break / new / does not work as expected + % never: \penalty-\!!tenthousand\relax \fi \else \ifnum#1=\plusone\goodbreak\fi diff --git a/tex/context/base/page-lin.tex b/tex/context/base/page-lin.tex index 10f875fc0..b31e46b58 100644 --- a/tex/context/base/page-lin.tex +++ b/tex/context/base/page-lin.tex @@ -40,12 +40,12 @@ \globallet\@@rglinesteptoggle\!!plusone \processaction [\@@rgindenting] - [ \v!yes=>\def\@@rgstepyes{\parindent\@@rgparindent}% - \def\@@rgstepno {\parindent\@@rgparindent}, - \v!odd=>\def\@@rgstepyes{\parindent\zeropoint }% - \def\@@rgstepno {\parindent\@@rgparindent}, - \v!even=>\def\@@rgstepno {\parindent\zeropoint }% - \def\@@rgstepyes{\parindent\@@rgparindent}]% + [ \v!yes=>\def\@@rgstepyes{\parindent\@@rgparindent}% + \def\@@rgstepno {\parindent\@@rgparindent}, + \v!odd=>\def\@@rgstepyes{\parindent\zeropoint }% + \def\@@rgstepno {\parindent\@@rgparindent}, + \v!even=>\def\@@rgstepno {\parindent\zeropoint }% + \def\@@rgstepyes{\parindent\@@rgparindent}]% \typesettinglinestrue \setupwhitespace[\v!none]% \obeylines @@ -71,6 +71,11 @@ \@@rgstepno \fi \futurelet\next\dobetweenthelines}% + % new + \processaction + [\@@rgspace] + [ \v!on=>\obeyspaces\def\obeyedspace{\mathortext\normalspace{\dontleavehmode{\tt\controlspace}}}, + \v!yes=>\obeyspaces\def\obeyedspace{\mathortext\normalspace{\dontleavehmode\normalspace}}]% \GotoPar} % \def\dobetweenthelines% @@ -414,6 +419,7 @@ [\c!before=\blank, \c!after=\blank, \c!inbetween=\blank, - \c!indenting=\v!no] + \c!indenting=\v!no, + \c!space=\v!default] \protect \endinput diff --git a/tex/context/base/page-one.tex b/tex/context/base/page-one.tex index bdae19104..ed4bc11d0 100644 --- a/tex/context/base/page-one.tex +++ b/tex/context/base/page-one.tex @@ -114,65 +114,6 @@ \fi \fi} -% \def\OTRONEdopagecontents#1#2% \box \unvbox -% {\bgroup % niet breedte zetten, kan fractie zijn! -% \setbox0\vbox \ifbottomnotes to \teksthoogte \fi -% {\edef\currentpagedepth{\the\dp#2}% still to be derived from #1 -% \dotopinsertions -% #1#2% -% \everypushproperties -% \ifgridsnapping -% \vskip-\currentpagedepth -% \vskip\openstrutdepth % \strutdp -% \prevdepth\openstrutdepth % \strutdp -% \dobotinsertions -% \vfil -% \else\ifr@ggedbottom -% \vskip-\currentpagedepth -% \vskip\openstrutdepth % \strutdp -% \prevdepth\openstrutdepth % \strutdp -% \dobotinsertions -% \vfil -% \else\ifb@selinebottom -% \kern-\currentpagedepth -% \kern\maxdepth -% \dobotinsertions -% \fi\fi\fi -% \fakenotes}% -% \ifbottomnotes -% \ifgridsnapping -% \getnoflines\teksthoogte -% \advance\noflines -1 -% \scratchdimen\noflines\lineheight -% \advance\scratchdimen \topskip -% \else -% \scratchdimen\ht0 -% \fi -% \else -% \scratchdimen\zeropoint -% \fi -% \setbox2\hbox -% {\checksinglecolumnfootnotes -% \lower\scratchdimen\vbox{\placebottomnotes}}% -% \smashbox2% % needed here -% \ifbottomnotes -% \ht0\zeropoint -% \fi -% \vbox to \teksthoogte -% {\box0\box2\ifbottomnotes\else\vfill\fi}% -% \egroup} - -%\def\OTRONEregisteredtextarea#1#2#3% -% {\ifregistertextareas -% % sub optimal, unvbox is nilled here -% \setbox#2\vbox{#1#2}% -% \wd#2\zetbreedte % somehow a space creeps in (in unvbox'd #2) -% \vbox{\registeredtextarea00#2}% -% #3% -% \else -% #1#2#3% -% \fi} - \chardef\kindofpagetextareas=2 % whole page (public variable! never change) \def\OTRONEregisteredtextarea#1% @@ -279,48 +220,6 @@ \fi \egroup} -% \def\OTRONEdodosettopinserts -% {\ifnum\noffloatinserts<\noftopfloats -% \dogetfloat -% \ifdim\topinserted=\zeropoint -% \topofinserttrue -% \else -% \topofinsertfalse -% \fi -% \global\advance\topinserted \ht\floatbox -% \global\advance\topinserted \dp\floatbox -% \global\advance\topinserted \floatbottomskip\relax -% \ifdim\topinserted<\teksthoogte\relax -% \xdef\totaltopinserted{\the\topinserted}% -% \insert\topins -% {\forgetall -% \iftopofinsert -% \kern-\lineskip\par -% \prevdepth\maxdimen -% \else -% %\blanko[-\@@bknawit,\@@bkvoorwit]% inserts can't look back -% \betweenfloatblanko -% \fi -% \flushfloatbox -% \blanko[\@@bknawit]}% -% \ifsomefloatwaiting -% \advance\noffloatinserts \plusone -% \else -% \noffloatinserts\noftopfloats\relax -% \fi -% \dofloatflushedinfo -% \else -% \doresavefloat -% \noffloatinserts\noftopfloats\relax -% \fi -% \else -% \ifsomefloatwaiting -% \showmessage\m!floatblocks6{\the\noftopfloats}% -% \fi -% \let\OTRONEdodosettopinserts\relax -% \fi -% \OTRONEdodosettopinserts} - \def\OTRONEdodosettopinserts {\ifnum\noffloatinserts<\noftopfloats \dogetfloat @@ -442,17 +341,6 @@ \global\botinserted\zeropoint \global\nofloatpermittedfalse} -% \def\OTRONEdoflushfloats -% {\global\flushingfloatstrue -% \ifsomefloatwaiting -% \par -% \ifvmode \prevdepth\maxdimen \fi % prevents whitespace -% \OTRONEdodoflushfloats -% \fi -% \global\savednoffloats\zerocount -% \global\somefloatwaitingfalse -% \global\flushingfloatsfalse} - \def\OTRONEdoflushfloats {\global\flushingfloatstrue \ifsomefloatwaiting @@ -677,27 +565,6 @@ \goodbreak}% \doinsertfloatinfo} -% \def\OTRONEsometopsfloat[#1]% -% {\ifdim\topinserted=\zeropoint -% \topofinserttrue -% \else -% \topofinsertfalse -% \fi -% \global\advance\topinserted \ht\floatbox -% \global\advance\topinserted \dp\floatbox -% \global\advance\topinserted \floatbottomskip -% \insert\topins -% {\forgetall -% \iftopofinsert -% \kern-\lineskip\par\prevdepth\maxdimen -% \else -% %\blanko[-\@@bknawit,\@@bkvoorwit]% inserts can't look back -% \betweenfloatblanko -% \fi -% \flushfloatbox -% \blanko[\@@bknawit]}% -% \doinsertfloatinfo} - \def\OTRONEsometopsfloat[#1]% {\ifdim\topinserted=\zeropoint \topofinserttrue diff --git a/tex/context/base/page-set.tex b/tex/context/base/page-set.tex index fda87f691..e6b51be42 100644 --- a/tex/context/base/page-set.tex +++ b/tex/context/base/page-set.tex @@ -56,9 +56,6 @@ \def\OTRSETgetgridcell#1#2{\box\csname \@otr@:\number#1:\number#2\endcsname} \def\OTRSETsetgridcell#1#2{\global\setbox\csname\@otr@:\number#1:\number#2\endcsname} -\long\def\OTRSETdoifcellelse#1#2#3#4% - {\relax\ifvoid\csname\@otr@:\number#1:\number#2\endcsname#4\else#3\fi} - \long\def\OTRSETdoifcellelse#1#2% {\relax\ifvoid\csname\@otr@:\number#1:\number#2\endcsname \@EA\secondoftwoarguments\else\@EA\firstoftwoarguments @@ -1107,72 +1104,80 @@ \def\OTRSETstoreincolumnslotLRTB#1% {\OTRSETprepareforcolumnslot1{#1}% -\OTRSETflushtextsofar + \OTRSETflushtextsofar \OTRSETstoreincolumnslotindeed \mofcolumns\nofcolumns+\currenthcell \plusone\columnmaxcells+\currentvcell{#1}} \def\OTRSETstoreincolumnslotLRBT#1% {\OTRSETprepareforcolumnslot3{#1}% -\OTRSETflushtextsofar + \OTRSETflushtextsofar \OTRSETstoreincolumnslotindeed \mofcolumns\nofcolumns+\currenthcell \columnmaxcells\plusone-\currentvcell{#1}} \def\OTRSETstoreincolumnslotRLTB#1% {\OTRSETprepareforcolumnslot1{#1}% -\OTRSETflushtextsofar + \OTRSETflushtextsofar + \OTRSETcheckprefered \OTRSETstoreincolumnslotindeed \nofcolumns\qofcolumns-\currenthcell \plusone\columnmaxcells+\currentvcell{#1}} \def\OTRSETstoreincolumnslotRLBT#1% {\OTRSETprepareforcolumnslot3{#1}% -\OTRSETflushtextsofar + \OTRSETflushtextsofar + \OTRSETcheckprefered \OTRSETstoreincolumnslotindeed \nofcolumns\qofcolumns-\currenthcell \columnmaxcells\plusone-\currentvcell{#1}} \def\OTRSETstoreincolumnslotTBLR#1% {\OTRSETprepareforcolumnslot1{#1}% -\OTRSETflushtextsofar + \OTRSETflushtextsofar \OTRSETstoreincolumnslotindeed \plusone\columnmaxcells+\currentvcell \mofcolumns\nofcolumns+\currenthcell{#1}} \def\OTRSETstoreincolumnslotTBRL#1% {\OTRSETprepareforcolumnslot1{#1}% -\OTRSETflushtextsofar + \OTRSETflushtextsofar + \OTRSETcheckprefered \OTRSETstoreincolumnslotindeed \plusone\columnmaxcells+\currentvcell \nofcolumns\qofcolumns-\currenthcell{#1}} \def\OTRSETstoreincolumnslotBTLR#1% {\OTRSETprepareforcolumnslot3{#1}% -\OTRSETflushtextsofar + \OTRSETflushtextsofar \OTRSETstoreincolumnslotindeed \columnmaxcells\plusone-\currentvcell \mofcolumns\nofcolumns+\currenthcell{#1}} \def\OTRSETstoreincolumnslotBTRL#1% {\OTRSETprepareforcolumnslot3{#1}% -\OTRSETflushtextsofar + \OTRSETflushtextsofar + \OTRSETcheckprefered \OTRSETstoreincolumnslotindeed \columnmaxcells\plusone-\currentvcell \nofcolumns\qofcolumns-\currenthcell{#1}} \def\OTRSETstoreincolumnslotFXTB#1% fixed column - {\OTRSETprepareforcolumnslot2{#1}% % 1/2 dependent of place, todo -\OTRSETflushtextsofar + {\OTRSETcheckprefered + \OTRSETdoifcellelse\pofcolumns\plusone + {\OTRSETprepareforcolumnslot2}{\OTRSETprepareforcolumnslot1}{#1}% % 1/2 dependent of place, todo + \OTRSETflushtextsofar \OTRSETstoreincolumnslotindeed - \pofcolumns\pofcolumns+\currenthcell + \pofcolumns \pofcolumns +\currenthcell \preferedrow\columnmaxcells+\currentvcell{#1}} \def\OTRSETstoreincolumnslotFXBT#1% fixed column - {\OTRSETprepareforcolumnslot2{#1}% % 3/2 dependent on place, todo -\OTRSETflushtextsofar + {\OTRSETcheckprefered + \OTRSETdoifcellelse\pofcolumns\columnmaxcells + {\OTRSETprepareforcolumnslot2}{\OTRSETprepareforcolumnslot3}{#1}% % 3/2 dependent of place, todo + \OTRSETflushtextsofar \OTRSETstoreincolumnslotindeed - \pofcolumns\pofcolumns+\currenthcell + \pofcolumns \pofcolumns +\currenthcell \columnmaxcells\preferedrow-\currentvcell{#1}} % \def\OTRSETstoreincolumnslotHERE#1% fixed column @@ -1232,7 +1237,7 @@ \noflines\columnmaxcells+\currentvcell{#2}% \OTRSETsetvsize} -\def\OTRSETstoreincolumnslotindeed#1#2#3#4#5#6#7#8#9% +\def\OTRSETcheckprefered {\ifnum\preferedcolumn<\mofcolumns \let\pofcolumns\mofcolumns \else @@ -1248,7 +1253,10 @@ \fi \else \let\qofcolumns\mofcolumns - \fi + \fi} + +\def\OTRSETstoreincolumnslotindeed#1#2#3#4#5#6#7#8#9% + {\OTRSETcheckprefered \enoughcolumncellsfalse \donefalse \dostepwiserecurse{#1}{#2}{#31} diff --git a/tex/context/base/ppchtex.tex b/tex/context/base/ppchtex.tex index 4e5ed3d25..23bad14d2 100644 --- a/tex/context/base/ppchtex.tex +++ b/tex/context/base/ppchtex.tex @@ -1052,7 +1052,7 @@ \startrotation by {#1} {#2} %% \stoprotation (t.b.v. testen) \fi} -\def\doresetchemicalrotation% +\def\doresetchemicalrotation {\ifnum\chemicaldrawingmode=1 % njet \else @@ -3354,7 +3354,7 @@ RT##3##4##5=>\processchemicaltextelement{RN}{##3##4##5}{#1}{0}{}, %D \item position tracking %D \stopopsoming -\ifCONTEXT +\ifCONTEXT \else \protect \endinput \fi \def\setchemicalattributes {\scratchdimen\@@chemicalchemicalrulethickness @@ -3392,7 +3392,5 @@ RT##3##4##5=>\processchemicaltextelement{RN}{##3##4##5}{#1}{0}{}, #2% \egroup \fi} - -\fi \protect \endinput diff --git a/tex/context/base/s-abr-01.tex b/tex/context/base/s-abr-01.tex index 63a67fe04..c5b9e75db 100644 --- a/tex/context/base/s-abr-01.tex +++ b/tex/context/base/s-abr-01.tex @@ -255,4 +255,6 @@ \def\THANH {H\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh} +%def\THANH {H\`an Th\ecircumflexacute\ Th\`anh} + \endinput diff --git a/tex/context/base/s-mod-00.tex b/tex/context/base/s-mod-00.tex index ee6b23504..ba8e24235 100644 --- a/tex/context/base/s-mod-00.tex +++ b/tex/context/base/s-mod-00.tex @@ -138,16 +138,12 @@ [titelpagina] [\useMPgraphic{titlepage}] -% When run at \PRAGMA, we use a slightly different graphic, -% so that we can recognize an original. Users are not -% supposed to mimick this feature. - \doifmode{atpragma}{\readfile{s-mod-04.tex}{}{}} \defineframed [TitleFrame] [\c!background=\v!color, - \c!backgroundcolor=wit, + \c!backgroundcolor=white, \c!align=\v!right, \c!offset=12pt, \c!strut=\v!no, @@ -163,7 +159,7 @@ \c!height=\v!middle, \c!width=\v!middle] -\def\moduletitel% +\def\moduletitel {\setuplayout[titlepage] \ifx\ModuleNumber\undefined \else \ifnum\ModuleNumber<10 @@ -488,8 +484,10 @@ %D Command references: -\input setupa -\input setupb +% \input setupa +% \input setupb + +\usemodule[int-load] \loadsetups \unprotect diff --git a/tex/context/base/setupa.tex b/tex/context/base/setupa.tex deleted file mode 100644 index 6dfa4a027..000000000 --- a/tex/context/base/setupa.tex +++ /dev/null @@ -1,739 +0,0 @@ -%D \module -%D [ file=setupa, -%D version=1998.07.20, -%D title=\CONTEXT\ Setup Definitions, -%D subtitle=Macro Definitions, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -\startmessages dutch library: setup - title: setup - formula: formule - number: getal - list: lijst - dimension: maat - mark: markering - reference: verwijzing - command: commando - file: file - name: naam - text: tekst - section: sectie -sectionnumber: sectienummer - singular: naam enkelvoud - plural: naam meervoud - matrix: n*m - see: zie - 1: de karakters < en > zijn globaal actief! - 2: -- wordt verwerkt - 3: -- is niet gedefinieerd - 4: -- wordt nogmaals verwerkt -\stopmessages - -\startmessages english library: setup - title: setup - formula: formula - number: number - list: list - dimension: dimension - mark: mark - reference: reference - command: command - file: file - name: name - text: text - section: section -sectionnumber: sectionnumber - singular: singular name - plural: plural name - matrix: n*m - see: see - 1: the characters < and > are globally active! - 2: -- is processed - 3: -- is undefined - 4: -- is processed again -\stopmessages - -\startmessages german library: setup - title: Setup - formula: Formel - number: Nummer - list: Liste - dimension: Dimension - mark: Beschriftung - reference: Referenz - command: Befehl - file: Datei - name: Name - text: Text - section: Abschnitt -sectionnumber: Abschnittnummer - singular: singular - plural: plural - matrix: n*m - see: siehe - 1: Die Zeichen < und > gelten global! - 2: -- wird verarbeitet - 3: -- ist undefiniert - 4: -- ist mehrmals verarbeitet -\stopmessages - -\startmessages czech library: setup - title: setup - formula: rovnice - number: cislo - list: seznam - dimension: dimenze - mark: znacka - reference: reference - command: prikaz - file: soubor - name: jmeno - text: text - section: sekce -sectionnumber: sekcecislo % ? - singular: jmeno v singularu - plural: jmeno v pluralu - matrix: n*m - see: viz - 1: znaky < a > jsou globalne aktivni! - 2: -- je zpracovano - 3: -- je nedefinovano - 4: -- je zpracovano znovu -\stopmessages - -\startmessages italian library: setup - title: impostazioni - formula: formula - number: numero - list: elenco - dimension: dimensione - mark: marcatura - reference: riferimento - command: comando - file: file - name: nome - text: testo - section: sezione -sectionnumber: numero sezione - singular: nome singolare - plural: nome plurale - matrix: n*m - see: vedi - 1: caratteri < e > attivi globalmente! - 2: -- elaborato - 3: -- non definito - 4: -- elaborato di nuovo -\stopmessages - -\startmessages romanian library: setup - title: setari - formula: formula - number: numar - list: lista - dimension: dimensiune - mark: marcaj - reference: referinta - command: comanda - file: fisier - name: nume - text: text - section: sectiune - sectionnumber: sectiunenumar % ? - singular: nume singular - plural: nume pluram - matrix: n*m - see: vezi - 1: caracterele < si > sunt active global! - 2: este procesat -- - 3: -- este nedefinit - 4: -- este procesat din nou -\stopmessages - -% we need some more constants - -\interfacetranslationtrue - -\input mult-sys -\input mult-con -\input mult-com - -% Enkele letter-instellingen - -\def\setupnumfont {} -\def\setuptxtfont {\tttf} -\def\setupvarfont {\ttsl} -\def\setupoptfont {\ttsl} -\def\setupalwcolor{} -\def\setupoptcolor{darkgray} - -% Het onderstaande is nodig om \type af te handelen in -% argumenten. Standaard gebeurt dit niet. - -% Het actief maken en toekennen moet zeer vroeg gebeuren, -% in ieder geval voordat cont-00a wordt geladen. Zoniet, -% dan gaat het mis op commando's als \processaction. De -% mathematische mode en vergelijken van waarden met \if -% gaat echter wel goed. - -% Omdat in een acrobat geen < en > in een label mogen -% zitten, moeten we deze karakters bij verwijzingen -% converteren naar wat onschuldiger varianten. - -\def\stpt#1{{\tttf#1}} -\def\stpr#1{#1*} -\def\stpv#1{{\setupvarfont#1}} - -\bgroup \catcode`\<=\active \catcode`\>=\other - -\gdef \verbatimsetupvariablepart{\def<<##1>>{\stpr{##1}}} -\gdef \protectsetupvariablepart{\def<<##1>>{\string\stpv{##1}}} -\gdef\visualizesetupvariablepart{\def<<##1>>{\stpv{##1}}} -\gdef \naturalsetupvariablepart{\def<<##1>>{\string<\string<##1\string>\string>}} - -\egroup - -% \setupsetup -% [verwijzing=<0,1,2,3>] -% -% \startsetup -% \command[name] -% \type[list] -% \value[values][default] -% \variable[variable][values][default] -% \stopsetup -% -% \setup{name} -% -% \volledigelijstmettexcommandos -% \plaatslijstmettexcommandos -% -% \c!val! [a] -% \c!vals! [a,b,c] -% -% \c!var! [x=] -% \c!vars! [x=,y=,z=] -% -% \c!trip! [x:y:z] -% \c!trips! [x:y:z,..] -% -% \c!arg! {..} -% \c!args! {..,..,..} -% -% \c!wrd! {..} -% \c!wrds! {.. .. ..} -% -% \c!idx! {..} -% \c!idxs! {..+..+..} -% -% \c!mat! $..$ -% \c!dis! $$..$$ -% -% \c!pos! (x) -% \c!poss! (x,y) -% -% \c!nop! ... -% -% \c!fil! ... -% -% \c!stp! \stop... -% -% \c!ref! [ref] -% \c!refs! [ref,..] -% -% \c!par! \par -% -% \c!cmd! \commando -% -% \c!opt! optioneel -% \c!alwint! altijd interactief -% \c!optint! optioneel interactief -% -% \c!dest! {..[refs]} -% \c!dests! {..[refs]},.. -% -% \c!one! #1 -% \c!two! #2 -% \c!three! #3 -% -% \c!font! fontspecificatie -% -% \c!sep! \\ - -\unprotect - -\def\@@setup {@@setup} -\def\c!stp {} -\def\c!setupref{stp} -\def\??stp {@@stp} - -\def\c!setup!variable!#1{{\setupvarfont\getmessage{setup}{#1}}} -\def\c!setup!command! #1{{\setupvarfont\texescape\getmessage{setup}{command}#1}} - -\def\c!command! {\c!setup!variable!{command}} -\def\c!dimension! {\c!setup!variable!{dimension}} -\def\c!filename! {\c!setup!variable!{file}} -\def\c!identifier! {\c!setup!variable!{name}} -\def\c!character! {\c!setup!variable!{character}} -\def\c!marker! {\c!setup!variable!{mark}} -\def\c!number! {\c!setup!variable!{number}} -\def\c!reference! {\c!setup!variable!{reference}} -\def\c!plural! {\c!setup!variable!{plural}} -\def\c!singular! {\c!setup!variable!{singular}} -\def\c!text! {\c!setup!variable!{text}} -\def\c!formula! {\c!setup!variable!{formula}} -\def\c!font! {\c!setup!variable!{file}} -\def\c!matrix! {\c!setup!variable!{matrix}} -\def\c!list! {\c!setup!variable!{list}} -\def\c!section! {\c!setup!variable!{section}} -\def\c!sectionnumber!{\c!setup!variable!{sectionnumber}} - -\def\c!noargument! {\c!setup!command!{}} -\def\c!oneargument! {\c!setup!command!{\#1}} -\def\c!twoarguments! {\c!setup!command!{\#1\#2}} -\def\c!threearguments!{\c!setup!command!{\#1\#2\#3}} - -\def\c!tex! #1{\texescape#1} -\def\c!or! #1#2{#1\hbox spread .25em{\vl}#2} - -\let\redefinesetupconstants=\relax - -% Test: - -\newif\ifbreaksetup \def\breaksetup{\ifbreaksetup\allowbreak\fi} - -\def\c!repeat! {\breaksetup\c!opt!{{\setupvarfont n}*}\breaksetup} -\def\c!arg! {\breaksetup\leftargument\c!dots!\rightargument\breaksetup} -\def\c!args! {\breaksetup\leftargument..,\breaksetup\c!dots!,\breaksetup..\rightargument\breaksetup} -\def\c!dis! {\breaksetup\$\$\c!dots!\$\$\breaksetup} -\def\c!idx! {\breaksetup\leftargument\c!dots!\rightargument\breaksetup} -\def\c!idxs! {\breaksetup\leftargument..+\breaksetup\c!dots!+\breaksetup..\rightargument\breaksetup} -\def\c!mat! {\breaksetup\$\c!dots!\$\breaksetup} -\def\c!nop! {\breaksetup\c!dots!\breaksetup} -\def\c!fil! {\breaksetup~\c!dots!~\breaksetup} -\def\c!pos! {\breaksetup(\c!dots!)\breaksetup} -\def\c!poss! {\breaksetup(\c!dots!,\c!dots!)\breaksetup} -\def\c!sep! {\breaksetup\texescape\texescape\breaksetup} -\def\c!ref! {\breaksetup[{\setupvarfont ref}]\breaksetup} -\def\c!refs! {\breaksetup[{\setupvarfont ref},\breaksetup..]\breaksetup} -\def\c!val! {\breaksetup[\c!dots!]\breaksetup} -\def\c!vals! {\breaksetup[..,\breaksetup\c!dots!,\breaksetup..]\breaksetup} -\def\c!var! {\breaksetup[..=..]\breaksetup} -\def\c!vars! {\breaksetup[..,\breaksetup..=..,\breaksetup..]\breaksetup} -\def\c!cmd! {\breaksetup\c!noargument!\breaksetup} -\def\c!dest! {\breaksetup[\leftargument..\breaksetup\c!ref!\rightargument]\breaksetup} -\def\c!dests! {\breaksetup[..,\breaksetup\leftargument..\breaksetup\c!refs!\rightargument,\breaksetup..]\breaksetup} -\def\c!trip! {\breaksetup[x:y:z=]\breaksetup} -\def\c!trips! {\breaksetup[x:y:z=,\breaksetup..]\breaksetup} -\def\c!wrd! {\breaksetup\leftargument\c!dots!\rightargument\breaksetup} -\def\c!wrds! {\breaksetup\leftargument.. \breaksetup\c!dots!\ \breaksetup..\rightargument\breaksetup} -\def\c!par! {\breaksetup\texescape par\breaksetup} -\def\c!opt! #1{{\setupoptfont{#1}}} - -\def\c!opt! #1{\ifx#1\c!or!\@EA\c!doropt!\else\@EA\c!noropt!\fi#1} -\def\c!doropt! #1#2#3{{\setupoptfont{#1#2#3}}} -\def\c!noropt! #1{{\setupoptfont{#1}}} - -\defineregister - [texmacro] - [texmacros] - -\definesorting - [texcommando] - [texcommandos] - -\setupsorting - [texcommando] - [\c!command=\@@stpcommand, - \c!criterium=\@@stpcriterium] - -\definesorting - [elktexcommando] - [alletexcommandos] - -\setupsorting - [elktexcommando] - [\c!command=\@@stpcommand, - \c!criterium=\v!all] - -% verwijzing: 0 geen verwijzingen plaatsen / wel genereren -% 1 alleen bij zie plaatsen / wel genereren -% 2 alle verwijzingen plaatsen / niet genereren -% 3 bij zie commando klikken / wel genereren - -\newif\ifv!numberingdots! -\newif\ifv!alwaysinteractive! -\newif\ifv!optionalinteractive! - -\newcount\v!dotnumber! - -\def\c!dots! - {\ifv!numberingdots! - \global\advance\v!dotnumber! by 1\relax - .{\setupnumfont\the\v!dotnumber!}.% - \else - ...% - \fi} - -\def\writesetupparbox#1% - {\hbox to \@@stpwidth{\strut#1\hss}}% - -\def\writesetupparameter#1#2% - {\doifcommonelse{#1}{#2} - {\underbar{#1} } - {#1 }}% - -\def\writesetupparametervalues#1#2#3% - {\bgroup - \def\dowritesetupparameter##1% - {\writesetupparameter{##1}{#3}}% - \veryraggedright - \noindent - \hangindent=\@@stpwidth - \writesetupparbox{\let\c!setup!variable!\firstofoneargument\getinterfaceconstant{#1}}% - \processcommalist[#2]\dowritesetupparameter - \doifcommonelse{#3}{#2}{}{\underbar{#3}}% - \endgraf - \egroup} - -\def\writesetupparameters#1#2% - {\doifnot{#1}{} - {\bgroup - \def\dowritesetupparameter##1% - {\writesetupparameter{##1}{#2}}% - \indent - \veryraggedright - \hangindent=\@@stpwidth - \writesetupparbox{\c!dots!}% - \processcommalist[#1]\dowritesetupparameter - \endgraf - \egroup}} - -% #1=list #3=default - -\def\setupvalue[#1]#2[#3]% - {\writesetupparameters{#1}{#3}} - -% #1=name #3=list #5=default - -\def\doifsystemconstantelse#1% - {\convertargument*\v!\to\asciia - \convertargument*#1\to\asciib - \doifinstringelse\asciia\asciib} - -\def\setupvariable[#1]#2[#3]#4[#5]% - {\doifcommonelse{\c!command!,\c!dimension!,\c!number!,\c!text!}{#3} - {\doifsystemconstantelse{#5} - {\writesetupparametervalues{#1}{#3}{#5}} - {\writesetupparametervalues{#1}{#3}{}}} - {\writesetupparametervalues{#1}{#3}{#5}}} - -\unexpanded\def\inheritsetup#1% - {\setsetupreference#1\to\currentsetupinheritance - \ifcase\@@stpreference - \texescape#1% % njet - \or - {\at{p}[\currentsetupinheritance]: \texescape#1}% zonder { } probleem - \or - {\at{p}[\currentsetupinheritance]: \texescape#1}% nog eens uitzoeken - \or - {\goto{\tttf\texescape#1}[\currentsetupinheritance]}% - \fi} - -% #1=name - -\def\inheritsetupvalues[#1]#2[#3]% - {\bgroup - \ConvertToConstant\doifelse{#3}{}{\def\next{}}{\def\next{: }}% - \verbatimsetupvariablepart - \value[\getmessage{setup}{see} \inheritsetup{#1}\next#3][]% - \egroup} - -% #1=name - -\def\inheritsetupvariables[#1]#2[#3]% - {\bgroup - \ConvertToConstant\doifelse{#3}{}{\def\next{}}{\def\next{: }}% - \verbatimsetupvariablepart - \variable[..=..][\getmessage{setup}{see} \inheritsetup{#1}\next#3][]% - \egroup} - -\def\setupsetup - {\dodoubleargument\getparameters[\??stp]} - -\bgroup \catcode`<=\active - -\gdef\dowritetexcommand#1<<#2>>#3\\% - {\texescape#1{\setupvarfont#2}#3} - -\gdef\writetexcommand#1% - {\setuptxtfont - \convertargument<<\to\asciia - \convertargument#1\to\asciib - \doifinstringelse{\asciia}{\asciib} - {\dowritetexcommand#1\\} - {\texescape#1}} - -\egroup - -\xdef\currentsetupreference {} -\xdef\currentsetupinheritance {} - -\def\subsetupreference#1{@#1@} - -\let\subsetup=\subsetupreference - -\def\setsetupreference#1\to#2% - {\bgroup - \verbatimsetupvariablepart - \let\subsetup=\subsetupreference - \xdef#2{\c!setupref:#1}% - \egroup} - -\def\setsetupnumber#1\to#2% - {\bgroup - \xdef#2{\c!setupref:#1}% - \egroup} - -\def\checkparametervalues#1#2#3% - {\setbox0=\hbox{\let\c!setup!variable!\firstofoneargument\getinterfaceconstant{#1}}% - \ifdim\wd0\morecharacter\dimen0\relax - \dimen0=\wd0 - \fi} - -\def\checkparameters#1#2% - {\setbox0=\hbox{\c!dots!}% - \ifdim\wd0\morecharacter\dimen0\relax - \dimen0=\wd0 - \fi} - -\def\dointeractivesetupsymbol#1% - {\color - [#1] - {\raise.15ex\hbox{$\gobackwardcharacter\hskip.5em\goforwardcharacter$}}} - -\def\dointeractivesetup - {\ifv!alwaysinteractive! - \dointeractivesetupsymbol\setupalwcolor - \fi - \ifv!optionalinteractive! - \dointeractivesetupsymbol\setupoptcolor - \fi} - -\bgroup \catcode`<=\active - -\@EA\gdef\@EA\c!dostp!\e!start#1<<#2>>#3\\% - {\breaksetup~...~\breaksetup\texescape\e!stop#1{\setupvarfont#2}}% - -\gdef\stripsetupstoppart#1% - {\@EA\def\@EA\c!stp!\@EA{\@EA\c!dostp!#1<<>>\\}} - -\egroup - -\pushmacro\setuptext - -\defineframedtext - [setuptext] - [\c!width=\hsize, - \c!height=\v!fit, - \c!offset=0.75em] - -\popmacro\setuptext - -\newif\ifshortsetup - -\newcounter\currentsetupnumber - -\def\dosetupreference - {\doifundefinedelse{done::\currentsetupreference} - {\pagereference[\currentsetupnumber]% - \pagereference[\currentsetupreference]% - \setgvalue{done::\currentsetupreference}{}} - {\showmessage{setup}{4}{\currentsetupreference}}} - -\def\doprocesssetup\number[#1]\command[#2]\type[#3]#4% - {\bgroup - \showmessage{setup}{2}{#2}% - \ifshortsetup\else\breaksetupfalse\fi - \let\value=\setupvalue - \let\variable=\setupvariable - \let\inheritvalues=\inheritsetupvalues - \let\inheritvariables=\inheritsetupvariables - \stripsetupstoppart{#2}% - \advance\hsize by -\leftskip - \advance\hsize by -\rightskip - \getvalue{\e!start setuptext} - \setupwhitespace[\v!none]% - \bgroup - \verbatimsetupvariablepart \edef\first {#2*}% - \protectsetupvariablepart \edef\second{#2}% - \expanded{\texmacro[\first]{\noexpand\stpt{\second}}}% - \egroup - \global\v!dotnumber!=0 - \global\v!numberingdots!true - \global\v!alwaysinteractive!false - \global\v!optionalinteractive!false - \def\c!alwint!{\global\v!alwaysinteractive!true}% - \def\c!optint!{\global\v!optionalinteractive!true}% - \setbox0=\hbox{\redefinesetupconstants#3}% - \ifnum\v!dotnumber!<2 - \global\v!numberingdots!false - \fi - \global\v!dotnumber!=0 - \ifbreaksetup - \hangafter1 - \hangindent1em - \veryraggedright - \else - \hbox to \hsize - \fi - {\let\subsetup=\gobbleoneargument - \redefinesetupconstants - \setuptxtfont\setstrut\strut - \visualizesetupvariablepart - \writetexcommand{#2}#3% - \ifbreaksetup\hfill\else\hss\fi - \ifnum\@@stpreference>0 - \dointeractivesetup - \fi - \setsetupnumber #1\to\currentsetupnumber - \setsetupreference#2\to\currentsetupreference - \ifcase\@@stpreference - \dosetupreference - \or - \dosetupreference - \or - \hskip1em - \doifreferencefoundelse{\currentsetupreference} - {\bf\at[\currentsetupreference]} - {\setupvarfont \translate - [nl=nog niet beschreven, - en=not yet described, - de=not yet described]}% - \or - \dosetupreference - \fi} - \ifbreaksetup - \endgraf - \fi - \ifshortsetup \else - \switchtobodyfont[\v!small]% - \setuptxtfont - \redefinesetupconstants - \global\v!dotnumber!=0 - \setbox0=\vbox - {\dimen0=\!!zeropoint - \let\writesetupparametervalues=\checkparametervalues - \let\writesetupparameters=\checkparameters - #4\relax - \ifdim\dimen0<2.5em - \dimen0=2.5em - \fi - \advance\dimen0 by 2em - \xdef\@@stpwidth{\the\dimen0}}% - \global\v!dotnumber!=0 - \setbox0=\vbox{#4}% - \ifdim\wd0>\!!zeropoint - \blank - \unvbox0 - \fi - \fi - \getvalue{\e!stop setuptext} - \egroup} - -\def\dosetup#1% - {\protect - \verbatimsetupvariablepart - \xdef\globalsetupname{#1}% - \expanded{\usecommands{#1*}}% - \doifdefinedelse{\@@setup\globalsetupname} - {\getvalue{\@@setup\globalsetupname}} - {\bgroup - \showmessage{setup}{3}{#1}% - \setuptxtfont [setup \makemessage{setup}{3}{#1}]\endgraf - \egroup}% - \egroup - \@@stpafter} - -\def\setup - {\@@stpbefore - \bgroup - \catcode`\<=\@@active - \catcode`\>=\@@other - \unprotect - \shortsetupfalse - \dosetup} - -\def\shortsetup - {\@@stpbefore - \bgroup - \catcode`\<=\@@active - \catcode`\>=\@@other - \unprotect - \shortsetuptrue - \dosetup} - -\def\startsetupfile - {\bgroup - \catcode`\<=\active - \unprotect} - -\def\stopsetupfile - {\protect - \egroup - \endinput} - -\def\startsetup#1\command[#2]#3\type[#4]#5\stopsetup - {\bgroup - \verbatimsetupvariablepart - \doglobal\increment\currentsetupnumber\relax - \edef\!!stringa{\@@setup#2}% - \expandafter\setgvalue\expandafter\!!stringa\expandafter - {\expandafter\doprocesssetup\expandafter - \number\expandafter[\currentsetupnumber]% - \command[#2]\type[#4]{#5}}% - % 'elk' comes first, else no 'gebruikt' entries are written - \expanded{\elktexcommando[#2*]{#2}}% - % this uggly hack prevents messages - \let\showmessage\gobblethreearguments - % here 'elk' is overruled - \expanded{\texcommando[#2*]{#2}}% - \egroup} - -\let\documenteduntilhere\relax - -\defineblock [dutch, english, german, czech, italian] -\hideblocks [dutch, english, german, czech, italian] - -\setupsetup - [\c!before=, - \c!after=, - \c!command=\setup, - \c!reference=0, - \c!criterium=\v!used] - -\def\placesetup - {\bgroup - \getvalue{\e!place\e!listof texcommandos} - \egroup} - -\def\placeeverysetup % for fun purposes only - {\bgroup - \setupsetup[\c!reference=2]% - \setupreferencing[\c!state=\v!stop]% - \getvalue{\e!place\e!listof alletexcommandos}% - \egroup} - -\let\plaatssetup \placesetup -\let\plaatselkesetup\placeeverysetup - -\bgroup \catcode`\<=\active \def<{\lesscharacter} \egroup - -% \showmessage{setup}{1}{} \catcode`\<=\active - -\protect \endinput diff --git a/tex/context/base/setupb.tex b/tex/context/base/setupb.tex deleted file mode 100644 index cd8588a9b..000000000 --- a/tex/context/base/setupb.tex +++ /dev/null @@ -1,9077 +0,0 @@ -%D \module -%D [ file=setupb, -%D version=1998.07.20, -%D title=\CONTEXT\ Setup Definitions, -%D subtitle=Command Specifications, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -% nieuw: oncomment plaatssamengesteldelijst - -% placeheadtext placeheadnumber placefloatnumber -% setupinitial placeinitial \c!state \c!location \c!n \s!font=initial (Initial) - -% nog 'reductie=ja/nee' in \setupcolors - -\startsetupfile - -% lang-ini - -\startsetup - \command - [\y!installlanguage] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!spacing] - [\v!packed,\v!broad] - [\v!packed] - \variable - [\s!lefthyphenmin] - [\c!dimension!] - [2] - \variable - [\s!righthyphenmin] - [\c!dimension!] - [2] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!stop] - \variable - [\c!leftsentence] - [\c!command!] - [---] - \variable - [\c!rightsentence] - [\c!command!] - [---] - \variable - [\c!leftsubsentence] - [\c!command!] - [---] - \variable - [\c!rightsubsentence] - [\c!command!] - [---] - \variable - [\c!leftquote] - [\c!command!] - [`] - \variable - [\c!rightquote] - [\c!command!] - ['] - \variable - [\c!leftquotation] - [\c!command!] - [``] - \variable - [\c!rightquotation] - [\c!command!] - [''] - \variable - [\c!default] - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!setuplanguage] - \type - [\c!val!\c!vars!] - \value - [\s!nl,\s!fr,\s!en,\s!uk,\s!de,\s!es,\s!cz,..] - [\s!nl] - \inheritvariables - [\y!installlanguage] - [] -\stopsetup - -\startsetup - \command - [\y!language] - \type - [\c!val!] - \value - [\s!nl,\s!fr,\s!en,\s!uk,\s!de,\s!es,\s!cz,..] - [] -\stopsetup - -\startsetup - \command - [\y!mainlanguage] - \type - [\c!val!] - \value - [\s!nl,\s!fr,\s!en,\s!uk,\s!de,\s!es,\s!cz,..] - [] -\stopsetup - -\startsetup - \command - [\y!translate] - \type - [\c!vars!] - \variable - [\c!identifier!] - [\c!text!] - [] -\stopsetup - -% enco-ini - -\startsetup - \command - [\y!useencoding] - \type - [\c!vals!] - \value - [\c!identifier!] - [] -\stopsetup - -% spec-ini - -\startsetup - \command - [\y!usespecials] - \type - [\c!vals!] - \value - [\c!reset,\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!defineoutput] - \type - [\c!val!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!setupoutput] - \type - [\c!vals!] - \value - [\c!identifier!] - [] -\stopsetup - -% font-ini - -\startsetup - \command - [\y!definebodyfontenvironment] - \type - [\c!val!\c!vars!] - \value - [5pt,...,12pt,\s!default] - [] - \variable - [\s!text] - [\c!dimension!] - [] - \variable - [\s!script] - [\c!dimension!] - [] - \variable - [\s!scriptscript] - [\c!dimension!] - [] - \variable - [\c!x] - [\c!dimension!] - [] - \variable - [\c!xx] - [\c!dimension!] - [] - \variable - [\c!small] - [\c!dimension!] - [] - \variable - [\c!big] - [\c!dimension!] - [] -\stopsetup - -\startsetup - \command - [\y!setupbodyfontenvironment] - \type - [\c!val!\c!vars!] - \inheritvalues - [\y!setupbodyfont] - [] - \inheritvariables - [\y!setupbodyfont] - [] -\stopsetup - -\startsetup - \command - [\y!showbodyfontenvironment] - \type - [\c!vals!] - \inheritvalues - [\y!setupbodyfont] - [] -\stopsetup - -\startsetup - \command - [\y!definebodyfont] - \type - [\c!vals!\c!val!\c!vars!] - \value - [5pt,...,12pt,\s!default] - [] - \value - [\c!rm,\c!ss,\c!tt,\c!mm,\c!hw,\c!cg] - [] - \variable [\c!tf] [\c!font!] [] - \variable [\c!bf] [\c!font!] [] - \variable [\c!sl] [\c!font!] [] - \variable [\c!it] [\c!font!] [] - \variable [\c!bs] [\c!font!] [] - \variable [\c!bi] [\c!font!] [] - \variable [\c!sc] [\c!font!] [] - \variable [\c!ex] [\c!font!] [] - \variable [\c!mi] [\c!font!] [] - \variable [\c!sy] [\c!font!] [] - \variable [\c!ma] [\c!font!] [] - \variable [\c!mb] [\c!font!] [] - \variable [\c!mc] [\c!font!] [] -\stopsetup - -\startsetup - \command - [\y!showbodyfont] - \type - [\c!vals!] - \inheritvalues - [\y!setupbodyfont] - [] -\stopsetup - -\startsetup - \command - [\y!setupbodyfont] - \type - [\c!vals!] - \value - [\c!identifier!, - \v!serif,\v!regular,\v!roman, - \v!sans,\v!support,\v!sansserif, - \v!mono,\v!type,\v!teletype, - \v!handwritten,\v!calligraphic, - 5pt,...,12pt] - [sau,ibm,12pt,\v!serif] -\stopsetup - -% not yet multi lingual -% -% \startsetup -% \command -% [\y!switchstyleonly] -% \type -% [\c!val!] -% \value -% [\c!identifier!] -% [] -% \stopsetup - -\startsetup - \command - [\y!switchtobodyfont] - \type - [\c!vals!] - \value - [5pt,...,12pt,\v!small,\v!big,\v!global] - [] -\stopsetup - -\startsetup - \command - [\y!definefont] - \type - [\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!font!] - [] -\stopsetup - -\startsetup - \command - [\y!setupstrut] - \type - [\c!opt!\c!vals!] - \value - [\v!yes,\v!no,\v!cap,\c!text!] - [\v!yes] -\stopsetup - -% colo-ini - -\startsetup - \command - [\y!setupcolor] - \type - [\c!val!] - \value - [\c!identifier!] - [\v!rgb] -\stopsetup - -\startsetup - \command - [\y!setupcolors] - \type - [\c!vars!] - \variable - [\c!state] - [\v!start,\v!stop,\v!global,\v!local] - [\v!stop] - \variable - [\c!conversion] - [\v!yes,\v!no,\v!always] - [\v!yes] - \variable - [\c!reduction] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!rgb] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!cmyk] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!mp\c!cmyk] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!mp\c!spot] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!textcolor] - [\c!identifier!] - [] - \variable - [\c!split] - [\c!c,\c!m,\c!y,\c!k,\c!p,\c!s,\v!no,\c!identifier!] - [\v!no] - \variable - [\c!criterium] - [\v!all,\v!none] - [\v!none] -\stopsetup - -\startsetup - \command - [\y!definecolor] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!r] - [\c!text!] - [0] - \variable - [\c!g] - [\c!text!] - [0] - \variable - [\c!b] - [\c!text!] - [0] - \variable - [\c!c] - [\c!text!] - [0] - \variable - [\c!m] - [\c!text!] - [0] - \variable - [\c!y] - [\c!text!] - [0] - \variable - [\c!k] - [\c!text!] - [0] - \variable - [\c!s] - [\c!text!] - [0] -\stopsetup - -\startsetup - \command - [\y!startcolor] - \type - [\c!val!\c!stp!] - \value - [\c!identifier!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!color] - \type - [\c!val!\c!arg!] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!graycolor] - \type - [\c!val!] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!showcolor] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!definepalet] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!identifier!] - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!setuppalet] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!definecolorgroup] - \type - [\c!val!\c!opt!\c!val!\c!trips!] - \value - [\c!identifier!] - [] - \value - [\v!rgb,\v!cmyk,\v!gray,\v!s] - [\v!rgb] -\stopsetup - -\startsetup - \command - [\y!showpalet] - \type - [\c!val!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\v!horizontal,\v!vertical,\v!name,\v!value] - [] -\stopsetup - -\startsetup - \command - [\y!showcolorgroup] - \type - [\c!val!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\v!horizontal,\v!vertical,\v!name,\v!value,\v!number] - [] -\stopsetup - -\startsetup - \command - [\y!comparepalet] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!comparecolorgroup] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command [\y!showmakeup] - \type [] -\stopsetup - -% core-ver - -\startsetup - \command - [\y!definetype] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setuptype] - [] -\stopsetup - -\startsetup - \command - [\y!setuptype] - \type - [\c!vars!] - \variable - [\c!space] - [\v!on,\v!off] - [\v!off] - \variable - [\c!option] - [\v!slanted,\v!normal,\v!none] - [\v!none] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!type] - \variable - [\c!color] - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command [\y!type] - \type [\c!arg!] - \value [\c!text!][] -\stopsetup - -\startsetup - \command [\y!typ] - \type [\c!arg!] - \value [\c!text!][] -\stopsetup - -\startsetup - \command [\y!tex] - \type [\c!arg!] - \value [\c!text!][] -\stopsetup - -\startsetup - \command [\y!arg] - \type [\c!arg!] - \value [\c!text!][] -\stopsetup - -\startsetup - \command - [\y!definetyping] - \type - [\c!val!\c!vars!] - \value - [\v!file,\v!typing,\c!identifier!] - [] - \inheritvariables - [\y!setuptyping] - [] -\stopsetup - -\startsetup - \command - [\y!setuptyping] - \type - [\c!opt!\c!val!\c!vars!] - \value - [\v!file,\v!typing,\c!identifier!] - [] - \variable - [\c!space] - [\v!on,\v!off] - [\v!off] - \variable - [\c!page] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!option] - [\v!slanted,\v!normal,\v!commands,\v!color,\v!none] - [\v!none] - \variable - [\c!text] - [\v!yes,\v!no] - [\v!no] - \variable - [i\c!command] - [\c!command!] - [\ttsl] - \variable - [v\c!command] - [\c!command!] - [] - \variable - [c\c!command] - [\c!command!] - [\tf] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [\blank] - \variable - [\c!margin] - [\c!dimension!,\v!standard,\v!yes,\v!no] - [0pt] - \variable - [\c!evenmargin] - [\c!dimension!] - [0pt] - \variable - [\c!oddmargin] - [\c!dimension!] - [0pt] - \variable - [\c!blank] - [\c!dimension!,\v!small,\v!medium,\v!big,\v!standard,\v!halfline,\v!line] - [\v!line] - \variable - [\c!escape] - [\c!character!] - [/] - \variable - [\c!indentnext] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!type] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!palet] - [\c!identifier!] - [colorpretty] - \variable - [\c!lines] - [\v!yes,\v!no,\v!hyphenated] - [\v!yes] -\stopsetup - -\startsetup - \command - [\e!start<<\y!typing>>] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!typefile] - \type - [\c!opt!\c!val!\c!arg!] - \value - [\c!identifier!] - [] - \value - [\c!filename!] - [] -\stopsetup - -% core-not - -\startsetup - \command - [\y!setupfootnotes] - \type - [\c!vars!] - \variable - [\c!conversion] - [\v!numbers,\v!characters,\v!Characters,\v!romannumerals,\v!Romannumerals] - [\v!numbers] - \variable - [\c!way] - [\v!by\v!text,\v!by\c!section!] - [\v!by\v!text] - \variable - [\c!location] - [\v!page,\v!text,\v!columns,\v!firstcolumn,\v!lastcolumn,\v!high,\v!none] - [\v!page] - \variable - [\c!rule] - [\v!on,\v!off] - [\v!off] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!width] - [\c!dimension!] - [] - \variable - [\c!height] - [\c!dimension!] - [] - \variable - [\c!bodyfont] - [5pt,...,12pt,\v!small,\v!big] - [\v!small] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!distance] - [\c!dimension!] - [.125em] - \variable - [\c!columndistance] - [\c!dimension!] - [1em] - \variable - [\c!margindistance] - [\c!dimension!] - [.5em] - \variable - [\c!n] - [\c!number!] - [1] - \variable - [\c!numbercommand] - [\c!oneargument!] - [] - \variable - [\c!textcommand] - [\c!oneargument!] - [] - \variable - [\c!split] - [\v!tolerant,\v!strict,\v!verystrict,\c!number!] - [\v!tolerant] - \variable - [\c!textstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [] - \variable - [\c!textcolor] - [\c!identifier!] - [] - \variable - [\c!interaction] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!factor] - [\c!number!] - [] % or -1 - \inheritvariables - [\y!framed] - [] -\stopsetup - -\startsetup - \command - [\y!setupfootnotedefinition] - \type - [\c!vars!] - \inheritvariables - [\y!definedescription] - [] -\stopsetup - -\startsetup - \command[\y!footnote] - \type[\c!opt!\c!ref!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!footnotetext] - \type[\c!opt!\c!ref!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!note] - \type[\c!optint!\c!ref!] -\stopsetup - -\startsetup - \command - [\y!startlocalfootnotes] - \type - [\c!stp!] - \inheritvariables - [\y!setupfootnotes] - [] -\stopsetup - -\startsetup - \command - [\y!placelocalfootnotes] - \type - [\c!opt!\c!vars!] - \inheritvariables - [\y!setupfootnotes] - [] -\stopsetup - -\startsetup - \command - [\y!placefootnotes] - \type - [\c!opt!\c!vars!] - \inheritvariables - [\y!setupfootnotes] - [] -\stopsetup - -% core-fnt / core-con - -\startsetup - \command - [\y!setupunderbar] - \type - [\c!vars!] - \variable - [\c!alternative] - [a,b,c] - [a] - \variable - [\c!rulethickness] - [\c!dimension!] - [\linewidth] - \variable - [\c!bottomoffset] - [\c!dimension!] - [1.5pt] - \variable - [\c!topoffset] - [\c!dimension!] - [2.5pt] - \variable - [\c!rulecolor] - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command[\y!underbar] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!underbars] - \type[\c!wrds!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!overbar] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!overbars] - \type[\c!wrds!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!overstrike] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!overstrikes] - \type[\c!wrds!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!romannumerals] - \type[\c!arg!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!Romannumerals] - \type[\c!arg!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!numbers] - \type[\c!arg!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!character] - \type[\c!arg!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!Character] - \type[\c!arg!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!characters] - \type[\c!arg!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!Characters] - \type[\c!arg!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\v!mediaeval] % geen \y!mediaeval - \type[\c!arg!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!month] - \type[\c!arg!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!MONTH] - \type[\c!arg!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!weekday] - \type[\c!arg!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!WEEKDAY] - \type[\c!arg!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command - [\y!setupcapitals] - \type - [\c!vars!] - \variable - [\c!title] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!sc] - [\v!yes,\v!no] - [\v!no] -\stopsetup - -\startsetup - \command[\y!smallcapped] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!notsmallcapped] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!CAPPED] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!SmallCapped] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!SmallCaps] - \type[\c!wrds!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!WORD] - \type[\c!wrd!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!WORDS] - \type[\c!wrds!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!Word] - \type[\c!wrd!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!Words] - \type[\c!wrds!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!stretched] - \type[\c!wrd!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command - [\y!definesymbol] - \type - [\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!definefiguresymbol] - \type - [\c!val!\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\c!text!] - [] - \inheritvariables - [\y!externalfigure] - [] -\stopsetup - -\startsetup - \command - [\y!symbol] - \type - [\c!opt!\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!startsymbolset] - \type - [\c!val!\c!stp!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!setupsymbolset] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!usesymbols] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!showsymbolset] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!defineconversion] - \type - [\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!command!,\c!text!] % eigenlijk texts - [] -\stopsetup - -\startsetup - \command - [\y!convertnumber] - \type - [\c!arg!\c!arg!] - \value - [\c!identifier!] - [] - \value - [\c!number!] - [] -\stopsetup - -% lang-lab - -\startsetup - \command - [\y!setupheadtext] - \type - [\c!opt!\c!val!\c!var!] - \value - [\s!nl,\s!fr,\s!en,\s!uk,\s!de,\s!es,\s!cz,..] - [\s!nl] - \variable - [\c!identifier!] - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!setuplabeltext] - \type - [\c!opt!\c!val!\c!var!] - \value - [\s!nl,\s!fr,\s!en,\s!uk,\s!de,\s!es,\s!cz,..] - [\s!nl] - \variable - [\c!identifier!] - [\c!text!] - [] -\stopsetup - -\startsetup - \command[\y!headtext] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!labeltext] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -% core-rul - -\startsetup - \command - [\y!setupmarginrules] - \type - [\c!var!] - \variable - [\c!level] - [\c!number!] - [1] - \variable - [\c!rulethickness] - [\c!dimension!] - [] -\stopsetup - -\startsetup - \command - [\y!startmarginrule] - \type - [\c!val!\c!stp!] - \value - [\c!number!] - [] -\stopsetup - -\startsetup - \command - [\y!marginrule] - \type - [\c!val!\c!arg!] - \value - [\c!number!] - [] -\stopsetup - -% \startsetup -% \command -% [\y!setuprules] -% \type -% [\c!var!] -% \variable -% [\c!lijndikte] -% [\v!klein,\v!middel,\v!groot,\c!dimension!] -% [\v!middel] -% \variable -% [\c!voor] -% [\c!command!] -% [] -% \variable -% [\c!na] -% [\c!command!] -% [] -% \stopsetup - -\startsetup - \command - [\y!setuplinewidth] - \type - [\c!val!] - \value - [\c!dimension!] - [] -\stopsetup - -\startsetup - \command - [\y!setupframed] - \type - [\c!vars!] - \variable - [\c!height] - [\v!fit,\v!broad,\c!dimension!] - [\v!broad] - \variable - [\c!width] - [\v!fit,\v!broad,\v!fixed,\v!local,\c!dimension!] - [\v!broad] - \variable - [\c!offset] - [\v!none,\v!overlay,\v!default,\c!dimension!] - [1em] - \variable - [\c!location] - [\v!low,\v!depth,\v!hanging] - [] - \variable - [\c!option] - [\v!none,\v!empty] - [\v!none] - \variable - [\c!strut] - [\v!yes,\v!no,\v!global,\v!local] - [\v!yes] - \variable - [\c!align] - [\v!no,\v!left,\v!right,\v!middle,\v!normal,\v!high,\v!low,\v!lohi] - [\v!no] - \variable - [\c!bottom] - [\c!command!] - [\vss] - \variable - [\c!top] - [\c!command!] - [] - \variable - [\c!frame] - [\v!on,\v!off,\v!none,\v!overlay] - [\v!on] - \variable - [\c!topframe] - [\v!on,\v!off] - [\v!off] - \variable - [\c!bottomframe] - [\v!on,\v!off] - [\v!off] - \variable - [\c!leftframe] - [\v!on,\v!off] - [\v!off] - \variable - [\c!rightframe] - [\v!on,\v!off] - [\v!off] - \variable - [\c!frameoffset] - [\c!dimension!] - [0pt] - \variable - [\c!framedepth] - [\c!dimension!] - [0pt] - \variable - [\c!framecorner] - [\v!round,\v!rectangular] - [\v!rectangular] - \variable - [\c!frameradius] - [\c!dimension!] - [.5\korpsgrootte] - \variable - [\c!framecolor] - [\c!identifier!] - [] - \variable - [\c!background] - [\v!screen,\v!color,\v!none,\v!foreground,\c!identifier!] - [\v!none] - \variable - [\c!backgroundscreen] - [\c!number!] - [0.9] - \variable - [\c!backgroundcolor] - [\c!identifier!] - [] - \variable - [\c!backgroundoffset] - [\v!frame,\c!dimension!] - [0pt] - \variable - [\c!backgrounddepth] - [\c!dimension!] - [0pt] - \variable - [\c!backgroundcorner] - [\v!round,\v!rectangular] - [\v!rectangular] - \variable - [\c!backgroundradius] - [\c!dimension!] - [.5\korpsgrootte] - \variable - [\c!depth] - [\c!dimension!] - [0pt] - \variable - [\c!corner] - [\v!round,\v!rectangular] - [\v!rectangular] - \variable - [\c!radius] - [\c!dimension!] - [.5\korpsgrootte] - \variable - [\c!empty] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!foregroundcolor] - [\c!identifier!] - [] - \variable - [\c!foregroundstyle] - [\c!identifier!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!framed] - \type - [\c!opt!\c!vars!\c!arg!] - \inheritvariables - [\y!setupframed] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!inframed] - \type - [\c!opt!\c!vars!\c!arg!] - \inheritvariables - [\y!setupframed] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!thinrules] - \type - [\c!opt!\c!var!] - \inheritvariables - [\y!setupthinrules] - [] -\stopsetup - -\startsetup - \command - [\y!setupthinrules] - \type - [\c!var!] - \variable - [\c!interlinespace] - [\v!small,\v!medium,\v!big] - [\v!small] - \variable - [\c!n] - [\c!number!] - [3] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!inbetween] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!backgroundcolor] - [\c!identifier!] - [] - \variable - [\c!height] - [\c!dimension!,\v!max] - [.5\linewidth] - \variable - [\c!depth] - [\c!dimension!,\v!max] - [.5\linewidth] - \variable - [\c!alternative] - [\v!a,\v!b,\v!c,\v!d] - [\v!a] - \variable - [\c!rulethickness] - [\c!dimension!] - [] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!background] - [\v!color] - [] - \variable - [\c!backgroundcolor] - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command[\y!hairline] - \type[] -\stopsetup - -\startsetup - \command[\y!thinrule] - \type[] -\stopsetup - -\startsetup - \command - [\y!defineframedtext] - \type - [\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupframedtexts] - [] -\stopsetup - -\startsetup - \command - [\y!defineframed] - \type - [\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupframedtexts] - [] -\stopsetup - -\startsetup - \command - [\y!setupframedtexts] - \type - [\c!vars!] - \variable - [\c!bodyfont] - [5pt,...,12pt,\v!small,\v!big] - [] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!small...,\c!command!] % \v!cap - [\v!bold] - \variable - [\c!left] - [\c!command!] - [\hfill] - \variable - [\c!right] - [\c!command!] - [\hfill] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [\blank] - \variable - [\c!inner] - [\c!command!] - [] - \variable - [\c!linecorrection] - [\v!on,\v!off] - [\v!on] - \variable - [\c!depthcorrection] - [\v!on,\v!off] - [\v!on] - \variable - [\c!margin] - [\v!standard,\v!yes,\v!no] - [\v!standard] - \variable - [\c!location] - [\v!left,\v!right,\v!middle,\v!none] - [] - \inheritvariables - [\y!setupframed] - [] -\stopsetup - -% \startsetup -% \command -% [\y!startframedtext] -% \type -% [\c!opt!\c!val!\c!opt!\c!vars!\c!stp!] -% \value -% [\v!links,\v!rechts,\v!midden] -% [] -% \inheritvariables -% [\y!setupframedtexts] -% [] -% \stopsetup - -\startsetup - \command - [\e!start<<\y!framedtext>>] - \type - [\c!opt!\c!val!\c!opt!\c!vars!\c!stp!] - \value - [\v!left,\v!right,\v!middle,\v!none] - [] - \inheritvariables - [\y!setupframedtexts] - [] -\stopsetup - -\startsetup - \command - [<<\y!framedtext>>] - \type - [\c!opt!\c!vars!] - \inheritvariables - [\y!setupframedtexts] - [] -\stopsetup - -\startsetup - \command - [\y!startbackground] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!background] - \type - [] -\stopsetup - -\startsetup - \command - [\y!setupbackground] - \type - [\c!vars!] - \variable - [\c!leftoffset] - [\c!dimension!] - [.5\korpsgrootte] - \variable - [\c!rightoffset] - [\c!dimension!] - [.5\korpsgrootte] - \variable - [\c!topoffset] - [\c!dimension!] - [0pt] - \variable - [\c!bottomoffset] - [\c!dimension!] - [0pt] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!start] - \inheritvariables - [\y!setupframed] - [] -\stopsetup - -\startsetup - \command - [\y!fillinrules] - \type - [\c!opt!\c!vars!\c!arg!\c!opt!\c!arg!] - \inheritvariables - [\y!setupfillinrules] - [] -\stopsetup - -\startsetup - \command - [\y!fillintext] - \type - [\c!opt!\c!vars!\c!arg!\c!opt!\c!arg!\c!par!] - \inheritvariables - [\y!setupfillinrules] - [] -\stopsetup - -\startsetup - \command - [\y!setupfillinrules] - \type - [\c!vars!] - \variable - [\c!width] - [\v!fit,\v!broad,\c!dimension!] - [\v!broad] - \variable - [\c!distance] - [\c!dimension!] - [1em] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [\blank] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!n] - [\c!number!] - [1] - \variable - [\c!interlinespace] - [\v!small,\v!medium,\v!big] - [\v!small] - \variable - [\c!separator] - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!fillinline] - \type - [\c!opt!\c!vars!\c!nop!\c!par!] - \inheritvariables - [\y!setupfillinlines] - [] -\stopsetup - -\startsetup - \command - [\y!setupfillinlines] - \type - [\c!vars!] - \variable - [\c!width] - [\c!dimension!] - [3cm] - \variable - [\c!margin] - [\c!dimension!] - [3cm] - \variable - [\c!distance] - [\c!dimension!] - [1em] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [\blank] -\stopsetup - -\startsetup - \command - [\y!setuptextrules] - \type - [\c!vars!] - \variable - [\c!location] - [\v!left,\v!inmargin] - [\v!left] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [\blank] - \variable - [\c!inbetween] - [\c!command!] - [] - \variable - [\c!width] - [\c!dimension!] - [2em] - \variable - [\c!distance] - [\c!dimension!] - [2em] - \variable - [\c!bodyfont] - [5pt,...,12pt,\v!small,\v!big] - [] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!bold] - \variable - [\c!rulecolor] - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!textrule] - \type - [\c!opt!\c!val!\c!opt!\c!arg!] - \value - [\v!top,\v!bottom] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!starttextrule] - \type - [\c!opt!\c!val!\c!opt!\c!arg!\c!stp!] - \value - [\v!top,\v!bottom] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!blackrule] - \type - [\c!opt!\c!vars!] - \inheritvariables - [\y!setupblackrules] - [] -\stopsetup - -\startsetup - \command - [\y!blackrules] - \type - [\c!vars!] - \inheritvariables - [\y!setupblackrules] - [] -\stopsetup - -\startsetup - \command - [\y!setupblackrules] - \type - [\c!vars!] - \variable - [\c!width] - [\c!dimension!,\v!max] - [1.5em] - \variable - [\c!height] - [\c!dimension!,\v!max] - [1ex] - \variable - [\c!depth] - [\c!dimension!,\v!max] - [0pt] - \variable - [\c!alternative] - [\c!a,\c!b] - [\c!a] - \variable - [\c!distance] - [\c!dimension!] - [.25ex] - \variable - [\c!n] - [\c!number!] - [3] -\stopsetup - -\startsetup - \command - [\y!defineoverlay] - \type - [\c!vals!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!command!] - [] -\stopsetup - -\startsetup - \command - [\y!usemodule] - \type - [\c!vals!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command[\y!reset] - \type[\c!vals!] - \value[\c!identifier!][] -\stopsetup - -\startsetup - \command[\y!donttest] - \type[] -\stopsetup - -\startsetup - \command[\e!start\v!localenvironment] - \type[\c!stp!] -\stopsetup - -\startsetup % gebied, korps - \command - [\y!setupsystem] - \type - [\c!vars!] - \variable - [\c!resolution] - [\c!number!] - [] - \variable - [\c!file] - [\c!text!] - [\jobname] - \variable - [\c!directory] - [\c!text!] - [] - \variable - [\c!random] - [\v!normal,\v!small,\v!medium,\v!big,\c!number!] - [] -\stopsetup - -\startsetup - \command - [\y!usepath] - \type - [\c!vals!] - \value - [\c!identifier!,\v!reset] - [.] -\stopsetup - -\startsetup - \command[\y!low] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!high] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!lohi] - \type[\c!opt!\c!val!\c!arg!\c!arg!] - \value[\v!low][] - \value[\c!text!][] - \value[\c!text!][] -\stopsetup - -\startsetup - \command - [\y!showframe] - \type - [\c!opt!\c!val!] - \value - [\v!text,\v!margin,\v!edge] - [] -\stopsetup - -% \startsetup -% \command -% [\y!toonopbouw] -% \type -% [] -% \stopsetup - -\startsetup - \command[\y!leftaligned] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!rightaligned] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!midaligned] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!wordright] - \type[\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!inmargin] - \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!] - \value[+,-,\v!low][] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!inothermargin] - \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!] - \value[+,-,\v!low][] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!inleft] - \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!] - \value[+,-,\v!low][] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!inright] - \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!] - \value[+,-,\v!low][] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!ininner] - \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!] - \value[+,-,\v!low][] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!inouter] - \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!] - \value[+,-,\v!low][] - \value[\c!text!][] -\stopsetup - -%\startsetup -% \command[\y!oplinker] -% \type[\c!arg!] -% \value[\c!text!][] -%\stopsetup - -\startsetup - \command[\y!column] - \type[] -\stopsetup - -\startsetup - \command[\y!showstruts] - \type[] -\stopsetup - -\startsetup - \command[\y!showsetups] - \type[] -\stopsetup - -\startsetup - \command[\y!showlayout] - \type[] -\stopsetup - -% \startsetup -% \command[\y!margetitel] -% \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!] -% \value[+,-,\v!laag][] -% \value[\c!text!][] -% \stopsetup - -% \startsetup -% \command[\y!margewoord] -% \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!] -% \value[+,-,\v!laag][] -% \value[\c!text!][] -% \stopsetup - -\startsetup - \command[\y!margintext] - \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!] - \value[+,-,\v!low][] - \value[\c!text!][] -\stopsetup - -\startsetup - \command - [\y!setupmarginblocks] - \type - [\c!vars!] - \variable - [\c!location] - [\v!inmargin,\v!left,\v!middle,\v!right] - [\v!inmargin] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!width] - [\c!dimension!] - [] - \variable - [\c!align] - [\v!left,\v!middle,\v!right,\v!no] - [] - \variable - [\c!top] - [\c!command!] - [] - \variable - [\c!inbetween] - [\c!command!] - [\blank] - \variable - [\c!bottom] - [\c!command!] - [\vfill] - \variable - [\c!left] - [\c!command!] - [] - \variable - [\c!right] - [\c!command!] - [] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] -\stopsetup - -\startsetup - \command - [\y!startmarginblock] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command[\v!part] - \type[\c!opt!\c!refs!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\v!title] - \type[\c!opt!\c!refs!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\v!chapter] - \type[\c!opt!\c!refs!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\v!section] - \type[\c!opt!\c!refs!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\v!subsection] - \type[\c!opt!\c!refs!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\v!subsubsection] - \type[\c!opt!\c!refs!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\v!subject] - \type[\c!opt!\c!refs!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\v!subsubject] - \type[\c!opt!\c!refs!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\v!subsubsubject] - \type[\c!opt!\c!refs!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\v!appendix] - \type[\c!opt!\c!refs!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!in] - \type[\c!optint!\c!arg!\c!optint!\c!arg!\c!ref!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!at] - \type[\c!optint!\c!arg!\c!optint!\c!arg!\c!ref!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!about] - \type[\c!optint!\c!arg!\c!ref!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!somewhere] - \type[\c!arg!\c!arg!\c!ref!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!atpage] - \type[\c!ref!] -\stopsetup - -\startsetup - \command[\y!ref] - \type[\c!val!\c!ref!] - \value[t,p,r,s,e][] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!textreference] - \type[\c!ref!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!pagereference] - \type[\c!ref!] -\stopsetup - -\startsetup - \command[\y!reference] - \type[\c!ref!\c!arg!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!usereferences] - \type[\c!vals!] - \value[\c!filename!][] -\stopsetup - -\startsetup - \command[\y!definereference] - \type[\c!val!\c!refs!] - \value[\c!identifier!][] -% \value[\c!text!][] -\stopsetup - -\startsetup - \command - [\y!definereferenceformat] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!left] - [\c!text!] - [] - \variable - [\c!right] - [\c!text!] - [] - \variable - [\c!text] - [\c!text!] - [] - \variable - [\c!label] - [\c!identifier!] - [] -\stopsetup - -% rudiment -% -% \startsetup -% \command[\y!definehbox] -% \type[\c!val!\c!val!] -% \value[\c!identifier!][] -% \value[\c!number!][] -% \stopsetup - -\startsetup - \command[\y!hl] - \type[\c!val!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!vl] - \type[\c!val!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!godown] - \type[\c!val!] - \value[\c!dimension!][] -\stopsetup - -\startsetup - \command[\y!whitespace] - \type[] -\stopsetup - -\startsetup - \command[\y!nowhitespace] - \type[] -\stopsetup - -\startsetup - \command[\y!crlf] - \type[] -\stopsetup - -\startsetup - \command[\y!space] - \type[] -\stopsetup - -\startsetup - \command[\y!fixedspaces] - \type[] -\stopsetup - -\startsetup - \command[\y!emptylines] - \type[\c!val!] - \value[\c!number!][] -\stopsetup - -\startsetup - \command[\y!nospace] - \type[] -\stopsetup - -\startsetup - \command[\y!packed] - \type[] -\stopsetup - -% \startsetup -% \command[\y!redo] -% \type[\c!val!] -% \value[\c!repeat!\c!text!][] -% \stopsetup - -\startsetup - \command - [\y!setupdescriptions] - \type - [\c!opt!\c!vals!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!headstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!bold] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!width] - [\v!fit,\v!broad,\c!dimension!] - [8em] - \variable - [\c!distance] - [\c!dimension!] - [0pt] - \variable - [\c!sample] - [\c!text!] - [] - \variable - [\c!text] - [\c!text!] - [] - \variable - [\c!align] - [\v!left,\v!middle,\v!right] - [] - \variable - [\c!margin] - [\v!standard,\v!yes,\v!no,\c!dimension!] - [] - \variable - [\c!location] - [\v!left,\v!right,\v!top,\v!serried,\c!command, - \v!inmargin,\v!inleft,\v!inright,\v!hanging] - [\v!left] - \variable - [\c!headcommand] - [] - [] - \variable - [\c!hang] - [\v!fit,\v!broad,\c!number!] - [] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!inbetween] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [\blank] - \variable - [\c!indentnext] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!indenting] - [\v!never,\v!not,\v!no,\v!yes,\v!always,\v!first,\v!next] - [\v!never] -\stopsetup - -\startsetup - \command - [\y!setupenumerations] - \type - [\c!opt!\c!vals!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!definedescription] - [] - \variable - [\c!location] - [\v!left,\v!right,\v!top,\v!serried, - \v!inmargin,\v!inleft,\v!inright,\v!hanging] - [\v!top] - \variable - [\c!text] - [\c!text!] - [] - \variable - [\c!levels] - [\c!number!] - [3] - \variable - [\c!conversion] - [\v!numbers,\v!characters,\v!Characters,\v!romannumerals,\v!Romannumerals] - [\v!numbers] - \variable - [\c!way] - [\v!by\v!text,\v!by\c!section!] - [\v!by\v!text] - \variable - [\c!blockway] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!sectionnumber] - [\v!yes,\v!number,\v!no] - [] - \variable - [\c!separator] - [\c!text!] - [.] - \variable - [\c!stopper] - [\c!text!] - [] - \variable - [\c!coupling] - [\c!identifier!] - [] - \variable - [\c!couplingway] - [\v!global,\v!local] - [\v!local] - \variable - [\c!number] - [\v!no,\c!identifier!] - [] - \variable - [\c!aligntitle] - [\v!no,\v!yes] - [\v!yes] - \variable - [\c!start] - [\c!number!] - [0] - \inheritvariables - [\y!setupenumerations] - [] -\stopsetup - -\startsetup - \command - [\y!defineenumeration] - \type - [\c!vals!\c!opt!\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupenumerations] - [] -\stopsetup - -\startsetup - \command - [<<\y!enumeration>>] - \type - [\c!optint!\c!nop!\c!par!] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\e!start<<\y!enumeration>>] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!definedescription] - \type - [\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupdescriptions] - [] -\stopsetup - -\startsetup - \command - [<<\y!description>>] - \type - [\c!arg!\c!nop!\c!par!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\e!start<<\y!description>>] - \type - [\c!arg!\c!stp!] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!setupindentations] - \type - [\c!opt!\c!vals!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!headstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!width] - [\v!fit,\c!dimension!] - [\v!fit] - \variable - [\c!text] - [\c!text!] - [] - \variable - [\c!sample] - [\c!text!] - [] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [\blank] - \variable - [\c!distance] - [\c!dimension!] - [1em] - \variable - [\c!separator] - [\c!text!] - [{:}] -\stopsetup - -\startsetup - \command - [\y!defineindenting] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupindentations] - [] -\stopsetup - -\startsetup - \command - [<<\y!indentation>>] - \type - [\c!nop!\c!par!] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!definelabel] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!text] - [\c!text!] - [] - \variable - [\c!location] - [\v!inmargin,\v!intext] - [\v!intext] - \variable - [\c!way] - [\v!by\v!text,\v!by\c!section!] - [\v!by\v!chapter] - \variable - [\c!blockway] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!headstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [] - \variable - [\c!headcolor] - [\c!identifier!] - [] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] -\stopsetup - -\startsetup - \command - [<<\y!labeling>>] - \type - [\c!opt!\c!ref!] -\stopsetup - -\startsetup - \command - [\y!setupcolumns] - \type - [\c!vars!] - \variable - [\c!n] - [\c!number!] - [2] - \variable - [\c!ntop] - [\c!number!] - [1] - \variable - [\c!rule] - [\v!on,\v!off] - [\v!off] - \variable - [\c!height] - [\c!dimension!] - [] - \variable - [\c!tolerance] - [\v!verystrict,\v!strict,\v!tolerant,\v!verytolerant,\v!stretch] - [\v!tolerant] - \variable - [\c!distance] - [\c!dimension!] - [1.5em] - \variable - [\c!balance] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!align] - [\v!yes,\v!no,\v!text] - [\v!text] - \variable - [\c!blank] - [\v!fixed,\v!halfline,\v!line,\v!flexible,\v!big,\v!medium,\v!small] - [\v!fixed,\v!line] - \variable - [\c!option] - [\v!background] - [] - \variable - [\c!direction] - [\v!left,\v!right] - [\v!right] - \inheritvariables - [\y!setupframed] - [] -\stopsetup - -\startsetup - \command - [\y!startcolumns] - \type - [\c!opt!\c!vars!\c!stp!] - \inheritvariables - [\y!setupcolumns] - [] -\stopsetup - -\startsetup - \command - [\y!definetext] - \type - [\c!val!\c!val!\c!val!\c!opt!\c!val!\c!opt!\c!val!] - \value - [\c!identifier!] - [] - \value - [\v!header,\v!footer] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!setupheader] - \type - [\c!opt!\c!val!\c!vars!] - \value - [\v!text,\v!margin,\v!edge] - [\v!text] - \variable - [\c!state] - [\v!normal,\v!stop,\v!start,\v!empty,\v!high,\v!none, - \v!nomarking,\c!identifier!] - [\v!normal] - \variable - [\c!strut] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!bold] - \variable - [\c!leftstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!bold] - \variable - [\c!rightstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!bold] - \variable - [\c!leftwidth] - [\c!dimension!] - [] - \variable - [\c!rightwidth] - [\c!dimension!] - [] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] -\stopsetup - -\startsetup - \command - [\y!setupfooter] - \type - [\c!opt!\c!val!\c!vars!] - \inheritvalues - [\y!setupheader] - [] - \inheritvariables - [\y!setupheader] - [] -\stopsetup - -\startsetup - \command - [\y!setuptext] - \type - [\c!opt!\c!val!\c!vars!] - \inheritvalues - [\y!setupheader] - [] - \inheritvariables - [\y!setupheader] - [] -\stopsetup - -\startsetup - \command - [\y!setuptop] - \type - [\c!opt!\c!val!\c!vars!] - \inheritvalues - [\y!setupheader] - [] - \inheritvariables - [\y!setupheader] - [] -\stopsetup - -\startsetup - \command - [\y!setupbottom] - \type - [\c!opt!\c!val!\c!vars!] - \inheritvalues - [\y!setupheader] - [] - \inheritvariables - [\y!setupheader] - [] -\stopsetup - -\startsetup - \command[\y!noheaderandfooterlines] - \type[] -\stopsetup - -\startsetup - \command[\y!notopandbottomlines] - \type[] -\stopsetup - -\startsetup - \command - [\y!setupheadertexts] - \type - [\c!opt!\c!val!\c!val!\c!val!] - \value - [\v!text,\v!margin,\v!edge] - [\v!text] - \value - [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber] - [] - \value - [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber] - [] -\stopsetup - -\startsetup - \command - [\y!setupfootertexts] - \type - [\c!opt!\c!val!\c!val!\c!val!] - \value - [\v!text,\v!margin,\v!edge] - [\v!text] - \value - [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber] - [] - \value - [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber] - [] -\stopsetup - -\startsetup - \command - [\y!setuptexttexts] - \type - [\c!opt!\c!val!\c!val!\c!val!] - \value - [\v!text,\v!margin,\v!edge] - [\v!text] - \value - [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber] - [] - \value - [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber] - [] -\stopsetup - -\startsetup - \command - [\y!setuptoptexts] - \type - [\c!opt!\c!val!\c!val!\c!val!] - \value - [\v!text,\v!margin,\v!edge] - [\v!text] - \value - [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber] - [] - \value - [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber] - [] -\stopsetup - -\startsetup - \command - [\y!setupbottomtexts] - \type - [\c!opt!\c!val!\c!val!\c!val!] - \value - [\v!text,\v!margin,\v!edge] - [\v!text] - \value - [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber] - [] - \value - [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber] - [] -\stopsetup - -\startsetup - \command - [\y!definemarking] - \type - [\c!val!\c!opt!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!couplemarking] - \type - [\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!decouplemarking] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!resetmarking] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!setupmarking] - \type - [\c!val!\c!var!] - \value - [\c!identifier!] - [] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!start] - \variable - [\c!separator] - [\c!command!] - [---] - \variable - [\c!expansion] - [\v!yes,\v!no] - [\v!no] -\stopsetup - -\startsetup - \command - [\y!marking] - \type - [\c!val!\c!arg!] - \value - [\c!identifier!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!getmarking] - \type - [\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\v!first,\v!last,\v!previous,\v!both,\v!all,\v!current] - [] -\stopsetup - -\startsetup - \command - [\y!nomarking] - \type - [\c!arg!] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!setuplayout] - \type - [\c!vars!] - \variable - [\c!width] - [\c!dimension!,\v!fit,\v!middle] - [15cm] - \variable - [\c!height] - [\c!dimension!,\v!fit,\v!middle] - [25cm] - \variable - [\c!backspace] - [\c!dimension!] - [2.5cm] - \variable - [\c!topspace] - [\c!dimension!] - [2.5cm] - \variable - [\c!margin] - [\c!dimension!] - [2.5cm] - \variable - [\c!leftmargin] - [\c!dimension!] - [] - \variable - [\c!rightmargin] - [\c!dimension!] - [] - \variable - [\c!header] - [\c!dimension!] - [2.0cm] - \variable - [\c!footer] - [\c!dimension!] - [2.0cm] - \variable - [\c!top] - [\c!dimension!] - [2.0cm] - \variable - [\c!bottom] - [\c!dimension!] - [2.0cm] - \variable - [\c!leftedge] - [\c!dimension!] - [3cm] - \variable - [\c!rightedge] - [\c!dimension!] - [3cm] - \variable - [\c!headerdistance] - [\c!dimension!] - [0pt] - \variable - [\c!footerdistance] - [\c!dimension!] - [0pt] - \variable - [\c!topdistance] - [\c!dimension!] - [0pt] - \variable - [\c!bottomdistance] - [\c!dimension!] - [0pt] - \variable - [\c!leftmargindistance] - [\c!dimension!] - [12pt] - \variable - [\c!rightmargindistance] - [\c!dimension!] - [12pt] - \variable - [\c!leftedgedistance] - [\c!dimension!] - [12pt] - \variable - [\c!rightedgedistance] - [\c!dimension!] - [12pt] - \variable - [\c!horoffset] - [\c!dimension!] - [0pt] - \variable - [\c!veroffset] - [\c!dimension!] - [0pt] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!marking] - [\v!on,\v!off,\v!color,\v!screen,\v!text] - [\v!off] - \variable - [\c!location] - [\v!left,\v!middle,\v!right,\v!bottom,\v!top, - \v!singlesided,\v!doublesided] - [\v!singlesided] - \variable - [\c!scale] - [\c!dimension!] - [1] - \variable - [\c!nx] - [\c!number!] - [1] - \variable - [\c!ny] - [\c!number!] - [1] - \variable - [\c!dx] - [\c!dimension!] - [0pt] - \variable - [\c!dy] - [\c!dimension!] - [0pt] - \variable - [\c!lines] - [\c!number!] - [0] - \variable - [\c!columns] - [\c!number!] - [0] - \variable - [\c!columndistance] - [\c!dimension!] - [0pt] - \variable - [\c!grid] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!bottomspace] - [\c!dimension!] - [] - \variable - [\c!cutspace] - [\c!dimension!] - [] - \variable - [\c!textdistance] - [\c!dimension!] - [] - \variable - [\c!textwidth] - [\c!number!] - [] - \variable - [\c!textmargin] - [\c!dimension!] - [] - \variable - [\c!clipoffset] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!page] - [\c!identifier!] - [] - \variable - [\c!paper] - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!adaptlayout] - \type - [\c!opt!\c!vals!\c!vars!] - \value - [\c!number!] - [] - \variable - [\c!height] - [\c!dimension!,\v!max] - [] - \variable - [\c!lines] - [\c!number!] - [] -\stopsetup - -\startsetup - \command - [\y!showgrid] - \type - [] -\stopsetup - -\startsetup - \command - [\y!placeongrid] - \type - [\c!opt!\c!val!\c!arg!] - \inheritvalues - [\y!moveongrid] - [] -\stopsetup - -\startsetup - \command - [\y!moveongrid] - \type - [\c!opt!\c!vals!] - \value - [\v!top,\v!both,\v!bottom,-\v!top,-\v!both,-\v!bottom,\v!text, - \v!high,\v!middle,\v!low,\v!page,\v!none,\v!standard, - \v!broad,\v!fit,\v!depth,\v!line,\c!dimension!] - [\v!standard] -\stopsetup - -\startsetup - \command - [\y!startproject] - \type - [\c!fil!\c!stp!] - \value - [\c!filename!] - [] -\stopsetup - -\startsetup - \command - [\y!startenvironment] - \type - [\c!fil!\c!stp!] - \value - [\c!filename!] - [] -\stopsetup - -\startsetup - \command - [\y!startproduct] - \type - [\c!fil!\c!stp!] - \value - [\c!filename!] - [] -\stopsetup - -\startsetup - \command - [\y!startcomponent] - \type - [\c!fil!\c!stp!] - \value - [\c!filename!] - [] -\stopsetup - -\startsetup - \command - [\y!nomorefiles] - \type - [] -\stopsetup - -\startsetup - \command - [\y!setupinterlinespace] - \type - [\c!opt!\c!or!\c!val!\c!vars!] - \value - [\v!reset,\v!small,\v!medium,\v!big,\v!on,\v!off] - [\v!small] - \variable - [\v!height] - [\c!number!] - [0.72] - \variable - [\v!depth] - [\c!number!] - [0.28] - \variable - [\v!line] - [\c!dimension!] - [2.8ex] - \variable - [\v!top] - [\c!number!] - [1.0] - \variable - [\v!bottom] - [\c!number!] - [0.4] -\stopsetup - -\startsetup - \command - [\y!setuppagenumbering] - \type - [\c!vars!] - \variable - [\c!alternative] - [\v!singlesided,\v!doublesided] - [\v!singlesided] - \variable - [\c!location] - [\v!header,\v!footer, - \v!left,\v!right,\v!middle, - \v!margin,\v!marginedge,\v!inleft,\v!inright] - [\v!middle] - \variable - [\c!conversion] - [\v!numbers,\v!characters,\v!Characters,\v!romannumerals,\v!Romannumerals] - [\v!numbers] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!left] - [\c!text!] - [] - \variable - [\c!right] - [\c!text!] - [] - \variable - [\c!way] - [\v!by\v!text,\v!by\c!section!] - [\v!by\v!part] - \variable - [\c!text] - [\c!text!] - [] - \variable - [\c!numberseparator] - [\c!text!] - [--] - \variable - [\c!textseparator] - [\c!text!] - [] - \variable - [\c!sectionnumber!] - [\v!yes,\v!no] - [] - \variable - [\c!separator] - [\c!text!] - [--] - \variable - [\c!strut] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!start] - \variable - [\c!width] - [\c!dimension!] - [] - \variable - [\c!command] - [\c!oneargument!] - [] -\stopsetup - -\startsetup - \command - [\y!setupnarrower] - \type - [\c!vars!] - \variable - [\c!left] - [\c!dimension!] - [1.5em] - \variable - [\c!right] - [\c!dimension!] - [1.5em] - \variable - [\c!middle] - [\c!dimension!] - [1.5em] -\stopsetup - -\startsetup - \command - [\y!define] - \type - [\c!opt!\c!val!\c!cmd!\c!arg!] - \value - [\c!number!] - [0] -\stopsetup - -\startsetup - \command - [\y!usecommands] - \type - [\c!arg!] -\stopsetup - -\startsetup - \command - [\y!definestartstop] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!commands] - [\c!command!] - [] -\stopsetup - -\startsetup - \command - [\y!setupheads] - \type - [\c!vars!] - \variable - [\c!sectionnumber] - [\v!yes,\v!number,\v!no] - [\v!yes] - \variable - [\c!alternative] - [\v!normal,\v!margin,\v!middle,\v!text,\v!paragraph] - [\v!normal] - \variable - [\c!separator] - [\c!text!] - [.] - \variable - [\c!align] - [\v!left,\v!right,\v!normal,\v!broad] - [\v!normal] - \variable - [\c!aligntitle] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!tolerance] - [\v!verystrict,\v!strict,\v!tolerant,\v!verytolerant,\v!stretch] - [\v!tolerant] - \variable - [\c!indentnext] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!command] - [\c!twoarguments!] - [] - \variable - [\c!margin] - [\c!dimension!] - [0pt] -\stopsetup - -\startsetup - \command - [\y!setupcaptions] - \type - [\c!vars!] - \variable - [\c!location] - [\v!top,\v!bottom,\v!none,\v!high,\v!low,\v!middle] - [\v!bottom] - \variable - [\c!width] - [\v!fit,\v!broad,\v!max,\c!dimension!] - [\v!fit] - \variable - [\c!minwidth] - [\v!fit,\c!dimension!] - [\v!fit] - \variable - [\c!headstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!bold] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!number] - [\v!yes,\v!no] - [\v!yes] - %\variable - % [\c!before] - % [\c!command!] - % [\blank] - \variable - [\c!inbetween] - [\c!command!] - []% {\blank[\v!medium]}] - %\variable - % [\c!after] - % [\c!command!] - % [\blank] - \variable - [\c!align] - [\v!left,\v!middle,\v!right,\v!no] - [] - \variable - [\c!conversion] - [\v!numbers,\v!characters,\v!Characters,\v!romannumerals,\v!Romannumerals] - [\v!numbers] - \variable - [\c!way] - [\v!by\v!text,\v!by\c!section!] - [\v!by\v!text] - \variable - [\c!separator] - [\c!text!] - [.] - \variable - [\c!command] - [\c!command!] - [] - \variable - [\c!distance] - [\c!dimension!] - [1em] -\stopsetup - -\startsetup - \command - [\y!setupcaption] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupcaptions] - [] -\stopsetup - -\startsetup - \command - [\y!setupfloats] - \type - [\c!vars!] - \variable - [\c!location] - [\v!left,\v!right,\v!middle] - [\v!middle] - \variable - [\c!width] - [\v!fit,\c!dimension!] - [\v!fit] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!margin] - [\c!dimension!] - [1em] - \variable - [\c!spacebefore] - [\c!repeat!\v!small,\c!repeat!\v!medium,\c!repeat!\v!big,\v!none] - [] - \variable - [\c!spaceafter] - [\c!repeat!\v!small,\c!repeat!\v!medium,\c!repeat!\v!big,\v!none] - [] - \variable - [\c!sidespacebefore] - [\c!repeat!\v!small,\c!repeat!\v!medium,\c!repeat!\v!big,\v!none] - [] - \variable - [\c!sidespaceafter] - [\c!repeat!\v!small,\c!repeat!\v!medium,\c!repeat!\v!big,\v!none] - [] - \variable - [\c!indentnext] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!ntop] - [\c!number!] - [2] - \variable - [\c!nbottom] - [\c!number!] - [0] - \variable - [\c!nlines] - [\c!number!] - [4] - \variable - [\c!default] - [\c!identifier!] - [] - \variable - [\c!tolerance] - [0,1,2] - [1] - \variable - [\c!leftmargindistance] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!rightmargindistance] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!sidealign] - [\v!normal,\v!line] - [\v!normal] - \inheritvariables - [\y!setupframed] - [] -\stopsetup - -\startsetup - \command - [\y!setupfloatsplitting] - \type - [\c!vars!] - \variable - [\c!conversion] - [\v!numbers,\v!characters,\v!Characters,\v!romannumerals,\v!Romannumerals] - [\v!character] - \variable - [\c!lines] - [\c!number!] - [3] -\stopsetup - -\startsetup - \command - [\y!splitfloat] - \type - [\c!opt!\c!vars!\c!arg!\c!arg!] - \inheritvariables - [\y!setupfloatsplitting] - [] -\stopsetup - -\startsetup - \command - [\y!setupoppositeplacing] - \type - [\c!var!] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!stop] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!inbetween] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [] -\stopsetup - -\startsetup - \command - [\y!startopposite] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!setuphyphenmark] - \type - [\c!var!] - \variable - [\c!sign] - [--,---,-,~,(,),=,/] - [--] -\stopsetup - -\startsetup - \command - [\y!setuppositioning] - \type - [\c!vars!] - \variable - [\c!state] - [\v!start,\v!overlay] - [\v!start] - \variable - [\c!unit] - [\s!cm,\s!pt,\s!em,\s!mm,\s!ex,\s!es,\s!in] - [\s!cm] - \variable - [\c!factor] - [\c!number!] - [1] - \variable - [\c!scale] - [\c!number!] - [1] - \variable - [\c!offset] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!xstep] - [\v!absolute,\v!relative] - [\v!absolute] - \variable - [\c!ystep] - [\v!absolute,\v!relative] - [\v!absolute] -\stopsetup - -\startsetup - \command - [\y!startpositioning] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!grid] - \type - [\c!vars!] - \variable - [\c!x] - [\c!number!] - [0] - \variable - [\c!y] - [\c!number!] - [0] - \variable - [\c!nx] - [\c!number!] - [10] - \variable - [\c!ny] - [\c!number!] - [10] - \variable - [\c!dx] - [\c!number!] - [0.5] - \variable - [\c!dy] - [\c!number!] - [0.5] - \variable - [\c!xstep] - [\c!number!] - [0] - \variable - [\c!ystep] - [\c!number!] - [0] - \variable - [\c!offset] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!factor] - [\c!number!] - [1] - \variable - [\c!scale] - [\c!number!] - [1] - \variable - [\c!unit] - [\s!cm,\s!pt,\s!em,\s!mm,\s!ex,\s!es,\s!in] - [\s!cm] - \variable - [\c!location] - [\v!left,\v!middle] - [\v!left] -\stopsetup - - -\startsetup - \command - [\y!page] - \type - [\c!vals!] - \value - [\v!yes,\v!makeup,\v!no,\v!preference,\v!bigpreference, - \v!left,\v!right,\v!disable,\v!last,\v!quadruple, - \v!even,\v!odd,\v!blank,\v!empty,\v!reset,\v!start,\v!stop] - [\v!yes] -\stopsetup - -\startsetup - \command - [\y!setupreferencing] - \type - [\c!vars!] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!start] - \variable - [\c!sectionnumber!] - [\v!yes,\v!no] - [] - \variable - [\c!prefix] - [+,-,\c!text!] - [] - \variable - [\c!interaction] - [\v!label,\v!text,\v!all,\v!symbol] - [\v!all] - \variable - [\c!width] - [\c!dimension!] - [] - \variable - [\c!left] - [\c!command!] - [] - \variable - [\c!right] - [\c!command!] - [] - \variable - [\c!convertfile] - [\v!yes,\v!no,\v!small,\v!big] - [\v!no] - \variable - [\c!separator] - [\c!text!] - [~] - \variable - [\c!autofile] - [\v!yes,\v!no,\v!page] - [\v!no] - \variable - [\c!global] - [\v!yes,\v!no] - [\v!no] -\stopsetup - -\startsetup - \command - [\y!setupurl] - \type - [\c!vars!] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!type] - \variable - [\c!urlalternative] - [\v!none,\v!both,\v!before,\v!after] - [\v!both] - \variable - [\c!urlspace] - [\v!yes,\v!no] - [\v!no] -\stopsetup - -\startsetup - \command - [\y!writetoreferencelist] - \type - [\c!val!\c!arg!\c!arg!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!placereferencelist] - \type - [\c!vals!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!definereferencelist] - \type - [\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!stelreferentielijstin] - [] -\stopsetup - -\startsetup - \command - [\y!setupreferencelist] - \type - [\c!vals!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!start] - \variable - [\c!criterium] - [\c!section!,\v!local,\v!previous,\v!all] - [\v!all] - \variable - [\c!command] - [\c!command!] - [] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] -\stopsetup - -\startsetup - \command - [\y!writetolist] - \type - [\c!val!\c!arg!\c!arg!] - \value - [\c!section!,\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!writebetweenlist] - \type - [\c!val!\c!arg!] - \value - [\c!section!,\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!nolist] - \type - [\c!arg!] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!listsymbol] - \type - [\c!val!\c!arg!] - \value - [\c!identifier!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!placelist] - \type - [\c!vals!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setuplist] - [] -\stopsetup - -\startsetup - \command - [\y!determinelistcharacteristics] - \type - [\c!vals!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setuplist] - [] -\stopsetup - -% nieuw: - -\startsetup - \command - [\y!placecombinedlist] - \type - [\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupcombinedlist] - [] -\stopsetup - -\startsetup - \command - [\y!definelist] - \type - [\c!val!\c!opt!\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setuplist] - [] -\stopsetup - -\startsetup - \command - [\y!setuplist] - \type - [\c!vals!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!start] - \variable - [\c!alternative] - [\v!a,\v!b,\v!c,...,\v!none,\v!command] - [\v!b] - \variable - [\c!coupling] - [\v!on,\v!off] - [\v!off] - \variable - [\c!criterium] - [\c!section!,\v!local,\v!previous,\v!current,\v!all] - [\v!local] - \variable - [\c!pageboundaries] - [\c!list!] - [] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!numberstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!textstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!pagestyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!command] - [\c!threearguments!] - [] - \variable - [\c!numbercommand] - [\c!oneargument!] - [] - \variable - [\c!textcommand] - [\c!oneargument!] - [] - \variable - [\c!pagecommand] - [\c!oneargument!] - [] - \variable - [\c!interaction] - [\v!sectionnumber,\v!text,\v!pagenumber,\v!all] - [\v!sectionnumber] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!inbetween] - [\c!command!] - [] - \variable - [\c!left] - [\c!text!] - [] - \variable - [\c!right] - [\c!text!] - [] - \variable - [\c!label] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!prefix] - [\v!yes,\v!no,\v!none] - [\v!yes] - \variable - [\c!pagenumber] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!sectionnumber!] - [\v!yes,\v!no] - [] - \variable - [\c!aligntitle] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!margin] - [\c!dimension!] - [3em] - \variable - [\c!width] - [\c!dimension!,\v!fit] - [3em] - \variable - [\c!height] - [\c!dimension!,\v!fit,\v!broad] - [\v!broad] - \variable - [\c!depth] - [\c!dimension!,\v!fit,\v!broad] - [\v!broad] -% \variable -% [\c!offset] -% [\c!dimension!] -% [.25em] - \variable - [\c!distance] - [\c!dimension!] - [0em] - \variable - [\c!separator] - [\c!text!] - [.] - \variable - [\c!stopper] - [\c!text!] - [] - \variable - [\c!symbol] - [\v!none,1,2,3,...] - [] - \variable - [\c!expansion] - [\v!yes,\v!no,\v!command] - [\v!no] - \variable - [\c!maxwidth] - [\c!dimension!] - [] - \inheritvariables - [\y!framed] - [] -\stopsetup - -\startsetup - \command - [\y!definecombinedlist] - \type - [\c!val!\c!vals!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\c!list!] - [] - \inheritvariables - [\y!setupcombinedlist] - [] -\stopsetup - -\startsetup - \command - [\y!setupcombinedlist] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!level] - [1,2,3,4,\c!section!,\v!current] - [4] - \inheritvariables - [\y!setuplist] - [] -\stopsetup - -\startsetup - \command - [\e!place<<\y!combinedlist>>] - \type - [\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupcombinedlist] - [] -\stopsetup - -\startsetup - \command - [\e!complete<<\y!combinedlist>>] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupcombinedlist] - [] -\stopsetup - -\startsetup - \command - [\y!setupnumbering] - \type - [\c!vars!] - \variable - [\c!way] - [\v!by\v!text,\v!by\c!section!] - [\v!by\v!chapter] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!start] -\stopsetup - -% todo: \definieerformule - -\startsetup - \command - [\y!setupformulas] - \type - [\c!vars!] - \variable - [\c!location] - [\v!left,\v!right] - [\v!right] - \variable - [\c!left] - [\c!text!] - [{(}] - \variable - [\c!right] - [\c!text!] - [{)}] - \variable - [\c!align] - [\v!left,\v!middle,\v!right] - [] - \variable - [\c!strut] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!distance] - [\c!dimension!] - [1em] - \variable - [\c!margin] - [\c!dimension!,\v!standard,\v!yes,\v!no] - [0pt] - \variable - [\c!leftmargin] - [\c!dimension!] - [0pt] - \variable - [\c!rightmargin] - [\c!dimension!] - [0pt] - \variable - [\c!indentnext] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!alternative] - [\c!identifier!] - [\s!default] - \variable - [\c!spacebefore] - [\c!dimension!] - [0pt] - \variable - [\c!after] - [\c!dimension!] - [0pt] - \variable - [\c!separator] - [\c!text!] - [.] -\stopsetup - -\startsetup - \command - [\y!publication] - \type - [\c!ref!] -\stopsetup - -\startsetup - \command - [\y!setuppublications] - \type - [\c!vars!] - \variable - [\c!alternative] - [\c!apa,\v!normal] - [\c!apa] - \inheritvariables - [\y!setupenumerations] - [] -\stopsetup - -\startsetup - \command - [\y!setuplines] - \type - [\c!vars!] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [\blank] - \variable - [\c!inbetween] - [\c!command!] - [\blank] - \variable - [\c!indenting] - [\v!yes,\v!no,\v!even,\v!odd] - [\v!no] -\stopsetup - -\startsetup - \command - [\y!startlines] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!setupparagraphnumbering] - \type - [\c!vars!] - \variable - [\c!state] - [\v!start,\v!stop,\v!reset,\v!line] - [\v!stop] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!distance] - [\c!dimension!] - [0pt] -\stopsetup - -\startsetup - \command - [\y!setuplinenumbering] - \type - [\c!vars!] - \variable - [\c!conversion] - [\v!numbers,\v!characters,\v!Characters,\v!romannumerals,\v!Romannumerals, - \v!text] - [\v!numbers] - \variable - [\c!start] - [\c!number!] - [1] - \variable - [\c!step] - [\c!number!] - [1] - \variable - [\c!width] - [\c!dimension!] - [2ex] - \variable - [\c!location] - [\v!intext,\v!inmargin] - [\v!inmargin] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!prefix] - [\c!text!] - [] - \variable - [\c!referencing] - [\v!on,\v!off] - [\v!on] -\stopsetup - -\startsetup - \command - [\y!startlinenumbering] - \type - [\c!val!\c!stp!] - \value - [\v!continue] - [] -\stopsetup - -\startsetup - \command - [\y!startline] - \type - [\c!ref!\c!stp!] -\stopsetup - -\startsetup - \command - [\y!someline] - \type - [\c!ref!] -\stopsetup - -\startsetup - \command - [\y!inline] - \type - [\c!ref!] -\stopsetup - -\startsetup - \command - [\y!setupinmargin] - \type - [\c!opt!\c!val!\c!vars!] - \value - [\v!left,\v!right,\c!number!] - [] - \variable - [\c!location] - [\v!left,\v!right,\v!both] - [\v!both] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!bold] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!align] - [\v!inner,\v!outer,\v!left,\v!right,\v!middle,\v!normal,\v!no,\v!yes] - [\v!inner] - \variable - [\c!line] - [\c!number!] - [1] - \variable - [\c!distance] - [\c!dimension!] - [0pt] - \variable - [\c!separator] - [\c!text!] - [] - \variable - [\c!width] - [\c!dimension!] - [] - \variable - [\c!distance] - [\c!dimension!] - [] - \variable - [\c!stack] - [\v!yes,\v!no] - [\v!no] - \inheritvariables - [\y!setupframed] - [] -\stopsetup - -\startsetup - \command - [\y!setuppagenumber] - \type - [\c!vars!] - \variable - [\c!number] - [\c!number!] - [] - \variable - [\c!state] - [\v!start,\v!stop,\v!keep] - [\v!start] -\stopsetup - -\startsetup - \command - [\y!setupsubpagenumber] - \type - [\c!vars!] - \variable - [\c!way] - [\v!by\v!text,\v!by\c!section!] - [\v!by\v!part] - \variable - [\c!state] - [\v!start,\v!stop,\v!none] - [\v!stop] -\stopsetup - -%\startsetup \command[\y!paginanummer] \type[] \stopsetup -%\startsetup \command[\y!subpaginanummer] \type[] \stopsetup -%\startsetup \command[\y!numberofsubpages] \type[] \stopsetup -%\startsetup \command[\y!totalnumberofpages] \type[] \stopsetup - -\startsetup - \command - [\y!setupblank] - \type - [\c!opt!\c!val!] - \value - [\v!normal,\v!standard,\v!line,\c!dimension!, - \v!big,\v!medium,\v!small, - \v!fixed,\v!flexible] - [\v!normal] -\stopsetup - -\startsetup - \command - [\y!defineblank] - \type - [\c!val!\c!val!] - \value - [\c!identifier!] - [] - \inheritvalues - [\y!setupblank] - [] -\stopsetup - -\startsetup - \command - [\y!definepapersize] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!width] - [\c!dimension!] - [297mm] - \variable - [\c!height] - [\c!dimension!] - [210mm] - \variable - [\c!offset] - [\c!dimension!] - [210mm] - \variable - [\c!scale] - [\c!number!] - [1] -\stopsetup - -\startsetup - \command - [\y!setuppaper] - \type - [\c!vars!] - \variable - [\c!paper] - [\c!identifier!] - [] - \variable - [\c!page] - [\c!identifier!] - [] - \variable - [\c!nx] - [\c!number!] - [1] - \variable - [\c!ny] - [\c!number!] - [1] - \variable - [\c!width] - [\c!dimension!] - [0pt] - \variable - [\c!height] - [\c!dimension!] - [0pt] - \variable - [\c!topspace] - [\c!dimension!] - [0pt] - \variable - [\c!backspace] - [\c!dimension!] - [0pt] - \variable - [\c!option] - [\c!max,\v!fit] - [\c!max] -\stopsetup - -\startsetup - \command - [\y!setuppapersize] - \type - [\c!vals!\c!opt!\c!vals!] - \value - [A3,A4,A5,A6,letter,...,CD,\c!identifier!, - \v!landscape,\v!mirrored,\v!rotated,90,180,270] - [A4] - \value - [A3,A4,A5,A6,letter,...,\c!identifier!, - \v!landscape,\v!mirrored,\v!rotated,\v!negative,90,180,270] - [A4] -\stopsetup - -\startsetup - \command - [\y!setuparranging] - \type - [\c!vals!] - \value - [\v!disable, - 2*16,2*8,2*4,2*2,2**2,2*2*4,2*4*2,2UP,2DOWN,2SIDE,2TOP, - \v!mirrored,\v!rotated,\v!doublesided,\v!negative,90,180,270] - [] -\stopsetup - -\startsetup - \command - [\y!showprint] - \type - [\c!vals!\c!vals!\c!vars!] - \inheritvariables - [\y!setuppapersize] - [] - \inheritvariables - [\y!setuppapersize] - [] - \inheritvariables - [\y!setuplayout] - [] -\stopsetup - -\startsetup - \command - [\y!definelogo] - \type - [\c!val!\c!val!\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\v!top,\v!header,\v!footer,\v!bottom] - [] - \value - [\v!none,\v!page, - \v!leftedge,\v!leftmargin, - \v!left,\v!middle,\v!right, - \v!rightmargin,\v!rightedge] - [] - \variable - [\c!command] - [\c!command!,\c!text!] - [] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!stop] -\stopsetup - -\startsetup - \command - [\y!placelogos] - \type - [\c!opt!\c!vals!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!setupwhitespace] - \type - [\c!opt!\c!val!] - \value - [\v!none,\v!small,\v!medium,\v!big,\v!line,\v!fixed,\v!fix,\c!dimension!] - [\v!none] -\stopsetup - -\startsetup - \command - [\y!setupindenting] - \type - [\c!vals!] - \value - [\v!none,\v!small,\v!medium,\v!big,\v!next,\v!first,\c!dimension!] - [\v!none] -\stopsetup - -\startsetup - \command - [\y!definesectionblock] - \type - [\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupsectionblock] - [] -\stopsetup - -\startsetup - \command - [\y!setupsectionblock] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!number] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!page] - [\v!yes,\v!right] - [\v!right] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] -\stopsetup - -\startsetup - \command - [\y!definesection] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!setupsection] - \type - [\c!val!\c!opt!\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [\v!frontpart,\v!bodypart,\v!appendix,\v!backpart] - \variable - [\c!conversion] - [\v!numbers,\v!characters,\v!Characters,\v!romannumerals,\v!Romannumerals] - [\v!numbers] - \variable - [\c!previousnumber] - [\v!yes,\v!no] - [\v!yes] -\stopsetup - -\startsetup - \command - [\y!setuphead] - \type - [\c!vals!\c!vars!] - \value - [\c!section!] - [] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [] - \variable - [\c!textstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [] - \variable - [\c!numberstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!textcolor] - [\c!identifier!] - [] - \variable - [\c!numbercolor] - [\c!identifier!] - [] - \variable - [\c!number] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!ownnumber] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!page] - [\v!left,\v!right,\v!yes] - [] - \variable - [\c!continue] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!header] - [\v!none,\v!empty,\v!high,\v!nomarking] - [] - \variable - [\c!text] - [\v!none,\v!empty,\v!high,\v!nomarking] - [] - \variable - [\c!footer] - [\v!none,\v!empty,\v!high,\v!nomarking] - [] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!inbetween] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [\blank] - \variable - [\c!alternative] - [\v!normal,\v!inmargin,\v!middle,\v!text] - [\v!normal] - \variable - [\c!command] - [\c!twoarguments!] - [] - \variable - [\c!numbercommand] - [\c!oneargument!] - [] - \variable - [\c!textcommand] - [\c!oneargument!] - [] - \variable - [\c!prefix] - [+,-,\c!text!] - [] - \variable - [\c!placehead] - [\v!yes,\v!no,\v!empty] % leeg: wel markering - [\v!yes] - \variable - [\c!incrementnumber] - [\v!yes,\v!no,\v!list,\c!filename!] % lijst: wel lijstentry - [\v!yes] - \variable - [\c!resetnumber] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!file] - [\c!identifier!] - [] - \variable - [\c!expansion] - [\v!yes,\v!command,\v!no] - [\v!no] - \variable - [\c!margintext] - [\v!yes,\v!no] - [\v!yes] - \inheritvariables - [\y!setupheads] - [] -\stopsetup - -\startsetup - \command - [\y!setupheadnumber] - \type - [\c!val!\c!val!] - \value - [\c!section!] - [] - \value - [\c!number!,+\c!number!,-\c!number!] - [] -\stopsetup - -\startsetup - \command - [\y!headnumber] - \type - [\c!opt!\c!val!] - \value - [\c!section!] - [] -\stopsetup - -\startsetup - \command - [\y!determineheadnumber] - \type - [\c!val!] - \value - [\c!section!] - [] -\stopsetup - -\startsetup - \command - [\y!currentheadnumber] - \type - [] -\stopsetup - -\startsetup - \command - [\e!next<<\y!section>>] - \type - [] -\stopsetup - -\startsetup - \command - [\y!definehead] - \type - [\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!section!] - [] -\stopsetup - -\startsetup - \command - [\y!setupitemgroup] - \type - [\c!val!\c!opt!\c!val!\c!opt!\c!vals!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\c!number!,\v!each] - [] - \value - [\v!standard,\c!repeat!\v!broad,\c!repeat!\v!serried,\v!packed, - \v!unpacked,\v!stopper,\v!joinedup,\v!atmargin,\v!inmargin, - \v!autointro,\v!loose,\v!section,\v!intext] - [\v!standard] - \variable - [\c!margin] - [\v!no,\v!standard,\c!dimension!] - [0pt] - \variable - [\c!leftmargin] - [\v!no,\v!standard,\c!dimension!] - [0pt] - \variable - [\c!rightmargin] - [\v!no,\v!standard,\c!dimension!] - [0pt] - \variable - [\c!width] - [\c!dimension!] - [1.5em] - \variable - [\c!distance] - [\c!dimension!] - [0.5em] - \variable - [\c!factor] - [\c!number!] - [0] - \variable - [\c!items] - [\c!number!] - [4] - \variable - [\c!start] - [\c!number!] - [1] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!inbetween] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!left] - [\c!text!] - [] - \variable - [\c!right] - [\c!text!] - [] - \variable - [\c!beforehead] - [\c!command!] - [] - \variable - [\c!afterhead] - [\c!command!] - [] - \variable - [\c!headstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!marstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!type] - \variable - [\c!symstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!stopper] - [\c!text!] - [.] - \variable - [\c!n] - [\c!number!] - [] - \variable - [\c!symbol] - [\c!number!] - [] - \variable - [\c!align] - [\v!left,\v!right,\v!normal] - [\v!normal] - \variable - [\c!indentnext] - [\v!yes,\v!no] - [\v!yes] -\stopsetup - -%\startsetup -% \command -% [\y!symbol] -% \type -% [\c!val!] -% \value -% [\c!number!] -% [] -%\stopsetup - -% - -\startsetup - \command - [\e!start<<\y!itemgroup>>] - \type - [\c!val!\c!opt!\c!vals!\c!opt!\c!vars!\c!stp!] - \value - [\c!identifier!] - [] - \value - [a,A,KA,n,N,m,r,R,KR,\c!number!,\v!continue, - \v!standard,\c!repeat!\v!broad,\c!repeat!\v!serried,\v!packed, - \v!stopper,\v!joinedup,\v!atmargin,\v!inmargin,\v!intro, - \v!columns] - [\v!standard] - \inheritvariables - [\y!setupitemgroup] - [] -\stopsetup - -\startsetup \command[\y!item]\type[\c!opt!\c!refs!] \stopsetup -\startsetup \command[\y!but] \type[\c!alwint!\c!ref!] \stopsetup -\startsetup \command[\y!its] \type[\c!opt!\c!refs!] \stopsetup -\startsetup \command[\y!ran] \type[\c!arg!] \stopsetup -\startsetup \command[\y!head]\type[\c!opt!\c!refs!] \stopsetup -\startsetup \command[\y!mar] \type[\c!opt!\c!refs!\c!arg!] \stopsetup -\startsetup \command[\v!sub] \type[\c!opt!\c!refs!] \stopsetup % no \y!sub -\startsetup \command[\y!sym] \type[\c!arg!] \stopsetup -\startsetup \command[\y!nop] \type[] \stopsetup - -\startsetup - \command - [\y!defineregister] - \type - [\c!val!\c!val!] - \value - [\c!singular!] - [] - \value - [\c!plural!] - [] -\stopsetup - -\startsetup - \command - [\y!setupregister] - \type - [\c!val!\c!opt!\c!val!\c!vars!] - \value - [\c!singular!] - [] - \value - [\c!identifier!] - [] - \variable - [\c!n] - [\c!number!] - [2] - \variable - [\c!balance] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!align] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!bold] - \variable - [\c!pagestyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!bold] - \variable - [\c!textstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!bold] - \variable - [\c!indicator] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!coupling] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!sectionnumber!] - [\v!yes,\v!no] - [] - \variable - [\c!criterium] - [\c!section!,\v!local,\v!all] - [\v!part] - \variable - [\c!distance] - [\c!dimension!] - [1em] - \variable - [\c!symbol] - [1,2,...,\c!n,\c!a,...,\v!none] - [] - \variable - [\c!interaction] - [\v!pagenumber,\v!text] - [\v!pagenumber] - \variable - [\c!expansion] - [\v!yes,\v!command,\v!no] - [\v!no] - \variable - [\c!referencing] - [\v!on,\v!off] - [\v!on] - \variable - [\c!command] - [\c!oneargument!] - [] - \variable - [\c!location] - [\v!left,\v!middle,\v!right] - [\v!middle] - \variable - [\c!maxwidth] - [\c!dimension!] - [] - \variable - [\c!unknownreference] - [\v!empty,\v!none] - [\v!empty] - \variable - [\c!alternative] - [a,b,A,B] - [a] -\stopsetup - -\startsetup - \command - [<<\y!register>>] - \type - [\c!opt!\c!val!\c!idxs!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\e!start<<\y!register>>] - \type - [\c!opt!\c!val!\c!idxs!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!writetoregister] - \type - [\c!val!\c!opt!\c!val!\c!idxs!] - \value - [\c!singular!] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\e!coupled<<\y!register>>] - \type - [\c!opt!\c!val!\c!idx!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!coupleregister] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!placeregister] - \type - [\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupregister] - [] -\stopsetup - -\startsetup - \command - [\e!see<<\y!register>>] - \type - [\c!opt!\c!val!\c!arg!\c!idxs!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\e!complete<<\y!register>>] - \type - [\c!optint!\c!opt!\c!vars!] - \inheritvariables - [\y!setupregister] - [] -\stopsetup - -\startsetup - \command - [\e!place<<\y!register>>] - \type - [\c!optint!\c!opt!\c!vars!] - \inheritvariables - [\y!setupregister] - [] -\stopsetup - -\startsetup - \command - [\y!definesynonyms] - \type - [\c!val!\c!val!\c!val!\c!opt!\c!val!] - \value - [\c!singular!] - [] - \value - [\c!plural!] - [] - \value - [\c!command!] - [] - \value - [\c!command!] - [] -\stopsetup - -\startsetup - \command - [\y!setupsynonyms] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!textstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!cap] - \variable - [\c!synonymstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!location] - [\v!left,\v!right,\v!top,\v!serried, - \v!inmargin,\v!inleft,\v!inright] - [\v!left] - \variable - [\c!width] - [\c!dimension!] - [5em] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!start] - \variable - [\c!criterium] - [\v!all,\v!used] - [\v!used] - \variable - [\c!conversion] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!expansion] - [\v!yes,\v!command,\v!no] - [\v!no] - \variable - [\c!command] - [\c!threearguments!] - [] -\stopsetup - -\startsetup - \command - [<<\y!synonym>>] - \type - [\c!opt!\c!val!\c!arg!\c!arg!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\e!complete\e!listof<<\y!synonyms>>] - \type - [] -\stopsetup - -\startsetup - \command - [\e!place\e!listof<<\y!synonyms>>] - \type - [] -\stopsetup - -\startsetup - \command[\e!load<<\y!synonyms>>] - \type[] -\stopsetup - -\startsetup - \command - [\y!definesorting] - \type - [\c!val!\c!val!\c!opt!\c!val!] - \value - [\c!singular!] - [] - \value - [\c!plural!] - [] - \value - [\c!command!] - [] -\stopsetup - -\startsetup - \command - [\y!setupsorting] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!command] - [\c!oneargument!] - [] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!start] - \variable - [\c!criterium] - [\v!all,\v!used] - [\v!used] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!expansion] - [\v!yes,\v!command,\v!no] - [\v!no] -\stopsetup - -\startsetup - \command - [<<\y!sort>>] - \type - [\c!val!\c!arg!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\e!complete\e!listof<<\y!sorts>>] - \type - [] -\stopsetup - -\startsetup - \command - [\e!place\e!listof<<\y!sorts>>] - \type - [] -\stopsetup - -\startsetup - \command[\e!load<<\y!sorts>>] - \type[] -\stopsetup - -\startsetup - \command - [\y!definemakeup] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupmakeup] - [] -\stopsetup - -\startsetup - \command - [\y!startmakeup] - \type - [\c!val!\c!opt!\c!vars!\c!stp!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupmakeup] - [] -\stopsetup - -\startsetup - \command - [\y!setupmakeup] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!width] - [\c!dimension!] - [\makeupwidth] - \variable - [\c!height] - [\c!dimension!] - [\textheight] - \variable - [\c!voffset] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!hoffset] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!page] - [\v!left,\v!yes,\v!right] - [] - \variable - [\c!commands] - [\c!command!] - [] - \variable - [\c!doublesided] - [\v!yes,\v!no,\v!empty] - [\v!empty] - \variable - [\c!headerstate] - [\v!normal,\v!stop,\v!start,\v!empty,\v!none,\v!nomarking] - [\v!empty] - \variable - [\c!footerstate] - [\v!normal,\v!stop,\v!start,\v!empty,\v!none,\v!nomarking] - [\v!empty] - \variable - [\c!textstate] - [\v!normal,\v!stop,\v!start,\v!empty,\v!none,\v!nomarking] - [\v!empty] - \variable - [\c!topstate] - [\v!stop,\v!start] - [\v!stop] - \variable - [\c!bottomstate] - [\v!stop,\v!start] - [\v!stop] - \variable - [\c!pagestate] - [\v!stop,\v!start] - [\v!stop] - \variable - [\c!color] - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\e!start<<\y!name>>\e!makeup] % \tf - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!version] - \type - [\c!val!] - \value - [\v!final,\v!concept,\v!temporary] - [\v!final] -\stopsetup - -\startsetup - \command - [\y!currentdate] - \type - [\c!vals!] - \inheritvalues - [\y!date] - [] -\stopsetup - -\startsetup - \command - [\y!date] - \type - [\c!opt!\c!vars!\c!vals!] - \variable - [d] - [\c!number!] - [] - \variable - [m] - [\c!number!] - [] - \variable - [y] - [\c!number!] - [] - \value - [\v!day,\v!day+,\v!month,\v!weekday,\v!year, % \v!WEEKDAY,\v!MONTH, - dd,dd+,mm,jj,yy,d,d+,m,j,y,\v!referral] - [\v!day,\v!month,\v!year] -\stopsetup - -\startsetup - \command - [\y!referraldate] - \type - [] -\stopsetup - -\startsetup - \command - [\y!indenting] - \type - [\c!vals!] - \value - [\v!never,\v!not,\v!no,\v!yes,\v!always,\v!first,\v!next] - [\v!never] -\stopsetup - -\startsetup - \command - [\y!noindenting] - \type - [] -\stopsetup - -\startsetup - \command - [\y!blank] - \type - [\c!opt!\c!vals!] - \value - [\c!repeat!\v!small,\c!repeat!\v!medium,\c!repeat!\v!big, - \v!nowhite,\v!back,\v!white,\v!disable,\v!force,\v!reset, - \v!line,\v!halfline,\v!formula,\v!fixed,\v!flexible,\v!none] - [\v!big] -\stopsetup - -\startsetup - \command - [\y!startpacked] - \type - [\c!opt!\c!val!\c!stp!] % tzt \c!vals! - \value - [\v!blank] - [] -\stopsetup - -\startsetup - \command - [\y!startunpacked] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!startlinecorrection] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!correctwhitespace] - \type - [\c!arg!] -\stopsetup - -\startsetup - \command - [\e!start\v!postponing] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!startlocal] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!startnarrower] - \type - [\c!opt!\c!vals!\c!stp!] - \value - [\c!repeat!\v!left,\c!repeat!\v!middle,\c!repeat!\v!right] - [\v!middle] -\stopsetup - -\startsetup - \command - [\e!start\v!hiding] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!setupalign] - \type - [\c!val!] - \value - [\v!width,\v!left,\v!right,\v!middle,\v!inner,\v!outer, - \v!wide,\v!broad,\v!height,\v!bottom,\v!line,\v!reset, - \v!hanging,\v!nothanging,\v!hyphenated,\v!nothyphenated] - [] -\stopsetup - -\startsetup - \command - [\y!startalignment] - \type - [\c!stp!\c!opt!\c!val!] - \inheritvariables - [\y!setupalign] - [] -\stopsetup - -\startsetup - \command - [\y!setupspacing] - \type - [\c!val!] - \value - [\v!broad,\v!packed] - [] -\stopsetup - -\startsetup - \command - [\y!setuptolerance] - \type - [\c!vals!] - \value - [\v!horizontal,\v!vertical, - \v!stretch,\v!space,\v!verystrict,\v!strict,\v!tolerant,\v!verytolerant] - [\v!verystrict] -\stopsetup - -\startsetup - \command - [\y!pagetype] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!processpage] - \type - [\c!vals!\c!val!] - \value - [\c!identifier!] - [] - \value - [\v!yes,\v!no] - [\v!yes] -\stopsetup - -\startsetup - \command - [\y!couplepage] - \type - [\c!vals!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!option] - [\v!doublesided] - [] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] -\stopsetup - -\startsetup - \command - [\y!position] - \type - [\c!poss!\c!arg!] - \value - [\c!number!] - [] - \value - [\c!number!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!setupscreens] - \type - [\c!vars!] - \variable - [\c!method] - [\v!dot,\v!rule,\v!external] - [\v!external] - \variable - [\c!resolution] - [\c!number!] - [508] - \variable - [\c!factor] - [\c!number!] - [8] - \variable - [\c!screen] - [\c!number!] - [0.95] -\stopsetup - -\startsetup - \command - [\y!setupbackgrounds] - \type - [\c!opt!\c!val!\c!opt!\c!vals!\c!vars!] - \value - [\v!top,\v!header,\v!text,\v!footer,\v!bottom, - \v!page,\v!paper,\v!leftpage,\v!rightpage] - [] - \value - [\v!leftedge,\v!leftmargin,\v!text,\v!rightmargin,\v!rightedge] - [] - \variable - [\c!state] - [\v!start,\v!stop,\v!repeat] - [\v!start] -% \variable -% [\c!commando] -% [\c!command!] -% [] - \inheritvariables - [\y!setupframed] - [] -\stopsetup - -\startsetup - \command - [\e!start<<\y!buffer>>] - \type - [\c!opt!\c!val!\c!stp!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!getbuffer] - \type - [\c!opt!\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!typebuffer] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!definebuffer] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!setupbuffer] - \type - [\c!opt!\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!paragraph] - [\c!number!] - [0] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] -\stopsetup - -\startsetup - \command - [\y!defineblock] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!nomoreblocks] - \type - [] -\stopsetup - -\startsetup - \command - [\y!hideblocks] - \type - [\c!vals!\c!opt!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!keepblocks] - \type - [\c!vals!\c!opt!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\v!all,\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!useblocks] - \type - [\c!vals!\c!opt!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!processblocks] - \type - [\c!vals!\c!opt!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!bypassblocks] - \type - [\c!vals!\c!opt!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!forceblocks] - \type - [\c!vals!\c!opt!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!selectblocks] - \type - [\c!vals!\c!opt!\c!vals!\c!opt!\c!var!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] - \variable - [\c!criterium] - [\v!all,\c!section!] - [\v!all] -\stopsetup - -\startsetup - \command - [\y!setupblock] - \type - [\c!vals!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [\blank] - \variable - [\c!inner] - [\c!command!] - [] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] -% \variable -% [\c!scope] -% [\v!globaal,\v!lokaal] -% [\v!globaal] - \variable - [\c!file] - [\c!filename!] - [] -\stopsetup - -\startsetup - \command - [\e!start<<\y!formula>>] - \type - [\c!stp!] - \value - [\c!formula!] - [] -\stopsetup - -\startsetup - \command - [\y!mathematics] - \type - [\c!arg!] - \value - [\c!formula!] - [] -\stopsetup - -\startsetup - \command - [\y!placeformula] - \type - [\c!opt!\c!refs!\c!opt!\c!arg!\c!dis!] - \value - [\c!text!] - [] - \value - [\c!formula!] - [] -\stopsetup - -\startsetup - \command - [\y!placesubformula] - \type - [\c!opt!\c!refs!\c!opt!\c!arg!\c!dis!] - \value - [\c!text!] - [] - \value - [\c!formula!] - [] -\stopsetup - -\startsetup - \command - [\e!place<<\y!float>>] - \type - [\c!opt!\c!val!\c!opt!\c!refs!\c!arg!\c!arg!] - \value - [\v!left,\v!right,\v!here,\v!top,\v!bottom, - \v!inleft,\v!inright,\v!inmargin,\v!margin, - \v!leftmargin,\v!rightmargin,\v!leftedge,\v!rightedge, - \v!innermargin,\v!outermargin,\v!inneredge,\v!outeredge, - \v!inner,\v!outer,\c!line,\v!high,\v!low,\v!fit, - \v!page,\v!opposite,\v!always,\v!force,\v!tall,\v!reset, - \v!line,\v!height,\v!depth] - [\v!here] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\e!reserve<<\y!float>>] - \type - [\c!opt!\c!vars!\c!opt!\c!val!\c!opt!\c!refs!\c!arg!] - \variable - [\c!height] - [\c!dimension!] - [] - \variable - [\c!width] - [\c!dimension!] - [] - \variable - [\c!frame] - [\v!on,\v!off] - [] - \value - [\v!left,\v!right,\v!here,\v!top,\v!bottom, - \v!inleft,\v!inright,\v!inmargin,\v!margin, - \v!page,\v!opposite,\v!always,\v!force] - [\v!here] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!definefloat] - \type - [\c!val!\c!val!] - \value - [\c!singular!] - [] - \value - [\c!plural!] - [] -\stopsetup - -\startsetup - \command - [\y!setupfloat] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!height] - [\c!dimension!] - [] - \variable - [\c!width] - [\c!dimension!] - [] - \variable - [\c!maxheight] - [\c!dimension!] - [] - \variable - [\c!maxwidth] - [\c!dimension!] - [] - \variable - [\c!minwidth] - [\c!dimension!] - [] - \variable - [\c!default] - [\c!identifier!] - [] - \variable - [\c!pageboundaries] - [\c!list!] - [] - \variable - [\c!leftmargindistance] - [\c!dimension!] - [0pt] - \variable - [\c!rightmargindistance] - [\c!dimension!] - [0pt] - \variable - [\c!location] - [\v!left,\v!middle,\v!right] - [\v!middle] - \inheritvariables - [\y!setupframed] - [] -\stopsetup - -\startsetup - \command - [\e!start<<\y!float>>\e!text] - \type - [\c!opt!\c!val!\c!opt!\c!ref!\c!arg!\c!arg!\c!stp!] - \value - [\v!left,\v!right,\v!high,\v!middle,\v!low,\c!offset,\v!tall] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command[\e!place\e!listof<<\y!floats>>] - \type[\c!optint!] -\stopsetup - -\startsetup - \command[\e!complete\e!listof<<\y!floats>>] - \type[\c!optint!] -\stopsetup - -% pragma4.tex -% -% \startsetup -% \command -% [\y!label] -% \type -% [\c!val!\c!arg!\c!arg!\c!arg!\c!arg!\c!arg!\c!arg!] -% \value -% [\v!smal,\v!breed] -% [\v!breed] -% \value -% [\c!text!] -% [] -% \value -% [\c!text!] -% [] -% \value -% [\c!text!] -% [] -% \value -% [\c!text!] -% [] -% \value -% [\c!text!] -% [] -% \value -% [\c!text!] -% [] -% \stopsetup - -\startsetup - \command - [\y!referral] - \type - [\c!vars!] - \variable - [bet] - [\c!text!] - [] - \variable - [ken] - [\c!text!] - [] - \variable - [dat] - [\c!text!] - [] - \variable - [van] - [\c!text!] - [] - \variable - [aan] - [\c!text!] - [] - \variable - [ref] - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!selectpaper] - \type - [\c!vars!] - \variable - [\c!family] - [1,2] - [] -\stopsetup - -\startsetup - \command - [\y!couplepaper] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -% pragma5.tex - -\startsetup - \command[\y!chem] - \type[\c!arg!\c!arg!\c!arg!] - \value[\c!text!][] - \value[\c!text!][] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!fraction] - \type[\c!arg!\c!arg!] - \value[\c!text!][] - \value[\c!text!][] -\stopsetup - -\startsetup - \command[\y!periods] - \type[\c!val!] - \value[\c!number!][] -\stopsetup - -% \startsetup -% \command[\y!domicile] -% \type[\c!arg!] -% \value[\c!text!][] -% \stopsetup - -\startsetup - \command - [\y!items] - \type - [\c!opt!\c!vars!\c!args!] - \inheritvariables - [\y!setupitems] - [] -\stopsetup - -\startsetup - \command - [\y!setupitems] - \type - [\c!vars!] - \variable - [\c!location] - [\v!left,\v!right,\v!inmargin,\v!top,\v!bottom] - [\v!left] - \variable - [\c!symbol] - [1,2,...,\c!n,\c!a,...,\c!text!,\v!none] - [] - \variable - [\c!width] - [\c!dimension!] - [\hsize] - \variable - [\c!n] - [\c!number!,\v!unknown] - [\v!unknown] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!inbetween] - [\c!command!] - [{\blank[\v!medium]}] - \variable - [\c!align] - [\v!left,\v!right,\v!middle,\v!margin] - [\v!middle] - \variable - [\c!after] - [\c!command!] - [\blank] -\stopsetup - -\startsetup - \command - [\y!startquotation] - \type - [\c!vals!\c!stp!] - \value - [\c!repeat!\v!left,\c!repeat!\v!middle,\c!repeat!\v!right] - [\v!middle] -\stopsetup - -\startsetup - \command - [\y!quotation] - \type - [\c!arg!] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!quote] - \type - [\c!arg!] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!setupquote] - \type - [\c!vars!] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!location] - [\v!text,\v!margin] - [\v!margin] -\stopsetup - -\startsetup - \command - [\y!adding] - \type - [\c!val!] - \value - [\v!small,\v!medium,\v!big] - [\v!medium] -\stopsetup - -\startsetup - \command - [\y!defineparagraphs] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!n] - [\c!number!] - [2] - \variable - [\c!rule] - [\v!on,\v!off] - [\v!off] - \variable - [\c!height] - [\v!fit,\c!dimension!] - [\v!fit] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [\blank] - \variable - [\c!inner] - [\c!command!] - [] - \variable - [\c!distance] - [\c!dimension!] - [1em] - \variable - [\c!tolerance] - [\v!verystrict,\v!strict,\v!tolerant,\v!verytolerant,\v!stretch] - [\v!tolerant] - \variable - [\c!align] - [\v!left,\v!right,\v!middle] - [] -\stopsetup - -\startsetup - \command - [<<\y!paragraph>>] - \type - [] -\stopsetup - -\startsetup - \command - [\e!start<<\y!paragraph>>] - \type - [\c!stp!] -\stopsetup - -\startsetup - \command - [\y!setupparagraphs] - \type - [\c!val!\c!opt!\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\c!number!,\v!each] - [] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!width] - [\c!dimension!] - [] - \variable - [\c!height] - [\c!dimension!] - [] - \variable - [\c!align] - [\v!left,\v!right,\v!middle,\v!width] - [\c!width] - \variable - [\c!tolerance] - [\v!verystrict,\v!strict,\v!tolerant,\v!verytolerant,\v!stretch] - [\v!tolerant] - \variable - [\c!distance] - [\c!dimension!] - [] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!inner] - [\c!command!] - [] - \variable - [\c!command] - [\c!command!] - [] - \variable - [\c!rule] - [\v!on,\v!off] - [\v!off] -\stopsetup - -\startsetup - \command - [\y!setuptab] - \type - [\c!vars!] - \variable - [\c!sample] - [\c!text!] - [] - \variable - [\c!width] - [\c!dimension!] - [] - \variable - [\c!headstyle] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!normal] - \variable - [\c!location] - [\v!left,\v!right] - [\v!left] -\stopsetup - -\startsetup - \command - [\y!tab] - \type - [\c!arg!\c!nop!\c!par!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -% pragma6.tex - -\startsetup - \command - [\y!startdocument] - \type - [\c!val!\c!stp!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!labels] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!definetabulate] - \type - [\c!val!\c!opt!\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\e!start<<\y!tabulate>>] - \type - [\c!opt!\c!val!\c!opt!\c!vars!\c!stp!] - \value - [\c!text!] - [] - \inheritvariables - [\y!useexternalfigure] - [] -\stopsetup - -\startsetup - \command - [\y!setuptabulate] - \type - [\c!opt!\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!unit] - [\c!dimension!] - [1em] - \variable - [\c!indenting] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!before] - [\c!command!] - [\blank] - \variable - [\c!after] - [\c!command!] - [\blank] - \variable - [\c!inner] - [\c!command!] - [\blank] - \variable - [EQ] - [\c!text!] - [:] - \variable - [\c!rulecolor] - [\c!identifier!] - [] - \variable - [\c!align] - [\v!left,\v!middle,\v!right,\v!normal] - [\v!normal] - \variable - [\c!rulethickness] - [\c!dimension!] - [\linewidth] - \variable - [\c!distance] - [\v!blank,\v!grid,\v!depth,\c!dimension!,\v!small,\v!medium,\v!big,\v!none] - [\v!depth,\v!medium] - \variable - [\c!bodyfont] - [5pt,...,12pt,\v!small,\v!big] - [] - \variable - [\c!rule] - [\v!normal,\v!line] - [\v!line] - \variable - [\c!split] - [\v!yes,\v!no] - [\v!yes] -\stopsetup - -\startsetup - \command - [\y!setuptables] - \type - [\c!vars!] - \variable - [\c!distance] - [\v!small,\v!medium,\v!big] - [\v!medium] - \variable - [\c!bodyfont] - [5pt,...,12pt,\v!small,\v!big] - [] - \variable - [HL] - [\c!number!,\v!small,\v!medium,\v!big,\v!none] - [\v!medium] - \variable - [VL] - [\c!number!,\v!small,\v!medium,\v!big,\v!none] - [\v!medium] - \variable - [\c!depth] - [\c!number!,\v!strut] - [.40] - \variable - [\c!height] - [\c!number!,\v!strut] - [80] - \variable - [\c!rulethickness] - [\c!dimension!] - [\linewidth] - \variable - [\c!rulecolor] - [\c!identifier!] - [] - \variable - [\c!align] - [\v!right,\v!middle,\v!left,\v!normal] - [\v!right] - \variable - [\c!commands] - [\c!command!] - [] - \variable - [\c!align] - [\v!left,\v!middle,\v!right,\v!normal] - [\v!right] - \variable - [\c!background] - [\v!screen,\v!color,\v!none] - [\v!none] - \variable - [\c!backgroundscreen] - [\c!number!] - [0.9] - \variable - [\c!backgroundcolor] - [\c!identifier!] - [] - \variable - [\c!bodyfont] - [5pt,...,12pt,\v!small,\v!big] - [] -\stopsetup - -\startsetup - \command - [\y!starttable] - \type - [\c!val!\c!stp!] - \value - [\c!text!,\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!starttables] - \type - [\c!val!\c!stp!] - \value - [\c!text!,\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!definetabletemplate] - \type - [\c!val!\c!val!\c!opt!\c!val!\c!opt!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!useexternalfiles] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!bodyfont] - [5pt,...,12pt,\v!small,\v!big] - [] - \variable - [\c!file] - [\c!filename!] - [] -\stopsetup - -\startsetup - \command - [\y!useexternalfile] - \type - [\c!val!\c!val!\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] - \value - [\c!filename!] - [] - \variable - [\c!bodyfont] - [5pt,...,12pt,\v!small,\v!big] - [] -\stopsetup - -% \startsetup -% \command -% [\y!presetexternfiguur] -% \type -% [\c!val!\c!vars!] -% \value -% [\c!filename!] -% [] -% \variable -% [t] -% [eps,mps,pdf,tif,jpg,png] -% [] -% \variable -% [w] -% [\c!dimension!] -% [] -% \variable -% [h] -% [\c!dimension!] -% [] -% \variable -% [s] -% [\c!number!] -% [] -% \variable -% [t] -% [\c!text!] -% [] -% \stopsetup - -\startsetup - \command - [\y!useexternalfigure] - \type - [\c!opt!\c!val!\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\c!filename!] - [] - \variable - [\c!scale] - [\c!number!] - [1000] - \variable - [\c!factor] - [\v!max,\v!fit,\v!broad] - [] - \variable - [\c!wfactor] - [\c!number!,\v!max,\v!broad,\v!fit] - [] - \variable - [\c!hfactor] - [\c!number!,\v!max,\v!broad,\v!fit] - [] - \variable - [\c!width] - [\c!dimension!] - [] - \variable - [\c!height] - [\c!dimension!] - [] - \variable - [\c!frame] - [\v!on,\v!off] - [\v!off] - \variable - [\c!preset] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!display] - [\c!filename!] - [] - \variable - [\c!preview] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!repeat] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!object] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!type] - [\c!eps,\c!mps,\c!pdf,\c!tif,\c!png,\c!jpg,\c!mov,\c!tex] - [] - \variable - [\c!method] - [\c!eps,\c!mps,\c!pdf,\c!tif,\c!png,\c!jpg,\c!mov,\c!tex] - [] -\stopsetup - -\startsetup - \command - [\y!externalfigure] - \type - [\c!val!\c!vars!] - \value - [\c!filename!] - [] - \inheritvariables - [\y!useexternalfigure] - [] -\stopsetup - -\startsetup - \command - [\y!setupexternalfigures] - \type - [\c!var!] - \variable - [\c!option] - [\v!frame,\v!empty,\v!test] - [] - \variable - [\c!object] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!frames] - [\v!on,\v!off] - [\v!off] - \variable - [\c!ymax] - [\c!number!] - [24] - \variable - [\c!xmax] - [\c!number!] - [] - \variable - [\c!directory] - [\c!text!] - [] - \variable - [\c!location] - [\v!local,\v!global,\v!default,\v!none] - [] - \variable - [\c!maxwidth] - [\c!dimension!] - [] - \variable - [\c!maxheight] - [\c!dimension!] - [] -\stopsetup - -\startsetup - \command - [\y!showexternalfigures] - \type - [\c!opt!\c!vars!] - \variable - [\c!alternative] - [\v!a,\v!b,\v!c] - [\v!a] -\stopsetup - -\startsetup - \command - [\y!useexternalsoundtrack] - \type - [\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!filename!] - [] -\stopsetup - -\startsetup - \command - [\y!macroname] - \type - [\c!arg!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\e!start\v!legend] - \type - [\c!opt!\c!val!\c!tex!{leg}\c!nop!\c!sep!\c!nop!\c!sep!\c!nop!\c!sep!\c!tex!{leg}\c!stp!] - \value - [\v!two] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\e!start\v!fact] - \type -% [\c!tex!{geg}\c!nop!\c!sep!\c!nop!\c!sep!\c!nop!\c!sep!\c!tex!{geg}\c!stp!] - [\c!tex!{\y!fact}\c!nop!\c!sep!\c!nop!\c!sep!\c!nop!\c!sep!\c!tex!{\y!fact}\c!stp!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!rotate] - \type - [\c!opt!\c!vars!\c!arg!] - \inheritvariables - [\y!setuprotate] - [] -\stopsetup - -\startsetup - \command - [\y!setuprotate] - \type - [\c!vars!] - \variable - [\c!rotation] - [\c!number!] - [90] - \variable - [\c!location] - [\v!normal,\v!high,\v!fit,\v!broad,\v!depth] - [\v!normal] - \inheritvariables - [\y!setupframed] - [] -\stopsetup - -\startsetup - \command - [\y!mirror] - \type - [\c!arg!] -\stopsetup - -\startsetup - \command - [\y!scale] - \type - [\c!opt!\c!vars!\c!arg!] - \variable - [\c!sx] - [\c!number!] - [1] - \variable - [\c!sy] - [\c!number!] - [1] -\stopsetup - -\startsetup - \command - [\y!setupcombinations] - \type - [\c!vars!] - \variable - [\c!before] - [\c!command] - [] - \variable - [\c!inbetween] - [\c!command] - [] - \variable - [\c!after] - [\c!command] - [] - \variable - [\c!distance] - [\c!dimension!] - [1em] - \variable - [\c!height] - [\c!dimension!,\v!fit] - [\v!fit] - \variable - [\c!width] - [\c!dimension!,\v!fit] - [\v!fit] - \variable - [\c!location] - [\c!top,\c!middle,\c!bottom,\c!left,\c!right] - [\c!bottom] - \variable - [\c!align] - [\v!no,\v!left,\v!right,\v!middle,\v!normal] - [\v!middle] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...\c!command!] - [\v!bold] - \variable - [\c!color] - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!startcombination] - \type - [\c!val!\c!stp!] - \value - [\c!matrix!] - [] -\stopsetup - -\startsetup - \command - [\y!placesidebyside] - \type - [\c!arg!\c!arg!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!placeontopofeachother] - \type - [\c!arg!\c!arg!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!startoverlay] - \type - [\c!arg!\c!arg!\c!stp!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -% pragma8.tex - -% \verwerkkontakten[naam,groep][actie][] -% \verwerkfiguren[][overzicht][] - -\startsetup - \command - [\y!startoverzicht] - \type - [\c!vals!\c!stp!] - \value - [\c!identifier!] - [] -\stopsetup - -% core-01d.tex - -\startsetup - \command - [\y!setupinteractionscreen] - \type - [\c!alwint!\c!vars!] - \variable - [\c!width] - [\c!dimension!,\v!fit,\v!max] - [\paperwidth] - \variable - [\c!height] - [\c!dimension!,\v!fit,\v!max] - [\paperheight] - \variable - [\c!backspace] - [\c!dimension!] - [\backspace] - \variable - [\c!topspace] - [\c!dimension!] - [\topspace] - \variable - [\c!horoffset] - [\c!dimension!] - [0pt] - \variable - [\c!veroffset] - [\c!dimension!] - [0pt] - \variable - [\c!option] - [\v!max,\v!fit,\v!doublesided,\v!bookmark] - [] - \variable - [\c!delay] - [\c!number!,\v!none] - [\v!none] -\stopsetup - -\startsetup - \command[\y!screen] - \type[\c!alwint!] -\stopsetup - -\startsetup - \command - [\y!setuppagetransitions] - \type - [\c!opt!\c!vals!] - \value - [\v!reset, - %dissolve,box,split,blinds,wipe,glitter, - %vertical,horizontal,in,out,east,west,north,south, - \c!number!] - [] -\stopsetup - -\startsetup - \command - [\y!setupinteraction] - \type - [\c!alwint!\c!vars!] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!stop] - \variable - [\c!menu] - [\v!on,\v!off] - [\v!off] - \variable - [\c!page] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!click] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!split] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!display] - [\v!new] - [] - \variable - [\c!openaction] - [\c!reference!] - [] - \variable - [\c!closeaction] - [\c!reference!] - [] - \variable - [\c!openpageaction] - [\c!reference!] - [] - \variable - [\c!closepageaction] - [\c!reference!] - [] - \variable - [\c!calculate] - [\c!identifier!] - [] - \variable - [\c!strut] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!width] - [\c!dimension!] - [1em] - \variable - [\c!height] - [\c!dimension!] - [0pt] - \variable - [\c!depth] - [\c!dimension!] - [0pt] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...\c!command!] - [\v!bold] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!contrastcolor] - [\c!identifier!] - [] - \variable - [\c!symbolset] - [\c!identifier!] - [] - \variable - [\c!title] - [\c!text!] - [] - \variable - [\c!subtitle] - [\c!text!] - [] - \variable - [\c!author] - [\c!text!] - [] - \variable - [\c!date] - [\c!text!] - [] - \variable - [\c!keyword] - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!defineinteractionmenu] - \type - [\c!alwint!\c!vals!\c!opt!\c!vars!] % \c!opt!\c!dests! - \value - [\v!left,\v!right,\v!top,\v!bottom,\c!identifier!] - [] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!inbetween] - [\c!command!] - [] - \variable - [\c!left] - [\c!command!] - [] - \variable - [\c!right] - [\c!command!] - [] - \variable - [\c!middle] - [\c!command!] - [] - \variable - [\c!state] - [\v!start,\v!stop,\v!none,\v!local] - [\v!start] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...\c!command!] - [\v!bold] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!distance] - [\v!overlay,\c!dimension!] - [] - \variable - [\c!samepage] - [\v!yes,\v!empty,\v!no,\v!none] - [] - \variable - [\c!unknownreference] - [\v!yes,\v!empty,\v!no,\v!none] - [] - \variable - [\c!leftoffset] - [\c!dimension!] - [0pt] - \variable - [\c!rightoffset] - [\c!dimension!] - [0pt] - \variable - [\c!topoffset] - [\c!dimension!] - [0pt] - \variable - [\c!bottomoffset] - [\c!dimension!] - [0pt] - \variable - [\c!position] - [\v!yes,\v!no] - [\v!no] - \inheritvariables - [\y!setupframed] - [] -\stopsetup - -\startsetup - \command - [\y!defineinteractionmenu] - \type - [\c!alwint!\c!val!\c!opt!\c!val!\c!opt!\c!vars!] - \value - [\v!left,\v!right,\v!top,\v!bottom,\c!identifier!] - [] - \value - [\v!left,\v!right,\v!top,\v!bottom,\c!identifier!] - [] - \inheritvariables - [\y!setupinteractionmenu] - [] -\stopsetup - -\startsetup - \command - [\e!start\y!interactionmenu] % y! ? - \type - [\c!alwint!\c!val!\c!stp!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!disableinteractionmenu] - \type - [\c!alwint!\c!val!\c!refs!] - \value - [\v!left,\v!right,\v!top,\v!bottom,\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!useexternaldocument] - \type - [\c!alwint!\c!val!\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!file] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!useURL] - \type - [\c!alwint!\c!val!\c!val!\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!text!] - [] - \value - [\c!file] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!coupledocument] - \type - [\c!alwint!\c!val!\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!file] - [] - \value - [\c!identifier!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command[\y!from] - \type[\c!alwint!\c!ref!] - \value[\c!text!][] -\stopsetup - -\startsetup - \command - [\y!interactionbar] - \type - [\c!alwint!\c!vars!] - \inheritvariables - [\y!setupinteractionbar] - [] -\stopsetup - -\startsetup - \command - [\y!interactionbuttons] - \type - [\c!alwint!\c!opt!\c!vars!\c!vals!] - \inheritvariables - [\y!setupinteractionbar] - [] - \value - [\c!identifier!] - [] -\stopsetup - -% \interactiebalk[reset] - -\startsetup - \command - [\y!setupinteractionbar] - \type - [\c!alwint!\c!vars!] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!start] - \variable - [\c!alternative] - [a,b,c,d,e,f,g] - [b] - \variable - [\c!symbol] - [\v!yes,\v!no] - [\v!no] - \variable - [\c!width] - [\c!dimension!,\c!height,\v!fit] - [3cm] - \variable - [\c!height] - [\c!dimension!,\c!height,\v!fit] - [\v!broad] - \variable - [\c!depth] - [\c!dimension!] - [0pt] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!step] - [\c!number!,\v!small,\v!medium,\v!big] - [1] - \inheritvariables - [\y!setupframed] - [] -\stopsetup - -\startsetup - \command - [\y!synchronize] - \type - [\c!alwint!] -\stopsetup - -\startsetup - \command - [\y!startsynchronization] - \type - [\c!alwint!\c!stp!] -\stopsetup - -\startsetup - \command - [\y!setupsynchronizationbar] - \type - [\c!alwint!\c!vars!] - \variable - [\c!alternative] - [\v!page,\v!local] - [\v!page] - \variable - [\c!width] - [\c!dimension!,\c!height,\v!fit] - [3cm] - \variable - [\c!height] - [\c!dimension!] - [.5em] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [\v!bold] - \variable - [\c!color] - [\c!identifier!] - [] - \inheritvariables - [\y!setupframed] - [] -\stopsetup - -\startsetup - \command - [\y!synchronizationbar] - \type - [\c!alwint!\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!alternative] - [\v!page,\v!local] - [\v!page] - \inheritvariables - [\y!setupsynchronizationbar] - [] -\stopsetup - -\startsetup - \command - [\y!setupsynchronization] - \type - [\c!alwint!\c!vars!] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!stop] -\stopsetup - -\startsetup - \command - [\y!defineprofile] - \type - [\c!alwint!\c!vals!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!setupprofiles] - \type - [\c!alwint!\c!vars!] - \variable - [\c!option] - [\v!test] - [] -\stopsetup - -\startsetup - \command - [\y!startprofile] - \type - [\c!alwint!\c!vals!\c!stp!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!followprofile] - \type - [\c!alwint!\c!arg!\c!val!] - \value - [\c!text!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!placebookmarks] - \type - [\c!opt!\c!vals!\c!opt!\c!vals!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!bookmark] - \type - [\c!opt!\c!val!\c!arg!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!startversion] - \type - [\c!alwint!\c!vals!\c!stp!] - \value - [\c!number!] - [] -\stopsetup - -\startsetup - \command - [\y!setupversions] - \type - [\c!vars!] - \variable - [\c!number] - [\c!number!] - [1] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!] - [] -\stopsetup - -\startsetup - \command - [\y!markversion] - \type - [\c!alwint!] -\stopsetup - -\startsetup - \command - [\y!selectversion] - \type - [] -\stopsetup - -\startsetup - \command - [\y!defineversion] - \type - [\c!val!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\c!number!] - [] -\stopsetup - -\startsetup - \command - [\y!followversion] - \type - [\c!alwint!\c!arg!\c!val!] - \value - [\c!text!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!followprofileversion] - \type - [\c!alwint!\c!arg!\c!val!\c!val!] - \value - [\c!text!] - [] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!defineprogram] - \type - [\c!alwint!\c!val!\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!setupprograms] - \type - [\c!alwint!\c!vars!] - \variable - [\c!directory] - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!program] - \type - [\c!alwint!\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -% pragma11.tex - -\startsetup - \command - [\y!startfigure] - \type - [\c!alwint!\c!val!\c!val!\c!vars!\c!stp!] - \value - [\c!identifier!] - [] - \value - [\c!filename!] - [] - \variable - [\c!factor] - [\c!number!] - [] - \variable - [\c!frame] - [\v!on,\v!off] - [\v!off] -\stopsetup - -\startsetup - \command - [\y!referring\subsetup{\v!figure}] - \type - [\c!poss!\c!poss!\c!val!] - \value - [\c!number!] - [] - \value - [\c!number!] - [] - \value - [\c!number!] - [] - \value - [\c!number!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!marking\subsetup{\v!figure}] - \type - [\c!poss!\c!poss!\c!val!] - \value - [\c!number!] - [] - \value - [\c!number!] - [] - \value - [\c!number!] - [] - \value - [\c!number!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!remark] - \type - [\c!pos!\c!pos!\c!vars!\c!arg!] - \value - [\c!number!] - [] - \value - [\c!number!] - [] - \inheritvariables - [\y!setupframed] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!goto] - \type - [\c!alwint!\c!arg!\c!alwint!\c!arg!\c!refs!] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!gotobox] - \type - [\c!alwint!\c!arg!\c!refs!] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!button] - \type - [\c!alwint!\c!opt!\c!vars!\c!arg!\c!refs!] - \inheritvariables - [\y!setupbuttons] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!setupbuttons] - \type - [\c!vars!] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!start] - \inheritvariables - [\y!setupframed] - [] -\stopsetup - -\startsetup - \command - [\y!menubutton] - \type - [\c!alwint!\c!opt!\c!val!\c!opt!\c!vars!\c!arg!\c!refs!] - \inheritvariables - [\y!setupframed] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!setupcomment] - \type - [\c!vars!] - \variable - [\c!state] - [\v!start,\v!stop] - [\v!start] - \variable - [\c!width] - [\c!dimension!] - [] - \variable - [\c!height] - [\c!dimension!] - [] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!title] - [\c!text!] - [] - \variable - [\c!space] - [\v!yes,\v!no] - [\v!yes] - \variable - [\c!symbol] - [\v!normal, - \v!New,\v!Balloon,\v!Addition,\v!Help,\v!Paragraph,\v!Key, - \c!identifier!] - [\v!normal] - \variable - [\c!option] - [\v!max,\v!buffer] - [] - \variable - [\c!margin] - [\c!dimension!] - [2.5em] - \variable - [\c!distance] - [\c!dimension!] - [1em] -\stopsetup - -\startsetup - \command - [\e!start\v!comment] - \type - [\c!opt!\c!val!\c!opt!\c!vars!\c!stp!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupcomment] - [] -\stopsetup - -\startsetup - \command - [\y!comment] - \type - [\c!opt!\c!val!\c!opt!\c!vars!\c!arg!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupcomment] - [] -\stopsetup - -\startsetup - \command - [\y!definefield] - \type - [\c!val!\c!val!\c!val!\c!vals!\c!opt!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [radio,check,push,line,text,popup,choice,combo] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!definesubfield] - \type - [\c!val!\c!val!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!copyfield] - \type - [\c!val!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!clonefield] - \type - [\c!val!\c!vals!\c!val!\c!opt!\c!vals!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!field] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!fitfield] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!fillinfield] - \type - [\c!opt!\c!val!\c!arg!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!tooltip] - \type - [\c!opt!\c!val!\c!arg!\c!arg!] - \value - [\v!left,\v!right,\v!middle] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!showfields] - \type - [\c!opt!\c!vals!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!logfields] - \type - [] -\stopsetup - -\startsetup - \command - [\y!setupfield] - \type - [\c!val!\c!vals!\c!vars!\c!vars!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\v!label,\v!horizontal,\v!vertical,\v!frame] - [] - \inheritvariables - [\y!setupfields] - [] -\stopsetup - -\startsetup - \command - [\y!setupfields] - \type - [\c!vals!\c!val!\c!vars!\c!vars!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\v!reset,\v!label,\v!horizontal,\v!vertical,\v!frame] - [] - \variable - [\c!n] - [\c!number!] - [] - \variable - [\c!distance] - [\c!dimension!] - [] - \variable - [\c!before] - [\c!command!] - [] - \variable - [\c!after] - [\c!command!] - [] - \variable - [\c!inbetween] - [\c!command!] - [] - \variable - [\c!color] - [\c!identifier!] - [] - \variable - [\c!style] - [\v!normal,\v!bold,\v!slanted,\v!boldslanted,\v!type] - [\v!normal] - \variable - [\c!align] - [\v!left,\v!middle,\v!right] - [] - \variable - [\c!option] - [\v!readonly,\v!required,\v!protected,\v!sorted, - \v!unavailable, \v!hidden,\v!printable] - [] - \variable - [\c!clickin] - [\c!reference!] - [] - \variable - [\c!clickout] - [\c!reference!] - [] - \variable - [\c!regionin] - [\c!reference!] - [] - \variable - [\c!regionout] - [\c!reference!] - [] - \variable - [\c!afterkey] - [\c!reference!] - [] - \variable - [\c!format] - [\c!reference!] - [] - \variable - [\c!validate] - [\c!reference!] - [] - \variable - [\c!calculate] - [\c!reference!] - [] - \variable - [\c!fieldoffset] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!fieldframecolor] - [\c!identifier!] - [] - \variable - [\c!fieldbackgroundcolor] - [\c!identifier!] - [] - \inheritvariables - [\y!framed] - [] -\stopsetup - -\startsetup - \command - [\y!setupforms] - \type - [\c!vars!] - \variable - [\c!method] - [HTML,FDF] - [HTML] -\stopsetup - -\startsetup - \command - [\y!definefieldstack] - \type - [\c!val!\c!vals!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupfields] - [] -\stopsetup - -\startsetup - \command - [\y!fieldstack] - \type - [\c!val!\c!opt!\c!vals!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setupfields] - [] -\stopsetup - -\startsetup - \command - [\y!clip] - \type - [\c!opt!\c!vars!\c!arg!] - \inheritvariables - [\y!setupclipping] - [] -\stopsetup - -\startsetup - \command - [\y!setupclipping] - \type - [\c!vars!] - \variable - [\c!nx] - [\c!number!] - [2] - \variable - [\c!ny] - [\c!number!] - [2] - \variable - [\c!x] - [\c!number!] - [1] - \variable - [\c!y] - [\c!number!] - [1] - \variable - [\c!width] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!height] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!hoffset] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!voffset] - [\c!dimension!] - [\!!zeropoint] - \variable - [mp] - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!placelegend] - \type - [\c!arg!\c!arg!] - \value - [\c!text!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!setuplegend] - \type - [\c!vars!] - \variable - [\c!n] - [\c!number!] - [1] - \variable - [\c!distance] - [\c!dimension!] - [1em] - \variable - [\c!inbetween] - [\c!command!] - [] % [{\blank[\v!medium]}] - \variable - [\c!width] - [\c!dimension!] - [\hsize] - \variable - [\c!height] - [\c!dimension!] - [\vsize] - \variable - [\c!location] - [\v!right,\v!bottom] - [\v!bottom] - \variable - [\c!bodyfont] - [5pt,...,12pt,\v!small,\v!big] - [] -\stopsetup - -%D new - -\startsetup - \command - [\y!definerule] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setuprule] - [] -\stopsetup - -\startsetup - \command - [\y!placerule] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!setuprule] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!depth] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!height] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!width] - [\c!dimension!] - [\hsize] - \variable - [\c!spacebefore] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!spaceafter] - [\c!dimension!] - [\!!zeropoint] - \variable - [\c!color] - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!definetextvariable] - \type - [\c!val!\c!opt!\c!val!\c!opt!\c!vars!] - \inheritvariables - [\y!setuptextvariable] - [] -\stopsetup - -\startsetup - \command - [\y!setuptextvariable] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \variable - [\c!left] - [\c!text!] - [] - \variable - [\c!right] - [\c!text!] - [] - \variable - [\c!distance] - [\c!dimension!] - [5em] - \variable - [\c!command] - [\c!oneargument!] - [] - \variable - [\c!strut] - [\v!yes,\v!no,\v!cap,\c!text!] - [\c!ja] -\stopsetup - -\startsetup - \command - [\y!settextvariable] - \type - [\c!val!\c!val!] - \value - [\c!identifier!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!placetextvariable] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!textvariable] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!definerawfont] - \type - [\c!val!\c!opt!\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \value - [\c!font!] - [] - \inheritvariables - [\y!setupinterlinespace] - [] -\stopsetup - -\startsetup - \command - [\y!switchtorawfont] - \type - [\c!val!] - \value - [\c!identifier!] - [] -\stopsetup - -\startsetup - \command - [\y!definetextposition] - \type - [\c!val!\c!opt!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setuppositioning] - [] -\stopsetup - -\startsetup - \command - [\y!setuptextposition] - \type - [\c!val!\c!vars!] - \value - [\c!identifier!] - [] - \inheritvariables - [\y!setuppositioning] - [] -\stopsetup - -\startsetup - \command - [\y!positiontext] - \type - [\c!val!\c!arg!] - \value - [\c!identifier!] - [] - \value - [\c!text!] - [] -\stopsetup - -\startsetup - \command - [\y!setupstrut] - \type - [\c!val!] - \value - [\v!yes,\v!no,\v!cap,\c!text!] - [\v!yes] -\stopsetup - -\stopsetupfile diff --git a/tex/context/base/setupd.tex b/tex/context/base/setupd.tex deleted file mode 100644 index 861efe0c4..000000000 --- a/tex/context/base/setupd.tex +++ /dev/null @@ -1,184 +0,0 @@ -%D \module -%D [ file=setupd, -%D version=1998.07.20, -%D title=\CONTEXT\ Setup to TWS, -%D subtitle=Help Generation, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -\let\wait\relax - -\input setupa - -\unprotect - -% keys - -\def\copymessage#1#2#3% - {\dogetmessage{setup}{#3}\edef#1{#2\currentmessagetext}} - -\copymessage \c!command! * {command} -\copymessage \c!dimension! * {dimension} -\copymessage \c!filename! * {file} -\copymessage \c!identifier! * {name} -\copymessage \c!character! * {character} -\copymessage \c!marker! * {mark} -\copymessage \c!number! * {number} -\copymessage \c!reference! * {reference} -\copymessage \c!plural! * {plural} -\copymessage \c!singular! * {singular} -\copymessage \c!text! * {text} -\copymessage \c!formula! * {formula} -\copymessage \c!font! * {file} -\copymessage \c!matrix! * {matrix} -\copymessage \c!list! * {list} -\copymessage \c!section! * {section} -\copymessage \c!sectionnumber! * {sectionnumber} -\copymessage \c!noargument! \empty {command} -\copymessage \c!oneargument! \empty {command} -\copymessage \c!twoarguments! \empty {command} -\copymessage \c!threearguments! \empty {command} - -\edef\c!noargument! {*\@EA\string\csname\c!noargument! \endcsname} -\edef\c!oneargument! {*\@EA\string\csname\c!oneargument! \endcsname\string#1} -\edef\c!twoarguments! {*\@EA\string\csname\c!twoarguments! \endcsname\string#1\string#2} -\edef\c!threearguments!{*\@EA\string\csname\c!threearguments!\endcsname\string#1\string#2\string#3} - -\def\subsetup#1{/#1} - -\beginTEX - -\def\getinterfaceconstant#1% - {\ifinterfacetranslation - \ifx\csname\x!prefix!#1\endcsname\relax - #1% - \else - \csname\x!prefix!#1\endcsname - \fi - \else - #1% - \fi} - -\def\getinterfacevariable#1% - {\ifinterfacetranslation - \ifx\csname\y!prefix!#1\endcsname\relax - #1% - \else - \csname\y!prefix!#1\endcsname - \fi - \else - #1% - \fi} - -\endTEX - -\beginETEX \ifcsname - -\def\getinterfaceconstant#1% - {\ifinterfacetranslation - \ifcsname\x!prefix!#1\endcsname - \csname\x!prefix!#1\endcsname - \else - #1% - \fi - \else - #1% - \fi} - -\def\getinterfacevariable#1% - {\ifinterfacetranslation - \ifcsname\y!prefix!#1\endcsname - \csname\y!prefix!#1\endcsname - \else - #1% - \fi - \else - #1% - \fi} - -\endETEX - -\def\c!repeat! {repeat/} % {n*} -\def\c!arg! {arg/} % {{...}:} -\def\c!args! {args/} % {{..,...,..}:} -\def\c!dis! {dis/} % {$$...$$:} -\def\c!idx! {idx/} % {{...}:} -\def\c!idxs! {idxs/} % {{..+...+..}:} -\def\c!mat! {mat/} % {$...$:} -\def\c!nop! {nop/} % {...:} -\def\c!fil! {fil/} % {...:} -\def\c!pos! {pos/} % {(...):} -\def\c!poss! {poss/} % {(...,...):} -\def\c!sep! {sep/} % {\string\\:} -\def\c!ref! {ref/} % {[ref]:} -\def\c!refs! {refs/} % {[ref,..]:} -\def\c!val! {val/} % {[...]:} -\def\c!vals! {vals/} % {[..,...,..]:} -\def\c!var! {var/} % {[..=..]:} -\def\c!vars! {vars/} % {[..,..=..,..]:} -\def\c!cmd! {cmd/} % {\string\xxx:} -\def\c!dest! {dest/} % {[..ref]:} -\def\c!dests! {dests/} % {[..,..refs,..]:} -\def\c!trip! {trip/} % {[x:y:z=]:} -\def\c!trips! {trips/} % {[x:y:z=,..]:} -\def\c!wrd! {wrd/} % {{...}:} -\def\c!wrds! {wrds/} % {{.. ... ..}:} -\def\c!par! {par/} % {\string\par:} -\def\c!stp! {stp/} % {stop:} -\def\c!tex! {tex/} % {\string\cs:} - -\def\c!or! {} % tzt or - -\def\c!opt! {} % -\def\c!optint! {} % -\def\c!alwint! {} % - -% wrapper - -\def\startsetupfile - {\immediate\openout\scratchwrite=cont-\currentlanguage.tws } - -\def\stopsetupfile - {\immediate\closeout\scratchwrite} - -\let\documenteduntilhere\relax - -\long\def\startsetup#1\stopsetup % the :'s serve as breakpoints - {\bgroup - \naturalsetupvariablepart - \long\def\command [##1]% - {\immediate\write\scratchwrite{com:##1:}}% - \long\def\type [##1]% - {\immediate\write\scratchwrite{typ:##1:}}% - \long\def\value [##1]##2[##3]% - {\immediate\write\scratchwrite{val:##1:##3:}}% - \long\def\variable [##1]##2[##3]##4[##5]% - {\convertsetupdata{##5}\ascii - \edef\temp{\getinterfaceconstant{##1}}% - \immediate\write\scratchwrite{var:\temp:##3:\ascii:}}% - \long\def\inheritvalues [##1]##2[##3]% - {\immediate\write\scratchwrite{ivl:##1:##3:}}% - \long\def\inheritvariables[##1]##2[##3]% - {\convertsetupdata{##3}\ascii - \immediate\write\scratchwrite{ivr:##1:\ascii:}}% - \immediate\write\scratchwrite{startsetup}% - #1% - \immediate\write\scratchwrite{stopsetup}% - \immediate\write\scratchwrite{}% - \egroup} - -\let\stopsetup\relax - -\def\convertsetupdata#1#2% only accept #1=\v!whatever - {\doifsystemconstantelse{#1}{\edef#2{#1}}{\let#2\empty}} - -\input setupb - -\protect - -\end diff --git a/tex/context/base/setupe.tex b/tex/context/base/setupe.tex deleted file mode 100644 index c288171c8..000000000 --- a/tex/context/base/setupe.tex +++ /dev/null @@ -1,324 +0,0 @@ -%D \module -%D [ file=setupe, -%D version=2001.10.24, -%D title=\CONTEXT\ Setup to XML -%D subtitle=Help Generation, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -\let\wait\relax - -\input setupa - -\unprotect - -\def\SETUPnamespace{xmlns:cd="http://www.pragma-ade.com/commands"} - -\def\c!command! {cd:command} -\def\c!dimension! {cd:dimension} -\def\c!filename! {cd:file} -\def\c!identifier! {cd:name} -\def\c!character! {cd:character} -\def\c!marker! {cd:mark} -\def\c!number! {cd:number} -\def\c!reference! {cd:reference} -\def\c!plural! {cd:plural} -\def\c!singular! {cd:singular} -\def\c!text! {cd:text} -\def\c!formula! {cd:formula} -\def\c!font! {cd:file} -\def\c!matrix! {cd:matrix} -\def\c!list! {cd:list} -\def\c!section! {cd:section} -\def\c!sectionnumber! {cd:sectionnumber} -\def\c!noargument! {cd:noargument} -\def\c!oneargument! {cd:oneargument} -\def\c!twoarguments! {cd:twoarguments} -\def\c!threearguments! {cd:threearguments} - -\def\subsetup#1{*#1} % ? - -\beginTEX - -\def\getinterfaceconstant#1% - {\ifinterfacetranslation - \ifx\csname\x!prefix!#1\endcsname\relax - #1\else\csname\x!prefix!#1\endcsname - \fi - \else - #1% - \fi} - -\def\getinterfacevariable#1% - {\ifinterfacetranslation - \ifx\csname\y!prefix!#1\endcsname\relax - #1\else\csname\y!prefix!#1\endcsname - \fi - \else - #1% - \fi} - -\endTEX - -\beginETEX \ifcsname - -\def\getinterfaceconstant#1% - {\ifinterfacetranslation - \ifcsname\x!prefix!#1\endcsname - \csname\x!prefix!#1\endcsname\else#1% - \fi - \else - #1% - \fi} - -\def\getinterfacevariable#1% - {\ifinterfacetranslation - \ifcsname\y!prefix!#1\endcsname - \csname\y!prefix!#1\endcsname\else#1% - \fi - \else - #1% - \fi} - -\endETEX - -\let\typespec\empty - -\long\def\dovalvar#1% - {\increment\currentwhatever - \scratchcounter=0 - \dostring{\space\space\space\space}{}{#1\typespec} - \let\typespec\empty - \currentsetup - \let\typespec\empty - \dostring{\space\space\space\space}{/}{#1}} - -\long\def\doanother#1% - {\dostring{\space\space\space\space}{}{#1\typespec/} - \let\typespec\empty} - -\long\def\addtypespec#1#2% - {\edef\typespec{\typespec\space#1="#2"}} - -\def\c!opt! {\addtypespec{optional}{yes}} -\def\c!optint! {\addtypespec{interactive}{yes}} -\def\c!alwint! {\addtypespec{interactive}{exclusive}} - -\def\c!val! {\dovalvar{keywords}} -\def\c!var! {\dovalvar{assignments}} - -\def\c!vals! {\addtypespec{list}{yes}\dovalvar{keywords}} -\def\c!vars! {\addtypespec{list}{yes}\dovalvar{assignments}} - -\def\c!arg! {\doanother{content}} -\def\c!cmd! {\doanother{csname}} -\def\c!dest! {\doanother{reference}} -\def\c!dis! {\doanother{displaymath}} -\def\c!fil! {\doanother{file}} -\def\c!idx! {\doanother{index}} -\def\c!mat! {\doanother{math}} -\def\c!nop! {\doanother{nothing}} -\def\c!pos! {\doanother{position}} -\def\c!ref! {\doanother{reference}} -\def\c!trip! {\doanother{triplet}} -\def\c!wrd! {\doanother{word}} - -\def\c!args! {\addtypespec{list}{yes}\c!arg!} -\def\c!dests! {\addtypespec{list}{yes}\c!dest!} -\def\c!idxs! {\addtypespec{list}{yes}\c!idx!} -\def\c!poss! {\addtypespec{list}{yes}\c!pos!} -\def\c!refs! {\addtypespec{list}{yes}\c!ref!} -\def\c!wrds! {\addtypespec{list}{yes}\c!wrd!} -\def\c!trips! {\addtypespec{list}{yes}\c!trip!} - -\def\c!par! {\addtypespec{delimiter}{par}} % \par -\def\c!sep! {\addtypespec{separator}{backslash}} % \\ -\def\c!stp! {} - -\def\c!repeat! {} -\def\c!tex! #1{\addtypespec{command}{#1}\doanother{tex}} -\def\c!or! #1#2{\doline{\space\space\space\space}% - #1#2% - \doline{\space\space\space\space}} - -% wrapper - -\def\startsetupfile - {\immediate\openout\scratchwrite=cont-\currentlanguage.xml - \doline{\string} - \doline{} - \dostring{}{}{interface \SETUPnamespace\space name="context" language="\currentlanguage" version="\contextversion"}} - -\def\stopsetupfile - {\doline{} - \dostring{}{/}{interface} - \immediate\closeout\scratchwrite} - -\let\documenteduntilhere\relax - -\bgroup \catcode`\<=\@@other - -\unexpanded\gdef\dostring#1#2#3% - {\immediate\write\scratchwrite{#1<#2cd:#3>}} % todo - -\gdef\doline#1% - {\immediate\write\scratchwrite{#1}} - -\egroup - -\def\doval#1#2#3% - {\doifelse{#1}{#3} - {\def\valattr{ default="yes"}} - {\let\valattr\empty}% - \doifdefinedelse{c!#3!} - {\dostring{#2}{}{variable type="cd:#3"\valattr/}} - {\dostring{#2}{}{constant type="#3"\valattr/}}} - -\long\def\docommand[#1]% - {\def\currentname{#1}} - -\long\def\dotype[#1]% - {\def\currenttype{#1}} - -\long\def\dovalue[#1]#2[#3]% - {\advance\scratchcounter 1 - \ifnum\scratchcounter=\currentwhatever\relax - \processcommalist[#1]{\doval{#3}{\space\space\space\space\space\space}} - \fi} - -\newif\ifinvariables - -\long\def\dovariable[#1]#2[#3]#4[#5]% comes as sequence - {\ifinvariables\else\advance\scratchcounter 1 \fi - \ifnum\scratchcounter=\currentwhatever\relax - \invariablestrue - \dostring{\space\space\space\space\space\space}{}% - {parameter name="\getinterfaceconstant{#1}"} - \processcommalist[#3] - {\doval{}{\space\space\space\space\space\space\space\space}} - \dostring{\space\space\space\space\space\space}{/}{parameter} - \fi} - -\long\def\doinheritvalues[#1]#2[#3]% - {\advance\scratchcounter 1 - \ifnum\scratchcounter=\currentwhatever\relax - \dostring{\space\space\space\space\space\space}{}{inherit name="#1"/} - \fi} - -\long\def\doinheritvariables[#1]#2[#3]% - {\ifinvariables\else \advance\scratchcounter 1 \fi - \ifnum\scratchcounter=\currentwhatever\relax - \dostring{\space\space\space\space\space\space}{}{inherit name="#1"/} - \fi} - -\long\def\nocommand [#1]{} -\long\def\notype [#1]{} -\long\def\novalue [#1]#2[#3]{} -\long\def\novariable [#1]#2[#3]#4[#5]{} -\long\def\noinheritvalues [#1]#2[#3]{} -\long\def\noinheritvariables[#1]#2[#3]{} - -\bgroup \catcode`\<=\active - -\gdef\cleanupcurrentname{\def<<##1>>{##1}} - -\gdef\findvariablename#1% - {\bgroup - \def<<##1>>{\gdef\varname{##1}}% - \global\let\varname\empty - \setbox\scratchbox=\hbox{#1}% - \egroup} - -\gdef\splitcurrentname{\@EA\dosplitcurrentname\currentname<<>><<>>\end} - -\gdef\dosplitcurrentname#1<<#2>>#3<<>>#4\end - {\def\prename{#1}\def\midname{#2}\def\posname{#3}} - -\egroup - -\newif\ifsetupisenvironment - -\long\def\startsetup#1\stopsetup - {\bgroup - \doline{} - % zero pass - \long\def\currentsetup{#1} - % first pass - \let\command \docommand - \let\type \dotype - \let\value \novalue - \let\variable \novariable - \let\inheritvalues \noinheritvalues - \let\inheritvariables\noinheritvariables - \currentsetup - % second pass - \convertargument\c!stp!\to\asciia - \convertcommand\currenttype\to\asciib - \let\envattr\empty - \let\prename\empty - \let\midname\empty - \let\posname\empty - \ExpandBothAfter\doifinstringelse{\asciia}{\asciib} - {\expandafter\aftersplitstring\currentname\at start\to\currentname - \def\envattr{ type="environment"}} - {} % \def\envattr{ type="standalone"}} - \convertargument<<\to\asciic - \convertcommand\currentname\to\asciid - \findvariablename\currentname - \ExpandBothAfter\doifinstringelse{\asciic}{\asciid} - {\edef\envattr{\envattr\space generated="yes"}} - {} % \edef\envattr{\envattr\space generated="no"}} - \splitcurrentname - \cleanupcurrentname - % \ifx\envattr\empty - % \message{\letterbackslash\currentname} - % \else - % \message{\letterbackslash\e!start\currentname} - % \fi -\doifinsetelse{\currentname}{remark,menubutton,marking*figure,referring*figure}{% - \doline{}% -}{% - \dostring{}{}{command name="\currentname"\envattr} - \def\next##1% - {\ifx##1\empty - % skip - \else\ifx##1\varname - \dostring{\space\space\space\space}{}{variable value="##1"/} - \else - \dostring{\space\space\space\space}{}{string value="##1"/} - \fi\fi} - \dostring{\space\space}{}{sequence} - \next\prename - \next\midname - \next\posname - \dostring{\space\space}{/}{sequence} - \ifx\currenttype\empty \else \ifx\asciia\asciib \else - \dostring{\space\space}{}{arguments} - \let\command \nocommand - \let\type \notype - \let\value \dovalue - \let\variable \dovariable - \let\inheritvalues \doinheritvalues - \let\inheritvariables\doinheritvariables - \newcounter\currentwhatever \currenttype - \dostring{\space\space}{/}{arguments} - \fi \fi - \dostring{}{/}{command} -}% - \egroup} - -\let\stopsetup\relax - -\def\convertsetupdata#1#2% only accept #1=\v!whatever - {\doifsystemconstantelse{#1}{\edef#2{#1}}{\let#2\empty}} - -{\catcode`\<=\active \input setupb } - -\protect - -\end diff --git a/tex/context/base/spec-fdf.tex b/tex/context/base/spec-fdf.tex index 7d5a73b4d..07551aa78 100644 --- a/tex/context/base/spec-fdf.tex +++ b/tex/context/base/spec-fdf.tex @@ -42,6 +42,11 @@ \def\PDFobjref#1{\purenumber{#1} 0 R} +%D \macros +%D {PDFswapdir} + +\let\PDFswapdir\empty \def\PDFswapdir{\ifcase\inlinedirection\or\or-\fi} + %D \macros %D {setPDFdestination} %D @@ -624,7 +629,7 @@ \else \getsecondaryPDFreferences \doPDFaction - width #1 height #2 + width \PDFswapdir#1 height #2 action {\action \secondaryPDFreferences}% \fi \fi @@ -680,7 +685,7 @@ \else \getsecondaryPDFreferences \doPDFaction - width #1 height #2 + width \PDFswapdir#1 height #2 action {\action \secondaryPDFreferences}% \fi \fi @@ -713,7 +718,7 @@ \else \getsecondaryPDFreferences \doPDFaction - width #1 height #2 + width \PDFswapdir#1 height #2 action {\action \secondaryPDFreferences}% \fi \egroup} @@ -817,8 +822,8 @@ % \globalletempty\PDFobjectname % \fi % \next -\doPDFaction - width #1 height #2 + \doPDFaction + width \PDFswapdir#1 height #2 action {\action \secondaryPDFreferences}% \fi \egroup}} @@ -843,7 +848,7 @@ \else \getsecondaryPDFreferences \doPDFaction - width #1 height #2 + width \PDFswapdir#1 height #2 action {\action \secondaryPDFreferences}% \fi \egroup} @@ -866,7 +871,7 @@ \else \getsecondaryPDFreferences \doPDFaction - width #1 height #2 + width \PDFswapdir#1 height #2 action {\action \secondaryPDFreferences}% \fi}% \egroup} @@ -2078,7 +2083,8 @@ %\expanded{\setFDFkids[][\FDFkidlist]}% \setFDFactions[#5]% \doPDFdictionaryobject class FDF name #1 data - {/Subtype /Widget /FT /Btn /T (#1) /Rect [0 0 0 0] + {%/Subtype /Widget + /FT /Btn /T (#1) /Rect [0 0 0 0] % used to be this % /V (#2) % then this @@ -2804,9 +2810,17 @@ {\doPDFregistersomeindexcolor{#1}{#2}{#3}{#4}{Gray}{0.0 1.0}% {pop}} -\def\doPDFregisterfigurecolor#1% +% \def\doPDFregisterfigurecolor#1% +% {\dogetobjectreference +% {PDF\ifcase\internalspotcolorsize{#1} CS\or CS\else IX\fi} +% {\internalspotcolorname{#1}} +% \PDFimagecolorreference} + +\let\checkpredefinedcolor\predefineindexcolor % we need an index in order to negate bitmaps + +\def\doPDFregisterfigurecolor#1% always an index color {\dogetobjectreference - {PDF\ifcase\internalspotcolorsize{#1} CS\or CS\else IX\fi} + {PDFIX} {\internalspotcolorname{#1}} \PDFimagecolorreference} diff --git a/tex/context/base/spec-tpd.tex b/tex/context/base/spec-tpd.tex index e6ea95fbd..184c9f94f 100644 --- a/tex/context/base/spec-tpd.tex +++ b/tex/context/base/spec-tpd.tex @@ -611,6 +611,38 @@ %D New and very experimental. +% \def\doPDFregistersomeindexcolor#1#2#3#4#5#6#7% name fractions names p's space domain function +% {\bgroup +% \let\spotpops\empty +% \dorecurse{#2}{\edef\spotpops{\spotpops exch pop\space}}% +% \let\PDFspotcolornames \empty +% \let\PDFspotcolordomain\empty +% \def\docommand##1% +% {\edef\PDFspotcolornames{\PDFspotcolornames/\executeifdefined{@@pdf@@scn@@##1}{##1}\space}% +% \edef\PDFspotcolordomain{\PDFspotcolordomain 0.0 1.0\space}}% +% \processcommacommand[#3,None]\docommand +% \let\PDFcolorindexvector\empty +% \def\docommand##1% +% {\scratchdimen##1\points +% \scratchdimen\recurselevel\scratchdimen +% \scratchcounter\scratchdimen +% \divide\scratchcounter \maxcard +% \edef\PDFcolorindexvector{\PDFcolorindexvector\uchexnumbers\scratchcounter}}% +% \dostepwiserecurse\zerocount{255}\plusone +% {\rawprocesscommacommand[#4,1]\docommand +% \xdef\PDFcolorindexvector{\PDFcolorindexvector\space}}% +% \immediate \pdfobj stream attr +% {/FunctionType 4 /Domain [\PDFspotcolordomain] /Range [#6]}{{\spotpops#7}}% +% \immediate \pdfobj +% {[/Indexed +% [/DeviceN [\PDFspotcolornames] /Device#5 \PDFobjref\pdflastobj] % +% 255 <\PDFcolorindexvector>]}% +% \dosetobjectreference{PDFIX}{#1}{\the\pdflastobj}% +% \appendtoPDFdocumentcolorspaces{/#1_INDEXED \PDFobjref\pdflastobj}% +% \egroup} + +% we reverse the index; an alternative is to negate the graphic itself (\start/stop negative) + \def\doPDFregistersomeindexcolor#1#2#3#4#5#6#7% name fractions names p's space domain function {\bgroup \let\spotpops\empty @@ -618,7 +650,8 @@ \let\PDFspotcolornames \empty \let\PDFspotcolordomain\empty \def\docommand##1% - {\edef\PDFspotcolornames{\PDFspotcolornames/\executeifdefined{@@pdf@@scn@@##1}{##1}\space}% + {%\edef\PDFspotcolornames {\PDFspotcolornames/##1\space}% + \edef\PDFspotcolornames{\PDFspotcolornames/\executeifdefined{@@pdf@@scn@@##1}{##1}\space}% \edef\PDFspotcolordomain{\PDFspotcolordomain 0.0 1.0\space}}% \processcommacommand[#3,None]\docommand \let\PDFcolorindexvector\empty @@ -628,17 +661,18 @@ \scratchcounter\scratchdimen \divide\scratchcounter \maxcard \edef\PDFcolorindexvector{\PDFcolorindexvector\uchexnumbers\scratchcounter}}% - \dostepwiserecurse\zerocount{255}\plusone + %\dostepwiserecurse\zerocount{255}\plusone + \dostepwiserecurse{255}\zerocount\minusone % we need to negate {\rawprocesscommacommand[#4,1]\docommand \xdef\PDFcolorindexvector{\PDFcolorindexvector\space}}% \immediate \pdfobj stream attr {/FunctionType 4 /Domain [\PDFspotcolordomain] /Range [#6]}{{\spotpops#7}}% \immediate \pdfobj {[/Indexed - [/DeviceN [\PDFspotcolornames] /Device#5 \PDFobjref\pdflastobj] % + [/DeviceN [\PDFspotcolornames] /Device#5 \the\pdflastobj\space0 R] % 255 <\PDFcolorindexvector>]}% \dosetobjectreference{PDFIX}{#1}{\the\pdflastobj}% - \appendtoPDFdocumentcolorspaces{/#1_INDEXED \PDFobjref\pdflastobj}% + \appendtoPDFdocumentcolorspaces{/#1_INDEXED \the\pdflastobj\space0 R}% \egroup} %D \macros diff --git a/tex/context/base/supp-box.tex b/tex/context/base/supp-box.tex index 3d9c9414f..af2e2f132 100644 --- a/tex/context/base/supp-box.tex +++ b/tex/context/base/supp-box.tex @@ -322,7 +322,7 @@ %D have them here so that users can see them. %D %D \macros -%D {getnoflines, getrawnoflines} +%D {getnoflines, getroundednoflines, getrawnoflines} %D %D Het commando \type{\getnoflines} converteert een hoogte %D (dimensie) in een aantal regels en kent dit toe aan @@ -336,23 +336,100 @@ %D van~0pt komt overeen met 0~regels. The raw alternative %D does not round. +%D For a long time we had: +%D +%D \starttyping +%D \newcount\noflines +%D \newdimen\noflinesheight +%D +%D \def\dogetnoflines#1#2% +%D {\noflinesheight#2\relax +%D \ifzeropt\noflinesheight % \ifdim\noflinesheight=\zeropoint +%D \noflines\zerocount +%D \else +%D \divide\noflinesheight \openlineheight +%D \noflines\noflinesheight +%D #1\ifdim\noflines\openlineheight=#2\relax \else +%D \advance\noflines\ifdim#2>\zeropoint\plusone\else\minusone\fi +%D \fi\fi +%D \fi} +%D +%D \def\getnoflines {\dogetnoflines\iftrue } % compensated +%D \def\getrawnoflines{\dogetnoflines\iffalse} % no compensation +%D \stoptyping +%D +%D A more recent variant is: + +\ifx\roundingeps\undefined \newdimen\roundingeps \roundingeps=10sp \fi + \newcount\noflines \newdimen\noflinesheight -\def\dogetnoflines#1#2% +\def\getnoflines {\xdogetnoflines\plusone } % compensated +\def\getroundednoflines{\xdogetnoflines\plustwo } % rounded +\def\getrawnoflines {\xdogetnoflines\plusthree} % truncated + +\def\xdogetnoflines#1#2% {\noflinesheight#2\relax - \ifzeropt\noflinesheight % \ifdim\noflinesheight=\zeropoint + \ifzeropt\noflinesheight \noflines\zerocount + \else\ifdim#2>\zeropoint + \ifcase#1\or + \advance\noflinesheight-\roundingeps + \divide\noflinesheight\openlineheight + \noflines\noflinesheight + \advance\noflines\plusone + \or + \advance\noflinesheight\roundingeps + \divide\noflinesheight\openlineheight + \noflines\noflinesheight + \or + \advance\noflinesheight\roundingeps + \advance\noflinesheight.5\openlineheight + \divide\noflinesheight\openlineheight + \noflines\noflinesheight + \fi \else - \divide\noflinesheight \openlineheight - \noflines\noflinesheight - #1\ifdim\noflines\openlineheight=#2\relax \else - \advance\noflines\ifdim#2>\zeropoint\plusone\else\minusone\fi - \fi\fi - \fi} + \ifcase#1\or + \advance\noflinesheight\roundingeps + \divide\noflinesheight\openlineheight + \noflines\noflinesheight + \advance\noflines\minusone + \or + \advance\noflinesheight-\roundingeps + \divide\noflinesheight\openlineheight + \noflines\noflinesheight + \or + \advance\noflinesheight-\roundingeps + \advance\noflinesheight-.5\openlineheight + \divide\noflinesheight\openlineheight + \noflines\noflinesheight + \fi + \fi\fi} -\def\getnoflines {\dogetnoflines\iftrue } % compensated -\def\getrawnoflines{\dogetnoflines\iffalse} % no compensation +%D Let's proof that it works: +%D +%D \startbuffer +%D \scratchdimen\dimexpr(3pt) \getnoflines\scratchdimen 1=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10\lineheight) \getnoflines\scratchdimen 10=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10.1\lineheight) \getnoflines\scratchdimen 11=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10.5\lineheight) \getnoflines\scratchdimen 11=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10.9\lineheight) \getnoflines\scratchdimen 11=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10\lineheight+3pt) \getnoflines\scratchdimen 11=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10\lineheight+3sp) \getnoflines\scratchdimen 10=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10\lineheight-3sp) \getnoflines\scratchdimen 10=\the\noflines \endgraf +%D +%D \scratchdimen\dimexpr(3pt) \getrawnoflines\scratchdimen 0=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10\lineheight) \getrawnoflines\scratchdimen 10=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10.1\lineheight) \getrawnoflines\scratchdimen 10=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10.5\lineheight) \getrawnoflines\scratchdimen 11=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10.9\lineheight) \getrawnoflines\scratchdimen 11=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10\lineheight+3pt) \getrawnoflines\scratchdimen 10=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10\lineheight+3sp) \getrawnoflines\scratchdimen 10=\the\noflines \endgraf +%D \scratchdimen\dimexpr(10\lineheight-3sp) \getrawnoflines\scratchdimen 10=\the\noflines \endgraf +%D \stopbuffer +%D +%D \typebuffer \getbuffer %D \macros %D {determinenoflines} diff --git a/tex/context/base/supp-dir.tex b/tex/context/base/supp-dir.tex index fa4bfa6f7..9e19d3904 100644 --- a/tex/context/base/supp-dir.tex +++ b/tex/context/base/supp-dir.tex @@ -30,7 +30,8 @@ \def\pardir#1#2#3% messages end up in a higher level command {\global\TeXXeTstate\plusone \if#2L\chardef\inlinedirection\plusone\else - \if#2R\chardef\inlinedirection\plustwo\fi\fi} + \if#2R\chardef\inlinedirection\plustwo\fi\fi + \checkinlinedirection} % needed / added %\appendtoks \checkinlinedirection \to \everypar % see core-ini.tex diff --git a/tex/context/base/supp-fil.tex b/tex/context/base/supp-fil.tex index 9d54663af..37910dc4f 100644 --- a/tex/context/base/supp-fil.tex +++ b/tex/context/base/supp-fil.tex @@ -287,22 +287,6 @@ \def\maxreadlevel{3} -% \def\doreadfile#1#2#3#4% -% {\sanitizefilename#2\to\readfilename -% \checkfilename\readfilename -% \ifcase\kindoffile -% \iftracefiles\writestatus\m!systems{searching for \readfilename\space on #1}\fi -% % not a full path or url, check for existence -% \doifelsenothing{#1} -% {\def\next{\redoreadfile\readfilename{#3}{#4}}}% -% {\def\next{\redoreadfile{\pathplusfile{#1}{\readfilename}}{#3}{#4}}}% -% \else -% % a full path or url, no further checking done -% \iftracefiles\writestatus\m!systems{assuming present \readfilename}\fi -% \def\next{#3\dodoreadfile}% -% \fi -% \next} - \newconditional\trackfilenames % We need to postpone loading, else we got frozen type-* files and so when @@ -613,10 +597,45 @@ \catcode`\}=\@@endgroup \catcode`\%=\@@comment} -\def\stopreadingfile% +\def\stopreadingfile {\getvalue{\string\readingfilelevel::\readingfilelevel}% \doglobal\decrement\readingfilelevel} +%D \macros +%D {splitfilename} +%D +%D I should have made this one sooner. This macro was first needed when +%D ran into graphic with a period in the pathpart. +%D +%D \startbuffer +%D \def\showfilesplit +%D {\bgroup \tttf +%D \hbox{(full: \splitofffull)}\space +%D \hbox{(path: \splitoffpath)}\space +%D \hbox{(base: \splitoffbase)}\space +%D \hbox{(name: \splitoffname)}\space +%D \hbox{(type: \splitofftype)}\space +%D \egroup} +%D +%D \splitfilename{c:/aa/bb/cc/dd.ee.ff} \showfilesplit \endgraf +%D \splitfilename{c:/aa/bb/cc/dd.ee} \showfilesplit \endgraf +%D \splitfilename{c:/aa/bb/cc/dd} \showfilesplit \endgraf +%D +%D \splitfilename{dd.ee.ff} \showfilesplit \endgraf +%D \splitfilename{dd.ee} \showfilesplit \endgraf +%D \splitfilename{dd} \showfilesplit \endgraf +%D \stopbuffer +%D +%D \start \typebuffer \getbuffer \stop + +\def\splitfilename#1% + {\edef\splitofffull{#1}% normally outside this call: \sanitizefilename#1\to\sanitizedfilename + \greedysplitstring\splitofffull\at/\to\splitoffpath\and\splitoffbase + \ifx\splitoffbase\empty\let\splitoffbase\splitofffull\fi + \greedysplitstring\splitoffbase\at.\to\splitoffname\and\splitofftype + \ifx\splitoffpath\empty\def\splitoffpath{.}\fi + \ifx\splitoffname\empty\let\splitoffname\splitoffbase\fi} + %% % gebruikt voor normale (!) files, will change to proper %% % installer maybe combined with verb module push/popper %% diff --git a/tex/context/base/symb-nav.tex b/tex/context/base/symb-nav.tex index 109b29535..bc88f51f5 100644 --- a/tex/context/base/symb-nav.tex +++ b/tex/context/base/symb-nav.tex @@ -24,9 +24,9 @@ \startsymbolset [navigation 1] \definesymbol [\v!previouspage] [\ContextNavigationGlyph{1}] - \definesymbol [\v!nextpage] [\ContextNavigationGlyph{2}] - \definesymbol [\v!firstpage] [\ContextNavigationGlyph{3}] - \definesymbol [\v!lastpage] [\ContextNavigationGlyph{4}] + \definesymbol [\v!nextpage] [\ContextNavigationGlyph{2}] + \definesymbol [\v!firstpage] [\ContextNavigationGlyph{3}] + \definesymbol [\v!lastpage] [\ContextNavigationGlyph{4}] \definesymbol [\v!PreviousJump] [\ContextNavigationGlyph{5}] \definesymbol [\v!NextJump] [\ContextNavigationGlyph{6}] @@ -34,9 +34,9 @@ \definesymbol [\v!CloseDocument] [\ContextNavigationGlyph{7}] \definesymbol [\v!previoussubpage] [\ContextNavigationGlyph{1}] - \definesymbol [\v!nextsubpage] [\ContextNavigationGlyph{2}] - \definesymbol [\v!firstsubpage] [\ContextNavigationGlyph{3}] - \definesymbol [\v!lastsubpage] [\ContextNavigationGlyph{4}] + \definesymbol [\v!nextsubpage] [\ContextNavigationGlyph{2}] + \definesymbol [\v!firstsubpage] [\ContextNavigationGlyph{3}] + \definesymbol [\v!lastsubpage] [\ContextNavigationGlyph{4}] \definesymbol [\v!StartSound] [\ContextNavigationGlyph{2}] \definesymbol [\v!PauseSound] [\ContextNavigationGlyph{8}] @@ -56,9 +56,9 @@ \startsymbolset [navigation 2] \definesymbol [\v!previouspage] [\ContextNavigationGlyph{101}] - \definesymbol [\v!nextpage] [\ContextNavigationGlyph{102}] - \definesymbol [\v!firstpage] [\ContextNavigationGlyph{103}] - \definesymbol [\v!lastpage] [\ContextNavigationGlyph{104}] + \definesymbol [\v!nextpage] [\ContextNavigationGlyph{102}] + \definesymbol [\v!firstpage] [\ContextNavigationGlyph{103}] + \definesymbol [\v!lastpage] [\ContextNavigationGlyph{104}] \definesymbol [\v!PreviousJump] [\ContextNavigationGlyph{105}] \definesymbol [\v!NextJump] [\ContextNavigationGlyph{106}] @@ -66,9 +66,9 @@ \definesymbol [\v!CloseDocument] [\ContextNavigationGlyph{107}] \definesymbol [\v!previoussubpage] [\ContextNavigationGlyph{101}] - \definesymbol [\v!nextsubpage] [\ContextNavigationGlyph{102}] - \definesymbol [\v!firstsubpage] [\ContextNavigationGlyph{103}] - \definesymbol [\v!lastsubpage] [\ContextNavigationGlyph{104}] + \definesymbol [\v!nextsubpage] [\ContextNavigationGlyph{102}] + \definesymbol [\v!firstsubpage] [\ContextNavigationGlyph{103}] + \definesymbol [\v!lastsubpage] [\ContextNavigationGlyph{104}] \definesymbol [\v!StartSound] [\ContextNavigationGlyph{102}] \definesymbol [\v!PauseSound] [\ContextNavigationGlyph{108}] @@ -88,9 +88,9 @@ \startsymbolset [navigation 3] \definesymbol [\v!previouspage] [\ContextNavigationGlyph{201}] - \definesymbol [\v!nextpage] [\ContextNavigationGlyph{202}] - \definesymbol [\v!firstpage] [\ContextNavigationGlyph{203}] - \definesymbol [\v!lastpage] [\ContextNavigationGlyph{204}] + \definesymbol [\v!nextpage] [\ContextNavigationGlyph{202}] + \definesymbol [\v!firstpage] [\ContextNavigationGlyph{203}] + \definesymbol [\v!lastpage] [\ContextNavigationGlyph{204}] \definesymbol [\v!PreviousJump] [\ContextNavigationGlyph{205}] \definesymbol [\v!NextJump] [\ContextNavigationGlyph{206}] @@ -98,9 +98,9 @@ \definesymbol [\v!CloseDocument] [\ContextNavigationGlyph{207}] \definesymbol [\v!previoussubpage] [\ContextNavigationGlyph{201}] - \definesymbol [\v!nextsubpage] [\ContextNavigationGlyph{202}] - \definesymbol [\v!firstsubpage] [\ContextNavigationGlyph{203}] - \definesymbol [\v!lastsubpage] [\ContextNavigationGlyph{204}] + \definesymbol [\v!nextsubpage] [\ContextNavigationGlyph{202}] + \definesymbol [\v!firstsubpage] [\ContextNavigationGlyph{203}] + \definesymbol [\v!lastsubpage] [\ContextNavigationGlyph{204}] \definesymbol [\v!StartSound] [\ContextNavigationGlyph{202}] \definesymbol [\v!PauseSound] [\ContextNavigationGlyph{208}] diff --git a/tex/context/base/syst-ext.tex b/tex/context/base/syst-ext.tex index 4d64b914d..5bef964c5 100644 --- a/tex/context/base/syst-ext.tex +++ b/tex/context/base/syst-ext.tex @@ -872,13 +872,13 @@ \long\global\@EA\def\csname\@@arecurse\recursedepth\endcsname{#1}% \global\@EA\let\csname\@@irecurse\recursedepth\endcsname\recurselevel \let\endofloop\dodoloop - \dodoloop1} + \dodoloop\plusone} \beginETEX \numexpr \long\def\dodoloop#1% {\def\recurselevel{#1}% - \@EA\redoloop\@EA{\the\numexpr\recurselevel+1\relax}} + \@EA\redoloop\@EA{\the\numexpr\recurselevel+\plusone\relax}} \endETEX @@ -2422,19 +2422,55 @@ \@EA\dosplitstring#1@@@#2@@@\\} %D \macros -%D {splitstring} +%D {splitstring,greedysplitstring} %D %D A bonus macro. -%\def\splitstring#1\at#2\to#3\and#4% -% {\def\dosplitstring##1#2##2@@@##3\\% -% {\def#3{##1}\def#4{##2}}% -% \@EA\dosplitstring#1@@@#2@@@\\} - \def\splitstring#1\at#2\to#3\and#4% - {\def\dosplitstring##1#2##2#2##3\\% - {\def#3{##1}\def#4{##2}}% - \@EA\dosplitstring#1#2#2\\} + {\def\dosplitstring##1#2##2\empty\empty\empty##3\\% + {\def#3{##1}% + \def\dosplitstring{##3}% + \ifx\dosplitstring\empty + \let#4\empty + \else + \def#4{##2}% + \fi}% + \@EA\dosplitstring#1\empty\empty\empty#2\empty\empty\empty\\} + +\def\greedysplitstring#1\at#2\to#3\and#4% + {\edef\asciib{#1}% + \let\asciic\asciib + \let#3\empty + \let#4\empty + \doloop + {\expandafter\splitstring\asciib\at#2\to\asciia\and\asciib + \ifx\asciib\empty + \exitloop + \else + \edef#3{\ifx#3\empty\else#3#2\fi\asciia}% + \let#4\asciib + \fi}% + \ifx#3\empty\let#3\asciic\fi} + +% The next one is some 25\% faster, but it hardly matters because +% we seldom use this macro. +% +% \def\greedysplitstring#1\at#2\to#3\and#4% +% {\edef\asciib{#1}% +% \let\asciic\asciib +% \let#3\empty +% \let#4\empty +% \def\dogreedysplitstring +% {\expandafter\splitstring\asciib\at#2\to\asciia\and\asciib +% \ifx\asciib\empty +% \expandafter\dogreedysplitstring +% \else +% \edef#3{\ifx#3\empty\else#3#2\fi\asciia}% +% \let#4\asciib +% \fi}% +% \dogreedysplitstring +% \ifx#3\empty\let#3\asciic\fi} + %D \macros %D {beforetestandsplitstring, @@ -3802,18 +3838,33 @@ %D \stoptyping %D %D This command is used in for instance the language module -%D \type{lang-ini}. +%D \type{lang-ini}. The first version was: +%D +%D \starttyping +%D \def\dontleavehmode{\ifhmode\else\ifmmode\else$ $\fi\fi} +%D \stoptyping +%D +%D Next, Taco came with a better alternative (using mathsurround): +%D +%D \starttyping +%D \def\dontleavehmode +%D {\ifhmode\else \ifmmode\else +%D {\mathsurround\zeropoint\everymath\emptytoks$ $}% +%D \fi \fi} +%D \stoptyping +%D +%D And finaly we got the following alternative, one that avoids +%D interfering grouping at the cost of a box. -%\def\dontleavehmode{\ifhmode\else\ifmmode\else$ $\fi\fi} -% -% The (thanks to Taco) better alternative (mathsurround): +\newbox\@@dlhbox -\def\dontleavehmode +\unexpanded \def\dontleavehmode {\ifhmode\else \ifmmode\else - {\mathsurround\zeropoint\everymath\emptytoks$ $}% + \setbox\@@dlhbox\hbox{\mathsurround\zeropoint\everymath\emptytoks$ $}\unhbox\@@dlhbox \fi \fi} -%D And now your version of \TEX\ may provide: +%D But, if you run a recent version of \TEX, we can use the new +%D primitive: \ifx\quitvmode\undefined \else \let\dontleavehmode\quitvmode \fi diff --git a/tex/context/base/syst-gen.tex b/tex/context/base/syst-gen.tex index 17379afb7..9cc88ddad 100644 --- a/tex/context/base/syst-gen.tex +++ b/tex/context/base/syst-gen.tex @@ -397,7 +397,7 @@ \def\s!simple {simple} \def\s!stop {stop} %D \macros -%D {@EA,@EAEA,@EAEAEA,@EAEAEAEAEAEA,expanded} +%D {@EA,@EAEA,@EAEAEA,@EAEAEAEAEAEA,expanded,startexpanded} %D %D When in unprotected mode, to be entered with %D \type{\unprotect}, one can use \type{\@EA} as equivalent @@ -428,6 +428,12 @@ \long\def\expanded#1% {\long\xdef\@@expanded{\noexpand#1}\@@expanded} +%D Beware, the next one has no \type {\noexpand} before its +%D argument. + +\long\def\startexpanded#1\stopexpanded % see x-fo for example + {\long\xdef\@@expanded{#1}\@@expanded} + %D \macros %D {safeexpanded,everysafeexpanded} %D diff --git a/tex/context/base/syst-new.tex b/tex/context/base/syst-new.tex index 942f8e643..96943adcb 100644 --- a/tex/context/base/syst-new.tex +++ b/tex/context/base/syst-new.tex @@ -238,7 +238,7 @@ \def\globalgetrawparameters{\dogetparameters\dosetrawgvalue} % obsolete \def\splitskip#1% - {\scratchskip\zeropoint \!!plus 1pt \!!minus 1pt + {\scratchskip\zeropoint \!!plus \onepoint \!!minus \onepoint \advance\scratchskip#1\relax % \relax is realy needed here \expandafter\SPLITSKIP\the\scratchskip} @@ -256,8 +256,8 @@ \def\DOSPLITSKIP#1 #2 #3 {\dimen0=#1pt\dimen2=#2pt\dimen4=#3pt - \advance\dimen2 -1pt% - \advance\dimen4 -1pt} + \advance\dimen2 -\onepoint + \advance\dimen4 -\onepoint} % \def\minimaxskip#1#2% % {\splitskip#2\relax @@ -616,5 +616,125 @@ \def\appended#1#2#3{\@EA#1\@EA#2\@EA{#2#3}} \def\appendvalue #1{\@EA\appended\@EA \def\csname#1\endcsname} \def\appendgvalue#1{\@EA\appended\@EA\gdef\csname#1\endcsname} + +\def\prepended#1#2#3{\scratchtoks{#3}\@EA\@EA\@EA#1\@EA\@EA\@EA#2\@EA\@EA\@EA{\@EA\the\@EA\scratchtoks#2}} +\def\prependvalue #1{\@EA\prepended\@EA \def\csname#1\endcsname} +\def\prependgvalue#1{\@EA\prepended\@EA\gdef\csname#1\endcsname} + +%D \macros +%D {compresscommacommandnrs,compresscommalistnrs,compressedcommalistnrs, +%D compresscommacommand,compresscommalist,compressedcommalist, +%D reversecommacommand,reversecommalist,reversedcommalist} +%D +%D The following two list processing macros are needed by Taco's +%D bibliography module. The numbers compressor converts the +%D list in a list of ranges. The normal compressor remove duplicate +%D and empty entries. + +\def\compresscommalistnrs[#1]% + {\let\compressedlist\empty + \!!counta\maxdimen + \!!countb\maxdimen + \processcommalist[#1]\docompresslistnrs + \ifnum\!!counta=\maxdimen\else\dodocompresslistnrs\fi} + +\def\compresscommacommandnrs[#1]% + {\expanded{\compresscommalistnrs[#1]}} + +\def\docompresslistnrs#1% + {\edef\commalistelement{#1}% + \ifx\commalistelement\empty\else + \ifnum\!!counta=\maxdimen + \!!counta\commalistelement\relax + \!!countb\!!counta + \else + \advance\!!countb\plusone + \ifnum\commalistelement>\!!countb + \advance\!!countb\minusone + \dodocompresslistnrs + \!!counta\commalistelement\relax + \!!countb\!!counta + \fi + \fi + \fi} + +\def\dodocompresslistnrs + {\edef\compressedlist + {\ifx\compressedlist\empty\else\compressedlist,\fi + {\the\!!counta}{\ifnum\!!countb>\!!counta\the\!!countb\fi}}} + +%D \def\test#1{{\tttf#1->\compresscommalistnrs[#1]\convertcommand\compressedlist\to\ascii\ascii}} +%D \startlines +%D \test{} +%D \test{1} +%D \test{1,3} +%D \test{1,3,4} +%D \test{1,3,3,4,5} +%D \test{1,3,3,4,5,8} +%D \test{1,3,3,4,5,5,8,10} +%D \test{1,3,4,5,8,10,11} +%D \test{1,,3,,4,,5,,8,,10,,11,} +%D \stoplines + +\def\compresscommalist[#1]% + {\let\compressedlist\empty + \let\!!stringa\empty + \processcommalist[#1]\docompresslist} + +\def\compresscommacommand[#1]% + {\expanded{\compresscommalist[#1]}} + +\def\docompresslist#1% + {\edef\commalistelement{#1}% + \ifx\commalistelement\empty \else + \ifx\!!stringa\commalistelement \else + \ifx\compressedlist\empty + \def\compressedlist{#1}% + \else + \appended\def\compressedlist{,#1}% + \fi + \let\!!stringa\commalistelement + \fi + \fi} + +%D \def\test#1{{\tttf#1->\compresscommalist[#1]\convertcommand\compressedlist\to\ascii\ascii}} +%D \startlines +%D \test{} +%D \test{1} +%D \test{1,3} +%D \test{1,3,4} +%D \test{1,3,3,4,5} +%D \test{1,3,3,4,5,8} +%D \test{1,3,3,4,5,5,8,10} +%D \test{1,3,4,5,8,10,11} +%D \test{1,,3,,4,,5,,8,,10,,11,} +%D \stoplines + +\def\reversecommalist[#1]% + {\let\reversedlist\empty + \processcommalist[#1]\doreverselist} + +\def\doreverselist#1% + {\ifx\reversedlist\empty + \def\reversedlist{#1}% + \else + \prepended\def\reversedlist{#1,}% + \fi} + +\def\reversecommacommand[#1]% + {\expanded{\reversecommalist[#1]}} + +%D \def\test#1{{\tttf#1->\reversecommalist[#1]\convertcommand\reversedlist\to\ascii\ascii}} +%D \startlines +%D \test{} +%D \test{1} +%D \test{1,3} +%D \test{1,3,4} +%D \test{1,3,3,4,5} +%D \test{1,3,3,4,5,8} +%D \test{1,3,3,4,5,5,8,10} +%D \test{1,3,4,5,8,10,11} +%D \test{1,,3,,4,,5,,8,,10,,11,} +%D \stoplines \protect \endinput diff --git a/tex/context/base/type-enc.tex b/tex/context/base/type-enc.tex index 3a6c6a32f..60c1e63a0 100644 --- a/tex/context/base/type-enc.tex +++ b/tex/context/base/type-enc.tex @@ -823,7 +823,7 @@ \definefontsynonym [ComputerModernMono-Variable] [cmvtt10] \stoptypescript -\starttypescript [math] [computer-modern] [default] +\starttypescript [math] [computer-modern,latin-modern] [default] % watch the space, it prevents remapping \definefontsynonym [ComputerModernMath-Roman] [cmr10 ] \definefontsynonym [ComputerModernMath-Extension] [cmex10] @@ -831,6 +831,14 @@ \definefontsynonym [ComputerModernMath-Symbol] [cmsy10] \stoptypescript +\starttypescript [boldmath,bfmath] [computer-modern,latin-modern] [default] + % watch the space, it prevents remapping + \definefontsynonym [ComputerModernMath-Roman-Bold] [cmb10 ] + \definefontsynonym [ComputerModernMath-Extension] [cmex10] + \definefontsynonym [ComputerModernMath-Italic-Bold] [cmmib10] + \definefontsynonym [ComputerModernMath-Symbol-Bold] [cmbsy10] +\stoptypescript + % Computer Concrete (AMS) \starttypescript [serif] [concrete] [default] @@ -1006,10 +1014,121 @@ % Antykwa Torunska (GUST) -\starttypescript [serif] [antykwa-torunska] [texnansi,ec,8r] - \definefontsynonym [AntykwaTorunska-Regular] [\typefaceencoding-anttr] [encoding=\typefaceencoding] - \definefontsynonym [AntykwaTorunska-Bold] [\typefaceencoding-anttb] [encoding=\typefaceencoding] - \definefontsynonym [AntykwaTorunska-Italic] [\typefaceencoding-anttri] [encoding=\typefaceencoding] +% \starttypescript [serif] [antykwa-torunska] [texnansi,ec,8r] +% \definefontsynonym [AntykwaTorunska-Regular] [\typefaceencoding-anttr] [encoding=\typefaceencoding] +% \definefontsynonym [AntykwaTorunska-Bold] [\typefaceencoding-anttb] [encoding=\typefaceencoding] +% \definefontsynonym [AntykwaTorunska-Italic] [\typefaceencoding-anttri] [encoding=\typefaceencoding] +% \stoptypescript + +\starttypescript [serif] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [texnansi,t2a,t2b,t2c,qx] + \definefontsynonym [AntykwaTorunska-Bold] [\typescriptthree-anttb] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-BoldItalic] [\typescriptthree-anttbi] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-Light] [\typescriptthree-anttl] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-LightItalic] [\typescriptthree-anttli] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-Medium] [\typescriptthree-anttm] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-MedItalic] [\typescriptthree-anttmi] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-Regular] [\typescriptthree-anttr] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-Italic] [\typescriptthree-anttri] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondBold] [\typescriptthree-anttcb] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondBoldItalic] [\typescriptthree-anttcbi] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondLight] [\typescriptthree-anttcl] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondLightItalic][\typescriptthree-anttcli] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondMedium] [\typescriptthree-anttcm] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondMedItalic] [\typescriptthree-anttcmi] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondRegular] [\typescriptthree-anttcr] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondItalic] [\typescriptthree-anttcri] [encoding=\typescriptthree] +\stoptypescript + +\starttypescript [serif] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [texnansi,qx] + \definefontsynonym [AntykwaTorunska-BoldCap] [\typescriptthree-anttbcap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-BoldItalicCap] [\typescriptthree-anttbicap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-LightCap] [\typescriptthree-anttlcap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-LightItalicCap] [\typescriptthree-anttlicap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-MedCap] [\typescriptthree-anttmcap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-MedItalicCap] [\typescriptthree-anttmicap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-Cap] [\typescriptthree-anttrcap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-ItalicCap] [\typescriptthree-anttricap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondBoldCap] [\typescriptthree-anttcbcap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondBoldItalicCap] [\typescriptthree-anttcbicap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondLightCap] [\typescriptthree-anttclcap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondLightItalicCap][\typescriptthree-anttclicap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondMedCap] [\typescriptthree-anttcmcap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondMedItalicCap] [\typescriptthree-anttcmicap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondCap] [\typescriptthree-anttcrcap] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondItalicCap] [\typescriptthree-anttcricap] [encoding=\typescriptthree] +\stoptypescript + +\starttypescript [serif] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [ec] + \definefontsynonym [AntykwaTorunska-Bold] [cork-anttb] [encoding=ec] + \definefontsynonym [AntykwaTorunska-BoldItalic] [cork-anttbi] [encoding=ec] + \definefontsynonym [AntykwaTorunska-Light] [cork-anttl] [encoding=ec] + \definefontsynonym [AntykwaTorunska-LightItalic] [cork-anttli] [encoding=ec] + \definefontsynonym [AntykwaTorunska-Medium] [cork-anttm] [encoding=ec] + \definefontsynonym [AntykwaTorunska-MedItalic] [cork-anttmi] [encoding=ec] + \definefontsynonym [AntykwaTorunska-Regular] [cork-anttr] [encoding=ec] + \definefontsynonym [AntykwaTorunska-Italic] [cork-anttri] [encoding=ec] + \definefontsynonym [AntykwaTorunska-BoldCap] [cork-anttbcap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-BoldItalicCap] [cork-anttbicap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-LightCap] [cork-anttlcap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-LightItalicCap] [cork-anttlicap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-MedCap] [cork-anttmcap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-MedItalicCap] [cork-anttmicap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-Cap] [cork-anttrcap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-ItalicCap] [cork-anttricap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondBold] [cork-anttcb] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondBoldItalic] [cork-anttcbi] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondLight] [cork-anttcl] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondLightItalic] [cork-anttcli] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondMedium] [cork-anttcm] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondMedItalic] [cork-anttcmi] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondRegular] [cork-anttcr] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondItalic] [cork-anttcri] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondBoldCap] [cork-anttcbcap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondBoldItalicCap] [cork-anttcbicap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondLightCap] [cork-anttclcap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondLightItalicCap][cork-anttclicap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondMedCap] [cork-anttcmcap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondMedItalicCap] [cork-anttcmicap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondCap] [cork-anttcrcap] [encoding=ec] + \definefontsynonym [AntykwaTorunska-CondItalicCap] [cork-anttcricap] [encoding=ec] +\stoptypescript + +\starttypescript [serif] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [t2a,t2b,t2c] + \definefontsynonym [AntykwaTorunska-BoldCap] [\typescriptthree-anttb] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-BoldItalicCap] [\typescriptthree-anttbi] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-LightCap] [\typescriptthree-anttl] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-LightItalicCap] [\typescriptthree-anttli] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-MedCap] [\typescriptthree-anttm] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-MedItalicCap] [\typescriptthree-anttmi] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-Cap] [\typescriptthree-anttr] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-ItalicCap] [\typescriptthree-anttri] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondBoldCap] [\typescriptthree-anttcb] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondBoldItalicCap] [\typescriptthree-anttcbi] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondLightCap] [\typescriptthree-anttcl] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondLightItalicCap][\typescriptthree-anttcli] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondMedCap] [\typescriptthree-anttcm] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondMedItalicCap] [\typescriptthree-anttcmi] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondCap] [\typescriptthree-anttcr] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondItalicCap] [\typescriptthree-anttcri] [encoding=\typescriptthree] +\stoptypescript + +\starttypescript [serif] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [t2a,t2b,t2c] + \definefontsynonym [AntykwaTorunska-BoldCap] [\typescriptthree-anttb] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-BoldItalicCap] [\typescriptthree-anttbi] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-LightCap] [\typescriptthree-anttl] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-LightItalicCap] [\typescriptthree-anttli] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-MedCap] [\typescriptthree-anttm] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-MedItalicCap] [\typescriptthree-anttmi] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-Cap] [\typescriptthree-anttr] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-ItalicCap] [\typescriptthree-anttri] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondBoldCap] [\typescriptthree-anttcb] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondBoldItalicCap] [\typescriptthree-anttcbi] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondLightCap] [\typescriptthree-anttcl] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondLightItalicCap][\typescriptthree-anttcli] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondMedCap] [\typescriptthree-anttcm] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondMedItalicCap] [\typescriptthree-anttcmi] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondCap] [\typescriptthree-anttcr] [encoding=\typescriptthree] + \definefontsynonym [AntykwaTorunska-CondItalicCap] [\typescriptthree-anttcri] [encoding=\typescriptthree] \stoptypescript % Antykwa Polstawskiego (GUST) diff --git a/tex/context/base/type-exa.tex b/tex/context/base/type-exa.tex index c1da0d969..84f34ca58 100644 --- a/tex/context/base/type-exa.tex +++ b/tex/context/base/type-exa.tex @@ -34,9 +34,9 @@ \starttypescript [postscript] [texnansi,ec,8r,t5,uc] \definetypeface [postscript] [rm] [serif] [times] [default] [encoding=\typescripttwo] - \definetypeface [postscript] [mm] [math] [times] [default] \definetypeface [postscript] [ss] [sans] [helvetica] [default] [rscale=.9,encoding=\typescripttwo] \definetypeface [postscript] [tt] [mono] [courier] [default] [rscale=1.1,encoding=\typescripttwo] + \definetypeface [postscript] [mm] [math] [times] [default] \stoptypescript @@ -54,8 +54,8 @@ \starttypescript [palatino] [texnansi,ec,8r,t5,uc] \definetypeface [palatino] [rm] [serif] [palatino] [default] [encoding=\typescripttwo] - \definetypeface [palatino] [mm] [math] [palatino] [default] [encoding=default] \definetypeface [palatino] [tt] [mono] [modern] [default] [encoding=\typescripttwo,rscale=1.075] + \definetypeface [palatino] [mm] [math] [palatino] [default] [encoding=default] % \usemathcollection[default] @@ -119,69 +119,36 @@ \stoptypescript -\starttypescript [serif] [hanging] [pure] - - \setupfontsynonym [Serif] [handling=pure] - \setupfontsynonym [SerifBold] [handling=pure] - \setupfontsynonym [SerifSlanted] [handling=pure] - \setupfontsynonym [SerifItalic] [handling=pure] - \setupfontsynonym [SerifBoldSlanted] [handling=pure] - \setupfontsynonym [SerifBoldItalic] [handling=pure] - -\stoptypescript - -\starttypescript [sans] [hanging] [pure] - - \setupfontsynonym [Sans] [handling=pure] - \setupfontsynonym [SansBold] [handling=pure] - \setupfontsynonym [SansSlanted] [handling=pure] - \setupfontsynonym [SansItalic] [handling=pure] - \setupfontsynonym [SansBoldSlanted] [handling=pure] - \setupfontsynonym [SansBoldItalic] [handling=pure] - -\stoptypescript - -\starttypescript [mono] [hanging] [pure] - - \setupfontsynonym [Mono] [handling=pure] - \setupfontsynonym [MonoBold] [handling=pure] - \setupfontsynonym [MonoSlanted] [handling=pure] - \setupfontsynonym [MonoItalic] [handling=pure] - \setupfontsynonym [MonoBoldSlanted] [handling=pure] - \setupfontsynonym [MonoBoldItalic] [handling=pure] - -\stoptypescript - -\starttypescript [serif] [hanging] [thanh] +\starttypescript [serif] [hanging] [pure,normal] - \setupfontsynonym [Serif] [handling=normal] - \setupfontsynonym [SerifBold] [handling=bold] - \setupfontsynonym [SerifSlanted] [handling=slanted] - \setupfontsynonym [SerifItalic] [handling=italic] - \setupfontsynonym [SerifBoldSlanted] [handling=boldslanted] - \setupfontsynonym [SerifBoldItalic] [handling=bolditalic] + \setupfontsynonym [Serif] [handling=\typescriptthree] + \setupfontsynonym [SerifBold] [handling=\typescriptthree bold] + \setupfontsynonym [SerifSlanted] [handling=\typescriptthree slanted] + \setupfontsynonym [SerifItalic] [handling=\typescriptthree italic] + \setupfontsynonym [SerifBoldSlanted] [handling=\typescriptthree boldslanted] + \setupfontsynonym [SerifBoldItalic] [handling=\typescriptthree bolditalic] \stoptypescript -\starttypescript [sans] [hanging] [thanh] +\starttypescript [sans] [hanging] [pure,normal] - \setupfontsynonym [Sans] [handling=normal] - \setupfontsynonym [SansBold] [handling=bold] - \setupfontsynonym [SansSlanted] [handling=slanted] - \setupfontsynonym [SansItalic] [handling=italic] - \setupfontsynonym [SansBoldSlanted] [handling=boldslanted] - \setupfontsynonym [SansBoldItalic] [handling=bolditalic] + \setupfontsynonym [Sans] [handling=\typescriptthree] + \setupfontsynonym [SansBold] [handling=\typescriptthree bold] + \setupfontsynonym [SansSlanted] [handling=\typescriptthree slanted] + \setupfontsynonym [SansItalic] [handling=\typescriptthree italic] + \setupfontsynonym [SansBoldSlanted] [handling=\typescriptthree boldslanted] + \setupfontsynonym [SansBoldItalic] [handling=\typescriptthree bolditalic] \stoptypescript -\starttypescript [mono] [hanging] [thanh] +\starttypescript [mono] [hanging] [pure,normal] - \setupfontsynonym [Mono] [handling=normal] - \setupfontsynonym [MonoBold] [handling=bold] - \setupfontsynonym [MonoSlanted] [handling=slanted] - \setupfontsynonym [MonoItalic] [handling=italic] - \setupfontsynonym [MonoBoldSlanted] [handling=boldslanted] - \setupfontsynonym [MonoBoldItalic] [handling=bolditalic] + \setupfontsynonym [Mono] [handling=\typescriptthree] + \setupfontsynonym [MonoBold] [handling=\typescriptthree bold] + \setupfontsynonym [MonoSlanted] [handling=\typescriptthree slanted] + \setupfontsynonym [MonoItalic] [handling=\typescriptthree italic] + \setupfontsynonym [MonoBoldSlanted] [handling=\typescriptthree boldslanted] + \setupfontsynonym [MonoBoldItalic] [handling=\typescriptthree bolditalic] \stoptypescript diff --git a/tex/context/base/type-map.tex b/tex/context/base/type-map.tex index cb88ed8d7..a37f1e478 100644 --- a/tex/context/base/type-map.tex +++ b/tex/context/base/type-map.tex @@ -81,8 +81,16 @@ \loadmapfile[\typescriptthree-bitstrea-charter.map] \stoptypescript -\starttypescript [map] [antykwa-torunska] [ec,texnansi,t5,8r] - \loadmapfile[\typescriptthree-public-antt.map] +% \starttypescript [map] [antykwa-torunska] [ec,texnansi,t5,8r] +% \loadmapfile[\typescriptthree-public-antt.map] +% \stoptypescript + +\starttypescript [map] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [texnansi,t2a,t2b,t2c,qx] + \loadmapfile[\typescriptthree-antt.map] +\stoptypescript + +\starttypescript [map] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [ec] + \loadmapfile[cork-antt.map] \stoptypescript \starttypescript [map] [antykwa-poltawskiego] [ec,texnansi,t5,8r] diff --git a/tex/context/base/type-siz.tex b/tex/context/base/type-siz.tex index d01d49e6d..d6a504cd5 100644 --- a/tex/context/base/type-siz.tex +++ b/tex/context/base/type-siz.tex @@ -65,75 +65,63 @@ \definebodyfontenvironment [4pt] - [ \s!text=4pt, \s!script=4pt, \s!scriptscript=4pt, - \c!x=4pt, \c!xx=4pt, - \c!big=6pt, \c!small=4pt] + [\s!text=4pt,\s!script=4pt,\s!scriptscript=4pt, + \c!x=4pt,\c!xx=4pt,\c!big=6pt,\c!small=4pt] \definebodyfontenvironment [5pt] - [ \s!text=5pt, \s!script=5pt, \s!scriptscript=5pt, - \c!x=5pt, \c!xx=5pt, - \c!big=7pt, \c!small=5pt] + [\s!text=5pt,\s!script=5pt,\s!scriptscript=5pt, + \c!x=5pt,\c!xx=5pt,\c!big=7pt,\c!small=5pt] \definebodyfontenvironment [6pt] - [ \s!text=6pt, \s!script=5pt, \s!scriptscript=5pt, - \c!x=5pt, \c!xx=5pt, - \c!big=8pt, \c!small=5pt] + [\s!text=6pt,\s!script=5pt,\s!scriptscript=5pt, + \c!x=5pt,\c!xx=5pt,\c!big=8pt,\c!small=5pt] \definebodyfontenvironment [7pt] - [ \s!text=7pt, \s!script=6pt, \s!scriptscript=5pt, - \c!x=6pt, \c!xx=5pt, - \c!big=9pt, \c!small=5pt] + [\s!text=7pt,\s!script=6pt,\s!scriptscript=5pt, + \c!x=6pt,\c!xx=5pt,\c!big=9pt,\c!small=5pt] \definebodyfontenvironment [8pt] - [ \s!text=8pt, \s!script=6pt, \s!scriptscript=5pt, - \c!x=6pt, \c!xx=5pt, - \c!big=10pt, \c!small=6pt] + [\s!text=8pt,\s!script=6pt,\s!scriptscript=5pt, + \c!x=6pt,\c!xx=5pt,\c!big=10pt,\c!small=6pt] \definebodyfontenvironment [9pt] - [ \s!text=9pt, \s!script=7pt, \s!scriptscript=5pt, - \c!x=7pt, \c!xx=5pt, - \c!big=11pt, \c!small=7pt] + [\s!text=9pt,\s!script=7pt,\s!scriptscript=5pt, + \c!x=7pt,\c!xx=5pt,\c!big=11pt,\c!small=7pt] \definebodyfontenvironment [10pt] - [ \s!text=10pt, \s!script=7pt, \s!scriptscript=5pt, - \c!x=8pt, \c!xx=6pt, - \c!big=12pt, \c!small=8pt] + [\s!text=10pt,\s!script=7pt,\s!scriptscript=5pt, + \c!x=8pt,\c!xx=6pt,\c!big=12pt,\c!small=8pt] \definebodyfontenvironment [11pt] - [ \s!text=11pt, \s!script=8pt, \s!scriptscript=6pt, - \c!x=9pt, \c!xx=7pt, - \c!big=13pt, \c!small=9pt] + [\s!text=11pt,\s!script=8pt,\s!scriptscript=6pt, + \c!x=9pt,\c!xx=7pt,\c!big=13pt,\c!small=9pt] \definebodyfontenvironment [12pt] - [ \s!text=12pt, \s!script=9pt, \s!scriptscript=7pt, - \c!x=10pt, \c!xx=8pt, - \c!big=14pt, \c!small=10pt] + [\s!text=12pt,\s!script=9pt,\s!scriptscript=7pt, + \c!x=10pt,\c!xx=8pt,\c!big=14pt,\c!small=10pt] \definebodyfontenvironment [13pt] - [ \s!text=13pt, \s!script=10pt, \s!scriptscript=8pt, - \c!x=11pt, \c!xx=9pt, - \c!big=16pt, \c!small=11pt] + [\s!text=13pt,\s!script=10pt,\s!scriptscript=8pt, + \c!x=11pt,\c!xx=9pt,\c!big=16pt,\c!small=11pt] \definebodyfontenvironment [14pt] - [ \s!text=14pt, \s!script=10pt, \s!scriptscript=7pt, - \c!x=12pt, \c!xx=10pt, - \c!big=16pt, \c!small=12pt] + [\s!text=14pt,\s!script=10pt,\s!scriptscript=7pt, + \c!x=12pt,\c!xx=10pt,\c!big=16pt,\c!small=12pt] \definebodyfontenvironment [16pt] - [ \s!text=16pt, \s!script=12pt, \s!scriptscript=9pt, - \c!x=13pt, \c!xx=11pt, - \c!big=18pt, \c!small=14pt] + [\s!text=16pt,\s!script=12pt,\s!scriptscript=9pt, + \c!x=13pt,\c!xx=11pt,\c!big=18pt,\c!small=14pt] \stoptypescript @@ -405,7 +393,7 @@ \stoptypescript -\starttypescript [math] [computer-modern] [size] +\starttypescript [math] [computer-modern,latin-modern] [size] % hack to prevent mapping of filenames, watch the space! @@ -479,6 +467,154 @@ \stoptypescript +\starttypescript [boldmath] [computer-modern,latin-modern] [size] + +% hack to prevent mapping of filenames, watch the space! + +\definefontsynonym[xcmb12][cmbx12 ] +\definefontsynonym[xcmb10][cmbx10 ] +\definefontsynonym[xcmb9] [cmbx9 ] +\definefontsynonym[xcmb8] [cmbx8 ] +\definefontsynonym[xcmb7] [cmbx7 ] +\definefontsynonym[xcmb6] [cmbx6 ] +\definefontsynonym[xcmb5] [cmbx5 ] + +\definebodyfont [12pt] [mm] + [mr=xcmb12, + ex=cmex10 at 12pt, + mi=cmmib10 at 12pt, + sy=cmbsy10 at 12pt] + +\definebodyfont [11pt] [mm] + [mr=xcmb10 at 11pt, + ex=cmex10 at 11pt, + mi=cmmib10 at 11pt, + sy=cmbsy10 at 11pt] + +\definebodyfont [10pt] [mm] + [mr=xcmb10, + ex=cmex10, + mi=cmmib10, + sy=cmbsy10] + +\definebodyfont [9pt] [mm] + [mr=xcmb9, + ex=cmex10 at 9pt, + mi=cmmib10 at 9pt, + sy=cmbsy10 at 9pt] + +\definebodyfont [8pt] [mm] + [mr=xcmb8, + ex=cmex10 at 8pt, + mi=cmmib7 at 8pt, + sy=cmbsy7 at 8pt] + +\definebodyfont [7pt] [mm] + [mr=xcmb7, + ex=cmex10 at 7pt, + mi=cmmib7, + sy=cmbsy7] + +\definebodyfont [6pt] [mm] + [mr=xcmb6, + ex=cmex10 at 6pt, + mi=cmmib5 at 6pt, + sy=cmbsy5 at 6pt] + +\definebodyfont [5pt] [mm] + [mr=xcmb5, + ex=cmex10 at 5pt, + mi=cmmib5, + sy=cmbsy5] + +\definebodyfont [4pt] [mm] + [mr=xcmb5 at 4pt, + ex=cmex10 at 4pt, + mi=cmmib5 at 4pt, + sy=cmbsy5 at 4pt] + +\definebodyfont [14.4pt,17.3pt,20.7pt] [mm] + [mr=xcmb12 sa 1, + ex=cmex10 sa 1, + mi=cmmib10 sa 1, + sy=cmbsy10 sa 1] + +\stoptypescript + +\starttypescript [bfmath] [computer-modern,latin-modern] [size] + +% hack to prevent mapping of filenames, watch the space! + +\definefontsynonym[xcmb12][cmbx12 ] +\definefontsynonym[xcmb10][cmbx10 ] +\definefontsynonym[xcmb9] [cmbx9 ] +\definefontsynonym[xcmb8] [cmbx8 ] +\definefontsynonym[xcmb7] [cmbx7 ] +\definefontsynonym[xcmb6] [cmbx6 ] +\definefontsynonym[xcmb5] [cmbx5 ] + +\definebodyfont [12pt] [mm] + [mrbf=xcmb12, + exbf=cmex10 at 12pt, + mibf=cmmib10 at 12pt, + sybf=cmbsy10 at 12pt] + +\definebodyfont [11pt] [mm] + [mrbf=xcmb10 at 11pt, + exbf=cmex10 at 11pt, + mibf=cmmib10 at 11pt, + sybf=cmbsy10 at 11pt] + +\definebodyfont [10pt] [mm] + [mrbf=xcmb10, + exbf=cmex10, + mibf=cmmib10, + sybf=cmbsy10] + +\definebodyfont [9pt] [mm] + [mrbf=xcmb9, + exbf=cmex10 at 9pt, + mibf=cmmib10 at 9pt, + sybf=cmbsy10 at 9pt] + +\definebodyfont [8pt] [mm] + [mrbf=xcmb8, + exbf=cmex10 at 8pt, + mibf=cmmib7 at 8pt, + sybf=cmbsy7 at 8pt] + +\definebodyfont [7pt] [mm] + [mrbf=xcmb7, + exbf=cmex10 at 7pt, + mibf=cmmib7, + sybf=cmbsy7] + +\definebodyfont [6pt] [mm] + [mrbf=xcmb6, + exbf=cmex10 at 6pt, + mibf=cmmib5 at 6pt, + sybf=cmbsy5 at 6pt] + +\definebodyfont [5pt] [mm] + [mrbf=xcmb5, + exbf=cmex10 at 5pt, + mibf=cmmib5, + sybf=cmbsy5] + +\definebodyfont [4pt] [mm] + [mrbf=xcmb5 at 4pt, + exbf=cmex10 at 4pt, + mibf=cmmib5 at 4pt, + sybf=cmbsy5 at 4pt] + +\definebodyfont [14.4pt,17.3pt,20.7pt] [mm] + [mrbf=xcmb12 sa 1, + exbf=cmex10 sa 1, + mibf=cmmib10 sa 1, + sybf=cmbsy10 sa 1] + +\stoptypescript + \starttypescript [serif] [concrete] [size] \definebodyfont [10pt,11pt,12pt,14.4pt,17.3pt] [rm] diff --git a/tex/context/base/type-syn.tex b/tex/context/base/type-syn.tex index 09e8dff45..49f532e2c 100644 --- a/tex/context/base/type-syn.tex +++ b/tex/context/base/type-syn.tex @@ -72,6 +72,20 @@ \definefontsynonym [MathSymbol] [ComputerModernMath-Symbol] \stoptypescript +\starttypescript [boldmath] [computer-modern,latin-modern] [name] + \definefontsynonym [MathRoman] [ComputerModernMath-Roman-Bold] + \definefontsynonym [MathExtension] [ComputerModernMath-Extension] + \definefontsynonym [MathItalic] [ComputerModernMath-Italic-Bold] + \definefontsynonym [MathSymbol] [ComputerModernMath-Symbol-Bold] +\stoptypescript + +\starttypescript [bfmath] [computer-modern,latin-modern] [name] + \definefontsynonym [MathRomanBold] [ComputerModernMath-Roman-Bold] + \definefontsynonym [MathExtension] [ComputerModernMath-Extension] + \definefontsynonym [MathItalicBold] [ComputerModernMath-Italic-Bold] + \definefontsynonym [MathSymbolBold] [ComputerModernMath-Symbol-Bold] +\stoptypescript + \starttypescript [serif] [computer-modern-vari,latin-modern-vari] [name] \definefontsynonym [Serif] [ComputerModernMono-Variable] \definefontsynonym [SerifBold] [Serif] @@ -150,16 +164,198 @@ % Antykwa Torunska : +% \starttypescript [serif] [antykwa-torunska] [name] +% \definefontsynonym [Serif] [AntykwaTorunska-Regular] +% \definefontsynonym [SerifBold] [AntykwaTorunska-Bold] +% \definefontsynonym [SerifItalic] [AntykwaTorunska-Italic] +% \definefontsynonym [SerifSlanted] [AntykwaTorunska-Italic] +% \definefontsynonym [SerifBoldItalic] [AntykwaTorunska-Bold] +% \definefontsynonym [SerifBoldSlanted] [AntykwaTorunska-Bold] +% \definefontsynonym [SerifCaps] [AntykwaTorunska-Regular] +% \stoptypescript + \starttypescript [serif] [antykwa-torunska] [name] \definefontsynonym [Serif] [AntykwaTorunska-Regular] \definefontsynonym [SerifBold] [AntykwaTorunska-Bold] \definefontsynonym [SerifItalic] [AntykwaTorunska-Italic] \definefontsynonym [SerifSlanted] [AntykwaTorunska-Italic] - \definefontsynonym [SerifBoldItalic] [AntykwaTorunska-Bold] - \definefontsynonym [SerifBoldSlanted] [AntykwaTorunska-Bold] - \definefontsynonym [SerifCaps] [AntykwaTorunska-Regular] + \definefontsynonym [SerifBoldItalic] [AntykwaTorunska-BoldItalic] + \definefontsynonym [SerifBoldSlanted] [AntykwaTorunska-BoldItalic] + \definefontsynonym [SerifCaps] [AntykwaTorunska-Cap] \stoptypescript +\starttypescript [serif] [antykwa-torunska-light] [name] + \definefontsynonym [Serif] [AntykwaTorunska-Light] + \definefontsynonym [SerifBold] [AntykwaTorunska-Medium] + \definefontsynonym [SerifItalic] [AntykwaTorunska-LightItalic] + \definefontsynonym [SerifSlanted] [AntykwaTorunska-LightItalic] + \definefontsynonym [SerifBoldItalic] [AntykwaTorunska-MedItalic] + \definefontsynonym [SerifBoldSlanted] [AntykwaTorunska-MedItalic] + \definefontsynonym [SerifCaps] [AntykwaTorunska-LightCap] +\stoptypescript + +\starttypescript [serif] [antykwa-torunska-cond] [name] + \definefontsynonym [Serif] [AntykwaTorunska-CondRegular] + \definefontsynonym [SerifBold] [AntykwaTorunska-CondBold] + \definefontsynonym [SerifItalic] [AntykwaTorunska-CondItalic] + \definefontsynonym [SerifSlanted] [AntykwaTorunska-CondItalic] + \definefontsynonym [SerifBoldItalic] [AntykwaTorunska-CondBoldItalic] + \definefontsynonym [SerifBoldSlanted] [AntykwaTorunska-CondBoldItalic] + \definefontsynonym [SerifCaps] [AntykwaTorunska-CondCap] +\stoptypescript + +\starttypescript [serif] [antykwa-torunska-lightcond] [name] + \definefontsynonym [Serif] [AntykwaTorunska-CondLight] + \definefontsynonym [SerifBold] [AntykwaTorunska-CondMedium] + \definefontsynonym [SerifItalic] [AntykwaTorunska-CondLightItalic] + \definefontsynonym [SerifSlanted] [AntykwaTorunska-CondLightItalic] + \definefontsynonym [SerifBoldItalic] [AntykwaTorunska-CondMedItalic] + \definefontsynonym [SerifBoldSlanted] [AntykwaTorunska-CondMedItalic] + \definefontsynonym [SerifCaps] [AntykwaTorunska-CondLightCap] +\stoptypescript + +\starttypescript [serif] [antykwa-torunska] [name] + \definefontsynonym [SerifRegular] [Serif] + \definefontsynonym [SerifRegularCaps] [AntykwaTorunska-Cap] + \definefontsynonym [SerifBoldCaps] [AntykwaTorunska-BoldCap] + \definefontsynonym [SerifItalicCaps] [AntykwaTorunska-ItalicCap] + \definefontsynonym [SerifSlantedCaps] [AntykwaTorunska-ItalicCap] + \definefontsynonym [SerifBoldItalicCaps] [AntykwaTorunska-BoldItalicCap] + \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-BoldItalicCap] + \definefontsynonym [SerifCapsCaps] [AntykwaTorunska-Cap] + + \definefontvariant [Serif][osf][Caps] + \definefontvariant [Serif][sc] [Caps] + + \definefontsynonym [SerifRegularLight] [AntykwaTorunska-Light] + \definefontsynonym [SerifBoldLight] [AntykwaTorunska-Medium] + \definefontsynonym [SerifItalicLight] [AntykwaTorunska-LightItalic] + \definefontsynonym [SerifSlantedLight] [AntykwaTorunska-LightItalic] + \definefontsynonym [SerifBoldItalicLight] [AntykwaTorunska-MedItalic] + \definefontsynonym [SerifBoldSlantedLight] [AntykwaTorunska-MedItalic] + \definefontsynonym [SerifCapsLight] [AntykwaTorunska-LightCap] + + \definefontvariant [Serif][lt][Light] + + \definefontsynonym [SerifRegularCond] [AntykwaTorunska-CondRegular] + \definefontsynonym [SerifBoldCond] [AntykwaTorunska-CondBold] + \definefontsynonym [SerifItalicCond] [AntykwaTorunska-CondItalic] + \definefontsynonym [SerifSlantedCond] [AntykwaTorunska-CondItalic] + \definefontsynonym [SerifBoldItalicCond] [AntykwaTorunska-CondBoldItalic] + \definefontsynonym [SerifBoldSlantedCond] [AntykwaTorunska-CondBoldItalic] + \definefontsynonym [SerifCapsCond] [AntykwaTorunska-CondCap] + + \definefontvariant [Serif][cond][Cond] + +\stoptypescript + +\starttypescript [serif] [antykwa-torunska-light] [name] + \definefontsynonym [SerifRegular] [Serif] + \definefontsynonym [SerifRegularCaps] [AntykwaTorunska-LightCap] + \definefontsynonym [SerifBoldCaps] [AntykwaTorunska-MediumCap] + \definefontsynonym [SerifItalicCaps] [AntykwaTorunska-LightItalicCap] + \definefontsynonym [SerifSlantedCaps] [AntykwaTorunska-LightItalicCap] + \definefontsynonym [SerifBoldItalicCaps] [AntykwaTorunska-MedItalicCap] + \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-MedItalicCap] + \definefontsynonym [SerifCapsCaps] [AntykwaTorunska-LightCap] + + \definefontvariant [Serif][osf][Caps] + \definefontvariant [Serif][sc] [Caps] + + \definefontsynonym [SerifRegularDark] [AntykwaTorunska-Regular] + \definefontsynonym [SerifBoldDark] [AntykwaTorunska-Bold] + \definefontsynonym [SerifItalicDark] [AntykwaTorunska-Italic] + \definefontsynonym [SerifSlantedDark] [AntykwaTorunska-Italic] + \definefontsynonym [SerifBoldItalicDark] [AntykwaTorunska-BoldItalic] + \definefontsynonym [SerifBoldSlantedDark] [AntykwaTorunska-BoldItalic] + \definefontsynonym [SerifCapsDark] [AntykwaTorunska-Cap] + + \definefontvariant [Serif][dk][Dark] + + \definefontsynonym [SerifRegularCond] [AntykwaTorunska-CondLight] + \definefontsynonym [SerifBoldCond] [AntykwaTorunska-CondMedium] + \definefontsynonym [SerifItalicCond] [AntykwaTorunska-CondLightItalic] + \definefontsynonym [SerifSlantedCond] [AntykwaTorunska-CondLightItalic] + \definefontsynonym [SerifBoldItalicCond] [AntykwaTorunska-CondMedItalic] + \definefontsynonym [SerifBoldSlantedCond] [AntykwaTorunska-CondMedItalic] + \definefontsynonym [SerifCapsCond] [AntykwaTorunska-CondLightCap] + + \definefontvariant [Serif][cond][Cond] + +\stoptypescript + +\starttypescript [serif] [antykwa-torunska-cond] [name] + \definefontsynonym [SerifRegular] [Serif] + \definefontsynonym [SerifRegularCaps] [AntykwaTorunska-CondCap] + \definefontsynonym [SerifBoldCaps] [AntykwaTorunska-CondBoldCap] + \definefontsynonym [SerifItalicCaps] [AntykwaTorunska-CondItalicCap] + \definefontsynonym [SerifSlantedCaps] [AntykwaTorunska-CondItalicCap] + \definefontsynonym [SerifBoldItalicCaps] [AntykwaTorunska-CondBoldItalicCap] + \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-CondBoldItalicCap] + \definefontsynonym [SerifCapsCaps] [AntykwaTorunska-CondCap] + + \definefontvariant [Serif][osf][Caps] + \definefontvariant [Serif][sc] [Caps] + + \definefontsynonym [SerifRegularLight] [AntykwaTorunska-CondLight] + \definefontsynonym [SerifBoldLight] [AntykwaTorunska-CondMedium] + \definefontsynonym [SerifItalicLight] [AntykwaTorunska-CondLightItalic] + \definefontsynonym [SerifSlantedLight] [AntykwaTorunska-CondLightItalic] + \definefontsynonym [SerifBoldItalicLight] [AntykwaTorunska-CondMedItalic] + \definefontsynonym [SerifBoldSlantedLight] [AntykwaTorunska-CondMedItalic] + \definefontsynonym [SerifCapsLight] [AntykwaTorunska-CondLightCap] + + \definefontvariant [Serif][lt][Light] + + \definefontsynonym [SerifRegularExp] [AntykwaTorunska-Regular] + \definefontsynonym [SerifBoldExp] [AntykwaTorunska-Bold] + \definefontsynonym [SerifItalicExp] [AntykwaTorunska-Italic] + \definefontsynonym [SerifSlantedExp] [AntykwaTorunska-Italic] + \definefontsynonym [SerifBoldItalicExp] [AntykwaTorunska-BoldItalic] + \definefontsynonym [SerifBoldSlantedExp] [AntykwaTorunska-BoldItalic] + \definefontsynonym [SerifCapsExp] [AntykwaTorunska-Cap] + + \definefontvariant [Serif][exp][Exp] + +\stoptypescript + +\starttypescript [serif] [antykwa-torunska-lightcond] [name] + \definefontsynonym [SerifRegular] [Serif] + \definefontsynonym [SerifRegularCaps] [AntykwaTorunska-CondLightCap] + \definefontsynonym [SerifBoldCaps] [AntykwaTorunska-CondMediumCap] + \definefontsynonym [SerifItalicCaps] [AntykwaTorunska-CondLightItalicCap] + \definefontsynonym [SerifSlantedCaps] [AntykwaTorunska-CondLightItalicCap] + \definefontsynonym [SerifBoldItalicCaps] [AntykwaTorunska-CondMedItalicCap] + \definefontsynonym [SerifBoldSlantedCaps] [AntykwaTorunska-CondMedItalicCap] + \definefontsynonym [SerifCapsCaps] [AntykwaTorunska-CondLightCap] + + \definefontvariant [Serif][osf][Caps] + \definefontvariant [Serif][sc] [Caps] + + \definefontsynonym [SerifRegularDark] [AntykwaTorunska-CondRegular] + \definefontsynonym [SerifBoldDark] [AntykwaTorunska-CondBold] + \definefontsynonym [SerifItalicDark] [AntykwaTorunska-CondItalic] + \definefontsynonym [SerifSlantedDark] [AntykwaTorunska-CondItalic] + \definefontsynonym [SerifBoldItalicDark] [AntykwaTorunska-CondBoldItalic] + \definefontsynonym [SerifBoldSlantedDark] [AntykwaTorunska-CondBoldItalic] + \definefontsynonym [SerifCapsDark] [AntykwaTorunska-CondCap] + + \definefontvariant [Serif][dk][Dark] + + \definefontsynonym [SerifRegularExp] [AntykwaTorunska-Light] + \definefontsynonym [SerifBoldExp] [AntykwaTorunska-Medium] + \definefontsynonym [SerifItalicExp] [AntykwaTorunska-LightItalic] + \definefontsynonym [SerifSlantedExp] [AntykwaTorunska-LightItalic] + \definefontsynonym [SerifBoldItalicExp] [AntykwaTorunska-MedItalic] + \definefontsynonym [SerifBoldSlantedExp] [AntykwaTorunska-MedItalic] + \definefontsynonym [SerifCapsExp] [AntykwaTorunska-LightCap] + + \definefontvariant [Serif][exp][Exp] + +\stoptypescript + +% Antykwa Poltawskiego : + \starttypescript [serif] [antykwa-poltawskiego] [name] \definefontsynonym [Serif] [AntykwaPoltawskiego-Regular] \definefontsynonym [SerifBold] [AntykwaPoltawskiego-Bold] diff --git a/tex/context/base/unic-032.tex b/tex/context/base/unic-032.tex index b18bf7d37..68881a035 100644 --- a/tex/context/base/unic-032.tex +++ b/tex/context/base/unic-032.tex @@ -145,7 +145,7 @@ % U+206E NATIONAL DIGIT SHAPES % U+206F NOMINAL DIGIT SHAPES -\ifx\undefined\zerowidthspace \unexpanded\def\zerowidthspace{\kern\zeropoint} +\ifx\undefined\zerowidthspace \unexpanded\def\zerowidthspace{\kern\zeropoint} \fi % will be made more efficient diff --git a/tex/context/base/x-set-11.tex b/tex/context/base/x-set-11.tex index 2e4363159..5e7068b14 100644 --- a/tex/context/base/x-set-11.tex +++ b/tex/context/base/x-set-11.tex @@ -1,5 +1,5 @@ %D \module -%D [ file=x-set-01, +%D [ file=x-set-11, %D version=2004.10.31, %D remark=setupx.tex: 1998.07.20 and later, %D title=\CONTEXT\ Setup Definitions, @@ -14,6 +14,8 @@ % module x-set-02 loads the mapping, after that we can say: % +% texmfstart texexec --int=nl --pdf --global --result=setup-nl x-set-12 +% % \getinterfacecomponent{constant|variable|string}{tag} \usemodule[set-02] diff --git a/tex/context/base/x-set-12.tex b/tex/context/base/x-set-12.tex index a0fbbd22d..f98761513 100644 --- a/tex/context/base/x-set-12.tex +++ b/tex/context/base/x-set-12.tex @@ -1,5 +1,5 @@ %D \module -%D [ file=x-set-02, +%D [ file=x-set-12, %D version=2004.10.31, %D remark=setupx.tex: 1998.07.20 and later, %D title=\CONTEXT\ Setup Definitions, diff --git a/tex/context/base/xtag-ini.tex b/tex/context/base/xtag-ini.tex index 21377d22d..f7efc8385 100644 --- a/tex/context/base/xtag-ini.tex +++ b/tex/context/base/xtag-ini.tex @@ -2129,14 +2129,14 @@ {\csname\ifcsname\@@XMLdata:#1\endcsname\@@XMLdata:#1\else\s!empty\fi\endcsname} %D \starttyping -%D \defineXMLenvironmentsave[formula]{}{$\XMLtex{formula}$} +%D \defineXMLenvironmentsave[formula]{}{$\XMLtexdata{formula}$} %D %D \startXMLdata %D t+3+x+t\neq m\alpha\frac\theta\hbar %D \stopXMLdata %D \stoptyping -\def\XMLtex#1% +\def\XMLtexdata#1% {\begingroup \disableXML \scantokens\@EA\@EA\@EA{\csname\@@XMLdata:#1\endcsname}% @@ -2152,7 +2152,6 @@ {\detokenize\@EAEAEA{\csname\@@XMLdata:#1\endcsname}} \let\XMLpop \XMLflush - \let\XMLpopdata\XMLflushdata \def\XMLappend#1#2% let to empty expands to nothing -) diff --git a/tex/context/bib/bibl-apa.tex b/tex/context/bib/bibl-apa.tex new file mode 100644 index 000000000..b1ecf373f --- /dev/null +++ b/tex/context/bib/bibl-apa.tex @@ -0,0 +1,379 @@ +%D \module +%D [ file=bibl-apa, +%D version=2004.7.16, +%D title=APA bibliography style, +%D subtitle=Publications, +%D author={Taco Hoekwater}, +%D date=\currentdate, +%D copyright={Public Domain}] +%C +%C Donated to the public domain. Use at your own risk + +\unprotect + +\setupcite + [author,year] + [\c!pubsep={, }, + \c!lastpubsep={ and }, + \c!compress=\v!no, + \c!inbetween={ }, + \c!left={(}, + \c!right={)}] + +\setupcite + [authoryear] + [\c!pubsep={, }, + \c!lastpubsep={ and }, + \c!compress=\v!yes, + \c!inbetween={ }, + \c!left={(}, + \c!right={)}] + +\setupcite + [authoryears] + [\c!pubsep={, }, + \c!lastpubsep={ and }, + \c!compress=\v!yes, + \c!inbetween={, }, + \c!left={(}, + \c!right={)}] + +\setupcite + [key,number,page,short,type,doi] + [\c!pubsep={, }, + \c!lastpubsep={ and }, + \c!compress=\v!no, + \c!inbetween={ }, + \c!left={[}, + \c!right={]}] + +\setupcite + [num] + [\c!pubsep={, }, + \c!lastpubsep={ and }, + \c!compress=\v!yes, + \c!inbetween={--}, + \c!left={[}, + \c!right={]}] + +\setuppublications[% + \c!sorttype=, + \c!criterium=, + \c!refcommand=authoryears, + \c!numbering=\v!no, + \c!autohang=\v!no] + +\setuppublicationlist + [\c!width=24pt, + \c!artauthor=\invertedshortauthor, + \c!editor=\invertedshortauthor, + \c!author=\invertedshortauthor, + \c!namesep={, }, + \c!lastnamesep={ and }, + \c!finalnamesep={ and }, + \c!firstnamesep={, }, + \c!juniorsep={ }, + \c!vonsep={ }, + \c!surnamesep={, }, + \c!authoretallimit=5, + \c!editoretallimit=5, + \c!artauthoretallimit=5, + \c!authoretaldisplay=5, + \c!editoretaldisplay=5, + \c!artauthoretaldisplay=5, + \c!authoretaltext={ et al.}, + \c!editoretaltext={ et al.}, + \c!artauthoretaltext={ et al.}, +] + +\def\maybeyear#1{#1} + +\def\etalchar#1{#1} + +%D \macros{insertchapter,insertpublisher} + +%D Some shortcuts. + +% ((#1(type\ |)chapter#2)|#3) + +\def\insertchap#1#2#3% + {\insertchapter + {#1\inserttype{}{\ }{chapter\ }}{#2}% + {#3}} + +\def\insertpublisher#1#2#3% + {\insertpubname + {#1}{\insertcity + {, } + {\insertcountry{, }{}{#2}}% + {\insertcountry{, }{}{#2}}}% + {\insertcity + {}{\insertcountry{, }{}{#2}}% + {\insertcountry{#1}{#2}{#3}}}% + } + + +\setuppublicationlayout[article]{% + \insertartauthors{}{ }{\insertthekey{}{ }{}}% + \insertpubyear{(}{). }{\unskip.}% + \insertarttitle{\bgroup }{\egroup. }{}% + \insertjournal{\bgroup \it}{\egroup} + {\insertcrossref{In }{}{}}% + \insertvolume + {, } + {\insertissue{(}{)}{}\insertpages{:}{.}{.}} + {\insertpages{, pages }{.}{.}}% + \insertnote{ }{.}{}% + \insertcomment{}{.}{}% +} + +\newif\ifeditedbook +\setuppublicationlayout[book]{% + \insertauthors{}{ }{\inserteditors{}{, editor% + \ifnum\getvalue{editor@num}> 1 s\fi + \ \global\editedbooktrue + }{\insertthekey{}{. }{}}}% + \insertpubyear{(}{). }{\unskip.}% + \inserttitle + {\bgroup\it }% + {\/\egroup + \ifeditedbook + \global\editedbookfalse + \insertvolume + { Number~}% + {\insertseries + { in~\bgroup}% + {\egroup. }% + {\insertcrossref{ in~}{}{. }}}% + {\insertseries{ }{.}{} }% + \else + \insertcrossref + {\insertchap{, }{}{}% + \insertpages{, pages }{. }{. }% + \insertvolume{Volume~}{ of~}{}% + }% + {}% + {\insertvolume + {, volume~}% + {\insertseries + { of~\bgroup\it}% + {\egroup} + {}} + {}% + \insertchap{, }{}{}% + \insertpages{, pages }{. }{. }% + }% + \fi}% + { }% + \insertpublisher + {}% + {\insertedition{, }{ edition. }{. }}% + {\insertedition{, }{ edition. }{}}% + \insertpages{}{p. }{}% + \insertnote{ }{.}{}% +} + +\setuppublicationlayout[inbook]{% + \insertauthors{}{ }{\inserteditors{}{, editor% + \ifnum\getvalue{editor@num}> 1 s\fi + \ \global\editedbooktrue + }{\insertthekey{}{. }{}}}% + \insertpubyear{(}{). }{\unskip.}% + \inserttitle + {\bgroup\it }% + {\/\egroup + \ifeditedbook + \global\editedbookfalse + \insertvolume + { number~}% + {\insertseries + { in~\bgroup}% + {\egroup. }% + {\insertcrossref{ in~}{}{. }}}% + {\insertseries{ }{.}{} }% + \else + \insertcrossref + {\insertchap{, }{}{}% + \insertpages{, pages }{. }{. }% + \insertvolume{Volume~}{ of~}{}% + }% + {}% + {\insertvolume + {, volume~}% + {\insertseries + { of~\bgroup\it}% + {\egroup} + {}} + {}% + \insertchap{, }{}{}% + \insertpages{, pages }{. }{. }% + }% + \fi}% + { }% + \insertpublisher + {}% + {\insertedition{, }{ edition. }{. }}% + {\insertedition{, }{ edition. }{}}% + \insertnote{ }{.}{}% +} + +\setuppublicationlayout[booklet]{% + \insertauthors{}{ }{\insertthekey{}{. }{}}% + \insertpubyear{(}{). }{}% + \inserttitle{\bgroup }{\egroup \insertseries{ (}{)}{}. }{}% + \insertpublisher + {}% + {\insertedition{, }{ edition. }{. }}% + {\insertedition{, }{ edition. }{}}% + \insertpages{}{p. }{}% + \insertnote{ }{.}{}% +} + +\setuppublicationlayout[manual]{% + \insertauthors{}{ }{\insertthekey{}{. }{}}% + \insertpubyear{(}{). }{}% + \inserttitle{\bgroup \it }{\/\egroup \insertseries{ (}{)}{}. }{}% + \insertorganization + {}% + {\insertcity{, }% + {\insertedition{, }{ edition. }{. }}% + {\insertedition{, }{ edition. }{. }}}% + {\insertedition{, }{ edition. }{}}% + \insertpages{}{p. }{}% + \insertnote{ }{.}{}% +} + +\setuppublicationlayout[incollection]{% + \insertartauthors{}{ }{\insertthekey{}{. }{}}% + \insertpubyear{(}{). }{}% + \insertarttitle{\bgroup }{\egroup. }{}% + \inserttitle + {In \inserteditors{}% + {, editor\ifnum\getvalue{editor@num}> 1 s\fi, }% + {}% + \bgroup\it}% + {\egroup + \insertseries + {\insertvolume{, number }{~in }{ }}% + {}% + {}% + \insertchap{\unskip, }{ }{ }% + \insertpages{\unskip, pages~}{. }{\unskip. }% + \insertpublisher + {}% + {\insertedition{, }{ edition. }{. }}% + {\insertedition{, }{ edition. }{}}% + }% + {In \insertcrossref{}{}{}% + \insertchap{\unskip, }{ }{ }% + \insertpages{\unskip, pages~}{. }{\unskip. }% + }% + \insertnote{ }{.}{}% +} + +\setuppublicationlayout[inproceedings]{% + \insertauthors{}{ }{}% + \insertpubyear{(}{). }{}% + \insertarttitle{\bgroup }{\egroup. }{}%% + \inserttitle + {In \inserteditors{}% + {, editor\ifnum\getvalue{editor@num}> 1 s\fi, }% + {}% + \bgroup\it}% + {\egroup + \insertseries + {\insertvolume{, number }{~in }{ }}% + {}% + {}% + \insertchap{\unskip, }{ }{ }% + \insertpages + {\unskip, pages~} + {\insertcity{, }{. }{. }} + {\unskip. }% + \insertorganization + {}% + {\insertpubname{, }{. }{. }}% + {\insertpubname{}{. }{}}% was {, }{. }{} + }% + {In \insertcrossref{}{}{}% + \insertchap{\unskip, }{ }{ }% + \insertpages{\unskip, pages~}{. }{\unskip. }% + }% + \insertnote{ }{.}{}% +} + +\setuppublicationlayout[proceedings]{% + \inserteditors{}{, editor% + \ifnum\getvalue{editor@num}> 1 s\fi + \ \global\editedbooktrue + }{\insertthekey{}{ }{}}% + \insertpubyear{(}{). }{}% + \inserttitle + {\bgroup\it}% + {\egroup + \insertseries + {\insertvolume{, number }{~in }{ }}% + {}% + {}% + \insertchap{\unskip, }{ }{ }% + \insertpages{\unskip, pages~}{\insertcity{, }{. }{. }} + {\unskip\insertcity{, }{. }{. }}% + \insertorganization + {}% + {\insertpubname{, }{. }{. }}% + {\insertpubname{, }{. }{}}% + }% + {}% + \insertnote{ }{.}{}% +} + +\setuppublicationlayout[mastersthesis]{% + \insertauthors{}{ }{}% + \insertpubyear{(}{). }{}% + \inserttitle{\bgroup }{\egroup \insertseries{ (}{)}{}. }{}% + \inserttype{}{, }{Master's thesis, }% + \insertpublisher{}{. }{}% + \insertpages{}{p. }{}% + \insertnote{ }{.}{}% +} + +\setuppublicationlayout[phdthesis]{% + \insertauthors{}{ }{}% + \insertpubyear{(}{). }{}% + \inserttitle{\bgroup\it }{\egroup \insertseries{ (}{)}{}. }{}% + \inserttype{}{, }{PhD thesis, }% + \insertpublisher{}{. }{}% + \insertpages{}{p. }{}% + \insertnote{ }{.}{}% +} + +\setuppublicationlayout[misc]{% + \insertauthors{}{ }{\insertthekey{}{. }{}}% + \insertpubyear{(}{). }{}% + \inserttitle{\bgroup }{\egroup \insertseries{ (}{)}. }{}% + \insertpublisher{}{. }{}% + \insertpages{}{p. }{}% + \insertnote{ }{.}{}% +} + +\setuppublicationlayout[techreport]{% + \insertauthors{}{ }{}% + \insertpubyear{(}{). }{}% + \inserttitle{\bgroup }{\egroup \insertseries{ (}{)}{}. }{}% + \inserttype{}{\insertvolume{ }{, }{, }}{Technical Report, }% + \insertpublisher{}{. }{}% + \insertpages{}{p. }{}% + \insertnote{ }{.}{}% +} + +\setuppublicationlayout[unpublished]{% + \insertauthors{}{ }{}% + \insertpubyear{(}{). }{}% + \inserttitle{\bgroup }{\egroup \insertseries{ (}{)}{}. }{}% + \insertpublisher{}{. }{}% + \insertpages{}{p. }{}% + \inserttype{(}{)}{}% + \insertnote{ }{.}{}% +} + +\protect \ No newline at end of file diff --git a/tex/context/bib/bibl-aps.tex b/tex/context/bib/bibl-aps.tex new file mode 100644 index 000000000..c3a2c4a56 --- /dev/null +++ b/tex/context/bib/bibl-aps.tex @@ -0,0 +1,431 @@ +%D \module +%D [ file=bibl-aps, +%D version=2004.7.16, +%D title=APS bibliography style, +%D subtitle=Publications, +%D author={Taco Hoekwater}, +%D date=\currentdate, +%D copyright={Public Domain}] +%C +%C Donated to the public domain. Use at your own risk + +\unprotect + +\setupcite + [author,year] + [\c!pubsep={, }, + \c!lastpubsep={ and }, + \c!compress=\v!no, + \c!inbetween={ }, + \c!left={(}, + \c!right={)}] + +\setupcite + [authoryear] + [\c!pubsep={, }, + \c!lastpubsep={ and }, + \c!compress=\v!yes, + \c!inbetween={ }, + \c!left={(}, + \c!right={)}] + +\setupcite + [authoryears] + [\c!pubsep={, }, + \c!lastpubsep={ and }, + \c!compress=\v!yes, + \c!inbetween={, }, + \c!left={(}, + \c!right={)}] + +\setupcite + [key,number,page,short,type,doi] + [\c!pubsep={, }, + \c!lastpubsep={ and }, + \c!compress=\v!no, + \c!inbetween={ }, + \c!left={[}, + \c!right={]}] + +\setupcite + [num] + [\c!pubsep={, }, + \c!lastpubsep={ and }, + \c!compress=\v!yes, + \c!inbetween={--}, + \c!left={[}, + \c!right={]}] + +\setuppublications[% + \c!sorttype=, + \c!criterium=, + \c!refcommand=num, + \c!numbercommand=\tester, + \c!numbering=\v!yes, + \c!autohang=\v!yes] + +\def\tester#1{\hfill[#1]~~} + +\setuppublicationlist + [\c!width=24pt, + \c!artauthor=\normalshortauthor, + \c!editor=\normalshortauthor, + \c!author=\normalshortauthor, + \c!namesep={, }, + \c!lastnamesep={ and }, + \c!finalnamesep={, and }, + \c!firstnamesep={ }, + \c!juniorsep={ }, + \c!vonsep={ }, + \c!surnamesep={}, + \c!authoretallimit=4, + \c!editoretallimit=4, + \c!artauthoretallimit=4, + \c!authoretaldisplay=1, + \c!editoretaldisplay=1, + \c!artauthoretaldisplay=1, + \c!authoretaltext={ {\it et al.\/}}, + \c!editoretaltext={ {\it et al.\/}}, + \c!artauthoretaltext={ {\it et al.\/}}] + +\def\maybeyear#1{} + +\def\etalchar#1{#1} + +\def\insertNote#1#2#3{% + \begingroup + \sfcode`\.=1020 + \insertnote{#1}{\ifnum\spacefactor=1020 \else .\fi}{#3}% + \endgroup +} + +\def\insertEdition#1#2#3{% + \begingroup + \insertedition{#1}{\doifnumberelse{\csname @@pb@edition\endcsname}{% + \ifcase \csname @@pb@edition\endcsname \or st\or nd\or rd\else th\fi + }{}#2}{#3}% + \endgroup +} + +%D \macros{insertchapter,insertpublisher} + +%D Some shortcuts. + +% ((#1(type\ |)chapter#2)|#3) + +\def\insertchap#1#2#3% + {\insertchapter + {#1\inserttype{}{\ }{chapter\ }}{#2}% + {#3}} + +\def\insertpublisher#1#2#3% + {\insertpubname + {#1}{\insertcity + {, } + {\insertcountry{, }{}{#2}}% + {\insertcountry{, }{}{#2}}}% + {\insertcity + {}{\insertcountry{, }{}{#2}}% + {\insertcountry{#1}{#2}{#3}}}% + } + +% some tricks with page ranges: + +\def\insertfirstpage#1#2#3{% + \@EA\bibdoifelse + \@EA{\csname @@pb@pages\endcsname}% + {#1\fixedfirstpage #2}% + {#3}% +} + +\def\fixedfirstpage{\expanded{\doifinstringelse{-}{\csname @@pb@pages\endcsname}% + {\gobblelastdash\csname @@pb@pages\endcsname-\relax}{\csname @@pb@pages\endcsname}}} + +\protected\def\gobblelastdash#1-#2\relax{#1} + +\def\fixpp.{\expanded{\doifinstringelse{-}{\csname @@pb@pages\endcsname}{pp.}{p.}}} + +\setuppublicationlayout[article]{% + \insertartauthors{}{ }{\insertthekey{}{ }{}}% + \insertjournal{\unskip, \bgroup }{\egroup} + {}% \insertcrossref{In }{}{}}% + \insertvolume + { \bgroup \bf } + {\egroup %\insertissue{(}{)}{}% + \insertfirstpage{, }{}{}} + {\insertfirstpage{ }{}{}}% + \insertpubyear{ (}{). }{\unskip.}% + \insertNote{ }{.}{}% + \insertcomment{}{.}{}% +} + +\newif\ifeditedbook +\setuppublicationlayout[book]{% + \insertauthors{}{ }{\inserteditors{}{, editor% + \ifnum\getvalue{editor@num}> 1 s\fi + \ \global\editedbooktrue + }{\insertthekey{}{. }{}}}% + \inserttitle + {\unskip, \bgroup\it }% + {\/\egroup + \ifeditedbook + \global\editedbookfalse + \insertvolume + { Number~}% + {\insertseries + { in~\bgroup}% + {\egroup. }% + {\insertcrossref{ in~}{}{. }}}% + {\insertseries{ }{.}{} }% + \else + \insertcrossref + {\insertchap{, }{}{}% + \insertpages{, \fixpp. }{. }{. }% + \insertvolume{Volume~}{ of~}{}% + }% + {}% + {\insertvolume + {, volume~}% + {\insertseries + { of~\bgroup\it}% + {\egroup} + {}} + {}% + \insertchap{, }{}{}% + \insertpages{, p. }{. }{. }% + }% + \fi}% + { }% + \insertpubyear{(% + \insertpublisher + {}% + {, }% + {}% + }{)\insertEdition{, }{ ed. }{. }}{\unskip.}% +% \insertpages{}{p. }{}% + \insertNote{ }{.}{}% +} + +\setuppublicationlayout[inbook]{% + \insertauthors{}{}{\inserteditors{}{, editor% + \ifnum\getvalue{editor@num}> 1 s\fi + \ \global\editedbooktrue + }{\insertthekey{}{. }{}}}% + \inserttitle + {, \bgroup\it }% + {\/\egroup + \insertpubyear + { (% + \insertpubname{}{\insertcity{, }{, }{}}{}% + } + {)\insertEdition{, }{ ed.}{}}{}% + \ifeditedbook + \global\editedbookfalse + \insertvolume + { vol.~}% + {\insertseries + { in~\bgroup}% + {\egroup. }% + {\insertcrossref{ in~}{}{. }}}% + {\insertseries{ }{.}{} }% + \else + \insertcrossref + {\insertchap{, }{}{}% + \insertpages{, p. }{. }{. }% + \insertvolume{Volume~}{ of~}{}% + }% + {}% + {\insertvolume + {, vol.~}% + {\insertseries + { of~\bgroup\it}% + {\egroup} + {}} + {}% + \insertchap{, }{}{}% + \insertpages{, \fixpp. }{. }{. }% + }% + \fi }% + { }% + \insertNote{ }{.}{}% +} + +\setuppublicationlayout[booklet]{% + \insertauthors{}{ }{\insertthekey{}{. }{}}% + \inserttitle{\bgroup }{\egroup \insertseries{ (}{)}{}. }{}% + \insertpubyear{(% + \insertpublisher{}{, }{}% + }{)\insertEdition{, }{ ed. }{. }}{}% + \insertpages{}{p. }{}% + \insertNote{ }{.}{}% +} + +\setuppublicationlayout[manual]{% + \insertauthors{}{ }{\insertthekey{}{. }{}}% + \inserttitle{\bgroup \it }{\/\egroup \insertseries{ (}{)}{}. }{}% + \insertpubyear{(% + \insertorganization + {}% + {\insertcity{, }{, }{}}% + {\insertcity{}{, }{}}% + }{)\insertEdition{, }{ ed. }{. }}{}% + \insertpages{}{p. }{}% + \insertNote{ }{.}{}% +} + +\setuppublicationlayout[incollection]{% + \insertartauthors{}{}{\insertthekey{}{, }{}}% +% \insertarttitle{\bgroup }{\egroup. }{}% + \inserttitle + {, in % + \bgroup\it}% + {\egroup + \inserteditors{, edited by }% + {}% + {} + \insertseries + {\insertvolume{, number }{~in }{ }}% + {}% + {}% + \insertchap{\unskip, }{ }{ }% + \insertpubyear{(% + \insertpublisher{}%{, }%{}% + }{)\insertEdition{, }{ ed. }{}}{}% + \insertpages{\unskip, p.~}{. }{\unskip. }% + }% + {In \insertcrossref{}{}{}% + \insertchap{\unskip, }{ }{ }% + \insertpages{\unskip, p.~}{. }{\unskip. }% + }% + \insertNote{ }{.}{}% +} + +\setuppublicationlayout[inproceedings]{% + \insertauthors{}{ }{}% +% +% \insertarttitle{\bgroup }{\egroup. }{}%% + \inserttitle + {\unskip, in \bgroup\it}% + {\egroup + \inserteditors{, edited by }% + {}% + {}% + \insertchap{\unskip, }{ }{ }% + \insertpubyear + { (% + \insertorganization + {}% + {\insertpubname{, } + {\insertcity{, }{}{}, } + {\insertcity{, }{}{}, }}% + {\insertpubname{} + {\insertcity{, }{}{}, } + {\insertcity{}{, }{}}}% + } + {)}{}% + \insertseries + {, \insertvolume{vol. }{~of }{}\bgroup\it}% + {\egroup}% + {}% + \insertpages + {\unskip, \fixpp.~} + {\unskip.} + {\unskip.}% + }% + { In \insertcrossref{}{}{}% + \insertchap{\unskip, }{ }{ }% + \insertpages{\unskip, \fixpp.~}{. }{\unskip. }% + }% + \insertNote{ }{.}{}% +} + +\setuppublicationlayout[proceedings]{% + \inserteditors{}{, ed% + \ifnum\getvalue{editor@num}> 1 s\fi., + \ \global\editedbooktrue + }{\insertthekey{}{ }{}}% + \inserttitle + {\bgroup\it}% + {\egroup + \insertseries + {\insertvolume{, number }{~in }{ }}% + {}% + {}% + \insertchap{\unskip, }{ }{ }% + \insertpubyear{(% + \insertorganization + {}% + {\insertpubname{, }{, }{}}% + {\insertpubname{}{, }{}}% + } + {)} + {}% + \insertpages + {\unskip, p.~} + {\insertcity{, }{}{}} + {\unskip\insertcity{, }{}{}}% + }% + {}% + \insertNote{\unskip. }{.}{.}% +} + +\setuppublicationlayout[mastersthesis]{% + \insertauthors{}{, }{}% + \inserttype{}{, }{Master's thesis, }% + \insertpublisher{}{, }{}% + \insertpubyear{(}{)}{}% + \insertpages{\unskip, }{}{}% + \insertNote{\unskip. }{.}{\unskip.}% +} + +\setuppublicationlayout[phdthesis]{% + \insertauthors{}{, }{}% + \inserttype{}{, }{Ph.D. thesis, }% + \insertpublisher{}{, }{}% + \insertpubyear{(}{)}{}% + \insertpages{\unskip, }{}{}% + \insertNote{\unskip. }{.}{\unskip.}% +} + +\setuppublicationlayout[misc]{% + \insertauthors{}{% + \inserttitle{, \bgroup \it }{\egroup \insertseries{ (}{)}{} }{}% + }{% + \insertthekey{}{% + \inserttitle{, \bgroup \it }{\egroup \insertseries{ (}{)}{} }{}% + }{% + \inserttitle{, \bgroup \it }{\egroup \insertseries{ (}{)}{} }{}% + }}% + \insertpubyear{(% + \insertpublisher{}{, }{}% + }% + {)}% + {% + \inserthowpublished{\unskip, }{}{}% + }% + \insertpages{\unskip, }{}{}% + \inserteprint{\unskip, }{}{}% + \insertNote{\unskip. }{.}{\unskip.}% +} + +\setuppublicationlayout[techreport]{% + \insertauthors{}{, }{}% + \inserttitle{\bgroup \it }{\egroup \insertseries{ (}{)}{} }{}% + \inserttype{}{}{Tech. Rep.}% + \insertvolume{ }{, }{, }% + \insertpublisher{}{ }{}% + \insertpubyear{(}{)}{}% + \insertpages{\unskip, }{}{}% + \insertNote{\unskip. }{.}{\unskip.}% +} + +\setuppublicationlayout[unpublished]{% + \insertauthors{}{}{}% + \inserttitle{\bgroup \it }{\egroup \insertseries{ (}{)}{}}{}% + \inserttype{ (}{)}{}% + \insertpubyear{ (unpublished,}{)}{ (unpublished)}% + \insertpages{\unskip, }{ }{}% + \insertNote{\unskip. }{.}{\unskip.}% +} + +\protect \ No newline at end of file diff --git a/tex/context/bib/t-bib.tex b/tex/context/bib/t-bib.tex new file mode 100644 index 000000000..dbff4810f --- /dev/null +++ b/tex/context/bib/t-bib.tex @@ -0,0 +1,1177 @@ +%D \module +%D [ file=t-bib, +%D version=2005.01.04, +%D title=\CONTEXT\ Publication Module, +%D subtitle=Publications, +%D author=Taco Hoekwater, +%D date=\currentdate, +%D copyright=Public Domain] +%C +%C Donated to the public domain. + +\usemodule[bibltx] % bibtex files can contain latex left-overs + +%D Slightly adapted by HH (2005/01). For \BIBTEX\ relate questions, +%D contact Taco, if you expect interference with core macros, bother +%D Hans. This file will be cleaned up in due time. +%D +%D Documentation and additional resources can be found at +%D Taco's website: \url{tex.aanhet.net}. + +%D \subject{DONE} +%D +%D \startitemize +%D \item minor bugfixes today (25/6) +%D \item add finalnamesep support for Oxford comma (17/9) +%D \item add \insert... for: doi, eprint, howpublished (17-19/9) +%D \item minor fix (26/5/2004): +%D \item add author definition (and associated system variable) +%D \stopitemize + +%D \subject{TODO} +%D +%D \startitemize +%D \item export \type {\citation{}} +%D \item export a \type {\bibalternative{lastpubsep}} from BST instead of 'and' +%D \item don't reset [numbercommand] in \type {\setuppublication} by default +%D \item sort out different APS versions: PR A/B/L vs. RPM +%D \item (implement sub-options? / \type {\setupcitationstyle} ?) +%D \item worry about localization at same time +%D \item add hyperlinking to the doi->URL and \type {\cite}->list, in general +%D \item don't load the whole lot, but filter entries instead +%D \stopitemize + +\unprotect + +%D A few new shortcuts: + +\definesystemvariable {pv} % PublicationVariable +\definesystemvariable {pb} % PuBlication +\definemessageconstant {bib} +\definefileconstant {bibextension} {bbl} + +%D Some user information messages. + +\startmessages all library: bib + title: publications + 1: file -- not found, unknown style ignored + 2: file -- not found, don't forget to run bibtex + 3: wrote a new auxiliary file \jobname.aux + 4: loading database from -- + 5: warning: cite argument -- on \the\inputlineno + 6: loading formatting style from -- +\stopmessages + +%D Some constants for the multi-lingual interface + +\startconstants dutch english + + database: database database + sorttype: sorttype sorttype + compress: compress compress + autohang: autohang autohang + % author: author author + artauthor: artauthor artauthor + editor: editor editor + authoretallimit: authoretallimit authoretallimit + artauthoretallimit: artauthoretallimit artauthoretallimit + editoretallimit: editoretallimit editoretallimit + authoretaldisplay: authoretaldisplay authoretaldisplay + artauthoretaldisplay: artauthoretaldisplay artauthoretaldisplay + editoretaldisplay: editoretaldisplay editoretaldisplay + authoretaltext: authoretaltext authoretaltext + artauthoretaltext: artauthoretaltext artauthoretaltext + editoretaltext: editoretaltext editoretaltext + totalnumber: totalnumber totalnumber + firstnamesep: firstnamesep firstnamesep + vonsep: vonsep vonsep + juniorsep: juniorsep juniorsep + surnamesep: surnamesep surnamesep + lastnamesep: lastnamesep lastnamesep + finalnamesep: finalnamesep finalnamesep + namesep: namesep namesep + pubsep: pubsep pubsep + lastpubsep: lastpubsep lastpubsep + refcommand: refcommand refcommand + samplesize: samplesize samplesize + +\stopconstants + +\startvariables dutch english + + german czech + italian romanian + title: titel title + titel titul + titolo titlu + short: kort short + kurz short + short short + cite: cite cite + cite cite + cite cite + bbl: bbl bbl + bbl bbl + bbl bbl + bib: bib bib + bib bib + bib bib + author: auteur author + autor autor + autore autor + +\stopvariables + +%D The text string for the publication list header + +\setupheadtext[en][pubs=References] +\setupheadtext[nl][pubs=Literatuur] +\setupheadtext[de][pubs=Literatur] + +%D \macros{bibdoifelse} +%D +%D Here is a really small helper that is used a lot (which is why it +%D makes sense to use \type{\ifx} instead of \type{\doif..}). +%D This test is used in all the typesetting commands +%D (\type{\insert...}) we will encounter later. + +\def\bibdoifelse#1% + {\ifx#1\relax + \@EA\secondoftwoarguments + \else\ifx#1\empty + \@EAEAEA\secondoftwoarguments + \else + \@EAEAEA\firstoftwoarguments + \fi\fi} + +\def\bibdoif#1% + {\ifx#1\relax + \@EA\gobbleoneargument + \else\ifx#1\empty + \@EAEAEA\gobbleoneargument + \else + \@EAEAEA\firstofoneargument + \fi\fi} + +\def\bibdoifnot#1% + {\ifx#1\relax + \@EA\firstofoneargument + \else\ifx#1\empty + \@EAEAEA\firstofoneargument + \else + \@EAEAEA\gobbleoneargument + \fi\fi} + +%D Bibtex settings separated out + +%D No point in writing the aux file if there is no database... + +\def\setupbibtex{\dosingleempty\dosetupbibtex} + +\def\dosetupbibtex[#1]% + {\let\@@pbdatabase\empty + \let\@@pbsort \empty + \getparameters[\??pb][#1] + \expanded{\processaction[\@@pbsort]} + [ \v!no=>\def\bibstyle{cont-no}, + \v!author=>\def\bibstyle{cont-au}, + \v!title=>\def\bibstyle{cont-ti}, + \v!short=>\def\bibstyle{cont-ab}, + \s!default=>\def\bibstyle{cont-no}, + \s!unknown=>\def\bibstyle{cont-no}]% + \ifx\@@pbdatabase\empty\else \writeauxfile \fi} + +%D \macros{writeauxfile} +%D +%D Unfortunately, \BIBTEX\ is not the best configurable program +%D around. The names of the commands it parses as well as the \type{.aux} +%D extension to the file name are both hardwired. +%D +%D This means \CONTEXT\ has to write a \LATEX-style auxiliary file, yuk! +%D The good news is that it can be rather short. We'll just ask +%D \BIBTEX\ to output the entire database(s) into the \type{bbl} file. +%D +%D The \type{\bibstyle} command controls how the \type{bbl} file will +%D be sorted. The possibilities are: +%D +%D \startitemize[packed] +%D \item by author (+year, title): cont-au.bst +%D \item by title (+author, year): cont-ti.bst +%D \item by short key as in abbrev.bst: cont-ab.bst +%D \item not sorted at all: cont-no.bst +%D \stopitemize + +\def\writeauxfile + {\openout \scratchwrite \jobname.aux + \write \scratchwrite {\string\citation{*}}% + \write \scratchwrite {\string\bibstyle{\bibstyle}}% + \write \scratchwrite {\string\bibdata{\@@pbdatabase}}% + \closeout\scratchwrite + \showmessage\m!bib{3}{}} + +%D \macros{ifsortbycite,iftypesetall,ifautohang,ifbibcitecompress} +%D +%D The module needs some new \type{\if} statements. + +%D Default sort order of the reference list is by citation. + +\newif\ifsortbycite \sortbycitetrue + +%D By default, only referenced publications are typeset + +\newif\iftypesetall \typesetallfalse + +%D Hanging indentation of the publication list +%D will not adjust itself according to the width of the label. + +\newif\ifautohang \autohangfalse + +%D Cite lists are compressed, if possible. + +\newif\ifbibcitecompress \bibcitecompresstrue + +\def\setuppublications + {\dosingleargument\dosetuppublications} + +\def\bibleftnumber#1% + {#1\hfill~} + +\def\dosetuppublications[#1]% + {\getparameters + [\??pb] + [\c!numbercommand=\bibleftnumber,\c!alternative=,#1]% + \doifsomething\@@pbalternative + {\readsysfile{bibl-\@@pbalternative.tex} + {\showmessage\m!bib{6}{bibl-\@@pbalternative}\let\@@pbalternative\empty} + {\showmessage\m!bib{1}{bibl-\@@pbalternative}\let\@@pbalternative\empty}}% + \doifnothing{\@@pbalternative} + {\processaction + [\@@pbcriterium] + [ \v!all=>\typesetalltrue, + \s!unknown=>\typesetallfalse]% + \processaction + [\@@pbautohang] + [ \v!yes=>\autohangtrue, + \s!unknown=>\autohangfalse]% + \processaction + [\@@pbsorttype] + [ \v!cite=>\sortbycitetrue, + \v!bbl=>\sortbycitefalse, + \s!default=>\sortbycitetrue, + \s!unknown=>\sortbycitefalse]% + \processaction + [\@@pbnumbering] + [ \v!yes=>\let\@@pbinumbercommand\firstofoneargument, + \v!no=>\let\@@pbinumbercommand\gobbleoneargument, + \v!short=>\def\@@pbinumbercommand##1{\@@pbs}, + \v!bib=>\def\@@pbinumbercommand##1{\@@pbn}, + \s!unknown=>\let\@@pbinumbercommand\firstofoneargument]% + \processaction + [\@@pbrefcommand] + [\s!default=>\edef\@@citedefault{\@@pbrefcommand}, + \s!unknown=>\edef\@@citedefault{\@@pbrefcommand}]}} + +% initialize + +\def\@@pbrefcommand{num} + +%D how to load the references: + +\appendtoks \dousepublications\jobname \to \everystarttext + +%D \macros{usepublications} +%D +%D We need \type{\usereferences} so that it is possible to +%D refer to page and/or appearance number for publications +%D in the other document. + +\def\usepublications[#1]% + {\usereferences[#1]\processcommalist[#1]\dousepublications} + +\def\dousepublications#1% + {\readsysfile{#1.\f!bibextension} + {\showmessage\m!bib{4}{#1.\f!bibextension}} + {\showmessage\m!bib{2}{#1.\f!bibextension}}} + +%D \macros{setuppublicationlist} +%D +%D This will be the first command in (\BIBTEX-generated) \type{bbl} +%D files. `samplesize' is a sample value (in case of \BIBTEX-generated +%D files, this will be the longest `short' key). `totalnumber' +%D is the total number of entries that will follow in this +%D file. + +%D Both values are only needed for the label calculation +%D if `autohang' is `true', so by default the command is +%D not even needed, and therefore I saw no need to give +%D it it's own system variable and it just re-uses \type{pb}. + +\def\setuppublicationlist + {\dosingleempty\dosetuppublicationlist} + +\definelist[pubs][pubs] + +\def\dosetuppublicationlist[#1]% + {\getparameters + [@@pvdata] + [\c!samplesize={AA99},\c!totalnumber={99},#1]% for sample & totalnumber & firstnamesep etc. + \setuplist + [pubs] + [\c!alternative=a,\c!pagenumber=\v!no,#1]} + +\def\setuppublicationlayout[#1]% + {\setvalue{@@pvdata#1}} + +%D \macros{bibalternative} +%D +%D A nice little shorthand that will be used so we don't have to +%D key in the weird \type{\@@pv} parameter names all the time. + +\def\bibalternative#1% + {\getvalue{\??pv\@@currentalternative#1}} + +%D \macros{simplebibdef,bibcommandlist} +%D +%D \type{\simplebibdef} defines \type{bib@#1}, which in turn will +%D use one argument that is stored in \type{@@pb@#1}. +%D +%D \type{\simplebibdef} also defines \type{insert#1}, which can be +%D used in the argument of \type{\setuppublicationlayout} to fetch +%D one of the \type{@@pb@} data entries. \type{insert#1} then has +%D three arguments: \type{#1} are commands to be executed before the +%D data, \type{#2} are commands to be executed after the data, and +%D \type{#3} are commands to be executed if the data is not found. + +%D \type{\bibcommandlist} is the list of commands that is affected +%D by this approach. Later on, it will be used to do a series +%D of assignments from \type{#1} to \type{bib@#1}: e.g +%D \type{\title} becomes \type{\bib@title} when used within +%D a publication. + +\def\simplebibdef#1% hh: funny expansion ? + {\@EA\long\@EA\def\csname bib@#1\endcsname##1% + {\setvalue{\??pb @#1}{##1}\ignorespaces}% + \@EA\def\csname insert#1\endcsname##1##2##3% + {\@EA\bibdoifelse + \@EA{\csname @@pb@#1\endcsname}% + {##1\csname @@pb@#1\endcsname##2}% + {##3}}} + +\def\bibcommandlist + {arttitle,title,journal,notes, + volume,issue,pubname,city,country, + type,organization,institute,series,thekey, + edition,month,pubyear,note,annotate,pages, + keyword,keywords,comment,abstract,names,size, + issn,isbn,chapter,eprint,doi,howpublished} + +\processcommacommand[\bibcommandlist]\simplebibdef + +\def\newbibfield[#1]% + {\simplebibdef{#1}% + \edef\bibcommalist{\bibcommandlist,#1}} + +%D \macros{bib@crossref} +%D +%D \type{\crossref} is used in database files to point to another +%D entry. Because of this special situation, it has to be defined +%D separately. Since this command will not be seen until at +%D \type{\placepublications}, it may force extra runs. The same is +%D true for \type{\cite} commands inside of publications. + +\def\bib@crossref#1% + {\setvalue{\??pb @crossref}{#1}\ignorespaces} + +\def\insertcrossref#1#2#3% + {\bibdoifelse{\@@pb@crossref} + {#1\@EA\cite\@EA[\@@pb@crossref]#2} + {#3}} + +%D \macros{complexbibdef,specialbibinsert} +%D +%D The commands \type{\artauthor}, \type{\author} and +%D \type{\editor} are more complex than the other commands. +%D Their argument lists have this form: +%D +%D \type{\author[junior]{firstnames}[inits]{von}{surname}} +%D +%D (bracketed stuff should become optional someday) +%D +%D And not only that, but there also might be more than one of each of +%D these commands. This is why a special command is needed to insert +%D them, as well as one extra counter for each command. + +%D All of these \type{\@EA}'s and \type{\csnames} make this code +%D look far more complex than it really is. For example, the argument +%D \type{author} defines the macro \type{\bib@author} to do two +%D things: increment the counter \type{\author@num} (let's say to 2) +%D and next store it's arguments in the macro \type{\@@pb@author2}. +%D And it defines \type{\insertauthors} to expand into +%D \starttypen +%D \specialbibinsert{author}{\author@num}{}{}{} +%D \stoptypen + +% hh: use a context counter instead, more options + +\def\complexbibdef#1% + {\@EA\newcounter\csname #1@num\endcsname + \@EA\def\csname bib@#1\endcsname[##1]##2[##3]##4##5% + {\@EA\increment\csname #1@num\endcsname + \setvalue{\??pb @#1\csname #1@num\endcsname}% + {{##2}{##4}{##5}{##3}{##1}}\ignorespaces}% + \@EA\def\csname insert#1s\endcsname##1##2##3% + {\specialbibinsert{#1}{\csname #1@num\endcsname}{##1}{##2}{##3}}} + +\processcommalist[author,artauthor,editor]\complexbibdef + +%D Another level of indirection is needed to control the +%D typesetting of all of these arguments, which explains the usage +%D of \type{\tempa} below. + +%D There is some sneaky stuff with \type{\tempa} and \type{\tempb} +%D going on here to resolve the \type{\csname}'s. It probably could +%D be done a little bit more elegant, but it works. The basic goal +%D is to get the command that will actually typeset the name into +%D the macro \type{\tempb}, and to make sure that that command will actually +%D recieve five arguments (see the definition of +%D e.g. \type{\invertedauthor} below). + +%D There is a conflict between `author' and the predefined interface +%D variable `auteur'. The old version is overruled `auteur' is +%D overruled by the systemconstant definition at the top of this file! + +%D The increment/decrement trick on \type{\scratchcounter} is needed +%D to decide what name the last one is. + +\newcount\etallimitcounter +\newcount\etaldisplaycounter +\newcount\todocounter + +\def\specialbibinsert#1#2#3#4#5% + {\bgroup + \ifnum#2>\zerocount + \letcscsname\tempa\csname @@pvdata#1\endcsname + \def\tempb{\@EA\tempa}% + \etallimitcounter =0\bibalternative{#1etallimit}\relax + \etaldisplaycounter=0\bibalternative{#1etaldisplay}\relax + \ifnum #2>\etallimitcounter + \todocounter\etaldisplaycounter + % just in case ... + \ifnum\todocounter>\etallimitcounter + \todocounter\etallimitcounter + \fi + \else + \todocounter#2\relax + \fi + \scratchcounter\zerocount + \ifnum\todocounter>\zerocount + #3% + \doloop + {\ifnum \scratchcounter < \todocounter + \advance\scratchcounter \plusone + \ifnum \scratchcounter = \todocounter + \@EA\tempb \csname @@pb@#1\the\scratchcounter\endcsname + \ifnum\etallimitcounter<#2 \bibalternative{#1etaltext}\fi #4% + \else + \@EA\tempb \csname @@pb@#1\the\scratchcounter\endcsname + \advance\scratchcounter \plusone + \ifnum \scratchcounter = \todocounter + \ifnum \todocounter > \plustwo + \bibalternative\c!finalnamesep + \else + \bibalternative\c!lastnamesep + \fi + \else + \bibalternative\c!namesep + \fi + \advance\scratchcounter \minusone + \fi + \else + \exitloop + \fi}% + \else + #5% + \fi + \else + #5% + \fi + \egroup} + +%D \macros{invertedauthor,normalauthor,invertedshortauthor,normalshortauthor} +%D +%D Just some commands that can be used in \type{\setuppublicationparameters} +%D If you want to write an extension to the styles, you might +%D as well define some of these commands yourself. +%D +%D The argument liust has been reordered here, and the meanings +%D are: +%D +%D {\obeylines\parskip0pt +%D \type{#1} firstnames +%D \type{#2} von +%D \type{#3} surname +%D \type{#4} inits +%D \type{#5} junior +%D } +%D + +\def\invertedauthor#1#2#3#4#5% + {\bibdoif{#2}{#2\bibalternative\c!vonsep}% + #3\bibalternative\c!surnamesep + \bibdoif{#5}{#5\bibalternative\c!juniorsep}% + \bibdoif{#1}{#1\unskip}} + +\def\normalauthor#1#2#3#4#5% + {\bibdoif{#1}{#1\bibalternative\c!firstnamesep}% + \bibdoif{#2}{#2\bibalternative\c!vonsep}% + #3\bibalternative\c!surnamesep + \bibdoif{#5}{#5\unskip}} + +\def\invertedshortauthor#1#2#3#4#5% + {\bibdoif{#2}{#2\bibalternative\c!vonsep}% + #3\bibalternative\c!surnamesep + \bibdoif{#5}{#5\bibalternative\c!juniorsep}% + \bibdoif{#4}{#4\unskip}} + +\def\normalshortauthor#1#2#3#4#5% + {\bibdoif{#4}{#4\bibalternative\c!firstnamesep}% + \bibdoif{#2}{#2\bibalternative\c!vonsep}% + #3\bibalternative\c!surnamesep + \bibdoif{#5}{#5\unskip}} + +%D \macros{clearbibitem,clearbibitemtwo,bibitemdefs} +%D +%D These are used in \type{\typesetapublication} to do +%D initializations and cleanups. + +\def\clearbibitem#1{\setvalue{\??pb @#1}{}}% + +\def\clearbibitemtwo#1% + {\letvalue{#1@num}\!!zerocount + \scratchcounter\plusone + \doloop + {\doifdefinedelse{\??pb @#1\the\scratchcounter} + {\letvalue{\??pb @#1\the\scratchcounter}\empty + \advance\scratchcounter\plusone}% + {\exitloop}}} + +\def\bibitemdefs#1{\setvalue{#1}{\csname bib@#1\endcsname}} + +%D \macros{startpublication} +%D +%D We are coming to the end of this module, to the macros that +%D do typesetting and read the \type{bbl} file. +%D +%D The stuff between \type{\startpublication} ... \type{\stoppublication} +%D is simply stored into a macro: either +%D \type{\publist} (potentially huge) or separate macros +%D for each of them, depending on whether +%D or not we do \type{\sortbycite}, as explained above. + +\newcounter\bibcounter + +%D Just a \type{\dosingleempty} is the most friendly +%D of doing this: there need not even be an argument +%D to \type{\startpublication}. Of course, then there +%D is no key either, and it had better be an +%D article (otherwise the layout will be all screwed up). + +\def\startpublication{\dosingleempty\dostartpublication} +\def\stoppublication {} + +%D Only specifying the key in the argument is also +%D legal. In storing this stuff into macros, some trickery with +%D token registers is needed to fix the expansion problems. Even so, +%D this appears to not always be 100\% safe, so people are +%D urgently advised to use \ETEX\ instead of traditional \TEX. +%D +%D In \ETEX, all expansion problems are conviniently solved by +%D the primitive \type{\protected}. To put that another way: +%D +%D It's not a bug in this module if it does not appear in \ETEX! + +\long\def\dostartpublication[#1]#2\stoppublication% + {\increment\bibcounter + \bgroup + \bgroup\honorunexpanded + \doifassignmentelse{#1}% + {\egroup\getparameters[\??pb][k=,t=article,n=,s=,a=,y=,o=,#1]}% + {\egroup\getparameters[\??pb][k=#1,t=article,n=,s=,a=,y=,o=]}% + \toks0={\ignorespaces #2}% + \@EA\toks\@EA2\@EA{\@@pba}% + \@EA\toks\@EA4\@EA{\@@pbs}% + \setxvalue{pbd-\@@pbk}% + {{\the\toks2}% \@@pba (author) + {\@@pby}% + {\the\toks4}% \@@pbs (short) + {\@@pbn}% + {\@@pbt}% + {\the\toks0}% (data) + {\@@pbo}}% doi + \xdef\allrefs{\allrefs,\@@pbk}% + \egroup} + +% intialization of the order-list: + +\let\allrefs\empty + +% how to get stuff from a pbd-*** macro: + +\def\restorebibdata#1% + {\def\@@pbk{#1}% + \@EA\dorestorebibdata\csname pbd-#1\endcsname} + +\def\dorestorebibdata#1% + {\@EA\dodorestorebibdata#1{}{}{}{}{}{}{}\relax} + +\def\dodorestorebibdata#1#2#3#4#5#6#7#8\relax% + {\def\@@pba{#1}% + \def\@@pby{#2}% + \def\@@pbs{#3}% + \def\@@pbn{#4}% + \def\@@pbt{#5}% + \def\@@pbd{#6}% + \def\@@pbo{#7}} + +%D The \writeutility trick is dodgy at best, but it is needed +%D to make sure that \placepublications\stoptext works as +%D advertised. (without the \immediate, there *has* to be at +%D least one page break between \placepublications and \stoptext) +%D + +\def\preinitializepubslist + {\let\bibcounter\!!zerocount + \ifsortbycite + \processcommacommand[\publist]\sortwritepublist + \glet\publist\empty + \iftypesetall + \processcommacommand[\allrefs]\writepublist + \fi + \else + \iftypesetall + \processcommacommand[\allrefs]\writepublist + \else + \processcommacommand[\allrefs]\writereferredpublist + \fi + \fi} + +\def\initializepubslist + {\edef\@@pbnumbering{\@@pbnumbering}% + \ifautohang + \ifx\@@pbnumbering\v!short + \setbox\scratchbox\hbox{\@@pbnumbercommand{\csname @@pvdata\c!samplesize\endcsname}}% + \else\iftypesetall + \setbox\scratchbox\hbox{\@@pbnumbercommand{\csname @@pvdata\c!totalnumber\endcsname}}% + \else + \setbox\scratchbox\hbox{\@@pbnumbercommand{\numreferred}}% + \fi\fi + \edef\samplewidth{\the\wd\scratchbox}% + \setuplist[pubs][\c!width=\samplewidth,\c!distance=0pt]% + \def\@@pblimitednumber##1{\hbox to \samplewidth{\@@pbnumbercommand{##1}}}% + \else + \def\@@pblimitednumber##1{\hbox{\@@pbnumbercommand{##1}}}% + \fi + \ifx\@@pbnumbering\v!no + \setuplist[pubs][\c!numbercommand=,\c!textcommand=\outdented] + \else + \setuplist[pubs][\c!numbercommand=\@@pblimitednumber,\c!textcommand=] + \fi} + +\def\outdented#1% move to supp-box ? + {\hskip -\hangindent + \strut#1\strut} + +%D The full list of publications + +\def\completepublications + {\dosingleempty\docompletepublications} + +\def\docompletepublications[#1]% + {\preinitializepubslist + \ifcase\bibcounter\or + \initializepubslist + \let\bibcounter\!!zerocount + \completelist[pubs][\c!criterium=all,#1]% + \fi} + +%D And the portion with the entries only. + +\def\placepublications + {\dosingleempty\doplacepublications} + +\def\doplacepublications[#1]% + {\preinitializepubslist + \ifcase\bibcounter\or + \initializepubslist + \let\bibcounter\!!zerocount + \placelist[pubs][\c!criterium=\v!all,#1]% + \fi} + +\def\dowritebiblist#1#2% + {\restorebibdata{#2}% + \edef\pbnumbercommand{\@@pbinumbercommand{#1}}% + \@EA\dodowritebiblist\@EA{\pbnumbercommand}{\typesetapublication{#2}}} + +\def\dodowritebiblist + {\writetolist[pubs]} + +\def\writepublist#1% + {\doifnotempty{#1} + {\increment\bibcounter + \@EA\dowritebiblist\@EA{\bibcounter}{#1}}} + +\def\writereferredpublist#1% + {\doifnotempty{#1} + {\doifreferredelse{#1} + {\increment\bibcounter + \@EA\dowritebiblist\@EA{\bibcounter}{#1}}{}}} + +\def\sortwritepublist#1% + {\doifnotempty{#1} + {\removefromcommalist{#1}\allrefs + \increment\bibcounter + \@EA\dowritebiblist\@EA{\bibcounter}{#1}}} + +%D \subonderwerp{What's in a publication} +%D + +\def\typesetapublication + {\doglobal\increment\bibcounter + \dotypesetapublication} + +\def\dotypesetapublication#1% + {\bgroup + \def\@@currentalternative{data}% + \restorebibdata{#1}% + \processcommacommand[\bibcommandlist,crossref]\clearbibitem + \processcommalist [artauthor,author,editor]\clearbibitemtwo + \processcommacommand[\bibcommandlist]\bibitemdefs + \processcommalist [artauthor,author,editor,crossref]\bibitemdefs + \expanded{\reference[\@@pbk]{\bibcounter}}% + \@@pbd % execute data + \bibalternative{\@@pbt}% do typesetting + \egroup} + +%D An afterthought + +\def\maybeyear#1{} + +%D \onderwerp{Citations} + +%D \macros{cite,bibref} +%D +%D The indirection with \type{\dobibref} allows \LATEX\ style +%D \type{\cite} commands with a braced argument (these might appear +%D in included data from the \type{.bib} file). + +\def\cite + {\doifnextcharelse{[} + {\dodoubleempty\docite} + {\dobibref}} + +\def\dobibref#1% + {\docite[#1]} + +\def\docite#1[#2]#3[#4]% + {\ifsecondargument + \def\@@currentalternative{#2}% + \expanded{\processaction[\csname @@pv#2compress\endcsname]} + [ \v!yes=>\bibcitecompresstrue, + \v!no=>\bibcitecompressfalse, + \s!default=>\bibcitecompresstrue, + \s!unknown=>\bibcitecompresstrue]% + \getvalue{bib#2ref}[#4]% + \else + \expanded{\processaction[\csname @@pv\@@citedefault compress\endcsname]} + [ \v!yes=>\bibcitecompresstrue, + \v!no=>\bibcitecompressfalse, + \s!default=>\bibcitecompresstrue, + \s!unknown=>\bibcitecompresstrue]% + \edef\@@currentalternative{\@@citedefault}% + \getvalue{bib\@@citedefault ref}[#2]% + \fi} + +\def\setupcite#1[#2]#3[#4]% + {\def\getciteargs##1{\getparameters[\??pv##1][#4]}% + \processcommalist[#2]\dosetupcite} + +\def\dosetupcite#1% + {\getciteargs{#1}} + +%D \macros{numreferred,doifreferredelse,addthisref,publist} +%D +%D The interesting command here is \type{\addthisref}, which maintains +%D the global list of references. +%D +%D \type{\numreferred} is needed to do automatic calculations on +%D the label width, and \type{\doifreferredelse} will be used +%D to implement \type{criterium=cite}. + +\newcounter\numreferred + +\long\def\doifreferredelse#1{\doifdefinedelse{pbr-#1}} + +\def\addthisref#1% + {\doifundefined{pbr-#1} + {\setgvalue{pbr-#1}{a}% + \doglobal\increment\numreferred + \appended\gdef\publist{,#1}}} + +\let\publist\empty + +%D \macros{doifbibreferencefoundelse} +%D +%D Some macros to fetch the information provided by +%D \type{\startpublication}. + +\def\doifbibreferencefoundelse#1#2#3% + {\doifdefinedelse{pbd-#1} + {\restorebibdata{#1}#2} + {\showmessage\m!bib{5}{#1 is unknown}#3}} + +%D \macros{ixbibauthoryear,thebibauthors,thebibyears} +%D +%D If compression of \type{\cite}'s argument expansion is on, +%D the macros that deal with authors and years call this internal +%D command to do the actual typesetting. +%D +%D Two entries with same author but with different years may +%D be condensed into ``Author (year1,year2)''. This is about the +%D only optimization that makes sense for the (author,year) +%D style of citations (years within one author have to be unique +%D anyway so no need to test for that, and ``Author1, Author2 (year)'' +%D creates more confusion than it does good). +%D +%D In the code below, +%D the macro \type{\thebibauthors} holds the names of the alternative +%D author info fields for the current list. This is a commalist, +%D and \type{\thebibyears} holds the (collection of) year(s) that go with +%D this author (possibly as a nested commalist). +%D +%D There had better be an author for all cases, but there +%D does not have to be year info always. \type{\thebibyears} is +%D pre-initialized because this makes the insertion macros simpler. +%D +%D In `normal' \TeX, of course there are expansion problems again. + +\def\gobble#1{\def#1##1{##1}} + +\def\sanitizeaccents{\processcommalist[\',\`,\",\.,\c,\d,\~,\=]\gobble} + +\def\ixbibauthoryear#1#2#3#4% + {\bgroup + \sanitizeaccents + \gdef\ixlastcommand {#4}% + \gdef\ixsecondcommand{#3}% + \gdef\ixfirstcommand {#2}% + \glet\thebibauthors \empty + \glet\thebibyears \empty + \glet\theauthorssize \empty + \getcommalistsize[#1]% + \ifbibcitecompress + \dorecurse\commalistsize{\xdef\thebibyears{\thebibyears,}}% + \processcommalist[#1]\docompressbibauthoryear + \else + \processcommalist[#1]\donormalbibauthoryear + \fi + \getcommacommandsize[\thebibauthors]% + \xdef\theauthorssize{\commalistsize}% + \egroup + \dobibauthoryear} + +%D \macros{dodobibauthoryear} +%D +%D This macro only has to make sure that the lists +%D \type{\thebibauthors} and \type{\thebibyears} are printed. + +\def\dobibauthoryear + {\scratchcounter\zerocount + \getcommacommandsize[\thebibauthors]% + \@EA\processcommalist\@EA[\thebibauthors]\dodobibauthoryear} + +\def\dodobibauthoryear#1% + {\advance\scratchcounter\plusone + \edef\wantednumber{\the\scratchcounter}% + \getfromcommacommand[\thebibyears][\wantednumber]% + \def\AU{#1}% brr + \@EA\def\@EA\YR\@EA{\commalistelement}% + \ifnum\scratchcounter=\plusone + \ixfirstcommand + \else\ifnum \scratchcounter=\commalistsize\relax + \ixlastcommand + \else + \ixsecondcommand + \fi\fi} + +%D \macros{donormalbibauthoryear} +%D +%D Now we get to the macros that fill the two lists. +%D The `simple' one really is quite simple. + +\def\donormalbibauthoryear#1% + {\addthisref{#1}% + \xdef\myauthor{Xxxxxxxxxx}% + \xdef\myyear{0000}% + \doifbibreferencefoundelse{#1} + {\@EA\gdef\@EA\myauthor\@EA{\@@pba}% + \@EA\gdef\@EA\myyear \@EA{\@@pby}} + {}% + \@EA\doglobal\@EA\addtocommalist\@EA{\myauthor}\thebibauthors + \@EA\doglobal\@EA\addtocommalist\@EA{\myyear }\thebibyears} + +%D \macros{docompressbibauthoryear} +%D +%D So much for the easy parts. Nothing at all will be done if +%D the reference is not found or the reference does not contain +%D author data. No questions marks o.s.s. (to be fixed later) + +\def\docompressbibauthoryear#1% + {\addthisref{#1}% + \xdef\myauthor{Xxxxxxxxxx}% + \xdef\myyear {0000}% + \doifbibreferencefoundelse{#1} + {\@EA\gdef\@EA\myauthor\@EA{\@@pba}% + \@EA\gdef\@EA\myyear \@EA{\@@pby}} + {}% + \ifx\myauthor\empty\else + \checkifmyauthoralreadyexists + \findmatchingyear + \fi} + +%D two temporary counters. One of these two can possibly be replaced +%D by \type{\scratchcounter}. + +\newcount\bibitemcounter +\newcount\bibitemwanted + +%D The first portion is simple enough: if this is the very first author +%D it is quite straightforward to add it. \type{\bibitemcounter} and +%D \type{\bibitemwanted} are needed later to insert the year +%D information in the correct item of \type{\thebibyears} + +\def\checkifmyauthoralreadyexists + {\doifemptyelsevalue{thebibauthors} + {\global\bibitemcounter\plusone + \global\bibitemwanted \plusone + \@EA\gdef\@EA\thebibauthors\@EA{\myauthor}} % hh: one level + {\getcommacommandsize[\thebibauthors]% + \global\bibitemwanted\zerocount + \global\bibitemcounter\commalistsize + \processcommacommand[\thebibauthors]\docomparemyauthor}} + +%D The outer \type{\ifnum} accomplishes the addition of +%D a new author to \type{\thebibauthors}. The messing about with +%D the two counters is again to make sure that \type{\thebibyears} +%D will be updated correctly.If the author {\it was} found, +%D the counters will stay at their present values and everything +%D will be setup properly to insert the year info. + +\def\docomparemyauthor#1% + {\global\advance\bibitemwanted \plusone + \def\mytempc{#1}% + \ifnum\bibitemwanted = \commalistsize\relax + \ifx\mytempc\myauthor \else + \global\advance\bibitemwanted \plusone + \global\bibitemcounter\bibitemwanted\relax + \@EA\doglobal\@EA\addtocommalist\@EA{\myauthor}\thebibauthors + \quitcommalist + \fi + \else + \ifx\mytempc\myauthor + \quitcommalist + \fi + \fi} + +%D This macro should be clear now. + +\def\findmatchingyear + {\edef\wantednumber{\the\bibitemwanted}% + \getfromcommacommand[\thebibyears][\wantednumber]% + \ifx\commalistelement\empty + \edef\myyear{{\myyear}}% + \else + \edef\myyear{{\commalistelement, \myyear}}% + \fi + \edef\newcommalistelement{\myyear}% + \doglobal\replaceincommalist \thebibyears \wantednumber} + +%D \macros{bibauthoryearref,bibauthoryearsref,bibauthorref,bibyearref} +%D +%D Now that all the hard work has been done, these are simple. +%D \type{\ixbibauthoryearref} stores the data in the macros +%D \type{\AU} and \type{\YR}. + +\def\bibauthoryearref[#1]% + {\ixbibauthoryear{#1}% + {{\AU}\bibalternative\c!inbetween + \bibalternative\v!left{\YR}\bibalternative\v!right} + {\bibalternative\c!pubsep{\AU}\bibalternative\c!inbetween + \bibalternative\v!left {\YR}\bibalternative\v!right} + {\bibalternative\c!lastpubsep{\AU}\bibalternative\c!inbetween + \bibalternative\v!left {\YR}\bibalternative\v!right}} + +\def\bibauthoryearsref[#1]% + {\bibalternative\v!left + \ixbibauthoryear{#1} + {{\AU}\bibalternative\c!inbetween{\YR}} + {\bibalternative\c!pubsep {\AU}\bibalternative\c!inbetween{\YR}} + {\bibalternative\c!lastpubsep{\AU}\bibalternative\c!inbetween{\YR}}% + \bibalternative\v!right} + +\def\bibauthorref[#1]% + {\bibalternative\v!left + \ixbibauthoryear{#1}% + {{\AU}} + {\bibalternative\c!pubsep {\AU}} + {\bibalternative\c!lastpubsep{\AU}}% + \bibalternative\v!right} + +\def\bibyearref[#1]% + {\bibalternative\v!left + \ixbibauthoryear{#1}% + {{\YR}} + {\bibalternative\c!pubsep {\YR}} + {\bibalternative\c!lastpubsep{\YR}}% + \bibalternative\v!right} + +%D ML problems: + +%D \macros{bibshortref,bibkeyref,bibpageref,bibtyperef,bibnumberref} +%D +%D There is hardly any point in trying to compress these. The only +%D thing that needs to be done is making sure that +%D the separations are inserted correctly. And that is +%D what \type{\refsep} does. + +\newif\iffirstref + +\def\refsep{\iffirstref\firstreffalse\else\bibalternative\c!pubsep\fi} + +\def\bibshortref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibshort + \bibalternative\v!right} + +\def\dobibshort#1% + {\addthisref{#1}\refsep + \doifbibreferencefoundelse{#1}{\@@pbs}{??}} + + +\def\bibnumberref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibnumbered + \bibalternative\v!right} + +\def\dobibnumbered#1% + {\addthisref{#1}\refsep + \doifbibreferencefoundelse{#1}{\@@pbn}{??}} + +\def\bibkeyref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibkeyref + \bibalternative\v!right} + +\def\dobibkeyref#1% + {\addthisref{#1}\refsep#1} + +\def\bibdoiref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibdoiref + \bibalternative\v!right} + +\def\dobibdoiref#1% + {\addthisref{#1}\refsep#1} + +\def\bibtyperef[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibtyperef + \bibalternative\v!right} + +\def\dobibtyperef#1% + {\addthisref{#1}\refsep + \doifbibreferencefoundelse{#1}{\@@pbt}{??}} + +\def\bibpageref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibpageref + \bibalternative\v!right} + +\def\dobibpageref#1% + {\addthisref{#1}\refsep\at[#1]} + +\def\bibdataref[#1]% + {\bibalternative\v!left + \firstreftrue\processcommalist[#1]\dobibdata + \bibalternative\v!right} + +\def\dobibdata#1% + {\addthisref{#1}\refsep + \doifbibreferencefoundelse{#1}{\dotypesetapublication{#1}}{??}} + +%D \macros{bibnumref} +%D +%D It makes sense to try and compress the argument list of +%D \type{\bibnumref}. There are two things involved: the actual +%D compression, and a sort routine. The idea is to store the +%D found values in a new commalist called \type{\therefs}. + +%D But that is not too straight-forward, because \type{\in} is +%D not expandable, +%D so that the macro \type{\expandrefs} is needed. + +\def\expandrefs#1% + {\doifreferencefoundelse{#1} + {\@EA\doglobal\@EA\addtocommalist\@EA{\reftypet}\therefs } + {\showmessage\m!bib{5}{#1 unknown}% + \doglobal\addtocommalist{0}\therefs}} + +%D But at least the actual sorting code is simple (note that sorting +%D a list with exactly one entry fails to return anything, which +%D is why the \type{\ifx} is needed). + +\ifx\compresscommacommandnrs\undefined + \usemodule[list] + \let\compresscommacommandnrs\compresscommacommand +\fi + +\def\bibnumref[#1]% + {\bibalternative\v!left + \penalty\!!tenthousand + \processcommalist[#1]\addthisref + \firstreftrue + \ifbibcitecompress + \glet\therefs\empty + \processcommalist[#1]\expandrefs + \sortcommacommand[\therefs]\donumericcompare + \ifx\empty\sortedcommalist\else + \let\therefs\sortedcommalist + \fi + \compresscommacommandnrs[\therefs]% + % \message{\meaning\therefs, \meaning\compressedlist}% + \processcommacommand[\compressedlist]\verysimplebibnumref + \else + \processcommalist[#1]\dosimplebibnumref + \fi + \bibalternative\v!right} + +%D Here is the simple case first: + +\def\dosimplebibnumref #1{\refsep\in[#1]} +\def\verysimplebibnumref#1{\doverysimplebibnumref#1} + +\def\doverysimplebibnumref#1#2% + {\refsep + \ifcase#1\relax ??\else + \def\tempa{#2}\ifx\empty\tempa#1\else#1\bibalternative\c!inbetween#2\fi + \fi} + +%D And some defaults are loaded from bibl-apa: + +% hh: shouldn't those bibl files be made international ? + +\setuppublications + [\c!alternative=apa] + +%D \completepublications + +\protect \endinput diff --git a/tex/context/bib/t-bibltx.tex b/tex/context/bib/t-bibltx.tex new file mode 100644 index 000000000..cb9e787ad --- /dev/null +++ b/tex/context/bib/t-bibltx.tex @@ -0,0 +1,75 @@ +%D \module +%D [ file=t-bibltx, +%D version=2005.01.04, +%D title=\CONTEXT\ Publication Module, +%D subtitle=Publications, +%D author={Taco Hoekwater}, +%D date=\currentdate, +%D copyright={Public Domain}] +%C +%C Donated to the public domain. + +%D \macros{newcommand} +%D +%D Just about all databases define something that uses +%D \type {\newcommand}. This fake version does not cover +%D everything \type {\newcommand} does, but it should be +%D enough for simple definitions like the ones found in +%D \BIBTEX\ files. + +\unprotect + +\def\@star@or@long#1% + {\doifnextcharelse*{\afterassignment#1\let\next=}{#1}} + +\def\newcommand + {\@star@or@long\new@command} + +\def\new@command#1% + {\@testopt{\@newcommand#1}0} + +\def\@newcommand#1[#2]% + {\doifnextcharelse[{\@xargdef#1[#2]}{\@argdef#1[#2]}} + +\long\def\@argdef#1[#2]#3% + {\@yargdef#1\@ne{#2}{#3}} + +\long\def\@xargdef#1[#2][#3]#4% + {\@EA\def\@EA#1\@EA{\@EA\do@testopt\@EA#1\csname\string#1\endcsname{#3}}% + \@EA\@yargdef\csname\string#1\endcsname\tw@{#2}{#4}} + +\def\@testopt#1#2% + {\doifnextcharelse[{#1}{#1[#2]}} + +\def\do@testopt#1% + {\expandafter\@testopt} + +\long\def\@yargdef#1#2#3% + {\!!counta#3\relax + \advance \!!counta \@ne + \let\@hash@\relax + \edef\!!tempa{\ifx#2\tw@ [\@hash@1]\fi}% + \!!countb #2% + \loop + \ifnum\!!countb <\!!counta + \edef\!!tempa{\!!tempa\@hash@\the\!!countb}% + \advance\!!countb \@ne + \repeat + \let\@hash@##% + \long\@EA\def\@EA#1\!!tempa} + +\long\def\@reargdef#1[#2]% + {\@yargdef#1\@ne{#2}} + +%D Something like the following is needed to support the +%D average \LATEX-based \BIBTEX\ databases. +%D +%D \starttyping +%D \let\textsc\kap +%D \def\emph#1{{\em#1}} +%D \let\sf\ss +%D \stoptyping +%D +%D But we happily leave that to the user. + +\protect \endinput diff --git a/tex/context/config/cont-usr.tex b/tex/context/config/cont-usr.tex index 50556c463..4d09e6414 100644 --- a/tex/context/config/cont-usr.tex +++ b/tex/context/config/cont-usr.tex @@ -53,6 +53,9 @@ \definefilesynonym [lang-en.pat] [ushyphen.tex] % symbolic name, see below \definefilesynonym [lang-us.pat] [ushyphen.tex] % symbolic name, see below +%definefilesynonym [czhyph.pat] [czhyphen.tex] % safeguard +%definefilesynonym [skhyph.pat] [skhyphen.tex] % safeguard + \definefilesynonym [lang-cz.pat] [czhyphen.tex] % in a different part of the tree, sigh \definefilesynonym [lang-sk.pat] [skhyphen.tex] % in a different part of the tree, sigh diff --git a/tex/context/interface/cont-cz.xml b/tex/context/interface/cont-cz.xml index d7399bf8d..22a004bb0 100644 --- a/tex/context/interface/cont-cz.xml +++ b/tex/context/interface/cont-cz.xml @@ -4,7 +4,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -72,14 +72,14 @@ - + - + @@ -97,7 +97,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -213,32 +213,32 @@ - + - + - + - + - + - + @@ -301,18 +301,18 @@ - + - + - + @@ -337,7 +337,7 @@ - + @@ -353,7 +353,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -450,7 +450,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -498,7 +498,7 @@ - + @@ -510,7 +510,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -548,7 +548,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -594,7 +594,7 @@ - + @@ -612,7 +612,7 @@ - + @@ -623,7 +623,7 @@ - + @@ -634,7 +634,7 @@ - + @@ -647,14 +647,14 @@ - + - + @@ -684,7 +684,7 @@ - + @@ -695,7 +695,7 @@ - + @@ -722,7 +722,7 @@ - + @@ -731,14 +731,14 @@ - + - + @@ -842,7 +842,7 @@ - + @@ -854,7 +854,7 @@ - + @@ -955,25 +955,25 @@ - + - + - + - + @@ -993,7 +993,7 @@ - + @@ -1008,29 +1008,29 @@ - + - + - + - + - + @@ -1057,7 +1057,7 @@ - + @@ -1066,7 +1066,7 @@ - + @@ -1075,7 +1075,7 @@ - + @@ -1084,7 +1084,7 @@ - + @@ -1093,7 +1093,7 @@ - + @@ -1102,7 +1102,7 @@ - + @@ -1111,7 +1111,7 @@ - + @@ -1120,7 +1120,7 @@ - + @@ -1129,7 +1129,7 @@ - + @@ -1138,7 +1138,7 @@ - + @@ -1147,7 +1147,7 @@ - + @@ -1156,7 +1156,7 @@ - + @@ -1165,7 +1165,7 @@ - + @@ -1183,7 +1183,7 @@ - + @@ -1192,7 +1192,7 @@ - + @@ -1201,7 +1201,7 @@ - + @@ -1210,7 +1210,7 @@ - + @@ -1219,7 +1219,7 @@ - + @@ -1282,7 +1282,7 @@ - + @@ -1291,7 +1291,7 @@ - + @@ -1300,7 +1300,7 @@ - + @@ -1309,7 +1309,7 @@ - + @@ -1318,7 +1318,7 @@ - + @@ -1327,7 +1327,7 @@ - + @@ -1341,7 +1341,7 @@ - + @@ -1351,7 +1351,7 @@ - + @@ -1383,7 +1383,7 @@ - + @@ -1394,7 +1394,7 @@ - + @@ -1405,7 +1405,7 @@ - + @@ -1416,7 +1416,7 @@ - + @@ -1431,7 +1431,7 @@ - + @@ -1441,7 +1441,7 @@ - + @@ -1464,7 +1464,7 @@ - + @@ -1487,7 +1487,7 @@ - + @@ -1496,7 +1496,7 @@ - + @@ -1505,7 +1505,7 @@ - + @@ -1521,7 +1521,7 @@ - + @@ -1532,7 +1532,7 @@ - + @@ -1544,7 +1544,7 @@ - + @@ -1555,7 +1555,7 @@ - + @@ -1699,11 +1699,11 @@ - + - + @@ -1711,11 +1711,11 @@ - + - + @@ -1723,18 +1723,18 @@ - + - + - + @@ -1793,47 +1793,47 @@ - + - + - + - + - + - + - + @@ -1887,7 +1887,7 @@ - + @@ -1904,7 +1904,7 @@ - + @@ -1915,26 +1915,26 @@ - + - + - + - + @@ -1960,18 +1960,18 @@ - + - + - + @@ -1980,11 +1980,11 @@ - + - + @@ -1993,7 +1993,7 @@ - + @@ -2038,11 +2038,11 @@ - + - + @@ -2050,7 +2050,7 @@ - + @@ -2075,7 +2075,7 @@ - + @@ -2127,7 +2127,7 @@ - + @@ -2140,7 +2140,7 @@ - + @@ -2153,29 +2153,29 @@ - + - + - + - + - + @@ -2207,7 +2207,7 @@ - + @@ -2221,7 +2221,7 @@ - + @@ -2243,7 +2243,7 @@ - + @@ -2255,7 +2255,7 @@ - + @@ -2293,7 +2293,7 @@ - + @@ -2302,7 +2302,7 @@ - + @@ -2311,7 +2311,7 @@ - + @@ -2324,7 +2324,7 @@ - + @@ -2337,7 +2337,7 @@ - + @@ -2346,7 +2346,7 @@ - + @@ -2355,7 +2355,7 @@ - + @@ -2364,7 +2364,7 @@ - + @@ -2373,7 +2373,7 @@ - + @@ -2388,7 +2388,7 @@ - + @@ -2403,7 +2403,7 @@ - + @@ -2418,7 +2418,7 @@ - + @@ -2463,31 +2463,31 @@ - + - + - + - + - + @@ -2502,7 +2502,7 @@ - + @@ -2664,7 +2664,7 @@ - + @@ -2675,7 +2675,7 @@ - + @@ -2686,7 +2686,7 @@ - + @@ -2696,7 +2696,7 @@ - + @@ -2707,7 +2707,7 @@ - + @@ -2732,7 +2732,7 @@ - + @@ -2742,7 +2742,7 @@ - + @@ -2751,7 +2751,7 @@ - + @@ -2761,7 +2761,7 @@ - + @@ -2772,7 +2772,7 @@ - + @@ -2784,7 +2784,7 @@ - + @@ -2831,7 +2831,7 @@ - + @@ -2842,13 +2842,13 @@ - + - + @@ -2860,13 +2860,13 @@ - + - + @@ -2883,19 +2883,19 @@ - + - + - + @@ -2996,21 +2996,21 @@ - + - + - + @@ -3020,7 +3020,7 @@ - + @@ -3042,14 +3042,14 @@ - + - + @@ -3075,7 +3075,7 @@ - + @@ -3130,14 +3130,14 @@ - + - + @@ -3153,7 +3153,7 @@ - + @@ -3209,7 +3209,7 @@ - + @@ -3261,7 +3261,7 @@ - + @@ -3272,14 +3272,14 @@ - + - + @@ -3303,7 +3303,7 @@ - + @@ -3374,75 +3374,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3469,7 +3469,7 @@ - + @@ -3496,7 +3496,7 @@ - + @@ -3523,7 +3523,7 @@ - + @@ -3550,7 +3550,7 @@ - + @@ -3577,7 +3577,7 @@ - + @@ -3591,7 +3591,7 @@ - + @@ -3605,7 +3605,7 @@ - + @@ -3616,7 +3616,7 @@ - + @@ -3627,7 +3627,7 @@ - + @@ -3651,7 +3651,7 @@ - + @@ -3663,7 +3663,7 @@ - + @@ -3682,7 +3682,7 @@ - + @@ -3691,7 +3691,7 @@ - + @@ -3855,7 +3855,7 @@ - + @@ -3875,17 +3875,17 @@ - + - + - + @@ -3893,7 +3893,7 @@ - + @@ -3921,7 +3921,7 @@ - + @@ -3930,7 +3930,7 @@ - + @@ -3948,7 +3948,7 @@ - + @@ -3957,13 +3957,13 @@ - + - + @@ -3998,7 +3998,7 @@ - + @@ -4080,7 +4080,7 @@ - + @@ -4099,7 +4099,7 @@ - + @@ -4112,7 +4112,7 @@ - + @@ -4121,7 +4121,7 @@ - + @@ -4153,7 +4153,7 @@ - + @@ -4205,7 +4205,7 @@ - + @@ -4286,21 +4286,21 @@ - + - + - + @@ -4377,14 +4377,14 @@ - + - + @@ -4404,11 +4404,11 @@ - + - + @@ -4417,7 +4417,7 @@ - + @@ -4446,7 +4446,7 @@ - + @@ -4466,7 +4466,7 @@ - + @@ -4513,7 +4513,7 @@ - + @@ -4570,7 +4570,7 @@ - + @@ -4597,7 +4597,7 @@ - + @@ -4653,7 +4653,7 @@ - + @@ -4683,7 +4683,7 @@ - + @@ -4707,21 +4707,21 @@ - + - + - + @@ -4753,7 +4753,7 @@ - + @@ -4767,7 +4767,7 @@ - + @@ -4780,7 +4780,7 @@ - + @@ -4801,49 +4801,49 @@ - + - + - + - + - + - + - + @@ -4853,14 +4853,14 @@ - + - + @@ -5031,14 +5031,14 @@ - + - + @@ -5048,14 +5048,14 @@ - + - + @@ -5070,14 +5070,14 @@ - + - + @@ -5085,14 +5085,14 @@ - + - + @@ -5100,14 +5100,14 @@ - + - + @@ -5185,7 +5185,7 @@ - + @@ -5194,7 +5194,7 @@ - + @@ -5202,14 +5202,14 @@ - + - + @@ -5228,6 +5228,10 @@ + + + + @@ -5240,7 +5244,7 @@ - + @@ -5269,7 +5273,7 @@ - + @@ -5337,7 +5341,7 @@ - + @@ -5346,7 +5350,7 @@ - + @@ -5355,7 +5359,7 @@ - + @@ -5414,14 +5418,14 @@ - + - + @@ -5439,7 +5443,7 @@ - + @@ -5458,7 +5462,7 @@ - + @@ -5477,21 +5481,21 @@ - + - + - + @@ -5554,7 +5558,7 @@ - + @@ -5594,7 +5598,7 @@ - + @@ -5623,24 +5627,24 @@ - + - + - + - + - + @@ -5678,7 +5682,7 @@ - + @@ -5689,7 +5693,7 @@ - + @@ -5707,7 +5711,7 @@ - + @@ -5724,21 +5728,21 @@ - + - + - + @@ -5765,7 +5769,7 @@ - + @@ -5776,7 +5780,7 @@ - + @@ -5803,7 +5807,7 @@ - + @@ -5940,14 +5944,14 @@ - + - + @@ -5963,7 +5967,7 @@ - + @@ -5974,7 +5978,7 @@ - + @@ -5985,20 +5989,20 @@ - + - + - + @@ -6180,7 +6184,7 @@ - + @@ -6189,7 +6193,7 @@ - + @@ -6198,7 +6202,7 @@ - + @@ -6216,7 +6220,7 @@ - + @@ -6225,7 +6229,7 @@ - + @@ -6259,7 +6263,7 @@ - + @@ -6273,7 +6277,7 @@ - + @@ -6418,7 +6422,7 @@ - + @@ -6433,7 +6437,7 @@ - + @@ -6446,7 +6450,7 @@ - + @@ -6457,21 +6461,21 @@ - + - + - + @@ -6485,31 +6489,31 @@ - + - + - + - + - + @@ -6529,7 +6533,7 @@ - + @@ -6621,14 +6625,14 @@ - + - + @@ -6645,7 +6649,7 @@ - + @@ -6716,42 +6720,42 @@ - + - + - + - + - + - + - + @@ -6829,13 +6833,13 @@ - + - + @@ -6848,18 +6852,18 @@ - + - + - + @@ -6880,13 +6884,13 @@ - + - + @@ -6903,13 +6907,13 @@ - + - + @@ -6934,7 +6938,7 @@ - + @@ -6957,7 +6961,7 @@ - + @@ -6970,9 +6974,9 @@ - + - + @@ -6997,7 +7001,7 @@ - + @@ -7027,14 +7031,14 @@ - + - + @@ -7046,7 +7050,7 @@ - + @@ -7064,7 +7068,7 @@ - + @@ -7075,7 +7079,7 @@ - + @@ -7090,7 +7094,7 @@ - + @@ -7112,7 +7116,7 @@ - + @@ -7122,7 +7126,7 @@ - + @@ -7146,7 +7150,7 @@ - + @@ -7173,7 +7177,7 @@ - + @@ -7191,7 +7195,7 @@ - + @@ -7213,7 +7217,7 @@ - + @@ -7224,7 +7228,7 @@ - + @@ -7246,7 +7250,7 @@ - + @@ -7257,13 +7261,13 @@ - + - + @@ -7277,7 +7281,7 @@ - + @@ -7292,7 +7296,7 @@ - + @@ -7306,7 +7310,7 @@ - + @@ -7348,7 +7352,7 @@ - + @@ -7368,7 +7372,7 @@ - + @@ -7409,7 +7413,7 @@ - + @@ -7418,7 +7422,7 @@ - + @@ -7429,7 +7433,7 @@ - + @@ -7440,7 +7444,7 @@ - + @@ -7486,7 +7490,7 @@ - + @@ -7512,7 +7516,7 @@ - + @@ -7526,7 +7530,7 @@ - + @@ -7565,7 +7569,7 @@ - + @@ -7607,7 +7611,7 @@ - + @@ -7635,7 +7639,7 @@ - + @@ -7649,7 +7653,7 @@ - + @@ -7671,7 +7675,7 @@ - + @@ -7681,7 +7685,7 @@ - + @@ -7692,11 +7696,11 @@ - + - + @@ -7704,7 +7708,7 @@ - + @@ -7753,7 +7757,7 @@ - + @@ -7766,7 +7770,7 @@ - + @@ -7775,7 +7779,7 @@ - + @@ -7784,7 +7788,7 @@ - + @@ -7817,7 +7821,7 @@ - + @@ -7830,7 +7834,7 @@ - + @@ -7890,7 +7894,7 @@ - + @@ -7955,7 +7959,7 @@ - + @@ -8006,7 +8010,7 @@ - + @@ -8017,7 +8021,7 @@ - + @@ -8041,14 +8045,14 @@ - + - + @@ -8117,7 +8121,7 @@ - + @@ -8224,7 +8228,7 @@ - + @@ -8244,7 +8248,7 @@ - + @@ -8267,7 +8271,7 @@ - + @@ -8293,7 +8297,7 @@ - + @@ -8378,21 +8382,21 @@ - + - + - + @@ -8436,7 +8440,7 @@ - + @@ -8451,7 +8455,7 @@ - + @@ -8490,7 +8494,7 @@ - + @@ -8503,11 +8507,11 @@ - + - + @@ -8515,7 +8519,7 @@ - + @@ -8529,14 +8533,14 @@ - + - + @@ -8545,7 +8549,7 @@ - + @@ -8562,7 +8566,7 @@ - + @@ -8629,7 +8633,7 @@ - + @@ -8639,7 +8643,7 @@ - + @@ -8670,7 +8674,7 @@ - + @@ -8712,13 +8716,13 @@ - + - + @@ -8730,7 +8734,7 @@ - + @@ -8824,7 +8828,7 @@ - + @@ -8903,14 +8907,14 @@ - + - + @@ -8928,14 +8932,14 @@ - + - + @@ -8946,7 +8950,7 @@ - + @@ -8962,7 +8966,7 @@ - + @@ -8979,7 +8983,7 @@ - + @@ -8999,7 +9003,7 @@ - + @@ -9016,7 +9020,7 @@ - + @@ -9025,22 +9029,22 @@ - + - + - + - + @@ -9050,7 +9054,7 @@ - + @@ -9093,14 +9097,14 @@ - + - + @@ -9112,7 +9116,7 @@ - + @@ -9141,14 +9145,14 @@ - + - + @@ -9159,14 +9163,14 @@ - + - + @@ -9180,7 +9184,7 @@ - + @@ -9194,7 +9198,7 @@ - + @@ -9218,7 +9222,7 @@ - + @@ -9230,7 +9234,7 @@ - + @@ -9243,7 +9247,7 @@ - + @@ -9255,7 +9259,7 @@ - + @@ -9266,7 +9270,7 @@ - + @@ -9289,19 +9293,19 @@ - + - + - + @@ -9315,7 +9319,7 @@ - + @@ -9327,7 +9331,7 @@ - + @@ -9342,7 +9346,7 @@ - + @@ -9359,7 +9363,7 @@ - + @@ -9412,7 +9416,7 @@ - + @@ -9423,7 +9427,7 @@ - + @@ -9433,11 +9437,11 @@ - + - + @@ -9446,7 +9450,7 @@ - + @@ -9454,7 +9458,7 @@ - + @@ -9463,7 +9467,7 @@ - + @@ -9513,28 +9517,28 @@ - + - + - + - + @@ -9542,7 +9546,7 @@ - + @@ -9565,7 +9569,7 @@ - + @@ -9582,7 +9586,7 @@ - + @@ -9596,7 +9600,7 @@ - + @@ -9616,7 +9620,7 @@ - + @@ -9627,7 +9631,7 @@ - + @@ -9638,7 +9642,7 @@ - + @@ -9650,7 +9654,7 @@ - + @@ -9665,7 +9669,7 @@ - + @@ -9676,13 +9680,13 @@ - + - + @@ -9695,7 +9699,7 @@ - + @@ -9706,7 +9710,7 @@ - + @@ -9792,7 +9796,7 @@ - + @@ -9817,7 +9821,7 @@ - + @@ -9827,14 +9831,14 @@ - + - + @@ -9844,18 +9848,18 @@ - + - + - + @@ -9863,7 +9867,7 @@ - + @@ -9900,7 +9904,7 @@ - + @@ -9910,7 +9914,7 @@ - + @@ -10094,7 +10098,7 @@ - + @@ -10119,7 +10123,7 @@ - + @@ -10133,7 +10137,7 @@ - + diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml index f849578f5..e153b9687 100644 --- a/tex/context/interface/cont-de.xml +++ b/tex/context/interface/cont-de.xml @@ -4,7 +4,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -72,14 +72,14 @@ - + - + @@ -97,7 +97,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -213,32 +213,32 @@ - + - + - + - + - + - + @@ -301,18 +301,18 @@ - + - + - + @@ -337,7 +337,7 @@ - + @@ -353,7 +353,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -450,7 +450,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -498,7 +498,7 @@ - + @@ -510,7 +510,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -548,7 +548,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -594,7 +594,7 @@ - + @@ -612,7 +612,7 @@ - + @@ -623,7 +623,7 @@ - + @@ -634,7 +634,7 @@ - + @@ -647,14 +647,14 @@ - + - + @@ -686,7 +686,7 @@ - + @@ -695,7 +695,7 @@ - + @@ -722,7 +722,7 @@ - + @@ -731,14 +731,14 @@ - + - + @@ -842,7 +842,7 @@ - + @@ -854,7 +854,7 @@ - + @@ -955,25 +955,25 @@ - + - + - + - + @@ -993,7 +993,7 @@ - + @@ -1008,29 +1008,29 @@ - + - + - + - + - + @@ -1057,7 +1057,7 @@ - + @@ -1066,7 +1066,7 @@ - + @@ -1075,7 +1075,7 @@ - + @@ -1084,7 +1084,7 @@ - + @@ -1093,7 +1093,7 @@ - + @@ -1102,7 +1102,7 @@ - + @@ -1111,7 +1111,7 @@ - + @@ -1120,7 +1120,7 @@ - + @@ -1129,7 +1129,7 @@ - + @@ -1138,7 +1138,7 @@ - + @@ -1147,7 +1147,7 @@ - + @@ -1156,7 +1156,7 @@ - + @@ -1165,7 +1165,7 @@ - + @@ -1183,7 +1183,7 @@ - + @@ -1192,7 +1192,7 @@ - + @@ -1201,7 +1201,7 @@ - + @@ -1210,7 +1210,7 @@ - + @@ -1219,7 +1219,7 @@ - + @@ -1282,7 +1282,7 @@ - + @@ -1291,7 +1291,7 @@ - + @@ -1300,7 +1300,7 @@ - + @@ -1309,7 +1309,7 @@ - + @@ -1318,7 +1318,7 @@ - + @@ -1327,7 +1327,7 @@ - + @@ -1341,7 +1341,7 @@ - + @@ -1351,7 +1351,7 @@ - + @@ -1383,7 +1383,7 @@ - + @@ -1394,7 +1394,7 @@ - + @@ -1416,7 +1416,7 @@ - + @@ -1431,7 +1431,7 @@ - + @@ -1441,7 +1441,7 @@ - + @@ -1464,7 +1464,7 @@ - + @@ -1487,7 +1487,7 @@ - + @@ -1505,7 +1505,7 @@ - + @@ -1521,7 +1521,7 @@ - + @@ -1532,7 +1532,7 @@ - + @@ -1544,7 +1544,7 @@ - + @@ -1555,7 +1555,7 @@ - + @@ -1699,11 +1699,11 @@ - + - + @@ -1711,11 +1711,11 @@ - + - + @@ -1723,18 +1723,18 @@ - + - + - + @@ -1793,47 +1793,47 @@ - + - + - + - + - + - + - + @@ -1887,7 +1887,7 @@ - + @@ -1904,7 +1904,7 @@ - + @@ -1915,26 +1915,26 @@ - + - + - + - + @@ -1960,18 +1960,18 @@ - + - + - + @@ -1980,11 +1980,11 @@ - + - + @@ -1993,7 +1993,7 @@ - + @@ -2038,11 +2038,11 @@ - + - + @@ -2050,7 +2050,7 @@ - + @@ -2075,7 +2075,7 @@ - + @@ -2127,7 +2127,7 @@ - + @@ -2140,7 +2140,7 @@ - + @@ -2153,29 +2153,29 @@ - + - + - + - + - + @@ -2207,7 +2207,7 @@ - + @@ -2221,7 +2221,7 @@ - + @@ -2232,7 +2232,7 @@ - + @@ -2243,7 +2243,7 @@ - + @@ -2255,7 +2255,7 @@ - + @@ -2293,7 +2293,7 @@ - + @@ -2302,7 +2302,7 @@ - + @@ -2311,7 +2311,7 @@ - + @@ -2324,7 +2324,7 @@ - + @@ -2337,7 +2337,7 @@ - + @@ -2346,7 +2346,7 @@ - + @@ -2355,7 +2355,7 @@ - + @@ -2364,7 +2364,7 @@ - + @@ -2373,7 +2373,7 @@ - + @@ -2388,7 +2388,7 @@ - + @@ -2403,7 +2403,7 @@ - + @@ -2418,7 +2418,7 @@ - + @@ -2463,31 +2463,31 @@ - + - + - + - + - + @@ -2502,7 +2502,7 @@ - + @@ -2675,7 +2675,7 @@ - + @@ -2686,7 +2686,7 @@ - + @@ -2696,7 +2696,7 @@ - + @@ -2707,7 +2707,7 @@ - + @@ -2732,7 +2732,7 @@ - + @@ -2742,7 +2742,7 @@ - + @@ -2751,7 +2751,7 @@ - + @@ -2761,7 +2761,7 @@ - + @@ -2772,7 +2772,7 @@ - + @@ -2784,7 +2784,7 @@ - + @@ -2831,7 +2831,7 @@ - + @@ -2842,13 +2842,13 @@ - + - + @@ -2860,13 +2860,13 @@ - + - + @@ -2883,19 +2883,19 @@ - + - + - + @@ -2996,21 +2996,21 @@ - + - + - + @@ -3020,7 +3020,7 @@ - + @@ -3042,14 +3042,14 @@ - + - + @@ -3075,7 +3075,7 @@ - + @@ -3130,14 +3130,14 @@ - + - + @@ -3153,7 +3153,7 @@ - + @@ -3209,7 +3209,7 @@ - + @@ -3261,7 +3261,7 @@ - + @@ -3272,14 +3272,14 @@ - + - + @@ -3303,7 +3303,7 @@ - + @@ -3374,75 +3374,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3469,7 +3469,7 @@ - + @@ -3496,7 +3496,7 @@ - + @@ -3523,7 +3523,7 @@ - + @@ -3550,7 +3550,7 @@ - + @@ -3577,7 +3577,7 @@ - + @@ -3591,7 +3591,7 @@ - + @@ -3605,7 +3605,7 @@ - + @@ -3616,7 +3616,7 @@ - + @@ -3627,7 +3627,7 @@ - + @@ -3651,7 +3651,7 @@ - + @@ -3663,7 +3663,7 @@ - + @@ -3682,7 +3682,7 @@ - + @@ -3691,7 +3691,7 @@ - + @@ -3855,7 +3855,7 @@ - + @@ -3875,17 +3875,17 @@ - + - + - + @@ -3893,7 +3893,7 @@ - + @@ -3921,7 +3921,7 @@ - + @@ -3930,7 +3930,7 @@ - + @@ -3948,7 +3948,7 @@ - + @@ -3957,13 +3957,13 @@ - + - + @@ -3998,7 +3998,7 @@ - + @@ -4080,7 +4080,7 @@ - + @@ -4099,7 +4099,7 @@ - + @@ -4112,7 +4112,7 @@ - + @@ -4121,7 +4121,7 @@ - + @@ -4153,7 +4153,7 @@ - + @@ -4205,7 +4205,7 @@ - + @@ -4286,21 +4286,21 @@ - + - + - + @@ -4377,14 +4377,14 @@ - + - + @@ -4404,11 +4404,11 @@ - + - + @@ -4417,7 +4417,7 @@ - + @@ -4446,7 +4446,7 @@ - + @@ -4466,7 +4466,7 @@ - + @@ -4513,7 +4513,7 @@ - + @@ -4570,7 +4570,7 @@ - + @@ -4597,7 +4597,7 @@ - + @@ -4653,7 +4653,7 @@ - + @@ -4683,7 +4683,7 @@ - + @@ -4707,21 +4707,21 @@ - + - + - + @@ -4753,7 +4753,7 @@ - + @@ -4767,7 +4767,7 @@ - + @@ -4780,7 +4780,7 @@ - + @@ -4801,49 +4801,49 @@ - + - + - + - + - + - + - + @@ -4853,14 +4853,14 @@ - + - + @@ -5031,14 +5031,14 @@ - + - + @@ -5048,14 +5048,14 @@ - + - + @@ -5070,14 +5070,14 @@ - + - + @@ -5085,14 +5085,14 @@ - + - + @@ -5100,14 +5100,14 @@ - + - + @@ -5185,7 +5185,7 @@ - + @@ -5194,7 +5194,7 @@ - + @@ -5202,14 +5202,14 @@ - + - + @@ -5228,6 +5228,10 @@ + + + + @@ -5240,7 +5244,7 @@ - + @@ -5269,7 +5273,7 @@ - + @@ -5337,7 +5341,7 @@ - + @@ -5346,7 +5350,7 @@ - + @@ -5355,7 +5359,7 @@ - + @@ -5414,14 +5418,14 @@ - + - + @@ -5439,7 +5443,7 @@ - + @@ -5458,7 +5462,7 @@ - + @@ -5477,21 +5481,21 @@ - + - + - + @@ -5554,7 +5558,7 @@ - + @@ -5594,7 +5598,7 @@ - + @@ -5623,24 +5627,24 @@ - + - + - + - + - + @@ -5678,7 +5682,7 @@ - + @@ -5689,7 +5693,7 @@ - + @@ -5707,7 +5711,7 @@ - + @@ -5724,21 +5728,21 @@ - + - + - + @@ -5765,7 +5769,7 @@ - + @@ -5776,7 +5780,7 @@ - + @@ -5803,7 +5807,7 @@ - + @@ -5940,14 +5944,14 @@ - + - + @@ -5963,7 +5967,7 @@ - + @@ -5974,7 +5978,7 @@ - + @@ -5985,20 +5989,20 @@ - + - + - + @@ -6180,7 +6184,7 @@ - + @@ -6216,7 +6220,7 @@ - + @@ -6259,7 +6263,7 @@ - + @@ -6273,7 +6277,7 @@ - + @@ -6418,7 +6422,7 @@ - + @@ -6433,7 +6437,7 @@ - + @@ -6446,7 +6450,7 @@ - + @@ -6457,21 +6461,21 @@ - + - + - + @@ -6485,31 +6489,31 @@ - + - + - + - + - + @@ -6529,7 +6533,7 @@ - + @@ -6621,14 +6625,14 @@ - + - + @@ -6645,7 +6649,7 @@ - + @@ -6716,42 +6720,42 @@ - + - + - + - + - + - + - + @@ -6829,7 +6833,7 @@ - + @@ -6848,18 +6852,18 @@ - + - + - + @@ -6880,13 +6884,13 @@ - + - + @@ -6903,13 +6907,13 @@ - + - + @@ -6934,7 +6938,7 @@ - + @@ -6957,7 +6961,7 @@ - + @@ -6970,9 +6974,9 @@ - + - + @@ -6997,7 +7001,7 @@ - + @@ -7027,14 +7031,14 @@ - + - + @@ -7046,7 +7050,7 @@ - + @@ -7064,7 +7068,7 @@ - + @@ -7075,7 +7079,7 @@ - + @@ -7090,7 +7094,7 @@ - + @@ -7122,7 +7126,7 @@ - + @@ -7146,7 +7150,7 @@ - + @@ -7173,7 +7177,7 @@ - + @@ -7191,7 +7195,7 @@ - + @@ -7202,7 +7206,7 @@ - + @@ -7213,7 +7217,7 @@ - + @@ -7224,7 +7228,7 @@ - + @@ -7246,7 +7250,7 @@ - + @@ -7257,13 +7261,13 @@ - + - + @@ -7277,7 +7281,7 @@ - + @@ -7292,7 +7296,7 @@ - + @@ -7306,7 +7310,7 @@ - + @@ -7348,7 +7352,7 @@ - + @@ -7368,7 +7372,7 @@ - + @@ -7409,7 +7413,7 @@ - + @@ -7418,7 +7422,7 @@ - + @@ -7429,7 +7433,7 @@ - + @@ -7440,7 +7444,7 @@ - + @@ -7486,7 +7490,7 @@ - + @@ -7512,7 +7516,7 @@ - + @@ -7526,7 +7530,7 @@ - + @@ -7565,7 +7569,7 @@ - + @@ -7607,7 +7611,7 @@ - + @@ -7635,7 +7639,7 @@ - + @@ -7649,7 +7653,7 @@ - + @@ -7671,7 +7675,7 @@ - + @@ -7681,7 +7685,7 @@ - + @@ -7692,11 +7696,11 @@ - + - + @@ -7704,7 +7708,7 @@ - + @@ -7753,7 +7757,7 @@ - + @@ -7766,7 +7770,7 @@ - + @@ -7775,7 +7779,7 @@ - + @@ -7784,7 +7788,7 @@ - + @@ -7817,7 +7821,7 @@ - + @@ -7830,7 +7834,7 @@ - + @@ -7890,7 +7894,7 @@ - + @@ -7955,7 +7959,7 @@ - + @@ -8017,7 +8021,7 @@ - + @@ -8041,14 +8045,14 @@ - + - + @@ -8117,7 +8121,7 @@ - + @@ -8224,7 +8228,7 @@ - + @@ -8244,7 +8248,7 @@ - + @@ -8267,7 +8271,7 @@ - + @@ -8293,7 +8297,7 @@ - + @@ -8378,21 +8382,21 @@ - + - + - + @@ -8436,7 +8440,7 @@ - + @@ -8451,7 +8455,7 @@ - + @@ -8490,7 +8494,7 @@ - + @@ -8503,11 +8507,11 @@ - + - + @@ -8515,7 +8519,7 @@ - + @@ -8529,14 +8533,14 @@ - + - + @@ -8545,7 +8549,7 @@ - + @@ -8562,7 +8566,7 @@ - + @@ -8629,7 +8633,7 @@ - + @@ -8639,7 +8643,7 @@ - + @@ -8670,7 +8674,7 @@ - + @@ -8712,13 +8716,13 @@ - + - + @@ -8730,7 +8734,7 @@ - + @@ -8824,7 +8828,7 @@ - + @@ -8903,14 +8907,14 @@ - + - + @@ -8928,14 +8932,14 @@ - + - + @@ -8946,7 +8950,7 @@ - + @@ -8962,7 +8966,7 @@ - + @@ -8979,7 +8983,7 @@ - + @@ -8999,7 +9003,7 @@ - + @@ -9016,7 +9020,7 @@ - + @@ -9025,22 +9029,22 @@ - + - + - + - + @@ -9050,7 +9054,7 @@ - + @@ -9093,14 +9097,14 @@ - + - + @@ -9112,7 +9116,7 @@ - + @@ -9141,14 +9145,14 @@ - + - + @@ -9159,14 +9163,14 @@ - + - + @@ -9180,7 +9184,7 @@ - + @@ -9194,7 +9198,7 @@ - + @@ -9218,7 +9222,7 @@ - + @@ -9230,7 +9234,7 @@ - + @@ -9266,7 +9270,7 @@ - + @@ -9289,19 +9293,19 @@ - + - + - + @@ -9315,7 +9319,7 @@ - + @@ -9327,7 +9331,7 @@ - + @@ -9342,7 +9346,7 @@ - + @@ -9359,7 +9363,7 @@ - + @@ -9372,7 +9376,7 @@ - + @@ -9412,7 +9416,7 @@ - + @@ -9423,7 +9427,7 @@ - + @@ -9433,11 +9437,11 @@ - + - + @@ -9446,7 +9450,7 @@ - + @@ -9454,7 +9458,7 @@ - + @@ -9463,7 +9467,7 @@ - + @@ -9513,28 +9517,28 @@ - + - + - + - + @@ -9542,7 +9546,7 @@ - + @@ -9565,7 +9569,7 @@ - + @@ -9582,7 +9586,7 @@ - + @@ -9596,7 +9600,7 @@ - + @@ -9616,7 +9620,7 @@ - + @@ -9627,7 +9631,7 @@ - + @@ -9638,7 +9642,7 @@ - + @@ -9665,7 +9669,7 @@ - + @@ -9676,13 +9680,13 @@ - + - + @@ -9695,7 +9699,7 @@ - + @@ -9706,7 +9710,7 @@ - + @@ -9792,7 +9796,7 @@ - + @@ -9817,7 +9821,7 @@ - + @@ -9827,14 +9831,14 @@ - + - + @@ -9844,18 +9848,18 @@ - + - + - + @@ -9863,7 +9867,7 @@ - + @@ -9900,7 +9904,7 @@ - + @@ -9910,7 +9914,7 @@ - + @@ -10094,7 +10098,7 @@ - + @@ -10119,7 +10123,7 @@ - + @@ -10133,7 +10137,7 @@ - + diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml index 05bbfd7c6..8f36ebe59 100644 --- a/tex/context/interface/cont-en.xml +++ b/tex/context/interface/cont-en.xml @@ -5228,6 +5228,10 @@ + + + + diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml index af326a6bf..1aba3fe85 100644 --- a/tex/context/interface/cont-it.xml +++ b/tex/context/interface/cont-it.xml @@ -4,7 +4,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -72,14 +72,14 @@ - + - + @@ -97,7 +97,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -213,32 +213,32 @@ - + - + - + - + - + - + @@ -301,18 +301,18 @@ - + - + - + @@ -337,7 +337,7 @@ - + @@ -353,7 +353,7 @@ - + @@ -367,7 +367,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -450,7 +450,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -498,7 +498,7 @@ - + @@ -510,7 +510,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -548,7 +548,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -594,7 +594,7 @@ - + @@ -612,7 +612,7 @@ - + @@ -623,7 +623,7 @@ - + @@ -634,27 +634,27 @@ - + - + - + - + @@ -722,7 +722,7 @@ - + @@ -731,14 +731,14 @@ - + - + @@ -854,7 +854,7 @@ - + @@ -955,25 +955,25 @@ - + - + - + - + @@ -983,7 +983,7 @@ - + @@ -993,7 +993,7 @@ - + @@ -1008,29 +1008,29 @@ - + - + - + - + - + @@ -1057,7 +1057,7 @@ - + @@ -1066,7 +1066,7 @@ - + @@ -1075,7 +1075,7 @@ - + @@ -1084,7 +1084,7 @@ - + @@ -1093,7 +1093,7 @@ - + @@ -1102,7 +1102,7 @@ - + @@ -1111,7 +1111,7 @@ - + @@ -1120,7 +1120,7 @@ - + @@ -1129,7 +1129,7 @@ - + @@ -1138,7 +1138,7 @@ - + @@ -1147,7 +1147,7 @@ - + @@ -1156,7 +1156,7 @@ - + @@ -1165,7 +1165,7 @@ - + @@ -1183,7 +1183,7 @@ - + @@ -1192,7 +1192,7 @@ - + @@ -1201,7 +1201,7 @@ - + @@ -1210,7 +1210,7 @@ - + @@ -1219,7 +1219,7 @@ - + @@ -1282,7 +1282,7 @@ - + @@ -1291,7 +1291,7 @@ - + @@ -1300,7 +1300,7 @@ - + @@ -1309,7 +1309,7 @@ - + @@ -1318,7 +1318,7 @@ - + @@ -1327,7 +1327,7 @@ - + @@ -1341,7 +1341,7 @@ - + @@ -1351,14 +1351,14 @@ - + - + @@ -1383,7 +1383,7 @@ - + @@ -1394,7 +1394,7 @@ - + @@ -1405,7 +1405,7 @@ - + @@ -1416,7 +1416,7 @@ - + @@ -1431,7 +1431,7 @@ - + @@ -1441,7 +1441,7 @@ - + @@ -1464,7 +1464,7 @@ - + @@ -1487,7 +1487,7 @@ - + @@ -1496,7 +1496,7 @@ - + @@ -1505,7 +1505,7 @@ - + @@ -1521,7 +1521,7 @@ - + @@ -1532,7 +1532,7 @@ - + @@ -1544,7 +1544,7 @@ - + @@ -1555,7 +1555,7 @@ - + @@ -1699,11 +1699,11 @@ - + - + @@ -1711,11 +1711,11 @@ - + - + @@ -1723,18 +1723,18 @@ - + - + - + @@ -1793,47 +1793,47 @@ - + - + - + - + - + - + - + @@ -1887,7 +1887,7 @@ - + @@ -1904,7 +1904,7 @@ - + @@ -1915,26 +1915,26 @@ - + - + - + - + @@ -1960,18 +1960,18 @@ - + - + - + @@ -1980,11 +1980,11 @@ - + - + @@ -1993,7 +1993,7 @@ - + @@ -2038,11 +2038,11 @@ - + - + @@ -2050,7 +2050,7 @@ - + @@ -2075,7 +2075,7 @@ - + @@ -2127,7 +2127,7 @@ - + @@ -2140,7 +2140,7 @@ - + @@ -2153,29 +2153,29 @@ - + - + - + - + - + @@ -2207,7 +2207,7 @@ - + @@ -2221,7 +2221,7 @@ - + @@ -2232,7 +2232,7 @@ - + @@ -2243,7 +2243,7 @@ - + @@ -2255,7 +2255,7 @@ - + @@ -2293,7 +2293,7 @@ - + @@ -2302,7 +2302,7 @@ - + @@ -2311,7 +2311,7 @@ - + @@ -2324,7 +2324,7 @@ - + @@ -2337,7 +2337,7 @@ - + @@ -2346,7 +2346,7 @@ - + @@ -2355,7 +2355,7 @@ - + @@ -2364,7 +2364,7 @@ - + @@ -2373,7 +2373,7 @@ - + @@ -2388,7 +2388,7 @@ - + @@ -2403,7 +2403,7 @@ - + @@ -2418,7 +2418,7 @@ - + @@ -2463,31 +2463,31 @@ - + - + - + - + - + @@ -2502,7 +2502,7 @@ - + @@ -2675,7 +2675,7 @@ - + @@ -2686,7 +2686,7 @@ - + @@ -2696,7 +2696,7 @@ - + @@ -2707,7 +2707,7 @@ - + @@ -2716,7 +2716,7 @@ - + @@ -2732,7 +2732,7 @@ - + @@ -2742,7 +2742,7 @@ - + @@ -2751,7 +2751,7 @@ - + @@ -2761,7 +2761,7 @@ - + @@ -2772,7 +2772,7 @@ - + @@ -2784,7 +2784,7 @@ - + @@ -2831,7 +2831,7 @@ - + @@ -2842,13 +2842,13 @@ - + - + @@ -2860,13 +2860,13 @@ - + - + @@ -2883,19 +2883,19 @@ - + - + - + @@ -2996,21 +2996,21 @@ - + - + - + @@ -3020,7 +3020,7 @@ - + @@ -3042,14 +3042,14 @@ - + - + @@ -3075,7 +3075,7 @@ - + @@ -3130,14 +3130,14 @@ - + - + @@ -3153,7 +3153,7 @@ - + @@ -3209,7 +3209,7 @@ - + @@ -3261,7 +3261,7 @@ - + @@ -3272,14 +3272,14 @@ - + - + @@ -3303,7 +3303,7 @@ - + @@ -3374,75 +3374,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3469,7 +3469,7 @@ - + @@ -3496,7 +3496,7 @@ - + @@ -3523,7 +3523,7 @@ - + @@ -3550,7 +3550,7 @@ - + @@ -3577,7 +3577,7 @@ - + @@ -3591,7 +3591,7 @@ - + @@ -3605,7 +3605,7 @@ - + @@ -3616,7 +3616,7 @@ - + @@ -3627,7 +3627,7 @@ - + @@ -3651,7 +3651,7 @@ - + @@ -3663,7 +3663,7 @@ - + @@ -3682,7 +3682,7 @@ - + @@ -3691,7 +3691,7 @@ - + @@ -3855,7 +3855,7 @@ - + @@ -3875,17 +3875,17 @@ - + - + - + @@ -3893,7 +3893,7 @@ - + @@ -3921,7 +3921,7 @@ - + @@ -3930,7 +3930,7 @@ - + @@ -3948,7 +3948,7 @@ - + @@ -3957,13 +3957,13 @@ - + - + @@ -3998,7 +3998,7 @@ - + @@ -4080,7 +4080,7 @@ - + @@ -4099,7 +4099,7 @@ - + @@ -4112,7 +4112,7 @@ - + @@ -4121,7 +4121,7 @@ - + @@ -4153,7 +4153,7 @@ - + @@ -4205,7 +4205,7 @@ - + @@ -4286,21 +4286,21 @@ - + - + - + @@ -4377,14 +4377,14 @@ - + - + @@ -4404,11 +4404,11 @@ - + - + @@ -4417,7 +4417,7 @@ - + @@ -4446,7 +4446,7 @@ - + @@ -4466,7 +4466,7 @@ - + @@ -4513,7 +4513,7 @@ - + @@ -4570,7 +4570,7 @@ - + @@ -4597,7 +4597,7 @@ - + @@ -4653,7 +4653,7 @@ - + @@ -4683,7 +4683,7 @@ - + @@ -4707,21 +4707,21 @@ - + - + - + @@ -4753,7 +4753,7 @@ - + @@ -4767,7 +4767,7 @@ - + @@ -4780,7 +4780,7 @@ - + @@ -4801,49 +4801,49 @@ - + - + - + - + - + - + - + @@ -4853,14 +4853,14 @@ - + - + @@ -5031,14 +5031,14 @@ - + - + @@ -5048,14 +5048,14 @@ - + - + @@ -5070,14 +5070,14 @@ - + - + @@ -5085,14 +5085,14 @@ - + - + @@ -5100,14 +5100,14 @@ - + - + @@ -5185,7 +5185,7 @@ - + @@ -5194,7 +5194,7 @@ - + @@ -5202,14 +5202,14 @@ - + - + @@ -5228,6 +5228,10 @@ + + + + @@ -5240,7 +5244,7 @@ - + @@ -5269,7 +5273,7 @@ - + @@ -5337,7 +5341,7 @@ - + @@ -5346,7 +5350,7 @@ - + @@ -5355,7 +5359,7 @@ - + @@ -5414,14 +5418,14 @@ - + - + @@ -5439,7 +5443,7 @@ - + @@ -5458,7 +5462,7 @@ - + @@ -5477,21 +5481,21 @@ - + - + - + @@ -5554,7 +5558,7 @@ - + @@ -5594,7 +5598,7 @@ - + @@ -5623,24 +5627,24 @@ - + - + - + - + - + @@ -5678,7 +5682,7 @@ - + @@ -5689,7 +5693,7 @@ - + @@ -5707,7 +5711,7 @@ - + @@ -5724,21 +5728,21 @@ - + - + - + @@ -5765,7 +5769,7 @@ - + @@ -5776,7 +5780,7 @@ - + @@ -5803,7 +5807,7 @@ - + @@ -5940,14 +5944,14 @@ - + - + @@ -5963,7 +5967,7 @@ - + @@ -5974,7 +5978,7 @@ - + @@ -5985,20 +5989,20 @@ - + - + - + @@ -6180,7 +6184,7 @@ - + @@ -6189,7 +6193,7 @@ - + @@ -6198,7 +6202,7 @@ - + @@ -6216,7 +6220,7 @@ - + @@ -6244,7 +6248,7 @@ - + @@ -6259,7 +6263,7 @@ - + @@ -6273,7 +6277,7 @@ - + @@ -6405,7 +6409,7 @@ - + @@ -6418,7 +6422,7 @@ - + @@ -6433,7 +6437,7 @@ - + @@ -6446,7 +6450,7 @@ - + @@ -6457,21 +6461,21 @@ - + - + - + @@ -6485,31 +6489,31 @@ - + - + - + - + - + @@ -6529,7 +6533,7 @@ - + @@ -6621,14 +6625,14 @@ - + - + @@ -6645,7 +6649,7 @@ - + @@ -6716,21 +6720,21 @@ - + - + - + @@ -6744,14 +6748,14 @@ - + - + @@ -6835,7 +6839,7 @@ - + @@ -6848,18 +6852,18 @@ - + - + - + @@ -6880,13 +6884,13 @@ - + - + @@ -6903,13 +6907,13 @@ - + - + @@ -6934,7 +6938,7 @@ - + @@ -6957,7 +6961,7 @@ - + @@ -6970,9 +6974,9 @@ - + - + @@ -6997,7 +7001,7 @@ - + @@ -7027,14 +7031,14 @@ - + - + @@ -7046,7 +7050,7 @@ - + @@ -7064,7 +7068,7 @@ - + @@ -7075,7 +7079,7 @@ - + @@ -7090,7 +7094,7 @@ - + @@ -7112,7 +7116,7 @@ - + @@ -7122,7 +7126,7 @@ - + @@ -7146,7 +7150,7 @@ - + @@ -7173,7 +7177,7 @@ - + @@ -7191,7 +7195,7 @@ - + @@ -7213,7 +7217,7 @@ - + @@ -7224,7 +7228,7 @@ - + @@ -7246,7 +7250,7 @@ - + @@ -7257,13 +7261,13 @@ - + - + @@ -7277,7 +7281,7 @@ - + @@ -7292,7 +7296,7 @@ - + @@ -7306,7 +7310,7 @@ - + @@ -7320,7 +7324,7 @@ - + @@ -7334,7 +7338,7 @@ - + @@ -7348,7 +7352,7 @@ - + @@ -7368,7 +7372,7 @@ - + @@ -7409,7 +7413,7 @@ - + @@ -7418,7 +7422,7 @@ - + @@ -7429,7 +7433,7 @@ - + @@ -7440,7 +7444,7 @@ - + @@ -7486,7 +7490,7 @@ - + @@ -7512,7 +7516,7 @@ - + @@ -7526,7 +7530,7 @@ - + @@ -7565,7 +7569,7 @@ - + @@ -7573,7 +7577,7 @@ - + @@ -7635,7 +7639,7 @@ - + @@ -7649,7 +7653,7 @@ - + @@ -7660,7 +7664,7 @@ - + @@ -7671,7 +7675,7 @@ - + @@ -7681,7 +7685,7 @@ - + @@ -7692,11 +7696,11 @@ - + - + @@ -7704,7 +7708,7 @@ - + @@ -7753,7 +7757,7 @@ - + @@ -7766,7 +7770,7 @@ - + @@ -7775,7 +7779,7 @@ - + @@ -7784,7 +7788,7 @@ - + @@ -7830,7 +7834,7 @@ - + @@ -7890,7 +7894,7 @@ - + @@ -7955,7 +7959,7 @@ - + @@ -8006,7 +8010,7 @@ - + @@ -8017,7 +8021,7 @@ - + @@ -8041,14 +8045,14 @@ - + - + @@ -8117,7 +8121,7 @@ - + @@ -8224,7 +8228,7 @@ - + @@ -8244,7 +8248,7 @@ - + @@ -8267,7 +8271,7 @@ - + @@ -8293,7 +8297,7 @@ - + @@ -8378,21 +8382,21 @@ - + - + - + @@ -8436,7 +8440,7 @@ - + @@ -8451,7 +8455,7 @@ - + @@ -8490,7 +8494,7 @@ - + @@ -8503,11 +8507,11 @@ - + - + @@ -8515,7 +8519,7 @@ - + @@ -8529,14 +8533,14 @@ - + - + @@ -8545,7 +8549,7 @@ - + @@ -8562,7 +8566,7 @@ - + @@ -8629,7 +8633,7 @@ - + @@ -8639,7 +8643,7 @@ - + @@ -8670,7 +8674,7 @@ - + @@ -8712,13 +8716,13 @@ - + - + @@ -8730,7 +8734,7 @@ - + @@ -8824,7 +8828,7 @@ - + @@ -8903,14 +8907,14 @@ - + - + @@ -8928,14 +8932,14 @@ - + - + @@ -8946,7 +8950,7 @@ - + @@ -8962,7 +8966,7 @@ - + @@ -8979,7 +8983,7 @@ - + @@ -8999,7 +9003,7 @@ - + @@ -9016,7 +9020,7 @@ - + @@ -9025,22 +9029,22 @@ - + - + - + - + @@ -9050,7 +9054,7 @@ - + @@ -9093,14 +9097,14 @@ - + - + @@ -9112,7 +9116,7 @@ - + @@ -9141,14 +9145,14 @@ - + - + @@ -9159,14 +9163,14 @@ - + - + @@ -9180,7 +9184,7 @@ - + @@ -9194,7 +9198,7 @@ - + @@ -9218,7 +9222,7 @@ - + @@ -9230,7 +9234,7 @@ - + @@ -9243,7 +9247,7 @@ - + @@ -9255,7 +9259,7 @@ - + @@ -9266,7 +9270,7 @@ - + @@ -9289,19 +9293,19 @@ - + - + - + @@ -9315,7 +9319,7 @@ - + @@ -9327,7 +9331,7 @@ - + @@ -9342,7 +9346,7 @@ - + @@ -9359,7 +9363,7 @@ - + @@ -9372,7 +9376,7 @@ - + @@ -9412,7 +9416,7 @@ - + @@ -9423,7 +9427,7 @@ - + @@ -9433,11 +9437,11 @@ - + - + @@ -9446,7 +9450,7 @@ - + @@ -9454,7 +9458,7 @@ - + @@ -9463,7 +9467,7 @@ - + @@ -9513,28 +9517,28 @@ - + - + - + - + @@ -9542,7 +9546,7 @@ - + @@ -9565,7 +9569,7 @@ - + @@ -9582,7 +9586,7 @@ - + @@ -9596,7 +9600,7 @@ - + @@ -9616,7 +9620,7 @@ - + @@ -9627,7 +9631,7 @@ - + @@ -9638,7 +9642,7 @@ - + @@ -9665,7 +9669,7 @@ - + @@ -9676,13 +9680,13 @@ - + - + @@ -9695,7 +9699,7 @@ - + @@ -9706,7 +9710,7 @@ - + @@ -9792,7 +9796,7 @@ - + @@ -9803,7 +9807,7 @@ - + @@ -9817,7 +9821,7 @@ - + @@ -9827,14 +9831,14 @@ - + - + @@ -9844,7 +9848,7 @@ - + @@ -9855,7 +9859,7 @@ - + @@ -9863,7 +9867,7 @@ - + @@ -9900,7 +9904,7 @@ - + @@ -9910,7 +9914,7 @@ - + @@ -9946,21 +9950,21 @@ - + - + - + @@ -9971,7 +9975,7 @@ - + @@ -10002,11 +10006,11 @@ - + - + @@ -10017,7 +10021,7 @@ - + @@ -10048,7 +10052,7 @@ - + @@ -10062,7 +10066,7 @@ - + @@ -10073,7 +10077,7 @@ - + @@ -10084,7 +10088,7 @@ - + @@ -10094,14 +10098,14 @@ - + - + @@ -10112,35 +10116,35 @@ - + - + - + - + - + @@ -10152,7 +10156,7 @@ - + diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml index 4de4aa083..4e6858787 100644 --- a/tex/context/interface/cont-nl.xml +++ b/tex/context/interface/cont-nl.xml @@ -4,7 +4,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -72,14 +72,14 @@ - + - + @@ -97,7 +97,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -213,32 +213,32 @@ - + - + - + - + - + - + @@ -301,18 +301,18 @@ - + - + - + @@ -337,7 +337,7 @@ - + @@ -353,7 +353,7 @@ - + @@ -367,7 +367,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -450,7 +450,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -498,7 +498,7 @@ - + @@ -510,7 +510,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -548,7 +548,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -594,7 +594,7 @@ - + @@ -612,7 +612,7 @@ - + @@ -623,7 +623,7 @@ - + @@ -634,27 +634,27 @@ - + - + - + - + @@ -722,7 +722,7 @@ - + @@ -731,14 +731,14 @@ - + - + @@ -854,7 +854,7 @@ - + @@ -955,25 +955,25 @@ - + - + - + - + @@ -983,7 +983,7 @@ - + @@ -993,7 +993,7 @@ - + @@ -1008,29 +1008,29 @@ - + - + - + - + - + @@ -1057,7 +1057,7 @@ - + @@ -1066,7 +1066,7 @@ - + @@ -1075,7 +1075,7 @@ - + @@ -1084,7 +1084,7 @@ - + @@ -1093,7 +1093,7 @@ - + @@ -1102,7 +1102,7 @@ - + @@ -1111,7 +1111,7 @@ - + @@ -1120,7 +1120,7 @@ - + @@ -1129,7 +1129,7 @@ - + @@ -1138,7 +1138,7 @@ - + @@ -1147,7 +1147,7 @@ - + @@ -1156,7 +1156,7 @@ - + @@ -1165,7 +1165,7 @@ - + @@ -1183,7 +1183,7 @@ - + @@ -1192,7 +1192,7 @@ - + @@ -1201,7 +1201,7 @@ - + @@ -1210,7 +1210,7 @@ - + @@ -1219,7 +1219,7 @@ - + @@ -1282,7 +1282,7 @@ - + @@ -1291,7 +1291,7 @@ - + @@ -1300,7 +1300,7 @@ - + @@ -1309,7 +1309,7 @@ - + @@ -1318,7 +1318,7 @@ - + @@ -1327,7 +1327,7 @@ - + @@ -1341,7 +1341,7 @@ - + @@ -1351,14 +1351,14 @@ - + - + @@ -1383,7 +1383,7 @@ - + @@ -1394,7 +1394,7 @@ - + @@ -1405,7 +1405,7 @@ - + @@ -1416,7 +1416,7 @@ - + @@ -1431,7 +1431,7 @@ - + @@ -1441,7 +1441,7 @@ - + @@ -1464,7 +1464,7 @@ - + @@ -1487,7 +1487,7 @@ - + @@ -1496,7 +1496,7 @@ - + @@ -1505,7 +1505,7 @@ - + @@ -1521,7 +1521,7 @@ - + @@ -1532,7 +1532,7 @@ - + @@ -1544,7 +1544,7 @@ - + @@ -1555,7 +1555,7 @@ - + @@ -1699,11 +1699,11 @@ - + - + @@ -1711,11 +1711,11 @@ - + - + @@ -1723,18 +1723,18 @@ - + - + - + @@ -1793,47 +1793,47 @@ - + - + - + - + - + - + - + @@ -1887,7 +1887,7 @@ - + @@ -1904,7 +1904,7 @@ - + @@ -1915,26 +1915,26 @@ - + - + - + - + @@ -1960,18 +1960,18 @@ - + - + - + @@ -1980,11 +1980,11 @@ - + - + @@ -1993,7 +1993,7 @@ - + @@ -2038,11 +2038,11 @@ - + - + @@ -2050,7 +2050,7 @@ - + @@ -2075,7 +2075,7 @@ - + @@ -2127,7 +2127,7 @@ - + @@ -2140,7 +2140,7 @@ - + @@ -2153,29 +2153,29 @@ - + - + - + - + - + @@ -2207,7 +2207,7 @@ - + @@ -2221,7 +2221,7 @@ - + @@ -2243,7 +2243,7 @@ - + @@ -2255,7 +2255,7 @@ - + @@ -2293,7 +2293,7 @@ - + @@ -2302,7 +2302,7 @@ - + @@ -2311,7 +2311,7 @@ - + @@ -2324,7 +2324,7 @@ - + @@ -2337,7 +2337,7 @@ - + @@ -2346,7 +2346,7 @@ - + @@ -2355,7 +2355,7 @@ - + @@ -2364,7 +2364,7 @@ - + @@ -2373,7 +2373,7 @@ - + @@ -2388,7 +2388,7 @@ - + @@ -2403,7 +2403,7 @@ - + @@ -2418,7 +2418,7 @@ - + @@ -2433,7 +2433,7 @@ - + @@ -2448,7 +2448,7 @@ - + @@ -2463,31 +2463,31 @@ - + - + - + - + - + @@ -2502,7 +2502,7 @@ - + @@ -2675,7 +2675,7 @@ - + @@ -2696,7 +2696,7 @@ - + @@ -2707,7 +2707,7 @@ - + @@ -2732,7 +2732,7 @@ - + @@ -2742,7 +2742,7 @@ - + @@ -2751,7 +2751,7 @@ - + @@ -2761,7 +2761,7 @@ - + @@ -2772,7 +2772,7 @@ - + @@ -2784,7 +2784,7 @@ - + @@ -2831,7 +2831,7 @@ - + @@ -2842,13 +2842,13 @@ - + - + @@ -2860,19 +2860,19 @@ - + - + - + @@ -2883,19 +2883,19 @@ - + - + - + @@ -2996,21 +2996,21 @@ - + - + - + @@ -3020,7 +3020,7 @@ - + @@ -3042,14 +3042,14 @@ - + - + @@ -3075,7 +3075,7 @@ - + @@ -3130,14 +3130,14 @@ - + - + @@ -3153,7 +3153,7 @@ - + @@ -3209,7 +3209,7 @@ - + @@ -3261,7 +3261,7 @@ - + @@ -3272,14 +3272,14 @@ - + - + @@ -3303,7 +3303,7 @@ - + @@ -3374,75 +3374,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3469,7 +3469,7 @@ - + @@ -3496,7 +3496,7 @@ - + @@ -3523,7 +3523,7 @@ - + @@ -3550,7 +3550,7 @@ - + @@ -3577,7 +3577,7 @@ - + @@ -3591,7 +3591,7 @@ - + @@ -3605,7 +3605,7 @@ - + @@ -3616,7 +3616,7 @@ - + @@ -3627,7 +3627,7 @@ - + @@ -3651,7 +3651,7 @@ - + @@ -3663,7 +3663,7 @@ - + @@ -3682,7 +3682,7 @@ - + @@ -3691,7 +3691,7 @@ - + @@ -3855,7 +3855,7 @@ - + @@ -3875,17 +3875,17 @@ - + - + - + @@ -3893,7 +3893,7 @@ - + @@ -3930,7 +3930,7 @@ - + @@ -3948,7 +3948,7 @@ - + @@ -3957,13 +3957,13 @@ - + - + @@ -3998,7 +3998,7 @@ - + @@ -4080,7 +4080,7 @@ - + @@ -4099,7 +4099,7 @@ - + @@ -4112,7 +4112,7 @@ - + @@ -4121,7 +4121,7 @@ - + @@ -4153,7 +4153,7 @@ - + @@ -4205,7 +4205,7 @@ - + @@ -4286,21 +4286,21 @@ - + - + - + @@ -4377,14 +4377,14 @@ - + - + @@ -4404,11 +4404,11 @@ - + - + @@ -4417,7 +4417,7 @@ - + @@ -4446,7 +4446,7 @@ - + @@ -4466,7 +4466,7 @@ - + @@ -4513,7 +4513,7 @@ - + @@ -4570,7 +4570,7 @@ - + @@ -4597,7 +4597,7 @@ - + @@ -4653,7 +4653,7 @@ - + @@ -4683,7 +4683,7 @@ - + @@ -4696,7 +4696,7 @@ - + @@ -4707,21 +4707,21 @@ - + - + - + @@ -4753,7 +4753,7 @@ - + @@ -4767,7 +4767,7 @@ - + @@ -4780,7 +4780,7 @@ - + @@ -4789,7 +4789,7 @@ - + @@ -4801,49 +4801,49 @@ - + - + - + - + - + - + - + @@ -4853,14 +4853,14 @@ - + - + @@ -5031,14 +5031,14 @@ - + - + @@ -5048,14 +5048,14 @@ - + - + @@ -5070,14 +5070,14 @@ - + - + @@ -5085,14 +5085,14 @@ - + - + @@ -5100,14 +5100,14 @@ - + - + @@ -5185,7 +5185,7 @@ - + @@ -5194,7 +5194,7 @@ - + @@ -5202,14 +5202,14 @@ - + - + @@ -5228,6 +5228,10 @@ + + + + @@ -5240,7 +5244,7 @@ - + @@ -5269,7 +5273,7 @@ - + @@ -5337,7 +5341,7 @@ - + @@ -5346,7 +5350,7 @@ - + @@ -5355,7 +5359,7 @@ - + @@ -5414,14 +5418,14 @@ - + - + @@ -5439,7 +5443,7 @@ - + @@ -5458,7 +5462,7 @@ - + @@ -5477,21 +5481,21 @@ - + - + - + @@ -5516,7 +5520,7 @@ - + @@ -5554,7 +5558,7 @@ - + @@ -5594,7 +5598,7 @@ - + @@ -5623,24 +5627,24 @@ - + - + - + - + - + @@ -5678,7 +5682,7 @@ - + @@ -5689,7 +5693,7 @@ - + @@ -5707,7 +5711,7 @@ - + @@ -5724,21 +5728,21 @@ - + - + - + @@ -5765,7 +5769,7 @@ - + @@ -5776,7 +5780,7 @@ - + @@ -5803,7 +5807,7 @@ - + @@ -5940,14 +5944,14 @@ - + - + @@ -5963,7 +5967,7 @@ - + @@ -5974,7 +5978,7 @@ - + @@ -5985,20 +5989,20 @@ - + - + - + @@ -6012,7 +6016,7 @@ - + @@ -6173,14 +6177,14 @@ - + - + @@ -6216,7 +6220,7 @@ - + @@ -6259,7 +6263,7 @@ - + @@ -6273,7 +6277,7 @@ - + @@ -6418,7 +6422,7 @@ - + @@ -6433,7 +6437,7 @@ - + @@ -6446,7 +6450,7 @@ - + @@ -6457,21 +6461,21 @@ - + - + - + @@ -6485,31 +6489,31 @@ - + - + - + - + - + @@ -6529,7 +6533,7 @@ - + @@ -6621,14 +6625,14 @@ - + - + @@ -6645,7 +6649,7 @@ - + @@ -6716,42 +6720,42 @@ - + - + - + - + - + - + - + @@ -6829,13 +6833,13 @@ - + - + @@ -6848,18 +6852,18 @@ - + - + - + @@ -6880,13 +6884,13 @@ - + - + @@ -6903,13 +6907,13 @@ - + - + @@ -6934,7 +6938,7 @@ - + @@ -6957,7 +6961,7 @@ - + @@ -6970,9 +6974,9 @@ - + - + @@ -6997,7 +7001,7 @@ - + @@ -7027,14 +7031,14 @@ - + - + @@ -7046,7 +7050,7 @@ - + @@ -7064,7 +7068,7 @@ - + @@ -7075,7 +7079,7 @@ - + @@ -7090,7 +7094,7 @@ - + @@ -7112,7 +7116,7 @@ - + @@ -7122,7 +7126,7 @@ - + @@ -7146,7 +7150,7 @@ - + @@ -7173,7 +7177,7 @@ - + @@ -7191,7 +7195,7 @@ - + @@ -7213,7 +7217,7 @@ - + @@ -7224,7 +7228,7 @@ - + @@ -7246,7 +7250,7 @@ - + @@ -7257,13 +7261,13 @@ - + - + @@ -7277,7 +7281,7 @@ - + @@ -7292,7 +7296,7 @@ - + @@ -7306,7 +7310,7 @@ - + @@ -7320,7 +7324,7 @@ - + @@ -7334,7 +7338,7 @@ - + @@ -7348,7 +7352,7 @@ - + @@ -7368,7 +7372,7 @@ - + @@ -7409,7 +7413,7 @@ - + @@ -7418,7 +7422,7 @@ - + @@ -7429,7 +7433,7 @@ - + @@ -7440,7 +7444,7 @@ - + @@ -7486,7 +7490,7 @@ - + @@ -7512,7 +7516,7 @@ - + @@ -7526,7 +7530,7 @@ - + @@ -7565,7 +7569,7 @@ - + @@ -7573,7 +7577,7 @@ - + @@ -7607,7 +7611,7 @@ - + @@ -7635,7 +7639,7 @@ - + @@ -7649,7 +7653,7 @@ - + @@ -7671,7 +7675,7 @@ - + @@ -7681,7 +7685,7 @@ - + @@ -7696,7 +7700,7 @@ - + @@ -7704,7 +7708,7 @@ - + @@ -7753,7 +7757,7 @@ - + @@ -7766,7 +7770,7 @@ - + @@ -7775,7 +7779,7 @@ - + @@ -7784,7 +7788,7 @@ - + @@ -7817,7 +7821,7 @@ - + @@ -7830,7 +7834,7 @@ - + @@ -7890,7 +7894,7 @@ - + @@ -7955,7 +7959,7 @@ - + @@ -8017,7 +8021,7 @@ - + @@ -8041,14 +8045,14 @@ - + - + @@ -8117,7 +8121,7 @@ - + @@ -8224,7 +8228,7 @@ - + @@ -8244,7 +8248,7 @@ - + @@ -8267,7 +8271,7 @@ - + @@ -8293,7 +8297,7 @@ - + @@ -8378,21 +8382,21 @@ - + - + - + @@ -8436,7 +8440,7 @@ - + @@ -8451,7 +8455,7 @@ - + @@ -8490,7 +8494,7 @@ - + @@ -8503,11 +8507,11 @@ - + - + @@ -8515,7 +8519,7 @@ - + @@ -8529,14 +8533,14 @@ - + - + @@ -8545,7 +8549,7 @@ - + @@ -8562,7 +8566,7 @@ - + @@ -8629,7 +8633,7 @@ - + @@ -8639,7 +8643,7 @@ - + @@ -8670,7 +8674,7 @@ - + @@ -8712,13 +8716,13 @@ - + - + @@ -8730,7 +8734,7 @@ - + @@ -8824,7 +8828,7 @@ - + @@ -8903,14 +8907,14 @@ - + - + @@ -8928,14 +8932,14 @@ - + - + @@ -8946,7 +8950,7 @@ - + @@ -8962,7 +8966,7 @@ - + @@ -8979,7 +8983,7 @@ - + @@ -8999,7 +9003,7 @@ - + @@ -9016,7 +9020,7 @@ - + @@ -9025,22 +9029,22 @@ - + - + - + - + @@ -9050,7 +9054,7 @@ - + @@ -9093,14 +9097,14 @@ - + - + @@ -9112,7 +9116,7 @@ - + @@ -9141,14 +9145,14 @@ - + - + @@ -9159,14 +9163,14 @@ - + - + @@ -9180,7 +9184,7 @@ - + @@ -9194,7 +9198,7 @@ - + @@ -9218,7 +9222,7 @@ - + @@ -9230,7 +9234,7 @@ - + @@ -9255,7 +9259,7 @@ - + @@ -9266,7 +9270,7 @@ - + @@ -9289,19 +9293,19 @@ - + - + - + @@ -9315,7 +9319,7 @@ - + @@ -9327,7 +9331,7 @@ - + @@ -9342,7 +9346,7 @@ - + @@ -9359,7 +9363,7 @@ - + @@ -9372,7 +9376,7 @@ - + @@ -9412,7 +9416,7 @@ - + @@ -9423,7 +9427,7 @@ - + @@ -9437,7 +9441,7 @@ - + @@ -9446,7 +9450,7 @@ - + @@ -9454,7 +9458,7 @@ - + @@ -9463,7 +9467,7 @@ - + @@ -9513,28 +9517,28 @@ - + - + - + - + @@ -9542,7 +9546,7 @@ - + @@ -9565,7 +9569,7 @@ - + @@ -9582,7 +9586,7 @@ - + @@ -9596,7 +9600,7 @@ - + @@ -9616,7 +9620,7 @@ - + @@ -9627,7 +9631,7 @@ - + @@ -9638,7 +9642,7 @@ - + @@ -9650,7 +9654,7 @@ - + @@ -9665,7 +9669,7 @@ - + @@ -9676,13 +9680,13 @@ - + - + @@ -9695,7 +9699,7 @@ - + @@ -9706,7 +9710,7 @@ - + @@ -9792,7 +9796,7 @@ - + @@ -9803,7 +9807,7 @@ - + @@ -9817,7 +9821,7 @@ - + @@ -9827,14 +9831,14 @@ - + - + @@ -9844,7 +9848,7 @@ - + @@ -9855,7 +9859,7 @@ - + @@ -9863,7 +9867,7 @@ - + @@ -9900,7 +9904,7 @@ - + @@ -9910,7 +9914,7 @@ - + @@ -9946,21 +9950,21 @@ - + - + - + @@ -9971,7 +9975,7 @@ - + @@ -10002,11 +10006,11 @@ - + - + @@ -10017,7 +10021,7 @@ - + @@ -10048,7 +10052,7 @@ - + @@ -10062,7 +10066,7 @@ - + @@ -10073,7 +10077,7 @@ - + @@ -10094,7 +10098,7 @@ - + @@ -10112,35 +10116,35 @@ - + - + - + - + - + @@ -10152,7 +10156,7 @@ - + diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml index f57bb921d..5efcf4248 100644 --- a/tex/context/interface/cont-ro.xml +++ b/tex/context/interface/cont-ro.xml @@ -4,7 +4,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -72,14 +72,14 @@ - + - + @@ -97,7 +97,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -213,32 +213,32 @@ - + - + - + - + - + - + @@ -301,18 +301,18 @@ - + - + - + @@ -337,7 +337,7 @@ - + @@ -353,7 +353,7 @@ - + @@ -367,7 +367,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -450,7 +450,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -498,7 +498,7 @@ - + @@ -510,7 +510,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -548,7 +548,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -594,7 +594,7 @@ - + @@ -612,7 +612,7 @@ - + @@ -623,7 +623,7 @@ - + @@ -634,7 +634,7 @@ - + @@ -647,14 +647,14 @@ - + - + @@ -722,7 +722,7 @@ - + @@ -731,14 +731,14 @@ - + - + @@ -854,7 +854,7 @@ - + @@ -962,18 +962,18 @@ - + - + - + @@ -993,7 +993,7 @@ - + @@ -1008,29 +1008,29 @@ - + - + - + - + - + @@ -1057,7 +1057,7 @@ - + @@ -1066,7 +1066,7 @@ - + @@ -1075,7 +1075,7 @@ - + @@ -1084,7 +1084,7 @@ - + @@ -1093,7 +1093,7 @@ - + @@ -1102,7 +1102,7 @@ - + @@ -1111,7 +1111,7 @@ - + @@ -1120,7 +1120,7 @@ - + @@ -1129,7 +1129,7 @@ - + @@ -1138,7 +1138,7 @@ - + @@ -1147,7 +1147,7 @@ - + @@ -1156,7 +1156,7 @@ - + @@ -1165,7 +1165,7 @@ - + @@ -1183,7 +1183,7 @@ - + @@ -1192,7 +1192,7 @@ - + @@ -1201,7 +1201,7 @@ - + @@ -1210,7 +1210,7 @@ - + @@ -1219,7 +1219,7 @@ - + @@ -1282,7 +1282,7 @@ - + @@ -1291,7 +1291,7 @@ - + @@ -1300,7 +1300,7 @@ - + @@ -1309,7 +1309,7 @@ - + @@ -1318,7 +1318,7 @@ - + @@ -1327,7 +1327,7 @@ - + @@ -1341,7 +1341,7 @@ - + @@ -1351,14 +1351,14 @@ - + - + @@ -1383,7 +1383,7 @@ - + @@ -1394,7 +1394,7 @@ - + @@ -1405,7 +1405,7 @@ - + @@ -1416,7 +1416,7 @@ - + @@ -1431,7 +1431,7 @@ - + @@ -1441,7 +1441,7 @@ - + @@ -1464,7 +1464,7 @@ - + @@ -1487,7 +1487,7 @@ - + @@ -1496,7 +1496,7 @@ - + @@ -1505,7 +1505,7 @@ - + @@ -1521,7 +1521,7 @@ - + @@ -1532,7 +1532,7 @@ - + @@ -1544,7 +1544,7 @@ - + @@ -1555,7 +1555,7 @@ - + @@ -1703,7 +1703,7 @@ - + @@ -1715,7 +1715,7 @@ - + @@ -1723,18 +1723,18 @@ - + - + - + @@ -1793,47 +1793,47 @@ - + - + - + - + - + - + - + @@ -1887,7 +1887,7 @@ - + @@ -1904,7 +1904,7 @@ - + @@ -1915,26 +1915,26 @@ - + - + - + - + @@ -1960,18 +1960,18 @@ - + - + - + @@ -1980,11 +1980,11 @@ - + - + @@ -1993,7 +1993,7 @@ - + @@ -2038,11 +2038,11 @@ - + - + @@ -2050,7 +2050,7 @@ - + @@ -2075,7 +2075,7 @@ - + @@ -2127,7 +2127,7 @@ - + @@ -2140,7 +2140,7 @@ - + @@ -2153,29 +2153,29 @@ - + - + - + - + - + @@ -2207,7 +2207,7 @@ - + @@ -2221,7 +2221,7 @@ - + @@ -2243,7 +2243,7 @@ - + @@ -2255,7 +2255,7 @@ - + @@ -2293,7 +2293,7 @@ - + @@ -2302,7 +2302,7 @@ - + @@ -2311,7 +2311,7 @@ - + @@ -2324,7 +2324,7 @@ - + @@ -2337,7 +2337,7 @@ - + @@ -2346,7 +2346,7 @@ - + @@ -2355,7 +2355,7 @@ - + @@ -2364,7 +2364,7 @@ - + @@ -2373,7 +2373,7 @@ - + @@ -2388,7 +2388,7 @@ - + @@ -2403,7 +2403,7 @@ - + @@ -2418,7 +2418,7 @@ - + @@ -2463,31 +2463,31 @@ - + - + - + - + - + @@ -2502,7 +2502,7 @@ - + @@ -2675,7 +2675,7 @@ - + @@ -2686,7 +2686,7 @@ - + @@ -2696,7 +2696,7 @@ - + @@ -2707,7 +2707,7 @@ - + @@ -2732,7 +2732,7 @@ - + @@ -2742,7 +2742,7 @@ - + @@ -2751,7 +2751,7 @@ - + @@ -2761,7 +2761,7 @@ - + @@ -2772,7 +2772,7 @@ - + @@ -2784,7 +2784,7 @@ - + @@ -2831,7 +2831,7 @@ - + @@ -2842,13 +2842,13 @@ - + - + @@ -2860,13 +2860,13 @@ - + - + @@ -2883,19 +2883,19 @@ - + - + - + @@ -2996,21 +2996,21 @@ - + - + - + @@ -3020,7 +3020,7 @@ - + @@ -3042,14 +3042,14 @@ - + - + @@ -3075,7 +3075,7 @@ - + @@ -3130,14 +3130,14 @@ - + - + @@ -3153,7 +3153,7 @@ - + @@ -3209,7 +3209,7 @@ - + @@ -3261,7 +3261,7 @@ - + @@ -3272,14 +3272,14 @@ - + - + @@ -3303,7 +3303,7 @@ - + @@ -3374,75 +3374,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3469,7 +3469,7 @@ - + @@ -3496,7 +3496,7 @@ - + @@ -3523,7 +3523,7 @@ - + @@ -3550,7 +3550,7 @@ - + @@ -3577,7 +3577,7 @@ - + @@ -3591,7 +3591,7 @@ - + @@ -3605,7 +3605,7 @@ - + @@ -3616,7 +3616,7 @@ - + @@ -3627,7 +3627,7 @@ - + @@ -3651,7 +3651,7 @@ - + @@ -3663,7 +3663,7 @@ - + @@ -3682,7 +3682,7 @@ - + @@ -3691,7 +3691,7 @@ - + @@ -3855,7 +3855,7 @@ - + @@ -3875,17 +3875,17 @@ - + - + - + @@ -3893,7 +3893,7 @@ - + @@ -3921,7 +3921,7 @@ - + @@ -3930,7 +3930,7 @@ - + @@ -3948,7 +3948,7 @@ - + @@ -3957,13 +3957,13 @@ - + - + @@ -3998,7 +3998,7 @@ - + @@ -4080,7 +4080,7 @@ - + @@ -4099,7 +4099,7 @@ - + @@ -4112,7 +4112,7 @@ - + @@ -4121,7 +4121,7 @@ - + @@ -4153,7 +4153,7 @@ - + @@ -4205,7 +4205,7 @@ - + @@ -4286,21 +4286,21 @@ - + - + - + @@ -4377,14 +4377,14 @@ - + - + @@ -4404,11 +4404,11 @@ - + - + @@ -4417,7 +4417,7 @@ - + @@ -4446,7 +4446,7 @@ - + @@ -4466,7 +4466,7 @@ - + @@ -4570,7 +4570,7 @@ - + @@ -4597,7 +4597,7 @@ - + @@ -4653,7 +4653,7 @@ - + @@ -4683,7 +4683,7 @@ - + @@ -4707,21 +4707,21 @@ - + - + - + @@ -4753,7 +4753,7 @@ - + @@ -4767,7 +4767,7 @@ - + @@ -4780,7 +4780,7 @@ - + @@ -4801,49 +4801,49 @@ - + - + - + - + - + - + - + @@ -4853,14 +4853,14 @@ - + - + @@ -5038,7 +5038,7 @@ - + @@ -5048,14 +5048,14 @@ - + - + @@ -5070,14 +5070,14 @@ - + - + @@ -5085,14 +5085,14 @@ - + - + @@ -5100,14 +5100,14 @@ - + - + @@ -5185,7 +5185,7 @@ - + @@ -5194,7 +5194,7 @@ - + @@ -5202,14 +5202,14 @@ - + - + @@ -5228,6 +5228,10 @@ + + + + @@ -5240,7 +5244,7 @@ - + @@ -5269,7 +5273,7 @@ - + @@ -5337,7 +5341,7 @@ - + @@ -5346,7 +5350,7 @@ - + @@ -5355,7 +5359,7 @@ - + @@ -5414,14 +5418,14 @@ - + - + @@ -5439,7 +5443,7 @@ - + @@ -5458,7 +5462,7 @@ - + @@ -5477,21 +5481,21 @@ - + - + - + @@ -5554,7 +5558,7 @@ - + @@ -5594,7 +5598,7 @@ - + @@ -5623,24 +5627,24 @@ - + - + - + - + - + @@ -5678,7 +5682,7 @@ - + @@ -5689,7 +5693,7 @@ - + @@ -5707,7 +5711,7 @@ - + @@ -5724,21 +5728,21 @@ - + - + - + @@ -5765,7 +5769,7 @@ - + @@ -5776,7 +5780,7 @@ - + @@ -5803,7 +5807,7 @@ - + @@ -5940,14 +5944,14 @@ - + - + @@ -5963,7 +5967,7 @@ - + @@ -5974,7 +5978,7 @@ - + @@ -5985,20 +5989,20 @@ - + - + - + @@ -6180,7 +6184,7 @@ - + @@ -6198,7 +6202,7 @@ - + @@ -6216,7 +6220,7 @@ - + @@ -6244,7 +6248,7 @@ - + @@ -6259,7 +6263,7 @@ - + @@ -6273,7 +6277,7 @@ - + @@ -6418,7 +6422,7 @@ - + @@ -6433,7 +6437,7 @@ - + @@ -6446,7 +6450,7 @@ - + @@ -6457,21 +6461,21 @@ - + - + - + @@ -6485,31 +6489,31 @@ - + - + - + - + - + @@ -6529,7 +6533,7 @@ - + @@ -6621,14 +6625,14 @@ - + - + @@ -6645,7 +6649,7 @@ - + @@ -6716,21 +6720,21 @@ - + - + - + @@ -6744,14 +6748,14 @@ - + - + @@ -6835,7 +6839,7 @@ - + @@ -6848,18 +6852,18 @@ - + - + - + @@ -6880,13 +6884,13 @@ - + - + @@ -6903,13 +6907,13 @@ - + - + @@ -6934,7 +6938,7 @@ - + @@ -6957,7 +6961,7 @@ - + @@ -6997,7 +7001,7 @@ - + @@ -7027,14 +7031,14 @@ - + - + @@ -7046,7 +7050,7 @@ - + @@ -7064,7 +7068,7 @@ - + @@ -7075,7 +7079,7 @@ - + @@ -7090,7 +7094,7 @@ - + @@ -7112,7 +7116,7 @@ - + @@ -7122,7 +7126,7 @@ - + @@ -7146,7 +7150,7 @@ - + @@ -7173,7 +7177,7 @@ - + @@ -7191,7 +7195,7 @@ - + @@ -7202,7 +7206,7 @@ - + @@ -7213,7 +7217,7 @@ - + @@ -7224,7 +7228,7 @@ - + @@ -7246,7 +7250,7 @@ - + @@ -7257,13 +7261,13 @@ - + - + @@ -7277,7 +7281,7 @@ - + @@ -7292,7 +7296,7 @@ - + @@ -7306,7 +7310,7 @@ - + @@ -7320,7 +7324,7 @@ - + @@ -7334,7 +7338,7 @@ - + @@ -7348,7 +7352,7 @@ - + @@ -7368,7 +7372,7 @@ - + @@ -7409,7 +7413,7 @@ - + @@ -7418,7 +7422,7 @@ - + @@ -7429,7 +7433,7 @@ - + @@ -7440,7 +7444,7 @@ - + @@ -7486,7 +7490,7 @@ - + @@ -7512,7 +7516,7 @@ - + @@ -7526,7 +7530,7 @@ - + @@ -7565,7 +7569,7 @@ - + @@ -7607,7 +7611,7 @@ - + @@ -7635,7 +7639,7 @@ - + @@ -7649,7 +7653,7 @@ - + @@ -7671,7 +7675,7 @@ - + @@ -7681,7 +7685,7 @@ - + @@ -7692,11 +7696,11 @@ - + - + @@ -7704,7 +7708,7 @@ - + @@ -7753,7 +7757,7 @@ - + @@ -7766,7 +7770,7 @@ - + @@ -7775,7 +7779,7 @@ - + @@ -7784,7 +7788,7 @@ - + @@ -7817,7 +7821,7 @@ - + @@ -7830,7 +7834,7 @@ - + @@ -7890,7 +7894,7 @@ - + @@ -7955,7 +7959,7 @@ - + @@ -8006,7 +8010,7 @@ - + @@ -8017,7 +8021,7 @@ - + @@ -8041,14 +8045,14 @@ - + - + @@ -8117,7 +8121,7 @@ - + @@ -8224,7 +8228,7 @@ - + @@ -8244,7 +8248,7 @@ - + @@ -8267,7 +8271,7 @@ - + @@ -8293,7 +8297,7 @@ - + @@ -8378,21 +8382,21 @@ - + - + - + @@ -8436,7 +8440,7 @@ - + @@ -8451,7 +8455,7 @@ - + @@ -8503,11 +8507,11 @@ - + - + @@ -8515,7 +8519,7 @@ - + @@ -8529,14 +8533,14 @@ - + - + @@ -8545,7 +8549,7 @@ - + @@ -8562,7 +8566,7 @@ - + @@ -8629,7 +8633,7 @@ - + @@ -8639,7 +8643,7 @@ - + @@ -8670,7 +8674,7 @@ - + @@ -8712,13 +8716,13 @@ - + - + @@ -8730,7 +8734,7 @@ - + @@ -8824,7 +8828,7 @@ - + @@ -8903,14 +8907,14 @@ - + - + @@ -8928,14 +8932,14 @@ - + - + @@ -8946,7 +8950,7 @@ - + @@ -8962,7 +8966,7 @@ - + @@ -8979,7 +8983,7 @@ - + @@ -8999,7 +9003,7 @@ - + @@ -9016,7 +9020,7 @@ - + @@ -9025,22 +9029,22 @@ - + - + - + - + @@ -9050,7 +9054,7 @@ - + @@ -9093,14 +9097,14 @@ - + - + @@ -9112,7 +9116,7 @@ - + @@ -9141,14 +9145,14 @@ - + - + @@ -9159,14 +9163,14 @@ - + - + @@ -9180,7 +9184,7 @@ - + @@ -9194,7 +9198,7 @@ - + @@ -9218,7 +9222,7 @@ - + @@ -9230,7 +9234,7 @@ - + @@ -9243,7 +9247,7 @@ - + @@ -9255,7 +9259,7 @@ - + @@ -9266,7 +9270,7 @@ - + @@ -9289,19 +9293,19 @@ - + - + - + @@ -9315,7 +9319,7 @@ - + @@ -9327,7 +9331,7 @@ - + @@ -9342,7 +9346,7 @@ - + @@ -9359,7 +9363,7 @@ - + @@ -9412,7 +9416,7 @@ - + @@ -9423,7 +9427,7 @@ - + @@ -9433,11 +9437,11 @@ - + - + @@ -9446,7 +9450,7 @@ - + @@ -9454,7 +9458,7 @@ - + @@ -9463,7 +9467,7 @@ - + @@ -9513,28 +9517,28 @@ - + - + - + - + @@ -9542,7 +9546,7 @@ - + @@ -9565,7 +9569,7 @@ - + @@ -9582,7 +9586,7 @@ - + @@ -9596,7 +9600,7 @@ - + @@ -9616,7 +9620,7 @@ - + @@ -9627,7 +9631,7 @@ - + @@ -9638,7 +9642,7 @@ - + @@ -9665,7 +9669,7 @@ - + @@ -9676,13 +9680,13 @@ - + - + @@ -9695,7 +9699,7 @@ - + @@ -9706,7 +9710,7 @@ - + @@ -9803,7 +9807,7 @@ - + @@ -9817,7 +9821,7 @@ - + @@ -9827,14 +9831,14 @@ - + - + @@ -9844,7 +9848,7 @@ - + @@ -9855,7 +9859,7 @@ - + @@ -9863,7 +9867,7 @@ - + @@ -9900,7 +9904,7 @@ - + @@ -9910,7 +9914,7 @@ - + @@ -9946,21 +9950,21 @@ - + - + - + @@ -9971,7 +9975,7 @@ - + @@ -10002,11 +10006,11 @@ - + - + @@ -10017,7 +10021,7 @@ - + @@ -10048,7 +10052,7 @@ - + @@ -10062,7 +10066,7 @@ - + @@ -10073,7 +10077,7 @@ - + @@ -10084,7 +10088,7 @@ - + @@ -10094,14 +10098,14 @@ - + - + @@ -10112,35 +10116,35 @@ - + - + - + - + - + @@ -10152,7 +10156,7 @@ - + diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index 22c293997..c83bbd270 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@ - + @@ -191,6 +191,7 @@ + @@ -1350,8 +1351,8 @@ - - + + diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 9b9f92fc1..747572da1 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@ - + @@ -191,6 +191,7 @@ + @@ -1350,8 +1351,8 @@ - - + + diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 9871f1ba7..8b0329619 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@ - + @@ -191,6 +191,7 @@ + @@ -1350,8 +1351,8 @@ - - + + diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index bf5ad3355..dd7024d4f 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@ - + @@ -191,6 +191,7 @@ + @@ -1350,8 +1351,8 @@ - - + + diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index b92e77274..3b686f838 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@ - + @@ -191,6 +191,7 @@ + @@ -1253,7 +1254,7 @@ - + @@ -1350,8 +1351,8 @@ - - + + diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index 23516086b..1f1d4afc7 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ - + @@ -191,6 +191,7 @@ + @@ -1350,8 +1351,8 @@ - - + + diff --git a/tex/generic/context/ppchtex.noc b/tex/generic/context/ppchtex.noc index 4ae710279..6b2c2d1f2 100644 --- a/tex/generic/context/ppchtex.noc +++ b/tex/generic/context/ppchtex.noc @@ -62,13 +62,13 @@ \def\defineconstant #1 #2 #3 % en nl de {\ifcase\interfacenumber - \setvalue{c!#1}{#2} - \setvalue{c!#2}{#2} + \setvalue{c!#1}{#1} + \setvalue{c!#2}{#1} \or - \setvalue{c!#1}{#2} + \setvalue{c!#1}{#1} \or - \setvalue{c!#1}{#2} - \setvalue{c!#3}{#2} + \setvalue{c!#1}{#1} + \setvalue{c!#3}{#1} \fi} \def\definecommand #1 #2 #3 % @@ -139,7 +139,7 @@ \defineconstant right rechts rechts \defineconstant resolution resolutie aufloesung \defineconstant scale schaal format -\defineconstant status status status +\defineconstant state status status \defineconstant text tekst text \defineconstant textcolor tekstkleur tekstfarbe \defineconstant textsize tekstformaat textgroesse -- cgit v1.2.3