summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scripts/context/ruby/base/ctx.rb14
-rw-r--r--scripts/context/ruby/ctxtools.rb4
-rw-r--r--tex/context/base/cont-new.tex26
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/lang-sla.tex4
-rw-r--r--tex/context/base/m-gnuplot.tex159
-rw-r--r--tex/context/base/meta-pdf.mkii7
-rw-r--r--tex/context/base/syst-xtx.tex4
-rw-r--r--tex/context/base/type-enc.tex29
-rw-r--r--tex/context/base/x-newmml.tex70
-rw-r--r--tex/context/base/x-newmmo.tex80
-rw-r--r--tex/context/base/x-om2cml.xsl19
-rw-r--r--tex/context/base/xtag-stk.tex2
-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--tex/context/patterns/lang-et.hyp10
-rw-r--r--tex/context/patterns/lang-et.log745
-rw-r--r--tex/context/patterns/lang-et.pat1278
-rw-r--r--tex/context/patterns/lang-et.rme30
-rw-r--r--web2c/context.cnf34
25 files changed, 2282 insertions, 249 deletions
diff --git a/scripts/context/ruby/base/ctx.rb b/scripts/context/ruby/base/ctx.rb
index f33bf63a5..d09be55d4 100644
--- a/scripts/context/ruby/base/ctx.rb
+++ b/scripts/context/ruby/base/ctx.rb
@@ -187,6 +187,14 @@ class CtxRunner
end
REXML::XPath.each(root,"/ctx:job//ctx:preprocess/ctx:files") do |files|
REXML::XPath.each(files,"ctx:file") do |pattern|
+ suffix = @@suffix
+ begin
+ suffix = REXML::XPath.match(root,"/ctx:job//ctx:preprocess/@suffix").to_s
+ rescue
+ suffix = @@suffix
+ else
+ if suffix && suffix.empty? then suffix = @@suffix end
+ end
preprocessor = pattern.attributes['processor']
if preprocessor and not preprocessor.empty? then
begin
@@ -221,10 +229,10 @@ class CtxRunner
if command = commands[pp] then
# a lie: no <?xml ...?>
command = REXML::Document.new(command.to_s) # don't infect original
+ # command = command.deep_clone() # don't infect original
command = command.elements["ctx:processor"]
- begin
- newfile = "#{oldfile}.#{suf}" if suf = command.attributes['suffix']
- rescue
+ if suf = command.attributes['suffix'] then
+ newfile = "#{oldfile}.#{suf}"
end
begin
newfile = File.basename(newfile) if @local
diff --git a/scripts/context/ruby/ctxtools.rb b/scripts/context/ruby/ctxtools.rb
index b306ee5dc..1e1158d44 100644
--- a/scripts/context/ruby/ctxtools.rb
+++ b/scripts/context/ruby/ctxtools.rb
@@ -1602,7 +1602,7 @@ class Commands
@@languagedata['da' ] = [ 'ec' , ['dkspecial.tex','dkcommon.tex'] ]
# elhyph.tex
@@languagedata['es' ] = [ 'ec' , ['eshyph.tex'] ]
- @@languagedata['fi' ] = [ 'ec' , ['ethyph.tex'] ]
+ @@languagedata['et' ] = [ 'ec' , ['ethyph.tex'] ]
@@languagedata['fi' ] = [ 'ec' , ['fihyph.tex'] ]
@@languagedata['fr' ] = [ 'ec' , ['frhyph.tex'] ]
# ghyphen.readme ghyph31.readme grphyph
@@ -1622,7 +1622,7 @@ class Commands
@@languagedata['pl' ] = [ 'ec' , ['plhyph.tex'] ]
@@languagedata['pt' ] = [ 'ec' , ['pthyph.tex'] ]
@@languagedata['ro' ] = [ 'ec' , ['rohyph.tex'] ]
- @@languagedata['sl' ] = [ 'ec' , ['sihyph.tex'] ]
+ @@languagedata['sl' ] = [ 'ec' , ['slhyph.tex'], ['sihyph.tex'] ]
@@languagedata['sk' ] = [ 'ec' , ['skhyphen.tex','skhyphen.ex'] ]
# sorhyph.tex / upper sorbian
# srhyphc.tex / cyrillic
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 8f2e22e5c..930a2e28d 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{2007.01.18 12:57}
+\newcontextversion{2007.01.23 13:32}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
@@ -29,6 +29,30 @@
\let\then\relax % \ifnum1>2\then -)
+\chardef\baselinegridmode=0 % option in layout / 1=permit_half_lines
+
+\def\dodosetupwhitespace
+ {\ifgridsnapping
+ \witruimteflexibelfalse
+ \ctxparskip1\ctxparskip
+ \ifdim\ctxparskip>\zeropoint
+ \ifcase\baselinegridmode
+ \ctxparskip\baselineskip % normal ! ! ! ! !!
+ \or
+ \ifdim\scratchdimen=\baselineskip % maybe range
+ \ctxparskip\baselineskip % normal ! ! ! ! !!
+ \else
+ \ctxparskip\numexpr\ctxparskip/\dimexpr.5\lineheight\relax\relax\dimexpr.5\lineheight\relax
+ \fi
+ \else
+ \ctxparskip\baselineskip % normal ! ! ! ! !!
+ \fi
+ \fi
+ \else
+ \ifwitruimteflexibel \else \ctxparskip1\ctxparskip \fi
+ \fi
+ \parskip\ctxparskip}
+
\def\defXMLexpanded#1#2%
{\begingroup
\let\getXMLentity\expandedXMLentity
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index f0fb49d7c..e21d66d43 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{2007.01.18 12:57}
+\edef\contextversion{2007.01.23 13:32}
%D For those who want to use this:
diff --git a/tex/context/base/lang-sla.tex b/tex/context/base/lang-sla.tex
index b9749d930..b5a9728ce 100644
--- a/tex/context/base/lang-sla.tex
+++ b/tex/context/base/lang-sla.tex
@@ -170,7 +170,7 @@
\setupheadtext [\s!cz] [\v!content=Obsah]
\setupheadtext [\s!sk] [\v!content=Obsah]
\setupheadtext [\s!hr] [\v!content=Sadr\zcaron aj]
-\setupheadtext [\s!sl] [\v!content=Vsebina]
+\setupheadtext [\s!sl] [\v!content=Kazalo]
\setupheadtext [\s!pl] [\v!tables=Tabele]
\setupheadtext [\s!cz] [\v!tables=Tabulek]
@@ -200,7 +200,7 @@
\setupheadtext [\s!cz] [\v!index=Rejst\rcaron\iacute k]
\setupheadtext [\s!sk] [\v!index=Zoznam]
\setupheadtext [\s!hr] [\v!index=Indeks]
-\setupheadtext [\s!sl] [\v!index=Kazalo]
+\setupheadtext [\s!sl] [\v!index=Stvarno kazalo]
\setupheadtext [\s!pl] [\v!abbreviations=Skr\oacute cenie]
\setupheadtext [\s!cz] [\v!abbreviations=Zkratky]
diff --git a/tex/context/base/m-gnuplot.tex b/tex/context/base/m-gnuplot.tex
deleted file mode 100644
index 5e612257f..000000000
--- a/tex/context/base/m-gnuplot.tex
+++ /dev/null
@@ -1,159 +0,0 @@
-%D \module
-%D [ file=m-gnuplot,
-%D version=2006.01.04,
-%D title=\CONTEXT\ Extra Modules,
-%D subtitle=\GNUPLOT\ Inclusion,
-%D author={Tobias Burnus, Hans Hagen, Taco Hoekwater, Mojca Miklavec},
-%D date=\currentdate,
-%D copyright=\PRAGMA]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-% todo: reuse (only if really needed)
-
-% \enablemode[demo]
-
-%D example:
-%D
-%D \starttyping
-%D texexec --pdf --mode=demo m-gnuplot
-%D \stoptyping
-
-\unprotect
-
-\ifx\operatingsystem\undefined \def\operatingsystem{unix} \fi % texexec will set that
-
-\newcounter\GNUPLOTnumber
-
-\def\startGNUPLOTinclusions
- {\bgroup
- \obeylines
- \catcode`\%=\@@letter
- \dostartGNUPLOTinclusions}
-
-\def\dostartGNUPLOTinclusions#1\stopGNUPLOTinclusions
- {\gdef\GNUPLOTinclusions{#1}%
- \egroup}
-
-\let\GNUPLOTinclusions\empty
-
-\def\startGNUPLOTgraphic#1%
- {\bgroup
- \obeylines
- \catcode`\%=\@@letter
- \dostartGNUPLOTgraphic{#1}}
-
-\def\dostartGNUPLOTgraphic#1#2\stopGNUPLOTgraphic
- {\doglobal\increment\GNUPLOTnumber
- \letgvalue{gpg:n:#1}\GNUPLOTnumber
- \setgvalue{gpg:d:\GNUPLOTnumber}{#2}%
- \egroup}
-
-\def\useGNUPLOTgraphic
- {\dodoubleempty\douseGNUPLOTgraphic}
-
-\def\douseGNUPLOTgraphic[#1][#2]%
- {\iffirstargument
- \@EA\dodouseGNUPLOTgraphic % like \externalfigure[name][optional args]
- \else
- \@EA\redouseGNUPLOTgraphic % like \useMPgraphic{name}
- \fi[#1][#2]}
-
-\def\redouseGNUPLOTgraphic[#1][#2]#3%
- {\dodouseGNUPLOTgraphic[#3][]}
-
-\newtoks\everyGNUPLOTgraphic
-
-% gnuplot only seems to handle lf so we cannot use \mappartolineend
-% also, in order to prevent fuzzy runs (or no runs) we add a ; to
-% each line
-
-\appendtoks
- \obeylines
- \def\obeyedline{;\outputnewlinechar}%
-\to \everyGNUPLOTgraphic
-
-\appendtoks
- \let\%\letterpercent
- \def\ {\letterbackslash\outputnewlinechar}%
-\to \everyGNUPLOTgraphic
-
-\def\dodouseGNUPLOTgraphic[#1][#2]%
- {\bgroup
- \doifdefined{gpg:n:#1}
- {\edef\GNUPLOTnumber{\getvalue{gpg:n:#1}}%
- \edef\GNUPLOTfile {\bufferprefix gnuplot-\GNUPLOTnumber}%
- \bgroup
- \the\everyGNUPLOTgraphic
- \immediate\openout\scratchwrite=\GNUPLOTfile.gpd
- \immediate\write\scratchwrite{set terminal \@@GNUPLOToutput\space\@@GNUPLOToption}%
- \doifnotempty
- {\GNUPLOTinclusions}{\immediate\write\scratchwrite{\GNUPLOTinclusions}}%
- \immediate\write\scratchwrite{set output "\GNUPLOTfile.\@@GNUPLOTsuffix"}%
- \immediate\write\scratchwrite{\getvalue{gpg:d:\GNUPLOTnumber}}%
- \immediate\write\scratchwrite{quit}%
- \immediate\closeout\scratchwrite
- \egroup
- \processGNUPLOTgraphic
- \convertGNUPLOTgraphic
- \externalfigure[\@@GNUPLOTresult][#2]}%
- \egroup}
-
-% we assume pdf inclusion, eps wil be implemented when applicable
-
-\def\setupGNUPLOT
- {\dodoubleempty\getparameters[@@GNUPLOT]}
-
-\def\processGNUPLOTgraphic
- {\doifelse\operatingsystem{mswin}
- {\executesystemcommand{start /MIN pgnuplot \GNUPLOTfile.gpd}} % start is needed else gp fails
- {\executesystemcommand{gnuplot \GNUPLOTfile.gpd}}}
-
-\def\convertGNUPLOTgraphic
- {\doifsomething\@@GNUPLOThandle{\executesystemcommand{\@@GNUPLOThandle}}}
-
-\def\defineGNUPLOThandle#1#2#3#4#5% name output suffix conversion-method result
- {\setvalue{@@GNUPLOT-#1}{{#2}{#3}{#4}{#5}}}
-
-\def\@@GNUPLOToutput{\filterfromvalue{@@GNUPLOT-\@@GNUPLOTmethod}41}
-\def\@@GNUPLOTsuffix{\filterfromvalue{@@GNUPLOT-\@@GNUPLOTmethod}42}
-\def\@@GNUPLOThandle{\filterfromvalue{@@GNUPLOT-\@@GNUPLOTmethod}43}
-\def\@@GNUPLOTresult{\filterfromvalue{@@GNUPLOT-\@@GNUPLOTmethod}44}
-
-\defineGNUPLOThandle{postscript}{postscript}{ps} {texmfstart newpstopdf --method=raw \GNUPLOTfile.ps}{\GNUPLOTfile.pdf}
-\defineGNUPLOThandle{ps} {postscript}{ps} {texmfstart newpstopdf --method=raw \GNUPLOTfile.ps}{\GNUPLOTfile.pdf}
-\defineGNUPLOThandle{pdf} {pdf} {pdf}{} {\GNUPLOTfile.pdf}
-\defineGNUPLOThandle{metapost} {mp} {mp} {texmfstart mptopdf \GNUPLOTfile.mp} {\GNUPLOTfile-0.pdf}
-\defineGNUPLOThandle{mp} {mp} {mp} {texmfstart mptopdf \GNUPLOTfile.mp} {\GNUPLOTfile-0.pdf}
-\defineGNUPLOThandle{png} {png} {png}{} {\GNUPLOTfile.png}
-
-\setupGNUPLOT[\c!method=ps,\c!option=]
-
-\protect \doifnotmode{demo}{\endinput}
-
-\starttext
-
-\startGNUPLOTinclusions
- set title "trigonometry"
-\stopGNUPLOTinclusions
-
-\startGNUPLOTgraphic{sin}
- plot sin(x)
-\stopGNUPLOTgraphic
-
-\startGNUPLOTgraphic{cos}
- plot cos(x)
-\stopGNUPLOTgraphic
-
-\useGNUPLOTgraphic{sin} \endgraf
-\useGNUPLOTgraphic{cos} \endgraf
-\useGNUPLOTgraphic[cos] \endgraf
-
-\setupGNUPLOT[method=ps] \useGNUPLOTgraphic[sin][object=no,height=2cm] \blank
-%setupGNUPLOT[method=pdf] \useGNUPLOTgraphic[sin][object=no,height=2cm] \blank
-\setupGNUPLOT[method=png] \useGNUPLOTgraphic[sin][object=no,height=2cm] \blank
-\setupGNUPLOT[method=mp] \useGNUPLOTgraphic[sin][object=no,height=2cm,option=color] \blank
-
-\stoptext
diff --git a/tex/context/base/meta-pdf.mkii b/tex/context/base/meta-pdf.mkii
index 3060de539..27774b34d 100644
--- a/tex/context/base/meta-pdf.mkii
+++ b/tex/context/base/meta-pdf.mkii
@@ -860,7 +860,7 @@
\resetMPmoveto
\PDFcode{\!MPgMPs1 \!MPgMPs2 \!MPgMPs3 \!MPgMPs4 \!MPgMPs5 \!MPgMPs6 c}%
\or
- \ifx\lastMPmoveX\empty \else % bugged
+ \ifx\lastMPmoveX\empty \else % we assume 0,0 rlineto
\flushMPmoveto
\PDFcode{\!MP\lastMPmoveX\space \!MP\lastMPmoveY\space l S}%
\resetMPmoveto
@@ -891,12 +891,13 @@
\PDFcode{\!MP\a\space\!MP\b\space
\!MP\c\space\!MP\d\space
\!MP\e\space\!MP\f\space c}%
- \or
+ \or % rather mp specific ... rline always has 0,0
\bgroup
\noMPtranslate
\flushMPconcatmoveto
+ % next should be \lastMPmoveX+\a,\lastMPmoveY+\b but we know it's 0,0
+ \PDFcode{\!MP\lastMPmoveX\space\!MP\lastMPmoveY\space l S}%
\resetMPmoveto
- \PDFcode{\!MP\a\space\!MP\b\space l S}%
\egroup
\or
% \flushMPconcatmoveto
diff --git a/tex/context/base/syst-xtx.tex b/tex/context/base/syst-xtx.tex
index 83a28d36d..ad8efa0a6 100644
--- a/tex/context/base/syst-xtx.tex
+++ b/tex/context/base/syst-xtx.tex
@@ -22,8 +22,8 @@
% patch needed for turkish
-\setcclcuc 201C 201C 201C
-\setcclcuc 201D 201D 201D
+\setcclcucx 201C 201C 201C
+\setcclcucx 201D 201D 201D
\ifx\XeTeXuseglyphmetrics\undefined \else
\XeTeXuseglyphmetrics=1
diff --git a/tex/context/base/type-enc.tex b/tex/context/base/type-enc.tex
index c416b3375..bf0145474 100644
--- a/tex/context/base/type-enc.tex
+++ b/tex/context/base/type-enc.tex
@@ -30,39 +30,10 @@
% fallbacks, no math in latin modern
-% \definefontsynonym[lmbsy10] [cmbsy10]
-% \definefontsynonym[lmbsy5] [cmbsy5]
-% \definefontsynonym[lmbsy6] [cmbsy7]
-% \definefontsynonym[lmbsy7] [cmbsy7]
-% \definefontsynonym[lmbsy8] [cmbsy7]
-% \definefontsynonym[lmbsy9] [cmbsy10]
\definefontsynonym[lmdunh10][cmdunh10]
-% \definefontsynonym[lmex10] [cmex10]
-% \definefontsynonym[lmex7] [cmex10]
-% \definefontsynonym[lmex8] [cmex10]
-% \definefontsynonym[lmex9] [cmex10]
\definefontsynonym[lmff10] [cmff10]
\definefontsynonym[lmfi10] [cmfi10]
\definefontsynonym[lmfib8] [cmfib8]
-% \definefontsynonym[lmmi10] [cmmi10]
-% \definefontsynonym[lmmi12] [cmmi12]
-% \definefontsynonym[lmmi5] [cmmi5]
-% \definefontsynonym[lmmi6] [cmmi6]
-% \definefontsynonym[lmmi7] [cmmi7]
-% \definefontsynonym[lmmi8] [cmmi8]
-% \definefontsynonym[lmmi9] [cmmi9]
-% \definefontsynonym[lmmib10] [cmmib10]
-% \definefontsynonym[lmmib5] [cmmib5]
-% \definefontsynonym[lmmib6] [cmmib7]
-% \definefontsynonym[lmmib7] [cmmib7]
-% \definefontsynonym[lmmib8] [cmmib7]
-% \definefontsynonym[lmmib9] [cmmib10]
-% \definefontsynonym[lmsy10] [cmsy10]
-% \definefontsynonym[lmsy5] [cmsy5]
-% \definefontsynonym[lmsy6] [cmsy6]
-% \definefontsynonym[lmsy7] [cmsy7]
-% \definefontsynonym[lmsy8] [cmsy8]
-% \definefontsynonym[lmsy9] [cmsy9]
\definefontsynonym[lmtex10] [cmtex10]
\definefontsynonym[lmtex8] [cmtex8]
\definefontsynonym[lmtex9] [cmtex9]
diff --git a/tex/context/base/x-newmml.tex b/tex/context/base/x-newmml.tex
index 803190ee4..97562daec 100644
--- a/tex/context/base/x-newmml.tex
+++ b/tex/context/base/x-newmml.tex
@@ -439,16 +439,17 @@
[csymbol]
[encoding=text,
definitionURL=]
- {}
+ {\doifsomething{\XMLop{definitionURL}}{\directsetup{mmc:csymbol:apply}}}
\startsetups mmc:csymbol:apply
\begingroup
\startsavingXMLelements
\rawXMLstacktext\plusone % still on stack, no check, just attr test
\stopsavingXMLelements
- % http://www.publisherswhodontcareaboutcosts.com/SomeName
- \doifsetupselse{mmc:csymbol:\XMLpar{csymbol}{definitionURL}{}} {
- \expanded{\endgroup\noexpand\directsetup{mmc:csymbol:\XMLpar{csymbol}{definitionURL}{}}}
+ % http://www.publishers.com/SomeName
+ \lowercasestring\XMLpar{csymbol}{definitionURL}{}\to\mmcSymbolURL
+ \doifsetupselse{mmc:csymbol:} {\mmcSymbolURL} {
+ \expanded{\endgroup\noexpand\directsetup{mmc:csymbol:\mmcSymbolURL}}
} {
% SomeName (fallback)
\splitfilename{\XMLpar{csymbol}{definitionURL}{}}
@@ -880,16 +881,20 @@
\defineXMLcommand [divide] {\directsetup{mmc:divide}}
-\setupMMLappearance [divide] [\c!level=\!!maxcard]
+\setupMMLappearance [divide] [\c!level=\!!maxcard,\c!alternative=\v!a]
\startsetups mmc:divide
\increment\MMLcDIVIDElevel
- \ifnum\MMLcDIVIDElevel>\@@MMLdividelevel\space
+ \doifelse \@@MMLdividealternative\v!b {
\getXMLstackdata\plustwo/\getXMLstackdata\plusthree
- \else
- \MMLcreset
- \frac{\MMLcreset\getXMLstackdata\plustwo}{\MMLcreset\getXMLstackdata\plusthree}%
- \fi
+ } {
+ \ifnum\MMLcDIVIDElevel>\@@MMLdividelevel\space
+ \getXMLstackdata\plustwo/\getXMLstackdata\plusthree
+ \else
+ \MMLcreset
+ \frac{\MMLcreset\getXMLstackdata\plustwo}{\MMLcreset\getXMLstackdata\plusthree}%
+ \fi
+ }
\decrement\MMLcDIVIDElevel
\stopsetups
@@ -2451,6 +2456,11 @@
\let\MMLdoL\donothing
\let\MMLdoR\donothing
+\startsetups mmc:apply:start
+ \begingroup
+ \startsavingXMLelements
+\stopsetups
+
\startsetups mmc:apply:stop
\stopsavingXMLelements
\MMLmathinner {
@@ -2472,9 +2482,11 @@
\doifelse {\getXMLstackname\plusone} {apply} {
% <apply> <apply> ... </apply> <ci> .. </ci> </apply>
\doifelseMMCfunctioninapply \plusone {plus,minus} {
+% [a]
% yet incomplete and rather untested
% <apply> <apply> <minus/> <tan/> <cos/> </apply> <ci>x</ci> </apply>
} {
+% [b]
\MMLcreset
}
\MMLdoL
@@ -2487,17 +2499,21 @@
\MMLdoR
} {
\doifelse {\getXMLstackname\plusone} {fn} {
+% [c]
% \MMLdoL/R are to be taken care of in the next setup
\directsetup{mmc:fn:apply}
} {
\doifelse {\getXMLstackname\plusone} {csymbol} {
% \MMLdoL/R are to be taken care of in the next setup
+% [d]
\directsetup{mmc:csymbol:apply}
} {
\doifelse {\getXMLstackname\plusone} {ci} {
+% [e]
% \MMLdoL/R are to be taken care of in the next setup
\directsetup{mmc:ci:apply}
} {
+% [f]
\MMLdoL
\getXMLstackdata\plusone
\MMLdoR
@@ -2520,43 +2536,55 @@
\doifelse {\getXMLstackname\plusone} {ci} {
\flattenXMLcontent{\getXMLstackdata\plusone}
\doifsetupselse{mmc:fn:\flattenedXMLcontent} {
-% \MMLdoL/MMLdoR to be handled in plugin
+ % \MMLdoL/MMLdoR to be handled in plugin
\global\defXMLstackdata\XMLfnoperator\plusone
\expanded{\endgroup\noexpand\directsetup{mmc:fn:\flattenedXMLcontent}}
} {
\endgroup
\MMLcreset
-\MMLdoL
+ \MMLdoL
\getXMLstackdata\plusone
\ifnum\XMLstacklevel>\plusone
\getXMLentity{NegThinSpace}
\left(\MMLcreset\flushXMLstackwith\plustwo{\MMLseparator,}\right)
\fi
-\MMLdoR
+ \MMLdoR
}
} {
\endgroup
\MMLcreset
-\MMLdoL
+ \MMLdoL
\getXMLstackdata\plusone
-\MMLdoR
+ \MMLdoR
}
\stopsetups
\startsetups mmc:csymbol:apply
\begingroup
- \startsavingXMLelements
- \rawXMLstacktext\plusone % still on stack, no check, just attr test
- \stopsavingXMLelements
+ \defineXMLsave[csymbol][definitionURL=,encoding=]
+ \rawXMLstackdata\plusone % was text % still on stack, no check, just attr test
% \MMLdoL/MMLdoR to be handled in plugin
- \doifsetupselse{mmc:csymbol:\XMLpar{csymbol}{definitionURL}{}} {
- \expanded{\endgroup\noexpand\directsetup{mmc:csymbol:\XMLpar{csymbol}{definitionURL}{}}}
+ \lowercasestring\XMLpar{csymbol}{definitionURL}{}\to\mmcSymbolURL
+ \doifsetupselse{mmc:csymbol:\mmcSymbolURL} {
+ \expanded{\endgroup\noexpand\directsetup{mmc:csymbol:\mmcSymbolURL}}
} {
\endgroup
- \XMLval{mmc:cs}{\XMLop{encoding}}{\firstofoneargument}
+ %\XMLval{mmc:cs}{\XMLop{encoding}}{\firstofoneargument}% fails when no content
+ \XMLval{mmc:cs}{\XMLop{encoding}}{}
}
\stopsetups
+\defineXMLsingular
+ [csymbol]
+ [encoding=text,
+ definitionURL=]
+ {\directsetup{mmc:csymbol:apply:singular}}
+
+\startsetups mmc:csymbol:apply:singular
+ \lowercasestring\XMLpar{csymbol}{definitionURL}{}\to\mmcSymbolURL
+ \directsetup{mmc:csymbol:\mmcSymbolURL}
+\stopsetups
+
\startsetups mmc:ci:apply
\getXMLstackdata\plusone
\ifnum\XMLstacklevel>\plusone
diff --git a/tex/context/base/x-newmmo.tex b/tex/context/base/x-newmmo.tex
index 5e05faae9..2dc5b9009 100644
--- a/tex/context/base/x-newmmo.tex
+++ b/tex/context/base/x-newmmo.tex
@@ -31,7 +31,7 @@
%D
%D \typebuffer \processXMLbuffer
-\startsetups mmc:csymbol:http://www.openmath.org/cd/nums1\string#rational
+\startsetups mmc:csymbol:http://www.openmath.org/cd/nums1\letterhash rational
\MMLcreset
\getXMLstackdata\plustwo/\getXMLstackdata\plusthree
\stopsetups
@@ -48,7 +48,7 @@
%D
%D \typebuffer \processXMLbuffer
-\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\string#diffquot
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash diffquot
\MMLcreset
\frac {
\Delta\getXMLstackdata\plustwo
@@ -97,7 +97,7 @@
%D
%D \typebuffer \processXMLbuffer
-\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\string#difference
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash difference
\MMLcreset
\Delta\getXMLstackdata\plustwo
\stopsetups
@@ -114,7 +114,7 @@
%D
%D \typebuffer \processXMLbuffer
-\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\string#diff
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash diff
\MMLcreset
\frac {
\mfunction{\getXMLentity{mathematicald}}\getXMLstackdata\plustwo
@@ -123,4 +123,76 @@
}
\stopsetups
+%D A unit mess.
+
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_time1@second {\mr s}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_time1@minute {\mr m}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_time1@hour {\mr h}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_time1@day {\mr d}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_time1@week {\mr w}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_time1@month {\mr m}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_time1@year {\mr y}\stopsetups
+
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@meter {\mr m}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@gram {\mr g}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@liter {\mr l}\stopsetups
+
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@watt {\mr W}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@pascal {\mr P}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@kelvin {\mr K}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@celsius {\mr C}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@newton {\mr N}\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@byte {\mr B}\stopsetups
+
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_siprefix1@pico {\mr p}\getXMLstackdata\plustwo\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_siprefix1@micro \mu\getXMLstackdata\plustwo\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_siprefix1@milli {\mr m}\getXMLstackdata\plustwo\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_siprefix1@centi {\mr c}\getXMLstackdata\plustwo\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_siprefix1@deci {\mr d}\getXMLstackdata\plustwo\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_siprefix1@deca {\mr d}\getXMLstackdata\plustwo\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_siprefix1@hecto {\mr h}\getXMLstackdata\plustwo\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_siprefix1@kilo {\mr k}\getXMLstackdata\plustwo\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_siprefix1@mega {\mr m}\getXMLstackdata\plustwo\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_siprefix1@giga {\mr g}\getXMLstackdata\plustwo\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_siprefix1@tera {\mr t}\getXMLstackdata\plustwo\stopsetups
+
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash procent \procent\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash promille \promille\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash degree ^\circ\stopsetups
+
+% whatever
+
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash triangle
+ \Delta\,
+\stopsetups
+
+% crap
+
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@degree_celsius
+ \directsetup{mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@celsius}
+\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@degree_kelvin
+ \directsetup{mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@kelvin}
+\stopsetups
+
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@metre
+ \directsetup{mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@meter}
+\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@gramme
+ \directsetup{mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@gram}
+\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@litre
+ \directsetup{mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_metric1@liter}
+\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_time1@calendar_month
+ \directsetup{mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_time1@month}
+\stopsetups
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_time1@calendar_year
+ \directsetup{mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash units_time1@year}
+\stopsetups
+
+\startsetups mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash degree_angle
+ \directsetup{mmc:csymbol:http://www.openmath.org/cd/mathadore\letterhash degree}
+\stopsetups
+
\protect \endinput
diff --git a/tex/context/base/x-om2cml.xsl b/tex/context/base/x-om2cml.xsl
index 4bc181807..570c54bb5 100644
--- a/tex/context/base/x-om2cml.xsl
+++ b/tex/context/base/x-om2cml.xsl
@@ -195,6 +195,13 @@
</xsl:otherwise>
</xsl:choose>
</xsl:when>
+ <xsl:when test="@name='divide'">
+ <xsl:choose>
+ <xsl:when test="../@style='inline'">
+ <xsl:attribute name='alternative'>b</xsl:attribute>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:when>
<xsl:otherwise>
<!-- forget about it -->
</xsl:otherwise>
@@ -1294,4 +1301,16 @@
</matrix>
</xsl:template>
+ <!-- <OMS cd="units_siprefix1" name="centi" cdbase="mathadore"/> -->
+ <!-- <OMS cd="units_metric1" name="metre" cdbase="mathadore"/> -->
+
+ <xsl:template match="om:OMS[contains(@cd,'units_')]">
+ <csymbol>
+ <xsl:attribute name="definitionURL">
+ <xsl:value-of select="concat(concat(concat(concat(
+ 'http://www.openmath.org/cd/mathadore','#'),@cd),'@'),@name)"/>
+ </xsl:attribute>
+ </csymbol>
+ </xsl:template>
+
</xsl:stylesheet>
diff --git a/tex/context/base/xtag-stk.tex b/tex/context/base/xtag-stk.tex
index 32b2b87df..193b47132 100644
--- a/tex/context/base/xtag-stk.tex
+++ b/tex/context/base/xtag-stk.tex
@@ -100,7 +100,7 @@
{\defXMLstackiddata#1\XMLstackid}
\def\showXMLstacknames
- {\hbox{[\space\dorecurse\XMLstacklevel{\getXMLstackname\recurselevel\space}]}}
+ {\hbox{[\space\dorecurse\XMLstacklevel{\recurselevel:\getXMLstackname\recurselevel\space}]}}
\def\flushXMLstackfrom#1%
{\dostepwiserecurse{#1}\XMLstacklevel\plusone
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index c08c111a4..37a5d3aab 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="2007.01.18 12:57">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2007.01.23 13:32">
<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 8a0c53216..0a26cb80f 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="2007.01.18 12:57">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2007.01.23 13:32">
<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 fe84f3169..b498e5ce1 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="2007.01.18 12:57">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2007.01.23 13:32">
<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 aec6fc410..eb995896b 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="2007.01.18 12:57">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2007.01.23 13:32">
<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 0ad08c2c9..8f1778a1c 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="2007.01.18 12:57">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2007.01.23 13:32">
<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 1c0aaf5f9..70ccfff67 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="2007.01.18 12:57">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2007.01.23 13:32">
<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 cdc40d40f..297fea5c0 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="2007.01.18 12:57">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2007.01.23 13:32">
<cd:variables>
<cd:variable name="one" value="unu"/>
diff --git a/tex/context/patterns/lang-et.hyp b/tex/context/patterns/lang-et.hyp
new file mode 100644
index 000000000..c89901afb
--- /dev/null
+++ b/tex/context/patterns/lang-et.hyp
@@ -0,0 +1,10 @@
+% context hyphenation file, see lang-et.rme for original comment
+
+% source of data: ethyph.tex
+
+% begin hyphenation data
+
+\hyphenation {}
+
+% end hyphenation data
+
diff --git a/tex/context/patterns/lang-et.log b/tex/context/patterns/lang-et.log
new file mode 100644
index 000000000..c0586c1e0
--- /dev/null
+++ b/tex/context/patterns/lang-et.log
@@ -0,0 +1,745 @@
+/\\\^ A/ => [Acircumflex]
+/\\\^A/ => [Acircumflex]
+/\\\^\{A\}/ => [Acircumflex]
+/\\\^ a/ => [acircumflex]
+/\\\^a/ => [acircumflex]
+/\\\^\{a\}/ => [acircumflex]
+/\\\^ C/ => [Ccircumflex]
+/\\\^C/ => [Ccircumflex]
+/\\\^\{C\}/ => [Ccircumflex]
+/\\\^ c/ => [ccircumflex]
+/\\\^c/ => [ccircumflex]
+/\\\^\{c\}/ => [ccircumflex]
+/\\\^ E/ => [Ecircumflex]
+/\\\^E/ => [Ecircumflex]
+/\\\^\{E\}/ => [Ecircumflex]
+/\\\^ e/ => [ecircumflex]
+/\\\^e/ => [ecircumflex]
+/\\\^\{e\}/ => [ecircumflex]
+/\\\^ G/ => [Gcircumflex]
+/\\\^G/ => [Gcircumflex]
+/\\\^\{G\}/ => [Gcircumflex]
+/\\\^ g/ => [gcircumflex]
+/\\\^g/ => [gcircumflex]
+/\\\^\{g\}/ => [gcircumflex]
+/\\\^ H/ => [Hcircumflex]
+/\\\^H/ => [Hcircumflex]
+/\\\^\{H\}/ => [Hcircumflex]
+/\\\^ h/ => [hcircumflex]
+/\\\^h/ => [hcircumflex]
+/\\\^\{h\}/ => [hcircumflex]
+/\\\^ I/ => [Icircumflex]
+/\\\^I/ => [Icircumflex]
+/\\\^\{I\}/ => [Icircumflex]
+/\\\^ i/ => [icircumflex]
+/\\\^i/ => [icircumflex]
+/\\\^\{i\}/ => [icircumflex]
+/\\\^ \i/ => [icircumflex]
+/\\\^\i/ => [icircumflex]
+/\\\^\{\i\}/ => [icircumflex]
+/\\\^ J/ => [Jcircumflex]
+/\\\^J/ => [Jcircumflex]
+/\\\^\{J\}/ => [Jcircumflex]
+/\\\^ j/ => [jcircumflex]
+/\\\^j/ => [jcircumflex]
+/\\\^\{j\}/ => [jcircumflex]
+/\\\^ \j/ => [jcircumflex]
+/\\\^\j/ => [jcircumflex]
+/\\\^\{\j\}/ => [jcircumflex]
+/\\\^ O/ => [Ocircumflex]
+/\\\^O/ => [Ocircumflex]
+/\\\^\{O\}/ => [Ocircumflex]
+/\\\^ o/ => [ocircumflex]
+/\\\^o/ => [ocircumflex]
+/\\\^\{o\}/ => [ocircumflex]
+/\\\^ S/ => [Scircumflex]
+/\\\^S/ => [Scircumflex]
+/\\\^\{S\}/ => [Scircumflex]
+/\\\^ s/ => [scircumflex]
+/\\\^s/ => [scircumflex]
+/\\\^\{s\}/ => [scircumflex]
+/\\\^ U/ => [Ucircumflex]
+/\\\^U/ => [Ucircumflex]
+/\\\^\{U\}/ => [Ucircumflex]
+/\\\^ u/ => [ucircumflex]
+/\\\^u/ => [ucircumflex]
+/\\\^\{u\}/ => [ucircumflex]
+/\\\^ W/ => [Wcircumflex]
+/\\\^W/ => [Wcircumflex]
+/\\\^\{W\}/ => [Wcircumflex]
+/\\\^ w/ => [wcircumflex]
+/\\\^w/ => [wcircumflex]
+/\\\^\{w\}/ => [wcircumflex]
+/\\\^ Y/ => [Ycircumflex]
+/\\\^Y/ => [Ycircumflex]
+/\\\^\{Y\}/ => [Ycircumflex]
+/\\\^ y/ => [ycircumflex]
+/\\\^y/ => [ycircumflex]
+/\\\^\{y\}/ => [ycircumflex]
+/\\\` A/ => [Agrave]
+/\\\`A/ => [Agrave]
+/\\\`\{A\}/ => [Agrave]
+/\\\` a/ => [agrave]
+/\\\`a/ => [agrave]
+/\\\`\{a\}/ => [agrave]
+/\\\` E/ => [Egrave]
+/\\\`E/ => [Egrave]
+/\\\`\{E\}/ => [Egrave]
+/\\\` e/ => [egrave]
+/\\\`e/ => [egrave]
+/\\\`\{e\}/ => [egrave]
+/\\\` I/ => [Igrave]
+/\\\`I/ => [Igrave]
+/\\\`\{I\}/ => [Igrave]
+/\\\` i/ => [igrave]
+/\\\`i/ => [igrave]
+/\\\`\{i\}/ => [igrave]
+/\\\` \i/ => [igrave]
+/\\\`\i/ => [igrave]
+/\\\`\{\i\}/ => [igrave]
+/\\\` O/ => [Ograve]
+/\\\`O/ => [Ograve]
+/\\\`\{O\}/ => [Ograve]
+/\\\` o/ => [ograve]
+/\\\`o/ => [ograve]
+/\\\`\{o\}/ => [ograve]
+/\\\` U/ => [Ugrave]
+/\\\`U/ => [Ugrave]
+/\\\`\{U\}/ => [Ugrave]
+/\\\` u/ => [ugrave]
+/\\\`u/ => [ugrave]
+/\\\`\{u\}/ => [ugrave]
+/\\\` Y/ => [Ygrave]
+/\\\`Y/ => [Ygrave]
+/\\\`\{Y\}/ => [Ygrave]
+/\\\` y/ => [ygrave]
+/\\\`y/ => [ygrave]
+/\\\`\{y\}/ => [ygrave]
+/\\\~ A/ => [Atilde]
+/\\\~A/ => [Atilde]
+/\\\~\{A\}/ => [Atilde]
+/\\\~ a/ => [atilde]
+/\\\~a/ => [atilde]
+/\\\~\{a\}/ => [atilde]
+/\\\~ I/ => [Itilde]
+/\\\~I/ => [Itilde]
+/\\\~\{I\}/ => [Itilde]
+/\\\~ i/ => [itilde]
+/\\\~i/ => [itilde]
+/\\\~\{i\}/ => [itilde]
+/\\\~ \i/ => [itilde]
+/\\\~\i/ => [itilde]
+/\\\~\{\i\}/ => [itilde]
+/\\\~ O/ => [Otilde]
+/\\\~O/ => [Otilde]
+/\\\~\{O\}/ => [Otilde]
+/\\\~ o/ => [otilde]
+/\\\~o/ => [otilde]
+/\\\~\{o\}/ => [otilde]
+/\\\~ U/ => [Utilde]
+/\\\~U/ => [Utilde]
+/\\\~\{U\}/ => [Utilde]
+/\\\~ u/ => [utilde]
+/\\\~u/ => [utilde]
+/\\\~\{u\}/ => [utilde]
+/\\\" A/ => [Adiaeresis]
+/\\\"A/ => [Adiaeresis]
+/\\\"\{A\}/ => [Adiaeresis]
+/\\\" a/ => [adiaeresis]
+/\\\"a/ => [adiaeresis]
+/\\\"\{a\}/ => [adiaeresis]
+/\\\" E/ => [Ediaeresis]
+/\\\"E/ => [Ediaeresis]
+/\\\"\{E\}/ => [Ediaeresis]
+/\\\" e/ => [ediaeresis]
+/\\\"e/ => [ediaeresis]
+/\\\"\{e\}/ => [ediaeresis]
+/\\\" I/ => [Idiaeresis]
+/\\\"I/ => [Idiaeresis]
+/\\\"\{I\}/ => [Idiaeresis]
+/\\\" i/ => [idiaeresis]
+/\\\"i/ => [idiaeresis]
+/\\\"\{i\}/ => [idiaeresis]
+/\\\" \i/ => [idiaeresis]
+/\\\"\i/ => [idiaeresis]
+/\\\"\{\i\}/ => [idiaeresis]
+/\\\" O/ => [Odiaeresis]
+/\\\"O/ => [Odiaeresis]
+/\\\"\{O\}/ => [Odiaeresis]
+/\\\" o/ => [odiaeresis]
+/\\\"o/ => [odiaeresis]
+/\\\"\{o\}/ => [odiaeresis]
+/\\\" U/ => [Udiaeresis]
+/\\\"U/ => [Udiaeresis]
+/\\\"\{U\}/ => [Udiaeresis]
+/\\\" u/ => [udiaeresis]
+/\\\"u/ => [udiaeresis]
+/\\\"\{u\}/ => [udiaeresis]
+/\\\" Y/ => [Ydiaeresis]
+/\\\"Y/ => [Ydiaeresis]
+/\\\"\{Y\}/ => [Ydiaeresis]
+/\\\" y/ => [ydiaeresis]
+/\\\"y/ => [ydiaeresis]
+/\\\"\{y\}/ => [ydiaeresis]
+/\\\' A/ => [Aacute]
+/\\\'A/ => [Aacute]
+/\\\'\{A\}/ => [Aacute]
+/\\\' a/ => [aacute]
+/\\\'a/ => [aacute]
+/\\\'\{a\}/ => [aacute]
+/\\\' C/ => [Cacute]
+/\\\'C/ => [Cacute]
+/\\\'\{C\}/ => [Cacute]
+/\\\' c/ => [cacute]
+/\\\'c/ => [cacute]
+/\\\'\{c\}/ => [cacute]
+/\\\' E/ => [Eacute]
+/\\\'E/ => [Eacute]
+/\\\'\{E\}/ => [Eacute]
+/\\\' e/ => [eacute]
+/\\\'e/ => [eacute]
+/\\\'\{e\}/ => [eacute]
+/\\\' I/ => [Iacute]
+/\\\'I/ => [Iacute]
+/\\\'\{I\}/ => [Iacute]
+/\\\' i/ => [iacute]
+/\\\'i/ => [iacute]
+/\\\'\{i\}/ => [iacute]
+/\\\' \i/ => [iacute]
+/\\\'\i/ => [iacute]
+/\\\'\{\i\}/ => [iacute]
+/\\\' L/ => [Lacute]
+/\\\'L/ => [Lacute]
+/\\\'\{L\}/ => [Lacute]
+/\\\' l/ => [lacute]
+/\\\'l/ => [lacute]
+/\\\'\{l\}/ => [lacute]
+/\\\' N/ => [Nacute]
+/\\\'N/ => [Nacute]
+/\\\'\{N\}/ => [Nacute]
+/\\\' n/ => [nacute]
+/\\\'n/ => [nacute]
+/\\\'\{n\}/ => [nacute]
+/\\\' O/ => [Oacute]
+/\\\'O/ => [Oacute]
+/\\\'\{O\}/ => [Oacute]
+/\\\' o/ => [oacute]
+/\\\'o/ => [oacute]
+/\\\'\{o\}/ => [oacute]
+/\\\' R/ => [Racute]
+/\\\'R/ => [Racute]
+/\\\'\{R\}/ => [Racute]
+/\\\' r/ => [racute]
+/\\\'r/ => [racute]
+/\\\'\{r\}/ => [racute]
+/\\\' S/ => [Sacute]
+/\\\'S/ => [Sacute]
+/\\\'\{S\}/ => [Sacute]
+/\\\' s/ => [sacute]
+/\\\'s/ => [sacute]
+/\\\'\{s\}/ => [sacute]
+/\\\' U/ => [Uacute]
+/\\\'U/ => [Uacute]
+/\\\'\{U\}/ => [Uacute]
+/\\\' u/ => [uacute]
+/\\\'u/ => [uacute]
+/\\\'\{u\}/ => [uacute]
+/\\\' Y/ => [Yacute]
+/\\\'Y/ => [Yacute]
+/\\\'\{Y\}/ => [Yacute]
+/\\\' y/ => [yacute]
+/\\\'y/ => [yacute]
+/\\\'\{y\}/ => [yacute]
+/\\\' Z/ => [Zacute]
+/\\\'Z/ => [Zacute]
+/\\\'\{Z\}/ => [Zacute]
+/\\\' z/ => [zacute]
+/\\\'z/ => [zacute]
+/\\\'\{z\}/ => [zacute]
+/\\\. C/ => [Cdotaccent]
+/\\\.C/ => [Cdotaccent]
+/\\\.\{C\}/ => [Cdotaccent]
+/\\\. c/ => [cdotaccent]
+/\\\.c/ => [cdotaccent]
+/\\\.\{c\}/ => [cdotaccent]
+/\\\. E/ => [Edotaccent]
+/\\\.E/ => [Edotaccent]
+/\\\.\{E\}/ => [Edotaccent]
+/\\\. e/ => [edotaccent]
+/\\\.e/ => [edotaccent]
+/\\\.\{e\}/ => [edotaccent]
+/\\\. G/ => [Gdotaccent]
+/\\\.G/ => [Gdotaccent]
+/\\\.\{G\}/ => [Gdotaccent]
+/\\\. g/ => [gdotaccent]
+/\\\.g/ => [gdotaccent]
+/\\\.\{g\}/ => [gdotaccent]
+/\\\. I/ => [Idotaccent]
+/\\\.I/ => [Idotaccent]
+/\\\.\{I\}/ => [Idotaccent]
+/\\\. i/ => [idotaccent]
+/\\\.i/ => [idotaccent]
+/\\\.\{i\}/ => [idotaccent]
+/\\\. \i/ => [idotaccent]
+/\\\.\i/ => [idotaccent]
+/\\\.\{\i\}/ => [idotaccent]
+/\\\. Z/ => [Zdotaccent]
+/\\\.Z/ => [Zdotaccent]
+/\\\.\{Z\}/ => [Zdotaccent]
+/\\\. z/ => [zdotaccent]
+/\\\.z/ => [zdotaccent]
+/\\\.\{z\}/ => [zdotaccent]
+/\\\= A/ => [Amacron]
+/\\\=A/ => [Amacron]
+/\\\=\{A\}/ => [Amacron]
+/\\\= a/ => [amacron]
+/\\\=a/ => [amacron]
+/\\\=\{a\}/ => [amacron]
+/\\\= E/ => [Emacron]
+/\\\=E/ => [Emacron]
+/\\\=\{E\}/ => [Emacron]
+/\\\= e/ => [emacron]
+/\\\=e/ => [emacron]
+/\\\=\{e\}/ => [emacron]
+/\\\= I/ => [Imacron]
+/\\\=I/ => [Imacron]
+/\\\=\{I\}/ => [Imacron]
+/\\\= i/ => [imacron]
+/\\\=i/ => [imacron]
+/\\\=\{i\}/ => [imacron]
+/\\\= \i/ => [imacron]
+/\\\=\i/ => [imacron]
+/\\\=\{\i\}/ => [imacron]
+/\\\= O/ => [Omacron]
+/\\\=O/ => [Omacron]
+/\\\=\{O\}/ => [Omacron]
+/\\\= o/ => [omacron]
+/\\\=o/ => [omacron]
+/\\\=\{o\}/ => [omacron]
+/\\\= U/ => [Umacron]
+/\\\=U/ => [Umacron]
+/\\\=\{U\}/ => [Umacron]
+/\\\= u/ => [umacron]
+/\\\=u/ => [umacron]
+/\\\=\{u\}/ => [umacron]
+/\\c C/ => [Ccedilla]
+/\\c\{C\}/ => [Ccedilla]
+/\\c c/ => [ccedilla]
+/\\c\{c\}/ => [ccedilla]
+/\\c K/ => [Kcedilla]
+/\\c\{K\}/ => [Kcedilla]
+/\\c k/ => [kcedilla]
+/\\c\{k\}/ => [kcedilla]
+/\\c L/ => [Lcedilla]
+/\\c\{L\}/ => [Lcedilla]
+/\\c l/ => [lcedilla]
+/\\c\{l\}/ => [lcedilla]
+/\\c N/ => [Ncedilla]
+/\\c\{N\}/ => [Ncedilla]
+/\\c n/ => [ncedilla]
+/\\c\{n\}/ => [ncedilla]
+/\\c R/ => [Rcedilla]
+/\\c\{R\}/ => [Rcedilla]
+/\\c r/ => [rcedilla]
+/\\c\{r\}/ => [rcedilla]
+/\\c S/ => [Scedilla]
+/\\c\{S\}/ => [Scedilla]
+/\\c s/ => [scedilla]
+/\\c\{s\}/ => [scedilla]
+/\\c T/ => [Tcedilla]
+/\\c\{T\}/ => [Tcedilla]
+/\\c t/ => [tcedilla]
+/\\c\{t\}/ => [tcedilla]
+/\\H O/ => [Ohungarumlaut]
+/\\H\{O\}/ => [Ohungarumlaut]
+/\\H o/ => [ohungarumlaut]
+/\\H\{o\}/ => [ohungarumlaut]
+/\\H u/ => [uhungarumlaut]
+/\\H\{u\}/ => [uhungarumlaut]
+/\\H U/ => [Uhungarumlaut]
+/\\H\{U\}/ => [Uhungarumlaut]
+/\\k A/ => [Aogonek]
+/\\k\{A\}/ => [Aogonek]
+/\\k a/ => [aogonek]
+/\\k\{a\}/ => [aogonek]
+/\\k E/ => [Eogonek]
+/\\k\{E\}/ => [Eogonek]
+/\\k e/ => [eogonek]
+/\\k\{e\}/ => [eogonek]
+/\\k I/ => [Iogonek]
+/\\k\{I\}/ => [Iogonek]
+/\\k i/ => [iogonek]
+/\\k\{i\}/ => [iogonek]
+/\\k U/ => [Uogonek]
+/\\k\{U\}/ => [Uogonek]
+/\\k u/ => [uogonek]
+/\\k\{u\}/ => [uogonek]
+/\\r A/ => [Aring]
+/\\r\{A\}/ => [Aring]
+/\\r a/ => [aring]
+/\\r\{a\}/ => [aring]
+/\\r U/ => [Uring]
+/\\r\{U\}/ => [Uring]
+/\\r u/ => [uring]
+/\\r\{u\}/ => [uring]
+/\\u A/ => [Abreve]
+/\\u\{A\}/ => [Abreve]
+/\\u a/ => [abreve]
+/\\u\{a\}/ => [abreve]
+/\\u E/ => [Ebreve]
+/\\u\{E\}/ => [Ebreve]
+/\\u e/ => [ebreve]
+/\\u\{e\}/ => [ebreve]
+/\\u G/ => [Gbreve]
+/\\u\{G\}/ => [Gbreve]
+/\\u g/ => [gbreve]
+/\\u\{g\}/ => [gbreve]
+/\\u I/ => [Ibreve]
+/\\u\{I\}/ => [Ibreve]
+/\\u i/ => [ibreve]
+/\\u\{i\}/ => [ibreve]
+/\\u \i/ => [ibreve]
+/\\u\{\i\}/ => [ibreve]
+/\\u O/ => [Obreve]
+/\\u\{O\}/ => [Obreve]
+/\\u o/ => [obreve]
+/\\u\{o\}/ => [obreve]
+/\\u U/ => [Ubreve]
+/\\u\{U\}/ => [Ubreve]
+/\\u u/ => [ubreve]
+/\\u\{u\}/ => [ubreve]
+/\\v C/ => [Ccaron]
+/\\v\{C\}/ => [Ccaron]
+/\\v c/ => [ccaron]
+/\\v\{c\}/ => [ccaron]
+/\\v D/ => [Dcaron]
+/\\v\{D\}/ => [Dcaron]
+/\\v d/ => [dcaron]
+/\\v\{d\}/ => [dcaron]
+/\\v E/ => [Ecaron]
+/\\v\{E\}/ => [Ecaron]
+/\\v e/ => [ecaron]
+/\\v\{e\}/ => [ecaron]
+/\\v L/ => [Lcaron]
+/\\v\{L\}/ => [Lcaron]
+/\\v l/ => [lcaron]
+/\\v\{l\}/ => [lcaron]
+/\\v N/ => [Ncaron]
+/\\v\{N\}/ => [Ncaron]
+/\\v n/ => [ncaron]
+/\\v\{n\}/ => [ncaron]
+/\\v R/ => [Rcaron]
+/\\v\{R\}/ => [Rcaron]
+/\\v r/ => [rcaron]
+/\\v\{r\}/ => [rcaron]
+/\\v S/ => [Scaron]
+/\\v\{S\}/ => [Scaron]
+/\\v s/ => [scaron]
+/\\v\{s\}/ => [scaron]
+/\\v T/ => [Tcaron]
+/\\v\{T\}/ => [Tcaron]
+/\\v t/ => [tcaron]
+/\\v\{t\}/ => [tcaron]
+/\\v Z/ => [Zcaron]
+/\\v\{Z\}/ => [Zcaron]
+/\\v z/ => [zcaron]
+/\\v\{z\}/ => [zcaron]
+/\\\" \i/ => [idiaeresis]
+/\\\"\i/ => [idiaeresis]
+/\\\"\{\i\}/ => [idiaeresis]
+/\^\^00/ => [textgrave]
+/\^\^01/ => [textacute]
+/\^\^02/ => [textcircumflex]
+/\^\^03/ => [texttilde]
+/\^\^04/ => [textdiaeresis]
+/\^\^05/ => [texthungarumlaut]
+/\^\^06/ => [textring]
+/\^\^07/ => [textcaron]
+/\^\^08/ => [textbreve]
+/\^\^09/ => [textmacron]
+/\^\^0a/ => [textdotaccent]
+/\^\^0b/ => [textcedilla]
+/\^\^0c/ => [textogonek]
+/\^\^0d/ => [quotesinglebase]
+/\^\^0e/ => [guilsingleleft]
+/\^\^0f/ => [guilsingleright]
+/\^\^10/ => [quotedblleft]
+/\^\^11/ => [quotedblright]
+/\^\^12/ => [quotedblbase]
+/\^\^13/ => [leftguillemot]
+/\^\^14/ => [rightguillemot]
+/\^\^15/ => [endash]
+/\^\^16/ => [emdash]
+/\^\^19/ => [dotlessi]
+/\^\^1a/ => [dotlessj]
+/\^\^22/ => [quotedbl]
+/\^\^25/ => [percent]
+/\^\^27/ => [quoteright]
+/\^\^2d/ => [softhyphen]
+/\^\^5c/ => [textbackslash]
+/\^\^5e/ => [textasciicircum]
+/\^\^5f/ => [textunderscore]
+/\^\^60/ => [quoteleft]
+/\^\^7b/ => [textbraceleft]
+/\^\^7d/ => [textbraceright]
+/\^\^7e/ => [textasciitilde]
+/\^\^80/ => [Abreve]
+/\200/ => [Abreve]
+/\^\^81/ => [Aogonek]
+/\201/ => [Aogonek]
+/\^\^82/ => [Cacute]
+/\202/ => [Cacute]
+/\^\^83/ => [Ccaron]
+/\203/ => [Ccaron]
+/\^\^84/ => [Dcaron]
+/\204/ => [Dcaron]
+/\^\^85/ => [Ecaron]
+/\205/ => [Ecaron]
+/\^\^86/ => [Eogonek]
+/\206/ => [Eogonek]
+/\^\^87/ => [Gbreve]
+/\207/ => [Gbreve]
+/\^\^88/ => [Lacute]
+/\210/ => [Lacute]
+/\^\^89/ => [Lcaron]
+/\211/ => [Lcaron]
+/\^\^8a/ => [Lstroke]
+/\212/ => [Lstroke]
+/\^\^8b/ => [Nacute]
+/\213/ => [Nacute]
+/\^\^8c/ => [Ncaron]
+/\214/ => [Ncaron]
+/\^\^8d/ => [Eng]
+/\215/ => [Eng]
+/\^\^8d/ => [Neng]
+/\215/ => [Neng]
+/\^\^8e/ => [Ohungarumlaut]
+/\216/ => [Ohungarumlaut]
+/\^\^8f/ => [Racute]
+/\217/ => [Racute]
+/\^\^90/ => [Rcaron]
+/\220/ => [Rcaron]
+/\^\^91/ => [Sacute]
+/\221/ => [Sacute]
+/\^\^92/ => [Scaron]
+/\222/ => [Scaron]
+/\^\^93/ => [Scedilla]
+/\223/ => [Scedilla]
+/\^\^94/ => [Tcaron]
+/\224/ => [Tcaron]
+/\^\^95/ => [Tcedilla]
+/\225/ => [Tcedilla]
+/\^\^96/ => [Uhungarumlaut]
+/\226/ => [Uhungarumlaut]
+/\^\^97/ => [Uring]
+/\227/ => [Uring]
+/\^\^98/ => [Ydiaeresis]
+/\230/ => [Ydiaeresis]
+/\^\^99/ => [Zacute]
+/\231/ => [Zacute]
+/\^\^9a/ => [Zcaron]
+/\232/ => [Zcaron]
+/\^\^9b/ => [Zdotaccent]
+/\233/ => [Zdotaccent]
+/\^\^9c/ => [IJligature]
+/\234/ => [IJligature]
+/\^\^9d/ => [Idotaccent]
+/\235/ => [Idotaccent]
+/\^\^9e/ => [dstroke]
+/\236/ => [dstroke]
+/\^\^9f/ => [sectionmark]
+/\237/ => [sectionmark]
+/\^\^a0/ => [abreve]
+/\240/ => [abreve]
+/\^\^a1/ => [aogonek]
+/\241/ => [aogonek]
+/\^\^a2/ => [cacute]
+/\242/ => [cacute]
+/\^\^a3/ => [ccaron]
+/\243/ => [ccaron]
+/\^\^a4/ => [dcaron]
+/\244/ => [dcaron]
+/\^\^a5/ => [ecaron]
+/\245/ => [ecaron]
+/\^\^a6/ => [eogonek]
+/\246/ => [eogonek]
+/\^\^a7/ => [gbreve]
+/\247/ => [gbreve]
+/\^\^a8/ => [lacute]
+/\250/ => [lacute]
+/\^\^a9/ => [lcaron]
+/\251/ => [lcaron]
+/\^\^aa/ => [lstroke]
+/\252/ => [lstroke]
+/\^\^ab/ => [nacute]
+/\253/ => [nacute]
+/\^\^ac/ => [ncaron]
+/\254/ => [ncaron]
+/\^\^ad/ => [eng]
+/\255/ => [eng]
+/\^\^ae/ => [ohungarumlaut]
+/\256/ => [ohungarumlaut]
+/\^\^af/ => [racute]
+/\257/ => [racute]
+/\^\^b0/ => [rcaron]
+/\260/ => [rcaron]
+/\^\^b1/ => [sacute]
+/\261/ => [sacute]
+/\^\^b2/ => [scaron]
+/\262/ => [scaron]
+/\^\^b3/ => [scedilla]
+/\263/ => [scedilla]
+/\^\^b4/ => [tcaron]
+/\264/ => [tcaron]
+/\^\^b5/ => [tcedilla]
+/\265/ => [tcedilla]
+/\^\^b6/ => [uhungarumlaut]
+/\266/ => [uhungarumlaut]
+/\^\^b7/ => [uring]
+/\267/ => [uring]
+/\^\^b8/ => [ydiaeresis]
+/\270/ => [ydiaeresis]
+/\^\^b9/ => [zacute]
+/\271/ => [zacute]
+/\^\^ba/ => [zcaron]
+/\272/ => [zcaron]
+/\^\^bb/ => [zdotaccent]
+/\273/ => [zdotaccent]
+/\^\^bc/ => [ijligature]
+/\274/ => [ijligature]
+/\^\^bd/ => [exclamdown]
+/\275/ => [exclamdown]
+/\^\^be/ => [questiondown]
+/\276/ => [questiondown]
+/\^\^bf/ => [textsterling]
+/\277/ => [textsterling]
+/\^\^c0/ => [Agrave]
+/\300/ => [Agrave]
+/\^\^c1/ => [Aacute]
+/\301/ => [Aacute]
+/\^\^c2/ => [Acircumflex]
+/\302/ => [Acircumflex]
+/\^\^c3/ => [Atilde]
+/\303/ => [Atilde]
+/\^\^c4/ => [Adiaeresis]
+/\304/ => [Adiaeresis]
+/\^\^c5/ => [Aring]
+/\305/ => [Aring]
+/\^\^c6/ => [AEligature]
+/\306/ => [AEligature]
+/\^\^c7/ => [Ccedilla]
+/\307/ => [Ccedilla]
+/\^\^c8/ => [Egrave]
+/\310/ => [Egrave]
+/\^\^c9/ => [Eacute]
+/\311/ => [Eacute]
+/\^\^ca/ => [Ecircumflex]
+/\312/ => [Ecircumflex]
+/\^\^cb/ => [Ediaeresis]
+/\313/ => [Ediaeresis]
+/\^\^cc/ => [Igrave]
+/\314/ => [Igrave]
+/\^\^cd/ => [Iacute]
+/\315/ => [Iacute]
+/\^\^ce/ => [Icircumflex]
+/\316/ => [Icircumflex]
+/\^\^cf/ => [Idiaeresis]
+/\317/ => [Idiaeresis]
+/\^\^d0/ => [Eth]
+/\320/ => [Eth]
+/\^\^d0/ => [Dstroke]
+/\320/ => [Dstroke]
+/\^\^d1/ => [Ntilde]
+/\321/ => [Ntilde]
+/\^\^d2/ => [Ograve]
+/\322/ => [Ograve]
+/\^\^d3/ => [Oacute]
+/\323/ => [Oacute]
+/\^\^d4/ => [Ocircumflex]
+/\324/ => [Ocircumflex]
+/\^\^d5/ => [Otilde]
+/\325/ => [Otilde]
+/\^\^d6/ => [Odiaeresis]
+/\326/ => [Odiaeresis]
+/\^\^d7/ => [OEligature]
+/\327/ => [OEligature]
+/\^\^d8/ => [Ostroke]
+/\330/ => [Ostroke]
+/\^\^d9/ => [Ugrave]
+/\331/ => [Ugrave]
+/\^\^da/ => [Uacute]
+/\332/ => [Uacute]
+/\^\^db/ => [Ucircumflex]
+/\333/ => [Ucircumflex]
+/\^\^dc/ => [Udiaeresis]
+/\334/ => [Udiaeresis]
+/\^\^dd/ => [Yacute]
+/\335/ => [Yacute]
+/\^\^de/ => [Thorn]
+/\336/ => [Thorn]
+/\^\^df/ => [Ssharp]
+/\337/ => [Ssharp]
+/\^\^e0/ => [agrave]
+/\340/ => [agrave]
+/\^\^e1/ => [aacute]
+/\341/ => [aacute]
+/\^\^e2/ => [acircumflex]
+/\342/ => [acircumflex]
+/\^\^e3/ => [atilde]
+/\343/ => [atilde]
+/\^\^e4/ => [adiaeresis]
+/\344/ => [adiaeresis]
+/\^\^e5/ => [aring]
+/\345/ => [aring]
+/\^\^e6/ => [aeligature]
+/\346/ => [aeligature]
+/\^\^e7/ => [ccedilla]
+/\347/ => [ccedilla]
+/\^\^e8/ => [egrave]
+/\350/ => [egrave]
+/\^\^e9/ => [eacute]
+/\351/ => [eacute]
+/\^\^ea/ => [ecircumflex]
+/\352/ => [ecircumflex]
+/\^\^eb/ => [ediaeresis]
+/\353/ => [ediaeresis]
+/\^\^ec/ => [igrave]
+/\354/ => [igrave]
+/\^\^ed/ => [iacute]
+/\355/ => [iacute]
+/\^\^ee/ => [icircumflex]
+/\356/ => [icircumflex]
+/\^\^ef/ => [idiaeresis]
+/\357/ => [idiaeresis]
+/\^\^f0/ => [eth]
+/\360/ => [eth]
+/\^\^f1/ => [ntilde]
+/\361/ => [ntilde]
+/\^\^f2/ => [ograve]
+/\362/ => [ograve]
+/\^\^f3/ => [oacute]
+/\363/ => [oacute]
+/\^\^f4/ => [ocircumflex]
+/\364/ => [ocircumflex]
+/\^\^f5/ => [otilde]
+/\365/ => [otilde]
+/\^\^f6/ => [odiaeresis]
+/\366/ => [odiaeresis]
+/\^\^f7/ => [oeligature]
+/\367/ => [oeligature]
+/\^\^f8/ => [ostroke]
+/\370/ => [ostroke]
+/\^\^f9/ => [ugrave]
+/\371/ => [ugrave]
+/\^\^fa/ => [uacute]
+/\372/ => [uacute]
+/\^\^fb/ => [ucircumflex]
+/\373/ => [ucircumflex]
+/\^\^fc/ => [udiaeresis]
+/\374/ => [udiaeresis]
+/\^\^fd/ => [yacute]
+/\375/ => [yacute]
+/\^\^fe/ => [thorn]
+/\376/ => [thorn]
+/\^\^ff/ => [ssharp]
+/\377/ => [ssharp]
diff --git a/tex/context/patterns/lang-et.pat b/tex/context/patterns/lang-et.pat
new file mode 100644
index 000000000..f49086df5
--- /dev/null
+++ b/tex/context/patterns/lang-et.pat
@@ -0,0 +1,1278 @@
+% context pattern file, see lang-et.rme for original comment
+
+% source of data: ethyph.tex
+
+% begin pattern data
+
+\patterns {
+.au1a
+.ee2l
+.eel1e
+.eel1u
+.ee2s1
+.era1a
+.ise1e
+.ki2p3r
+.lep3l
+.lõpp3
+.moe3
+.pe2a
+.re2o
+.re2pr
+.se2a
+.sk2
+.sp2
+.st2
+.supe2
+.tu3sa
+.uudi2
+.vere1
+.üle1e
+aa1al
+aa1ar
+a1aas
+aadi1a
+aadio3
+a1ae
+a1a2he
+aa1i
+a1ait
+aa2ju
+a1aken
+aal1e2l
+aalk2
+aal1t
+aa2l1õ
+aari2s
+aase2
+aa2s1o
+1aasta
+a1asul
+aas1ü
+a1au
+a1b
+1abie
+a1d
+1admir
+a1eali
+ae2d
+1aed.
+aed1o
+2aee
+a1ees
+1aeg.
+2a1e2h
+a1eks
+2ael
+a1ett
+a1f
+a2fr
+a1g
+1a2gent
+a3graa
+1a2hi.
+ai2a
+a1ilm
+a1ins
+a1j
+1ajam
+a2jami
+1aken.
+a1k2las
+akna1
+ak2re
+a1kree
+a1krii
+a3kroo
+1a2ku.
+1a2lald
+al1do
+ali1sp
+al2l1ü
+a2l1ol
+alp2l
+1alun
+2aluni
+a1m
+1ametn
+ami2sa
+1analü
+1ansam
+1anten
+a1o2m
+a1or
+ao2s
+a1osa
+a1ots
+a1plaa
+1aretu
+1arhit
+1arst
+1arter
+1a2rua
+1arvam
+1arvu
+1asend
+a1so
+as1ole
+asp2
+a1s2por
+atii2v
+a1t2ree
+atu1a
+auba1a
+a1ui
+a1u2j
+aulu1
+a1umb
+au2sul
+1auto
+a1v
+1avald
+av2s
+a1õ2
+a1ö
+a1ä2
+a1ü2
+a1ž
+1ba
+ba1e
+ba1k2r
+ba1o
+ba1p2r
+ba1u2s
+2b1d
+1be
+be1a2
+bek2
+be2r1õ
+1bi
+2bi1e2
+2binõ
+2b1j
+2b1k
+2b1l
+2b1m
+2b1n
+1bo
+2bp
+2b1r
+3b2rig
+3b2roka
+2bs
+b1so
+2b1t
+1bu
+bu1a2
+2b1v
+1da
+dae2
+d1ain
+da2la.
+da1o
+2d1arv
+d1b
+1de
+de1ar
+dek2s1a
+de2pre
+2d1f
+d1g
+2d1h
+1di
+di1a2re
+di1es
+dis2kr
+2d1j
+2d3k2
+2d1l
+2d1m
+2d1n
+d1o2sa
+2d1p2
+2d1r
+3d2reen
+3drena
+2d1s
+2d3t2
+1du
+du2s1a2
+dusk2
+2d1v
+2dži
+eaa2
+ea1aj
+e1aas
+e1ae
+e1a2gen
+e1ai
+e1a2j
+e1a2la.
+e1alu
+e1arm
+e1arv
+e1a2se
+ea2sut
+e1au
+e1b
+e1d
+e2dž
+e1eali
+e1ees
+ee2hi
+1eelar
+e1e2lu.
+ee2pra
+ee2r1ap
+ee2s1ü
+e1e2ten
+e1g
+1ehit
+e2hiti
+eh2t1a
+e1iga.
+e1ilm
+e1i2nim
+e1ins
+e1istm
+e1j
+e1k2lo
+ek2ra
+e1kram
+1eksem
+1ekska
+eks2pr
+1ekstr
+1ekviv
+1e2lamu
+1eleme
+e3li
+e2l1ol
+el1t2r
+1elun
+e1m
+emne1
+1e2nerg
+eo2hu
+e1o2le
+e1o2lu
+eo1p2
+e1o2sak
+e1ots
+e1p
+ep2l
+ep2ri
+ep2ru
+er1ain
+ere1el
+1ergu
+er1kr
+er2pre
+e3saa
+es1an
+1ese.
+esi1e
+1esine
+es2kl
+es2kr
+es2k1ö
+e1so
+es1ole
+es2por
+1ette
+e1ug
+e1u2j
+e1u2l
+e1usk
+eu2tr
+e1uu
+e1v
+e1õ2
+e1ö
+e1ä2
+e1ü2
+e1ž
+1fa
+1fe
+2f1f
+1fi
+2f1l
+flu2
+2f1n
+1fo
+2fra
+f2rees
+2f1t
+1ga
+ga1k2
+ga1o
+ga1p2
+gasi1a
+2gatsu
+g1b
+1ge
+ge1a
+ge1k2l
+2g1h
+1gi
+gik2
+2g1j
+2g1k
+2g1l
+2g1m
+2g1n
+1gol
+g1o2sa
+2g1p2
+2g1r
+3g2rana
+3g2rav
+3g2rup
+2g1s
+2g1t
+1gu
+gu1e
+gulu2
+gu3p2
+gu1spo
+2g1v
+2g1õ
+1gü
+1ha
+haa2s
+ha1e
+1he
+he2rai
+h1h
+1hi
+hia2
+hi2kl
+h1j
+h1l
+h1m
+h1n
+1ho
+hoa2
+2h1p
+h2t1ae
+h2t1a2j
+h2t1ar
+htea2
+ht3s
+htu1
+h2t1ö
+1hu
+hu1a
+hu2lo
+2h1v
+hva1a
+1hõ
+1hö
+1hä
+1hü
+iaa2l
+i1aast
+i1a2bi
+i1ae
+i1a2hi
+i1aine
+ia2ja
+i1akt
+ia2la
+i1ala.
+i1alb
+i1all
+i1a2lu
+i1amet
+i1anal
+ia1o
+ia1p2
+i1a2par
+i1arm
+i1ars
+i1arv
+i1a2si
+i1a2su
+i1a2tel
+i1au
+i1a2vaj
+i1b
+i1d
+idu1u
+i1eal
+i1eel
+i1e2h
+iek3r
+i1eks
+ie2lu
+i1eos
+ie2sin
+i1f
+i2fr
+i1g
+igi1a
+igio2
+i3g2ram
+ii2kl
+ii2kr
+iima1a
+i1inde
+iin1k2
+i1istu
+ii2vo
+i1j
+i1k
+i2kaut
+ikk2r
+ik2laa
+ik2las
+i2kli
+ik2re
+ik1t2r
+1ilme
+1ilmut
+il2pl
+1i2lust
+i1m
+imi2s1
+i1n
+in2d1al
+1indek
+indo1
+1iniml
+inna1a
+1insen
+1insp
+1inven
+i1oht
+i1o2lek
+i1o2lu.
+i1o2man
+ioo2na
+iooni1
+i1o2per
+i1o2sa
+i1ots.
+i1p
+ip2la
+i2plo
+ip2r
+ip2sp
+irja1o
+i2s1au
+i2selu
+1isola
+i1sot
+isp2
+is2por
+is1üh
+is1ü2l
+2it
+it2or
+i1traf
+i3tseh
+itte1
+iu2ju
+iu2mo
+ium1p
+i1v
+ivii2l
+i1õ2
+i1ä
+i1ü2
+i1š
+i1ž
+3jaa
+ja1aa
+ja1aj
+ja1ann
+ja1arm
+ja1as
+ja1ee
+ja1e2l
+ja1i2
+2jam.
+ja1ost
+ja1p2
+je1a2
+je1i
+ju1a
+1ka
+2k1aed
+2k1aeg
+2k1a2lus
+kar2pl
+2k1asj
+2k1b
+2k1d
+1ke
+2keem.
+ke1in
+ke1kr
+2kelet
+2ken.
+ke1o
+kes2k1a2
+2k1f
+k1g
+2k1h
+1ki
+kiu2d
+2k1j
+2k1k
+kk3s2
+kku1k
+1k2laas
+2klai
+k2lamb
+2klan
+k2lapp
+1k2leit
+2klem
+3kliim
+2kloom
+2klu
+2k1m
+2k1n
+1ko
+2k1p2
+k2raan
+1kraav
+1krab
+k2rae
+1k2reem
+2kreep
+k2res
+k2rii
+2kro
+3krohv
+k2ruu
+k2ruv
+1kruvi
+2ks
+ks2kr
+k1so
+ks2pl
+2kt
+1ku
+ku1a
+kuu1k
+2k1v
+3k2vant
+3kvart
+1kõ
+1kö
+1kä
+1kü
+kü2h
+2k1ühe
+k1š
+1la
+laa2r1a
+l1a2la.
+l1alk
+2lanik
+2l1arv
+2lauto
+2l1b
+1le
+le1a2
+le1ee
+2lekk
+2lektr
+le1oh
+le2sa
+l1f
+lf2re
+lgu2sa
+2l1h
+1li
+li1aas
+li1aj
+li1ar
+li1a2s
+li1e2
+2lii.
+2liia
+2liima
+li2kra
+2l1ilm
+li1o2l
+lip2l
+li1t2re
+li1uj
+2l1j
+2l1k
+2l1l
+llk2
+l2lor
+l3lu
+2l1m
+lmi1a2
+2l1n
+1lo
+2l1o2le
+lo2lij
+l1orn
+2l1o2sa.
+2l1p
+lp2r
+2l1r
+2l1s
+2lt
+1lu
+lu1ah
+lu1ai
+lu1al
+lu1as
+lue2
+lu1el
+lu1il
+l1uks.
+2lun
+lusa2
+2luss.
+2l1v
+lve1a
+1lõ
+1lö
+1lä
+1lü
+l1š
+1ma
+ma1a2bi
+ma1e2
+ma1k2l
+map2
+ma1pl
+2mb
+mbe2r
+mber1a
+2m1d
+1me
+me1a2
+meo2
+me1os
+2metn
+2m1f
+2m1h
+1mi
+mi1aj
+mi1e
+mip2
+misa2
+mi3si
+misk2
+miso2
+mis3tr
+mi2sü
+2m1j
+2m1k2
+2m1l
+2m1m
+2m1n
+1mo
+m1oks
+2mp
+2m1r
+2m1s
+m2st
+2m3t2
+1mu
+mua2
+mu1ah
+2m1v
+1mö
+1mä
+1mü
+1na
+na1aa
+naa2ra
+na1i2ni
+2nalü
+na1o
+na1p2l
+na1p2r
+na1us
+2n1d
+nde1a2
+ndu2s
+n2dž
+1ne
+2ne2hit
+nese1i
+2n1f
+2n1g
+2n1h
+1ni
+ni1aj
+ni1as
+ni1e2
+2nimen
+2niml
+ni1so
+nisu1
+2n1j
+2nk
+nksp2
+2n1l
+2n1m
+2n1n
+nnaa2
+nna1e2
+nna1i2
+1no
+2n1p2
+2n1r
+2ns
+ns2kr
+ns2lav
+n1so
+nsti1
+2nt
+nte2l
+nt3ra
+1nu
+nu1spo
+2n1v
+1nõ
+1nö
+1nä
+1nü
+n1š
+n1ž
+o1a2d
+o1ae
+o1a2j
+o1aku
+o1a2mat
+o1an
+o1b
+1obj
+o1d
+odaa2
+odaal1
+oe2le
+o1elek
+o1f
+o2fr
+o1go
+1ohak
+o2haka
+o1iso
+oi2t1ai
+oiu1a
+o1j
+1o2lek.
+o2lev
+o2lija
+o2mad
+1omadu
+o1opti
+2oos
+opsu1
+o2r1ai
+1orav
+1or3g2
+2orgr
+ori1sp
+1orju
+1orkes
+1orna
+os2kl
+1oskus
+os1o2l
+1otsa
+o3tsö
+o1v
+o1õ
+o1ü2
+o1že
+1pa
+pa1a2m
+pan3sl
+1pe
+pea1a
+pe2a3j
+2p1eksk
+pep2r
+p1f2
+p1h
+1pi
+pi2kl
+pila2s
+pi2p3r
+2p1j
+2p1k
+p2laat
+3plak
+1p2lasm
+plek2s1
+2plem
+2pli
+3pliia
+p2luus
+2p1m
+2p1n
+3p2neu
+1po
+pordi1
+2pp
+p2p1as
+ppe1a
+p2raa
+p2rep
+1p2roo
+1p2rot
+2p1s
+p2st
+3p2sü
+2p1t
+1pu
+2p1v
+1põ
+1pö
+1pä
+1pü
+1ra
+raa2l1a
+2raav
+2rafo
+ra1kr
+2r1anal
+ra2par
+ra1pr
+raua3
+raud1
+rau2da
+2rauk
+2raum
+2rauto
+r1b
+r1d
+rde1a
+1re
+2reene
+2rehit
+re2pre
+2rette
+r1f
+r1g
+r2g1ae
+r2g1ah
+r1h
+1ri
+ri1aj
+ri1ala
+ri1a2m
+ri3br
+ri1ek
+ri1el
+2riip.
+ri1om
+ri1ots
+rip2p
+rippa2
+ri1t2r
+r1j
+r1l
+r1m
+r1n
+1ro
+roa2
+ro1e2
+2rohv
+r1p
+2r1r
+r1so
+r1s2po
+1ru
+rua2
+ru1k2r
+ruum1a2
+r1v
+1rõ
+1rö
+1rä
+1rü
+r1š
+r1ž
+1sa
+s1aas
+2s1ae
+s1agr
+s1ahi
+s1ain
+2saine
+2sala.
+sa3li
+s1alus
+2s1ann
+2sarvu
+s1asen
+sa1spo
+2s1aut
+s3b2
+s3d2
+1se
+se1ala
+se1ar
+se1eh
+2s1ees
+2sehh
+2se2hit
+sei2g
+se1k2l
+se2lam
+2sellu
+2semen
+2sensu
+sep2r
+2se2se.
+2s1esit
+2s1e2ten
+se1t2r
+2sette
+s1f
+s3g2
+2s1h
+1si
+si1aj
+si1ar
+sie2
+si1el
+s1i2ha.
+s1ins
+si1os
+si1s2p
+sisse1
+si1ur
+2s1j
+sjaa2
+2s1k
+ske1a2
+sk2lei
+3sk2ler
+s2kli
+3s2kulp
+s3kvar
+s2k1õ2li
+2s1l
+2s1m
+2s1n
+1sobi
+s1oht
+1soi
+s1oks
+2sole
+s1o2lek
+1son
+1soo
+s1orj
+1sort
+s1os
+2so2sa
+s1p
+s2prii
+2spu
+2s1r
+2s1s
+ss2po
+s1t
+1staad
+2ste
+2sto
+s2tr
+st2rei
+s3tseh
+s3t2sü
+stus1a
+stu2si
+1s2tuud
+1su
+2sula.
+2s1uss.
+2s1v
+1sõ
+2s1õh
+2s1õig
+s1õ2li
+2s1õ2p
+1sö
+2s1ö2k
+2sön
+1sä
+1sü
+2sü2h
+2sülek
+s1š
+1ta
+2taad
+taa2r1e
+2tabii
+2tahi.
+2t1aine
+ta3lu
+2tatis
+t1b
+2t3d2
+1te
+te1al
+te1an
+te1a2s
+te1a2va
+teis2t
+te1k2l
+te1s2p
+t1f
+t1g
+2t1h
+1ti
+ti1aj
+ti1al
+ti1as
+ti1e2
+ti1os
+2t1j
+2t1k
+tk2la
+tk2r
+2t1l
+tlu2sa
+2t1m
+tmi2s1
+2t1n
+1to
+to1el
+to1in
+2t1o2sa.
+2t1p2
+t1r
+t2rall
+1t2ran
+1traum
+3treim
+1t2rep
+1triip
+1t2ruu
+1t2rü
+2t1s
+t3sae
+tsea2
+1tseh
+3tsehh
+t2sp2
+t2st
+2t1t
+tte1e
+1tu
+tu1ar
+tua2s
+tu1kr
+tu2sa
+tus1a2j
+tusk2
+tuss2
+tus3t2
+tu2sõ
+tu2sül
+2t1v
+1tõ
+2tõmbl
+1tö
+töök2
+töö1p2
+1tä
+täi2s1
+1tü
+2t1ü2hen
+t1š
+1tšek
+1tšem
+uaa2l
+u1ae
+u1ain
+u1akt
+ua2la
+u1alu
+u1an
+ua1o
+ua1p2
+ua2se
+ua2si.
+u1ast
+u1au
+ua2val
+u1b
+u1do
+u3d2raa
+u1eh
+u1ei
+u1eks
+ue2l
+u1elu
+u1f
+u1g
+u1i2ga.
+u1i2h
+ui2kl
+u1ilm
+1uim.
+u1j
+u2jumi
+u1kraa
+u1kruv
+u2l1ol
+u3lu
+u1m
+unaa2
+u1o
+uo2l
+uo2m
+uo2p
+uo2s
+u1p
+u2pl
+u3p2la
+up2r
+uraa2l
+ur1auk
+1urb.
+urp2
+us1abi
+us1ais
+us1akt
+usa2l
+us1ala
+us1a2p
+us1are
+us1arm
+u2sasu
+use1an
+u2s1iso
+usk2r
+us1oh
+us1o2l
+usp2
+u1s2por
+1u2suli
+us1üh
+u2s1ük
+u1t
+u2tri
+utus1a
+u2tš
+1uuen
+uule1
+u1uu
+u1v
+u1õ2
+u1ö
+u1ä2
+u1ü2
+u1ž
+1va
+va1a2j
+2v1ain
+va1kr
+va1p2l
+2vart
+vas2k1a
+2v1d
+1ve
+vee1a
+vee1k
+vee1sp
+2v3g2
+2v1h
+1vi
+2viitu
+2v1j
+2v1k
+2v1l
+2v1m
+2v1n
+2v1p2
+2v1r
+2v1s
+2v1t
+2v1v
+1zo
+õ1b
+õbe1
+õ1g
+õhi1
+õhie2
+1õigu
+õi2kl
+õ1j
+õja1
+1õmbl
+õ2petu
+õra2s1
+õu1a2r
+õude1
+1õun.
+õ1v
+ö1a2
+ö1b
+ö1d
+ö2dee
+ö1g
+ö1h
+ö1j
+ö1k
+1ö2kon
+ö1l
+öli2s1
+ö1m
+ö2p1au
+ö1p2la
+ö1v
+ö1õ
+öö1e
+öö1i
+öö1o2
+ä1b
+ä1d
+äe1a
+äe1o2
+ä1g
+ä1j
+1ä2ke.
+äli2sa
+ära1a
+ära1o
+ü1b
+ü1g
+ühi1a
+1ühik
+ü2hik.
+ü1j
+ü2lek
+1üleka
+1ü2les
+üle2se
+1ü2liko
+ü1so
+1ütle
+ü1v
+üügi1
+üü2l1a2
+1ša
+1še
+2šek
+2šem
+1ši
+š1k
+š1m
+š1p
+1šö
+1šü
+1ža
+1ži
+1žo
+}
+
+% end pattern data
+
diff --git a/tex/context/patterns/lang-et.rme b/tex/context/patterns/lang-et.rme
new file mode 100644
index 000000000..073de4c54
--- /dev/null
+++ b/tex/context/patterns/lang-et.rme
@@ -0,0 +1,30 @@
+% comment copied from public hyphenation files}
+
+% source of data: ethyph.tex
+
+% begin original comment
+
+
+% preamble of file c:/data/develop/tex/texmf/tex/generic/hyphen/ethyph.tex
+%%% ====================================================================
+%%% @LaTeX-file{
+%%% author = "Enn Saar",
+%%% version = "1.0",
+%%% date = "1992-03-18"
+%%% time = ""
+%%% filename = "ethyphen.tex",
+%%% address = ""
+%%% telephone = "",
+%%% FAX = "",
+%%% checksum = "",
+%%% email = "saar@fuug.fi",
+%%% codetable = "DC/EC",
+%%% keywords = "",
+%%% supported = "yes",
+%%% docstring = "\lefthyphenmin=?\righthyphenmin=?"
+%%% }
+%%% ====================================================================
+\input cathyph.tex
+
+% end original comment
+
diff --git a/web2c/context.cnf b/web2c/context.cnf
index 5cd5cd824..92ff8a7ae 100644
--- a/web2c/context.cnf
+++ b/web2c/context.cnf
@@ -59,7 +59,8 @@ TEXFONTMAPS.dvips = .;$TEXMF/fonts/map/{dvips,pdftex,}//;./fonts//
TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,$engine,pdftex,dvips,}//;$TEXMF/{$progname,$engine,pdftex,dvips}/{config,}//;./fonts//
VFFONTS = .;$TEXMF/fonts/vf//;./fonts//
-TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//;./fonts//
+#~ TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm//;./fonts//
+TFMFONTS = .;$TEXMF/fonts/tfm//;./fonts//
T1FONTS = .;$TEXMF/fonts/{type1,pfb}//;$TEXMF/fonts/misc/hbf//;$OSFONTDIR;./fonts//
AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR;./fonts//
LIGFONTS = .;$TEXMF/fonts/lig//;./fonts//
@@ -73,10 +74,14 @@ CMAPFONTS = .;$TEXMF/fonts/cmap//;./fonts//
SFDFONTS = .;$TEXMF/fonts/sfd//;./fonts//
OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR;./fonts//
-OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//;$TFMFONTS;./fonts//
-OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl//;./fonts//
-OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovf//;./fonts//
-OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp//;./fonts//
+#~ OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}//;$TFMFONTS;./fonts//
+#~ OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl//;./fonts//
+#~ OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovf//;./fonts//
+#~ OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp//;./fonts//
+OFMFONTS = .;$TEXMF/fonts/{ofm,tfm}//;$TFMFONTS;./fonts//
+OPLFONTS = .;$TEXMF/fonts/opl//;./fonts//
+OVFFONTS = .;$TEXMF/fonts/ovf//;./fonts//
+OVPFONTS = .;$TEXMF/fonts/ovp//;./fonts//
OTPINPUTS = .;$TEXMF/omega/otp//
OCPINPUTS = .;$TEXMF/omega/ocp//
OTFFONTS = .;$TEXMF/fonts/otf/{xetex,}//;./fonts//
@@ -85,22 +90,23 @@ OTFFONTS = .;$TEXMF/fonts/otf/{xetex,}//;./fonts//
% resource paths, can be used in paranoid situations (can be env vars)
-TXRESOURCES=rubish
+TXRESOURCES=unset
MPRESOURCES=$TXRESOURCES
MFRESOURCES=$MPRESOURCES
% some extra paths for development trees (can be env vars)
-CTXDEVTXPATH=rubish
-CTXDEVMPPATH=rubish
-CTXDEVMFPATH=rubish
+CTXDEVTXPATH=unset
+CTXDEVMPPATH=unset
+CTXDEVMFPATH=unset
% TEXINPUTS.context = .;{$TXRESOURCES}//;{$CTXDEVTXPATH};$TEXMF/{pdftex,pdfetex,etex,xetex,omega,tex}/{context,plain,generic,}//
% TEXINPUTS.context = .;{$TXRESOURCES}//;{$CTXDEVTXPATH};$TEXMF/{tex,omega}/{context,plain,generic}//
% TEXINPUTS.context = .;{$TXRESOURCES}//;{$CTXDEVTXPATH};$TEXMF/tex/{context,plain/base,generic/context,generic/hyphen,generic/omega}//
TEXINPUTS.context = .;{$TXRESOURCES}//;{$CTXDEVTXPATH};$TEXMF/tex/{context,plain/base,generic}//
MPINPUTS = .;{$MFRESOURCES}//;{$CTXDEVMPPATH};$TEXMF/metapost/{context,base,}//
-MFINPUTS = .;{$MPRESOURCES}//;{$CTXDEVMFPATH};$TEXMF/metafont/{context,base,}//;{$TEXMF/fonts,$VARTEXFONTS}/source//
+#~ MFINPUTS = .;{$MPRESOURCES}//;{$CTXDEVMFPATH};$TEXMF/metafont/{context,base,}//;{$TEXMF/fonts,$VARTEXFONTS}/source//
+MFINPUTS = .;{$MPRESOURCES}//;{$CTXDEVMFPATH};$TEXMF/metafont/{context,base,}//;$TEXMF/fonts/source//
TEXCONFIG = .;$TEXMF/{fonts/map,dvips,pdftex,dvipdfmx,dvipdfm}//
PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
@@ -108,10 +114,10 @@ DVIPDFMINPUTS = .;$TEXMF/{fonts/{map,enc,lig}/dvipdfm,fonts/type1,dvips,pdftex,d
% this way we can hook in development paths
-CTXDEVPLPATH=rubish
-CTXDEVPYPATH=rubish
-CTXDEVRBPATH=rubish
-CTXDEVJVPATH=rubish
+CTXDEVPLPATH=unset
+CTXDEVPYPATH=unset
+CTXDEVRBPATH=unset
+CTXDEVJVPATH=unset
% some old paths; we restrict the search to context paths; new ones as well as old ones