diff options
author | Karl Berry <karl@freefriends.org> | 2014-12-24 23:21:27 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-12-24 23:21:27 +0000 |
commit | ea75d0bfb820f1fea872bbdfb88fed8e77947698 (patch) | |
tree | faeed0817769c924420116818b34bf344f77d7a0 /Master/texmf-dist/tex/csplain/fonts | |
parent | 17e3da100f9807511c04fdce7bfbaffe9b586a88 (diff) |
csplain (24dec14)
git-svn-id: svn://tug.org/texlive/trunk@35901 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/csplain/fonts')
4 files changed, 12 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/csplain/fonts/ams-math.tex b/Master/texmf-dist/tex/csplain/fonts/ams-math.tex index 4f9c9de10b7..d46f617bf7e 100644 --- a/Master/texmf-dist/tex/csplain/fonts/ams-math.tex +++ b/Master/texmf-dist/tex/csplain/fonts/ams-math.tex @@ -171,11 +171,11 @@ \def\mitvariables{\def\rm{\fam0\tenrm}% \mathcodechanges 0:0-9\mathcodechanges 1:A-Z\mathcodechanges 1:a-z} -\def\mathcodechanges#1:#2-#3{\chardef\tmp=\count0 \chardef\tmpa=\count1 +\def\mathcodechanges#1:#2-#3{\edef\tmp{\count0=\the\count0 \count1=\the\count1 }% \count0=`#2 \count1=\count0 \advance\count1 by"7#100 \loop \mathcode\count0=\count1 \ifnum\count0<`#3 \advance\count0 by1 \advance\count1 by1 \repeat - \count0=\tmp \count1=\tmpa + \tmp\relax } \def\whichtfm #1{\ifx\dgsize\undefined #1\else \expandafter \ifx\csname#1:reg\endcsname\relax diff --git a/Master/texmf-dist/tex/csplain/fonts/luafonts.tex b/Master/texmf-dist/tex/csplain/fonts/luafonts.tex index f4653c74321..b6d5899a096 100644 --- a/Master/texmf-dist/tex/csplain/fonts/luafonts.tex +++ b/Master/texmf-dist/tex/csplain/fonts/luafonts.tex @@ -21,6 +21,9 @@ } \else %%% \luatexversion>=76 +\ifnum\luatexversion<79 \def\luaotfloadfile{luaotfload} +\else \def\luaotfloadfile{luaotfload-main}\fi + \message{processing luaotfload.lua (2)} \expandafter\ifx\csname LuT@AllocAttribute\endcsname \relax \csname newcount\expandafter \endcsname \csname LuT@AllocAttribute\endcsname \fi @@ -33,7 +36,7 @@ oriwrite = texio.write_nl % I don't need to see unusual info function texio.write_nl(...) end require('luatexbase.mcb') - luatexbase.require_module('luaotfload') + luatexbase.require_module('\luaotfloadfile') texio.write_nl = oriwrite % return to original meaning } \fi diff --git a/Master/texmf-dist/tex/csplain/fonts/ntx-math.tex b/Master/texmf-dist/tex/csplain/fonts/ntx-math.tex index 705480ea45b..27634210a62 100644 --- a/Master/texmf-dist/tex/csplain/fonts/ntx-math.tex +++ b/Master/texmf-dist/tex/csplain/fonts/ntx-math.tex @@ -1,5 +1,5 @@ -% This file loads TX math fonts by plainTeX macros -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% This file loads NTX math fonts by plainTeX macros +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Petr Olsak, 2012, 2014 (derived from tx-math.tex) \message{FONT: NTX math fonts - \string\mathchardef's prepared, 14 math families preloaded.} @@ -121,11 +121,11 @@ \def\mitvariables{\def\rm{\fam0\tenrm}% \mathcodechanges 0:0-9\mathcodechanges 1:A-Z\mathcodechanges 1:a-z} -\def\mathcodechanges#1:#2-#3{\chardef\tmp=\count0 \chardef\tmpa=\count1 +\def\mathcodechanges#1:#2-#3{\edef\tmp{\count0=\the\count0 \count1=\the\count1 }% \count0=`#2 \count1=\count0 \advance\count1 by"7#100 \loop \mathcode\count0=\count1 \ifnum\count0<`#3 \advance\count0 by1 \advance\count1 by1 \repeat - \count0=\tmp \count1=\tmpa + \tmp\relax } \ifx\whichtfm\undefined \def\whichtfm#1{#1}\fi diff --git a/Master/texmf-dist/tex/csplain/fonts/tx-math.tex b/Master/texmf-dist/tex/csplain/fonts/tx-math.tex index 4f3a121788f..655de704252 100644 --- a/Master/texmf-dist/tex/csplain/fonts/tx-math.tex +++ b/Master/texmf-dist/tex/csplain/fonts/tx-math.tex @@ -115,11 +115,11 @@ \def\mitvariables{\def\rm{\fam0\tenrm}% \mathcodechanges 0:0-9\mathcodechanges 1:A-Z\mathcodechanges 1:a-z} -\def\mathcodechanges#1:#2-#3{\chardef\tmp=\count0 \chardef\tmpa=\count1 +\def\mathcodechanges#1:#2-#3{\edef\tmp{\count0=\the\count0 \count1=\the\count1 }% \count0=`#2 \count1=\count0 \advance\count1 by"7#100 \loop \mathcode\count0=\count1 \ifnum\count0<`#3 \advance\count0 by1 \advance\count1 by1 \repeat - \count0=\tmp \count1=\tmpa + \tmp\relax } \ifx\whichtfm\undefined \def\whichtfm#1{#1}\fi |