diff options
Diffstat (limited to 'tex')
27 files changed, 412 insertions, 286 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 0799d76c2..9b8be587b 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -11,6 +11,21 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +\ifx \newcontextversion \undefined % temp hack for testing by taco + \def\newcontextversion#1% + {\doifelse{#1}\contextversion + {\let\newcontextversion\gobbleoneargument} + {\writeline + \writestatus{Fatal Error}{Your format does not match the base files!}% + \writeline + \writestatus{Format Version}{\contextversion}% + \writestatus{Files Version}{#1}% + \batchmode + \normalend}} +\fi + +\newcontextversion{2006.01.12 10:38} + %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new %D features. diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index e110a5eff..825c873be 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.09} +\def\contextversion{2006.01.12 10:38} %D For those who want to use this: diff --git a/tex/context/base/core-mat.tex b/tex/context/base/core-mat.tex index 0d0731cb4..c9ddd8afc 100644 --- a/tex/context/base/core-mat.tex +++ b/tex/context/base/core-mat.tex @@ -1596,6 +1596,21 @@ \def\positive {\doraisedmathord{positive}} \def\zeroamount{\donumbermathord{zeroamount}} +%D The following macros are used in the MathML interpreter, so +%D there is a good change of them never being documented for +%D other usage. + +\let\normalordelimiter\secondoftwoarguments +\let\normalorfiller \firstoftwoarguments + +\def\enabledelimiter {\let\normalordelimiter\secondoftwoarguments} +\def\disabledelimiter{\let\normalordelimiter\firstoftwoarguments} + +\def\enablefiller {\let\normalorfiller\secondoftwoarguments} +\def\disablefiller {\let\normalorfiller\firstoftwoarguments} + +\def\mathopnolimits#1{\mathop{\rm#1}\nolimits} + %D How negative such a symbol looks is demonstrated in: %D $\negative 10^{\negative 10^{\negative 10}}$. diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex index 516cca58f..4acb07615 100644 --- a/tex/context/base/core-spa.tex +++ b/tex/context/base/core-spa.tex @@ -2305,6 +2305,20 @@ \def\setcapstrut% could be M, but Q has descender {\setcharstrut{Q}} +%D Handy for math (used in mathml): + +\def\charhtstrut + {\begingroup + \setcharstrut{GJY}% + \vrule\!!width\zeropoint\!!depth\zeropoint\!!height\strutht + \endgroup} + +\def\chardpstrut + {\begingroup + \setcharstrut{gjy}% + \vrule\!!width\zeropoint\!!depth\strutdp\!!height\zeropoint + \endgroup} + %D Centered looks nicer: \def\dosetstrut diff --git a/tex/context/base/core-sys.tex b/tex/context/base/core-sys.tex index f75d03513..c65ef64c2 100644 --- a/tex/context/base/core-sys.tex +++ b/tex/context/base/core-sys.tex @@ -15,6 +15,21 @@ \unprotect +%D Version checking: + +\def\newcontextversion#1% + {\doifelse{#1}\contextversion + {\let\newcontextversion\gobbleoneargument} + {\writeline + \writestatus{Fatal Error}{Your format does not match the base files!}% + \writeline + \writestatus{Format Version}{\contextversion}% + \writestatus{Files Version}{#1}% + \batchmode + \normalend}} + +%D Job names. + \def\outputfilename {\@@svfile} \def\inputfilename {\@@svinputfile} \def\operatingsystem{\@@svtype} diff --git a/tex/context/base/enco-cas.tex b/tex/context/base/enco-cas.tex index 61155ee5c..38d12f9fa 100644 --- a/tex/context/base/enco-cas.tex +++ b/tex/context/base/enco-cas.tex @@ -67,7 +67,7 @@ \defineULcharacter Dstroke dstroke \defineULcharacter Hstroke hstroke \defineULcharacter Lstroke lstroke -\defineULcharacter Lslash lslash % = lstroke +\defineULcharacter Lslash lslash \defineULcharacter Ostroke ostroke \defineULcharacter Tstroke tstroke @@ -84,11 +84,11 @@ \defineULcharacter Umacron umacron \defineULcharacter Ccedilla ccedilla -\defineULcharacter Gcedilla gcedilla % = gcommaaccent -\defineULcharacter Kcedilla kcedilla % = kcommaaccent -\defineULcharacter Lcedilla lcedilla % = lcommaaccent -\defineULcharacter Ncedilla ncedilla % = ncommaaccent -\defineULcharacter Rcedilla rcedilla % = rcommaaccent +\defineULcharacter Gcedilla gcedilla +\defineULcharacter Kcedilla kcedilla +\defineULcharacter Lcedilla lcedilla +\defineULcharacter Ncedilla ncedilla +\defineULcharacter Rcedilla rcedilla \defineULcharacter Scedilla scedilla \defineULcharacter Tcedilla tcedilla diff --git a/tex/context/base/enco-def.tex b/tex/context/base/enco-def.tex index 0c8fcb923..460be8f44 100644 --- a/tex/context/base/enco-def.tex +++ b/tex/context/base/enco-def.tex @@ -41,6 +41,8 @@ \definecharacter textring 23 \definecharacter texttilde 126 +\definecharacter textbottomcomma {\hbox{\lower.35ex\hbox{\tx,}}} % for mojca + \definecharacter dotlessi {\char"10 } \definecharacter dotlessj {\char"11 } \definecharacter dotlessI {I} @@ -62,8 +64,9 @@ \definecharacter thorn {\unknownchar} \definecharacter Thorn {\unknownchar} -\definecharacter eth {\dstroke} % wrong but better that nothing -\definecharacter Eth {\Dstroke} % wrong but better that nothing +\definecharacter eth {\unknownchar} % mojca prefers this (was \dstroke) +%definecharacter Eth {\unknownchar} +\definecharacter Eth {\Dstroke} % mojca prefers this too \definecharacter exclamdown 60 \definecharacter questiondown 62 @@ -347,10 +350,10 @@ \definecharacter Oumlaut {\smashaccent\Odiaeresis} \definecharacter Uumlaut {\smashaccent\Udiaeresis} -\definecharacter scommaaccent {s\quoteright} -\definecharacter Scommaaccent {S\quoteright} -\definecharacter tcommaaccent {t\quoteright} -\definecharacter Tcommaaccent {T\quoteright} +\definecharacter scommaaccent {\buildtextbottomcomma s} +\definecharacter Scommaaccent {\buildtextbottomcomma S} +\definecharacter tcommaaccent {\buildtextbottomcomma t} +\definecharacter Tcommaaccent {\buildtextbottomcomma T} \definecharacter Etilde {\buildtextaccent\texttilde E} \definecharacter etilde {\buildtextaccent\texttilde e} @@ -414,10 +417,11 @@ \definecharacter udotbelow {\buildtextbottomdot u} \definecharacter Ydotbelow {\buildtextbottomdot Y} \definecharacter ydotbelow {\buildtextbottomdot y} -\definecharacter Ohorndotbelow {\buildtextbottomdot O} -\definecharacter ohorndotbelow {\buildtextbottomdot o} -\definecharacter Uhorndotbelow {\buildtextbottomdot U} -\definecharacter uhorndotbelow {\buildtextbottomdot u} + +\definecharacter Ohorndotbelow {\buildtextbottomdot\Ohorn} +\definecharacter ohorndotbelow {\buildtextbottomdot\ohorn} +\definecharacter Uhorndotbelow {\buildtextbottomdot\Uhorn} +\definecharacter uhorndotbelow {\buildtextbottomdot\uhorn} \definecharacter Acircumflexdotbelow {\buildtextbottomdot\Acircumflex} \definecharacter acircumflexdotbelow {\buildtextbottomdot\acircumflex} @@ -451,6 +455,17 @@ \stopencoding +%D Needed for transliterated chinese (provided by Tobias Burnus). + +\startencoding[default] + +\definecharacter acaron {\buildtextaccent\textcaron a} % U+01CE +\definecharacter icaron {\buildtextaccent\textcaron \dotlessi} % U+01D0 +\definecharacter ocaron {\buildtextaccent\textcaron o} % U+01D2 +\definecharacter ucaron {\buildtextaccent\textcaron u} % U+01D4 + +\stopencoding + %D Greek (moved to here): \startencoding[default] @@ -694,18 +709,27 @@ %D A few goodies: -\def\eszett {\ssharp} -\def\Eszett {\Ssharp} +\def\eszett{\ssharp} +\def\Eszett{\Ssharp} + +\def\lslash{\lstroke} +\def\Lslash{\Lstroke} +\def\dslash{\dstroke} +\def\Dslash{\Dstroke} +\def\oslash{\ostroke} +\def\Oslash{\Ostroke} -\def\lslash {\lstroke} -\def\Lslash {\Lstroke} -\def\dslash {\dstroke} -\def\Dslash {\Dstroke} -\def\oslash {\ostroke} -\def\Oslash {\Ostroke} +\def\dcroat{\dstroke} +\def\Dcroat{\Dstroke} -\def\dcroat {\dstroke} -\def\Dcroat {\Dstroke} +% \startencoding [default] +% +% \definecharacter scommaaccent {\scedilla} +% \definecharacter Scommaaccent {\Scedilla} +% \definecharacter tcommaaccent {\tcedilla} +% \definecharacter Tcommaaccent {\Tcedilla} +% +% \stopencoding % for plain tex's sake @@ -829,7 +853,7 @@ \stopencoding -%D Also new, from Taco, for Mojka, who wanted another 8~regimes. +%D Also new, from Taco, for Mojca, who wanted another 8~regimes. \startencoding[\s!default] diff --git a/tex/context/base/enco-ec.tex b/tex/context/base/enco-ec.tex index aa8319e00..4f1dfed1b 100644 --- a/tex/context/base/enco-ec.tex +++ b/tex/context/base/enco-ec.tex @@ -3,7 +3,7 @@ %D version=2000.05.07, % 1999.16.07, %D title=\CONTEXT\ Encoding Macros, %D subtitle=\LATEX\ EC Encoding, -%D author={Patrick Gundlach, Hans Hagen, Taco Hoekwater}, +%D author={Patrick Gundlach, Hans Hagen, Taco Hoekwater, Mojca Miklavec}, %D date=\currentdate, %D copyright=PRAGMA-ADE] %C @@ -17,30 +17,34 @@ %D %D Annoyingly, most \POSTSCRIPT\ fonts do not have \type %D {\dotlessj}, and T1 encoding does not make the various -%D prebuilts with \type {j} available. +%D prebuilts with \type {j} available. When this is the case: %D +%D \starttyping +%D \startencoding[ec] +%D \definecharacter dotlessj {j} +%D \stopencoding +%D \stoptyping +%D +%D is a way out. + %D There is hardly a point in supporting TS1 encoding. \startmapping[ec] -\resetcaserange 141 to 141 -\resetcaserange 149 to 149 -\definecasemap 159 to 159 -\resetcaserange 173 to 173 -\resetcaserange 180 to 181 -\resetcaserange 184 to 184 -\resetcaserange 189 to 191 - -\definecasemap 157 `i 157 -\definecasemap 158 158 `D +% a problem is that the uppercase of dstroke (158) and eth (240) +% is the same glyph (208) so we cannot do lowercase mapping there \definecasemaps 128 to 156 lc +32 uc 0 -\definecasemaps 160 to 188 lc 0 uc -32 - -\definecasemaps 192 to 222 lc +32 uc 0 +\definecasemap 157 `i 157 % Idotaccent i +\definecasemap 158 158 208 % dstroke Eth +\definecasemap 159 159 159 % sectionmark +\definecasemaps 160 to 187 lc 0 uc -32 +\resetcaserange 189 to 191 % exclamdown, questiondown, textsterling +\definecasemaps 192 to 223 lc +32 uc 0 \definecasemaps 224 to 254 lc 0 uc -32 +\definecaseswap 255 223 % ssharp (else patterns fail) -\definecaseswap 255 223 +% 156 vs. 188 IJligature %D Some languages need this: @@ -60,17 +64,13 @@ %D explicitly constructed. %D %D \startitemize[columns,two] -%D \item \type{\dotlessj} +%D \item \type{\dotlessj} - but then it may not be defined!!!! %D \item \type{\IJligature} %D \item \type{\ijligature} %D \item \type{\Ssharp} %D \item \type{\perthousand} %D \item \type{\compoundwordmark} -% %D \item \type{\textvisiblespace} -% %D \item \type{\tcaron} -% %D \item \type{\tcedilla } -% %D \item \type{\Tcedilla} -% %D \item \type{\ydiaeresis} +% \item \type{\textvisiblespace} %D \stopitemize %D So, for the moment we nil them; we can always create @@ -80,204 +80,214 @@ \startencoding[ec][ec] % second arg defines auto regime, needed here ? +\definecharacter textgrave 0 \definecharacter textacute 1 -\definecharacter textbreve 8 -\definecharacter textcaron 7 -\definecharacter textcedilla 11 \definecharacter textcircumflex 2 +\definecharacter texttilde 3 \definecharacter textdiaeresis 4 -\definecharacter textdotaccent 10 -\definecharacter textgrave 0 \definecharacter texthungarumlaut 5 +\definecharacter textring 6 +\definecharacter textcaron 7 +\definecharacter textbreve 8 \definecharacter textmacron 9 +\definecharacter textdotaccent 10 +\definecharacter textcedilla 11 \definecharacter textogonek 12 -\definecharacter textring 6 -\definecharacter texttilde 3 - -\definecharacter dotlessi 25 -%definecharacter dotlessj 26 - +\definecharacter quotesinglebase 13 +\definecharacter guilsingleleft 14 +\definecharacter guilsingleright 15 +\definecharacter quotedblleft 16 +\definecharacter quotedblright 17 +\definecharacter quotedblbase 18 +\definecharacter leftguillemot 19 +\definecharacter rightguillemot 20 \definecharacter endash 21 \definecharacter emdash 22 - -\definecharacter aeligature 230 -\definecharacter AEligature 198 -%definecharacter ijligature 188 -%definecharacter IJligature 156 -\definecharacter oeligature 247 -\definecharacter OEligature 215 - -\definecharacter ssharp 255 -%definecharacter Ssharp 223 - -\definecharacter thorn 254 -\definecharacter Thorn 222 - -%definecharacter Eth 208 % no ! -\definecharacter Dstroke 208 -\definecharacter eth 240 - -\definecharacter exclamdown 189 % lig -\definecharacter questiondown 190 % lig - -\definecharacter sectionmark 159 - -\definecharacter textsterling 191 - -\definecharacter percent 37 -%definecharacter perthousand 24 - -\definecharacter softhyphen 127 % ? %definecharacter compoundwordmark 23 - -\definecharacter textasciicircum 94 -\definecharacter textasciitilde 126 -\definecharacter textbackslash 92 -\definecharacter textbraceleft 123 -\definecharacter textbraceright 125 -\definecharacter textunderscore 95 +%definecharacter perthousand 24 +\definecharacter dotlessi 25 % or when missing: {j} +\definecharacter dotlessj 26 +% ff 27 +% fi 28 +% fl 29 +% ffi 30 +% ffl 31 %definecharacter textvisiblespace 32 - +% exclam ! 33 \definecharacter quotedbl 34 -\definecharacter quotedblbase 18 -\definecharacter quotedblleft 16 -\definecharacter quotedblright 17 - -\definecharacter quotesingle 39 % fake 'm -\definecharacter quotesinglebase 13 - -\definecharacter quoteleft 96 +% numbersign # 35 +% dollar $ 36 +\definecharacter percent 37 +% ampersand & 38 +%definecharacter quotesingle 39 % fake 'm TODO:enco-def!!!! \definecharacter quoteright 39 - -\definecharacter guilsingleleft 14 -\definecharacter guilsingleright 15 -\definecharacter leftguillemot 19 -\definecharacter rightguillemot 20 - -\definecharacter aacute 225 -\definecharacter Aacute 193 -\definecharacter cacute 162 -\definecharacter Cacute 130 -\definecharacter eacute 233 -\definecharacter Eacute 201 -\definecharacter iacute 237 -\definecharacter Iacute 205 -\definecharacter lacute 168 -\definecharacter Lacute 136 -\definecharacter Nacute 139 -\definecharacter Oacute 211 -\definecharacter nacute 171 -\definecharacter oacute 243 -\definecharacter racute 175 -\definecharacter Racute 143 -\definecharacter sacute 177 -\definecharacter Sacute 145 -\definecharacter uacute 250 -\definecharacter Uacute 218 -\definecharacter yacute 253 -\definecharacter Yacute 221 -\definecharacter zacute 185 -\definecharacter Zacute 153 - -\definecharacter abreve 160 -\definecharacter Abreve 128 -\definecharacter gbreve 167 -\definecharacter Gbreve 135 - -\definecharacter ccaron 163 -\definecharacter Ccaron 131 -\definecharacter dcaron 164 -\definecharacter Dcaron 132 -\definecharacter ecaron 165 -\definecharacter Ecaron 133 -\definecharacter lcaron 169 -\definecharacter Lcaron 137 -\definecharacter ncaron 172 -\definecharacter Ncaron 140 -\definecharacter rcaron 176 -\definecharacter Rcaron 144 -\definecharacter scaron 178 -\definecharacter Scaron 146 -\definecharacter tcaron 180 -\definecharacter Tcaron 148 -\definecharacter zcaron 186 -\definecharacter Zcaron 154 - -\definecharacter ccedilla 231 -\definecharacter Ccedilla 199 -\definecharacter scedilla 179 -\definecharacter Scedilla 147 -\definecharacter tcedilla 181 -\definecharacter Tcedilla 149 - -\definecharacter acircumflex 226 -\definecharacter Acircumflex 194 -\definecharacter ecircumflex 234 -\definecharacter Ecircumflex 202 -\definecharacter icircumflex 238 -\definecharacter Icircumflex 206 -\definecharacter ocircumflex 244 -\definecharacter Ocircumflex 212 -\definecharacter ucircumflex 251 -\definecharacter Ucircumflex 219 - -\definecharacter adiaeresis 228 -\definecharacter Adiaeresis 196 -\definecharacter ediaeresis 235 -\definecharacter Ediaeresis 203 -\definecharacter idiaeresis 239 -\definecharacter Idiaeresis 207 -\definecharacter odiaeresis 246 -\definecharacter Odiaeresis 214 -\definecharacter udiaeresis 252 -\definecharacter Udiaeresis 220 -\definecharacter ydiaeresis 184 -\definecharacter Ydiaeresis 152 - +% parenleft ( 40 +% parenright ) 41 +% asterisk * 42 +% plus + 43 +% comma , 44 +\definecharacter softhyphen 45 +% period . 46 +% slash / 47 +% 0-9 48-57 +% colon : 58 +% semicolon ; 59 +% less < 60 +% equal = 61 +% greater > 62 +% question ? 63 +% at @ 64 +% A-Z 65-90 +% bracketleft [ 91 +\definecharacter textbackslash 92 +% bracketright ] 93 +\definecharacter textasciicircum 94 +\definecharacter textunderscore 95 +\definecharacter quoteleft 96 +% a-z 97-122 +\definecharacter textbraceleft 123 +\definecharacter textbraceright 125 +\definecharacter textasciitilde 126 +%definecharacter softhyphen 127 % -> 45 (127 often undefined) +\definecharacter Abreve 128 % abreve 160 +\definecharacter Aogonek 129 % aogonek 161 +\definecharacter Cacute 130 % cacute 162 +\definecharacter Ccaron 131 % ccaron 163 +\definecharacter Dcaron 132 % dcaron 164 +\definecharacter Ecaron 133 % ecaron 165 +\definecharacter Eogonek 134 % eogonek 166 +\definecharacter Gbreve 135 % gbreve 167 +\definecharacter Lacute 136 % lacute 168 +\definecharacter Lcaron 137 % lcaron 169 +\definecharacter Lstroke 138 % lstroke 170 +\definecharacter Nacute 139 % nacute 171 +\definecharacter Ncaron 140 % ncaron 172 +\definecharacter Eng 141 % eng 173 +\definecharacter Neng 141 % Neng 173 +\definecharacter Ohungarumlaut 142 % ohungarumlaut 174 +\definecharacter Racute 143 % racute 175 +\definecharacter Rcaron 144 % rcaron 176 +\definecharacter Sacute 145 % sacute 177 +\definecharacter Scaron 146 % scaron 178 +\definecharacter Scedilla 147 % scedilla 179 +\definecharacter Tcaron 148 % tcaron 180 +\definecharacter Tcedilla 149 % tcedilla 181 +\definecharacter Uhungarumlaut 150 % uhungarumlaut 182 +\definecharacter Uring 151 % uring 183 +\definecharacter Ydiaeresis 152 % ydiaeresis 184 +\definecharacter Zacute 153 % zacute 185 +\definecharacter Zcaron 154 % zcaron 186 +\definecharacter Zdotaccent 155 % zdotaccent 187 +\definecharacter IJligature 156 % ijligature 188 \definecharacter Idotaccent 157 -\definecharacter zdotaccent 187 -\definecharacter Zdotaccent 155 - -\definecharacter agrave 224 -\definecharacter Agrave 192 -\definecharacter egrave 232 -\definecharacter Egrave 200 -\definecharacter igrave 236 -\definecharacter Igrave 204 -\definecharacter ograve 242 -\definecharacter Ograve 210 -\definecharacter ugrave 249 -\definecharacter Ugrave 217 - -\definecharacter ohungarumlaut 174 -\definecharacter Ohungarumlaut 142 -\definecharacter uhungarumlaut 182 -\definecharacter Uhungarumlaut 150 - -%definecharacter dmacron 158 % no ! -\definecharacter dstroke 158 - -\definecharacter aogonek 161 -\definecharacter Aogonek 129 -\definecharacter eogonek 166 -\definecharacter Eogonek 134 +\definecharacter dstroke 158 % Dstroke 208 +\definecharacter sectionmark 159 +\definecharacter abreve 160 % Abreve 128 +\definecharacter aogonek 161 % Aogonek 129 +\definecharacter cacute 162 % Cacute 130 +\definecharacter ccaron 163 % Ccaron 131 +\definecharacter dcaron 164 % Dcaron 132 +\definecharacter ecaron 165 % Ecaron 133 +\definecharacter eogonek 166 % Eogonek 134 +\definecharacter gbreve 167 % Gbreve 135 +\definecharacter lacute 168 % Lacute 136 +\definecharacter lcaron 169 % Lcaron 137 +\definecharacter lstroke 170 % Lstroke 138 +\definecharacter nacute 171 % Nacute 139 +\definecharacter ncaron 172 % Ncaron 140 +\definecharacter eng 173 % Eng 141 +\definecharacter ohungarumlaut 174 % Ohungarumlaut 142 +\definecharacter racute 175 % Racute 143 +\definecharacter rcaron 176 % Rcaron 144 +\definecharacter sacute 177 % Sacute 145 +\definecharacter scaron 178 % Scaron 146 +\definecharacter scedilla 179 % Scedilla 147 +\definecharacter tcaron 180 % Tcaron 148 +\definecharacter tcedilla 181 % Tcedilla 149 +\definecharacter uhungarumlaut 182 % Uhungarumlaut 150 +\definecharacter uring 183 % Uring 151 +\definecharacter ydiaeresis 184 % Ydiaeresis 152 +\definecharacter zacute 185 % Zacute 153 +\definecharacter zcaron 186 % Zcaron 154 +\definecharacter zdotaccent 187 % Zdotaccent 155 +\definecharacter ijligature 188 % IJligature 156 +\definecharacter exclamdown 189 +\definecharacter questiondown 190 +\definecharacter textsterling 191 +\definecharacter Agrave 192 % agrave 224 +\definecharacter Aacute 193 % aacute 225 +\definecharacter Acircumflex 194 % acircumflex 226 +\definecharacter Atilde 195 % atilde 227 +\definecharacter Adiaeresis 196 % adiaeresis 228 +\definecharacter Aring 197 % aring 229 +\definecharacter AEligature 198 % aeligature 230 +\definecharacter Ccedilla 199 % ccedilla 231 +\definecharacter Egrave 200 % egrave 232 +\definecharacter Eacute 201 % eacute 233 +\definecharacter Ecircumflex 202 % ecircumflex 234 +\definecharacter Ediaeresis 203 % ediaeresis 235 +\definecharacter Igrave 204 % igrave 236 +\definecharacter Iacute 205 % iacute 237 +\definecharacter Icircumflex 206 % icircumflex 238 +\definecharacter Idiaeresis 207 % idiaeresis 239 +\definecharacter Eth 208 % eth 240 +\definecharacter Dstroke 208 % dstroke 158 +\definecharacter Ntilde 209 % ntilde 241 +\definecharacter Ograve 210 % ograve 242 +\definecharacter Oacute 211 % oacute 243 +\definecharacter Ocircumflex 212 % ocircumflex 244 +\definecharacter Otilde 213 % otilde 245 +\definecharacter Odiaeresis 214 % odiaeresis 246 +\definecharacter OEligature 215 % oeligature 247 +\definecharacter Ostroke 216 % ostroke 248 +\definecharacter Ugrave 217 % ugrave 249 +\definecharacter Uacute 218 % uacute 250 +\definecharacter Ucircumflex 219 % ucircumflex 251 +\definecharacter Udiaeresis 220 % udiaeresis 252 +\definecharacter Yacute 221 % yacute 253 +\definecharacter Thorn 222 % thorn 254 +\definecharacter Ssharp 223 % ssharp 255 +\definecharacter agrave 224 % Agrave 192 +\definecharacter aacute 225 % Aacute 193 +\definecharacter acircumflex 226 % Acircumflex 194 +\definecharacter atilde 227 % Atilde 195 +\definecharacter adiaeresis 228 % Adiaeresis 196 +\definecharacter aring 229 % Aring 197 +\definecharacter aeligature 230 % AEligature 198 +\definecharacter ccedilla 231 % Ccedilla 199 +\definecharacter egrave 232 % Egrave 200 +\definecharacter eacute 233 % Eacute 201 +\definecharacter ecircumflex 234 % Ecircumflex 202 +\definecharacter ediaeresis 235 % Ediaeresis 203 +\definecharacter igrave 236 % Igrave 204 +\definecharacter iacute 237 % Iacute 205 +\definecharacter icircumflex 238 % Icircumflex 206 +\definecharacter idiaeresis 239 % Idiaeresis 207 +\definecharacter eth 240 % Eth 208 +\definecharacter ntilde 241 % Ntilde 209 +\definecharacter ograve 242 % Ograve 210 +\definecharacter oacute 243 % Oacute 211 +\definecharacter ocircumflex 244 % Ocircumflex 212 +\definecharacter otilde 245 % Otilde 213 +\definecharacter odiaeresis 246 % Odiaeresis 214 +\definecharacter oeligature 247 % OEligature 215 +\definecharacter ostroke 248 % Ostroke 216 +\definecharacter ugrave 249 % Ugrave 217 +\definecharacter uacute 250 % Uacute 218 +\definecharacter ucircumflex 251 % Ucircumflex 219 +\definecharacter udiaeresis 252 % Udiaeresis 220 +\definecharacter yacute 253 % Yacute 221 +\definecharacter thorn 254 % Thorn 222 +\definecharacter ssharp 255 % Ssharp 223 -\definecharacter aring 229 -\definecharacter Aring 197 -\definecharacter uring 183 -\definecharacter Uring 151 +\stopencoding -\definecharacter lstroke 170 -\definecharacter Lstroke 138 -\definecharacter ostroke 248 -\definecharacter Ostroke 216 +\startencoding[ec] -\definecharacter atilde 227 -\definecharacter Atilde 195 -\definecharacter ntilde 241 -\definecharacter Ntilde 209 -\definecharacter otilde 245 -\definecharacter Otilde 213 +\definecharacter Scommaaccent {\Scedilla} +\definecharacter scommaaccent {\scedilla} +\definecharacter Tcommaaccent {\Tcedilla} +\definecharacter tcommaaccent {\tcedilla} \stopencoding diff --git a/tex/context/base/enco-ini.tex b/tex/context/base/enco-ini.tex index 9a3b2c841..53cec0d9d 100644 --- a/tex/context/base/enco-ini.tex +++ b/tex/context/base/enco-ini.tex @@ -1855,6 +1855,10 @@ \definecommand d {\buildtextbottomdot} \definecommand k {\buildtextogonek} +%D A collectors item: + +\def\buildtextbottomcomma{\bottomaccent{.15ex}{0}{5}{\tx,}} + %D Rarely needed but there: \unexpanded\def\topaccent#1#2#3#4#5% down right slantcorrection accent char diff --git a/tex/context/base/m-gnuplot.tex b/tex/context/base/m-gnuplot.tex index 17900bcdb..27e4c03dc 100644 --- a/tex/context/base/m-gnuplot.tex +++ b/tex/context/base/m-gnuplot.tex @@ -3,7 +3,7 @@ %D version=2006.01.04, %D title=\CONTEXT\ Extra Modules, %D subtitle=\GNUPLOT\ Inclusion, -%D author=Hans Hagen, +%D author={Tobias Burnus, Hans Hagen, Taco Hoekwater, Mojca Miklavec}, %D date=\currentdate, %D copyright=\PRAGMA] %C @@ -30,6 +30,7 @@ \def\startGNUPLOTinclusions {\bgroup \obeylines + \catcode`\%=\@@letter \dostartGNUPLOTinclusions} \def\dostartGNUPLOTinclusions#1\stopGNUPLOTinclusions @@ -41,6 +42,7 @@ \def\startGNUPLOTgraphic#1% {\bgroup \obeylines + \catcode`\%=\@@letter \dostartGNUPLOTgraphic{#1}} \def\dostartGNUPLOTgraphic#1#2\stopGNUPLOTgraphic @@ -84,8 +86,9 @@ % 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 \immediate\openout\scratchwrite=\GNUPLOTfile.gpd - \immediate\write\scratchwrite{set terminal \@@GNUPLOTmethod\space\@@GNUPLOToption}% + \immediate\write\scratchwrite{set terminal \@@GNUPLOToutput\space\@@GNUPLOToption}% \doifnotempty {\GNUPLOTinclusions}{\immediate\write\scratchwrite{\GNUPLOTinclusions}}% \immediate\write\scratchwrite{set output "\GNUPLOTfile.\@@GNUPLOTsuffix"}% diff --git a/tex/context/base/mult-ini.tex b/tex/context/base/mult-ini.tex index 40e379648..1e3f378df 100644 --- a/tex/context/base/mult-ini.tex +++ b/tex/context/base/mult-ini.tex @@ -1537,7 +1537,7 @@ \def\contextversion{unknown} \def\contextversionnumber{0} \else - \def\contextversionnumber#1.#2.#3\relax{#1\ifnum#2<10 0\fi#2\ifnum#3<10 0\fi#3} + \def\contextversionnumber#1.#2.#3 #4:#5\relax{#1\ifnum#2<10 0\fi#2\ifnum#3<10 0\fi#3 #4:#5} \edef\contextversionnumber{\expandafter\contextversionnumber\contextversion\relax} \fi diff --git a/tex/context/base/spec-fdf.tex b/tex/context/base/spec-fdf.tex index 853dbb678..3bba30f0e 100644 --- a/tex/context/base/spec-fdf.tex +++ b/tex/context/base/spec-fdf.tex @@ -453,13 +453,17 @@ \def\doPDFsetupidentity#1#2#3#4#5#6% {\bgroup \enablePDFdocencoding + \edef\!!stringa{#5}% + \ifx\!!stringa\empty \ifx\pdfdate\undefined\else + \edef\!!stringa{D:\pdfdate}% + \fi \fi \expanded{\doPDFaddtoinfo {/Title (#1) /Subject (#2) /Author (#3) /Creator (#4) - /ModDate (#5) - /ID (\jobname.#5) % needed for pdf/x + /ModDate (\!!stringa) + /ID (\jobname.\!!stringa) % needed for pdf/x /Keywords (#6)}}% \egroup} diff --git a/tex/context/base/type-akb.tex b/tex/context/base/type-akb.tex index adf0c6797..7c02144d5 100644 --- a/tex/context/base/type-akb.tex +++ b/tex/context/base/type-akb.tex @@ -208,43 +208,43 @@ \stoptypescript -\starttypescript [adobekb,berry] [t5] +\starttypescript [adobekb,berry] [t5] % there are no adobe metrics \loadmapfile[t5-base.map] -\definefontsynonym [t5-utmr8a] [ptmr8v] [encoding=t5] -\definefontsynonym [t5-utmri8a] [ptmri8v] [encoding=t5] -\definefontsynonym [t5-utmb8a] [ptmb8v] [encoding=t5] -\definefontsynonym [t5-utmbi8a] [ptmbi8v] [encoding=t5] - -\definefontsynonym [t5-utmr8a-slanted-167] [ptmro8v] [encoding=t5] -\definefontsynonym [t5-utmb8a-slanted-167] [ptmbo8v] [encoding=t5] - -\definefontsynonym [t5-uhvr8a] [phvr8v] [encoding=t5] -\definefontsynonym [t5-uhvro8a] [phvro8v] [encoding=t5] -\definefontsynonym [t5-uhvb8a] [phvb8v] [encoding=t5] -\definefontsynonym [t5-uhvbo8a] [phvbo8v] [encoding=t5] - -\definefontsynonym [t5-ucrr8a] [pcrr8v] [encoding=t5] -\definefontsynonym [t5-ucrb8a] [pcrb8v] [encoding=t5] -\definefontsynonym [t5-ucrro8a] [pcrro8v] [encoding=t5] -\definefontsynonym [t5-ucrbo8a] [pcrbo8v] [encoding=t5] - -\definefontsynonym [t5-uplr8a] [pplr8v] [encoding=t5] -\definefontsynonym [t5-uplri8a] [pplri8v] [encoding=t5] -\definefontsynonym [t5-uplb8a] [pplb8v] [encoding=t5] -\definefontsynonym [t5-uplbi8a] [pplbi8v] [encoding=t5] -\definefontsynonym [t5-uplr8a-slanted-167] [pplro8v] [encoding=t5] -\definefontsynonym [t5-uplb8a-slanted-167] [pplbo8v] [encoding=t5] -\definefontsynonym [t5-uplr8a-capitalized-800] [pplr8v] [encoding=t5] - -\definefontsynonym [t5-ubkl8a] [pbkl8v] [encoding=t5] -\definefontsynonym [t5-ubkli8a] [pbkli8v] [encoding=t5] -\definefontsynonym [t5-ubkd8a] [pbkd8v] [encoding=t5] -\definefontsynonym [t5-ubkdi8a] [pbkdi8v] [encoding=t5] -\definefontsynonym [t5-ubkl8a-slanted-167] [pbklo8v] [encoding=t5] -\definefontsynonym [t5-ubkd8a-slanted-167] [pbkdo8v] [encoding=t5] -\definefontsynonym [t5-ubkl8a-capitalized-800] [pbkl8v] [encoding=t5] +\definefontsynonym [t5-utmr8a] [utmr8v] [encoding=t5] +\definefontsynonym [t5-utmri8a] [utmri8v] [encoding=t5] +\definefontsynonym [t5-utmb8a] [utmb8v] [encoding=t5] +\definefontsynonym [t5-utmbi8a] [utmbi8v] [encoding=t5] + +\definefontsynonym [t5-utmr8a-slanted-167] [utmro8v] [encoding=t5] +\definefontsynonym [t5-utmb8a-slanted-167] [utmbo8v] [encoding=t5] + +\definefontsynonym [t5-uhvr8a] [uhvr8v] [encoding=t5] +\definefontsynonym [t5-uhvro8a] [uhvro8v] [encoding=t5] +\definefontsynonym [t5-uhvb8a] [uhvb8v] [encoding=t5] +\definefontsynonym [t5-uhvbo8a] [uhvbo8v] [encoding=t5] + +\definefontsynonym [t5-ucrr8a] [ucrr8v] [encoding=t5] +\definefontsynonym [t5-ucrb8a] [ucrb8v] [encoding=t5] +\definefontsynonym [t5-ucrro8a] [ucrro8v] [encoding=t5] +\definefontsynonym [t5-ucrbo8a] [ucrbo8v] [encoding=t5] + +\definefontsynonym [t5-uplr8a] [uplr8v] [encoding=t5] +\definefontsynonym [t5-uplri8a] [uplri8v] [encoding=t5] +\definefontsynonym [t5-uplb8a] [uplb8v] [encoding=t5] +\definefontsynonym [t5-uplbi8a] [uplbi8v] [encoding=t5] +\definefontsynonym [t5-uplr8a-slanted-167] [uplro8v] [encoding=t5] +\definefontsynonym [t5-uplb8a-slanted-167] [uplbo8v] [encoding=t5] +\definefontsynonym [t5-uplr8a-capitalized-800] [uplr8v] [encoding=t5] + +\definefontsynonym [t5-ubkl8a] [ubkl8v] [encoding=t5] +\definefontsynonym [t5-ubkli8a] [ubkli8v] [encoding=t5] +\definefontsynonym [t5-ubkd8a] [ubkd8v] [encoding=t5] +\definefontsynonym [t5-ubkdi8a] [ubkdi8v] [encoding=t5] +\definefontsynonym [t5-ubkl8a-slanted-167] [ubklo8v] [encoding=t5] +\definefontsynonym [t5-ubkd8a-slanted-167] [ubkdo8v] [encoding=t5] +\definefontsynonym [t5-ubkl8a-capitalized-800] [ubkl8v] [encoding=t5] \stoptypescript diff --git a/tex/context/base/type-ini.tex b/tex/context/base/type-ini.tex index e6d79493c..8c988acd3 100644 --- a/tex/context/base/type-ini.tex +++ b/tex/context/base/type-ini.tex @@ -1,5 +1,4 @@ %D \module -%D \module %D [ file=type-ini, %D version=2001.03.05, %D title=\CONTEXT\ Typescript Macros, diff --git a/tex/context/base/xtag-ext.tex b/tex/context/base/xtag-ext.tex index 957f6eb1d..e2db5eae4 100644 --- a/tex/context/base/xtag-ext.tex +++ b/tex/context/base/xtag-ext.tex @@ -226,7 +226,7 @@ \endcsname} \gdef\defXMLelement#1#2% - {\@EA\def\@EA#1\csname + {\@EA\let\@EA#1\csname \@@XMLsave:\ifcsname\@@XMLsave:#2\endcsname#2\else\@@XMLsave\fi \endcsname} diff --git a/tex/context/base/xtag-ini.tex b/tex/context/base/xtag-ini.tex index 61906b621..2b9dc8aa2 100644 --- a/tex/context/base/xtag-ini.tex +++ b/tex/context/base/xtag-ini.tex @@ -2863,4 +2863,23 @@ \def\XMLyes#1{\XMLownifequalelse{#1}{yes}{#1}{}} +%D The next macro will set the variable \type {\flattenedXMLcontent} +%D to the content with elements removed and entity names. + +\bgroup + +\catcode`\<\active +\catcode`\&\active + +\gdef\flattenXMLcontent#1% we need taco's 'over one group' + {\begingroup + \def<##1>{}% + \def&##1;{##1}% + \edef\flattenedXMLcontent{#1}% + \edef\flattenedXMLcontent{\expandafter\dounspaced\flattenedXMLcontent\end}% + \@EA\endgroup + \@EA\def\@EA\flattenedXMLcontent\@EA{\flattenedXMLcontent}} + +\egroup + \protect \endinput diff --git a/tex/context/base/xtag-map.tex b/tex/context/base/xtag-map.tex index 4ee23e750..6cd73442f 100644 --- a/tex/context/base/xtag-map.tex +++ b/tex/context/base/xtag-map.tex @@ -401,7 +401,7 @@ \appendtoks \defineXMLentity[tex-hash]{\letterhash}% - \defineXMLentity[tex-bar]{\myspecialvert}% + \defineXMLentity[tex-bar]{\myspecialnormalvert}% \to \everyXMLremapping \def\setnormalXMLentities% will change ! ! ! ! ! diff --git a/tex/context/base/xtag-mmc.tex b/tex/context/base/xtag-mmc.tex index a6f7578c2..803891164 100644 --- a/tex/context/base/xtag-mmc.tex +++ b/tex/context/base/xtag-mmc.tex @@ -132,6 +132,10 @@ complex-cartesian=>\let\next\MMLccartesian, {\encapsulatenextXMLRelements{\left(}{\MMLccomma}{\right)}} {}} +% \def\MMLcFNdefault#1#2% neg space needed because of \left +% {#2\!% \getXMLentity{NegThinSpace}% +% \MMLcreset\encapsulatenextXMLRelements{\left(}{\MMLccomma}{\right)}} + \def\MMLcCN#1% #2% can be sped up with \doifundefined ... {\getXMLarguments{cn}{type="" #1}% \doifXMLparelse{cn}{type} diff --git a/tex/context/base/xtag-mml.tex b/tex/context/base/xtag-mml.tex index b77063986..f2279c4f5 100644 --- a/tex/context/base/xtag-mml.tex +++ b/tex/context/base/xtag-mml.tex @@ -464,7 +464,7 @@ \defineXMLentity [nabla] {\nabla} -\def\myspecialvert{\mathematics{\vert}} % temp hack, should stretch +\def\myspecialnormalvert{\mathematics{\vert}} % temp hack, should stretch \defineXMLentity [,] {{,}} \defineXMLentity [.] {{.}} @@ -474,7 +474,7 @@ \defineXMLentity [)] {)} \defineXMLentity [<] {\mathematics{<}} \defineXMLentity [>] {\mathematics{>}} -\defineXMLentity [|] {\myspecialvert} +\defineXMLentity [|] {\myspecialnormalvert} \defineXMLentity [/] {/} \defineXMLentity [*] {\times} \defineXMLentity [=] {=} diff --git a/tex/context/base/xtag-mmp.tex b/tex/context/base/xtag-mmp.tex index 125315da7..0405ed1bb 100644 --- a/tex/context/base/xtag-mmp.tex +++ b/tex/context/base/xtag-mmp.tex @@ -110,10 +110,10 @@ {\resetMMLseparator \encapsulateXMLR {}% - {\pushmacro\myspecialvert % hack - \def\myspecialvert{\;\vrule\;}% + {\pushmacro\myspecialnormalvert % hack + \def\myspecialnormalvert{\;\vrule\;}% \grabMMLseparator{\XMLpar{mfenced}{separators}{}}% - \popmacro\myspecialvert} + \popmacro\myspecialnormalvert} {}% {#2\empty}} {#2}% diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index e1ac64107..f7cf72bc8 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.09"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.01.12 10:38"> <cd:variables> <cd:variable name="one" value="jedna"/> diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 1c7e91f73..68a1abd99 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.09"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.01.12 10:38"> <cd:variables> <cd:variable name="one" value="eins"/> diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index a571af6a3..4cd8cdca9 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.09"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.01.12 10:38"> <cd:variables> <cd:variable name="one" value="one"/> diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index 1d8b92f11..4fa840bf8 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.09"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.01.12 10:38"> <cd:variables> <cd:variable name="one" value="un"/> diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index 7361b5840..79a7711dd 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.09"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.01.12 10:38"> <cd:variables> <cd:variable name="one" value="uno"/> diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index 3ae79ba40..bfe22266c 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.09"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.01.12 10:38"> <cd:variables> <cd:variable name="one" value="een"/> diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index e08ac7c67..d99dcf2b4 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.09"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.01.12 10:38"> <cd:variables> <cd:variable name="one" value="unu"/> |