From a59c89b31ff0895ffa7f5b5f8784cc38449ca1a5 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 27 Nov 2006 11:04:00 +0100 Subject: stable 2006.11.27 11:04 --- tex/context/base/cont-new.tex | 2 +- tex/context/base/context.tex | 2 +- tex/context/base/core-itm.tex | 7 ++-- tex/context/base/core-var.tex | 13 ++++++- tex/context/base/core-vis.tex | 71 --------------------------------------- tex/context/base/enco-ans.tex | 1 + tex/context/base/meta-ini.tex | 5 +++ tex/context/base/syst-xtx.tex | 4 +++ tex/context/base/x-newmml.tex | 62 +++++++++++++++++++++------------- tex/context/base/x-om2cml.xsl | 24 ++++++++++++- 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 +- 17 files changed, 97 insertions(+), 108 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 806d17386..5ccc67fd3 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -13,7 +13,7 @@ % it's about time to clean up this file ... -\newcontextversion{2006.11.23 14:46} +\newcontextversion{2006.11.27 11:04} %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 d3f5362bf..0be6eba56 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -42,7 +42,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2006.11.23 14:46} +\edef\contextversion{2006.11.27 11:04} %D For those who want to use this: diff --git a/tex/context/base/core-itm.tex b/tex/context/base/core-itm.tex index 364501f23..9f132a96a 100644 --- a/tex/context/base/core-itm.tex +++ b/tex/context/base/core-itm.tex @@ -494,9 +494,10 @@ \ifnum\itemlevel>\plusone \letitemparameter\itemlevel\c!inbetween\empty \fi - \else\ifconditional\packlistitem + \fi + \ifconditional\packlistitem \letitemparameter\itemlevel\c!inbetween\empty - \fi\fi + \fi \doifinset\v!columns{#1}% {\ifinsidecolumns\else\ifnum\itemcolumndepth=\zerocount \globallet\itemcolumndepth\itemlevel @@ -881,7 +882,7 @@ \fi \fi \else -\ifconditional\inlinelistitem +\ifconditional\textlistitem % was bugged: \inlinelistitem % \removeunwantedspaces\hskip\interwordspace\!!plus\emwidth\relax % new per 2006/10/20 \removeunwantedspaces\hskip\emwidth\!!plus\interwordstretch\!!minus\interwordshrink\relax % new per 2006/10/20 \else diff --git a/tex/context/base/core-var.tex b/tex/context/base/core-var.tex index eba38fdc5..4db5cb6e5 100644 --- a/tex/context/base/core-var.tex +++ b/tex/context/base/core-var.tex @@ -143,7 +143,7 @@ \def\dodopreventmode#1% {\@EA\let\csname\@mode@#1\endcsname\preventedmode} -\def\dodoenablemode#1% +\def\dodoenablemode#1% mode can be relax {\ifcase0\csname\@mode@#1\endcsname\relax \@EA\let\csname\@mode@#1\endcsname\enabledmode \fi} @@ -153,6 +153,17 @@ \@EA\let\csname\@mode@#1\endcsname\disabledmode \fi} +% handy for mp + +\def\booleanmodevalue#1% can be \relax + {\expandafter\ifx\csname\@mode@#1\endcsname\relax + fals% + \else\ifnum0\csname\@mode@#1\endcsname=0 + fals% + \else + tru% + \fi\fi e} + % check macros \newif\ifcheckedmode diff --git a/tex/context/base/core-vis.tex b/tex/context/base/core-vis.tex index ed469e2e0..b20c9b9ce 100644 --- a/tex/context/base/core-vis.tex +++ b/tex/context/base/core-vis.tex @@ -319,19 +319,6 @@ \normalvskip\zeropoint\!!plus\ruleddepth}% \fi} -% \def\cutmarksymbols -% {\setbox\scratchbox\normalvbox to \cutmarklength -% {\normalvfill -% \normalhbox to \cutmarklength -% {\normalhfill\ssxx\cutmarksymbol\normalhfill}% -% \normalvfill}% -% \normalhbox to \ruledwidth -% {\scratchdimen\cutmarklength -% \divide\scratchdimen 2 -% \llap{\copy\scratchbox\normalhskip\cutmarkoffset\scratchdimen}% -% \normalhfill -% \rlap{\normalhskip\cutmarkoffset\scratchdimen\copy\scratchbox}}} - \def\cutmarksymbols#1% {\normalhbox to \ruledwidth {\setbox\scratchbox\normalhbox to \cutmarklength @@ -348,64 +335,6 @@ \normalvss}% \normalhss}} -% \def\makecutbox#1% -% {\edef\ruledheight{\the\ht#1}% -% \edef\ruleddepth {\the\dp#1}% -% \edef\ruledwidth {\the\wd#1}% -% \setbox#1\normalhbox -% {\dontcomplain -% \forgetall -% \boxmaxdepth\maxdimen -% \offinterlineskip -% \scratchdimen\cutmarklength -% \divide\scratchdimen 2 -% \hsize\ruledwidth -% \setbox\scratchbox\normalvbox -% {\setbox\scratchbox\normalhbox{\horizontalcuts}% -% \normalvskip-\cutmarkoffset\scratchdimen -% \normalvskip-2\scratchdimen -% \copy\scratchbox -% \normalvskip\cutmarkoffset\scratchdimen -% \hbox to \ruledwidth -% {\setbox\scratchbox\normalhbox{\verticalcuts}% -% \llap{\copy\scratchbox\normalhskip\cutmarkoffset\scratchdimen}% -% \bgroup -% \setbox\scratchbox\normalhbox{\baselinecuts}% -% \llap{\copy\scratchbox\normalhskip\cutmarkoffset\scratchdimen}% -% \normalhfill -% \rlap{\normalhskip\cutmarkoffset\scratchdimen\copy\scratchbox}% -% \egroup -% \rlap{\normalhskip\cutmarkoffset\scratchdimen\copy\scratchbox}}% -% \normalvskip\cutmarkoffset\scratchdimen -% \copy\scratchbox}% -% \ht\scratchbox\ruledheight -% \dp\scratchbox\ruleddepth -% \wd\scratchbox\zeropoint -% \resetcolorseparation -% \localstartcolor[\defaulttextcolor]% -% \box\scratchbox -% \ifx\cutmarksymbol\relax \else -% \setbox\scratchbox\normalvbox -% {\setbox\scratchbox\normalhbox{\cutmarksymbols}% -% \vskip-\cutmarkoffset\scratchdimen -% \vskip-\cutmarklength -% \copy\scratchbox -% \vskip\cutmarkoffset\scratchdimen -% \vskip\ruledheight -% \vskip\ruleddepth -% \vskip\cutmarkoffset\scratchdimen -% \copy\scratchbox}% -% \ht\scratchbox\ruledheight -% \dp\scratchbox\ruleddepth -% \wd\scratchbox\zeropoint -% \box\scratchbox -% \fi -% \localstopcolor -% \box#1}% -% \wd#1=\ruledwidth -% \ht#1=\ruledheight -% \dp#1=\ruleddepth} - \def\makecutbox#1% simplier with layers, todo {\edef\ruledheight{\the\ht#1}% \edef\ruleddepth {\the\dp#1}% diff --git a/tex/context/base/enco-ans.tex b/tex/context/base/enco-ans.tex index 6c7acf731..7a48b5b55 100644 --- a/tex/context/base/enco-ans.tex +++ b/tex/context/base/enco-ans.tex @@ -114,6 +114,7 @@ \definecharacter textasciitilde 158 \definecharacter textbackslash 92 \definecharacter textbraceleft 123 +\definecharacter textbar 124 \definecharacter textbraceright 125 \definecharacter textunderscore 95 diff --git a/tex/context/base/meta-ini.tex b/tex/context/base/meta-ini.tex index d00a8a6b1..e2f9fa1f9 100644 --- a/tex/context/base/meta-ini.tex +++ b/tex/context/base/meta-ini.tex @@ -760,6 +760,11 @@ LastPageNumber:= lastpage; \stopMPinitializations +\appendtoks + \disablediscretionaries + \disablecompoundcharacters +\to\everyMPgraphic + \appendtoks \expanded{\definecolor[currentcolor][\currentcolorname]}% \to \everyMPgraphic diff --git a/tex/context/base/syst-xtx.tex b/tex/context/base/syst-xtx.tex index 3c60b7824..3cf5aa29b 100644 --- a/tex/context/base/syst-xtx.tex +++ b/tex/context/base/syst-xtx.tex @@ -39,6 +39,10 @@ \input enco-xtx.tex \fi +\ifx\XeTeXuseglyphmetrics\undefined \else + \XeTeXuseglyphmetrics=1 +\fi + % patch needed for turkish \setcclcuc 201C 201C 201C diff --git a/tex/context/base/x-newmml.tex b/tex/context/base/x-newmml.tex index 690c9ca70..803190ee4 100644 --- a/tex/context/base/x-newmml.tex +++ b/tex/context/base/x-newmml.tex @@ -100,6 +100,16 @@ \def\setupMMLappearance[#1]{\dodoubleargument\getparameters[@@MML#1]} +\def\startusingMMLarguments % optional maken + {\begingroup + %\expandXMLta % expand entities first + \getXMLta} + +\def\stopusingMMLarguments % optional maken + {\endgroup} + +\def\MMLargumentprefix{@@MML\currentXMLelement} + %D We will apply inner math to all bits and pieces made up by an %D \type {apply}. @@ -138,7 +148,7 @@ {\donetrue} {\XMLdoifonstackelse{apply} {\defXMLfirstnamedtext\ascii{apply}% - \startsavingXMLelements % best use a substack so that we donnot need to \edef + \startsavingXMLelements % best use a substack so that we do not need to \edef \ascii \stopsavingXMLelements} {}% @@ -993,35 +1003,41 @@ \defineXMLcommand [rem] {\flushXMLstackwith\plustwo{\getXMLentity{mod}}} -\defineXMLcommand [times] {\directsetup{mmc:times}} - \setupMMLappearance [times] [\c!symbol=\v!no,\c!auto=\v!yes] % new, auto catches cn cn cn +\defineXMLcommand [times] [\MMLargumentprefix] [] {\directsetup{mmc:times}} + \startsetups mmc:times - \setMMLcreset{\MMLcfunctionlist,\MMLcconstructlist}% - \doifelse\@@MMLtimesauto\v!no { - \let\@@MMLtimes@@symbol\@@MMLtimessymbol - } { - \countXMLnamedstack {cn} - \ifnum\scratchcounter>\plusone - \let\@@MMLtimes@@symbol\v!yes - \else - \let\@@MMLtimes@@symbol\@@MMLtimessymbol - \fi - } - \doifelse\@@MMLtimes@@symbol\v!yes { - \flushXMLstackwith\plustwo\times - } { - \doifelse\@@MMLtimes@@symbol{dot} { - \flushXMLstackwith\plustwo\cdot + \startusingMMLarguments + \setMMLcreset{\MMLcfunctionlist,\MMLcconstructlist}% + \doifelse\@@MMLtimesauto\v!no { + \let\@@MMLtimes@@symbol\@@MMLtimessymbol } { - \doifelse\@@MMLtimes@@symbol{times} { - \flushXMLstackwith\plustwo\times + \countXMLnamedstack {cn} + \ifnum\scratchcounter>\plusone + \doifinsetelse\@@MMLtimessymbol{\v!yes,\v!no} { + \let\@@MMLtimes@@symbol\v!yes + } { + \let\@@MMLtimes@@symbol\@@MMLtimessymbol + } + \else + \let\@@MMLtimes@@symbol\@@MMLtimessymbol + \fi + } + \doifelse\@@MMLtimes@@symbol\v!yes { + \flushXMLstackwith\plustwo\times + } { + \doifelse\@@MMLtimes@@symbol{dot} { + \flushXMLstackwith\plustwo\cdot } { - \flushXMLstackwith\plustwo\empty + \doifelse\@@MMLtimes@@symbol{times} { + \flushXMLstackwith\plustwo\times + } { + \flushXMLstackwith\plustwo\empty + } } } - } + \stopusingMMLarguments \stopsetups \defineXMLcommand [root] {\directsetup{mmc:root}} diff --git a/tex/context/base/x-om2cml.xsl b/tex/context/base/x-om2cml.xsl index 60888c10d..4bc181807 100644 --- a/tex/context/base/x-om2cml.xsl +++ b/tex/context/base/x-om2cml.xsl @@ -177,7 +177,29 @@ - + + + + + + + + + times + + + + + + + + + + + + + + diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index 41dd16b5a..b2bc2225e 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 b1d783864..3268f705d 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 7b79bf38f..3bc84189f 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 5fabbce7d..68f74858e 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 a001ef65f..094875084 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 fb4ce4d4d..8341fcf11 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 c4c87b96e..c8e8db8ba 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ - + -- cgit v1.2.3