summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/csplain/opmac/opmac.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/csplain/opmac/opmac.tex')
-rw-r--r--Master/texmf-dist/tex/csplain/opmac/opmac.tex20
1 files changed, 5 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index 28940e0864e..7ecc4ac5581 100644
--- a/Master/texmf-dist/tex/csplain/opmac/opmac.tex
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
@@ -1,11 +1,11 @@
% OPmac
%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Petr Olsak, 2012 -- 2015
+%% Petr Olsak, 2012 -- 2016
%% The history of versions is at the end of this file, after \endpinput
\ifx\OPmacversion\undefined \else \endinput \fi
-\def\OPmacversion{Apr. 2016b}
+\def\OPmacversion{Apr. 2016c}
\immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
%%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -73,7 +73,6 @@
}
\egroup
-
%%%%%%%%%%%%%% Global parameters, sec. 3.2 in opmac-d.pdf
\widowpenalty=10000
@@ -243,6 +242,7 @@
\addprotect\textfontsize \addprotect\textfontscale
\addprotect\em
+\def\fontfam{\par \input fontfam \fontfam}
%%%%%%%%%%%%%% Multilingual support, sec. 3.5 in opmac-d.pdf
@@ -321,7 +321,6 @@
}
\def\Xlabel#1#2{\sxdef{lab:#1}{#2}\sxdef{pgref:#1}{\the\lastpage}}
-
%%%%%%%%%%%%%% Chapters, sections, subsections -- sec. 3.8 in opmac-d.pdf
\def\printchap#1{\vfil\break
@@ -410,7 +409,6 @@
\def\nbpar{{\interlinepenalty=10000\endgraf}}
\def\nl{\hfil\break}
-
%%%%%%%%%%%%%% Captions, equations -- sec. 3.9 in opmac-d.pdf
\newcount\tnum \newcount\fnum \newcount\dnum
@@ -616,7 +614,6 @@
\def\scanprevii#1/#2&{\def\previi{#2}\def\tmpa{#1}\edef\tmpa{\meaning\tmpa}}
\def\previi{} % previous index item
-
%%%%%%%%%%%%%% Sorting -- sec. 3.13 in opmac-d.pdf
\def\sortingdata{%
@@ -765,7 +762,6 @@
\def\sortreturn#1#2\fi\relax{#1} \def\fif{\fi}
\def\gobbletoend #1\end{}
-
%%%%%%%%%%%%%% \begmulti ... \endmulti TBN p. 244, 245 -- sec. 3.14 in opmac-d.pdf
\newcount\mullines
@@ -901,7 +897,6 @@
\def\draft{\opwarning{\string\draft: Grey color is possible in pdfTeX only}}
\fi
-
%%%%%%%%%%%%%% Hyperrefs -- sec. 3.16 in opmac-d.pdf
\def\destheight{1.4em}
@@ -975,7 +970,6 @@
\def\urlslashslash{/\urlskip/}
\addprotect\url
-
%%%%%%%%%%%%%% Outlines -- sec. 3.17 in opmac-d.pdf
\def\outlines#1{\pdfcatalog{/PageMode/UseOutlines}\openref\ifx\toclist\empty
@@ -1045,7 +1039,6 @@
\let\insertoutline=\outlines
\fi
-
%%%%%%%%%%%%%% Verbatim, \begtt, \endtt -- sec. 3.18 in opmac-d.pdf
\newcount\ttline \ttline=-1
@@ -1154,7 +1147,6 @@
\def\vireadline{\read\vifile to \tmp \global\advance\viline by1 }
\def\viprintline{\expandafter\addto\expandafter\tmpb\expandafter{\tmp}}
-
%%%%%%%%%%%%%% \table -- sec. 3.19 in opmac-d.pdf
\newtoks\tabdata
@@ -1211,7 +1203,6 @@
\hbox{\kern\hhkern#1\kern\hhkern}%
}\kern\vvkern\hrule}\vrule}}
-
%%%%%%%%%%%%%% \inspic -- sec. 3.20 in opmac-d.pdf
\newdimen\picwidth \picwidth=0pt \let\picw=\picwidth
@@ -1272,7 +1263,6 @@
\def\pdfsetmatrix#1{} \def\pdfsave{} \def\pdfrestore{}
\fi
-
%%%%%%%%%%%%%% \fnote, \mnote -- sec 3.22 in opmac-d.pdf
\newcount\fnotenum \fnotenum=0
@@ -1332,7 +1322,6 @@
\def\fixmnotes#1{\def\mnotesfixed{#1}}
-
%%%%%%%%%%%%%% \cite, \bib, \usebibtex, \usebbl -- sec. 3.23 in opmac-d.pdf
\newwrite\auxfile % AUX file for BibTeX
@@ -1529,6 +1518,7 @@
}
\def\Xcite#1{\addto\citelistB{\citeI[#1]}}
+\def\usebib{\par \input opmac-bib \usebib}
%%%%%%%%%%%%%% output -- sec. 3.24 in opmac-d.pdf
@@ -1567,7 +1557,6 @@
\newcount\lastpage \lastpage=0 % the last page of the document
\def\Xpage#1{\lastpage=#1 \fnotenumlocal=0 }
-
%%%%%%%%%%%%%% margins -- sec. 3.25 in opmac-d.pdf
\newdimen\pgwidth \newdimen\pgheight \pgwidth=0pt
@@ -1772,5 +1761,6 @@ Apr. 2016 \frame: redundant group removed
Apr. 2016a \eoldef introduced to \tit, \chap, \sec, \secc, see OPmac trick 0121
Apr. 2016b \input opmac-luatex.tex introduced
\slet introduced
+Apr. 2016c \fontfam introduced, \usebib as module loaded
%%%%%%%%%%%%%% End of opmac.tex