diff options
author | Karl Berry <karl@freefriends.org> | 2016-05-03 21:31:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-05-03 21:31:31 +0000 |
commit | 23ec1d8f81a005ed2c9f96fd3037a36a80acb6e2 (patch) | |
tree | 3e0a90863ba179580665b57346ccdcbfdd749a67 /Master/texmf-dist/tex/csplain/opmac | |
parent | be75a0741713bc316a35792a635625bb6835d960 (diff) |
csplain (3may16)
git-svn-id: svn://tug.org/texlive/trunk@40870 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/csplain/opmac')
4 files changed, 41 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex b/Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex index 56ac94e3c53..db9077c3ccf 100644 --- a/Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex +++ b/Master/texmf-dist/tex/csplain/opmac/fontfam-catalog.tex @@ -26,7 +26,9 @@ {\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 {\currtt Not available}\else \fontfamsample \fi + \ifx\tmp\basicfont + \ifx#1\rm \fontfamsample \else {\currtt Not available}\fi + \else \fontfamsample \fi \par}% \expandafter\pcatB\fi } @@ -46,8 +48,14 @@ size: \expandafter\ignorept\the\fontdim /\expandafter\ignorept\the\dimen0 \ifx\loadmathfonts\undefined \let\loadmathfonts=\relax \fi \let\fontfamexec=\fontfamexecC \ifx\fontfamsample\undefined - \def\fontfamsample{ABCDabcd áéíóúů řžč ÁÉÍÓÚŮ ŘŽČ 0123456789} -\fi + \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{ }% + \char176\char186\char163{ }% + \char193\char201\char205\char211\char218\char220\char151{ }% + \char144\char154\char130{ }0123456789} +\fi\fi\fi \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 448805b6f89..c61ef74dbdb 100644 --- a/Master/texmf-dist/tex/csplain/opmac/fontfam-global.tex +++ b/Master/texmf-dist/tex/csplain/opmac/fontfam-global.tex @@ -1,8 +1,10 @@ +\fontfamnote {Fonts derived from Computer Modern} \setfontfam [LM fonts] {\rm \it \bf \bi \tt} {\caps} {} {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} \famalias{timesroman}{times} \setfontfam [Helvetica] {\rm \it \bf \bi \tt} {\cond} {} {TX} (8t 8z) {\input chelvet} @@ -11,6 +13,7 @@ \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} +\fontfamnote {TeXGyre project, fonts derived from Adobe 35} \setfontfam [TG Termes] {\rm \it \bf \bi} {\caps} {} {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} @@ -26,9 +29,17 @@ \setfontfam [TG Cursor] {\rm \it \bf \bi} {\caps} {} {TX} (8t 8z U) {\input cs-cursor} \famalias{cursor}{tgcursor} \famalias{texgyrecursor}{tgcursor} -\setfontfam [Antykwa Torunska] {\lr \li \rm \it \mr \mi \bf \bi} {} {} {TX} (8t 8z) {\input cs-antt} -\setfontfam [Antykwa Poltawskiego] {\rm \it \bf \bi} {\caps \wli} {} {TX} (8t 8z U) {\input cs-polta} +\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} +\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 [Linux Libertine] {\rm \it \bf \bi} {\mono \sans \caps} {} {TX} (U sU) {\input cs-libertine} +\famalias{libertine}{linuxlibertine} \famalias{linlibertine}{linuxlibertine} +\setfontfam [KP fonts] {\rm \it \bf \bi} + {\caps \bcaps \slant \sans \ttset \wlight \bext \noflig \oldn \olds \oldsv} + {... 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 519249fbb83..863f5051860 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 this for more details. +% See end of this file for more details. \ifx\OPmacversion\udefined \input opmac \fi @@ -58,6 +58,8 @@ } \def\famalias#1#2{\slet{fs:#1}{fs:#2}} +\def\fontfamnote#1{\addto\fontfamL{\fontfamnoteA{#1}}} +\def\fontfamnoteA#1{\immediate\write16{=== #1 ===}} \input fontfam-global @@ -119,6 +121,8 @@ And \famalias can be used: The aliasname and origname must be lowecase and without spaces. See fontfam-global.tex for examples. +\fontfamnote{text} prints text to the listing of font families. + Note that the macro file fontfam.tex and the data fontfam-global.tex and fontfam-local.tex are read on demand only when \fontfam macro is used in OPmac. It is not loaded by OPmac directly because user may not need to use diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex index 7ecc4ac5581..aef308105b8 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{Apr. 2016c} +\def\OPmacversion{May 2016} \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>} %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf @@ -66,9 +66,10 @@ \addprotect\percent \addprotect\bslash \addprotect\, \addprotect\exfont \bgroup \catcode`!=3 \catcode`?=3 -\gdef\replacestrings#1#2{\long\def\replacestringsA##1#1##2!{% - \ifx!##2!\addto\tmpb{##1}\else\addto\tmpb{##1#2}\replacestringsA##2!\fi}% - \edef\tmpb{\expandafter}\expandafter\replacestringsA\tmpb?#1!% +\gdef\replacestrings#1#2{\long\def\replacestringsA##1#1{\def\tmpb{##1}\replacestringsB}% + \long\def\replacestringsB##1#1{\ifx!##1\relax \else\addto\tmpb{#2##1}% + \expandafter\replacestringsB\fi}% improved version <May 2016> inspired + \expandafter\replacestringsA\tmpb?#1!#1% from pysyntax.tex by Petr Krajnik \long\def\replacestringsA##1?{\def\tmpb{##1}}\expandafter\replacestringsA\tmpb } \egroup @@ -142,7 +143,7 @@ \opwarning{No multilanguage support (csplain is recommended)} \fi % macros from csplain, file csfontsm.tex: - \font\tenbi=cmbxti10 \def\bi{\tenbi} + \ifx\tenbi\undefined \font\tenbi=cmbxti10 \def\bi{\tenbi}\fi \def\letfont#1#2{\ifx#2=\expandafter\letfont\expandafter#1\else \expandafter\font\expandafter#1\expandafter\rfontskipat\fontname#2 \relax\space \fi} \def\rfontskipat#1{\ifx#1"\expandafter\rfskipatX\else\expandafter\rfskipatN\expandafter#1\fi} @@ -345,7 +346,7 @@ \def\chapfont{\typobase\typoscale[\magstep3/\magstep3]\bfshape} \def\secfont{\typobase\typoscale[\magstep2/\magstep2]\bfshape} \def\seccfont{\typobase\typoscale[\magstep1/\magstep1]\bfshape} -\def\bfshape{\let\tenit=\tenbi \boldmath \bf} +\def\bfshape{\let\tenit=\tenbi \everymath\expandafter{\the\everymath\boldmath}\bf} \newcount\chapnum \newcount\secnum \newcount\seccnum \newcount\nonumnum \newif\ifnotoc \notocfalse \def\notoc{\global\notoctrue} @@ -1758,9 +1759,11 @@ Jan. 2016 \inspicpage introduced Mar. 2016 \thefnote default changed: ^{num}) -> ^{num} Apr. 2016 \frame: redundant group removed \isnextchar improved (using \toks) -Apr. 2016a \eoldef introduced to \tit, \chap, \sec, \secc, see OPmac trick 0121 -Apr. 2016b \input opmac-luatex.tex introduced + \eoldef introduced to \tit, \chap, \sec, \secc, see OPmac trick 0121 + \input opmac-luatex.tex introduced \slet introduced -Apr. 2016c \fontfam introduced, \usebib as module loaded + \fontfam introduced, \usebib as module loaded +May 2016 \replacestrings improved + \bfshape: \everymath={\boldmath} instead \boldmath directly %%%%%%%%%%%%%% End of opmac.tex |