From 907edcfcac423f52f1b960a94a3242a0501c7afa Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Thu, 27 Apr 2006 00:58:00 +0200 Subject: stable 2006.04.27 00:58 --- tex/context/base/colo-ini.tex | 94 +-- tex/context/base/cont-new.tex | 18 +- tex/context/base/context.tex | 2 +- tex/context/base/core-job.tex | 2 +- tex/context/base/core-lst.tex | 2 +- tex/context/base/core-mat.tex | 2 +- tex/context/base/core-not.tex | 4 +- tex/context/base/core-ref.tex | 42 +- tex/context/base/core-sec.tex | 5 + tex/context/base/core-syn.tex | 12 + tex/context/base/font-ini.tex | 7 +- tex/context/base/hand-ini.tex | 4 +- tex/context/base/lang-ita.tex | 4 +- tex/context/base/m-database.tex | 287 +++++++++ tex/context/base/m-streams.tex | 2 + tex/context/base/page-flt.tex | 83 ++- tex/context/base/page-ini.tex | 2 + tex/context/base/page-one.tex | 14 +- tex/context/base/prop-lay.tex | 4 +- tex/context/base/s-pre-30.tex | 245 ++++++++ tex/context/base/syst-ext.tex | 6 +- tex/context/base/syst-gen.tex | 2 +- tex/context/base/x-om2cml.xsl | 1250 +++++++++++++++++++++++++++++++++++++ tex/context/base/x-openmath.xsl | 35 ++ tex/context/interface/cont-cz.xml | 2 + tex/context/interface/cont-de.xml | 2 + tex/context/interface/cont-en.xml | 2 + tex/context/interface/cont-fr.xml | 2 + tex/context/interface/cont-it.xml | 2 + tex/context/interface/cont-nl.xml | 2 + tex/context/interface/cont-ro.xml | 2 + tex/context/interface/keys-cz.xml | 2 +- tex/context/interface/keys-de.xml | 2 +- tex/context/interface/keys-en.xml | 2 +- tex/context/interface/keys-fr.xml | 2 +- tex/context/interface/keys-it.xml | 2 +- tex/context/interface/keys-nl.xml | 2 +- tex/context/interface/keys-ro.xml | 2 +- 38 files changed, 2018 insertions(+), 138 deletions(-) create mode 100644 tex/context/base/m-database.tex create mode 100644 tex/context/base/s-pre-30.tex create mode 100644 tex/context/base/x-om2cml.xsl create mode 100644 tex/context/base/x-openmath.xsl (limited to 'tex') diff --git a/tex/context/base/colo-ini.tex b/tex/context/base/colo-ini.tex index 779479681..0fac60740 100644 --- a/tex/context/base/colo-ini.tex +++ b/tex/context/base/colo-ini.tex @@ -326,64 +326,6 @@ \def\dodefineglobalcolor{\dododefinecolor\doglobal\setgvalue\setxvalue1} \def\dodefinenamedcolor {\dododefinecolor\doglobal\setvalue \setevalue0} -% keep this for readability -% -% \def\dodefinecolor[#1][#2]% -% {\addtocommalist{#1}\colorlist -% \doifassignmentelse{#2} -% {\@@resetcolorparameters -% \getparameters[\??cl @@][#2]% -% \doifelse{\@@cl@@r\@@cl@@g\@@cl@@b}{\@@cl@@z\@@cl@@z\@@cl@@z} -% {\doifelse{\@@cl@@c\@@cl@@m\@@cl@@y\@@cl@@k}{\@@cl@@z\@@cl@@z\@@cl@@z\@@cl@@z} -% {\doifelse\@@cl@@s\@@cl@@z -% {\showmessage\m!colors8{{[#2]},#1}% -% \setevalue{\??cr#1}{\colorZpattern}} -% {\setevalue{\??cr#1}{\colorSpattern}}} -% {\setevalue{\??cr#1}{\colorCpattern}}} -% {\setevalue{\??cr#1}{\colorRpattern}}} -% {\doifdefinedelse{\??cr#2} -% {\doifelse{#1}{#2} -% {% this way we can freeze \definecolor[somecolor][somecolor] -% % and still prevent cyclic definitions -% \iffreezecolors\setevalue{\??cr#1}{\getvalue{\??cr#2}}\fi} -% {\iffreezecolors\@EA\setevalue\else\@EA\setvalue\fi -% {\??cr#1}{\getvalue{\??cr#2}}}} -% {\showmessage\m!colors3{#1}\empty}}% -% \unexpanded\setvalue{#1}{\color[#1]}} % \unexpanded toegevoegd - -% \def\dododefinecolor#1#2#3#4[#5][#6]% #2==set(g)value #3==set[e|x]value -% {#1\addtocommalist{#5}\colorlist % optional -% \doifassignmentelse{#6} -% {\@@resetcolorparameters -% \getparameters[\??cl @@][#6]% -% \ifx\@@cl@@h\empty -% \doifelse{\@@cl@@r\@@cl@@g\@@cl@@b}{\@@cl@@z\@@cl@@z\@@cl@@z} -% {\doifelse{\@@cl@@c\@@cl@@m\@@cl@@y\@@cl@@k}{\@@cl@@z\@@cl@@z\@@cl@@z\@@cl@@z} -% {\doifelse\@@cl@@s\@@cl@@z -% {\showmessage\m!colors8{{[#6]},#5}% -% #3{\??cr#5}{\colorZpattern}} -% {#3{\??cr#5}{\colorSpattern}}} -% {#3{\??cr#5}{\colorCpattern}}} -% {#3{\??cr#5}{\colorRpattern}}% -% \else -% \setxvalue{\??cr#5}{\colorHpattern}% -% \fi -% % new: e=external spot color name -% \ifx\@@cl@@e\empty \else -% \doregisterspotcolorname{#5}\@@cl@@e -% \fi} -% {\doifdefinedelse{\??cr#6} -% {\doifelse{#5}{#6} -% {% this way we can freeze \definecolor[somecolor][somecolor] -% % and still prevent cyclic definitions -% \iffreezecolors#3{\??cr#5}{\getvalue{\??cr#6}}\fi} -% {\iffreezecolors\@EA#3\else\@EA#2\fi -% {\??cr#5}{\getvalue{\??cr#6}}}} -% {\showmessage\m!colors3{#5 (def)}}}% -% \ifcase#4\or -% \unexpanded#2{#5}{\switchtocolor[#5]}% \unexpanded toegevoegd -% \fi} - \def\dododefinecolor#1#2#3#4[#5][#6]% #2==set(g)value #3==set[e|x]value {#1\addtocommalist{#5}\colorlist % optional \doifassignmentelse{#6} @@ -416,9 +358,9 @@ {\doifelse{#5}{#6} {% this way we can freeze \definecolor[somecolor][somecolor] % and still prevent cyclic definitions - \iffreezecolors#3{\??cr#5}{\getvalue{\??cr#6}}\fi} + \iffreezecolors#3{\??cr#5}{\csname\??cr#6\endcsname}\fi} {\iffreezecolors\@EA#3\else\@EA#2\fi - {\??cr#5}{\getvalue{\??cr#6}}}} + {\??cr#5}{\csname\??cr#6\endcsname}}} {\showmessage\m!colors3{#5 (def)}}% \fi}% \ifcase#4\or @@ -427,7 +369,7 @@ \def\paletcolorspec#1% % {\executeifdefined{\??cr\currentpalet#1}{\executeifdefined{\??cr#1}\empty}} - {\getvalue{\??cr\currentpalet#1}} + {\csname\??cr\currentpalet#1\endcsname} %D Hex color support is not enabled by default. You need to say \setupcolor %D [hex] to get this working. @@ -449,6 +391,9 @@ \edef\@@cl@@n{#2}% \getparameters[\??cl @@][#3]% \doifnothing\@@cl@@p{\let\@@cl@@p\!!plusone}% + \ifx\@@cl@@e\empty \else + \doregisterspotcolorname{#2}\@@cl@@e + \fi \doglobal\addtocommalist{#2}\allspotcolors \setxvalue{\??cr#1}{\colorPpattern}% was \setevalue \setgvalue{#1}{\switchtocolor[#1]}}} % was \setvalue @@ -534,14 +479,15 @@ \processcommalist[#1]\docommand}} \def\checkmultitonecolor#1% - {\getvalue{\??cl#1\s!check}\letgvalue{\??cl#1\s!check}\relax} + {\csname\??cl#1\s!check\endcsname\letgvalue{\??cl#1\s!check}\relax} -\def\dodefinespotcolor[#1][#2][#3]% todo: always global +\def\dodefinespotcolor[#1][#2][#3]% todo: always global (REDEFINED) {\doifnot{#1}{#2} {\@@resetcolorparameters \edef\@@cl@@n{#2}% \getparameters[\??cl @@][#3]% - \doifnothing\@@cl@@p{\let\@@cl@@p\!!plusone}% + \doifnothing \@@cl@@p{\let\@@cl@@p\!!plusone}% + \doifsomething\@@cl@@e{\doregisterspotcolorname{#2}\@@cl@@e}% \doglobal\addtocommalist{#2}\allspotcolors \setxvalue{\??cr#1}{\colorPpattern}% was \setevalue \setgvalue{#1}{\switchtocolor[#1]}}}% was \setvalue @@ -2174,7 +2120,7 @@ {\dodoformatcolor{#1}} \def\doformatcolor#1:% - {\getvalue{doformatcolor#1}} + {\csname doformatcolor#1\endcsname} \def\colorvalue {\dowithcolor\doformatcolor} @@ -2197,7 +2143,7 @@ {\dowithcolor\doformatcolor{#1}} \def\doformatgray#1:% - {\getvalue{doformatgray#1}} + {\csname doformatgray#1\endcsname} \def\grayvalue {\dowithcolor\doformatgray} @@ -2300,28 +2246,28 @@ \setevalue{\??pa\??pa#1}{#2}% \def\dodododefinepalet[##1=##2]% {\doifvaluesomething{\??pa#1} - {\setevalue{\??pa#1}{\getvalue{\??pa#1},}}% - \setevalue{\??pa#1}{\getvalue{\??pa#1}##1}% + {\setevalue{\??pa#1}{\csname\??pa#1\endcsname,}}% + \setevalue{\??pa#1}{\csname\??pa\endcsname##1}% \doifassignmentelse{##2} {% == \definepalet[test][xx={y=.4}] \definecolor[\??pa#1:##1][##2]% \iffreezecolors\@EA\setevalue\else\@EA\setvalue\fi - {\??cr#1:##1}{\getvalue{\??cr\??pa#1:##1}}} + {\??cr#1:##1}{\csname\??cr\??pa#1:##1\endcsname}} {% == \definepalet[test][xx=green] \doifdefinedelse{\??cr##2} {\iffreezecolors\@EA\setevalue\else\@EA\setvalue\fi - {\??cr#1:##1}{\getvalue{\??cr##2}}} + {\??cr#1:##1}{\csname\??cr##2\endcsname}} {\letvalue{\??cr#1:##1}\colorXpattern}}}% \def\dododefinepalet##1% {\dodododefinepalet[##1]}% \processcommalist[#2]\dododefinepalet} {\doifdefined{\??pa#2} - {\expanded{\dodefinepalet[#1][\getvalue{\??pa\??pa#2}]}}}} + {\expanded{\dodefinepalet[#1][\csname\??pa\??pa#2\endcsname]}}}} \let\paletsize\!!zerocount \def\getpaletsize[#1]% - {\getcommacommandsize[\getvalue{\??pa\??pa#1}]% + {\getcommacommandsize[\csname\??pa\??pa#1\endcsname]% \edef\paletsize{\number\commalistsize}} %D Instead of refering to colors, one can also directly specify @@ -2408,7 +2354,7 @@ [#2] [ \v!cmyk=>\edef\currentcolorspace{C}, \v!rgb=>\edef\currentcolorspace{R}, - \v!gray=>\edef\currentcolorspace{S}, + \v!gray=>\edef\currentcolorspace{S}, \v!spot=>\edef\currentcolorspace{P}, \v!s=>\edef\currentcolorspace{S}, \s!unknown=>\edef\currentcolorspace{R}]% @@ -2423,7 +2369,7 @@ {\doloop {\doifdefinedelse{\??cr#2:\recurselevel} {\setevalue{\??cr#1:\recurselevel}% - {\getvalue{\??cr#2:\recurselevel}}} + {\csname\??cr#2:\recurselevel\endcsname}} {\exitloop}}}% \fi} diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 4f332abe9..02030165c 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2006.04.23 23:55} +\newcontextversion{2006.04.27 00:58} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new @@ -26,6 +26,22 @@ \writestatus{\m!systems}{beware: some patches loaded from cont-new.tex} +\def\environment #1 % at outermost level only (load only once) + {\pushmacro\startenvironment + \pushmacro\stopenvironment + \def\startenvironment ##1 {}% + \let\stopenvironment\relax + \startreadingfile + \doexecutefileonce{#1} + \stopreadingfile + \popmacro\startenvironment + \popmacro\stopenvironment} + +\def\singlewidened #1{\hbox spread 1em{\hss#1\hss}} +\def\complexwidened[#1]#2{\hbox spread #1{\hss#2\hss}} + +\definecomplexorsimple\widened + % todo % % \def\definelocation{\dodoubleargument\dodefinelocation} diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index b2c5f6c25..1f2d5043c 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{2006.04.23 23:55} +\def\contextversion{2006.04.27 00:58} %D For those who want to use this: diff --git a/tex/context/base/core-job.tex b/tex/context/base/core-job.tex index 7a950fc95..5e129caae 100644 --- a/tex/context/base/core-job.tex +++ b/tex/context/base/core-job.tex @@ -352,7 +352,7 @@ \def\donextlevel#1#2#3#4#5#6#7\\% {\pushmacro\currentcomponent - \let\currentcomponent#1 + \let\currentcomponent#1% \setsystemmode\currentcomponent \beforesplitstring#7\at.\to#2\relax \ifcase\filelevel\relax diff --git a/tex/context/base/core-lst.tex b/tex/context/base/core-lst.tex index d3a5ebdb4..e63212575 100644 --- a/tex/context/base/core-lst.tex +++ b/tex/context/base/core-lst.tex @@ -282,7 +282,7 @@ \dosetlistmode \endgroup} -% the simple appreach: +% the simple approach: % % \def\dosettoclevel#1#2% % {\dosetfilterlevel{\getvalue{#1#2\c!criterium}}\empty} diff --git a/tex/context/base/core-mat.tex b/tex/context/base/core-mat.tex index 8624396cc..c3edf584e 100644 --- a/tex/context/base/core-mat.tex +++ b/tex/context/base/core-mat.tex @@ -2071,7 +2071,7 @@ \edef\currentmathcases{#1}% \doifassignmentelse{#2}{\setupmathcases[#1][#2]}\donothing \mathcasesparameter\c!left - \ruledvcenter\bgroup + \vcenter\bgroup \pushmacro\docasesNC \let\endmath\relax \def\NC{\docasesNC}% diff --git a/tex/context/base/core-not.tex b/tex/context/base/core-not.tex index 410df6e47..6ab983ec1 100644 --- a/tex/context/base/core-not.tex +++ b/tex/context/base/core-not.tex @@ -446,14 +446,14 @@ \def\settextnotes {\def\startpushnote {\startvboxtohbox + \edef\@@defaultnotedefloc{\ifnum\noteparameter\c!n=\zerocount\v!serried\else\v!inleft \fi}% + \edef\@@defaultnotedefdis{\ifnum\noteparameter\c!n=\zerocount .5em\else\!!zeropoint\fi}% \startnotedef}% \def\stoppushnote {\stopnotedef \hskip\noteparameter\c!columndistance % plus.5em minus.5em \stopvboxtohbox}% \def\startpopnotes {\vbox\bgroup % here, else problems in preroll - \edef\@@defaultnotedefloc{\ifnum\noteparameter\c!n=\zerocount\v!serried\else\v!inleft \fi}% - \edef\@@defaultnotedefdis{\ifnum\noteparameter\c!n=\zerocount .5em\else\!!zeropoint\fi}% \doifnotinset{\noteparameter\c!width}{\v!fit,\v!broad}\setnotehsize \beginofshapebox}% \def\stoppopnotes {\endofshapebox diff --git a/tex/context/base/core-ref.tex b/tex/context/base/core-ref.tex index 7306987bb..4d31bf3a0 100644 --- a/tex/context/base/core-ref.tex +++ b/tex/context/base/core-ref.tex @@ -615,10 +615,47 @@ \def\currentfolioreference{0} +% \def\dogetreferenceelements#1#2#3#4#5% +% {\chardef\currentreferencetype=\ifx#1\relax0\else#1\fi\relax +% \ifnum\currentreferencetype<2 +% \edef\currentpagereference{#2}% +% \ifx\currentpagereference \empty +% \let\currentfolioreference\folio +% \else +% \def \currentpagereference {\referencepagenumber[#2]}% +% \edef\currentfolioreference{\dosplitofffoliopart[#2]}% +% \fi +% \edef\currentrealreference{#3}% +% \settextreferences#4\end +% \ifnum0#5<\crossreferencenumber +% \forwardreferencetrue +% \else +% \forwardreferencefalse +% \fi +% \else +% \edef\currentrealreference {#3}% +% \def \currentdatareference {#2}% +% \let \currentfolioreference\folio +% \settextreferences#4\end +% \forwardreferencefalse +% \fi +% \ifodd\currentreferencetype +% \realreferencepagefalse +% \else +% \docheckrealreferencepage\currentrealreference +% \ifrealreferencepage \else +% \docheckrealreferencepage\currentdatareference +% \fi +% \fi} + +\let\currentlocationreference\empty + \def\dogetreferenceelements#1#2#3#4#5% {\chardef\currentreferencetype=\ifx#1\relax0\else#1\fi\relax - \ifnum\currentreferencetype<2 + \ifnum\currentreferencetype<\plustwo \edef\currentpagereference{#2}% + \let \currentdatareference\empty + \edef\currentlocationreference{#2}% \ifx\currentpagereference \empty \let\currentfolioreference\folio \else @@ -633,6 +670,7 @@ \forwardreferencefalse \fi \else + \let \currentlocationreference\empty \edef\currentrealreference {#3}% \def \currentdatareference {#2}% \let \currentfolioreference\folio @@ -1369,7 +1407,7 @@ % \egroup % \doresetgotowhereever} % to prevent problems with direct goto's -\def\doifreferencefoundelse#1#2#3% REF \cs +\def\doifreferencefoundelse#1#2#3% REF \cs / never more than one group (else \aftergroup usage problems) {\checkreferences % first we collect the secondary ones \bgroup diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex index 446eab57e..63a5254cf 100644 --- a/tex/context/base/core-sec.tex +++ b/tex/context/base/core-sec.tex @@ -571,8 +571,13 @@ \fi}% \dobacktrackcommando\lastsection}} +% \def\ignoresectionconversion % brrr +% {\let\@@sectionconversion\secondoftwoarguments} + \def\dosetfilterlevel#1#2% beware: this one is \let {\bgroup + \let\@@shortsectionnumber\@@sectionvalue +% \ignoresectionconversion \edef\askedlevel{#1}% \edef\askedfilter{#2}% \ifx\askedlevel\v!current diff --git a/tex/context/base/core-syn.tex b/tex/context/base/core-syn.tex index ac48b38f2..9c291f156 100644 --- a/tex/context/base/core-syn.tex +++ b/tex/context/base/core-syn.tex @@ -251,11 +251,23 @@ \endgroup \ifutilitydone\else\nowhitespace\fi} +% to be tested +% +% \def\doplacelistofsorts#1% NOG EEN RUWE VERSIE MAKEN +% {\startpacked +% \doutilities{#1}\jobname{#1}\relax\par +% \stoppacked} + \def\docompletelistofsorts#1#2% {\expanded{\systemsuppliedchapter[#1]{\noexpand\headtext{#2}}}% \doplacelistofsorts{#1}% \page[\v!yes]} +% todo: +% +% \def\placelistofsorts[#1]% +% {\doplacelistofsorts{#1}} + \def\processsort#1#2#3% {\explicithmode \begingroup % was \bgroup diff --git a/tex/context/base/font-ini.tex b/tex/context/base/font-ini.tex index 782e9cd9c..1dc28a250 100644 --- a/tex/context/base/font-ini.tex +++ b/tex/context/base/font-ini.tex @@ -2850,8 +2850,8 @@ \fi}% \chardef\currentxfontsize\zerocount} -\def\dodosetfont#1#2% #1 = set/switch state - {\dododosetfont{#1}{#2}{\showmessage\m!fonts4{#2}}} +\def\dodosetfont#1#2% #1 = set/switch state | check fo rempty, else space + {\doifsomething{#2}{\dododosetfont{#1}{#2}{\showmessage\m!fonts4{#2}}}} \def\dododosetfont#1#2#3% #1 = set/switch state {\doifnumberelse{#2} @@ -3619,8 +3619,7 @@ %D because \PLAIN\ \TEX\ is english anyway. \def\dodefinebodyfontswitch[#1][#2]% - {\def\docommando##1% - {\setvalue{##1}{\switchtobodyfont[#2]}}% + {\def\docommando##1{\setvalue{##1}{\switchtobodyfont[#2]}}% \processcommalist[#1]\docommando} \def\definebodyfontswitch diff --git a/tex/context/base/hand-ini.tex b/tex/context/base/hand-ini.tex index 44fcf2973..e11e3da1a 100644 --- a/tex/context/base/hand-ini.tex +++ b/tex/context/base/hand-ini.tex @@ -208,15 +208,15 @@ \def\dosetfontadjusting#1% {\iftracefonthandling\showfontadjusting{#1}\fi \pdffontexpand\handledfont - \csname\@fha@\@fha@#1\c!min \endcsname\space \csname\@fha@\@fha@#1\c!max \endcsname\space + \csname\@fha@\@fha@#1\c!min \endcsname\space \csname\@fha@\@fha@#1\c!step\endcsname\space \@@pdfexpandbonus\relax} \def\showfontadjusting#1% {\writestatus\m!handlings{[adjust]\space#1\space - \csname\@fha@\@fha@#1\c!min \endcsname/% \csname\@fha@\@fha@#1\c!max \endcsname/% + \csname\@fha@\@fha@#1\c!min \endcsname/% \csname\@fha@\@fha@#1\c!step\endcsname\space \fontname\handledfont}} \fi diff --git a/tex/context/base/lang-ita.tex b/tex/context/base/lang-ita.tex index cc2f8af93..776078118 100644 --- a/tex/context/base/lang-ita.tex +++ b/tex/context/base/lang-ita.tex @@ -162,7 +162,7 @@ \setupheadtext [\s!pt] [\v!content=Conte\'udo] \setupheadtext [\s!ro] [\v!content=Cuprins] -\setupheadtext [\s!fr] [\v!tables=Tables] +\setupheadtext [\s!fr] [\v!tables=Tableaux] \setupheadtext [\s!es] [\v!tables=Tablas] \setupheadtext [\s!ca] [\v!tables=Taules] \setupheadtext [\s!it] [\v!tables=Tabelle] @@ -226,7 +226,7 @@ \setupheadtext [\s!pt] [\v!units=Unidades] \setupheadtext [\s!ro] [\v!units=Unit\u{a}\c{t}i] -\setuplabeltext [\s!fr] [\v!table=Table ] +\setuplabeltext [\s!fr] [\v!table=Tableau ] \setuplabeltext [\s!es] [\v!table=Tablas ] \setuplabeltext [\s!ca] [\v!table=Taules ] \setuplabeltext [\s!it] [\v!table=Tabella ] diff --git a/tex/context/base/m-database.tex b/tex/context/base/m-database.tex new file mode 100644 index 000000000..a657e38c3 --- /dev/null +++ b/tex/context/base/m-database.tex @@ -0,0 +1,287 @@ +%D \module +%D [ file=m-database, +%D version=2006.04.23, +%D title=\CONTEXT\ Modules, +%D subtitle=Database Thingies, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright=PRAGMA + +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + + +\unprotect + +% % % to be added to mult-* files +% +% % % todo: \dontcollectseparatedlist via k/v + +\definesystemvariable{ls} +\def\c!first{first} +\def\c!last {last} + +% % % so far + +% \long\def\processseplist#1#2#3\end +% {\def\doprocessseplist####1####2\end +% {\ifx\end####1% +% \expandafter\gobbleoneargument +% \else +% #2{####1####2}% +% \fi +% \doprocessseplist}% +% \dodoprocessseplist#3\end} + +\def\dodefineprocessseplist#1#2% separator \docommand + {\def\dodoprocessseplist##1##2#1% + {\ifx\relax##1% + \expandafter\nodoprocessseplist + \else\ifx##1#1% + #2{}% + #2{##2}% + \expandafter\expandafter\expandafter\dodoprocessseplist + \else + #2{##1##2}% + \expandafter\expandafter\expandafter\dodoprocessseplist + \fi\fi}% + \def\doprocessseplist##1\relax + {\dodoprocessseplist##1#1\relax#1\relax\relax\end}} + +\def\nodoprocessseplist#1\end + {} + +\long\def\processseplist#1#2#3\relax + {\dodefineprocessseplist{#1}{#2}% + \dodoprocessseplist#3#1\relax#1\relax\relax\end} + +% \dodefineprocessseplist{,}\test +% \dodoprocessseplist{,}a,b,c\relax,\relax\relax\end +% \doprocessseplista,b,c\relax + +% \def\test#1{[#1]} +% \startlines +% \processseplist{,}\test ,2,,\relax +% \processseplist{,}\test ,,,44\relax +% \processseplist{,}\test ,,33,44\relax +% \processseplist{,}\test 11,,33,44\relax +% \processseplist{,}\test 1,2,3,4\relax +% \stoplines + +\newtoks\separatedlistdata + +\def\appendseparatedlistparameter#1% + {\@EAEAEA\appendtoks\csname\??ls\currentseparatedlist#1\endcsname\to\separatedlistdata} + +\def\appendseparatedlistcontent#1% + {\appendtoks#1\to\separatedlistdata} + +\def\flushseparatedlistdata + {\the\separatedlistdata + \separatedlistdata\emptytoks} + +\def\initializeseparatedlistdata + {\separatedlistdata{\egroup}} + +\def\dontcollectseparatedlist + {\def\dodoprocessseparatedfileline + {\the\separatedlistdata + \separatedlistdata\emptytoks + \doprocessseparatedfileline}% + \def\dodoprocessseparatedline + {\the\separatedlistdata + \separatedlistdata\emptytoks + \doprocessseparatedline}% + \let\flushseparatedlistdata\egroup + \let\initializeseparatedlistdata\donothing} + +\chardef\separatedlistmode\zerocount + +\bgroup \obeylines + +\gdef\doprocessseparatedfileline% + {\ifeof\scratchread% + \ifcase\separatedlistmode\appendseparatedlistparameter\c!after\fi% + \immediate\closein\scratchread% + \expandafter\flushseparatedlistdata% + \else\ifx\line\empty% + % skip, can be comment + \read\scratchread to\line% + \@EA\dodoprocessseparatedfileline% + \else + \appendseparatedlistparameter{\ifcase\separatedlistmode\c!first\else\c!command\fi}% + \expandafter\doprocessseplist\line\relax% + \ifcase\separatedlistmode\appendseparatedlistparameter\c!last\fi% + \read\scratchread to\line% + \@EAEAEA\dodoprocessseparatedfileline% + \fi\fi} + +\gdef\dodoprocessseparatedfileline% + {\doprocessseparatedfileline} + +\gdef\doprocessseparatedfile[#1][#2]% + {\bgroup% + \edef\currentseparatedlist{#1}% + \doifdefined{\??ls\currentseparatedlist\c!command}{\chardef\separatedlistmode\plusone}% + \edef\currentlistseparator{\csname\??ls\currentseparatedlist\c!separator\endcsname}% + \ifx\currentlistseparator\empty\def\currentlistseparator{,}\fi% + \expandafter\dodefineprocessseplist\expandafter{\currentlistseparator}\doprocessseparateditem% + \initializeseparatedlistdata% + \directsetup{\currentseparatedlist:\executeifdefined{\??ls\currentseparatedlist\c!setups}\s!default}% + \ifcase\separatedlistmode\appendseparatedlistparameter\c!before\fi% + \endlinechar\minusone% + \ignorelines% + \catcode`\#\@@comment + \immediate\openin\scratchread=#2\relax% todo: \doopenin + \read\scratchread to\line% + \doprocessseparatedfileline} + +\gdef\dostartseparatedlist#1[#2]% + {\bgroup% + \edef\currentseparatedlist{#2}% + \doifdefined{\??ls\currentseparatedlist\c!command}{\chardef\separatedlistmode\plusone}% + \obeylines% + \let#1\relax% + \def\separateslistend{#1}% + \edef\currentlistseparator{\csname\??ls\currentseparatedlist\c!separator\endcsname}% + \ifx\currentlistseparator\empty\def\currentlistseparator{,}\fi% + \expandafter\dodefineprocessseplist\expandafter{\currentlistseparator}\doprocessseparateditem% + \directsetup{\currentseparatedlist:\executeifdefined{\??ls\currentseparatedlist\c!setups}\s!default}% + \initializeseparatedlistdata% + \ifcase\separatedlistmode\appendseparatedlistparameter\c!before\fi% + \dodostartseparatedlist} + +\gdef\dodostartseparatedlist#1 + {\doprocessseparatedline} + +\gdef\doprocessseparatedline#1 + {\def\!!stringa{#1}% + \ifx\!!stringa\separateslistend% + \ifcase\separatedlistmode\appendseparatedlistparameter\c!after\fi% + \expandafter\flushseparatedlistdata% + \else% + \appendseparatedlistparameter{\ifcase\separatedlistmode\c!first\else\c!command\fi}% + \expandafter\doprocessseplist#1\relax% + \ifcase\separatedlistmode\appendseparatedlistparameter\c!last\fi% + \expandafter\dodoprocessseparatedline% + \fi} + +\gdef\dodoprocessseparatedline% + {\doprocessseparatedline} + +\gdef\doprocessseparateditem#1% + {\ifcase\separatedlistmode + \appendseparatedlistparameter\c!left% + \appendseparatedlistcontent{#1}% + \appendseparatedlistparameter\c!right + \else + \appendseparatedlistcontent{{#1}}% + \fi} + +\egroup + +\startsetups CVS:unix + \catcode`\#=\@@comment +\stopsetups + +\def\defineseparatedlist + {\dodoubleempty\dodefineseparatedlist} + +\def\dodefineseparatedlist[#1][#2]% + {\setvalue{\e!start#1}{\expandafter\dostartseparatedlist\csname\e!stop#1\endcsname[#1]}% + \getparameters + [\??ls#1] + [\c!separator=, + \c!first=, + \c!left=, + \c!before=, + \c!right=, + \c!last=, + \c!after=, +% \c!command=, + #2]} + +\def\startseparatedlist[#1]% + {\dostartseparatedlist\stopseparatedlist[#1]} + +\def\processseparatedfile + {\dodoubleargument\doprocessseparatedfile} + +\protect \endinput + +\defineseparatedlist + [CVS] + [separator={,}, + first=\bTR,last=\eTR, + left=\bTD,right=\eTD, + before=\bTABLE,after=\eTABLE] + +\startseparatedlist[CVS] +a,b,c +d,e,f +\stopseparatedlist + +\startCVS +a,b,c +d,e,f +\stopCVS + +\defineseparatedlist + [CVS] + [separator={,}, + first=\NC,last=\NR, + left=,right=\NC, + before={\starttabulate[|l|l|l|]},after=\stoptabulate] + +\startCVS +a,b,c +d,e,f +\stopCVS + +\defineseparatedlist + [CVS] + [separator={ }, + first=\NC,last=\NR, + left=,right=\NC, + before={\starttabulate[|l|l|l|]},after=\stoptabulate] + +\startCVS +a b c +d e f +\stopCVS + +\defineseparatedlist + [CVS] + [setups=unix, + first=\NC,last=\NR, + left=,right=\NC, + before={\starttabulate[|l|l|l|]},after=\stoptabulate] + +% \startsetups CVS:unix +% \catcode`\#=\@@comment +% \stopsetups + +% %1,2,3 +% 1,2,3 +% # 4,5,6 +% 4,5,6 + +\processseparatedfile[CVS][test.dat] + +\defineseparatedlist + [CVSX] + [command=\Whatever, + separator={,}, + first=\bTR,last=\eTR, + left=\bTD,right=\eTD, + before=\bTABLE,after=\eTABLE] + +\def\Whatever#1#2#3{[#1][#2][#3]\endgraf} + +\startseparatedlist[CVSX] +a,b,c +d,e,f +\stopseparatedlist + +\stoptext diff --git a/tex/context/base/m-streams.tex b/tex/context/base/m-streams.tex index d465c390a..fd93f2655 100644 --- a/tex/context/base/m-streams.tex +++ b/tex/context/base/m-streams.tex @@ -374,6 +374,8 @@ \starttext +% \definestreamlayer[block] +% % \startstreamlayer[block] % \title{Sample \recurselevel} % \startcolumns diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex index 18ea5113a..3b9396d28 100644 --- a/tex/context/base/page-flt.tex +++ b/tex/context/base/page-flt.tex @@ -1055,18 +1055,18 @@ % \goodbreak}% % \doinsertfloatinfo} -\def\OTRONEsomepagefloat[#1]% - {%\checkwaitingfloats{#1}% - \global\setbox\collectedpagefloats\vbox - {\ifvoid\collectedpagefloats\else\unvbox\collectedpagefloats\fi - \vbox to \textheight % vss and unvbox catch too high and limited floats - {\vss - \doifnotinset\v!high{#1}\vfill - \unvbox\floatbox - \doifnotinset\v!low{#1}\vfill - \vss}% - \goodbreak}% - \doinsertfloatinfo} +% \def\OTRONEsomepagefloat[#1]% +% {%\checkwaitingfloats{#1}% +% \global\setbox\collectedpagefloats\vbox +% {\ifvoid\collectedpagefloats\else\unvbox\collectedpagefloats\fi +% \vbox to \textheight % vss and unvbox catch too high and limited floats +% {\vss +% \doifnotinset\v!high{#1}\vfill +% \unvbox\floatbox +% \doifnotinset\v!low{#1}\vfill +% \vss}% +% \goodbreak}% +% \doinsertfloatinfo} % test case: % @@ -2132,14 +2132,35 @@ % \ifinpostponing: handhaven, want gebruikt in stijlen ! ! ! ! ! +\def\flushpagefloats + {\doifoddpageelse + {\ifvoid\collectedleftpagefloats + \ifvoid\collectedrightpagefloats\else + \unvbox\collectedrightpagefloats + \page + %\the\everytopofpage + \fi + \fi} + {\ifvoid\collectedleftpagefloats\else + \unvbox\collectedleftpagefloats + \page + %\the\everytopofpage + \fi + \ifvoid\collectedrightpagefloats\else + \unvbox\collectedrightpagefloats + \page + %\the\everytopofpage + \fi}% + \ifvoid\collectedpagefloats\else + % message + \unvbox\collectedpagefloats + \fi} + \def\dopostponeblock {\bgroup % new may 2004 \setsystemmode\v!postponing % new may 2004 \the\everytopofpage - \ifvoid\collectedpagefloats\else - % message - \unvbox\collectedpagefloats - \fi + \flushpagefloats \donefalse \ifinpostponing \else \ifcase\nofpostponedblocks \else \donetrue \fi @@ -2393,6 +2414,8 @@ \installfloathandler \v!margin \somemarginfloat \installfloathandler \v!opposite \somefacefloat \installfloathandler \v!page \somepagefloat +\installfloathandler \v!leftpage \someleftpagefloat +\installfloathandler \v!rightpage \somerightpagefloat \installfloathandler \v!inmargin \someinmarginfloat \installfloathandler \v!inleft \someinleftmarginfloat \installfloathandler \v!inright \someinrightmarginfloat @@ -2415,14 +2438,16 @@ \installfloathandler {fxtb} \someslotfloat \installfloathandler {fxbt} \someslotfloat -\def\placesomeslotfloat {\OTRcommand\someslotfloat} -\def\placesomeherefloat {\OTRcommand\someherefloat} -\def\placesomefixdfloat {\OTRcommand\somefixdfloat} -\def\placesomepagefloat {\OTRcommand\somepagefloat} -\def\placesometopsfloat {\OTRcommand\sometopsfloat} -\def\placesomebotsfloat {\OTRcommand\somebotsfloat} -\def\placesomesidefloat {\OTRcommand\somesidefloat} -\def\placesomefacefloat {\OTRcommand\somefacefloat} +\def\placesomeslotfloat {\OTRcommand\someslotfloat} +\def\placesomeherefloat {\OTRcommand\someherefloat} +\def\placesomefixdfloat {\OTRcommand\somefixdfloat} +\def\placesomepagefloat {\OTRcommand\somepagefloat} +\def\placesomeleftpagefloat {\OTRcommand\someleftpagefloat} +\def\placesomerightpagefloat{\OTRcommand\somerightpagefloat} +\def\placesometopsfloat {\OTRcommand\sometopsfloat} +\def\placesomebotsfloat {\OTRcommand\somebotsfloat} +\def\placesomesidefloat {\OTRcommand\somesidefloat} +\def\placesomefacefloat {\OTRcommand\somefacefloat} \def\someleftsidefloat [#1]{\somesidefloat[#1]\presetindentation} \def\somerightsidefloat [#1]{\somesidefloat[#1]} @@ -2440,9 +2465,11 @@ \def\somebackspacefloat [#1]{\somesidefloat[#1]} \def\somecutspacefloat [#1]{\somesidefloat[#1]} -\def\somefixdfloat {\placesomefixdfloat} -\def\somepagefloat {\placesomepagefloat} -\def\somefacefloat {\placesomefacefloat} -\def\someslotfloat {\placesomeslotfloat} +\def\somefixdfloat {\placesomefixdfloat} +\def\somepagefloat {\placesomepagefloat} +\def\someleftpagefloat {\placesomeleftpagefloat} +\def\somerightpagefloat{\placesomerightpagefloat} +\def\somefacefloat {\placesomefacefloat} +\def\someslotfloat {\placesomeslotfloat} \protect \endinput diff --git a/tex/context/base/page-ini.tex b/tex/context/base/page-ini.tex index c41019232..5184df72a 100644 --- a/tex/context/base/page-ini.tex +++ b/tex/context/base/page-ini.tex @@ -922,6 +922,8 @@ \newif\ifpackcolumnfloats \packcolumnfloatstrue \newbox\collectedpagefloats +\newbox\collectedleftpagefloats +\newbox\collectedrightpagefloats %D The \type {\ifdim} test is needed, because otherwise the %D last line of a text end up on top of the baseline instead of diff --git a/tex/context/base/page-one.tex b/tex/context/base/page-one.tex index df92c1f03..a52196c59 100644 --- a/tex/context/base/page-one.tex +++ b/tex/context/base/page-one.tex @@ -586,17 +586,21 @@ \doifinset\v!tall{#1}\flushsidefloatsafterpar \fi} -\def\OTRONEsomepagefloat[#1]% +\def\OTRONEdosomepagefloat#1[#2]% {%\checkwaitingfloats{#1}% - \global\setbox\collectedpagefloats\vbox - {\unvbox\collectedpagefloats + \global\setbox#1\vbox + {\unvbox#1% \vbox to \textheight - {\doifnotinset\v!high{#1}\vfill + {\doifnotinset\v!high{#2}\vfill \box\floatbox - \doifnotinset\v!low{#1}\vfill}% + \doifnotinset\v!low{#2}\vfill}% \goodbreak}% \doinsertfloatinfo} +\def\OTRONEsomepagefloat {\OTRONEdosomepagefloat\collectedpagefloats} +\def\OTRONEsomeleftpagefloat {\OTRONEdosomepagefloat\collectedleftpagefloats} +\def\OTRONEsomerightpagefloat{\OTRONEdosomepagefloat\collectedrightpagefloats} + \def\OTRONEsometopsfloat[#1]% {\ifdim\topinserted=\zeropoint \topofinserttrue diff --git a/tex/context/base/prop-lay.tex b/tex/context/base/prop-lay.tex index a5f43dc13..0e5038d19 100644 --- a/tex/context/base/prop-lay.tex +++ b/tex/context/base/prop-lay.tex @@ -27,8 +27,8 @@ \def\checklayerproperty {\doifelse{\checkedpropertyparameter\v!printable\currentproperty}\v!no - {\def\printviewerlayer{0}}% - {\def\printviewerlayer{1}} + {\def\printviewerlayer{0}} + {\def\printviewerlayer{1}}% \dodefineviewerlayer \currentproperty % tag {\checkedpropertyparameter\c!title\currentproperty}% diff --git a/tex/context/base/s-pre-30.tex b/tex/context/base/s-pre-30.tex new file mode 100644 index 000000000..2f983e51b --- /dev/null +++ b/tex/context/base/s-pre-30.tex @@ -0,0 +1,245 @@ +%D \module +%D [ file=s-pre-30, +%D version=2006.04.25, +%D title=\CONTEXT\ Style File, +%D subtitle=Presentation Environment 30, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright=PRAGMA] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\usemodule[streams] + +\setuppapersize + [S6] [S6] + +\setupbodyfont + [12pt,tt] + +\definemeasure[bleed][6pt] + +\definecolor[maincolor-3][r=.5,g=.2,b=.2] +\definecolor[maincolor-1][r=.2,g=.5,b=.2] +\definecolor[maincolor-2][r=.2,g=.2,b=.5] + +\definecolor[pagecolor] [s=.5] +\definecolor[resultcolor][s=1,t=.85,a=1] +\definecolor[maincolor] [maincolor-3] + +\definecolorgroup + [maingroup] + [.5:.2:.2, + .2:.5:.2, + .2:.2:.5] + +\definecolorgroup + [resultgroup] + [1:.85:.85, + .85:1:.85, + .85:.85:1] + +\def\CurrentColor{1} + +\definecolor[maincolor] [maingroup:\CurrentColor] +\definecolor[resultcolor][resultgroup:\CurrentColor] + +\def\NextColor{\ifnum\CurrentColor=3 \def\CurrentColor{1}\else\doglobal\increment\CurrentColor\fi} + +\setuplayout + [backspace=\measure{bleed}, + topspace=30pt, + bottomdistance=\measure{bleed}, + bottom=\dimexpr30pt-\measure{bleed}\relax, + header=0pt, + footer=0pt, + topdistance=\measure{bleed}, + top=\dimexpr30pt-\measure{bleed}\relax, + width=middle, + height=middle] + +\setuptop + [before=\vfill, + after=\vfill, + strut=yes] + +\setupbackgrounds + [text] + [backgroundoffset=\measure{bleed}, + background=color, + backgroundcolor=maincolor] + +\setupbackgrounds + [page] + [background=color, + backgroundcolor=pagecolor] + +\setupcolors + [state=start, + textcolor=white] + +\setuphead + [chapter] + [style=\ttd] + +\setuphead + [section] + [style=\ttd] + +\defineproperty + [result] + [layer] + [state=stop] + +\definelayer + [result] + +\setuplayer + [result] + [width=\textwidth, + height=\textheight] + +\setupbackgrounds + [text] + [background={color,toggle,foreground,result}] + +\setupinteraction + [state=start, + click=no, + menu=on, + color=white, + contrastcolor=white, + closepageaction=HideLayer{result}, + openpageaction=HideLayer{result}] + +% We add a dummy color switch so that each page has at least one +% transparency; else acrobat will render the pages differently +% bug in 6 and 7). + +\startinteractionmenu[bottom] +% \color[resultcolor]{ }% + \hfill + \got [content] content \\ + \got [previouspage] previous \\ + \got [nextpage] next \\ + \got [ToggleLayer{result}] result \\ + \got [CloseDocument] close \\ +\stopinteractionmenu + +\setuphead + [section] + [placehead=no, + incrementnumber=list] + +\setuplist + [section] + [alternative=f] + +\defineoverlay + [toggle] + [\overlaybutton{ToggleLayer{result}}] + +\definestreamlayer + [resultstream] + +\startsetups streamlayer:resultstream:flush + \setlayer + [result] + [preset=middlebottom, + hoffset=\measure{bleed}, +% voffset=-\measure{bleed}] + voffset=\measure{bleed}] + {\startproperty[result]% +% \framed +% [offset=overlay, +% frame=off, +% background=color, +% backgroundoffset=1\dimexpr\measure{bleed}\relax, +% backgroundcolor=maincolor] + {\framed + [offset=overlay, + frame=off, + foregroundcolor=maincolor, + background=color, + backgroundoffset=1\dimexpr\measure{bleed}\relax, + backgroundcolor=resultcolor] + {\tightlayer[\currentstreamlayer]}} + \stopproperty} +\stopsetups + +\startsetups show-definition + \subject{definition} + \typebuffer + \getbuffer + \page +\stopsetups + +\startsetups show-result + \startstreamlayer[resultstream] + \subject{result} + \getbuffer + \stopstreamlayer + \placestreamlayer[resultstream] + \page +\stopsetups + +\startsetups show-usage + \subject{usage} + \typebuffer + \startstreamlayer[resultstream] + \subject{result} + \getbuffer + \stopstreamlayer + \placestreamlayer[resultstream] + \page +\stopsetups + +\startsetups show-contents + \startcolumns[n=3] + \placelist[section][criterium=text] + \stopcolumns + \pagereference[content] + \page + \NextColor +\stopsetups + +\def\TitlePage#1% + {\title{#1} + \setups{show-contents}} + +\def\StartSample#1% + {\starttext + \page + \section{#1} + \setuptoptexts[][\processedfile\enspace:\enspace\lowercase{#1}]} + +\def\StopSample + {\page + \setuptoptexts[][] + \stoptext + \NextColor} + +\endinput + +\usemodule[pre-30] + +% \TitlePage{Howling to the moon} + +\StartSample{Basics} + +\startbuffer +\lua{a = 1.5 ; b = 1.8 ; c = a*b ; tex.print(c) ;} + +\startlua + a = 1 + b = 2 + c = a*b + tex.print(c) +\stoplua +\stopbuffer + +\setups{show-usage} + +\StopSample diff --git a/tex/context/base/syst-ext.tex b/tex/context/base/syst-ext.tex index b903a2778..55b1c5687 100644 --- a/tex/context/base/syst-ext.tex +++ b/tex/context/base/syst-ext.tex @@ -3777,18 +3777,16 @@ %D \processlist(){=>}\docommando(a=>b=>c=>d) %D \stoptyping -\long\def\processlist#1#2#3#4% +\long\def\processlist#1#2#3#4% no blank skipping ! {\def\doprocesslist##1#2% {\def\dodoprocesslist####1####2#3% {\ifx#2####1% \let\dodoprocesslist\relax \else\ifx#2####2% \let\dodoprocesslist\relax - \else\ifx\blankspace####2% - #4{####1}% \else #4{####1####2}% - \fi\fi\fi + \fi\fi \dodoprocesslist}% \expandafter\dodoprocesslist\gobbleoneargument##1#3#2#3}% \def\dodoprocesslist#1% diff --git a/tex/context/base/syst-gen.tex b/tex/context/base/syst-gen.tex index e249325b9..eea5351b8 100644 --- a/tex/context/base/syst-gen.tex +++ b/tex/context/base/syst-gen.tex @@ -2539,7 +2539,7 @@ %D Even more important is that this alternative is fully %D expandable! -\long\def\doifnumberelse#1% +\long\def\doifnumberelse#1% does not accept counters {\ifcase0\ifcase1#1\or\or\or\or\or\or\or\or\or\else1\fi\space \expandafter\secondoftwoarguments \else diff --git a/tex/context/base/x-om2cml.xsl b/tex/context/base/x-om2cml.xsl new file mode 100644 index 000000000..06f7442c8 --- /dev/null +++ b/tex/context/base/x-om2cml.xsl @@ -0,0 +1,1250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + + + -10 + + + + + + + + + + + + + + + + + + + 16 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + open + + + closed + + + open-closed + + + closed-open + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + all + + + above + + + below + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 16 + + + + + + + + + + + + + + + + + + + + + Content MathML cannot add type for the object after this comment. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + x + + + + x + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + 0.5 + + + + + + + 0 + + + + + + + + + 0.5 + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ERROR: + Error Type: + Error occured in CD: + Error occured in symbol: + + + + + + + + + + + + ERROR: + Error Type: + Description: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + 1 + + + + π + ⅈ + &NaN; + γ + ⅇ + &true; + &false; + ∞ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + x + + + + + + + + + + + + + diff --git a/tex/context/base/x-openmath.xsl b/tex/context/base/x-openmath.xsl new file mode 100644 index 000000000..e91b83e51 --- /dev/null +++ b/tex/context/base/x-openmath.xsl @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + /x-openmath.xsl + + + + diff --git a/tex/context/interface/cont-cz.xml b/tex/context/interface/cont-cz.xml index 821a9ff64..d61b5e8d7 100644 --- a/tex/context/interface/cont-cz.xml +++ b/tex/context/interface/cont-cz.xml @@ -7560,6 +7560,8 @@ + + diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml index 542c0fd24..dcab05847 100644 --- a/tex/context/interface/cont-de.xml +++ b/tex/context/interface/cont-de.xml @@ -7560,6 +7560,8 @@ + + diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml index e67085c00..ccf8b3dc1 100644 --- a/tex/context/interface/cont-en.xml +++ b/tex/context/interface/cont-en.xml @@ -7560,6 +7560,8 @@ + + diff --git a/tex/context/interface/cont-fr.xml b/tex/context/interface/cont-fr.xml index 0cfd795c1..8060afb2f 100644 --- a/tex/context/interface/cont-fr.xml +++ b/tex/context/interface/cont-fr.xml @@ -7560,6 +7560,8 @@ + + diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml index aa09da6bd..b5d18a716 100644 --- a/tex/context/interface/cont-it.xml +++ b/tex/context/interface/cont-it.xml @@ -7560,6 +7560,8 @@ + + diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml index 1734b2962..40f05f3a8 100644 --- a/tex/context/interface/cont-nl.xml +++ b/tex/context/interface/cont-nl.xml @@ -7560,6 +7560,8 @@ + + diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml index 9ed76d25c..17dd9eb13 100644 --- a/tex/context/interface/cont-ro.xml +++ b/tex/context/interface/cont-ro.xml @@ -7560,6 +7560,8 @@ + + diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index 9f2ff1790..ce25d7971 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 58688600d..6d71f6247 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index d40557aa5..9e77a60e2 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index 9f0740bce..b38033867 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index 408fb3211..4fff964bf 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index 0a62e9780..4919806b5 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index 5137fd255..346519a21 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ - + -- cgit v1.2.3