csplain (6sep13)

git-svn-id: svn://tug.org/texlive/trunk@31589 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 69 insertions, 25 deletions

diff --git a/Master/texmf-dist/tex/csplain/base/csplain.ini b/Master/texmf-dist/tex/csplain/base/csplain.ini
index 17616df4e14..b8648e5af3e 100644
--- a/Master/texmf-dist/tex/csplain/base/csplain.ini
+++ b/Master/texmf-dist/tex/csplain/base/csplain.ini
@@ -1,3 +1,4 @@
+% csplain.ini -- see the text after \dump command for more information
 \input csfonts  % re-defines primitive \font
 \input plain    % format Plain
 \restorefont    % original meaning of primitive \font
@@ -15,7 +16,7 @@
 \fi
 \ifx\enc\undefined \else \input csenc-\enc.tex \fi % re-encoding using encTeX
 
-\ifx\directlua\undefined \else\input luatexiniconfig.tex \fi         % LuaTeX specific
+\ifx\directlua\undefined \else\input luatexiniconfig.tex \fi  % LuaTeX specific
 
 \ifx\XeTeXuseglyphmetrics\undefined \else % XeTeX specific:
    \csname newcount\endcsname \XeTeXallocatorG \XeTeXallocatorG=3
@@ -29,10 +30,10 @@
 \fi
 
 \ifx\pdfoutput\undefined \else % added in Feb. 2005
-   \def\tmpa{\pdfcsplain}
-   \expandafter\def\expandafter\tmpb\expandafter{\csname\jobname\endcsname}
-   \ifx\tmpa\tmpb %% PDFTeX with PDF output
-      \message {jobname=pdfcsplain, PDF output initialised.}
+   \def\tmpa#1#2#3#4\relax{\def\tmpa{#1#2#3}}\expandafter\tmpa\jobname\relax
+   \def\tmpb{pdf} \edef\tmpa{\meaning\tmpa} \edef\tmpb{\meaning\tmpb}
+   \ifx\tmpa\tmpb %% PDFTeX with PDF output, \jobname starts by "pdf":
+      \message {jobname=pdf*, PDF output initialised.}
       \openin0=pdftexconfig.tex
       \ifeof0 \message{WARNING: pdftexconfig.tex does not exist. 
                        I set \string\pdfoutput=1 only.}%
@@ -40,18 +41,54 @@
       \fi
       \pdfoutput=1
    \else
-      \message {jobname=csplain with pdftex, DVI output initialised.}
+      \message {jobname=non-pdf, DVI output initialised.}
       \pdfoutput=0
       \let\oripdfoutput=\pdfoutput \let\pdfoutput=\undefined
    \fi
    \let\tmpa=\undefined \let\tmpb=\undefined
 \fi
 
-
 \dump
 
-Information about changes (since <Apr. 1995>)
-=============================================
+csplain.ini -- the basic file for CSplain format generation
+===========================================================
+
+The default behavior after  texengine -ini csplain.ini:
+
+   - csplain.fmt with DVI output is created
+   - plain.tex is loaded but cs fonts are preloaded instead of cm fonts
+   - \hsize, \vsize are set basely on A4 paper format (no letter)
+   - internal encoding is assumed like csfonts encoding
+   - no input--internal re-encoding is activated
+   - language patterns for English, Czech, Slovak are preloaded
+     (see the hyphen.lan file for info how to add more languages)
+   - if encTeX is detected then characters 128--255 are printable
+   - if luaTeX is used then \input luatexiniconfig is performed
+   - if XeTeX is used then \newXeTeXintercharclass is defined
+
+If pdfTeX primitives are detected and -jobname is set to "pdf*"
+(pdfsomething) then PDF output is initialized (instead DVI). Example:
+   pdftex -ini -jobname pdfcsplain csplain.ini
+
+If pdfTeX primitives are detected and PDF output is initialized and the
+pdftexconfig.tex file exists then \input pdftexconfig.tex is performed.
+
+If encTeX is detected, then the meaning of \enc sequence is a subject 
+of the following behavior:
+   \enc=u  ... UTF-8 input is activated (recommended for 8bit texengines)
+   \enc=w  ... CP1250 input is activated (usable for old Win systems)
+   \enc=p  ... CP852 input is activated (for very old systems)
+   \enc=k  ... Kamenicky input is activated (for very old DOS systems)
+   undefined . No re-encoding (usable for old Unix systems with ISO-8859-2)
+
+You can type   pdftex -ini -enc "\let\enc=u \input csplain.ini"
+or you can use a wrapper file (like csplain-utf8.ini).
+
+See http://petr.olsak.net/csplain.html for more information.
+
+
+Changes of CSplain files (since <Apr. 1995>)
+============================================
 
 ** 1 ** <Aug. 1996>
 file extcode.tex renamed to il2code.tex (suggested by Jan Kasprzak)
