summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-11 23:24:51 +0000
committerKarl Berry <karl@freefriends.org>2016-06-11 23:24:51 +0000
commitb8932a2863ab57aed166ce0f527de1a11c47f555 (patch)
tree51768f80760d59d022ac1e99cd893c26693f1f80 /Master
parent516124d8de871007f2d2443daf2b7faff9f7c2ea (diff)
luatex85 (28may16)
git-svn-id: svn://tug.org/texlive/trunk@41395 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/luatex85/luatex85.pdfbin167915 -> 170527 bytes
-rw-r--r--Master/texmf-dist/source/generic/luatex85/luatex85.dtx31
-rw-r--r--Master/texmf-dist/tex/generic/luatex85/luatex85.sty10
3 files changed, 28 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/generic/luatex85/luatex85.pdf b/Master/texmf-dist/doc/generic/luatex85/luatex85.pdf
index f8921aecafd..4e08ef36425 100644
--- a/Master/texmf-dist/doc/generic/luatex85/luatex85.pdf
+++ b/Master/texmf-dist/doc/generic/luatex85/luatex85.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/generic/luatex85/luatex85.dtx b/Master/texmf-dist/source/generic/luatex85/luatex85.dtx
index c1356380bcb..025fef1f65f 100644
--- a/Master/texmf-dist/source/generic/luatex85/luatex85.dtx
+++ b/Master/texmf-dist/source/generic/luatex85/luatex85.dtx
@@ -9,13 +9,14 @@
\ProvidesFile{luatex85.dtx}
%</dtx>
%<package>\ifx\ProvidesPackage\undefined
-%<package>\def\next#1#2[#3]{\wlog{#2 #3}}
+%<package>\def\next#1#2[#3]{\wlog{#2 #3}\expandafter\gdef
+%<package>\csname ver@luatex85.sty\endcsname{#3}}
%<package>\expandafter\next\fi
%<package>\ProvidesPackage{luatex85}
%<driver> \ProvidesFile{luatex85.drv}
% \fi
% \ProvidesFile{luatex85.dtx}
- [2016/03/01 v1.0 pdftex aliases for luatex]
+ [2016/05/23 v1.2 pdftex aliases for luatex]
%
% \iffalse
%<*driver>
@@ -144,14 +145,26 @@
\let\ifpdfabsnum \ifabsnum
\let\ifpdfabsdim \ifabsdim
% \end{macrocode}
+% Use |\enableprimitives| here in case of conflict with tracefnt.
+% \begin{macrocode}
+\directlua{tex.enableprimitives('pdf',{'tracingfonts'})}
+% \end{macrocode}
+%
+% \subsection{Commands converted to constants}
+% The |\pdffeedback| version is not defined in dvi mode and (currently) is
+% curiously defined to be 40 in pdf mode, so define these as constant values.
+% \begin{macrocode}
+\protected\def\pdftexversion {\numexpr 140\relax}
+ \def\pdftexrevision {7}
+%\protected\def\pdftexversion {\numexpr\pdffeedback version\relax}
+% \def\pdftexrevision {\pdffeedback revision}
+% \end{macrocode}
%
% \subsection{Commands converted to \cs{pdffeedback}}
-% Expandable commands use a sipmple |\def| internal registers that
+% Expandable commands use a simple |\def|. Internal registers that
% were accessed via |\the| in PDF\TeX\ use a |\protected| definition
% using |\numexpr| terminated by an explicit |\relax|.
% \begin{macrocode}
-\protected\def\pdftexversion {\numexpr\pdffeedback version\relax}
- \def\pdftexrevision {\pdffeedback revision}
\protected\def\pdflastlink {\numexpr\pdffeedback lastlink\relax}
\protected\def\pdfretval {\numexpr\pdffeedback retval\relax}
\protected\def\pdflastobj {\numexpr\pdffeedback lastobj\relax}
@@ -166,8 +179,8 @@
% \end{macrocode}
%
% \subsection{Commands converted to calls to \cs{pdfextension}}
-% These use a |\protected| definition. Comands that take no following
-% argument are currently terminated by |\releax| as suggested in the
+% These use a |\protected| definition. Commands that take no following
+% argument are currently terminated by |\relax| as suggested in the
% Lua\TeX\ manual, although it would be appear to be sufficient to
% consistently terminate these commands with a space.
% \begin{macrocode}
@@ -223,7 +236,7 @@
\protected\edef\pdfinclusioncopyfonts {\pdfvariable inclusioncopyfonts}
\protected\edef\pdfinclusionerrorlevel {\pdfvariable inclusionerrorlevel}
% \end{macrocode}
-% Note that |\pdfreplacefont| was never actually in public releases of
+% Note that |\pdfreplacefont| was never in public releases of
% PDF\TeX, It was in Lua\TeX0.85, but discussion on luatex list
% lead to it being removed in 0.87
% \begin{macrocode}
@@ -244,7 +257,7 @@
\protected\edef\pdfpageresources {\pdfvariable pageresources}
% \end{macrocode}
% Note that |\pdfxformattr| and |\pdfxformresources| were never
-% actually in PDF\TeX, But are included here so that all the
+% in PDF\TeX, But are included here so that all the
% |\pdfvariable| cases are covered.
% \begin{macrocode}
\protected\edef\pdfxformattr {\pdfvariable xformattr}
diff --git a/Master/texmf-dist/tex/generic/luatex85/luatex85.sty b/Master/texmf-dist/tex/generic/luatex85/luatex85.sty
index ef02b7e33b5..fd755520124 100644
--- a/Master/texmf-dist/tex/generic/luatex85/luatex85.sty
+++ b/Master/texmf-dist/tex/generic/luatex85/luatex85.sty
@@ -12,10 +12,11 @@
%% This file may be distributed under the terms of the LPPL.
%% See README for details.
\ifx\ProvidesPackage\undefined
-\def\next#1#2[#3]{\wlog{#2 #3}}
+\def\next#1#2[#3]{\wlog{#2 #3}\expandafter\gdef
+\csname ver@luatex85.sty\endcsname{#3}}
\expandafter\next\fi
\ProvidesPackage{luatex85}
- [2016/03/01 v1.0 pdftex aliases for luatex]
+ [2016/05/23 v1.2 pdftex aliases for luatex]
\ifx\pdfvariable\undefined
\expandafter\endinput
\fi
@@ -49,8 +50,9 @@
\let\ifpdfprimitive \ifprimitive
\let\ifpdfabsnum \ifabsnum
\let\ifpdfabsdim \ifabsdim
-\protected\def\pdftexversion {\numexpr\pdffeedback version\relax}
- \def\pdftexrevision {\pdffeedback revision}
+\directlua{tex.enableprimitives('pdf',{'tracingfonts'})}
+\protected\def\pdftexversion {\numexpr 140\relax}
+ \def\pdftexrevision {7}
\protected\def\pdflastlink {\numexpr\pdffeedback lastlink\relax}
\protected\def\pdfretval {\numexpr\pdffeedback retval\relax}
\protected\def\pdflastobj {\numexpr\pdffeedback lastobj\relax}