From 223162e87cec5243ae4b5345d9d5599523632e70 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 15 Aug 2013 22:14:29 +0000 Subject: csplain (15aug13) git-svn-id: svn://tug.org/texlive/trunk@31437 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/csplain/base/csplain.ini | 6 +- Master/texmf-dist/tex/csplain/fonts/ams-math.tex | 19 +++--- Master/texmf-dist/tex/csplain/fonts/cavantga.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cbookman.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/chelvet.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cncent.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cpalatin.tex | 2 +- .../texmf-dist/tex/csplain/fonts/cs-adventor.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cs-antt.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cs-arev.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cs-bera.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cs-bonum.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cs-charter.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cs-cursor.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cs-heros.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cs-pagella.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cs-polta.tex | 4 +- Master/texmf-dist/tex/csplain/fonts/cs-schola.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/cs-termes.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/ctimes.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/lmfonts.tex | 2 +- Master/texmf-dist/tex/csplain/fonts/tx-math.tex | 19 +++--- Master/texmf-dist/tex/csplain/opmac/opmac.tex | 68 ++++++++++++---------- 23 files changed, 88 insertions(+), 64 deletions(-) diff --git a/Master/texmf-dist/tex/csplain/base/csplain.ini b/Master/texmf-dist/tex/csplain/base/csplain.ini index 4eb0e15e924..17616df4e14 100644 --- a/Master/texmf-dist/tex/csplain/base/csplain.ini +++ b/Master/texmf-dist/tex/csplain/base/csplain.ini @@ -134,11 +134,15 @@ file extcode.tex renamed to il2code.tex (suggested by Jan Kasprzak) * \letfont macro introduced. * lmfonts.tex: \ifx\font\corkencoded \def\tmp{rm} corrected. - Jul. 2013: + Jul. 2013: [format didn't modified] * \newXeTeXintercharclass defined for XeTeX. * chars-8z.tex: twice loading is protected. * lmfonts.tex: cs-lmtt10 loaded, encoding is OK. + Aug, 2013: [format didn't modified] +* ams-math, tx-math.tex: \dgsize, \whichtfm corrected +* ams-math, tx-math.tex: \mathpreloaded introduced, used in fonts/*.tex + COPYRIGHT ========= diff --git a/Master/texmf-dist/tex/csplain/fonts/ams-math.tex b/Master/texmf-dist/tex/csplain/fonts/ams-math.tex index 9f204220f8d..260194c8a18 100644 --- a/Master/texmf-dist/tex/csplain/fonts/ams-math.tex +++ b/Master/texmf-dist/tex/csplain/fonts/ams-math.tex @@ -6,6 +6,7 @@ \message{FONT: AMS math fonts - \string\mathchardef's prepared, 12 math families preloaded.} +\let\mathpreloaded=A % After \input ams-math % @@ -153,8 +154,7 @@ % but now there is a different usage of the \resizefont: % \def\dgsize{17pt}\def\sizespec{at\dgsize}\resizefont\tenrm -\ifx\corrmsizes\undefined \def\corrmsizes#1{}\fi % see tx-math for the - % example of \corrmsizes +\def\corrmsizes#1{} % see tx-math for the example of \corrmsizes %% macros: @@ -170,7 +170,7 @@ \font\tmp=\whichtfm{#2} at \dgsize \scriptfont#1=\tmp \let\dgsize=\sizemsscript \font\tmp=\whichtfm{#2} at\dgsize \scriptscriptfont#1=\tmp - \ptmunit=1pt + \ptmunit=1pt \let\dgsize=\undefined } \def\setmathfamily #1#2{\corrmsizes{#1}% \let\dgsize=\sizemtext @@ -179,7 +179,7 @@ \font\tmp = \specfontname #2 at\sizemscript \scriptfont#1=\tmp \let\dgsize=\sizemsscript \font\tmp = \specfontname #2 at\sizemsscript \scriptscriptfont#1=\tmp - \ptmunit=1pt + \ptmunit=1pt \let\dgsize=\undefined } \def\specfontname #1{\expandafter \ignoreatpt \fontname #1 \relax} \def\ignoreatpt #1 #2\relax{\whichtfm{#1}} @@ -189,12 +189,13 @@ \ifnum\count0<`#3 \advance\count0 by1 \advance\count1 by1 \repeat \count0=\tmp \count1=\tmpa } -\def\whichtfm #1{\expandafter \ifx\csname#1:reg\endcsname\relax +\def\whichtfm #1{\ifx\dgsize\undefined #1\else + \expandafter \ifx\csname#1:reg\endcsname\relax #1% \else \expandafter\expandafter\expandafter \dowhichtfm \csname #1:reg\expandafter\endcsname - \fi + \fi \fi } \def\dowhichtfm #1 #2 {% \ifdim\dgsize<#2pt #1\expandafter\ignoretfm\else \expandafter\dowhichtfm @@ -218,7 +219,7 @@ \def\sizemtext{#1\ptmunit}\def\sizemscript{#2\ptmunit}% \def\sizemsscript{#3\ptmunit}% } -\newdimen\ptmunit \ptmunit=1pt % used in \corrmsizes +\ifx\ptmunit\undefined \csname newdimen\endcsname\ptmunit\fi \ptmunit=1pt % used in \corrmsizes \setmathsizes[10/7/5] @@ -507,3 +508,7 @@ % end of ams-math.tex file +Jul. 2013: \ifx\dgsize\undefined added +Jul. 2013: \def\corrmsizes{} without dependency +Aug. 2013: \mathpreloaded introduced +Aug. 2013: \newdimen\ptmunit only once diff --git a/Master/texmf-dist/tex/csplain/fonts/cavantga.tex b/Master/texmf-dist/tex/csplain/fonts/cavantga.tex index 8742df30e6f..a3e1aa99a20 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cavantga.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cavantga.tex @@ -22,7 +22,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi \let\setsimplemath=\relax % this command is obsolete diff --git a/Master/texmf-dist/tex/csplain/fonts/cbookman.tex b/Master/texmf-dist/tex/csplain/fonts/cbookman.tex index d033df87182..35d115c34c9 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cbookman.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cbookman.tex @@ -21,7 +21,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi \let\setsimplemath=\relax % this command is obsolete diff --git a/Master/texmf-dist/tex/csplain/fonts/chelvet.tex b/Master/texmf-dist/tex/csplain/fonts/chelvet.tex index 38b9988dc1f..34b771da76d 100644 --- a/Master/texmf-dist/tex/csplain/fonts/chelvet.tex +++ b/Master/texmf-dist/tex/csplain/fonts/chelvet.tex @@ -48,7 +48,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi \let\setsimplemath=\relax % this command is obsolete diff --git a/Master/texmf-dist/tex/csplain/fonts/cncent.tex b/Master/texmf-dist/tex/csplain/fonts/cncent.tex index 7ff72a57173..dd9a3e64f62 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cncent.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cncent.tex @@ -21,7 +21,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi \let\setsimplemath=\relax % this command is obsolete diff --git a/Master/texmf-dist/tex/csplain/fonts/cpalatin.tex b/Master/texmf-dist/tex/csplain/fonts/cpalatin.tex index c8299d91c4c..6a071afea16 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cpalatin.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cpalatin.tex @@ -21,7 +21,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi \let\setsimplemath=\relax % this command is obsolete diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-adventor.tex b/Master/texmf-dist/tex/csplain/fonts/cs-adventor.tex index ed0d9b7ac4b..0de83efb1de 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-adventor.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-adventor.tex @@ -30,7 +30,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi % end of cs-adventor.tex diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-antt.tex b/Master/texmf-dist/tex/csplain/fonts/cs-antt.tex index 3304fa32fba..0f9bcb31b75 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-antt.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-antt.tex @@ -49,7 +49,7 @@ \def\txr{cs-anttr} \def\txmi{mi-anttri} \def\txb{cs-anttb} \def\txbi{mi-anttbi} -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi \ifx\font\corkencoded \else \input chars-8z \fi diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-arev.tex b/Master/texmf-dist/tex/csplain/fonts/cs-arev.tex index d0b1cf6fae9..71df60b33ad 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-arev.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-arev.tex @@ -15,7 +15,7 @@ \font\tenit=favri\tmp \font\tenbi=favbi\tmp -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi % end of cs-arev.tex diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-bera.tex b/Master/texmf-dist/tex/csplain/fonts/cs-bera.tex index 623795823fb..a0a6dd7b045 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-bera.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-bera.tex @@ -37,6 +37,6 @@ \regfont\tenttbf \regfont\tenttbi \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi % end of cs-bera.tex diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-bonum.tex b/Master/texmf-dist/tex/csplain/fonts/cs-bonum.tex index c563c5917fd..4d8d67b17ac 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-bonum.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-bonum.tex @@ -30,7 +30,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi % end of cs-bonum.tex diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-charter.tex b/Master/texmf-dist/tex/csplain/fonts/cs-charter.tex index 30a283c3033..8398ae2f5eb 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-charter.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-charter.tex @@ -15,6 +15,6 @@ \tenrm -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi % end of cs-charter.tex diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-cursor.tex b/Master/texmf-dist/tex/csplain/fonts/cs-cursor.tex index d0fb9382978..cde44cd41a3 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-cursor.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-cursor.tex @@ -25,7 +25,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi % end of cs-cursor.tex diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-heros.tex b/Master/texmf-dist/tex/csplain/fonts/cs-heros.tex index 9db72673eae..b1154bd8e47 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-heros.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-heros.tex @@ -51,7 +51,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi % end of cs-heros.tex diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-pagella.tex b/Master/texmf-dist/tex/csplain/fonts/cs-pagella.tex index dde3b41c317..a1fb5c32729 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-pagella.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-pagella.tex @@ -30,7 +30,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi % end of cs-pagella.tex diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-polta.tex b/Master/texmf-dist/tex/csplain/fonts/cs-polta.tex index 01d38d03de0..d125965fdc1 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-polta.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-polta.tex @@ -32,6 +32,8 @@ \font\tenmrc=\tmp-antpm\dgsize-sc \sizespec \font\tenmic=\tmp-antpmi\dgsize-sc \sizespec +\let\dgsize=\undefined + \tenrm % You can use \cap\rm, \cap\bf, \cap\li @@ -51,7 +53,7 @@ \regfont\tenmrc \regfont\tenmic \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi \ifx\font\corkencoded \else \input chars-8z \fi diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-schola.tex b/Master/texmf-dist/tex/csplain/fonts/cs-schola.tex index 8c5504a56e4..bd4ef4b59ad 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-schola.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-schola.tex @@ -30,7 +30,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi % end of cs-schola.tex diff --git a/Master/texmf-dist/tex/csplain/fonts/cs-termes.tex b/Master/texmf-dist/tex/csplain/fonts/cs-termes.tex index eb2a6e83e86..5f547853cec 100644 --- a/Master/texmf-dist/tex/csplain/fonts/cs-termes.tex +++ b/Master/texmf-dist/tex/csplain/fonts/cs-termes.tex @@ -30,7 +30,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi % end of cs-termes.tex diff --git a/Master/texmf-dist/tex/csplain/fonts/ctimes.tex b/Master/texmf-dist/tex/csplain/fonts/ctimes.tex index f9a85683fcb..82825f7f552 100644 --- a/Master/texmf-dist/tex/csplain/fonts/ctimes.tex +++ b/Master/texmf-dist/tex/csplain/fonts/ctimes.tex @@ -21,7 +21,7 @@ \ifx\font\corkencoded \else \input chars-8z \fi -\ifx\normalTXmath\undefined \input tx-math \else\normalTXmath \fi +\ifx\mathpreloaded X\else \input tx-math \fi \let\setsimplemath=\relax % this command is obsolete diff --git a/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex b/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex index 6dcdc926d81..bc433f88299 100644 --- a/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex +++ b/Master/texmf-dist/tex/csplain/fonts/lmfonts.tex @@ -7,7 +7,7 @@ \ifx\sizespec\undefined \def\sizespec{}\fi -\ifx\regtfm\undefined \input ams-math \fi +\ifx\mathpreloaded A\else \input ams-math \fi \ifx\font\corkencoded \else \input chars-8z \fi \ifx\font\corkencoded \def\tmp{ec}\else \def\tmp{cs}\fi diff --git a/Master/texmf-dist/tex/csplain/fonts/tx-math.tex b/Master/texmf-dist/tex/csplain/fonts/tx-math.tex index e02a1bc3796..f5df0efe4b2 100644 --- a/Master/texmf-dist/tex/csplain/fonts/tx-math.tex +++ b/Master/texmf-dist/tex/csplain/fonts/tx-math.tex @@ -3,6 +3,7 @@ % Petr Olsak, 2012 \message{FONT: TX math fonts - \string\mathchardef's prepared, 14 math families preloaded.} +\let\mathpreloaded=X % After \input tx-math % @@ -87,12 +88,13 @@ \txxdef\txr{txr}\txxdef\txmi{txmi} % \fam0, \fam1 normal \txxdef\txb{txb}\txxdef\txbmi{txbmi} % \fam0, \fam1 bold -\txxdef\bfsans{phvb8z}\txxdef\bisans{phvbo8z} % \bffam, \bifam normal -\txxdef\bbfsans{phvb8z}\txxdef\bbisans{phvbo8z} % \bffam, \bifam bold -\ifx\corrmsizes\undefined % wee need to correct - \def\corrmsizes#1{\ifnum#1=10 \ptmunit=.83pt \fi % the sizes o phvb8t and - \ifnum#1=11 \ptmunit=.83pt \fi} % phvbo8t fonts -\fi +\ifx\bisans\undefined % user can define his own \bfsans, \bisans + \def\bfsans{phvb8z}\def\bisans{phvbo8z} % \bffam, \bifam normal + \def\bbfsans{phvb8z}\def\bbisans{phvbo8z} % \bffam, \bifam bold + \def\corrmsizes#1{\ifnum#1=10 \ptmunit=.83pt \fi % wee need to correct + \ifnum#1=11 \ptmunit=.83pt \fi} % the sizes o phvb8t and +\fi % phvbo8t fonts +\ifx\corrmsizes\undefined \def\corrmsizes#1{}\fi % macros: @@ -134,7 +136,7 @@ \def\sizemtext{#1\ptmunit}\def\sizemscript{#2\ptmunit}% \def\sizemsscript{#3\ptmunit}% } -\newdimen\ptmunit \ptmunit=1pt +\ifx\ptmunit\undefined \csname newdimen\endcsname\ptmunit\fi \ptmunit=1pt \setmathsizes[10/7/5] \ifx\tenbi\undefined \font\tenbi=ptmbi8z \relax \fi @@ -708,3 +710,6 @@ % end of tx-math.tex file +Jul. 2013: \corrmsizes defined if \bisans undefined +Aug. 2013: \mathpreloaded introduced +Aug. 2013: \newdimen\ptmunit only once diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex index 89cceb21682..a365fea689b 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{Jul. 2013} +\def\OPmacversion{Aug. 2013} \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>} @@ -132,9 +132,10 @@ \regfont\tenrm \regfont\tenit \regfont\tenbf \regfont\tenbi \regfont\tentt \fi -\input ams-math % ams-math.tex is in csplain package Nov. 2012 or later - -\def\resizefontskipat#1 #2\relax{\whichtfm{#1} \sizespec\relax} +\ifx\normalmath\undefined \input ams-math \fi % ams-math.tex is in csplain package +\ifx\whichtfm\undefined \else + \def\resizefontskipat#1 #2\relax{\whichtfm{#1} \sizespec\relax} +\fi \newdimen\ptunit \ptunit=1pt \newdimen\fontdim \fontdim=10pt @@ -156,7 +157,7 @@ \fontdim=#1\ptunit \let\dgsize=\fontdim \edef\sizespec{at\the\fontdim}% - \resizeall \rm + \resizeall \rm \let\dgsize=\undefined \fi } \def\setbaselineskip[#1]{\if$#1$\else @@ -194,7 +195,7 @@ \def\thefontsize[#1]{% \expandafter\let \expandafter\thefont \the\font \def\sizespec{at#1\ptunit}\def\dgsize{#1\ptunit}\resizefont\thefont - \thefont \ignorespaces + \thefont \let\dgsize=\undefined \ignorespaces } \def\thefontscale[#1]{% \tmpdim=#1pt \divide\tmpdim by1000 @@ -389,14 +390,14 @@ \parfillskip=0pt plus2fil \def\par{\endgraf\egroup}% \captionhook{#1}\noindent - {\def\destheight{2.1em}\wlabel{\csname the#1num\endcsname}}% + {\destheight=2.1em \wlabel{\csname the#1num\endcsname}}% \printcaption{\mtext{#1}}{\csname the#1num\endcsname}% } \def\printcaption#1#2{{\bf#1 #2}\enspace} \def\eqmark{\global\advance\dnum by1 \ifinner\else\eqno \fi - {\def\destheight{2.1em}\wlabel\thednum}\thednum + {\destheight=2.1em \wlabel\thednum}\thednum } %%%%%%%%%%%%%% Items -- sec. 3.10 in opmac-d.pdf @@ -453,7 +454,7 @@ \opwarning{\noexpand\maketoc -- data unavailable, TeX me again}\openref \else \toclist \fi} -\def\toclinkA#1{\def\tmp##1!##2\end{\if&##1&\kern.8em \else##1\fi}\tmp#1!\end} +\def\toclinkA#1{\def\tmp##1!##2\end{\if^##1^\kern.8em \else##1\fi}\tmp#1!\end} %%%%%%%%%%%%%% Index -- sec. 3.12 on opmac-d.pdf @@ -538,11 +539,11 @@ \orippx \global\let\act=\undefined \global\let\orippx=\undefined \fi } -\def\printiipages#1&{#1\par} +\def\printiipages#1&{ #1\par} \def\prepii #1{\isinlist \iispeclist #1\iftrue - \expandafter\expandafter\expandafter \printii \csname\string#1\endcsname& - \else \expandafter\prepiiA\string #1& + \expandafter\expandafter\expandafter \printii \csname\string#1\endcsname&% + \else \expandafter\prepiiA\string #1&% \fi } \def\prepiiA #1#2#3&{\printii#3&} @@ -550,18 +551,17 @@ \def\iis #1 #2{\bgroup \def~{ }% \global\expandafter\addto\expandafter\iispeclist\csname,#1\endcsname \global\sdef{\expandafter\string\csname,#1\endcsname}{#2}% - \egroup + \egroup \ignorespaces } \def\iispeclist{} \def\printii #1&{\gdef\currii{#1}\noindent\everyii \hskip-\iindent \ignorespaces\printiiA#1//} -\def\printiiA #1/{\if$#1$\expandafter\printiiB\else - \expandafter\scanprevii\previi/&\gdef\tmpb{#1}% +\def\printiiA #1/{\if^#1^\let\previi=\currii \else + \expandafter\scanprevii\previi/&\def\tmpb{#1}\edef\tmpb{\meaning\tmpb}% \ifx\tmpa\tmpb \iiemdash \else#1 \gdef\previi{}\fi \expandafter\printiiA\fi } -\def\printiiB{\let\previi=\currii} \def\iiemdash{\kern.1em---\space} \def\everyii{} @@ -574,7 +574,7 @@ \global\leftskip=\iindent } -\def\scanprevii#1/#2&{\def\previi{#2}\def\tmpa{#1}} +\def\scanprevii#1/#2&{\def\previi{#2}\def\tmpa{#1}\edef\tmpa{\meaning\tmpa}} \def\previi{} % previous index item @@ -910,6 +910,7 @@ %%%%%%%%%%%%%% Hyperrefs -- sec. 3.16 in opmac-d.pdf +\newdimen\destheight \destheight=1.3em \def\destactive[#1:#2]{\if$#2$\else\ifvmode \tmpdim=\prevdepth \prevdepth=-1000pt \destbox[#1:#2]\prevdepth=\tmpdim @@ -917,7 +918,6 @@ \fi\fi } \def\destbox[#1]{\vbox to0pt{\kern-\destheight \pdfdest name{#1} xyz\vss}} -\def\destheight{1.3em} \def\dest[#1]{} \def\link[#1:#2]#3#4{\leavevmode\pdfstartlink height.9em depth.3em @@ -945,8 +945,8 @@ \def\urlcolor{\longlocalcolor#2}% } -\def\pdfborder#1{\if$#1$\else \isdefined{#1border}\iftrue - \if$\csname#1border\endcsname$\else +\def\pdfborder#1{\if^#1^\else \isdefined{#1border}\iftrue + \if^\csname#1border\endcsname^\else attr{/C[\csname#1border\endcsname] /Border[0 0 1]}% \fi\fi\fi } @@ -957,7 +957,7 @@ \def\hyperlinks#1#2{} \fi -\def\url#1{\def\tmpb{#1}% +\def\url#1{{\def\tmpb{#1}% \replacestrings{//}{\urlskip\urlslashslash\urlbskip}% \replacestrings{/}{\urlskip/\urlbskip}% \replacestrings{.}{\urlskip.\urlbskip}% @@ -971,7 +971,7 @@ \replacestrings{\}}{\char`\} }% \replacestrings{&}{\urlbskip\char`\& \urlskip}% \ulink[url:#1]{\urlfont\tmpb}% -} +}} \def\urlfont{\tt} \def\urlskip{\null\nobreak\hskip0pt plus0.05em\relax} \def\urlbskip{\penalty100 \hskip0pt plus0.05em\relax} @@ -1317,14 +1317,14 @@ \openref\wref\Xmnote{}% \expandafter\ifx\tmp \left \hbox to0pt{\kern-\mnotesize \kern-\mnoteindent - \vbox to0pt{\vss \setbox0=\vtop{% - \hsize=\mnotesize \leftskip=0pt plus 1fill \relax \mnotehook \noindent#1}% - \dp0=0pt \box0 \kern\mnoteskip \global\mnoteskip=0pt}\hss}% + \vbox to0pt{\vss \setbox0=\vtop{\hsize=\mnotesize + \leftskip=0pt plus 1fill \rightskip=0pt \relax \mnotehook \noindent#1}% + \dp0=0pt \box0 \kern\mnoteskip \global\mnoteskip=0pt}\hss}% \else \hbox to0pt{\kern\hsize \kern\mnoteindent - \vbox to0pt{\vss \setbox0=\vtop{% - \hsize=\mnotesize \rightskip=0pt plus 1fil \relax \mnotehook \noindent#1}% - \dp0=0pt \box0 \kern\mnoteskip \global\mnoteskip=0pt}\hss}% + \vbox to0pt{\vss \setbox0=\vtop{\hsize=\mnotesize + \rightskip=0pt plus 1fil \leftskip=0pt \relax \mnotehook \noindent#1}% + \dp0=0pt \box0 \kern\mnoteskip \global\mnoteskip=0pt}\hss}% \fi } \def\Xmnote{\advance\mnotenum by1 @@ -1508,7 +1508,7 @@ } \def\doprotect#1{\let#1=\relax} \addto\begoutput{\def\nl{ }} -\def\prepage{\def\destheight{25pt}\dest[pg:\the\pageno]} +\def\prepage{\destheight=25pt \dest[pg:\the\pageno]} {\catcode`\@=11 \gdef\pagecontents{\prepage % dest of pageno @@ -1621,10 +1621,18 @@ Jul. 2013 \fnotetext unwanted space - corrected \othe\secnum in \secc removed \dotocnum, \remskip, \reminsert introduced \nonum, \notoc implemented - \destheight introduced + \destheight introduced as macro \runningfnotes introduced \addto defined as \long \iiskip, \ttskip, \bibskip precedes by \par +Aug. 2013 \dgsize corrected + \ifx\tmpa\tmpb in \printiiA is realized via \meaning + \ignorespaces included to \iis + \url hidden in group, in order to handle & in tables + \destheight rewritten as a dimen register + \rightskip, \leftskip corrected in \mnote + space corrected in \prepii + \input ams-math only if \normalmath is \undefined %%%%%%%%%%%%%% End of opmac.tex -- cgit v1.2.3