csplain

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

4 files changed, 29 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/csplain/fonts/ams-math.tex b/Master/texmf-dist/tex/csplain/fonts/ams-math.tex
index e62c192d70a..35c94875fc0 100644
--- a/Master/texmf-dist/tex/csplain/fonts/ams-math.tex
+++ b/Master/texmf-dist/tex/csplain/fonts/ams-math.tex
@@ -212,7 +212,7 @@
 \ifx\sizemtext\undefined \setmathsizes[10/7/5]\fi
 
 \ifx\tenbi\undefined \font\tenbi=ptmbi8z \relax \fi
-\normalmath    % load families, normal shape
+\ifx\normalmathloading\relax\else \normalmath \fi  % load families, normal shape
 \mitvariables  % \rm in \fam0 and avriables in math by \mit
 
 %% \mathchardef declarations
@@ -506,3 +506,4 @@ Aug. 2013: \tmp -> \mF (the sequence is printed in overfull messages)
 Sep. 2013: \letfont plus \corrmsizes used in \setmathfamily
            \ptmunit depends on \ptunit now
            \setmathfamily <num><space><font-selector> ... (<space> added)
+Nov. 2013  Test of \normalmathloading introduced
diff --git a/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex b/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex
index aa1ed043dbf..a8ab3680259 100644
--- a/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex
+++ b/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex
@@ -8,6 +8,7 @@
 \ifx\sizespec\undefined \def\sizespec{}\fi
 
 \ifx\font\corkencoded\else \ifx\font\unicoded\else \input chars-8z \fi\fi
+\let\normalmathloading=\relax
 \ifx\mathpreloaded A\else \input ams-math \fi                     
 
 \ifx\font\corkencoded \def\tmp{ec}\else \def\tmp{cs}\fi
@@ -63,7 +64,7 @@
 \exregtfm bbfsans 0 \tmp-lmssbx10 *
 \exregtfm bbisans 0 \tmp-lmssbo10 *
 
-\normalmath
+\normalmath \let\normalmathloading=y
 
 \let\lmfonts=\font  % macros can do test:  \ifx\font\lmfonts ...
 
diff --git a/Master/texmf-dist/tex/csplain/fonts/luafonts.tex b/Master/texmf-dist/tex/csplain/fonts/luafonts.tex
index c07b2d3e798..f4653c74321 100644
--- a/Master/texmf-dist/tex/csplain/fonts/luafonts.tex
+++ b/Master/texmf-dist/tex/csplain/fonts/luafonts.tex
@@ -1,9 +1,11 @@
 % I don't understand this. This is a result of my reverse engeneering of the
-% fontspec package.
+% luaotfload.sty package.
 % LuaTeX needs these \directlua in order to \font primitive works like in XeTeX.
-% Petr Olsak     Nov. 2012
+% Petr Olsak     Nov. 2012,  Nov. 2013
 
-\message{processing luaotfload.lua }
+\ifnum\luatexversion<76 %%%
+
+\message{processing luaotfload.lua (1)}
 \directlua{luatexbase = luatexbase or {} 
               luatexbase.luatexversion = \the\luatexversion\space
               luatexbase.luatexrevision = \luatexrevision\space
@@ -17,6 +19,24 @@
            luatexbase.require_module('luaotfload')
 	   texio.write_nl = oriwrite % return to original meaning
 }
+\else %%% \luatexversion>=76
+
+\message{processing luaotfload.lua (2)}
+\expandafter\ifx\csname LuT@AllocAttribute\endcsname \relax
+   \csname newcount\expandafter \endcsname \csname LuT@AllocAttribute\endcsname \fi
+\csname LuT@AllocAttribute\endcsname=-1
+\directlua{luatexbase = luatexbase or {}
+              luatexbase.luatexversion = \the\luatexversion\space
+              luatexbase.luatexrevision = \luatexrevision\space
+           require('luatexbase.modutils')
+           require('luatexbase.attr')
+           oriwrite = texio.write_nl % I don't need to see unusual info
+           function texio.write_nl(...) end
+           require('luatexbase.mcb')
+           luatexbase.require_module('luaotfload')
+           texio.write_nl = oriwrite % return to original meaning
+}
+\fi
 \global\let\luafonts=\relax
 
 \endinput
diff --git a/Master/texmf-dist/tex/csplain/fonts/tx-math.tex b/Master/texmf-dist/tex/csplain/fonts/tx-math.tex
index 1a562f8e6d4..a88f171aeb2 100644
--- a/Master/texmf-dist/tex/csplain/fonts/tx-math.tex
+++ b/Master/texmf-dist/tex/csplain/fonts/tx-math.tex
@@ -141,7 +141,7 @@
 \ifx\sizemtext\undefined \setmathsizes[10/7/5]\fi
 
 \ifx\tenbi\undefined \font\tenbi=ptmbi8z \relax \fi
-\normalmath   % load families, normal shape
+\ifx\normalmathloading\relax\else \normalmath \fi  % load families, normal shape
 \itvariables  % \rm in math and variables in math by current text font
 
 %% \mathchardef declarations
@@ -721,3 +721,4 @@ Sep. 2013: \letfont plus \corrmsizes used in \setmathfamily
            \whichtfm used in \loadmathfamily (the same as in ams-math.tex)
            \ptmunit depends on \ptunit now
            \setmathfamily <num><space><font-selector> ... (<space> added)
+Nov. 2013: Test of \normalmathloading introduced