summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2005-11-16 00:00:00 +0100
committerHans Hagen <pragma@wxs.nl>2005-11-16 00:00:00 +0100
commit8a1e1ae9a3235940054faa37188c17a249d3b79a (patch)
treed44da9f48210ce7293b144a1b5363a9f405dd865 /tex
parent840798e323e582f82ca9fba1294b9ec996d86c0d (diff)
downloadcontext-8a1e1ae9a3235940054faa37188c17a249d3b79a.tar.gz
stable 2005.11.16
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/core-mis.tex2
-rw-r--r--tex/context/base/core-ver.tex37
-rw-r--r--tex/context/base/math-tex.tex2
-rw-r--r--tex/context/base/supp-mat.tex2
-rw-r--r--tex/context/base/supp-vis.tex14
-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-it.xml2
-rw-r--r--tex/context/interface/keys-nl.xml2
-rw-r--r--tex/context/interface/keys-ro.xml2
12 files changed, 28 insertions, 43 deletions
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 45df4fdac..346c8c13e 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{2005.11.15}
+\def\contextversion{2005.11.16}
%D For those who want to use this:
diff --git a/tex/context/base/core-mis.tex b/tex/context/base/core-mis.tex
index acd84554e..998c7eae6 100644
--- a/tex/context/base/core-mis.tex
+++ b/tex/context/base/core-mis.tex
@@ -1936,7 +1936,7 @@
\let\next\vbox
\ExpandFirstAfter\processallactionsinset
[\combinationparameter\c!location]
- [ \v!top=>\let\next\depthonlybox, % \tbox,
+ [ \v!top=>\let\next\depthonlybox, % \tbox,
\v!middle=>\let\next\halfwaybox]%
\next{\copy0}%
% we need to save the caption for a next alignment line
diff --git a/tex/context/base/core-ver.tex b/tex/context/base/core-ver.tex
index 6c734cbb1..acb9ab40c 100644
--- a/tex/context/base/core-ver.tex
+++ b/tex/context/base/core-ver.tex
@@ -328,35 +328,12 @@
\ifx\scantokens\undefined\ascii\else\everyeof{\hskip-\spaceskip}\scantokens\expandafter{\ascii}\fi
\egroup}
-% bugged
-%
-% \bgroup
-% \catcode`\[=\@@begingroup
-% \catcode`\]=\@@endgroup
-% \catcode`\{=\@@active
-% \catcode`\}=\@@active
-% \gdef\initializetypegrouping%
-% [\catcode`\{=\@@active
-% \catcode`\}=\@@endgroup % otherwise things go wrong ...
-% \def\activerightargument%
-% [\rightargument
-% \egroup]%
-% \def\activeleftargument%
-% [\bgroup
-% \leftargument %% this way TeXEdit can check: {
-% \catcode`\}=\@@active % ... in alignments (tables)
-% \let}=\activerightargument]%
-% \let{=\activeleftargument]% %% this way TeXEdit can check: }
-% \egroup
-%
-% ok:
-
\bgroup
\catcode`\[=\@@begingroup
\catcode`\]=\@@endgroup
\catcode`\{=\@@active
\catcode`\}=\@@active
-\gdef\initializetypegrouping%
+\gdef\initializetypegrouping
[\ifnum\catcode`\{=\@@active
\let\normalactivebgroup{%
\let\normalactiveegroup}%
@@ -366,17 +343,17 @@
\let\normalactivebgroup\leftargument
\let\normalactiveegroup\rightargument
\fi
- \def\activeleftargument%
+ \def\activeleftargument
[\bgroup
+ \catcode`\}=\@@active
\let}\activerightargument
- \normalactivebgroup
- ]%
- \def\activerightargument%
+ \normalactivebgroup]%
+ \def\activerightargument
[\normalactiveegroup
\egroup]%
\let{=\activeleftargument
- \let}=\egroup
- ]
+ % not \let}=\egroup, otherwise things go wrong in alignments (???)
+ \catcode`\}=\@@endgroup]
\egroup
\bgroup
diff --git a/tex/context/base/math-tex.tex b/tex/context/base/math-tex.tex
index 8b547d000..d2516bc62 100644
--- a/tex/context/base/math-tex.tex
+++ b/tex/context/base/math-tex.tex
@@ -466,7 +466,7 @@
\def\notsosqrt[#1]{\root#1\of}
-\def\sqrt{\doifnextcharelse[\notsosqrt\normalsqrt}
+\unexpanded\def\sqrt{\doifnextcharelse[\notsosqrt\normalsqrt}
\def\PLAINbig {\@@dobig{0.85}}
\def\PLAINBig {\@@dobig{1.15}}
diff --git a/tex/context/base/supp-mat.tex b/tex/context/base/supp-mat.tex
index 15ae7fdd8..54ff34f01 100644
--- a/tex/context/base/supp-mat.tex
+++ b/tex/context/base/supp-mat.tex
@@ -46,6 +46,8 @@
%D Which is implemented as:
\def\mathematics#1{\relax\ifmmode#1\else$#1$\fi} % lookahead bug reported by brooks
+\def\displaymath#1{\relax\ifmmode#1\else$$#1$$\fi}
+\def\inlinemath #1{\relax\ifmmode#1\else$#1$\fi}
\def\startmathmode
{\ifmmode
diff --git a/tex/context/base/supp-vis.tex b/tex/context/base/supp-vis.tex
index 384bcd440..95cee5176 100644
--- a/tex/context/base/supp-vis.tex
+++ b/tex/context/base/supp-vis.tex
@@ -1742,8 +1742,11 @@
%D For those who want to manipulate the visual cues in detail,
%D we have grouped them.
+\newif\ifshowingcomposition % see later why we need this
+
\def\showfils
- {\let\hss \ruledhss
+ {\showingcompositiontrue
+ \let\hss \ruledhss
\let\hfil \ruledhfil
\let\hfill \ruledhfill
\let\hfilneg \ruledhfilneg
@@ -1767,7 +1770,8 @@
\let\vfillneg \normalvfillneg}
\def\showboxes
- {\baselineruletrue
+ {\showingcompositiontrue
+ \baselineruletrue
\let\hbox \ruledhbox
\let\vbox \ruledvbox
\let\vtop \ruledvtop
@@ -1780,7 +1784,8 @@
\let\vcenter \normalvcenter}
\def\showskips
- {\let\hskip \ruledhskip
+ {\showingcompositiontrue
+ \let\hskip \ruledhskip
\let\vskip \ruledvskip
\let\kern \ruledkern
\let\mskip \ruledmskip
@@ -1798,7 +1803,8 @@
\let\vglue \normalvglue}
\def\showpenalties
- {\let\penalty \ruledpenalty}
+ {\showingcompositiontrue
+ \let\penalty \ruledpenalty}
\def\dontshowpenalties
{\let\penalty \normalpenalty}
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index 12d7ebd82..3e86fa600 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="2005.11.15">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2005.11.16">
<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 a3833ce00..e81dc46f4 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="2005.11.15">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2005.11.16">
<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 9dcfe5b04..2965e0ef7 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="2005.11.15">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2005.11.16">
<cd:variables>
<cd:variable name="one" value="one"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index 5c0fd2204..d89fec084 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="2005.11.15">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2005.11.16">
<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 5c32973b1..6350dc92d 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="2005.11.15">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2005.11.16">
<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 d92729fab..11482fae3 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="2005.11.15">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2005.11.16">
<cd:variables>
<cd:variable name="one" value="unu"/>