summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-29 23:27:25 +0000
committerKarl Berry <karl@freefriends.org>2013-04-29 23:27:25 +0000
commitedb774bed555c3ebe551d39c690375bc1d850c21 (patch)
tree6686bc77e0fd2d5ae3ba503c3e427b36584fc671 /Master/texmf-dist
parent04a0be28296aa8b6e73b84223f3d714af8823573 (diff)
csplain (29apr13)
git-svn-id: svn://tug.org/texlive/trunk@30164 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/tex/csplain/opmac/opmac.tex29
1 files changed, 18 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index 78f826f6316..71833814afc 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{Feb. 2013}
+\def\OPmacversion{Apr. 2013}
\immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
@@ -208,7 +208,8 @@
\expandafter\ifx \the\font \tenbi \additcorr \bf \else
\it \aftergroup\afteritcorr\fi\fi\fi}
\def\additcorr{\ifdim\lastskip>0pt \skip0=\lastskip \unskip\/\hskip\skip0 \else\/\fi}
-\def\afteritcorr{\def\tmp{\ifx\next..\else\ifx\next,,\else\/\next\fi\fi}%
+\def\afteritcorr{\def\tmp{\ifx\next..\else\ifx\next,,\else\/%
+ \expandafter\expandafter\expandafter\next\expandafter\fi\fi}%
\afterassignment\tmp \let\next= }
\addprotect\thefontsize \addprotect\thefontscale
@@ -336,12 +337,14 @@
\nobreak\bigskip
\firstnoindent
}
-\def\printsec#1{\removelastskip \goodbreak \bigskip
+\def\printsec#1{\removelastskip
+ \ifnum \lastpenalty<1000 \goodbreak \fi \bigskip
{\secfont \noindent \dest[toc:\thesecnum]{1.3em}\thesecnum\quad #1\nbpar}%
\nobreak\medskip
\firstnoindent
}
-\def\printsecc#1{\removelastskip \goodbreak \medskip
+\def\printsecc#1{\removelastskip
+ \ifnum \lastpenalty<1000 \goodbreak \fi \medskip
{\seccfont \noindent
\dest[toc:\theseccnum]{1.3em}\theseccnum\quad #1\nbpar}%
\nobreak\medskip
@@ -905,7 +908,7 @@
\def\urllink[#1:#2]#3{{\let~=\relax \let\\=\relax \let\{=\relax \let\}=\relax
\leavevmode\pdfstartlink height.9em depth.3em
\pdfborder{#1}user{/Subtype/Link/A <</Type/Action/S/URI/URI(#2)>>}\relax
- {\urlcolor#3}\pdfendlink}%
+ {\def~{\nobreak\space}\urlcolor#3}\pdfendlink}%
}
\def\toclink#1{#1}
\def\pglink#1{#1}
@@ -1145,17 +1148,17 @@
\def\ddlinedata{}
\def\vvleft{}
-\def\table#1#2{\vbox{\offinterlineskip
- \def\tmpa{}\scantabdata#1\relax
- \halign\expandafter{\the\tabdata\tabstrutA\cr#2\crcr}}}
+\def\table{\vbox\bgroup \catcode`\|=12 \tableA}
+\def\tableA#1#2{\offinterlineskip \def\tmpa{}\tabdata={}\scantabdata#1\relax
+ \halign\expandafter{\the\tabdata\tabstrutA\cr#2\crcr}\egroup}
-\def\scantabdata#1{%
- \ifx#1\relax\let\scantabdata=\relax
+\def\scantabdata#1{\let\next=\scantabdata
+ \ifx#1\relax\let\next=\relax
\else\if#1|\addtabvrule
\else\expandafter\ifx\csname tabdeclare#1\endcsname \relax
\opwarning{tab-declare letter #1 unknown, ignored}%
\else\expandafter \addtabitem\expandafter{\csname tabdeclare#1\endcsname}%
- \fi\fi\fi \scantabdata
+ \fi\fi\fi \next
}
\def\tabdeclarec{\tabiteml\hfil##\unsskip\hfil\tabitemr}
\def\tabdeclarel{\tabiteml##\unsskip\hfil\tabitemr}
@@ -1585,6 +1588,10 @@ Feb. 2013 \urllink: works with \\, \%, \#, \$, \{, \}.
\localcolor, \longlocalcolor introduced
\global\advance for chap./sec. nums corrected
\printcaption introduced
+Apr. 2013 \table in \table allowed, \catcode`\|=12 set in \table.
+ \printsec(c): \ifnum\lastpenalty added.
+ \urlink: ``~ removing'' corrected
+ {\em text}\macro error corrected.
%%%%%%%%%%%%%% End of opmac.tex