From 26256017b82ce224bc22ff8679fae090c440360e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 19 Jun 2015 22:32:47 +0000 Subject: csplain (19jun15) git-svn-id: svn://tug.org/texlive/trunk@37616 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/csplain/base/csplain.ini | 3 +++ Master/texmf-dist/tex/csplain/fonts/ams-math.tex | 17 ++++++++++++++++- Master/texmf-dist/tex/csplain/opmac/opmac.tex | 14 +++++++++----- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Master/texmf-dist/tex/csplain/base/csplain.ini b/Master/texmf-dist/tex/csplain/base/csplain.ini index 6ec9c11444b..466a48654ed 100644 --- a/Master/texmf-dist/tex/csplain/base/csplain.ini +++ b/Master/texmf-dist/tex/csplain/base/csplain.ini @@ -220,6 +220,9 @@ file extcode.tex renamed to il2code.tex (suggested by Jan Kasprzak) Apr. 2015: * csenc-u.tex: \utfBOM added. + Jun 2015: +* ams-tex.tex: \ifx\chyph\undefined added + COPYRIGHT ========= diff --git a/Master/texmf-dist/tex/csplain/fonts/ams-math.tex b/Master/texmf-dist/tex/csplain/fonts/ams-math.tex index d46f617bf7e..217b6656815 100644 --- a/Master/texmf-dist/tex/csplain/fonts/ams-math.tex +++ b/Master/texmf-dist/tex/csplain/fonts/ams-math.tex @@ -143,7 +143,21 @@ \regtfm bbisans 0 ecso0500 5.5 ecso0600 6.5 ecso0700 7.5 ecso0800 8.5 ecso0900 9.5 ecso1000 11.1 ecso1200 * -\fi +\ifx\chyph\undefined % non-csplain format, CM fonts used: + +\regtfm cmr 0 cmr5 5.5 cmr6 6.5 cmr7 7.5 cmr8 8.5 cmr9 9.5 + cmr10 11.1 cmr12 15 cmr17 * +\regtfm cmbx 0 cmbx5 5.5 cmbx6 6.5 cmbx7 7.5 cmbx8 8.5 cmbx9 9.5 + cmbx10 11.1 cmbx12 * +\regtfm cmsl 0 cmsl8 8.5 cmsl9 9.5 cmsl10 11.1 cmsl12 * +\regtfm cmtt 0 cmtt8 8.5 cmtt9 9.5 cmtt10 11.1 cmtt12 * +\regtfm cmss 0 cmss8 8.5 cmss9 9.5 cmss10 11.1 cmss12 15 cmss17 * +\regtfm cmssi 0 cmssi8 8.5 cmssi9 9.5 cmssi10 11.1 cmssi12 15 cmssi17 * +\regtfm cmti 0 cmti7 7.5 cmti8 8.5 cmti9 9.5 cmti10 11.1 cmti12 * +\regtfm cmbxti 0 cmbxti10 * +\regtfm cmtex 0 cmtex8 8.5 cmtex9 9.5 cmtex10 * + +\fi\fi % User can re-register these tfm's mentioned above after \input ams-math.tex % if he/she want to load other fonts than these defaults. @@ -508,3 +522,4 @@ Sep. 2013: \letfont plus \corrmsizes used in \setmathfamily \setmathfamily ... ( added) Nov. 2013 Test of \normalmathloading introduced Jul. 2014 \bgroup -> \begingroup in \not macro +Jun 2015 \ifx\chyph\undefined added diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex index 9894fe70c73..6c4e4036e3c 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 2015} +\def\OPmacversion{Jun 2015} \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>} %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf @@ -134,7 +134,7 @@ \opwarning{No multilanguage support (csplain is recommended)} \fi % macros from csplain, file csfontsm.tex: - \font\tenbi=csbxti10 \def\bi{\tenbi} + \font\tenbi=cmbxti10 \def\bi{\tenbi} \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} @@ -951,9 +951,9 @@ \replacestrings{\{}{{\char`\{}}% \replacestrings{\}}{{\char`\}}}% \replacestrings{&}{{\urlbskip\char`\& \urlskip}}% - \def\|{}\ulink[#1]{\urlfont\tmpb}% + \def\|{}\ulink[#1]{\urlfont\tmpb\null}% }} -\def\urlfont{\tt \hyphenchar\the\font=-1 \let\|=\urlspecchar} +\def\urlfont{\tt \let\|=\urlspecchar} \def\urlspecchar{\penalty10 } \def\urlskip{\null\nobreak\hskip0pt plus0.05em\relax} \def\urlbskip{\penalty100 \hskip0pt plus0.05em\relax} @@ -1297,7 +1297,7 @@ \isdefined{mn:\the\mnotenum}\iftrue \else\opwarning{unknown \noexpand\mnote side. TeX me again}\fi \edef\tmp{\csname mn:\the\mnotenum\endcsname}% - \openref\wref\Xmnote{}% + \openref\wref\Xmnote{}\ifvmode\nobreak\fi \else \let\tmp=\mnotesfixed \fi \expandafter\ifx\tmp \left \hbox to0pt{\kern-\mnotesize \kern-\mnoteindent @@ -1733,5 +1733,9 @@ May 2015 \itemhook introduced \REFversion introduced \prepghook introduced, \draft redefined using \prepghook \mnote, \fnote redeclared as \long +Jun 2015 \urlfont: \hyphenchar=-1 removed (bug fixed) + \mnote: \nobreak after \wref added (bug fixed) + csbxti10 -> cmbxti10, corrected for non-csplain users + %%%%%%%%%%%%%% End of opmac.tex -- cgit v1.2.3