summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/core-fnt.tex4
-rw-r--r--tex/context/base/core-reg.tex8
-rw-r--r--tex/context/base/core-ver.tex2
-rw-r--r--tex/context/base/enco-ini.tex2
-rw-r--r--tex/context/base/font-ini.tex26
-rw-r--r--tex/context/base/lang-dis.tex4
-rw-r--r--tex/context/base/spec-tr.tex6
-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
14 files changed, 35 insertions, 31 deletions
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 8bc75f1ae..05b9cf46a 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.06.03}
+\def\contextversion{2005.06.07}
%D Welcome to the main module. When this module is ran through
%D \type{initex} or \type {tex -i} or \type {whatevertex} using
diff --git a/tex/context/base/core-fnt.tex b/tex/context/base/core-fnt.tex
index befb41369..7d0fe57a5 100644
--- a/tex/context/base/core-fnt.tex
+++ b/tex/context/base/core-fnt.tex
@@ -167,10 +167,10 @@
\doifelse\@@kktitle\v!yes
{\definealternativestyle[\v!capital][\normalsmallcapped][\normalsmallcapped]%
\definealternativestyle[\v!smallcaps][\sc][\sc]%
- \let\smallcapped\normalsmallcapped}
+ \unexpanded\def\smallcapped{\normalsmallcapped}}
{\definealternativestyle[\v!capital][\normalsmallcapped][\uppercased]%
\definealternativestyle[\v!smallcaps][\sc][\uppercased]%
- \def\smallcapped{\doconvertfont\v!capital}}%
+ \unexpanded\def\smallcapped{\doconvertfont\v!capital}}%
\doifelse\@@kksc\v!yes
\userealcaps
\usepseudocaps}
diff --git a/tex/context/base/core-reg.tex b/tex/context/base/core-reg.tex
index 3ac39782c..4341a85c7 100644
--- a/tex/context/base/core-reg.tex
+++ b/tex/context/base/core-reg.tex
@@ -86,10 +86,10 @@
\ifduplicate\getlastregisterentry{#3}\fi
\convertexpanded{\registerparameter\c!keyexpansion}{#1}\asciiregisterentryA
\convertexpanded{\registerparameter\c!expansion }{#3}\asciiregisterentryB
-\doifsomething{\registerparameter\c!keyexpansion}
- {\ifx\asciiregisterentryA\empty
- \convertexpanded{\registerparameter\c!keyexpansion}{#3}\asciiregisterentryA
- \fi}%
+ \doifsomething{\registerparameter\c!keyexpansion}
+ {\ifx\asciiregisterentryA\empty
+ \convertexpanded{\registerparameter\c!keyexpansion}{#3}\asciiregisterentryA
+ \fi}%
\makesectionformat
\doifelse{\registerparameter\c!ownnumber}\v!yes
\donetrue\donefalse
diff --git a/tex/context/base/core-ver.tex b/tex/context/base/core-ver.tex
index df4baf807..4add36b8d 100644
--- a/tex/context/base/core-ver.tex
+++ b/tex/context/base/core-ver.tex
@@ -152,7 +152,7 @@
{\doifvalue{#1\c!tab}\s!ascii
{\chardef\tabskipmode\plustwo % quit on >127
\def\obeytabs{\settabskips}}%
- {}}
+ {}}%
%
\ignorehyphens % default
\ExpandFirstAfter\processaction
diff --git a/tex/context/base/enco-ini.tex b/tex/context/base/enco-ini.tex
index e8b79143c..6e7ae5120 100644
--- a/tex/context/base/enco-ini.tex
+++ b/tex/context/base/enco-ini.tex
@@ -822,7 +822,7 @@
{\let\doautosetregime\gobbletwoarguments}
{\def\characterregime{@#2@}}}
-\def\stopencoding%
+\def\stopencoding
{\popmacro\doautosetregime
\popmacro\definesortkey
\popmacro\dohandlecommand % still needed?
diff --git a/tex/context/base/font-ini.tex b/tex/context/base/font-ini.tex
index 88b6b5939..f459b99c0 100644
--- a/tex/context/base/font-ini.tex
+++ b/tex/context/base/font-ini.tex
@@ -4510,25 +4510,25 @@
\definefontsize[\c!a] \definefontsize[\c!b]
\definefontsize[\c!c] \definefontsize[\c!d]
-\definealternativestyle [\v!mediaeval] [\os] []
-\definealternativestyle [\v!normal] [\tf] []
-\definealternativestyle [\v!bold] [\bf] []
-\definealternativestyle [\v!type] [\tt] []
-\definealternativestyle [\v!slanted] [\sl] []
-\definealternativestyle [\v!italic] [\it] []
+\definealternativestyle [\v!mediaeval] [\os] []
+\definealternativestyle [\v!normal] [\tf] []
+\definealternativestyle [\v!bold] [\bf] []
+\definealternativestyle [\v!type] [\tt] []
+\definealternativestyle [\v!slanted] [\sl] []
+\definealternativestyle [\v!italic] [\it] []
\definealternativestyle [\v!boldslanted,\v!slantedbold] [\bs] []
-\definealternativestyle [\v!bolditalic,\v!italicbold] [\bi] []
-\definealternativestyle [\v!small,\v!smallnormal] [\tfx] []
-\definealternativestyle [\v!smallbold] [\bfx] []
-\definealternativestyle [\v!smalltype] [\ttx] []
-\definealternativestyle [\v!smallslanted] [\slx] []
+\definealternativestyle [\v!bolditalic,\v!italicbold] [\bi] []
+\definealternativestyle [\v!small,\v!smallnormal] [\tfx] []
+\definealternativestyle [\v!smallbold] [\bfx] []
+\definealternativestyle [\v!smalltype] [\ttx] []
+\definealternativestyle [\v!smallslanted] [\slx] []
\definealternativestyle [\v!smallboldslanted,\v!smallslantedbold] [\bsx] []
-\definealternativestyle [\v!smallbolditalic,\v!smallitalicbold] [\bix] []
+\definealternativestyle [\v!smallbolditalic,\v!smallitalicbold] [\bix] []
%D Slow but handy:
\definealternativestyle [\v!smallbodyfont] [\setsmallbodyfont] []
-\definealternativestyle [\v!bigbodyfont] [\setbigbodyfont] []
+\definealternativestyle [\v!bigbodyfont] [\setbigbodyfont] []
%D We treat {\sc Small Caps} and \cap {Pseudo Caps} a bit
%D different. We also provide an \WORD {uppercase} style.
diff --git a/tex/context/base/lang-dis.tex b/tex/context/base/lang-dis.tex
index 43a8e015f..58b95f681 100644
--- a/tex/context/base/lang-dis.tex
+++ b/tex/context/base/lang-dis.tex
@@ -45,8 +45,8 @@
\definefilefallback [lang-sv.pat] [svhyph.tex,sehyph.tex]
\definefilefallback [lang-tr.pat] [tkhyph.tex,trhyph.tex]
\definefilefallback [lang-ua.pat] [ukrenhyp.tex]
-\definefilefallback [lang-uk.pat] [ukhyph.tex,ukhyphmax.tex,ukhyph1.tex,ukhyph2.tex,hyphen.tex]
-\definefilefallback [lang-us.pat] [ushyph.tex,ushyphmax.tex,ushyph1.tex,ushyph2.tex,hyphen.tex]
+\definefilefallback [lang-uk.pat] [ukhyphen.tex,ukhyph.tex]
+\definefilefallback [lang-us.pat] [ushyphmax.tex,ushyph.tex,ushyph1.tex,ushyph2.tex,hyphen.tex]
\definefilefallback [lang-nl.pat] [nehyph96.tex,dutch96.pat,nehyph.tex]
\definefilefallback [lang-cz.pat] [czhyphen.tex,czhyph.pat]
\definefilefallback [lang-sk.pat] [skhyphen.tex,skhyph.pat]
diff --git a/tex/context/base/spec-tr.tex b/tex/context/base/spec-tr.tex
index 34e5ac257..2631f399e 100644
--- a/tex/context/base/spec-tr.tex
+++ b/tex/context/base/spec-tr.tex
@@ -107,7 +107,11 @@
%D Relatively new:
\definespecial\dosetuppaper#1#2#3%
- {\special{papersize=#2,#3}}
+ {\begingroup
+ \!!dimena#2%
+ \!!dimenb#3%
+ \special{papersize=\the\!!dimena,\the\!!dimenb}%
+ \endgroup}
\stopspecials
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index cab46b7c0..6284f36ff 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.06.03">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2005.06.07">
<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 3f8fa46c4..ca03949b4 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.06.03">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2005.06.07">
<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 16791d296..7a65adf12 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.06.03">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2005.06.07">
<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 393e87259..9fd7a06be 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.06.03">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2005.06.07">
<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 ef03ee44f..c6ea1b19c 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.06.03">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2005.06.07">
<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 212dde427..bd0c5e0dc 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.06.03">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2005.06.07">
<cd:variables>
<cd:variable name="one" value="unu"/>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 02:49:48 +0000