summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scripts/context/perl/texfont.pl2
-rw-r--r--scripts/context/ruby/pdftools.rb1
-rw-r--r--scripts/context/ruby/xmltools.rb50
-rw-r--r--tex/context/base/cont-new.tex12
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/core-ctx.tex7
-rw-r--r--tex/context/base/core-itm.tex114
-rw-r--r--tex/context/base/core-mat.tex1
-rw-r--r--tex/context/base/math-pln.tex34
-rw-r--r--tex/context/base/regi-8859-1.tex9
-rw-r--r--tex/context/base/regi-8859-10.tex6
-rw-r--r--tex/context/base/regi-8859-13.tex7
-rw-r--r--tex/context/base/regi-8859-15.tex15
-rw-r--r--tex/context/base/regi-8859-16.tex9
-rw-r--r--tex/context/base/regi-8859-2.tex13
-rw-r--r--tex/context/base/regi-8859-3.tex13
-rw-r--r--tex/context/base/regi-8859-4.tex13
-rw-r--r--tex/context/base/regi-8859-5.tex7
-rw-r--r--tex/context/base/regi-8859-7.tex8
-rw-r--r--tex/context/base/regi-8859-9.tex9
-rw-r--r--tex/context/base/regi-syn.tex11
-rw-r--r--tex/context/base/rlxtools.rlx33
-rw-r--r--tex/context/base/syst-cat.tex5
-rw-r--r--tex/context/base/syst-pln.tex3
-rw-r--r--tex/context/base/xtag-ini.tex6
-rw-r--r--tex/context/interface/cont-cz.xml3
-rw-r--r--tex/context/interface/cont-de.xml3
-rw-r--r--tex/context/interface/cont-en.xml3
-rw-r--r--tex/context/interface/cont-fr.xml3
-rw-r--r--tex/context/interface/cont-it.xml3
-rw-r--r--tex/context/interface/cont-nl.xml3
-rw-r--r--tex/context/interface/cont-ro.xml3
-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
39 files changed, 311 insertions, 114 deletions
diff --git a/scripts/context/perl/texfont.pl b/scripts/context/perl/texfont.pl
index e6ebf7029..5b3c1f1d7 100644
--- a/scripts/context/perl/texfont.pl
+++ b/scripts/context/perl/texfont.pl
@@ -562,7 +562,7 @@ if ($sourcepath eq "auto") # todo uppercase root
{ report ("removing : $nam") ;
unlink "$nam" }
my $mapfile = "$encoding$varlabel-$vendor-$collection" ;
- foreach my $map ("pdftex","dvips", "dvipdfm")
+ foreach my $map ("pdftex","dvips", "dvipdfm")
{ my $maproot = "$fontroot/fonts/map/$map/context/";
if (-e "$maproot$mapfile.map")
{ report ("renaming : $mapfile.map -> $mapfile.bak") ;
diff --git a/scripts/context/ruby/pdftools.rb b/scripts/context/ruby/pdftools.rb
index cfcc39631..6dfa47374 100644
--- a/scripts/context/ruby/pdftools.rb
+++ b/scripts/context/ruby/pdftools.rb
@@ -755,6 +755,7 @@ class Commands
end
end
end
+ report("")
report("#{n.to_s.rjust(4)} pages in total")
end
diff --git a/scripts/context/ruby/xmltools.rb b/scripts/context/ruby/xmltools.rb
index fe4fbde22..c3e76b23a 100644
--- a/scripts/context/ruby/xmltools.rb
+++ b/scripts/context/ruby/xmltools.rb
@@ -15,7 +15,7 @@
# This script will harbor some handy manipulations on tex
# related files.
-banner = ['XMLTools', 'version 1.2.0', '2002/2006', 'PRAGMA ADE/POD']
+banner = ['XMLTools', 'version 1.2.1', '2002/2006', 'PRAGMA ADE/POD']
$: << File.expand_path(File.dirname($0)) ; $: << File.join($:.last,'lib') ; $:.uniq!
@@ -400,6 +400,51 @@ class Commands
end
end
+ def enhance
+ oldname = @commandline.argument('first')
+ newname = @commandline.argument('second')
+ verbose = @commandline.option('verbose')
+ if ! newname || newname.empty? then
+ newname = oldname + ".prep"
+ end
+ if FileTest.file?(oldname) then
+ report("") if verbose
+ data = IO.read(oldname)
+ elements = Array.new
+ preamble = ""
+ done = false
+ data.sub!(/^(.*?)\s*(<[a-z])/mois) do
+ preamble = $1
+ $2
+ end
+ data.gsub!(/<(.*?)>/mois) do
+ elements << $1
+ "<#{elements.length}>"
+ end
+ data.gsub!(/([a-z]{3,})([\/\-])([a-z]{3,})/mois) do
+ done = true
+ report("compound: #{$1}#{$2}#{$3}") if verbose
+ "#{$1}<compound token='#{$2}'/>#{$3}"
+ end
+ data.gsub!(/<(\d+)>/mois) do
+ "<#{elements.shift}>"
+ end
+ File.open(newname,'wb') do |f|
+ f << preamble
+ f << "\n"
+ f << data
+ end
+ if verbose then
+ if done then
+ report("")
+ report(oldname," converted to ",newname)
+ else
+ report(oldname," copied to ",newname)
+ end
+ end
+ end
+ end
+
def cleanup # todo, share loading/saving with previous
file = @commandline.argument('first')
@@ -508,6 +553,7 @@ commandline.registeraction('dir', 'generate directory listing')
commandline.registeraction('mmlpages','generate graphic from mathml')
commandline.registeraction('analyze', 'report entities and elements [--utf --process]')
commandline.registeraction('cleanup', 'cleanup xml file [--force]')
+commandline.registeraction('enhance', 'enhance xml file')
# commandline.registeraction('dir', 'filename --pattern= --output= [--recurse --stripname --longname --url --root]')
# commandline.registeraction('mmlpages','filename [--eps --jpg --png --style= --mode=]')
@@ -520,6 +566,7 @@ commandline.registeraction('version')
commandline.registerflag('stripname')
commandline.registerflag('longname')
commandline.registerflag('recurse')
+commandline.registerflag('verbose')
commandline.registervalue('pattern')
commandline.registervalue('url')
@@ -533,7 +580,6 @@ commandline.registerflag('utf')
commandline.registerflag('process')
commandline.registervalue('style')
commandline.registervalue('modes')
-commandline.registervalue('verbose')
commandline.expand
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 0c82a1721..48a96415a 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.12.12 23:46}
+\newcontextversion{2006.12.17 17:41}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
@@ -29,6 +29,16 @@
\let\then\relax % \ifnum1>2\then -)
+\def\defXMLexpanded#1#2%
+ {\begingroup
+ \let\getXMLentity\expandedXMLentity
+ \expanded{\endgroup\edef\noexpand#1{#2}}}
+
+\def\gdefXMLexpanded#1#2%
+ {\begingroup
+ \let\getXMLentity\expandedXMLentity
+ \expanded{\endgroup\xdef\noexpand#1{#2}}}
+
\def\dividedsize#1#2#3% size gap n
{\dimexpr
\ifnum\dimexpr#1\relax>\plusone
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 8ef29ce3b..46b2af47c 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.12.12 23:46}
+\edef\contextversion{2006.12.17 17:41}
%D For those who want to use this:
diff --git a/tex/context/base/core-ctx.tex b/tex/context/base/core-ctx.tex
index ba47f07fd..88659122f 100644
--- a/tex/context/base/core-ctx.tex
+++ b/tex/context/base/core-ctx.tex
@@ -24,7 +24,9 @@
\def \preprocesssuffix {.prep}
\def\loadctxpreplist
- {\ifcase\preprocessmethod
+ {\begingroup
+ \chardef\XMLtokensreduction\plusone
+ \ifcase\preprocessmethod
% no checking
\or
% simple checking
@@ -42,7 +44,8 @@
\egroup}%
{\global\chardef\preprocessmode\plusone}%
\fi
- \global\let\loadctxpreplist\relax}
+ \global\let\loadctxpreplist\relax
+ \endgroup}
\appendtoks\loadctxpreplist\to\everystarttext % will become: \prependtoks\loadctxpreplist\to\everyjob
diff --git a/tex/context/base/core-itm.tex b/tex/context/base/core-itm.tex
index 9f132a96a..9642b0f94 100644
--- a/tex/context/base/core-itm.tex
+++ b/tex/context/base/core-itm.tex
@@ -65,6 +65,10 @@
\newconditional\paragraphlistitem \setfalse\paragraphlistitem
\newconditional\textlistitem \setfalse\textlistitem
\newconditional\firstlistitem \setfalse\firstlistitem
+\newconditional\beforelistitem \setfalse\beforelistitem
+\newconditional\afterlistitem \setfalse\afterlistitem
+\newconditional\nowhitelistitem \setfalse\nowhitelistitem
+\newconditional\joinedlistitem \setfalse\joinedwhitelistitem
\newcounter\noflists
\newcounter\itemlevel
@@ -178,9 +182,12 @@
#2*\v!broad*=>\setitemparameter{#1}\c!factor{#2},
\v!text*=>\settrue\textlistitem
\settrue\inlinelistitem
- \dosetuppackeditemgroup{#1}%
+ \settrue\joinedlistitem % \dosetuppackeditemgroup{#1}%
\packitems,
\v!columns*=>\packitems,
+ \v!before*=>\settrue\beforelistitem,
+ \v!after*=>\settrue\afterlistitem,
+ \v!nowhite*=>\settrue\nowhitelistitem, % \def\packeditemspacing{\nowhitespace},
\v!margin*=>\setitemparameter{#1}\c!width{-2em}, % signal
\v!inmargin*=>\setitemparameter{#1}\c!width{-2em}, % signal
\v!atmargin*=>\doifnot{#1}{1}{\setitemparameter{#1}\c!width{0em}}, % signal
@@ -188,7 +195,7 @@
\v!loose*=>\setfalse\optimizelistitem,
\v!paragraph*=>\settrue\paragraphlistitem
\packitems,
- \v!joinedup*=>\dosetuppackeditemgroup{#1}%
+ \v!joinedup*=>\settrue\joinedlistitem % \dosetuppackeditemgroup{#1}%
\packitems,
\v!serried*=>\setitemparameter{#1}\c!factor{-1},
#2#3*\v!serried*=>\setitemparameter{#1}\c!factor{-#2#3},
@@ -211,12 +218,75 @@
\c!after=\blank,
\c!inner=]}
-\def\dosetuppackeditemgroup#1%
- {\letitemparameter{#1}\c!beforehead\empty
- \letitemparameter{#1}\c!afterhead \empty
- \letitemparameter{#1}\c!before \empty
- \letitemparameter{#1}\c!after \empty
- \letitemparameter{#1}\c!inbetween \empty}
+% \def\packeditemspacing{\empty}
+
+% \setupwhitespace[big]
+% \starttext
+% test \startitemize[joinedup] \item test \item test \stopitemize test \par
+% test \startitemize[joinedup,nowhite] \item test \item test \stopitemize test \par
+% test \startitemize[joinedup,nowhite,before] \item test \item test \stopitemize test \par
+% test \startitemize[joinedup,nowhite,after] \item test \item test \stopitemize test \par
+% \stoptext
+
+\def\itembeforecommand
+ {\ifconditional\nowhitelistitem
+ \ifconditional\beforelistitem
+ \ifcase\itemlevel\or\getitemparameter\itemlevel\c!before\fi
+ \else
+ \nowhitespace
+ \fi
+ \else\ifconditional\joinedlistitem
+ % \empty
+ \else
+ \getitemparameter\itemlevel\c!before
+ \fi\fi}
+
+\def\itemaftercommand
+ {\ifconditional\nowhitelistitem
+ \ifconditional\afterlistitem
+ \ifcase\itemlevel\or\getitemparameter\itemlevel\c!after\fi
+ \else
+ \nowhitespace
+ \fi
+ \else\ifconditional\joinedlistitem
+ % \empty
+ \else
+ \getitemparameter\itemlevel\c!after
+ \fi\fi}
+
+\def\iteminbetweencommand
+ {\ifconditional\nowhitelistitem
+ \nowhitespace
+ \else\ifconditional\joinedlistitem
+ % \empty
+ \else
+ \getitemparameter\itemlevel\c!inbetween
+ \fi\fi}
+
+\def\itembeforeheadcommand
+ {\ifconditional\nowhitelistitem
+ \nowhitespace
+ \else\ifconditional\joinedlistitem
+ % \empty
+ \else
+ \getitemparameter\itemlevel\c!beforehead
+ \fi\fi}
+
+\def\itemafterheadcommand
+ {\ifconditional\nowhitelistitem
+ \nowhitespace
+ \else\ifconditional\joinedlistitem
+ % \empty
+ \else
+ \getitemparameter\itemlevel\c!afterhead
+ \fi\fi}
+
+% \def\dosetuppackeditemgroup#1%
+% {\setitemparameter{#1}\c!beforehead{\packeditemspacing}%
+% \setitemparameter{#1}\c!afterhead {\packeditemspacing}%
+% \setitemparameter{#1}\c!before {\packeditemspacing}%
+% \setitemparameter{#1}\c!after {\packeditemspacing}%
+% \setitemparameter{#1}\c!inbetween {\packeditemspacing}}
\def\dosetupitemgroupconstant[#1][#2]%
{\def\dodosetupitemgroupconstant##1% catches empty in [a,b,] handy for xml
@@ -501,7 +571,7 @@
\doifinset\v!columns{#1}%
{\ifinsidecolumns\else\ifnum\itemcolumndepth=\zerocount
\globallet\itemcolumndepth\itemlevel
- \getitemparameter\itemlevel\c!before
+ \itembeforecommand
\processfirstactioninset
[#1]
[ \v!one=>\!!counta1\relax,
@@ -551,20 +621,20 @@
\ifnum\itemcolumndepth=\itemlevel\relax
\stopcolumns
\doglobal\newcounter\itemcolumndepth
- \getitemparameter\itemlevel\c!after
+ \itemaftercommand
\dontrechecknextindentation
\else
\ifnum\itemlevel=\plusone
\doitembreak\allowbreak % toegevoegd
- \getitemparameter1\c!after
+ \itemaftercommand % \getitemparameter\itemlevel\c!after
% was: \dochecknextindentation\??oo, is now:
\dochecknextindentation{\??op\currentitemgroup\itemlevel}%
\else
% nieuw, not yet nobreak handling
\ifcase\autoitemgroupspacing
- \getitemparameter\itemlevel\c!after
+ \itemaftercommand
\or
- \getitemparameter\itemlevel\c!after
+ \itemaftercommand
\fi
\dontrechecknextindentation
\fi
@@ -863,7 +933,7 @@
\or % 1
\ifnum\itemcolumndepth=0\relax
\ifconditional\introlistitem\doitembreak\nobreak\fi
- \getitemparameter1\c!before
+ \itembeforecommand % \getitemparameter\itemlevel\c!before
\ifconditional\introlistitem\doitembreak\nobreak\fi
\fi
\else % 2 en hoger
@@ -871,10 +941,10 @@
\let\previtemlevel\itemlevel
\decrement\previtemlevel
\ifcase\autoitemgroupspacing\relax % nieuw
- \getitemparameter\itemlevel\c!before
+ \itembeforecommand
\or
- \doifelsenothing{\getitemparameter\itemlevel\c!before}
- {\getitemparameter\itemlevel\c!before}
+ \doifelsenothing{\itembeforecommand}
+ {\itembeforecommand}
{\getitemparameter\previtemlevel\c!inbetween}%
\else
\getitemparameter\previtemlevel\c!inbetween % == itemlevel-1
@@ -886,7 +956,7 @@
% \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
- \getitemparameter\itemlevel\c!inbetween
+ \iteminbetweencommand
\fi
\fi
\ifconditional\concatnextitem % new, concat
@@ -946,7 +1016,7 @@
% \def\complexdoitemgrouphead[#1]#2\par% % beter in \complexdosom hangen met een if
% {\ifconditional\firstlistitem\else\doitembreak\allowbreak\fi
-% \ifconditional\packlistitem\else\getitemparameter\itemlevel\c!beforehead\fi
+% \ifconditional\packlistitem\else\itembeforeheadcommand\fi
% \ifconditional\firstlistitem\ifconditional\introlistitem\else\ifcase\itemlevel % incr in \complexdosom
% \doitembreak\allowbreak
% \fi\fi\fi
@@ -958,7 +1028,7 @@
% \par
% \fi
% \doitembreak\nobreak
-% \ifconditional\packlistitem\else\getitemparameter\itemlevel\c!afterhead\fi
+% \ifconditional\packlistitem\else\itemafterheadcommand\fi
% \doitembreak\nobreak
% \noindentation}
%
@@ -969,7 +1039,7 @@
\def\complexdoitemgrouphead[#1]% beter in \complexdosom hangen met een if
{\ifconditional\firstlistitem\else\doitembreak\allowbreak\fi
- \ifconditional\packlistitem\else\getitemparameter\itemlevel\c!beforehead\fi
+ \ifconditional\packlistitem\else\itembeforeheadcommand\fi
\ifconditional\firstlistitem\ifconditional\introlistitem\else\ifcase\itemlevel % incr in \complexdosom
\doitembreak\allowbreak
\fi\fi\fi
@@ -989,7 +1059,7 @@
\par
\fi
\doitembreak\nobreak
- \ifconditional\packlistitem\else\getitemparameter\itemlevel\c!afterhead\fi
+ \ifconditional\packlistitem\else\itemafterheadcommand\fi
\doitembreak\nobreak
\noindentation}
diff --git a/tex/context/base/core-mat.tex b/tex/context/base/core-mat.tex
index 0a75bfcf6..d6e1153f7 100644
--- a/tex/context/base/core-mat.tex
+++ b/tex/context/base/core-mat.tex
@@ -1141,6 +1141,7 @@
\catcode`\_=\@@active
\def_{\ifmmode\expandafter\suber\else\expandafter\normalsuber\fi}}
\egroup
+
%D \macros
%D {enableautomath}
%D
diff --git a/tex/context/base/math-pln.tex b/tex/context/base/math-pln.tex
index 386b67d9b..5ea7bc6fe 100644
--- a/tex/context/base/math-pln.tex
+++ b/tex/context/base/math-pln.tex
@@ -103,7 +103,9 @@
\def\!{\mskip-\thinmuskip}
\def\*{\discretionary{\thinspace\the\textfont2\char2}{}{}}
-{\catcode`\'=\active \gdef'{^\bgroup\prim@s}}
+% {\catcode`\'=\active \gdef'{^\bgroup\prim@s}}
+
+\def\activemathquote{^\bgroup\prim@s}
\def\prim@s
{\prime\futurelet\next\pr@m@s}
@@ -135,7 +137,9 @@
\def\pr@@@t#1#2%
{#2\egroup}
-{\catcode`\_=\active \global\let_=\_} % _ in math is either subscript or \_
+% {\catcode`\_=\active \global\let_=\_} % _ in math is either subscript or \_
+
+\let\activemathunderscore\_
\def\relbar {\mathrel{\smash-}} % - has the same height as +
\def\Relbar {\mathrel=}
@@ -354,4 +358,30 @@
&\kern-\displaywidth\rlap{$\@lign##$}\tabskip\displaywidth\crcr
#1\crcr}}
+% temporary here
+
+% \startcatcodetable \mthcatcodes
+% \setcatcodetable\ctxcatcodes
+% \catcode`\_ = 13
+% \catcode`\' = 13
+% \stopcatcodetable
+%
+% \letcatcodecommand \mthcatcodes `\_ \activemathunderscore
+% \letcatcodecommand \mthcatcodes `\' \activemathquote
+%
+% \appendtoks \setcatcodetable\mthcatcodes \to \everymath
+
+% tricky, but some day we will reimplement math
+
+\bgroup
+ \catcode`\_ = 13
+ \catcode`\' = 13
+ \doglobal\appendtoks
+ \let_\activemathunderscore
+ \let'\activemathquote
+ \to \everymath
+\egroup
+
+% so far
+
\protect \endinput
diff --git a/tex/context/base/regi-8859-1.tex b/tex/context/base/regi-8859-1.tex
index 268d41b68..6f5152518 100644
--- a/tex/context/base/regi-8859-1.tex
+++ b/tex/context/base/regi-8859-1.tex
@@ -16,13 +16,10 @@
%D
%D (Contributors to the original file: Daniel Flipo, Hans Hagen & Denis Roegel.)
%D
-%D Usage:
-%D \type{\enableregime[iso-8859-1]} or
-%D \type{\enableregime[latin1]} or
-%D \type{\enableregime[il1]}
+%D Usage: \type{\enableregime[8859-1]} (see \type {regi-syn} for
+%D alternatives calls).
-
-\startregime[iso-8859-1]
+\startregime[8859-1]
\defineactivetoken 128 {\unknownchar} % 0080 <control>
\defineactivetoken 129 {\unknownchar} % 0081 <control>
diff --git a/tex/context/base/regi-8859-10.tex b/tex/context/base/regi-8859-10.tex
index 53d80b6d7..79d74d952 100644
--- a/tex/context/base/regi-8859-10.tex
+++ b/tex/context/base/regi-8859-10.tex
@@ -13,10 +13,8 @@
%D Support for iso-8859-10/Latin6 input encoding (regime) for Nordic languages.
%D
-%D Usage:
-%D \type{\enableregime[iso-8859-10]} or
-%D \type{\enableregime[latin6]} or
-%D \type{\enableregime[il6]}
+%D Usage: \type{\enableregime[8859-10]} (see \type {regi-syn} for
+%D alternatives calls).
\startregime[iso-8859-10]
diff --git a/tex/context/base/regi-8859-13.tex b/tex/context/base/regi-8859-13.tex
index e17907e3e..a6dbe376f 100644
--- a/tex/context/base/regi-8859-13.tex
+++ b/tex/context/base/regi-8859-13.tex
@@ -14,11 +14,8 @@
%D Support for iso-8859-13/Latin7 input encoding (regime) for Baltic languages,
%D see also iso-8859-4 and cp1257.
%D
-%D Usage:
-%D \type{\enableregime[iso-8859-13]} or
-%D \type{\enableregime[latin7]} or
-%D \type{\enableregime[il7]}
-
+%D Usage: \type{\enableregime[8859-13]} (see \type {regi-syn} for
+%D alternatives calls).
\startregime[iso-8859-13]
diff --git a/tex/context/base/regi-8859-15.tex b/tex/context/base/regi-8859-15.tex
index 1b643df15..cf788d3f3 100644
--- a/tex/context/base/regi-8859-15.tex
+++ b/tex/context/base/regi-8859-15.tex
@@ -11,16 +11,15 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-%D Support for iso-8859-15/Latin9 input encoding (regime) for West European languages,
-%D almost the same as iso-8859-1 with rarely used symbols (currency symbol,%D fractions, accents) replaced by Euro and some additional letters,%D see also cp1252.
+%D Support for iso-8859-15/Latin9 input encoding (regime) for
+%D West European languages, almost the same as iso-8859-1 with rarely
+%D used symbols (currency symbol,%D fractions, accents) replaced by
+%D Euro and some additional letters,%D see also cp1252.
%D
-%D Usage:
-%D \type{\enableregime[iso-8859-9]} or
-%D \type{\enableregime[latin9]} or
-%D \type{\enableregime[il9]}
+%D Usage: \type{\enableregime[8859-15]} (see \type {regi-syn} for
+%D alternatives calls).
-
-\startregime[iso-8859-15]
+\startregime[8859-15]
\defineactivetoken 128 {\unknownchar} % 0080 <control>
\defineactivetoken 129 {\unknownchar} % 0081 <control>
diff --git a/tex/context/base/regi-8859-16.tex b/tex/context/base/regi-8859-16.tex
index 453472a40..96f0a15d4 100644
--- a/tex/context/base/regi-8859-16.tex
+++ b/tex/context/base/regi-8859-16.tex
@@ -13,13 +13,10 @@
%D Support for iso-8859-16/Latin10 input encoding (regime) for Romanian.
%D
-%D Usage:
-%D \type{\enableregime[iso-8859-16]} or
-%D \type{\enableregime[latin10]} or
-%D \type{\enableregime[il10]}
+%D Usage: \type{\enableregime[8859-16]} (see \type {regi-syn} for
+%D alternatives calls).
-
-\startregime[iso-8859-16]
+\startregime[8859-16]
\defineactivetoken 128 {\unknownchar} % 0080 <control>
\defineactivetoken 129 {\unknownchar} % 0081 <control>
diff --git a/tex/context/base/regi-8859-2.tex b/tex/context/base/regi-8859-2.tex
index b6a83e0e7..81fe8419e 100644
--- a/tex/context/base/regi-8859-2.tex
+++ b/tex/context/base/regi-8859-2.tex
@@ -11,16 +11,13 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-%D Support for iso-8859-2/Latin2 input encoding (regime) for Central European languages,
-%D see also cp1250.
+%D Support for iso-8859-2/Latin2 input encoding (regime) for
+%D Central European languages, see also cp1250.
%D
-%D Usage:
-%D \type{\enableregime[iso-8859-2]} or
-%D \type{\enableregime[latin2]} or
-%D \type{\enableregime[il2]}
+%D Usage: \type{\enableregime[8859-2]} (see \type {regi-syn} for
+%D alternatives calls).
-
-\startregime[iso-8859-2]
+\startregime[8859-2]
\defineactivetoken 128 {\unknownchar} % 0080 <control>
\defineactivetoken 129 {\unknownchar} % 0081 <control>
diff --git a/tex/context/base/regi-8859-3.tex b/tex/context/base/regi-8859-3.tex
index 5ae115cc7..dcb8be67f 100644
--- a/tex/context/base/regi-8859-3.tex
+++ b/tex/context/base/regi-8859-3.tex
@@ -11,16 +11,13 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-%D Support for iso-8859-3/Latin3 input encoding (regime) for South European languages,
-%D esp. for Esperanto and Maltese.
+%D Support for iso-8859-3/Latin3 input encoding (regime) for South
+%D European languages, esp. for Esperanto and Maltese.
%D
-%D Usage:
-%D \type{\enableregime[iso-8859-3]} or
-%D \type{\enableregime[latin3]} or
-%D \type{\enableregime[il3]}
+%D Usage: \type{\enableregime[8859-3]} (see \type {regi-syn} for
+%D alternatives calls).
-
-\startregime[iso-8859-3]
+\startregime[8859-3]
\defineactivetoken 128 {\unknownchar} % 0080 <control>
\defineactivetoken 129 {\unknownchar} % 0081 <control>
diff --git a/tex/context/base/regi-8859-4.tex b/tex/context/base/regi-8859-4.tex
index eaaf93216..3ebe66a13 100644
--- a/tex/context/base/regi-8859-4.tex
+++ b/tex/context/base/regi-8859-4.tex
@@ -11,16 +11,13 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-%D Support for iso-8859-4/Latin4 input encoding (regime) for West European languages,
-%D see also cp1257 and iso-8859-13.
+%D Support for iso-8859-4/Latin4 input encoding (regime) for West
+%D European languages, see also cp1257 and iso-8859-13.
%D
-%D Usage:
-%D \type{\enableregime[iso-8859-4]} or
-%D \type{\enableregime[latin4]} or
-%D \type{\enableregime[il4]}
+%D Usage: \type{\enableregime[8859-4]} (see \type {regi-syn} for
+%D alternatives calls).
-
-\startregime[iso-8859-4]
+\startregime[8859-4]
\defineactivetoken 128 {\unknownchar} % 0080 <control>
\defineactivetoken 129 {\unknownchar} % 0081 <control>
diff --git a/tex/context/base/regi-8859-5.tex b/tex/context/base/regi-8859-5.tex
index fe9fc0cc0..531226433 100644
--- a/tex/context/base/regi-8859-5.tex
+++ b/tex/context/base/regi-8859-5.tex
@@ -14,11 +14,10 @@
%D Support for iso-8859-5 input encoding (regime) for Cyrillic,
%D see also regi-cyr and regi-cyp.
%D
-%D Usage:
-%D \type{\enableregime[iso-8859-5]}
+%D Usage: \type{\enableregime[8859-5]} (see \type {regi-syn} for
+%D alternatives calls).
-
-\startregime[iso-8859-5]
+\startregime[8859-5]
\defineactivetoken 128 {\unknownchar} % 0080 <control>
\defineactivetoken 129 {\unknownchar} % 0081 <control>
diff --git a/tex/context/base/regi-8859-7.tex b/tex/context/base/regi-8859-7.tex
index c858d45e6..80259be65 100644
--- a/tex/context/base/regi-8859-7.tex
+++ b/tex/context/base/regi-8859-7.tex
@@ -16,12 +16,10 @@
%D
%D (Contributor to the original file: Apostolos Syropoulos.)
%D
-%D Usage:
-%D \type{\enableregime[iso-8859-7]} or
-%D \type{\enableregime[grk]}
+%D Usage: \type{\enableregime[8859-7]} (see \type {regi-syn} for
+%D alternatives calls).
-
-\startregime[iso-8859-7]
+\startregime[8859-7]
\defineactivetoken 128 {\unknownchar} % 0080 <control>
\defineactivetoken 129 {\unknownchar} % 0081 <control>
diff --git a/tex/context/base/regi-8859-9.tex b/tex/context/base/regi-8859-9.tex
index 302bcc9c6..8460d739b 100644
--- a/tex/context/base/regi-8859-9.tex
+++ b/tex/context/base/regi-8859-9.tex
@@ -14,13 +14,10 @@
%D Support for iso-8859-9/Latin5 input encoding (regime) for Turkish,
%D see also cp1254.
%D
-%D Usage:
-%D \type{\enableregime[iso-8859-9]} or
-%D \type{\enableregime[latin5]} or
-%D \type{\enableregime[il5]}
+%D Usage: \type{\enableregime[8859-9]} (see \type {regi-syn} for
+%D alternatives calls).
-
-\startregime[iso-8859-9]
+\startregime[8859-9]
\defineactivetoken 128 {\unknownchar} % 0080 <control>
\defineactivetoken 129 {\unknownchar} % 0081 <control>
diff --git a/tex/context/base/regi-syn.tex b/tex/context/base/regi-syn.tex
index e57446ad8..b29c06775 100644
--- a/tex/context/base/regi-syn.tex
+++ b/tex/context/base/regi-syn.tex
@@ -36,6 +36,17 @@
\defineregimesynonym [il9] [8859-15]
\defineregimesynonym [il10] [8859-16]
+\defineregimesynonym [iso-8859-1] [8859-1]
+\defineregimesynonym [iso-8859-2] [8859-2]
+\defineregimesynonym [iso-8859-3] [8859-3]
+\defineregimesynonym [iso-8859-4] [8859-4]
+\defineregimesynonym [iso-8859-9] [8859-9]
+\defineregimesynonym [iso-8859-10] [8859-10]
+\defineregimesynonym [iso-8859-13] [8859-13]
+%defineregimesynonym [iso-8859-14] [8859-14]
+\defineregimesynonym [iso-8859-15] [8859-15]
+\defineregimesynonym [iso-8859-16] [8859-16]
+
\defineregimesynonym [latin1] [8859-1]
\defineregimesynonym [latin2] [8859-2]
\defineregimesynonym [latin3] [8859-3]
diff --git a/tex/context/base/rlxtools.rlx b/tex/context/base/rlxtools.rlx
index cc8249031..da605f6ee 100644
--- a/tex/context/base/rlxtools.rlx
+++ b/tex/context/base/rlxtools.rlx
@@ -38,21 +38,22 @@
</rl:step>
</rl:manipulator -->
- <rl:manipulator name='pdf' suffix='svg'>
- <rl:old><rl:value name='path'/>/<rl:value name='file' method='nosuffix'/>.svg</rl:old>
+ <rl:manipulator name='pdf' suffix='eps'>
+ <rl:old><rl:value name='path'/>/<rl:value name='file' method='nosuffix'/>.eps</rl:old>
<rl:new><rl:value name='path'/>/<rl:value name='prefix'/><rl:value name='file' method='nosuffix'/>.pdf</rl:new>
<rl:step>
texmfstart pstopdf --convert
<rl:value name='old'/>
- <rl:value name='new'/>
</rl:step>
</rl:manipulator>
- <rl:manipulator name='pdf' suffix='eps'>
- <rl:old><rl:value name='path'/>/<rl:value name='file' method='nosuffix'/>.eps</rl:old>
+ <rl:manipulator name='pdf' suffix='svg'>
+ <rl:old><rl:value name='path'/>/<rl:value name='file' method='nosuffix'/>.svg</rl:old>
+ <rl:new><rl:value name='path'/>/<rl:value name='prefix'/><rl:value name='file' method='nosuffix'/>.pdf</rl:new>
<rl:step>
texmfstart pstopdf --convert
<rl:value name='old'/>
+ <rl:value name='new'/>
</rl:step>
</rl:manipulator>
@@ -99,6 +100,28 @@
</rl:step>
</rl:manipulator>
+ <rl:manipulator name='pdf' suffix='tif'>
+ <rl:old><rl:value name='path'/>/<rl:value name='file' method='nosuffix'/>.tif</rl:old>
+ <rl:new><rl:value name='cache' default='.'/>/<rl:value name='file' method='nosuffix'/>.pdf</rl:new>
+ <rl:step>
+ texmfstart pstopdf --convert
+ --inputpath=<rl:value name='path'/>
+ --outputpath=<rl:value name='cache' default='.'/>
+ <rl:value name='file' method='nosuffix'/>.gif
+ </rl:step>
+ </rl:manipulator>
+
+ <rl:manipulator name='pdf' suffix='tiff'>
+ <rl:old><rl:value name='path'/>/<rl:value name='file' method='nosuffix'/>.tiff</rl:old>
+ <rl:new><rl:value name='cache' default='.'/>/<rl:value name='file' method='nosuffix'/>.pdf</rl:new>
+ <rl:step>
+ texmfstart pstopdf --convert
+ --inputpath=<rl:value name='path'/>
+ --outputpath=<rl:value name='cache' default='.'/>
+ <rl:value name='file' method='nosuffix'/>.gif
+ </rl:step>
+ </rl:manipulator>
+
<rl:manipulator name='cropped' suffix='pdf'>
<rl:old><rl:value name='path'/>/<rl:value name='file'/></rl:old>
<rl:new><rl:value name='path'/>/<rl:value name='prefix'/><rl:value name='file'/></rl:new>
diff --git a/tex/context/base/syst-cat.tex b/tex/context/base/syst-cat.tex
index c4f6711ed..fb672c327 100644
--- a/tex/context/base/syst-cat.tex
+++ b/tex/context/base/syst-cat.tex
@@ -69,8 +69,8 @@
\def\defcatcodecommandc % only first time
{\expandafter\gdef\csname CCD:\number\cctcountera:\number\cctcounterb\expandafter\endcsname
- \expandafter##\expandafter1\expandafter
- {\expandafter\def\csname CCC:\number\cctcountera:\number\cctcounterb\endcsname{##1}}%
+ \expandafter##\expandafter1\expandafter
+ {\expandafter\def\csname CCC:\number\cctcountera:\number\cctcounterb\endcsname{##1}}%
\reinstatecatcodecommanda
\csname CCD:\number\cctcountera:\number\cctcounterb\endcsname}
@@ -118,6 +118,7 @@
\ifx\ctxcatcodes \undefined \newcatcodetable \ctxcatcodes \fi
\ifx\vrbcatcodes \undefined \newcatcodetable \vrbcatcodes \fi
\ifx\prtcatcodes \undefined \newcatcodetable \prtcatcodes \fi
+\ifx\mthcatcodes \undefined \newcatcodetable \mthcatcodes \fi % math
\ifx\xmlcatcodesn\undefined \newcatcodetable \xmlcatcodesn \fi % normal
\ifx\xmlcatcodese\undefined \newcatcodetable \xmlcatcodese \fi % entitle
\ifx\xmlcatcodesr\undefined \newcatcodetable \xmlcatcodesr \fi % reduce
diff --git a/tex/context/base/syst-pln.tex b/tex/context/base/syst-pln.tex
index 0b74d6d0f..9582c6508 100644
--- a/tex/context/base/syst-pln.tex
+++ b/tex/context/base/syst-pln.tex
@@ -604,7 +604,8 @@
\chardef\#=`\#
\chardef\$=`\$
-\def\_{\leavevmode \kern.06em \vbox{\hrule width.3em}}
+%def\_{\leavevmode \kern.06em \vbox{\hrule width.3em}}
+\def\_{\dontleavehmode \kern.06em \vbox{\hrule width.3em}}
%D Replaced later on:
diff --git a/tex/context/base/xtag-ini.tex b/tex/context/base/xtag-ini.tex
index b6845a90c..155034145 100644
--- a/tex/context/base/xtag-ini.tex
+++ b/tex/context/base/xtag-ini.tex
@@ -2310,6 +2310,12 @@
\egroup
\convertcommand\@@XML@@string\to#1}
+% this has to expand nicely:
+%
+% <!DOCTYPE XXX SYSTEM "xxx" [ <!ENTITY aaa "../www/"> <!ENTITY bbb SYSTEM "&aaa;mmm.eps"> ]>
+%
+% so keep the following as is!
+
\def\defXMLclean#1#2%
{\bgroup
\enableXMLexpansion
diff --git a/tex/context/interface/cont-cz.xml b/tex/context/interface/cont-cz.xml
index 62d966373..7ac5c0c4d 100644
--- a/tex/context/interface/cont-cz.xml
+++ b/tex/context/interface/cont-cz.xml
@@ -5955,6 +5955,9 @@
<cd:constant type="semknuto"/>
<cd:constant type="zhustene"/>
<cd:constant type="rozbalene"/>
+ <cd:constant type="zadnabila"/>
+ <cd:constant type="pred"/>
+ <cd:constant type="po"/>
<cd:constant type="predel"/>
<cd:constant type="spojeno"/>
<cd:constant type="naokraji"/>
diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml
index 65040942f..b9a968c7b 100644
--- a/tex/context/interface/cont-de.xml
+++ b/tex/context/interface/cont-de.xml
@@ -5955,6 +5955,9 @@
<cd:constant type="kleinerabstand"/>
<cd:constant type="gepackt"/>
<cd:constant type="ungepackt"/>
+ <cd:constant type="keinweiss"/>
+ <cd:constant type="vor"/>
+ <cd:constant type="nach"/>
<cd:constant type="trenner"/>
<cd:constant type="keinabstand"/>
<cd:constant type="amrand"/>
diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml
index 6a730113a..e87f46195 100644
--- a/tex/context/interface/cont-en.xml
+++ b/tex/context/interface/cont-en.xml
@@ -5955,6 +5955,9 @@
<cd:constant type="serried"/>
<cd:constant type="packed"/>
<cd:constant type="unpacked"/>
+ <cd:constant type="nowhite"/>
+ <cd:constant type="before"/>
+ <cd:constant type="after"/>
<cd:constant type="stopper"/>
<cd:constant type="joinedup"/>
<cd:constant type="atmargin"/>
diff --git a/tex/context/interface/cont-fr.xml b/tex/context/interface/cont-fr.xml
index e78ea5126..3ac1b70ac 100644
--- a/tex/context/interface/cont-fr.xml
+++ b/tex/context/interface/cont-fr.xml
@@ -5955,6 +5955,9 @@
<cd:constant type="serried"/>
<cd:constant type="groupe"/>
<cd:constant type="degroupe"/>
+ <cd:constant type="sansblanc"/>
+ <cd:constant type="avant"/>
+ <cd:constant type="apres"/>
<cd:constant type="stopper"/>
<cd:constant type="joinedup"/>
<cd:constant type="alamarge"/>
diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml
index 04fdcdb59..b1a75e38b 100644
--- a/tex/context/interface/cont-it.xml
+++ b/tex/context/interface/cont-it.xml
@@ -5955,6 +5955,9 @@
<cd:constant type="vicino"/>
<cd:constant type="impaccato"/>
<cd:constant type="unpacked"/>
+ <cd:constant type="nobianco"/>
+ <cd:constant type="prima"/>
+ <cd:constant type="dopo"/>
<cd:constant type="stopper"/>
<cd:constant type="unito"/>
<cd:constant type="almargine"/>
diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml
index 8f7fc5816..a3f20ef5d 100644
--- a/tex/context/interface/cont-nl.xml
+++ b/tex/context/interface/cont-nl.xml
@@ -5955,6 +5955,9 @@
<cd:constant type="aanelkaar"/>
<cd:constant type="opelkaar"/>
<cd:constant type="vanelkaar"/>
+ <cd:constant type="geenwit"/>
+ <cd:constant type="voor"/>
+ <cd:constant type="na"/>
<cd:constant type="afsluiter"/>
<cd:constant type="aansluitend"/>
<cd:constant type="opmarge"/>
diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml
index bab6f0fbf..930d549f9 100644
--- a/tex/context/interface/cont-ro.xml
+++ b/tex/context/interface/cont-ro.xml
@@ -5955,6 +5955,9 @@
<cd:constant type="serried"/>
<cd:constant type="impachetat"/>
<cd:constant type="despachetat"/>
+ <cd:constant type="faraalb"/>
+ <cd:constant type="inainte"/>
+ <cd:constant type="dupa"/>
<cd:constant type="stopper"/>
<cd:constant type="unit"/>
<cd:constant type="lamargine"/>
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index 6b2aac332..76921ca29 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.12.12 23:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.12.17 17:41">
<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 12dce1800..87c6b7502 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.12.12 23:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.12.17 17:41">
<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 d1ccf8cf1..73261669a 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.12.12 23:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.12.17 17:41">
<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 5b20b1319..c73b9cf0f 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.12.12 23:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.12.17 17:41">
<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 0e54e179b..1da846dca 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.12.12 23:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.12.17 17:41">
<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 5209459ad..57218ce99 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.12.12 23:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.12.17 17:41">
<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 2cd2a12f1..a2073c157 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.12.12 23:46">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.12.17 17:41">
<cd:variables>
<cd:variable name="one" value="unu"/>