stable 2004.10.28

6 files changed, 30 insertions, 26 deletions

diff --git a/tex/context/base/cont-err.tex b/tex/context/base/cont-err.tex
index f4c503da8..8b4ca8a54 100644
--- a/tex/context/base/cont-err.tex
+++ b/tex/context/base/cont-err.tex
@@ -1,24 +1,26 @@
 %D \module
 %D   [       file=cont-err,
 %D        version=2003.08.12,
-%D          title=\CONTEXT\ System Files, 
-%D       subtitle=Just A warning, 
+%D          title=\CONTEXT\ System Files,
+%D       subtitle=Just A warning,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
-% todo : translate into language 
+% todo : translate into language
 
-\writeline
-
-\writestring{>>>> I cannot locate your local setup file. Locate 'cont-sys.rme'}
-\writestring{>>>> and copy this file to '../tex/context/usr/cont-sys.tex'. You}
-\writestring{>>>> can set cq. uncomment your local preferences in this file.}
+% \writeline
+% \writestring{>>>> I cannot locate your local setup file. Locate 'cont-sys.rme'}
+% \writestring{>>>> and copy this file to '../tex/context/usr/cont-sys.tex'. You}
+% \writestring{>>>> can set cq. uncomment your local preferences in this file.}
+% \writeline
 
 \writeline
+\writestring{> User file 'cont-sys.tex' not found, 'cont-sys.rme' has been used instead. <}
+\writeline
 
-\endinput 
+\endinput
diff --git a/tex/context/base/cont-sys.ori b/tex/context/base/cont-sys.ori
index 6860efefa..ad48b73fb 100644
--- a/tex/context/base/cont-sys.ori
+++ b/tex/context/base/cont-sys.ori
@@ -38,13 +38,13 @@
 % \setupencoding [\s!default=texnansi]
 %
 % or:
-%
-% \setupencoding [\s!default=ec]
-%
+
+\setupencoding [\s!default=ec]
+
 % If you want the default berry names:
-%
-% \usetypescript [berry] [\defaultencoding]
-%
+
+\usetypescript [berry] [\defaultencoding]
+
 % If you run into missing font metrics kind of problems,
 % you may want to uncomment:
 %
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 2e26cabb2..da8c8f28a 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -31,7 +31,7 @@
 %D 2004.8.30 the low level interface is english. Watch out and adapt
 %D your styles an modules.
 
-\def\contextversion{2004.10.26}
+\def\contextversion{2004.10.28}
 
 %D Welcome to the main module. When this module is ran through
 %D \type{initex} or \type {tex -i} or \type {whatevertex} using
diff --git a/tex/context/base/font-chi.tex b/tex/context/base/font-chi.tex
index c568a25ef..580f633b1 100644
--- a/tex/context/base/font-chi.tex
+++ b/tex/context/base/font-chi.tex
@@ -217,8 +217,8 @@
 
 \chardef\plusfour=4
 
-\def\analyzechineseunicodeglyph
-  {\chardef\chineseSstatus\zerocount\getvalue{uc\the\unicodeposition}\relax}
+\def\analyzechineseunicodeglyph % beware, no zerocount !
+  {\chardef\chineseSstatus0\getvalue{uc\the\unicodeposition}\relax}
 
 \def\analyzechineseunicodeenviroment
   {% left
diff --git a/tex/context/base/syst-gen.tex b/tex/context/base/syst-gen.tex
index 4ca2a966f..17379afb7 100644
--- a/tex/context/base/syst-gen.tex
+++ b/tex/context/base/syst-gen.tex
@@ -364,6 +364,8 @@
 \ifx\plusone  \undefined \chardef\plusone  =1                 \fi
 \ifx\plustwo  \undefined \chardef\plustwo  =2                 \fi
 \ifx\plusthree\undefined \chardef\plusthree=3                 \fi
+\ifx\plusfour \undefined \chardef\plusfour =4                 \fi
+\ifx\plusfive \undefined \chardef\plusfive =5                 \fi
 \ifx\minusone \undefined \count\minusone \minusone=-1         \fi
 
 \ifx\@m\undefined \else \let\plusthousand   \@m \fi
diff --git a/tex/context/user/cont-sys.rme b/tex/context/user/cont-sys.rme
index 6860efefa..ad48b73fb 100644
--- a/tex/context/user/cont-sys.rme
+++ b/tex/context/user/cont-sys.rme
@@ -38,13 +38,13 @@
 % \setupencoding [\s!default=texnansi]
 %
 % or:
-%
-% \setupencoding [\s!default=ec]
-%
+
+\setupencoding [\s!default=ec]
+
 % If you want the default berry names:
-%
-% \usetypescript [berry] [\defaultencoding]
-%
+
+\usetypescript [berry] [\defaultencoding]
+
 % If you run into missing font metrics kind of problems,
 % you may want to uncomment:
 %