summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2006-11-27 11:04:00 +0100
committerHans Hagen <pragma@wxs.nl>2006-11-27 11:04:00 +0100
commita59c89b31ff0895ffa7f5b5f8784cc38449ca1a5 (patch)
tree07a92813397fc312f104eefd9a02b15b0ca2c3cb
parentbfb9867b1e778691f01de03b5b55fcb1598f314c (diff)
downloadcontext-a59c89b31ff0895ffa7f5b5f8784cc38449ca1a5.tar.gz
stable 2006.11.27 11:04
-rw-r--r--tex/context/base/cont-new.tex2
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/core-itm.tex7
-rw-r--r--tex/context/base/core-var.tex13
-rw-r--r--tex/context/base/core-vis.tex71
-rw-r--r--tex/context/base/enco-ans.tex1
-rw-r--r--tex/context/base/meta-ini.tex5
-rw-r--r--tex/context/base/syst-xtx.tex4
-rw-r--r--tex/context/base/x-newmml.tex62
-rw-r--r--tex/context/base/x-om2cml.xsl24
-rw-r--r--tex/context/interface/keys-cz.xml2
-rw-r--r--tex/context/interface/keys-de.xml2
-rw-r--r--tex/context/interface/keys-en.xml2
-rw-r--r--tex/context/interface/keys-fr.xml2
-rw-r--r--tex/context/interface/keys-it.xml2
-rw-r--r--tex/context/interface/keys-nl.xml2
-rw-r--r--tex/context/interface/keys-ro.xml2
-rw-r--r--web2c/context.cnf5
18 files changed, 102 insertions, 108 deletions
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
@@ -761,6 +761,11 @@
\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 @@
<!-- Trivial Cases: abs, divide, gcd, lcm, minus, plus -->
<xsl:template match="om:OMS[@cd='arith1']">
- <xsl:element name="{@name}"/>
+ <xsl:element name="{@name}">
+ <xsl:choose>
+ <xsl:when test="@name='times'">
+ <xsl:choose>
+ <xsl:when test="../@style='empty'">
+ <xsl:attribute name='symbol'></xsl:attribute>
+ </xsl:when>
+ <xsl:when test="../@style='cross'">
+ <xsl:attribute name='symbol'>times</xsl:attribute>
+ </xsl:when>
+ <xsl:when test="../@style=''">
+ <!-- inherit from parent times -->
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name='symbol'><xsl:value-of select="../@style"/></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- forget about it -->
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:element>
</xsl:template>
<!-- unary_minus -->
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 @@
<?xml version="1.0"?>
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.11.23 14:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.11.27 11:04">
<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 b1d783864..3268f705d 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.11.23 14:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.11.27 11:04">
<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 7b79bf38f..3bc84189f 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.11.23 14:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.11.27 11:04">
<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 5fabbce7d..68f74858e 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.11.23 14:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.11.27 11:04">
<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 a001ef65f..094875084 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.11.23 14:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.11.27 11:04">
<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 fb4ce4d4d..8341fcf11 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.11.23 14:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.11.27 11:04">
<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 c4c87b96e..c8e8db8ba 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.11.23 14:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.11.27 11:04">
<cd:variables>
<cd:variable name="one" value="unu"/>
diff --git a/web2c/context.cnf b/web2c/context.cnf
index 0d273a754..6abc73960 100644
--- a/web2c/context.cnf
+++ b/web2c/context.cnf
@@ -216,3 +216,8 @@ ocp_buf_size = 500000
ocp_stack_size = 10000
ocp_list_size = 1000
+% Just for xetex:
+
+FONTCONFIG_FILE = fonts.conf
+FONTCONFIG_PATH = $TEXMFLOCAL/fonts/conf
+FC_CACHEDIR = $TMP/fonts/cache