From f4bb07267c294f84d8f0656f916930f6883ca6f4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 13 Mar 2019 20:56:52 +0000 Subject: csplain (13mar19) git-svn-id: svn://tug.org/texlive/trunk@50371 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/csplain/opmac/opmac.tex | 47 ++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex index f6cb8e92995..408e3bbf345 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{Aug. 2018} +\def\OPmacversion{Mar. 2019} \immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>} %%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf @@ -107,6 +107,7 @@ \newdimen\mnoteindent \mnoteindent=10pt % ditance between mnote and text \newdimen\mnotesize \mnotesize=20mm % the width of the mnote paragraph +\newskip\titskip \titskip=4em % \vglue above title printed by \tit \def\picdir{} % the directory with picture files \def\bibtexhook{} % hook in \usebibtex and \usebbl macros @@ -252,6 +253,7 @@ \sdef{mt:chap:en}{Chapter} \sdef{mt:chap:cs}{Kapitola} \sdef{mt:chap:sk}{Kapitola} \sdef{mt:t:en}{Table} \sdef{mt:t:cs}{Tabulka} \sdef{mt:t:sk}{Tabu\v lka} \sdef{mt:f:en}{Figure} \sdef{mt:f:cs}{Obr\'azek} \sdef{mt:f:sk}{Obr\'azok} +\sdef{mt:subj:en}{Subject} \sdef{mt:subj:cs}{V\v{e}c} \sdef{mt:subj:sk}{Vec} \ifx\r\undefined \csname csaccents\endcsname \fi @@ -337,7 +339,7 @@ {\seccfont \noindent \dotocnum{\thetocnum\quad}#1\nbpar}% \nobreak \remskip\medskipamount \firstnoindent } -\eoldef\tit#1{\vglue4em +\eoldef\tit#1{\vglue\titskip {\leftskip=0pt plus1fill \rightskip=\leftskip \titfont \noindent #1\par}% \nobreak\bigskip @@ -1309,9 +1311,9 @@ \newcount\fnotenumlocal \newif\iflocfnum \locfnumtrue -\long\def\fnote#1{\global\advance \fnotenum by1 - \leavevmode\openref\wref\Xfnote{}% - \iflocfnum \isdefined{fn:\the\fnotenum}\iftrue +\long\def\fnote#1{\global\advance \fnotenum by1 \leavevmode + \iflocfnum \openref\wref\Xfnote{}% + \isdefined{fn:\the\fnotenum}\iftrue \else\opwarning{unknown \noexpand\fnote mark. TeX me again}\fi\fi \fnmarkx{\fnotehook\typobase\typoscale[800/800]\vfootnote\fnmarkx{#1}}% } @@ -1659,6 +1661,37 @@ \fi\fi} \def\truedimen#1{\ifx\trueunit\empty \else#1=\expandafter\ignorept\the#1truept \fi} +%%%%%%%%%%%%%% Pre-defined document styles + +\def\boxlines{% + \def\boxlinesE{\ifhmode\egroup\empty\fi}\def\nl{\boxlinesE}% + \bgroup \lccode`\~=`\^^M\lowercase{\egroup\let~}\boxlinesE + \everypar{\setbox0=\lastbox\endgraf + \hbox\bgroup \catcode`\^^M=13 \let\par=\nl \aftergroup\boxlinesC}% +} +\def\boxlinesC{\futurelet\next\boxlinesD} +\def\boxlinesD{\ifx\next\empty\else\expandafter\egroup\fi} + +\def\report{ + \typosize[11/13.2] + \let\titfont=\chapfont + \titskip=3ex + \eoldef\author##1{\removelastskip\bigskip + {\leftskip=0pt plus1fill \rightskip=\leftskip \it \noindent ##1\par}\nobreak\bigskip + } + \parindent=1.2em \iindent=\parindent \ttindent=\parindent + \footline={\global\footline={\hss\tenrm\thefontsize[10]\folio\hss}} + \runningfnotes +} +\def\letter{ + \def\address{\vtop\bgroup\boxlines \parskip=0pt \let\par=\egroup} + \def\subject{{\bf \mtext{subj}: }} + \typosize[11/14] + \parindent=0pt + \parskip=\medskipamount + \nopagenumbers +} + %%%%%%%%%%%%%% XeTeX specific + REF file is read now -- sec 3.26 in opmac-d.pdf \ifx\XeTeXversion\undefined \else \pdftexfalse \input opmac-xetex \fi @@ -1820,6 +1853,10 @@ May 2018 \chap: \edef\thesecnum added (J. Sustek) \link: argument in group in both: \hyperlinks on/off (J. Sustek) Aug. 2018 \wlabel: \protectlist added. \Xlabel: \sxdef{lab:#1} changed to \sdef (J. Sustek) +Mar. 2019 Style declarations \report and \letter added. + \boxlines added. + \titskip introduced. + \fnote corrected: \iflocfnum\openref. %%%%%%%%%%%%%% End of opmac.tex -- cgit v1.2.3