summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/csplain/opmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-07 22:17:55 +0000
committerKarl Berry <karl@freefriends.org>2016-05-07 22:17:55 +0000
commitb5d9cb0ff373d2eb1a99192dcef729faf6e2dd07 (patch)
tree24a13389f4c7c91e4ad7e914331e6635ef781387 /Master/texmf-dist/tex/csplain/opmac
parent3057e4132188d2e2d9423f1a88c854087d0e44e7 (diff)
csplain (7may16)
git-svn-id: svn://tug.org/texlive/trunk@40932 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/csplain/opmac')
-rw-r--r--Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex57
-rw-r--r--Master/texmf-dist/tex/csplain/opmac/fontfam-global.tex19
-rw-r--r--Master/texmf-dist/tex/csplain/opmac/fontfam.tex8
3 files changed, 55 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex b/Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex
index db9077c3ccf..89f11620505 100644
--- a/Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex
@@ -7,29 +7,40 @@
% See end of the file fontfam.tex for more details.
-\def\fontfamexecC#1#2#3#4#5#6#7{\testfotenc{#6}%
- \iftrue\ifx\relax#2\relax \else
- \par #7
- \edef\basicfont{\fontname\the\font}%
- \noindent {[#1]}\par\nobreak
- \def\variants{#2}
- \pcatA {}#3\relax
- \medskip
- \fi\fi
+\def\fontfamexecC#1#2#3#4#5#6#7{\ifx\relax#2\relax \else
+ {\testfotenc{#6}\iftrue
+ \par
+ \noindent {\currtt [#1]\quad (#6)\quad \def\tmp{#7} \detok\tmp}\par\nobreak
+ #7
+ \edef\basicfont{\fontname\the\font}%
+ \def\variants{#2}
+ \pcatA {}#3\relax
+ \medskip
+ \else \par
+ \noindent {\currtt -- [#1] (#6) -- is unavailable in \fotenc\space encoding.}
+ \medskip
+ \fi}%
+ \fi
}
\def\pcatA#1{\ifx#1\relax\par\else
\def\prefix{#1}\expandafter\pcatB\variants\relax
\expandafter\pcatA\fi
}
\def\pcatB#1{\ifx#1\relax\par\else
+ {\ifx\ffnamegen\undefined \let\ffsetX=\relax \fi
+ \ifx\prefix\empty\ffsetX#1\relax\else\prefix#1\relax\fi
+ \ifx\ffvarV\undefined \def\ffvarV{x}\fi
+ \ifx#1\tt \ifx\prefix\empty\else \def\ffvarV{!}\fi\fi
+ \if!\ffvarV\relax \else
\indent
- {\currtt \ifx\prefix\empty \else \expandafter\string\prefix\fi
- \string#1 }{\prefix#1%
- \edef\tmp{\ifx\prefix\empty\else\fontname\the\font\fi}%
- \ifx\tmp\basicfont
- \ifx#1\rm \fontfamsample \else {\currtt Not available}\fi
- \else \fontfamsample \fi
- \par}%
+ {\currtt \ifx\prefix\empty \else \expandafter\string\prefix\fi \string#1 }%
+% \edef\tmp{\ifx\prefix\empty\else\fontname\the\font\fi}%
+% \ifx\tmp\basicfont
+% \ifx#1\rm \fontfamsample \else {\currtt Not available}\fi
+% \else \fontfamsample \fi
+ \advance\hsize by2in
+ \fontfamsample\par
+ \fi}%
\expandafter\pcatB\fi
}
@@ -37,18 +48,27 @@
\begingroup
+\ifx\ffdecl\undefined \input ff-mac \fi
+
+\parindent=0pt
+
Generated \the\day/\the\month/\the\year\space by
{\tt \string\fontfam[Catalog]} (from OPmac).
+
Encoding: \fotenc, \dimen0=\baselineskip
-size: \expandafter\ignorept\the\fontdim /\expandafter\ignorept\the\dimen0
+size: \expandafter\ignorept\the\fontdim /\expandafter\ignorept\the\dimen0.
+
+See the article \url{http://petr.olsak.net/ftp/olsak/bulletin/kpfonts-plain.pdf}
+for information about usage of font modifiers.
\bigskip
+\parindent=1em
\ifx\sizespec\empty \def\sizespec{at10pt}\fi
\letfont\currtt=\tentt
\ifx\loadmathfonts\undefined \let\loadmathfonts=\relax \fi
\let\fontfamexec=\fontfamexecC
\ifx\fontfamsample\undefined
- \def\fontfamsample{ABCDabcd Qsty fi fl áéíóúüů řžč ÁÉÍÓÚÜŮ ŘŽČ 0123456789}
+ \def\fontfamsample{ABCDabcd Qsty fi fl áéíóúüů řžč ÁÉÍÓÚ ŘŽČ 0123456789}
\ifx\chyph\undefined \ismacro\fotenc{8t}\iftrue
\def\fontfamsample{ABCDabcd Qsty fi fl
\char225\char233\char237\char243\char250\char252\char183{ }%
@@ -56,6 +76,7 @@ size: \expandafter\ignorept\the\fontdim /\expandafter\ignorept\the\dimen0
\char193\char201\char205\char211\char218\char220\char151{ }%
\char144\char154\char130{ }0123456789}
\fi\fi\fi
+\def\detok#1{\expandafter\detokA\meaning#1}\def\detokA#1->{}
\fontfamL
\endgroup
diff --git a/Master/texmf-dist/tex/csplain/opmac/fontfam-global.tex b/Master/texmf-dist/tex/csplain/opmac/fontfam-global.tex
index c61ef74dbdb..95093f6db2f 100644
--- a/Master/texmf-dist/tex/csplain/opmac/fontfam-global.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/fontfam-global.tex
@@ -1,17 +1,20 @@
\fontfamnote {Fonts derived from Computer Modern}
-\setfontfam [LM fonts] {\rm \it \bf \bi \tt} {\caps} {} {AMS} (8t 8z U) {\input lmfonts}
+\setfontfam [LM fonts] {\rm \it \bf \bi}
+ {\caps \sans \ttset \slant \nbold \ttprop \ttlight \ttcond \quotset \upital \dunhill}
+ {} {AMS} (8t 8z U) {\input lmfonts}
\famalias{latinmodern}{lmfonts} \famalias{lmfont}{lmfonts}
\famalias{latinmodernfonts}{lmfonts} \famalias{latinmodern}{lmfonts}
-\fontfamnote {Adobe 35 fonts (installed in each PostScript RIP)}
-\setfontfam [Times] {\rm \it \bf \bi \tt} {} {} {TX} (8t 8z) {\input ctimes}
+\fontfamnote {Adobe 35 fonts}
+\setfontfam [Times] {\rm \it \bf \bi \tt} {\caps} {} {TX} (8t 8z) {\input ctimes}
\famalias{timesroman}{times}
-\setfontfam [Helvetica] {\rm \it \bf \bi \tt} {\cond} {} {TX} (8t 8z) {\input chelvet}
-\setfontfam [Avantgarde] {\rm \it \bf \bi \tt} {} {} {TX} (8t 8z) {\input cavantga}
-\setfontfam [Bookman] {\rm \it \bf \bi \tt} {} {} {TX} (8t 8z) {\input cbookman}
-\setfontfam [Palatino] {\rm \it \bf \bi \tt} {} {} {TX} (8t 8z) {\input cpalatin}
-\setfontfam [New Century] {\rm \it \bf \bi \tt} {} {} {TX} (8t 8z) {\input cncent}
+\setfontfam [Helvetica] {\rm \it \bf \bi \tt} {\cond \caps} {} {TX} (8t 8z) {\input chelvet}
+\setfontfam [Avantgarde] {\rm \it \bf \bi \tt} {\caps} {} {TX} (8t 8z) {\input cavantga}
+\setfontfam [Bookman] {\rm \it \bf \bi \tt} {\caps} {} {TX} (8t 8z) {\input cbookman}
+\setfontfam [Palatino] {\rm \it \bf \bi \tt} {\caps} {} {TX} (8t 8z) {\input cpalatin}
+\setfontfam [New Century] {\rm \it \bf \bi \tt} {\caps} {} {TX} (8t 8z) {\input cncent}
+\famalias{ncent}{newcentury}
\fontfamnote {TeXGyre project, fonts derived from Adobe 35}
\setfontfam [TG Termes] {\rm \it \bf \bi} {\caps} {} {TX} (8t 8z U) {\input cs-termes}
diff --git a/Master/texmf-dist/tex/csplain/opmac/fontfam.tex b/Master/texmf-dist/tex/csplain/opmac/fontfam.tex
index 863f5051860..5b532cd9e6b 100644
--- a/Master/texmf-dist/tex/csplain/opmac/fontfam.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/fontfam.tex
@@ -10,7 +10,7 @@
% Font Family Names if unknown. Example:
% \fontfam [Times] or \fontfam [Times Roman] ... does \input ctimes
-% See end of this file for more details.
+% See end of this file this for more details.
\ifx\OPmacversion\udefined \input opmac \fi
@@ -40,16 +40,18 @@
\fi
}
\def\fontfamexecA#1#2#3#4#5#6#7{\testfotenc{#6}\iftrue#7 \else
- \opwarning{The [#1] family is unavailable in (\fotenc) encoding}\fi
+ \opwarning{[#1] (#6) family unavailable in \fotenc\space enc}\fi
}
\def\fontfamexecB#1#2#3#4#5#6#7{\testfotenc{#6}%
\iftrue
{\toks2={#2}\toks3={#3}\toks4={#4}%
- \immediate\write16{\space[#1] \space
+ \immediate\write16{ [#1] \space
{\the\toks2
\ifx\relax#3\relax \else ; mod:\the\toks3 \fi
\ifx\relax#4\relax \else ; \the\toks4 \fi
\ifx\relax#5\relax \else ; +#5\fi} (#6)}}%
+ \else
+ \immediate\write16{ -- [#1] (#6) -- unavailable in \fotenc\space enc.}%
\fi
}
\def\testfotenc#1{\def\tmpa{ #1 }\edef\tmpb{\space\fotenc\space}%