diff options
Diffstat (limited to 'Master/texmf-dist/tex/csplain/fonts')
14 files changed, 68 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/csplain/fonts/ams-math.tex b/Master/texmf-dist/tex/csplain/fonts/ams-math.tex index 35c94875fc0..4f9c9de10b7 100644 --- a/Master/texmf-dist/tex/csplain/fonts/ams-math.tex +++ b/Master/texmf-dist/tex/csplain/fonts/ams-math.tex @@ -484,7 +484,7 @@ \ifx\TeX\relax \noexpand\not \else % \let\TeX=\relax in \output routine \ifx #1<\nless \else \ifx #1>\ngtr \else - \bgroup\escapechar=-1\xdef\tmpn{\string#1}\egroup + \begingroup\escapechar=-1\xdef\tmpn{\string#1}\endgroup \expandafter\ifx \csname not\tmpn\endcsname \relax \expandafter\ifx \csname n\tmpn\endcsname \relax \mathrel{\mathord{\notchar}\mathord{#1}}% @@ -507,3 +507,4 @@ 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 +Jul. 2014 \bgroup -> \begingroup in \not macro diff --git a/Master/texmf-dist/tex/csplain/fonts/chelvet.tex b/Master/texmf-dist/tex/csplain/fonts/chelvet.tex index 4afba8cc891..3209362ced3 100644 --- a/Master/texmf-dist/tex/csplain/fonts/chelvet.tex +++ b/Master/texmf-dist/tex/csplain/fonts/chelvet.tex @@ -35,7 +35,8 @@ \font\tenbin=phvbon8z \fi -\ifx\regfont\undefined \else +\ifx\regfontdefault\undefined \else + \regfontdefault \regfont\tenrmn \regfont\tenitn \regfont\tenbfn \regfont\tenbin \fi diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-adventor.tex b/Master/texmf-dist/tex/csplain/fonts/cs-adventor.tex index edb304d3496..75c3e994890 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-adventor.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-adventor.tex @@ -24,6 +24,12 @@ \tenrm +\ifx\regfontdefault\undefined \else + \regfontdefault + \regfont\tenrmc \regfont\tenitc + \regfont\tenbfc \regfont\tenbic +\fi + \def\caps#1{{\escapechar=-1 \expandafter}% \expandafter\csname\expandafter\tenonlytext\string#1c\endcsname} \def\tenonlytext{ten} diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-antt.tex b/Master/texmf-dist/tex/csplain/fonts/cs-antt.tex index 2937157bf1a..927ec4a8cf8 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-antt.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-antt.tex @@ -38,7 +38,8 @@ \expandafter\csname\expandafter\tenonlytext\string#1c\endcsname} \def\tenonlytext{ten} -\ifx\regfont\undefined \else +\ifx\regfontdefault\undefined \else + \regfontdefault \regfont\tenlr \regfont\tenli \regfont\tenmr \regfont\tenmi \regfont\tenrmc \regfont\tenitc diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-bera.tex b/Master/texmf-dist/tex/csplain/fonts/cs-bera.tex index a0a6dd7b045..c48d240a6e2 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-bera.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-bera.tex @@ -28,12 +28,11 @@ \font\tenttit=fvsro\tmp \def\ttit{\tenttit} \font\tenttbi=fvsbo\tmp \def\ttbi{\tenttbi} -\ifx\regfont\undefined \else - \regfont\tenrm \regfont\tenit - \regfont\tenbf \regfont\tenbi +\ifx\regfontdefault\undefined \else + \regfontdefault \regfont\tenrms \regfont\tenits \regfont\tenbfs \regfont\tenbis - \regfont\tentt \regfont\tenttit + \regfont\tenttit \regfont\tenttbf \regfont\tenttbi \fi diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-bonum.tex b/Master/texmf-dist/tex/csplain/fonts/cs-bonum.tex index 53dd6a465c1..60528cfd5b1 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-bonum.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-bonum.tex @@ -24,6 +24,12 @@ \tenrm +\ifx\regfontdefault\undefined \else + \regfontdefault + \regfont\tenrmc \regfont\tenitc + \regfont\tenbfc \regfont\tenbic +\fi + \def\caps#1{{\escapechar=-1 \expandafter}% \expandafter\csname\expandafter\tenonlytext\string#1c\endcsname} \def\tenonlytext{ten} diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-cursor.tex b/Master/texmf-dist/tex/csplain/fonts/cs-cursor.tex index 7f9a070b2d3..3639bd50ca6 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-cursor.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-cursor.tex @@ -19,6 +19,12 @@ \tenrm +\ifx\regfontdefault\undefined \else + \regfontdefault + \regfont\tenrmc \regfont\tenitc + \regfont\tenbfc \regfont\tenbic +\fi + \def\caps#1{{\escapechar=-1 \expandafter}% \expandafter\csname\expandafter\tenonlytext\string#1c\endcsname} \def\tenonlytext{ten} diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-heros.tex b/Master/texmf-dist/tex/csplain/fonts/cs-heros.tex index e1016cb3274..92d9b08a7eb 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-heros.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-heros.tex @@ -25,10 +25,6 @@ \font\tenitc=\tmp-qhvri-sc \sizespec \font\tenbic=\tmp-qhvbi-sc \sizespec -\fi - -\tenrm - \font\tenrmn=\tmp-qhvcr \sizespec \font\tenbfn=\tmp-qhvcb \sizespec \font\tenitn=\tmp-qhvcri \sizespec @@ -39,6 +35,20 @@ \font\tenitnc=\tmp-qhvcri-sc \sizespec \font\tenbinc=\tmp-qhvcbi-sc \sizespec +\fi + +\tenrm + +\ifx\regfontdefault\undefined \else + \regfontdefault + \regfont\tenrmc \regfont\tenitc + \regfont\tenbfc \regfont\tenbic + \regfont\tenrmn \regfont\tenitn + \regfont\tenbfn \regfont\tenbin + \regfont\tenrmnc \regfont\tenitnc + \regfont\tenbfnc \regfont\tenbinc +\fi + \def\caps#1{{\escapechar=-1 \expandafter}% \expandafter\csname\expandafter\tenonlytext\string#1c\endcsname} \def\tenonlytext{ten} diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-pagella.tex b/Master/texmf-dist/tex/csplain/fonts/cs-pagella.tex index 08f0b7f0f17..4e9d119b544 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-pagella.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-pagella.tex @@ -24,6 +24,12 @@ \tenrm +\ifx\regfontdefault\undefined \else + \regfontdefault + \regfont\tenrmc \regfont\tenitc + \regfont\tenbfc \regfont\tenbic +\fi + \def\caps#1{{\escapechar=-1 \expandafter}% \expandafter\csname\expandafter\tenonlytext\string#1c\endcsname} \def\tenonlytext{ten} diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-polta.tex b/Master/texmf-dist/tex/csplain/fonts/cs-polta.tex index d125965fdc1..9e1a92953e5 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-polta.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-polta.tex @@ -42,9 +42,8 @@ \expandafter\csname\expandafter\tenonlytext\string#1c\endcsname} \def\tenonlytext{ten} -\ifx\regfont\undefined \else - \regfont\tenrm \regfont\tenit - \regfont\tenbf \regfont\tenbi +\ifx\regfontdefault\undefined \else + \regfontdefault \regfont\tenlr \regfont\tenli \regfont\tenmr \regfont\tenmi \regfont\tenrmc \regfont\tenitc diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-schola.tex b/Master/texmf-dist/tex/csplain/fonts/cs-schola.tex index 86fd033cf8f..fb685604a5e 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-schola.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-schola.tex @@ -24,6 +24,12 @@ \tenrm +\ifx\regfontdefault\undefined \else + \regfontdefault + \regfont\tenrmc \regfont\tenitc + \regfont\tenbfc \regfont\tenbic +\fi + \def\caps#1{{\escapechar=-1 \expandafter}% \expandafter\csname\expandafter\tenonlytext\string#1c\endcsname} \def\tenonlytext{ten} diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-termes.tex b/Master/texmf-dist/tex/csplain/fonts/cs-termes.tex index 356eb5ed0e6..b6225925eb4 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-termes.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-termes.tex @@ -24,6 +24,12 @@ \tenrm +\ifx\regfontdefault\undefined \else + \regfontdefault + \regfont\tenrmc \regfont\tenitc + \regfont\tenbfc \regfont\tenbic +\fi + \def\caps#1{{\escapechar=-1 \expandafter}% \expandafter\csname\expandafter\tenonlytext\string#1c\endcsname} \def\tenonlytext{ten} diff --git a/Master/texmf-dist/tex/csplain/fonts/cyrchars.tex b/Master/texmf-dist/tex/csplain/fonts/cyrchars.tex index 329a55e30ce..a49ba1fb9d2 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cyrchars.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cyrchars.tex @@ -377,7 +377,7 @@ the \language register appropriately. That is all. -If you needs more: use Unicoded TeX engine (XeTeX, LuaTeX) plus appropriate -Unicode font and doesn't use this macro file! +If you need more: use Unicoded TeX engine (XeTeX, LuaTeX) plus appropriate +Unicode font and don't use this macro file! -------------------------------------------------------------
\ No newline at end of file diff --git a/Master/texmf-dist/tex/csplain/fonts/tx-math.tex b/Master/texmf-dist/tex/csplain/fonts/tx-math.tex index a88f171aeb2..4f3a121788f 100644 --- a/Master/texmf-dist/tex/csplain/fonts/tx-math.tex +++ b/Master/texmf-dist/tex/csplain/fonts/tx-math.tex @@ -131,6 +131,8 @@ \skewchar\scriptscriptfont1=127 \skewchar\textfont2=48 \skewchar\scriptfont2=48 \skewchar\scriptscriptfont2=48 + \fontdimen8\scriptfont3 = \fontdimen8\textfont3 + \fontdimen8\scriptscriptfont3 = \fontdimen8\textfont3 } \def\setmathsizes[#1/#2/#3]{% \def\sizemtext{#1\ptmunit}\def\sizemscript{#2\ptmunit}% @@ -699,7 +701,7 @@ \ifx #1=\ne \else \ifx #1<\nless \else \ifx #1>\ngtr \else - \bgroup\escapechar=-1\xdef\tmpn{\string#1}\egroup + \begingroup\escapechar=-1\xdef\tmpn{\string#1}\endgroup \expandafter\ifx \csname not\tmpn\endcsname \relax \expandafter\ifx \csname n\tmpn\endcsname \relax \mathrel{\mathord{\notchar}\mathord{#1}}% @@ -722,3 +724,5 @@ 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 +Jul. 2014: \bgroup -> \beingroup in \not macro + \fontdimen8 (fraction rule thikness) set the same for (s)script |