summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/csplain
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-13 22:08:15 +0000
committerKarl Berry <karl@freefriends.org>2014-05-13 22:08:15 +0000
commit34e3f8b16e62906055cbdcecd6288251af92cbc0 (patch)
tree87088c55ac2a579bc26b354c5784568e4424a31b /Master/texmf-dist/tex/csplain
parent67b8b39b54b6ff45ab131e0e4758efddcdf5e9b4 (diff)
csplain (13may14)
git-svn-id: svn://tug.org/texlive/trunk@34008 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/csplain')
-rw-r--r--Master/texmf-dist/tex/csplain/opmac/opmac-xetex.tex2
-rw-r--r--Master/texmf-dist/tex/csplain/opmac/opmac.tex35
2 files changed, 19 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac-xetex.tex b/Master/texmf-dist/tex/csplain/opmac/opmac-xetex.tex
index d62a97f26cc..61c3dcf8d80 100644
--- a/Master/texmf-dist/tex/csplain/opmac/opmac-xetex.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac-xetex.tex
@@ -18,7 +18,7 @@
% TEXT\special{pdf:eann} has to be used instead of
% \pdfstartlink goto name{LABEL}\relax TEXT\pdfendlink:
-\def\link[#1:#2]#3#4{\leavevmode
+\def\linkactive[#1:#2]#3#4{\leavevmode
\special{pdf:bann <</Type/Annot/Subtype/Link\pdfborder{#1}/A<</S/GoTo/D(#1:#2)>>>>}%
{#3#4}\special{pdf:eann}%
}
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index be09d128e29..b3824337d79 100644
--- a/Master/texmf-dist/tex/csplain/opmac/opmac.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
@@ -5,8 +5,7 @@
%% The history of versions is at the end of this file, after \endpinput
\ifx\OPmacversion\undefined \else \endinput \fi
-\def\OPmacversion{May 2014}
-
+\def\OPmacversion{May 2014c}
\immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
%%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -29,9 +28,7 @@
\def\sdef#1{\expandafter\def\csname#1\endcsname}
\def\sxdef#1{\expandafter\xdef\csname#1\endcsname}
-\def\adef#1{\catcode`#1=13
- \bgroup \lccode`\~=`#1\lowercase{\egroup\def~}%
-}
+\def\adef#1{\catcode`#1=13 \bgroup \lccode`\~=`#1\lowercase{\egroup\def~}}
\def\isdefined #1#2{\expandafter\ifx \csname#1\endcsname \relax
\csname iffalse\expandafter\endcsname
@@ -41,7 +38,7 @@
}
\def\isinlist#1#2#3{\def\tmp##1#2##2\end{\def\tmp{##2}%
\ifx\tmp\empty \csname iffalse\expandafter\endcsname \else
- \csname iftrue\expandafter\endcsname \fi}%
+ \csname iftrue\expandafter\endcsname \fi}% end of \def\tmp
\expandafter\tmp#1\endlistsep#2\end
}
\def\isnextchar#1#2#3{\def\tmpa{#2}\def\tmpb{#3}%
@@ -49,6 +46,10 @@
}
\def\isnextcharA{\ifx\tmp\next\expandafter\tmpa\else\expandafter\tmpb\fi}
+\def\maybebreak{\afterassignment\maybebreakA\tmpdim=}
+\def\maybebreakA{\ifvmode \vskip0pt plus\tmpdim \penalty-130 \vskip0pt plus-\tmpdim
+ \else \hskip0pt plus\tmpdim \penalty-130 \hskip0pt plus-\tmpdim \fi \relax
+}
\def\uv#1{\clqq#1\crqq}
\let\\=\undefined
{\lccode`\?=`\% \lowercase{\gdef\percent{?}}}
@@ -56,6 +57,7 @@
\def\,{\ifmmode \mskip\thinmuskip \else \thinspace \fi}
\addprotect\percent \addprotect\bslash \addprotect\, \addprotect\exfont
+
%%%%%%%%%%%%%% Global parameters, sec. 3.2 in opmac-d.pdf
\widowpenalty=10000
@@ -118,7 +120,7 @@
%%%%%%%%%%%%%% Sizes of fonts and \baselineskip, sec. 3.4 in opmac-d.pdf
\ifx\regfont\undefined
- \ifx\uselanguage\undefined
+ \ifx\uselanguage\undefined % if this is eplain, the following warning is suppressed
\opwarning{csplain version <Nov. 2012> or later is recommended}
\fi
% macros from csplain, file csfontsm.tex:
@@ -476,15 +478,11 @@
\def\ii #1 {\leavevmode\def\tmp{#1}\iiA #1,,}
\def\iiA #1,{\if$#1$\else\def\tmpa{#1}%
- \ifx\tmpa\iiatsign \expandafter\iiB\tmp,,%
- \else\iindex{#1}\fi
+ \ifx\tmpa\iiatsign \expandafter\iiB\tmp,,\else\iindex{#1}\fi
\expandafter\iiA\fi}
\def\iiatsign{@}
-\def\iiB #1,{\if$#1$\else
- \iiC#1/\relax
- \expandafter\iiB\fi
-}
+\def\iiB #1,{\if$#1$\else \iiC#1/\relax \expandafter\iiB\fi}
\def\iiC #1/#2\relax{\if$#2$\else\iindex{#2#1}\fi}
\def\iid #1 {\leavevmode\iindex{#1}#1\futurelet\tmp\iiD}
@@ -671,8 +669,7 @@
\newif \ifAleB
\def\isAleB #1#2{%
- \edef\tmp{\firstdata#1\empty\relax\firstdata#2\empty\relax%
- \noexpand#1\noexpand#2}%
+ \edef\tmp{\firstdata#1\empty\relax\firstdata#2\empty\relax \noexpand#1\noexpand#2}%
\expandafter \testAleB \tmp
}
\def\testAleB #1#2\relax #3#4\relax #5#6{%
@@ -935,9 +932,11 @@
\def\destbox[#1]{\vbox to0pt{\kern-\destheight \pdfdest name{#1} xyz\vss}}
\def\dest[#1]{}
-\def\link[#1:#2]#3#4{\leavevmode\pdfstartlink height.9em depth.3em
+\def\linkactive[#1:#2]#3#4{\leavevmode\pdfstartlink height.9em depth.3em
\pdfborder{#1} goto name{#1:#2}\relax {#3#4}\pdfendlink
}
+\def\link[#1]#2#3{#3}
+
\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
@@ -951,7 +950,7 @@
\def\urlcolor{}
\def\hyperlinks#1#2{%
- \let\dest=\destactive
+ \let\dest=\destactive \let\link=\linkactive
\def\toclink##1{\link[toc:##1]{\localcolor#1}{\toclinkA{##1}}}%
\def\pglink##1{\link[pg:##1]{\localcolor#1}{##1}}%
\def\citelink##1##2{\link[cite:##1]{\localcolor#1}{##2}}%
@@ -1726,5 +1725,7 @@ Apr. 2014 \nonumcitations, \ecite, \printbib, \lastbibnum introduced
Apr. 2014b \nocite[*] bug removed, \insertmark corrected
Apr. 2014c nowarn about old csplain if csplain isn't used
May 2014 \hyphenchar\urlfont=-1, \urlspecchar introduced
+May 2014b \linkactive introduced (bug correction)
+May 2014c \maybebreak introduced
%%%%%%%%%%%%%% End of opmac.tex