summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-22 21:19:09 +0000
committerKarl Berry <karl@freefriends.org>2016-04-22 21:19:09 +0000
commite139215c9b77f799e573649198fb2558c4e3bb25 (patch)
treeed0e2f37586bbb351d8dafd61f908e57f6f4e484 /Master/texmf-dist/tex
parent740159ec8f1abc4f8a55a8615d083e65f80743be (diff)
csplain
git-svn-id: svn://tug.org/texlive/trunk@40683 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/csplain/base/csplain.ini16
-rw-r--r--Master/texmf-dist/tex/csplain/base/luaplain.ini2
-rw-r--r--Master/texmf-dist/tex/csplain/opmac/opmac-luatex.tex31
-rw-r--r--Master/texmf-dist/tex/csplain/opmac/opmac.tex13
4 files changed, 55 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/csplain/base/csplain.ini b/Master/texmf-dist/tex/csplain/base/csplain.ini
index eb8a4dee9c0..b773142266c 100644
--- a/Master/texmf-dist/tex/csplain/base/csplain.ini
+++ b/Master/texmf-dist/tex/csplain/base/csplain.ini
@@ -3,13 +3,17 @@
\input plain % format Plain
\restorefont % original meaning of primitive \font
\input csfontsm % macros: \sizespec, \resizefont, \resizeall, \tenbi, \bi
+
+\ifx\directlua\undefined \else\input luatexiniconfig.tex \fi
+\ifx\pdfextension\undefined \else\input luatex85.sty \fi % LuaTeX specific
+\ifx\eTeXversion\undefined \else\input etex-mac.tex \fi % eTeX specific
+
\input il2code % extra codes for czech / slovak letters in ISO-8859-2 encoding
-\ifx\directlua\undefined \else\input luatexiniconfig.tex \fi % LuaTeX specific
-\ifx\eTeXversion\undefined \else\input etex-mac.tex \fi % eTeX specific
\input hyphen.lan % czech / slovak hyphenation pattern (may be others too)
\input plaina4 % \hsize and \vsize for A4
+
\everyjob=\expandafter{\the\everyjob
- \message{The format: csplain <Jan. 2016a>.}
+ \message{The format: csplain <Mar. 2016>.}
\message{The cs-fonts are preloaded and A4 size implicitly defined.}}
\ifx\xprncode\undefined \else %% The encTeX is detected
\count255=128 % All codes > 128 are printable:
@@ -27,7 +31,9 @@
\wlog{\string#1=\string\XeTeXintercharclass\the\XeTeXallocatorG}%
\else \errmessage{No room for a new \XeTeXintercharclass}\fi}
\XeTeXuseglyphmetrics=1
+ \input ucode
\fi
+\ifx\directlua\undefined \else \input ucode \fi % LuaTeX specific
\ifx\pdfoutput\undefined \else % added in Feb. 2005
\def\tmpa#1#2#3#4\relax{\def\tmpa{#1#2#3}}\expandafter\tmpa\jobname\relax
@@ -234,8 +240,10 @@ file extcode.tex renamed to il2code.tex (suggested by Jan Kasprzak)
* luafonts.tex: new code for new version 80
* <Jan. 2016a>: \isncxunt -> \inscOunt in etex-mac.tex corrected
- Mar. 2016
+** 16 ** <Mar. 2016>
* t1enc-u.tex: raw AE, ae, etc. mapped
+* \input luatex85.sty for LuaTeX specific added
+* \input ucode for XeTeX and LuaTeX as default
COPYRIGHT
=========
diff --git a/Master/texmf-dist/tex/csplain/base/luaplain.ini b/Master/texmf-dist/tex/csplain/base/luaplain.ini
index 731302c535b..ca537b39158 100644
--- a/Master/texmf-dist/tex/csplain/base/luaplain.ini
+++ b/Master/texmf-dist/tex/csplain/base/luaplain.ini
@@ -45,6 +45,8 @@
\def\font{\input luafonts \global\let\font=\orifont \font}
%% Default output format:
+ \input luatex85.sty % backward compatibility with pdfTeX
+ \input pdftexconfig % pdfTeX configuration
\pdfoutput=1
\everyjob={%
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac-luatex.tex b/Master/texmf-dist/tex/csplain/opmac/opmac-luatex.tex
new file mode 100644
index 00000000000..4c2f8274c09
--- /dev/null
+++ b/Master/texmf-dist/tex/csplain/opmac/opmac-luatex.tex
@@ -0,0 +1,31 @@
+% opmac-xetex.tex
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Petr Olsak, 2016
+
+% LuaTeX renames pdfTeX primitives in 2016.
+% We need only few such primitives in OPmac.
+
+% If you are using another remanemd primitives, you can modify your macros
+% or use \input luatex85.sty
+
+\ifx\protected\undefined \let \protected=\relax \fi
+
+\let\pdfximage \saveimageresource
+\let\pdfrefximage \useimageresource
+\let\pdfpagewidth \pagewidth
+\let\pdfpageheight \pageheight
+\protected\def\pdfliteral {\pdfextension literal}
+\protected\def\pdfcolorstack {\pdfextension colorstack}
+\def\pdfcolorstackinit {\pdffeedback colorstackinit}
+\protected\def\pdfsave {\pdfextension save\relax}
+\protected\def\pdfrestore {\pdfextension restore\relax}
+\protected\def\pdfdest {\pdfextension dest }
+\protected\def\pdfstartlink {\pdfextension startlink }
+\protected\def\pdfendlink {\pdfextension endlink\relax}
+\protected\def\pdfcatalog {\pdfextension catalog }
+\protected\def\pdfoutline {\pdfextension outline }
+\protected\def\pdfsetmatrix {\pdfextension setmatrix}
+\def\pdfhorigin {\pdfvariable horigin}
+\def\pdfvorigin {\pdfvariable vorigin}
+
+\endinput
diff --git a/Master/texmf-dist/tex/csplain/opmac/opmac.tex b/Master/texmf-dist/tex/csplain/opmac/opmac.tex
index 6f7e5da9002..28940e0864e 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{Apr. 2016a}
+\def\OPmacversion{Apr. 2016b}
\immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
%%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -21,12 +21,16 @@
\def\addprotect#1{\addto\protectlist{\doprotect#1}}
\addprotect~
+\ifx\pdfextension\undefined \else
+ \let\pdfoutput=\outputmode \def\pdfcolorstackinit{\pdffeedback colorstackinit}\fi
+
\newif\ifpdftex \pdftextrue
\ifx\pdfoutput\undefined \pdftexfalse \else \ifnum\pdfoutput=0 \pdftexfalse \fi \fi
\ifx\XeTeXversion\undefined \else \pdftextrue \fi
\def\sdef#1{\expandafter\def\csname#1\endcsname}
\def\sxdef#1{\expandafter\xdef\csname#1\endcsname}
+\def\slet#1#2{\expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname}
\def\adef#1{\catcode`#1=13 \begingroup \lccode`\~=`#1\lowercase{\endgroup\def~}}
@@ -868,7 +872,7 @@
\def\ensureblacko#1{#1}
\def\ensureblackoA#1{\colorstackpush\pdfblackcolor #1\colorstackpop}
-\ifx\pdfcolorstack\undefined
+\ifx\pdfcolorstackinit\undefined
\def\colorstackpush#1{\pdfliteral{#1 k #1 K}}
\def\colorstackpop{\colorstackpush\currentcolor}
\let\colorstackset=\colorstackpush
@@ -1628,6 +1632,7 @@
%%%%%%%%%%%%%% XeTeX specific + REF file is read now -- sec 3.26 in opmac-d.pdf
\ifx\XeTeXversion\undefined \else \pdftexfalse \input opmac-xetex \fi
+\ifx\pdfextension\undefined \else \input opmac-luatex \fi
\inputref
\endinput
@@ -1764,6 +1769,8 @@ Jan. 2016 \inspicpage introduced
Mar. 2016 \thefnote default changed: ^{num}) -> ^{num}
Apr. 2016 \frame: redundant group removed
\isnextchar improved (using \toks)
- \eoldef introduced to \tit, \chap, \sec, \secc, see OPmac trick 0121
+Apr. 2016a \eoldef introduced to \tit, \chap, \sec, \secc, see OPmac trick 0121
+Apr. 2016b \input opmac-luatex.tex introduced
+ \slet introduced
%%%%%%%%%%%%%% End of opmac.tex