@@ -134,15 +171,23 @@ file extcode.tex renamed to il2code.tex (suggested by Jan Kasprzak)
 * \letfont macro introduced.
 * lmfonts.tex: \ifx\font\corkencoded \def\tmp{rm} corrected.
 
-  Jul. 2013: [format didn't modified]
+  Jul. 2013: [format wasn't modified]
 * \newXeTeXintercharclass defined for XeTeX.
 * chars-8z.tex: twice loading is protected.
 * lmfonts.tex: cs-lmtt10 loaded, encoding is OK.
 
-  Aug, 2013: [format didn't modified]
+  Aug. 2013: [format wasn't modified]
 * ams-math, tx-math.tex: \dgsize, \whichtfm corrected
 * ams-math, tx-math.tex: \mathpreloaded introduced, used in fonts/*.tex
 
+  Sep. 2013: [format wasn't modified]
+* ams-math, tx-math.tex: \mF introduced
+* ucode.tex corrected
+* fonts/*.tex: \input chars-8z only if !\corkencoded AND !\unicoded
+* exchars.tex introduced
+* csplain.ini: PDF output initialized if \jobname=pdf*
+* chars-8z: \crq 155->96
+
 
 COPYRIGHT
 =========
diff --git a/Master/texmf-dist/tex/csplain/base/ucode.tex b/Master/texmf-dist/tex/csplain/base/ucode.tex
index c252230528b..2b09558115e 100644
--- a/Master/texmf-dist/tex/csplain/base/ucode.tex
+++ b/Master/texmf-dist/tex/csplain/base/ucode.tex
@@ -2,15 +2,14 @@
 %  (0) sets \czech, \slovak to Cork encoded hyphen-pattern numbers,
 %  (1) sets \catcode, \l/uccode for characters (code by Cork),
 %  (2) defines \csaccents for new behavior of \v, \', etc (code by Cork),
-%  (3) defines some \sequences for special cs-fonts characters.
+%  (3) defines some \sequences for special characters.
 %  (4) redefines character-like macros from plainTeX as \chardef
-%  (5) if encTeX with \mubytein>0 is activated reads t1enc-u.tex file
 %
 % Created by Petr Olsak <olsak@math.feld.cvut.cz>,       November 2012
 
 \def\tmp#1#2\relax{\def\tmp{#2}}\tmp ^^^^abcd\relax
 \ifx\tmp\empty \else
-   \errhelp={The ucode.tex file expects the TeX engine which work in Unicode
+   \errhelp={The ucode.tex file expects the TeX engine which works in Unicode
              internally.}
    \errmessage{Sorry, the Unicoded TeX engine (like luatex, xetex) is not detected}
    \endinput \fi
@@ -284,7 +283,17 @@
 \chardef \aa 229
 \chardef \AA 197   
 
-% new characters in T1 encoding:
+\chardef \ellipsis   8230
+\chardef \dag        8224
+\chardef \ddag       8225
+\chardef \textbullet 8226
+\chardef \euro       8364
+\chardef \trademark  8482
+\chardef \copyright  169
+\chardef \registered 174
+\chardef \currency   164
+
+% characters from T1 encoding:
 
 \chardef \Eth       272
 \chardef \NG        330
@@ -301,14 +310,4 @@
 \chardef \sterling  163  
 \let\pound=\sterling
 
-%% (5) reading UTF-8 input encoding from t1enc-u.tex file
-
-\ifx\mubytein\undefined \expandafter \endinput \fi
-\ifnum\mubytein=0 \expandafter \endinput \fi
-
-\input t1enc-u
-
-
 \endinput
-
-