summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/csplain/fonts/lmfonts.tex')
-rw-r--r--Master/texmf-dist/tex/csplain/fonts/lmfonts.tex42
1 files changed, 18 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex b/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex
index c77b1772187..9bd3c1d6b97 100644
--- a/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex
+++ b/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex
@@ -7,7 +7,7 @@
\ffdecl [Latin Modern] {\rm \bf \it \bi}
{\caps \sans \ttset \slant \nbold \ttprop \ttlight \ttcond
\quotset \upital \dunhill}
- {} {AMS} {8z 8t U}
+ {} {AMS} {8t 8z 8q 8y 8v U}
% \lmreset ... implicit values (serif, bod extended, nocaps)
% \sans ...... sans serif subfamily
@@ -22,24 +22,12 @@
% \slant ..... slanted (default in some subfamilies)
% \nbold ..... normal bold (no extended)
-\ismacro\fotenc{8t}\iftrue
- \font\tenrm = ec-lmr10 \sizespec
- \font\tenbf = ec-lmbx10 \sizespec
- \font\tenit = ec-lmri10 \sizespec
- \font\tenbi = ec-lmbxi10 \sizespec
- \font\tentt = ec-lmtt10 \sizespec
- \font\tenrmc= ec-lmcsc10 \sizespec % for backward compatibility
- \font\tenitc= ec-lmcsco10 \sizespec % for backward compatibility
-\fi
-\ismacro\fotenc{8z}\iftrue
- \font\tenrm = cs-lmr10 \sizespec
- \font\tenbf = cs-lmbx10 \sizespec
- \font\tenit = cs-lmri10 \sizespec
- \font\tenbi = cs-lmbxi10 \sizespec
- \font\tentt = cs-lmtt10 \sizespec
- \font\tenrmc= cs-lmcsc10 \sizespec % for backward compatibility
- \font\tenitc= cs-lmcsco10 \sizespec % for backward compatibility
-\fi
+\ismacro\fotenc{8t}\iftrue \def\ffnamepre{ec-}\fi % T1 aka Cork
+\ismacro\fotenc{8z}\iftrue \def\ffnamepre{cs-}\fi % IL2 aka CSfont
+\ismacro\fotenc{8q}\iftrue \def\ffnamepre{qx-}\fi % QX GUST, Polish
+\ismacro\fotenc{8y}\iftrue \def\ffnamepre{texansi-}\fi % Y&Y
+\ismacro\fotenc{8v}\iftrue \def\ffnamepre{t5-}\fi % Vietnamese
+
\ismacro\fotenc{U}\iftrue
\font\tenrm = "[lmroman10-regular]:\fontfeatures" \sizespec
\font\tenbf = "[lmroman10-bold]:\fontfeatures" \sizespec
@@ -48,7 +36,16 @@
\font\tentt = "[lmmono10-regular]:\fontfeatures" \sizespec
\font\tenrmc= "[lmromancaps10-regular]:\fontfeatures" \sizespec
\font\tenitc= "[lmromancaps10-oblique]:\fontfeatures" \sizespec
+\else
+ \font\tenrm = \ffnamepre lmr10 \sizespec
+ \font\tenbf = \ffnamepre lmbx10 \sizespec
+ \font\tenit = \ffnamepre lmri10 \sizespec
+ \font\tenbi = \ffnamepre lmbxi10 \sizespec
+ \font\tentt = \ffnamepre lmtt10 \sizespec
+ \font\tenrmc= \ffnamepre lmcsc10 \sizespec % for backward compatibility
+ \font\tenitc= \ffnamepre lmcsco10 \sizespec % for backward compatibility
\fi
+\ismacro\fotenc{8z}\iftrue \input chars-8z \fi
\tenrm
\ffvars{\regularV}{b\bextV}{ti\slantV}{b\bextV i\slantV}
@@ -70,9 +67,9 @@
\def\ffnamegen{lm\subfamV\ffvarV\capsV\ffoptV}
-\def\ffnametest#1{\expandafter\ifx \csname\ffnamegen:reg\endcsname \relax
+\def\ffloadhookA#1{\expandafter\ifx \csname\ffnamegen:reg\endcsname \relax
\ffmessage{FONT warning: LMfonts - desired shape (\ffnamegen) unavailable}%
- \else % font is loaded
+ \else % TS1 metric added + load font
}
\def\LMregtfm #1 #2 #3 #4 {\edef\tmp
{\noexpand\regtfm #1 0 \csname regtfm#3\endcsname\ffnamepre{#2}}%
@@ -88,9 +85,6 @@
\def\regtfmT #1#2{#1#210 *}
\def\regtfmE #1#2{#1#28 *}
-\ismacro\fotenc{8t}\iftrue \def\ffnamepre{ec-}\fi
-\ismacro\fotenc{8z}\iftrue \def\ffnamepre{cs-}\fi
-
\ismacro\fotenc{U}\iftrue
\def\ffnamepre#1-#2;#3 {\noexpand\ffnameotf{[#1#3-#2]} }
\let\ffnameotf=\ffnameotfA