summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-11-23 23:04:17 +0000
committerKarl Berry <karl@freefriends.org>2015-11-23 23:04:17 +0000
commit62337378571de2e36529d442dd4ca63bb3ba5b81 (patch)
tree87ef0a2382ba356f54fc4d0db2ccee453de0c497 /Master/texmf-dist/tex
parente4aeaa443a5f38518b62cd0732ba9621f194a79b (diff)
csplain (23nov15)
git-svn-id: svn://tug.org/texlive/trunk@38925 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/csplain/opmac/opmac.tex17
1 files changed, 10 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index b90f07f5eda..4b6dc67c69e 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{Oct. 2015}
+\def\OPmacversion{Nov. 2015}
\immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
%%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -880,7 +880,7 @@
\def\setcmykcolor#1{} \def\pdfliteral#1{}
\fi
-\def\draft{\def\prepghook{\draftbox{\tenbf DRAFT}\nointerlineskip}}
+\def\draft{\addto\prepghook{\draftbox{\tenbf DRAFT}\nointerlineskip}}
\def\draftbox#1{\vbox to0pt{\setbox0=\hbox{\typosize[10/]#1}%
\kern.5\vsize \kern4\wd0 \hbox to0pt{\kern.5\hsize \kern-2.5\wd0
\pdfsave \pdfrotate{55}\pdfscale{10}{10}%
@@ -1044,10 +1044,10 @@
\newread\vifile
\def\setverb{\frenchspacing\def\do##1{\catcode`##1=12}\dospecials \catcode`\*=12 }
-\def\begtt{\par\ttskip\bgroup \wipeepar
+\def\begtt{\par \vskip\parskip \ttskip \bgroup \wipeepar
\setverb \adef{ }{\ }%
\ifx\savedttchar\undefined \else \catcode\savedttchar=12 \fi
- \parindent=\ttindent \vskip\parskip \parskip=0pt
+ \parindent=\ttindent \parskip=0pt
\tthook\relax
\ifnum\ttline<0 \else
\tenrm \thefontscale[700]\let\sevenrm=\thefont
@@ -1119,10 +1119,10 @@
\else
\edef\vinolines{\the\tmpnum}%
\fi
- \par\ttskip\bgroup \wipeepar
+ \vskip\parskip \ttskip \bgroup \wipeepar
\setverb \adef{ }{\ }%
\ifx\savedttchar\undefined \else \catcode\savedttchar=12 \fi
- \parindent=\ttindent
+ \parindent=\ttindent \parskip=0pt
\tthook\relax
\ifnum\ttline<-1 \else
\tenrm \thefontscale[700]\let\sevenrm=\thefont
@@ -1294,7 +1294,7 @@
\newcount\mnotenum \mnotenum=0 % global counter of mnotes
\newdimen\mnoteskip \mnoteskip=0pt
-\long\def\mnote#1{\ifvmode \mnoteA{#1}\nobreak\vskip-\baselineskip
+\long\def\mnote#1{\ifvmode \hbox{\vbox to\ht\strutbox{}\mnoteA{#1}}\nobreak\vskip-\baselineskip
\else \strut\vadjust{\kern-\dp\strutbox \mnoteA{#1}\kern\dp\strutbox}%
\fi
}
@@ -1750,5 +1750,8 @@ Sep. 2015 \sortingdata<iso-code> introduced, \isolangset introduced.
\dosorting: local \iisort changes.
Oct. 2015 \printttline, \ptthook introduced, \viprintline redesigned.
\everypar\expandafter{\the\everypar...} in \begtt, \doverbinput.
+Nov. 2015 \parskip=0 in \doverbinput, \vskip\parskip before first \ttskip
+ \addto\prepghook instead \def\prepghook in \draft
+ \mnote: ifvmode \hbox{\strut...} added
%%%%%%%%%%%%%% End of opmac.tex