diff options
author | Karl Berry <karl@freefriends.org> | 2016-06-06 23:01:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-06-06 23:01:45 +0000 |
commit | ec3bec951daa0d83eb0d4fe49461e90920cfa830 (patch) | |
tree | 4c27a48af8bdde450a091356673698dc64c520f1 /Master/texmf-dist/tex/csplain/opmac | |
parent | 04e211f107eb8723e3df5cb49ee72fb0a191e6e4 (diff) |
csplain (6jun16)
git-svn-id: svn://tug.org/texlive/trunk@41300 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/csplain/opmac')
4 files changed, 67 insertions, 42 deletions
diff --git a/Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex b/Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex index ac49cd7a224..b16facaa546 100644 --- a/Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex +++ b/Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex @@ -7,15 +7,15 @@ % See end of the file fontfam.tex for more details. -\def\fontfamexecC#1#2#3#4#5#6#7{\ifx\relax#2\relax \else +\def\fontfamexecC#1#2#3#4#5#6#7{\ifx\relax#3\relax \else {\testfotenc{#6}\iftrue \par \noindent {\currtt [#1]\quad \char`\{+#5\char`\} \space(#6)\quad \def\tmp{#7} \detok\tmp}% \par\nobreak #7 \edef\basicfont{\fontname\the\font}% - \def\variants{#2} - \pcatA {}#3\relax + \def\variants{#3} + \pcatA {}#2\relax \medskip \else \par \noindent {\currtt -- [#1] (#6) -- is unavailable in \fotenc\space encoding.} @@ -35,15 +35,15 @@ \if!\ffvarV\relax \else \indent {\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 } +\def\catalogfamsA#1,{\ifx,#1,\else + \expandafter\addto\expandafter\fontfamL\csname fs:#1\endcsname + \expandafter\catalogfamsA\fi +} \nonum\sec Font Catalogue @@ -60,7 +60,8 @@ Encoding: \fotenc, \dimen0=\baselineskip 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. +for information about usage of font modifiers. Note, that this Catalogue +doesn't show all available and independent combinations of font modifiers. \bigskip \parindent=1em @@ -78,6 +79,14 @@ for information about usage of font modifiers. \char144\char154\char130{ }0123456789} \fi\fi\fi \def\detok#1{\expandafter\detokA\meaning#1}\def\detokA#1->{} + +\ifx\catalogfams\undefined \else + {Only \tt\char`\\catalogfams\char`\{\catalogfams\char`\}} + are printed.\medskip + \edef\catalogfams{\catalogfams\space{} } + \def\fsname{}\expandafter \setfsname \catalogfams + \def\fontfamL{}\expandafter \catalogfamsA \fsname,,\fi + \fontfamL \endgroup @@ -90,6 +99,7 @@ of fonts: AMS ... AMS fonts math TX .... TX fonts math KP .... KP fonts math +KI .... Kurier or Iwona math \endtt If {\tt TX} is used then variables (math italic) and roman text are borrowed diff --git a/Master/texmf-dist/tex/csplain/opmac/fontfam-global.tex b/Master/texmf-dist/tex/csplain/opmac/fontfam-global.tex index 55f800f9ab5..f8f21b33199 100644 --- a/Master/texmf-dist/tex/csplain/opmac/fontfam-global.tex +++ b/Master/texmf-dist/tex/csplain/opmac/fontfam-global.tex @@ -1,48 +1,55 @@ \fontfamnote {Fonts derived from Computer Modern} -\setfontfam [LM fonts] {\rm \it \bf \bi} - {\caps \sans \ttset \slant \nbold \ttprop \ttlight \ttcond \quotset \upital \dunhill} +\setfontfam [LM fonts] + {\caps \sans \ttset \slant \nbold \ttprop \ttlight \ttcond \upital \quotset \dunhill} + {\rm \it \bf \bi} {} {AMS} (8t 8z 8q 8y 8v U) {\input lmfonts} \famalias{latinmodern}{lmfonts} \famalias{lmfont}{lmfonts} \famalias{latinmodernfonts}{lmfonts} \famalias{latinmodern}{lmfonts} \fontfamnote {Adobe 35 fonts} -\setfontfam [Times] {\rm \it \bf \bi \tt} {\caps} {} {TX} (8t 8z) {\input ctimes} +\setfontfam [Times] {\caps} {\rm \it \bf \bi \tt} {} {TX} (8t 8z) {\input ctimes} \famalias{timesroman}{times} -\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} +\setfontfam [Helvetica] {\cond \caps} {\rm \it \bf \bi \tt} {} {TX} (8t 8z) {\input chelvet} +\setfontfam [Avantgarde] {\caps} {\rm \it \bf \bi \tt} {} {TX} (8t 8z) {\input cavantga} +\setfontfam [Bookman] {\caps} {\rm \it \bf \bi \tt} {} {TX} (8t 8z) {\input cbookman} +\setfontfam [Palatino] {\caps} {\rm \it \bf \bi \tt} {} {TX} (8t 8z) {\input cpalatin} +\setfontfam [New Century] {\caps} {\rm \it \bf \bi \tt} {} {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} +\setfontfam [TG Termes] {\caps} {\rm \it \bf \bi} {} {TX} (8t 8z U) {\input cs-termes} \famalias{termes}{tgtermes} \famalias{texgyretermes}{tgtermes} -\setfontfam [TG Heros] {\rm \it \bf \bi} {\caps \cond} {} {TX} (8t 8z U) {\input cs-heros} +\setfontfam [TG Heros] {\caps \cond} {\rm \it \bf \bi} {} {TX} (8t 8z U) {\input cs-heros} \famalias{heros}{tgheros} \famalias{texgyreheros}{tgheros} -\setfontfam [TG Adventor] {\rm \it \bf \bi} {\caps} {} {TX} (8t 8z U) {\input cs-adventor} +\setfontfam [TG Adventor] {\caps} {\rm \it \bf \bi} {} {TX} (8t 8z U) {\input cs-adventor} \famalias{adventor}{tgadventor} \famalias{texgyreadventor}{tgadventor} -\setfontfam [TG Bonum] {\rm \it \bf \bi} {\caps} {} {TX} (8t 8z U) {\input cs-bonum} +\setfontfam [TG Bonum] {\caps} {\rm \it \bf \bi} {} {TX} (8t 8z U) {\input cs-bonum} \famalias{bonum}{tgbonum} \famalias{texgyrebonum}{tgbonum} -\setfontfam [TG Pagella] {\rm \it \bf \bi} {\caps} {} {TX} (8t 8z U) {\input cs-pagella} +\setfontfam [TG Pagella] {\caps} {\rm \it \bf \bi} {} {TX} (8t 8z U) {\input cs-pagella} \famalias{pagella}{tgpagella} \famalias{texgyrepagella}{tgpagella} -\setfontfam [TG Schola] {\rm \it \bf \bi} {\caps} {} {TX} (8t 8z U) {\input cs-schola} +\setfontfam [TG Schola] {\caps} {\rm \it \bf \bi} {} {TX} (8t 8z U) {\input cs-schola} \famalias{schola}{tgschola} \famalias{texgyreschola}{tgschola} -\setfontfam [TG Cursor] {\rm \it \bf \bi} {\caps} {} {TX} (8t 8z U) {\input cs-cursor} +\setfontfam [TG Cursor] {\caps} {\rm \it \bf \bi} {} {TX} (8t 8z U) {\input cs-cursor} \famalias{cursor}{tgcursor} \famalias{texgyrecursor}{tgcursor} \fontfamnote {Polish fonts} -\setfontfam [Antykwa Torunska] {\rm \it \bf \bi} {\caps \cond \wlight} {} {TX} (8t 8z) {\input cs-antt} -\setfontfam [Antykwa Poltawskiego] {\rm \it \bf \bi} {\caps \wlight} {} {TX} (8t 8z U) {\input cs-polta} +\setfontfam [Antykwa Torunska] {\caps \cond \wlight} {\rm \it \bf \bi} {} {TX} (8t 8z) {\input cs-antt} +\setfontfam [Antykwa Poltawskiego] {\caps \wlight} {\rm \it \bf \bi} {} {TX} (8t 8z U) {\input cs-polta} +\setfontfam [Kurier] {\caps \cond \lightw \heavyw} {\rm \it \bf \bi} {} {KI} (8t 8z U) {\input cs-kurier} +\setfontfam [Iwona] {\caps \cond \lightw \heavyw} {\rm \it \bf \bi} {} {KI} (8t 8z U) {\input cs-iwona} \fontfamnote {Miscelaneous} -\setfontfam [Charter] {\rm \it \bf \bi} {} {} {TX} (8t 8z) {\input cs-charter} -\setfontfam [Arev Sans] {\rm \it \bf \bi} {} {} {TX} (8t) {\input cs-arev} -\setfontfam [Bera] {\rm \it \bf \bi} {\sans} {} {TX} (8t) {\input cs-bera} +\setfontfam [Charter] {} {\rm \it \bf \bi} {} {TX} (8t 8z) {\input cs-charter} +\setfontfam [Arev Sans] {} {\rm \it \bf \bi} {} {TX} (8t) {\input cs-arev} +\setfontfam [Bera] {\sans} {\rm \it \bf \bi} {} {TX} (8t) {\input cs-bera} +\setfontfam [Heuristica] {\caps} {\rm \it \bf \bi \tt} {} {TX} (8t U) {\input cs-heuristica} +\setfontfam [Baskervald X] {\caps} {\rm \it \bf \bi} {} {TX} (8t U) {\input cs-baskerx} +\famalias{baskervald}{baskervaldx} -\setfontfam [Linux Libertine] {\rm \it \bf \bi} {\mono \sans \caps} {} {TX} (U sU) {\input cs-libertine} +\setfontfam [Linux Libertine] {\mono \sans \caps} {\rm \it \bf \bi} {} {TX} (U sU) {\input cs-libertine} \famalias{libertine}{linuxlibertine} \famalias{linlibertine}{linuxlibertine} -\setfontfam [KP fonts] {\rm \it \bf \bi} +\setfontfam [KP fonts] {\caps \bcaps \slant \sans \ttset \wlight \bext \noflig \oldn \olds \oldsv} + {\rm \it \bf \bi} {... 22 modifiers in total} {KP} (8t 7t) {\input kp-fonts} diff --git a/Master/texmf-dist/tex/csplain/opmac/fontfam.tex b/Master/texmf-dist/tex/csplain/opmac/fontfam.tex index 5b532cd9e6b..cbb193baa10 100644 --- a/Master/texmf-dist/tex/csplain/opmac/fontfam.tex +++ b/Master/texmf-dist/tex/csplain/opmac/fontfam.tex @@ -45,11 +45,9 @@ \def\fontfamexecB#1#2#3#4#5#6#7{\testfotenc{#6}% \iftrue {\toks2={#2}\toks3={#3}\toks4={#4}% - \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)}}% + \immediate\write16{ [#1] \space {\the\toks2} {\the\toks3}% + \ifx\relax#4\relax \else \space\the\toks4 \fi + \ifx\relax#5\relax \else \space +#5\fi \space(#6)}}% \else \immediate\write16{ -- [#1] (#6) -- unavailable in \fotenc\space enc.}% \fi @@ -93,12 +91,18 @@ If a required [Font Family Name] is not known, then all available Font Family Names are printed on terminal and into log file. Typical usage: \fontfam [?]. If a required [Font Family Name] is known then appropriate \input fontfile -is done. Nothing more. This means that \fontfam gives you possibility to +is done. Nothing more. This means that \fontfam gives you only possibility to keep a good overview about fontfiles. You can use special parameter \fontfam [Catalog]. Then all available font families are printed to the document with font samples. The pre-defined font -sample can be rewritten: \def\fontfamsample{...}. +sample can be rewritten by \def\fontfamsample{...}. + +If you want to print only selected families in the catalog, give these +families in comma separated list in the macro \catalogfams before +\fontfam[Catalog] is executed. Example: + +\def\catalogfams{Times Roman, Helvetica, KP fonts} \fontfam[Catalog] Each fontfile supports a limited set of encodings of the fonts. This is listed in round brackets: 8t means T1 encoding, 8z means IL2 encoding and @@ -114,9 +118,12 @@ which provides the encoding currently chosen. The fontfam-global.tex or fontfam-local.tex files uses \setfontfam with following format: -\setfontfam [Name] {variants} {modifiers} {comment} {math} (encodings) {\input fontfile} +\setfontfam [Name] {modifiers} {variants} {comment} {math} (encodings) {\input fontfile} + +Note, that \setfontfam changed its syntax in Jun. 2016. New version use +first {modifiers} then {variants}. -And \famalias can be used: +The \famalias macro can be used: \famalias{aliasname}{origname} diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex index a2d0a7d1a01..fa60ecc3a8f 100644 --- a/Master/texmf-dist/tex/csplain/opmac/opmac.tex +++ b/Master/texmf-dist/tex/csplain/opmac/opmac.tex @@ -5,7 +5,7 @@ %% The history of versions is at the end of this file, after \endpinput \ifx\OPmacversion\undefined \else \endinput \fi -\def\OPmacversion{May 2016} +\def\OPmacversion{Jun 2016} \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>} %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf @@ -213,9 +213,9 @@ \withoutunit\setbaselineskip\tmpdim \fi\fi } -\def\thefontsize[#1]{% +\def\thefontsize[#1]{\fontdim=#1\ptunit \expandafter\let \expandafter\thefont \the\font - \def\sizespec{at#1\ptunit}\def\dgsize{#1\ptunit}\resizefont\thefont + \edef\sizespec{at#1\ptunit}\def\dgsize{#1\ptunit}\resizefont\thefont \thefont \let\dgsize=\undefined \ignorespaces } \def\thefontscale[#1]{% @@ -1765,5 +1765,6 @@ Apr. 2016 \frame: redundant group removed May 2016 \replacestrings improved \bfshape: \everymath={\boldmath} instead \boldmath directly \tskip corrected +Jun. 2016 \thefontsize: \fontdim=#1\ptunit added. %%%%%%%%%%%%%% End of opmac.tex |