diff options
34 files changed, 659 insertions, 124 deletions
diff --git a/scripts/context/perl/mptopdf.pl b/scripts/context/perl/mptopdf.pl index 5f19ecaf4..767d2d260 100644 --- a/scripts/context/perl/mptopdf.pl +++ b/scripts/context/perl/mptopdf.pl @@ -22,6 +22,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $ use Config ; use Getopt::Long ; use strict ; +use File::Basename ; $Getopt::Long::passthrough = 1 ; # no error message $Getopt::Long::autoabbrev = 1 ; # partial switch accepted @@ -43,7 +44,7 @@ my $report = '' ; my $texlatexswitch = " --tex=latex --format=latex " ; my $mplatexswitch = " --tex=latex " ; -my $dosish = ($Config{'osname'} =~ /^(ms)?dos|^os\/2|^(ms|cyg)win/i) ; +my $dosish = ($Config{'osname'} =~/^(ms)?dos|^os\/2|^mswin/i) ; my $miktex = ($ENV{"TEXSYSTEM"} =~ /miktex/io); my $escapeshell = ( ($ENV{'SHELL'}) && ($ENV{'SHELL'} =~ m/sh/i )); @@ -107,8 +108,12 @@ foreach my $file (@files) else { $command = "$command \\\\relax $file" } system($command) ; - rename ("$_.pdf", "$_-$1.pdf") ; - if (-e "$_.pdf") { CopyFile ("$_.pdf", "$_-$1.pdf") } + # rename ("$_.pdf", "$_-$1.pdf") ; + # if (-e "$_.pdf") { CopyFile ("$_.pdf", "$_-$1.pdf") } + my $pdfsrc = basename($_).".pdf"; + rename ($pdfsrc, "$_-$1.pdf") ; + if (-e $pdfsrc) { CopyFile ($pdfsrc, "$_-$1.pdf") } + # end of patch if ($done) { $report .= " +" } $report .= " $_-$1.pdf" ; ++$done } } diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 9b8be587b..fe6f7df02 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -24,7 +24,7 @@ \normalend}} \fi -\newcontextversion{2006.01.12 10:38} +\newcontextversion{2006.01.16 18:35} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 825c873be..b4e228ae3 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.01.12 10:38} +\def\contextversion{2006.01.16 18:35} %D For those who want to use this: @@ -189,6 +189,7 @@ \input lang-ctx.tex \input lang-dis.tex % after lang-ctx ! \input unic-ini.tex +\input unic-ext.tex \input colo-ini.tex \input colo-ext.tex diff --git a/tex/context/base/core-mat.tex b/tex/context/base/core-mat.tex index c9ddd8afc..4e716cffe 100644 --- a/tex/context/base/core-mat.tex +++ b/tex/context/base/core-mat.tex @@ -520,22 +520,22 @@ % \defineformulaalternative[multi][\begindmath][\enddmath] % % \fakewords{20}{40}\epar -% \plaatsformule {a} $$ \fakespacingformula $$ +% \placeformula {a} $$ \fakespacingformula $$ % \fakewords{20}{40}\epar -% \plaatsformule {b} \startformule \fakespacingformula \stopformule -% \plaatsformule {b} \startformule \fakespacingformula \stopformule +% \placeformula {b} \startformule \fakespacingformula \stopformule +% \placeformula {b} \startformule \fakespacingformula \stopformule % \fakewords{20}{40}\epar -% \plaatsformule {c} \startmdformule \fakespacingformula \stopmdformule -% \plaatsformule {c} \startmdformule \fakespacingformula \stopmdformule +% \placeformula {c} \startmdformule \fakespacingformula \stopmdformule +% \placeformula {c} \startmdformule \fakespacingformula \stopmdformule % \fakewords{20}{40}\epar -% \plaatsformule {d} \startmpformule \fakespacingformula \stopmpformule -% \plaatsformule {d} \startmpformule \fakespacingformula \stopmpformule +% \placeformula {d} \startmpformule \fakespacingformula \stopmpformule +% \placeformula {d} \startmpformule \fakespacingformula \stopmpformule % \fakewords{20}{40}\epar -% \plaatsformule {e} \startsdformule \fakespacingformula \stopsdformule -% \plaatsformule {e} \startsdformule \fakespacingformula \stopsdformule +% \placeformula {e} \startsdformule \fakespacingformula \stopsdformule +% \placeformula {e} \startsdformule \fakespacingformula \stopsdformule % \fakewords{20}{40}\epar -% \plaatsformule {f} \startspformule \fakespacingformula \stopspformule -% \plaatsformule {f} \startspformule \fakespacingformula \stopspformule +% \placeformula {f} \startspformule \fakespacingformula \stopspformule +% \placeformula {f} \startspformule \fakespacingformula \stopspformule % \fakewords{20}{40} % \convertcommand\next\to\ascii \getfirstcharacter\ascii @@ -550,30 +550,30 @@ \dodoubleempty\doplaceformula} \def\doplaceformula[#1][#2]% #2 = dummy, gobbles spaces - {\def\redoplaatsformule + {\def\redoplaceformula {\bgroup\def\dostartformula####1{\relax}% \ifx\next\bgroup - \@EA\moreplaatsformule % [ref]{} + \@EA\moreplaceformula % [ref]{} \else \expandafter\convertargument\e!start\to\asciiA \expandafter\convertargument\next \to\asciiB \ExpandBothAfter\doifincsnameelse\asciiA\asciiB {\egroup \@EA\dodoplaceformula}% [ref]\start - {\egroup \@EA\dispplaatsformule}% [ref]$$ + {\egroup \@EA\dispplaceformula}% [ref]$$ \fi[#1]{}}% - \futurelet\next\redoplaatsformule} + \futurelet\next\redoplaceformula} -\long\def\moreplaatsformule[#1]#2#3#4% #2 dummy #4 gobbles spaces - {\def\redoplaatsformule +\long\def\moreplaceformula[#1]#2#3#4% #2 dummy #4 gobbles spaces + {\def\redoplaceformula {\expandafter\convertargument\e!start\to\asciiA \expandafter\convertargument\next \to\asciiB \ExpandBothAfter\doifincsnameelse\asciiA\asciiB {\egroup \dodoplaceformula}% [ref]\start - {\egroup \dispplaatsformule}% [ref]$$ + {\egroup \dispplaceformula}% [ref]$$ [#1]{#3}}% - \futurelet\next\redoplaatsformule#4} + \futurelet\next\redoplaceformula#4} -\def\dispplaatsformule[#1]#2$$#3$$% +\def\dispplaceformula[#1]#2$$#3$$% {\dodoplaceformula[#1]{#2}\dostartformula{}#3\dostopformula} \let\normalreqno\eqno @@ -673,8 +673,8 @@ \fi \fi \egroup} -\defineinnermathhandler\v!right{\startmathbox\empty1}{\stopmathbox\hfill0} -\defineinnermathhandler\v!left {\startmathbox\hfill0}{\stopmathbox\empty1} +\defineinnermathhandler\v!right {\startmathbox\empty1}{\stopmathbox\hfill0} +\defineinnermathhandler\v!left {\startmathbox\hfill0}{\stopmathbox\empty1} \defineinnermathhandler\v!middle{\startmathbox\hfill0}{\stopmathbox\hfill0} %D [The examples below are in english and don't process in the diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex index d8ca4cf70..555c5fcee 100644 --- a/tex/context/base/core-sec.tex +++ b/tex/context/base/core-sec.tex @@ -1741,14 +1741,19 @@ \placeheadmargintexts{#1}% binnen #3? \ifdisplaysectionhead \getvalue{\??ko#1\c!textcommand}% struts can be nilled with \setnostrut - {\setstrut\begstrut\ifcase\headtimingmode\hbox{#2}\fi#3\endstrut}% \hbox prevents break + {\setstrut + \begstrut + \ifcase\headtimingmode\hbox{#2}\fi + \executeifdefined{\??ko#1\c!deeptextcommand}\firstofoneargument{#3} + \endstrut}% \hbox prevents break \xdef\localheadheight {\the\strutht}% \xdef\localheaddepth {\the\strutdp}% \xdef\localheadlineheight{\the\lineheight}% % == \globallet\localheaddepth\strutdepth \else \ifcase\headtimingmode#2\fi - \getvalue{\??ko#1\c!textcommand}{#3}% + \getvalue{\??ko#1\c!textcommand}% + {\executeifdefined{\??ko#1\c!deeptextcommand}\firstofoneargument{#3}}% \fi \getvalue{\??ko#1\c!commandafter}% \ifdisplaysectionhead\endgraf\fi @@ -1783,9 +1788,14 @@ \placeheadmargintexts{#1}% binnen #3? \ifdisplaysectionhead % can be nilled with \setnostrut - \getvalue{\??ko#1\c!numbercommand}{\setstrut\begstrut#3\endstrut}% + \getvalue{\??ko#1\c!numbercommand}% + {\setstrut + \begstrut + \executeifdefined{\??ko#1\c!deepnumbercommand}\firstofoneargument{#3}% + \endstrut}% \else - \getvalue{\??ko#1\c!numbercommand}{#3}% + \getvalue{\??ko#1\c!numbercommand}% + {\executeifdefined{\??ko#1\c!deepnumbercommand}\firstofoneargument{#3}}% \fi \dostopattributes \dostopattributes} @@ -1802,14 +1812,19 @@ \placeheadmargintexts{#1}% binnen #3? \ifdisplaysectionhead \getvalue{\??ko#1\c!textcommand}% struts can be nilled with \setnostrut - {\setstrut\begstrut\ifcase\headtimingmode\hbox{#2}\fi#4\endstrut}% \hbox prevents break + {\setstrut + \begstrut + \ifcase\headtimingmode\hbox{#2}\fi + \executeifdefined{\??ko#1\c!deeptextcommand}\firstofoneargument{#4}% + \endstrut}% \hbox prevents break \xdef\localheadheight {\the\strutht}% \xdef\localheaddepth {\the\strutdp}% \xdef\localheadlineheight{\the\lineheight}% % == \globallet\localheaddepth\strutdepth \else \ifcase\headtimingmode#2\fi % inside textcommand ? - \getvalue{\??ko#1\c!textcommand}{#4}% + \getvalue{\??ko#1\c!textcommand}% + {\executeifdefined{\??ko#1\c!deeptextcommand}\firstofoneargument{#4}}% \fi \getvalue{\??ko#1\c!commandafter}% \ifdisplaysectionhead\endgraf\fi @@ -1818,6 +1833,18 @@ \fi \endheadplacement{#1}{#5}} +%D \starttyping +%D \def\StretchedBox#1% +%D {\framed +%D [frame=off,offset=.5em,align=middle,width=broad] +%D {\sc\def\stretchedspaceamount{.3em}\stretchednormalcase{#1}}} +%D +%D \definehead[MySubject] +%D \setuphead [MySubject][deeptextcommand=\StretchedBox] +%D +%D \MySubject{feeling stretched feeling stretched feeling stretched feeling stretched} +%D \stoptyping + \newsignal\headsignal \let\headlastlinewidth\!!zeropoint diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex index 4acb07615..18d091da6 100644 --- a/tex/context/base/core-spa.tex +++ b/tex/context/base/core-spa.tex @@ -499,9 +499,21 @@ \defineblankmethod [\v!joinedup] {\ifvmode\nointerlineskip\fi} % happens often, so we speed this up: +% +% \defineblankmethod [2*\v!line] {\addblankskip+{2\openlineheight}{2\openlineheight}} +% \defineblankmethod [2*\v!big] {\addblankskip+{2\bigskipamount }{2\openlineheight}} +% +% no, with 2\whatever we loose the stretch and shrink! Taco's alternative: + +\defineblankmethod + [2*line] + {\addblankskip+\openlineheight\openlineheight + \addblankskip+\openlineheight\openlineheight} -\defineblankmethod [2*\v!line] {\addblankskip+{2\openlineheight}{2\openlineheight}} -\defineblankmethod [2*\v!big] {\addblankskip+{2\bigskipamount }{2\openlineheight}} +\defineblankmethod + [2*big] + {\addblankskip+\bigskipamount\openlineheight + \addblankskip+\bigskipamount\openlineheight} % ETEX ! ! ! diff --git a/tex/context/base/font-chi.tex b/tex/context/base/font-chi.tex index dd5c4211a..5d3e20f27 100644 --- a/tex/context/base/font-chi.tex +++ b/tex/context/base/font-chi.tex @@ -14,6 +14,12 @@ % NOT YET ADAPTED TO THE NEW FONT MACROS +%D The first implementation (most of which is here) is based on +%D the specific font layout. This is because not all glyphs are +%D available in uniciode, which means that we cannot use +%D unicode codepoints (yet); if it were possible we could use +%D just one table per input encoding. + \writestatus{loading}{Context Font Macros / Chinese} % much will to typo-chi.tex @@ -108,8 +114,8 @@ \def\chineseunicodescale {1.00} % not smaller than .85 \def\chineseunicodeheight {1.00} \def\chineseunicodedepth {1.00} -\def\chineseinterglyphskip{0pt plus .05em minus .01em} -\def\chinesesurroundskip {.25em plus .15em minus .05em} +\def\chineseinterglyphskip{0pt \!!plus .05em \!!minus .01em} +\def\chinesesurroundskip {.25em \!!plus .15em \!!minus .05em} %D We define a few signals. As said, another example of %D using signals can be found in the module \type {m-units}. @@ -211,6 +217,8 @@ \else \insertunicodeglyph \fi + \else\ifx\nextglyph\relax + \insertunicodeglyph \else \analyzechineseunicodeglyph \analyzechineseunicodeenviroment @@ -277,7 +285,7 @@ \insertchineseglyph \hskip\chineseinterglyphskip \hskip\chineseRsignal - \fi + \fi\fi \aftergroup\ignorespaces % watch this \fi} @@ -288,30 +296,38 @@ \else \setunicodescale\chineseunicodescale \setunicodestrut\chineseunicodeheight\chineseunicodedepth - \analyzechineseunicodeglyph - \setbox\scratchbox\hbox to \hsize - {\hss - \ifcase\chineseSstatus\relax - \insertchineseglyph - \else % left / right - \setbox\scratchbox\hbox{\insertchineseglyph}% - \rotate[\c!rotation=270]{\box\scratchbox}% - \fi - \hss}% - \ht\scratchbox\unicodeheight\strutht - \dp\scratchbox\unicodedepth \strutdp - \ifvmode % catches \hbox{...}, actually \hbox should be \vbox -) - \nointerlineskip - \fi - \ifcase\prevchineseSstatus\relax - \ifnum\chineseSstatus=\plustwo \par\nobreak\else\allowbreak\fi - \or % left - \par\nobreak - \or % right - \ifnum\chineseSstatus=\plustwo \par\nobreak\else\allowbreak\fi + \ifx\nextglyph\relax + \insertchineseglyph + \ifvmode % catches \hbox{...}, actually \hbox should be \vbox -) + \nointerlineskip + \fi + \allowbreak + \else + \analyzechineseunicodeglyph + \setbox\scratchbox\hbox to \hsize + {\hss + \ifcase\chineseSstatus\relax + \insertchineseglyph + \else % left / right + \setbox\scratchbox\hbox{\insertchineseglyph}% + \rotate[\c!rotation=270]{\box\scratchbox}% + \fi + \hss}% + \ht\scratchbox\unicodeheight\strutht + \dp\scratchbox\unicodedepth \strutdp + \ifvmode % catches \hbox{...}, actually \hbox should be \vbox -) + \nointerlineskip + \fi + \ifcase\prevchineseSstatus\relax + \ifnum\chineseSstatus=\plustwo \par\nobreak\else\allowbreak\fi + \or % left + \par\nobreak + \or % right + \ifnum\chineseSstatus=\plustwo \par\nobreak\else\allowbreak\fi + \fi + \global\chardef\prevchineseSstatus\chineseSstatus % pagebody ... + \box\scratchbox\par \fi - \global\chardef\prevchineseSstatus\chineseSstatus % pagebody ... - \box\scratchbox\par \aftergroup\ignorespaces % watch this \fi} @@ -475,7 +491,7 @@ \stopdummy} \def\tracedchineseglyph - {\leavevmode + {\dontleavehmode \ruledhbox {\setbox\scratchbox\hbox{\insertunicodeglyph}% \hbox to \wd\scratchbox @@ -1120,7 +1136,7 @@ %D \stopnarrower %D This package is written in the city of Hasselt, a pretty -%D small town in the |<|compare to China real small|>| +%D small town in the |<|compared to China real small|>| %D Netherlands. Like most dutch cities, even this small one %D has a chinese restaurant, run by chinese, speaking chinese, %D and |<|indeed|>| writing chinese. Eating there will never diff --git a/tex/context/base/font-jap.tex b/tex/context/base/font-jap.tex new file mode 100644 index 000000000..4c84f1b88 --- /dev/null +++ b/tex/context/base/font-jap.tex @@ -0,0 +1,76 @@ +%D \module +%D [ file=font-jap, +%D version=2006.01.13, +%D title=\CONTEXT\ Font Macros, +%D subtitle=Japanese, +%D author=Hans Hagen, +%D date=\currentdate, +%D suggestions=Wang Lei, +%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. + +\writestatus{loading}{Context Font Macros / Japanese} + +\unprotect + +\newif\iftracejapanese + +\let\japaneseencoding\empty + +\def\setjapaneseencoding + {\getfontfileparameters\unicodestyle + \ifx\currentfontfileencoding\undefined \else + \let\japaneseencoding\currentfontfileencoding + \fi} + +\def\japaneseunicodescale {1.00} +\def\japaneseunicodeheight {1.00} +\def\japaneseunicodedepth {1.00} + +\setupunicodefont + [japanese] + [ \c!scale=\japaneseunicodescale, + \c!height=\japaneseunicodeheight, + \c!depth=\japaneseunicodedepth, + \c!conversion=\japanesenumber, + \c!commands=\setjapaneseencoding, % needed for digits + \c!command=\handlejapaneseunicodeglyph] + +\def\japanesenumber{\numbers} + +\def\handlejapaneseunicodeglyph + {\relax + \ifhmode\else\dontleavehmode\fi + \setunicodescale\japaneseunicodescale + \setunicodestrut\japaneseunicodeheight\japaneseunicodedepth + \iftracejapanese + \ruledhbox{\insertunicodeglyph}% + \else + \insertunicodeglyph + \fi + \allowbreak + \ignorespaces} + +\doifelse \currentregime {utf} { + + % todo: typescripts + + \definefontsynonym [JapaneseRegular] [uni-cybercjk-][encoding=j-uni] + \definefontsynonym [JapaneseSlanted] [uni-cybercjk-][encoding=j-uni] + \definefontsynonym [JapaneseItalic] [uni-cybercjk-][encoding=j-uni] + \definefontsynonym [JapaneseBold] [uni-cybercjk-][encoding=j-uni] + \definefontsynonym [JapaneseBoldSlanted][uni-cybercjk-][encoding=j-uni] + \definefontsynonym [JapaneseBoldItalic] [uni-cybercjk-][encoding=j-uni] + + \loadmapfile[uni-cybercjk.map] + + \defineunicodefont [Japanese] [Japanese] [japanese] + +} { + \writestatus{Japanese}{No fonts defined} +} + +\protect \endinput diff --git a/tex/context/base/font-uni.tex b/tex/context/base/font-uni.tex index dca301a6b..6a53aa782 100644 --- a/tex/context/base/font-uni.tex +++ b/tex/context/base/font-uni.tex @@ -176,7 +176,7 @@ \unexpanded\def\uchar#1#2% use as standalone glyph {\bgroup - \let\nextglyph\relax + % wrong: \let\nextglyph\relax % needed for lookahead chinese \edef\unicodeone{#1}% \edef\unicodetwo{#2}% % \unicodeposition=\unicodeone\unicodetwo\relax diff --git a/tex/context/base/lang-chi.tex b/tex/context/base/lang-chi.tex index 69277a456..a743c800b 100644 --- a/tex/context/base/lang-chi.tex +++ b/tex/context/base/lang-chi.tex @@ -142,11 +142,11 @@ \definecommand cnencodedfriday {\uchar{102}{31}\uchar{103}{31}\uchar{78}{148}} \definecommand cnencodedsaturday {\uchar{102}{31}\uchar{103}{31}\uchar{81}{109}} % RG & XJF - \definecommand cnencodedgraphics {\uchar{86}{254}} - \definecommand cnencodedintermezzo {\uchar{210}{99}\uchar{242}{102}} - \definecommand cnencodedillustration {\uchar{99}{210}\uchar{86}{254}} - \definecommand cnencodedappendix {\uchar{150}{68}\uchar{95}{85}} - \definecommand cnencodedline {\uchar{136}{76}} + \definecommand cnencodedgraphics {\uchar{86}{254}} + \definecommand cnencodedintermezzo {\uchar{210}{99}\uchar{242}{102}} + \definecommand cnencodedillustration {\uchar{99}{210}\uchar{86}{254}} + \definecommand cnencodedappendix {\uchar{150}{68}\uchar{95}{85}} + \definecommand cnencodedline {\uchar{136}{76}} % Tobias Burnus & XJF \definecommand cnyear {\uchar{94}{116}} \definecommand cnmonth {\uchar{103}{8}} @@ -199,11 +199,11 @@ \definecommand cnencodedfriday {\uchar{208}{199}\uchar{198}{218}\uchar{206}{229}} \definecommand cnencodedsaturday {\uchar{208}{199}\uchar{198}{218}\uchar{193}{249}} % RG & XJF - \definecommand cnencodedgraphics {\uchar{205}{188}} - \definecommand cnencodedintermezzo {\uchar{178}{229}\uchar{199}{250}} - \definecommand cnencodedillustration {\uchar{178}{229}\uchar{205}{188}} - \definecommand cnencodedappendix {\uchar{184}{189}\uchar{194}{188}} - \definecommand cnencodedline {\uchar{208}{208}} + \definecommand cnencodedgraphics {\uchar{205}{188}} + \definecommand cnencodedintermezzo {\uchar{178}{229}\uchar{199}{250}} + \definecommand cnencodedillustration {\uchar{178}{229}\uchar{205}{188}} + \definecommand cnencodedappendix {\uchar{184}{189}\uchar{194}{188}} + \definecommand cnencodedline {\uchar{208}{208}} % Tobias Burnus & XJF \definecommand cnyear {\uchar{196}{234}} \definecommand cnmonth {\uchar{212}{194}} diff --git a/tex/context/base/lang-jap.tex b/tex/context/base/lang-jap.tex new file mode 100644 index 000000000..7023bd646 --- /dev/null +++ b/tex/context/base/lang-jap.tex @@ -0,0 +1,239 @@ +%D \module +%D [ file=lang-jap, +%D version=2006.01.13, +%D title=\CONTEXT\ Language Macros, +%D subtitle=Japanese, +%D author={Richard Gabriel}, +%D date=\currentdate, +%D copyright={PRAGMA / RG}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +% rgabriel@kerio.com + +\writestatus{loading}{Context Language Macros / Japanese} + +\unprotect + +\definesystemconstant {japanese} \definesystemconstant {ja} + +\installlanguage + [\s!ja] + [\c!leftsentence=\jaencoding\jaleftsentence, + \c!rightsentence=\jaencoding\jarightsentence, + \c!leftsubsentence=\jaencoding\jaleftsubsentence, + \c!rightsubsentence=\jaencoding\jarightsubsentence, + \c!leftquote=\jaencoding\jaencodedsinglestartquote, + \c!rightquote=\jaencoding\jaencodedsingleendquote, + \c!leftquotation=\jaencoding\jaencodedstartquote, + \c!rightquotation=\jaencoding\jaencodedendquote, + \c!date={\jaencodedchristiandate,\v!year,\jaencodedyear,\v!month,\jaencodedmonth,\v!day,\jaencodedday}, + \c!state=\v!stop] + +\setupheadtext [\s!ja] [\v!content={\jaencoding\jaencodedtableofcontents}] +\setupheadtext [\s!ja] [\v!tables={\jaencoding\jaencodedtables}] +\setupheadtext [\s!ja] [\v!figures={\jaencoding\jaencodedfigures}] +\setupheadtext [\s!ja] [\v!graphics={\jaencoding\jaencodedgraphics}] +\setupheadtext [\s!ja] [\v!intermezzi={\jaencoding\jaencodedintermezzos}] +\setupheadtext [\s!ja] [\v!index={\jaencoding\jaencodedindex}] +\setupheadtext [\s!ja] [\v!abbreviations={\jaencoding\jaencodedabbreviations}] +\setupheadtext [\s!ja] [\v!logos={\jaencoding\jaencodedlogos}] +\setupheadtext [\s!ja] [\v!units={\jaencoding\jaencodedunits}] + +\setuplabeltext [\s!ja] [\v!table={\jaencoding\jaencodedtable}] +\setuplabeltext [\s!ja] [\v!figure={\jaencoding\jaencodedfigure}] +\setuplabeltext [\s!ja] [\v!intermezzo={\jaencoding\jaencodedintermezzo}] +\setuplabeltext [\s!ja] [\v!graphic={\jaencoding\jaencodedillustration}] +\setuplabeltext [\s!ja] [\v!appendix={\jaencoding\jaencodedappendix}] +\setuplabeltext [\s!ja] [\v!part={\jaencoding\jaencodedintro,\jaencoding\jaencodedpart}] +\setuplabeltext [\s!ja] [\v!chapter={\jaencoding\jaencodedintro,\jaencoding\jaencodedchapter}] +\setuplabeltext [\s!ja] [\v!section={\jaencoding\jaencodedintro,\jaencoding\jaencodedsection}] +\setuplabeltext [\s!ja] [\v!line={\jaencoding\jaencodedline}] +\setuplabeltext [\s!ja] [\v!lines={\jaencoding\jaencodedline}] + +\setuplabeltext [\s!ja] [\v!subsection=] +\setuplabeltext [\s!ja] [\v!subsubsection=] +\setuplabeltext [\s!ja] [\v!subsubsubsection=] + +%D Why are these languagespecifics ? + +% \startlanguagespecifics[\s!ja] + +\setuplabeltext [\s!ja] [\v!january=1] +\setuplabeltext [\s!ja] [\v!february=2] +\setuplabeltext [\s!ja] [\v!march=3] +\setuplabeltext [\s!ja] [\v!april=4] +\setuplabeltext [\s!ja] [\v!may=5] +\setuplabeltext [\s!ja] [\v!june=6] +\setuplabeltext [\s!ja] [\v!july=7] +\setuplabeltext [\s!ja] [\v!august=8] +\setuplabeltext [\s!ja] [\v!september=9] +\setuplabeltext [\s!ja] [\v!october=10] +\setuplabeltext [\s!ja] [\v!november=11] +\setuplabeltext [\s!ja] [\v!december=12] + +\setuplabeltext [\s!ja] [\v!sunday=\jaencoding\jaencodedsunday ] +\setuplabeltext [\s!ja] [\v!monday=\jaencoding\jaencodedmonday ] +\setuplabeltext [\s!ja] [\v!tuesday=\jaencoding\jaencodedtuesday ] +\setuplabeltext [\s!ja] [\v!wednesday=\jaencoding\jaencodedwednesday] +\setuplabeltext [\s!ja] [\v!thursday=\jaencoding\jaencodedthursday ] +\setuplabeltext [\s!ja] [\v!friday=\jaencoding\jaencodedfriday ] +\setuplabeltext [\s!ja] [\v!saturday=\jaencoding\jaencodedsaturday ] + +% \stoplanguagespecifics + +% Hardcoded - \japaneseencoding should be defined similarly to \chineseencoding + +\unexpanded\def\jaencoding{\enableencoding[j-uni]} + +%D This list is taken from DocBook XSL stylesheets (http://docbook.sourceforge.net/). + +\startencoding[j-uni] + + \definecommand jaencodedabstract {\uchar{105}{130}\uchar{137}{129}} + \definecommand jaencodedand {\uchar{48}{1}} + \definecommand jaencodedanswer {\uchar{123}{84}\uchar{255}{26}} + \definecommand jaencodedappendix {\uchar{78}{216}\uchar{147}{50}} + \definecommand jaencodedarticle {\uchar{152}{5}\uchar{118}{238}} + \definecommand jaencodedbibliography {\uchar{83}{194}\uchar{128}{3}\uchar{101}{135}\uchar{115}{46}} + \definecommand jaencodedbook {\uchar{48}{214}\uchar{48}{195}\uchar{48}{175}} + \definecommand jaencodedbridgehead {\uchar{152}{5}} + \definecommand jaencodedbullet {\uchar{37}{207}} + \definecommand jaencodedby {\uchar{255}{26}} + \definecommand jaencodedcaution {\uchar{108}{232}\uchar{97}{15}} + \definecommand jaencodedcolophon {\uchar{89}{101}\uchar{78}{216}} + \definecommand jaencodedcopyright {\uchar{136}{253}\uchar{79}{92}\uchar{132}{87}\uchar{79}{92}} + \definecommand jaencodeddedication {\uchar{139}{29}\uchar{143}{158}} + \definecommand jaencodededited {\uchar{125}{232}\uchar{128}{5}} + \definecommand jaencodededitedby {\uchar{125}{232}\uchar{128}{5}\uchar{255}{26}} + \definecommand jaencodededition {\uchar{125}{232}\uchar{150}{198}} + \definecommand jaencodedendquote {\uchar{48}{13}} + \definecommand jaencodedequation {\uchar{95}{15}} + \definecommand jaencodedexample {\uchar{79}{139}} + \definecommand jaencodedfigure {\uchar{86}{243}} + \definecommand jaencodedglossary {\uchar{117}{40}\uchar{138}{158}\uchar{150}{198}} + \definecommand jaencodedglosssee {\uchar{83}{194}\uchar{113}{103}} + \definecommand jaencodedglossseealso {\uchar{83}{194}\uchar{113}{103}} + \definecommand jaencodedchapter {\uchar{122}{224}} + \definecommand jaencodedimportant {\uchar{145}{205}\uchar{137}{129}\uchar{152}{5}\uchar{118}{238}} + \definecommand jaencodedindex {\uchar{118}{238}\uchar{107}{33}} + \definecommand jaencodedindexsymbols {\uchar{48}{183}\uchar{48}{243}\uchar{48}{220}\uchar{48}{235}} + \definecommand jaencodedintro {\uchar{123}{44}} + \definecommand jaencodedlistofequations {\uchar{95}{15}\uchar{118}{238}\uchar{107}{33}} + \definecommand jaencodedlistofexamples {\uchar{79}{139}\uchar{118}{238}\uchar{107}{33}} + \definecommand jaencodedlistoffigures {\uchar{86}{243}\uchar{118}{238}\uchar{107}{33}} + \definecommand jaencodedlistoftables {\uchar{136}{104}\uchar{118}{238}\uchar{107}{33}} + \definecommand jaencodedlistofunknown {\uchar{78}{13}\uchar{102}{14}\uchar{118}{238}\uchar{107}{33}} + \definecommand jaencodedmsgaud {\uchar{91}{254}\uchar{140}{97}\uchar{128}{5}} + \definecommand jaencodedmsglevel {\uchar{48}{236}\uchar{48}{217}\uchar{48}{235}} + \definecommand jaencodedmsgorig {\uchar{118}{122}\uchar{79}{225}\uchar{81}{67}} + \definecommand jaencodednavhome {\uchar{48}{219}\uchar{48}{252}\uchar{48}{224}} + \definecommand jaencodednavnext {\uchar{107}{33}\uchar{48}{110}\uchar{48}{218}\uchar{48}{252}\uchar{48}{184}} + \definecommand jaencodednavnextsibling {\uchar{101}{233}\uchar{144}{1}\uchar{48}{138}} + \definecommand jaencodednavprev {\uchar{82}{77}\uchar{48}{110}\uchar{48}{218}\uchar{48}{252}\uchar{48}{184}} + \definecommand jaencodednavprevsibling {\uchar{93}{251}\uchar{98}{59}\uchar{48}{87}} + \definecommand jaencodednavup {\uchar{78}{10}\uchar{48}{107}\uchar{98}{59}\uchar{48}{139}} + \definecommand jaencodednestedendquote {\uchar{48}{15}} + \definecommand jaencodednestedstartquote {\uchar{48}{14}} + \definecommand jaencodednonexistantelement {\uchar{137}{129}\uchar{125}{32}\uchar{48}{76}\uchar{91}{88}\uchar{87}{40}\uchar{48}{87}\uchar{48}{126}\uchar{48}{91}\uchar{48}{147}} + \definecommand jaencodednote {\uchar{108}{232}\uchar{97}{15}} + \definecommand jaencodednotes {\uchar{108}{232}\uchar{97}{15}} + \definecommand jaencodedpages {\uchar{80}{103}\uchar{115}{46}} + \definecommand jaencodedpart {\uchar{48}{209}\uchar{48}{252}\uchar{48}{200}} + \definecommand jaencodedpreface {\uchar{94}{143}\uchar{101}{135}} + \definecommand jaencodedprocedure {\uchar{98}{75}\uchar{152}{6}} + \definecommand jaencodedprocedureformal {\uchar{98}{75}\uchar{152}{6}} + \definecommand jaencodedproductionset {\uchar{48}{215}\uchar{48}{237}\uchar{48}{192}\uchar{48}{175}\uchar{48}{183}\uchar{48}{231}\uchar{48}{243}} + \definecommand jaencodedproductionsetformal {\uchar{48}{215}\uchar{48}{237}\uchar{48}{192}\uchar{48}{175}\uchar{48}{183}\uchar{48}{231}\uchar{48}{243}} + \definecommand jaencodedpublished {\uchar{118}{122}\uchar{136}{76}} + \definecommand jaencodedqandadiv {\uchar{85}{79}\uchar{255}{26}\uchar{48}{1}\uchar{123}{84}\uchar{255}{26}} + \definecommand jaencodedqandaentry {\uchar{85}{79}\uchar{255}{26}} + \definecommand jaencodedquestion {\uchar{85}{79}\uchar{255}{26}} + \definecommand jaencodedreference {\uchar{83}{194}\uchar{113}{103}} + \definecommand jaencodedrefname {\uchar{84}{13}\uchar{82}{77}} + \definecommand jaencodedrefsection {\uchar{152}{5}} + \definecommand jaencodedrefsynopsisdiv {\uchar{105}{130}\uchar{137}{129}} + \definecommand jaencodedrevhistory {\uchar{101}{57}\uchar{138}{2}\uchar{92}{101}\uchar{107}{116}} + \definecommand jaencodedrevision {\uchar{101}{57}\uchar{138}{2}} + \definecommand jaencodedsection {\uchar{152}{5}} + \definecommand jaencodedsee {\uchar{83}{194}\uchar{113}{103}} + \definecommand jaencodedseealso {\uchar{83}{194}\uchar{113}{103}} + \definecommand jaencodedseparator {\uchar{48}{1}} + \definecommand jaencodedset {\uchar{138}{45}\uchar{91}{154}} + \definecommand jaencodedsetindex {\uchar{118}{238}\uchar{107}{33}\uchar{138}{45}\uchar{91}{154}} + \definecommand jaencodedsidebar {\uchar{48}{181}\uchar{48}{164}\uchar{48}{201}\uchar{48}{208}\uchar{48}{252}} + \definecommand jaencodedsimplesect {\uchar{152}{5}} + \definecommand jaencodedsingleendquote {\uchar{32}{25}} + \definecommand jaencodedsinglestartquote {\uchar{32}{24}} + \definecommand jaencodedstartquote {\uchar{48}{12}} + \definecommand jaencodedstep {\uchar{48}{185}\uchar{48}{198}\uchar{48}{195}\uchar{48}{215}} + \definecommand jaencodedtable {\uchar{136}{104}} + \definecommand jaencodedtablenotes {\uchar{108}{232}\uchar{97}{15}} + \definecommand jaencodedtableofcontents {\uchar{118}{238}\uchar{107}{33}} + \definecommand jaencodedtip {\uchar{48}{198}\uchar{48}{163}\uchar{48}{195}\uchar{48}{215}} + \definecommand jaencodedunexpectedelementname {\uchar{78}{13}\uchar{102}{14}\uchar{48}{106}\uchar{137}{129}\uchar{125}{32}\uchar{84}{13}} + \definecommand jaencodedunsupported {\uchar{48}{181}\uchar{48}{221}\uchar{48}{252}\uchar{48}{200}\uchar{48}{87}\uchar{48}{126}\uchar{48}{91}\uchar{48}{147}} + \definecommand jaencodedwarning {\uchar{139}{102}\uchar{84}{74}} + + \definecommand jaencodedyear {\uchar{94}{116}} + \definecommand jaencodedmonth {\uchar{103}{8}} + \definecommand jaencodedday {\uchar{101}{229}} + +\stopencoding + +%D Taken from Chinese (will be investigated yet...) + +\startencoding[j-uni] + + \definecommand jaencodedleftsentence {\uchar{32}{20}\uchar{32}{20}} + \definecommand jaencodedrightsentence {\uchar{32}{20}\uchar{32}{20}} + \definecommand jaencodedleftsubsentence {\uchar{32}{20}\uchar{32}{20}} + \definecommand jaencodedrightsubsentence {\uchar{32}{20}\uchar{32}{20}} + +\stopencoding + +%D Special thanxx to Eizo Tsuchihashi (eizo@arcbrain.jp) for the following stuff + +\startencoding[j-uni] + + \definecommand jaencodedchristiandate {\uchar{137}{127}\uchar{102}{166}} + + \definecommand jaencodedtables {\uchar{103}{58}} + \definecommand jaencodedfigures {\uchar{86}{243}} + \definecommand jaencodedabbreviations {\uchar{117}{101}\uchar{138}{158}} + \definecommand jaencodedlogos {\uchar{116}{6}\uchar{96}{39}} + \definecommand jaencodedunits {\uchar{48}{230}\uchar{48}{203}\uchar{48}{195}\uchar{48}{196}} + + \definecommand jaencodedgraphics {\uchar{48}{176}\uchar{48}{233}\uchar{48}{213}} + \definecommand jaencodedintermezzo {\uchar{149}{147}\uchar{89}{79}\uchar{102}{242}} + \definecommand jaencodedintermezzos {\uchar{149}{147}\uchar{89}{79}\uchar{102}{242}} + \definecommand jaencodedillustration {\uchar{48}{164}\uchar{48}{233}\uchar{48}{185}\uchar{48}{200}} + \definecommand jaencodedline {\uchar{125}{218}} + \definecommand jaencodedlines {\uchar{125}{218}} + + \definecommand jaencodedjanuary {\uchar{78}{0}\uchar{103}{8}} + \definecommand jaencodedfebruary {\uchar{78}{140}\uchar{103}{8}} + \definecommand jaencodedmarch {\uchar{78}{9}\uchar{103}{8}} + \definecommand jaencodedapril {\uchar{86}{219}\uchar{103}{8}} + \definecommand jaencodedmay {\uchar{78}{148}\uchar{103}{8}} + \definecommand jaencodedjune {\uchar{81}{109}\uchar{103}{8}} + \definecommand jaencodedjuly {\uchar{78}{3}\uchar{103}{8}} + \definecommand jaencodedaugust {\uchar{81}{107}\uchar{103}{8}} + \definecommand jaencodedseptember {\uchar{78}{93}\uchar{103}{8}} + \definecommand jaencodedoctober {\uchar{83}{65}\uchar{103}{8}} + \definecommand jaencodednovember {\uchar{83}{65}\uchar{78}{0}\uchar{103}{8}} + \definecommand jaencodeddecember {\uchar{83}{65}\uchar{78}{140}\uchar{103}{8}} + + \definecommand jaencodedsunday {\uchar{103}{8}\uchar{102}{220}\uchar{101}{229}} + \definecommand jaencodedmonday {\uchar{112}{107}\uchar{102}{220}\uchar{101}{229}} + \definecommand jaencodedtuesday {\uchar{108}{52}\uchar{102}{220}\uchar{101}{229}} + \definecommand jaencodedwednesday {\uchar{103}{40}\uchar{102}{220}\uchar{101}{229}} + \definecommand jaencodedthursday {\uchar{145}{209}\uchar{102}{220}\uchar{101}{229}} + \definecommand jaencodedfriday {\uchar{87}{31}\uchar{102}{220}\uchar{101}{229}} + \definecommand jaencodedsaturday {\uchar{101}{229}\uchar{102}{220}\uchar{101}{229}} + +\stopencoding + +\protect \endinput diff --git a/tex/context/base/m-gnuplot.tex b/tex/context/base/m-gnuplot.tex index 27e4c03dc..5345cdb4e 100644 --- a/tex/context/base/m-gnuplot.tex +++ b/tex/context/base/m-gnuplot.tex @@ -73,9 +73,21 @@ \ifx\systemendofline\undefined \def\systemendofline{\rawcharacter{10}} \fi -\bgroup - \gdef\fixGNUPLOTnewlines{\obeylines\def\obeyedline{;\systemendofline}} -\egroup +\newtoks\everyGNUPLOTgraphic + +% gnuplot only seems to handle lf so we cannot use \mappartolineend +% also, in order to prevent fuzzy runs (or no runs) we add a ; to +% each line + +\appendtoks + \obeylines + \def\obeyedline{;\systemendofline}% +\to \everyGNUPLOTgraphic + +\appendtoks + \let\%\letterpercent + \def\ {\letterbackslash\systemendofline}% +\to \everyGNUPLOTgraphic \def\dodouseGNUPLOTgraphic[#1][#2]% {\bgroup @@ -83,10 +95,7 @@ {\edef\GNUPLOTnumber{\getvalue{gpg:n:#1}}% \edef\GNUPLOTfile {\bufferprefix gnuplot-\GNUPLOTnumber}% \bgroup - % hm, gnuplot only seems to handle lf so we cannot use \mappartolineend - % also, in order to prevent fuzzy runs (or no runs) we add a ; to each line - \fixGNUPLOTnewlines - \let\%\letterpercent + \the\everyGNUplotgraphic \immediate\openout\scratchwrite=\GNUPLOTfile.gpd \immediate\write\scratchwrite{set terminal \@@GNUPLOToutput\space\@@GNUPLOToption}% \doifnotempty diff --git a/tex/context/base/m-newmat.tex b/tex/context/base/m-newmat.tex index 6f5f3586a..eb3208d94 100644 --- a/tex/context/base/m-newmat.tex +++ b/tex/context/base/m-newmat.tex @@ -189,7 +189,7 @@ %D %D [HH] Another macro that users expect (slightly adapted): -\def\boxed% +\def\boxed {\ifmmode\expandafter\mframed\else\expandafter\framed\fi} %D \macros diff --git a/tex/context/base/mult-con.tex b/tex/context/base/mult-con.tex index 38d2fad7e..518b36aca 100644 --- a/tex/context/base/mult-con.tex +++ b/tex/context/base/mult-con.tex @@ -1954,6 +1954,15 @@ subsubsubsubsubsubject: subsubsubsubsubonderwerp subsubsubsubsub parolachiave keyword motcle + deeptextcommand: dieptekstcommando deeptextcommand + deeptextcommand deeptextcommand + deeptextcommand deeptextcommand + deeptextcommand + deepnumbercommand: diepnummercommando deepnumbercommand + deepnumbercommand deepnumbercommand + deepnumbercommand deepnumbercommand + deepnumbercommand + \stopconstants %D This one is a private one, used for very dirty hooks. diff --git a/tex/context/base/regi-il1.tex b/tex/context/base/regi-il1.tex index 7c1838fec..ec0155c04 100644 --- a/tex/context/base/regi-il1.tex +++ b/tex/context/base/regi-il1.tex @@ -1,6 +1,6 @@ %D \module %D [ file=regi-il1, -%D version=2000.05.07, +%D version=2000.05.07, %D title=\CONTEXT\ Encoding Macros, %D subtitle=ISO Latin 1 keys, %D author={Daniel Flipo, Hans Hagen, Denis Roegel}, @@ -11,8 +11,8 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -%D This module is not yet finished since some characters -%D need to be mapped onto symbols, which is work in progress. +%D This module is not yet finished since some characters +%D need to be mapped onto symbols, which is work in progress. \startregime [il1] @@ -34,10 +34,10 @@ \defineactivetoken 144 {\dotlessi} -\defineactivetoken 162 {\textcent} +\defineactivetoken 162 {\textcent} \defineactivetoken 163 {\textsterling} -\defineactivetoken 164 {\textcurrency} -\defineactivetoken 165 {\textyen} +\defineactivetoken 164 {\textcurrency} +\defineactivetoken 165 {\textyen} \defineactivetoken 167 {\sectionmark} \defineactivetoken 182 {\paragraphmark} @@ -45,37 +45,37 @@ \defineactivetoken 171 {\ifvmode\leavevmode\fi\leftguillemot\prewordbreak} \defineactivetoken 187 {\prewordbreak\rightguillemot} -\defineactivetoken 173 {\softhyphen} -\defineactivetoken 160 {\nonbreakablespace} % ? +\defineactivetoken 173 {\softhyphen} +\defineactivetoken 160 {\nonbreakablespace} % ? \defineactivetoken 169 {\copyright} -\defineactivetoken 174 {\registered} +\defineactivetoken 174 {\registered} -\defineactivetoken 185 {\textonesuperior} -\defineactivetoken 178 {\texttwosuperior} -\defineactivetoken 179 {\textthreesuperior} +\defineactivetoken 185 {\onesuperior} +\defineactivetoken 178 {\twosuperior} +\defineactivetoken 179 {\threesuperior} -\defineactivetoken 188 {\textonequarter} -\defineactivetoken 189 {\textonehalf} -\defineactivetoken 190 {\textthreequarters} +\defineactivetoken 188 {\onequarter} +\defineactivetoken 189 {\onehalf} +\defineactivetoken 190 {\threequarters} -%defineactivetoken 183 {\textperiodcentered} +%defineactivetoken 183 {\textperiodcentered} -\defineactivetoken 166 {\textbrokenbar} -\defineactivetoken 176 {\textdegree} -\defineactivetoken 247 {\textdiv} +\defineactivetoken 166 {\textbrokenbar} +\defineactivetoken 176 {\textdegree} +\defineactivetoken 247 {\textdiv} \defineactivetoken 172 {\textlognot} -\defineactivetoken 215 {\textmultiply} -\defineactivetoken 181 {\textmu} -\defineactivetoken 177 {\textpm} +\defineactivetoken 215 {\textmultiply} +\defineactivetoken 181 {\textmu} +\defineactivetoken 177 {\textpm} \defineactivetoken 254 {\thorn} \defineactivetoken 222 {\Thorn} \defineactivetoken 223 {\ssharp} -\defineactivetoken 208 {\Eth} -\defineactivetoken 240 {\eth} +\defineactivetoken 208 {\Eth} +\defineactivetoken 240 {\eth} \defineactivetoken 198 {\AEligature} \defineactivetoken 230 {\aeligature} @@ -90,8 +90,8 @@ \defineactivetoken 211 {\Oacute} \defineactivetoken 250 {\uacute} \defineactivetoken 218 {\Uacute} -\defineactivetoken 253 {\yacute} -\defineactivetoken 221 {\Yacute} +\defineactivetoken 253 {\yacute} +\defineactivetoken 221 {\Yacute} \defineactivetoken 231 {\ccedilla} \defineactivetoken 199 {\Ccedilla} @@ -147,8 +147,8 @@ \endinput -% \defineactivetoken 186 {\textordmasculine} -% \defineactivetoken 170 {\textordfeminine} +% \defineactivetoken 186 {\textordmasculine} +% \defineactivetoken 170 {\textordfeminine} % \defineactivetoken 161 {!`} % \defineactivetoken 191 {?`} diff --git a/tex/context/base/supp-mps.tex b/tex/context/base/supp-mps.tex index dae2b16df..20e181dbd 100644 --- a/tex/context/base/supp-mps.tex +++ b/tex/context/base/supp-mps.tex @@ -198,9 +198,24 @@ %D passing them to \type{\MPinclusions}: %D %D \starttyping +%D \startMPinclusions +%D input mp-mine ; +%D \stopMPinclusions +%D \stoptyping +%D +%D \starttyping %D \MPinclusions{input mp-mine} %D \stoptyping %D +%D These commands reset their content each time. You can append +%D code as follows: +%D +%D \starttyping +%D \startMPinclusions[+] +%D input mp-mine ; +%D \stopMPinclusions +%D \stoptyping +%D %D The token register \type {\MPinitializations} is expanded %D before all other inclusions, the extensions are expanded %D only once per run. @@ -208,14 +223,24 @@ \newtoks \MPinitializations % each graphic \newtoks \MPextensions % once per run (can be multiple graphics) -\long\def\startMPinclusions#1\stopMPinclusions % document wide - {\long\def\theMPinclusions - {% \expanded ! - \@EA\expanded\@EA{\@EA\writeMPgraphic\@EA{\the\MPextensions;}}% new - \writeMPgraphic{#1}}} +\def\startMPinclusions + {\dosingleempty\dostartMPinclusions} + +\long\def\dostartMPinclusions[#1]#2\stopMPinclusions % document wide + {\doifelse{#1}{+} + {\@EA\long\@EA\def\@EA\theMPinclusions\@EA + {\theMPinclusions + \writeMPgraphic{#2}}} + {\long\def\theMPinclusions + {% \expanded ! + \@EA\expanded\@EA{\@EA\writeMPgraphic\@EA{\the\MPextensions;}}% new + \writeMPgraphic{#2}}}} + +\def\MPinclusions + {\dosingleempty\doMPinclusions} -\long\def\MPinclusions#1% - {\startMPinclusions#1\stopMPinclusions} +\long\def\doMPinclusions[#1]#2% + {\startMPinclusions[#1]#2\stopMPinclusions} \startMPinclusions \stopMPinclusions diff --git a/tex/context/base/type-enc.tex b/tex/context/base/type-enc.tex index 4d6e24857..33553e3b9 100644 --- a/tex/context/base/type-enc.tex +++ b/tex/context/base/type-enc.tex @@ -893,6 +893,13 @@ \definefontsynonym [Iwona-Math-Extension-Medium] [ex-iwonam] \stoptypescript +\starttypescript [math] [iwona-heavy] [default] + \definefontsynonym [Iwona-Math-Letters-Heavy] [rm-iwonah] + \definefontsynonym [Iwona-Math-Letters-HeavyItalic] [mi-iwonahi] + \definefontsynonym [Iwona-Math-Symbols-Heavy] [sy-iwonahz] + \definefontsynonym [Iwona-Math-Extension-Heavy] [ex-iwonah] +\stoptypescript + % Kurier (JMN) \starttypescript [sans] [kurier-light,kurier,kurier-medium] [texnansi,ec,qx,t5] diff --git a/tex/context/base/type-exa.tex b/tex/context/base/type-exa.tex index 4232955e5..ee26d254f 100644 --- a/tex/context/base/type-exa.tex +++ b/tex/context/base/type-exa.tex @@ -238,6 +238,17 @@ \stoptypescript +\starttypescript [iwona,iwona-light,iwona-heavy,iwona-medium] [texnansi,ec,8r,uc] + + % todo: rscale + + \definetypeface[\typescriptone][ss][sans] [\typescriptone] [default][encoding=\typescripttwo] + \definetypeface[\typescriptone][rm][serif][modern] [default][encoding=\typescripttwo] + \definetypeface[\typescriptone][tt][mono] [modern] [default][encoding=\typescripttwo] + \definetypeface[\typescriptone][mm][math] [\typescriptone] [default][encoding=\typescripttwo] + +\stoptypescript + \stoptypescriptcollection \endinput diff --git a/tex/context/base/type-syn.tex b/tex/context/base/type-syn.tex index 3f642e4bf..549e560fb 100644 --- a/tex/context/base/type-syn.tex +++ b/tex/context/base/type-syn.tex @@ -495,6 +495,13 @@ \definefontsynonym [MathExtension] [Iwona-Math-Extension-Medium] \stoptypescript +\starttypescript [math] [iwona-heavy] [name] + \definefontsynonym [MathRoman] [Iwona-Math-Letters-Heavy] + \definefontsynonym [MathItalic] [Iwona-Math-Letters-HeavyItalic] + \definefontsynonym [MathSymbol] [Iwona-Math-Symbols-Heavy] + \definefontsynonym [MathExtension] [Iwona-Math-Extension-Heavy] +\stoptypescript + % Kurier \starttypescript [sans] [kurier-light] [name] diff --git a/tex/context/base/unic-ext.tex b/tex/context/base/unic-ext.tex new file mode 100644 index 000000000..eb483fc17 --- /dev/null +++ b/tex/context/base/unic-ext.tex @@ -0,0 +1,35 @@ +%D \module +%D [ file=unic-ini, +%D version=2006.13.01, +%D title=\CONTEXT\ \UNICODE\ Support, +%D subtitle=\UNICODE\ \& UTF-8 extras, +%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. + +\writestatus{loading}{Context UNICODE Macros (ext)} + +\beginTEX \expandafter \endinput \endTEX + +\unprotect + +%D Here we hook in a lookahead mechanism. This is needed for +%D Chinese. In future versions of \PDFTEX\ we need a real +%D lookahead mechanism. + +\let\normalunicodechar\unicodechar + +\newcount\unicodecharnumber + +\def\unicodechar#1% + {\unicodecharnumber#1% + \futurelet\nextglyph\dounicodechar} + +\def\dounicodechar + {\normalunicodechar\unicodecharnumber} + +\protect \endinput diff --git a/tex/context/interface/cont-cz.xml b/tex/context/interface/cont-cz.xml index b6683b0d2..8cc2d7638 100644 --- a/tex/context/interface/cont-cz.xml +++ b/tex/context/interface/cont-cz.xml @@ -5984,6 +5984,12 @@ <cd:parameter name="textovyprikaz"> <cd:constant type="cd:oneargument"/> </cd:parameter> + <cd:parameter name="deepnumbercommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="deeptextcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> <cd:parameter name="prefix"> <cd:constant type="+"/> <cd:constant type="-"/> diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml index 611314833..9ea60bdba 100644 --- a/tex/context/interface/cont-de.xml +++ b/tex/context/interface/cont-de.xml @@ -5984,6 +5984,12 @@ <cd:parameter name="textbefehl"> <cd:constant type="cd:oneargument"/> </cd:parameter> + <cd:parameter name="deepnumbercommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="deeptextcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> <cd:parameter name="prefix"> <cd:constant type="+"/> <cd:constant type="-"/> diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml index b2e9ae113..26ff06d56 100644 --- a/tex/context/interface/cont-en.xml +++ b/tex/context/interface/cont-en.xml @@ -5984,6 +5984,12 @@ <cd:parameter name="textcommand"> <cd:constant type="cd:oneargument"/> </cd:parameter> + <cd:parameter name="deepnumbercommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="deeptextcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> <cd:parameter name="prefix"> <cd:constant type="+"/> <cd:constant type="-"/> diff --git a/tex/context/interface/cont-fr.xml b/tex/context/interface/cont-fr.xml index 00ca36b1e..bacd77ec4 100644 --- a/tex/context/interface/cont-fr.xml +++ b/tex/context/interface/cont-fr.xml @@ -5984,6 +5984,12 @@ <cd:parameter name="commandetexte"> <cd:constant type="cd:oneargument"/> </cd:parameter> + <cd:parameter name="deepnumbercommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="deeptextcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> <cd:parameter name="prefixe"> <cd:constant type="+"/> <cd:constant type="-"/> diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml index ab9b35caa..5e43a59b4 100644 --- a/tex/context/interface/cont-it.xml +++ b/tex/context/interface/cont-it.xml @@ -5984,6 +5984,12 @@ <cd:parameter name="comandotesto"> <cd:constant type="cd:oneargument"/> </cd:parameter> + <cd:parameter name="deepnumbercommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="deeptextcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> <cd:parameter name="prefisso"> <cd:constant type="+"/> <cd:constant type="-"/> diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml index 8851f4bf0..39dda6977 100644 --- a/tex/context/interface/cont-nl.xml +++ b/tex/context/interface/cont-nl.xml @@ -5984,6 +5984,12 @@ <cd:parameter name="tekstcommando"> <cd:constant type="cd:oneargument"/> </cd:parameter> + <cd:parameter name="diepnummercommando"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="dieptekstcommando"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> <cd:parameter name="prefix"> <cd:constant type="+"/> <cd:constant type="-"/> diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml index edf02151d..966492e51 100644 --- a/tex/context/interface/cont-ro.xml +++ b/tex/context/interface/cont-ro.xml @@ -5984,6 +5984,12 @@ <cd:parameter name="comandatext"> <cd:constant type="cd:oneargument"/> </cd:parameter> + <cd:parameter name="deepnumbercommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> + <cd:parameter name="deeptextcommand"> + <cd:constant type="cd:oneargument"/> + </cd:parameter> <cd:parameter name="prefix"> <cd:constant type="+"/> <cd:constant type="-"/> diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index f7cf72bc8..c88098322 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.01.12 10:38"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.01.16 18:35"> <cd:variables> <cd:variable name="one" value="jedna"/> @@ -481,6 +481,8 @@ <cd:constant name="textdistance" value="textdistance"/> <cd:constant name="textmargin" value="textmargin"/> <cd:constant name="keyword" value="keyword"/> + <cd:constant name="deeptextcommand" value="deeptextcommand"/> + <cd:constant name="deepnumbercommand" value="deepnumbercommand"/> </cd:constants> <cd:constants> diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 68a1abd99..97fc05f41 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.01.12 10:38"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.01.16 18:35"> <cd:variables> <cd:variable name="one" value="eins"/> @@ -481,6 +481,8 @@ <cd:constant name="textdistance" value="textdistance"/> <cd:constant name="textmargin" value="textmargin"/> <cd:constant name="keyword" value="keyword"/> + <cd:constant name="deeptextcommand" value="deeptextcommand"/> + <cd:constant name="deepnumbercommand" value="deepnumbercommand"/> </cd:constants> <cd:constants> diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 4cd8cdca9..48e154948 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.01.12 10:38"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.01.16 18:35"> <cd:variables> <cd:variable name="one" value="one"/> @@ -481,6 +481,8 @@ <cd:constant name="textdistance" value="textdistance"/> <cd:constant name="textmargin" value="textmargin"/> <cd:constant name="keyword" value="keyword"/> + <cd:constant name="deeptextcommand" value="deeptextcommand"/> + <cd:constant name="deepnumbercommand" value="deepnumbercommand"/> </cd:constants> <cd:constants> diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index 4fa840bf8..c728c4dce 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.01.12 10:38"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.01.16 18:35"> <cd:variables> <cd:variable name="one" value="un"/> @@ -481,6 +481,8 @@ <cd:constant name="textdistance" value="distancetexte"/> <cd:constant name="textmargin" value="margetexte"/> <cd:constant name="keyword" value="motcle"/> + <cd:constant name="deeptextcommand" value="deeptextcommand"/> + <cd:constant name="deepnumbercommand" value="deepnumbercommand"/> </cd:constants> <cd:constants> diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index 79a7711dd..557068f6f 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.01.12 10:38"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.01.16 18:35"> <cd:variables> <cd:variable name="one" value="uno"/> @@ -481,6 +481,8 @@ <cd:constant name="textdistance" value="distanzatesto"/> <cd:constant name="textmargin" value="textmargin"/> <cd:constant name="keyword" value="parolachiave"/> + <cd:constant name="deeptextcommand" value="deeptextcommand"/> + <cd:constant name="deepnumbercommand" value="deepnumbercommand"/> </cd:constants> <cd:constants> diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index bfe22266c..ac75d0920 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.01.12 10:38"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.01.16 18:35"> <cd:variables> <cd:variable name="one" value="een"/> @@ -481,6 +481,8 @@ <cd:constant name="textdistance" value="tekstafstand"/> <cd:constant name="textmargin" value="tekstmarge"/> <cd:constant name="keyword" value="trefwoord"/> + <cd:constant name="deeptextcommand" value="dieptekstcommando"/> + <cd:constant name="deepnumbercommand" value="diepnummercommando"/> </cd:constants> <cd:constants> diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index d99dcf2b4..14beaf1fc 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.01.12 10:38"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.01.16 18:35"> <cd:variables> <cd:variable name="one" value="unu"/> @@ -481,6 +481,8 @@ <cd:constant name="textdistance" value="textdistance"/> <cd:constant name="textmargin" value="textmargin"/> <cd:constant name="keyword" value="keyword"/> + <cd:constant name="deeptextcommand" value="deeptextcommand"/> + <cd:constant name="deepnumbercommand" value="deepnumbercommand"/> </cd:constants> <cd:constants> |