oberdiek (30mar18)

git-svn-id: svn://tug.org/texlive/trunk@47195 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 90 insertions, 26 deletions

diff --git a/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx b/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx
index 4193190962c..b341092b6cf 100644
--- a/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/accsupp.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % File: accsupp.dtx
-% Version: 2016/05/16 v0.4
+% Version: 2018/01/30 v0.5
 % Info: Accessibility support by marked content
 %
 % Copyright (C) 2007, 2010 by
@@ -26,7 +26,8 @@
 % This work consists of the main source file accsupp.dtx
 % and the derived files
 %    accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv,
-%    accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def,
+%    accsupp-pdftex.def, \ccsupp-luatex.def, accsupp-dvipdfm.def,
+%    accsupp-dvips.def,
 %    accsupp-example1.tex, accsupp-example2.tex,
 %    accsupp-test1.tex.
 %
@@ -63,6 +64,7 @@
 % Installation:
 %    TDS:tex/latex/oberdiek/accsupp.sty
 %    TDS:tex/latex/oberdiek/accsupp-pdftex.def
+%    TDS:tex/latex/oberdiek/accsupp-luatex.def
 %    TDS:tex/latex/oberdiek/accsupp-dvipdfm.def
 %    TDS:tex/latex/oberdiek/accsupp-dvips.def
 %    TDS:doc/latex/oberdiek/accsupp.pdf
@@ -86,7 +88,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: accsupp 2016/05/16 v0.4 Accessibility support by marked content (HO)}
+\Msg{* Package: accsupp 2018/03/28 v0.5 Accessibility support by marked content (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -98,7 +100,7 @@
 This is a generated file.
 
 Project: accsupp
-Version: 2016/05/16 v0.4
+Version: 2018/03/28 v0.5
 
 Copyright (C) 2007, 2010 by
    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -120,7 +122,8 @@ This Current Maintainer of this work is Heiko Oberdiek.
 This work consists of the main source file accsupp.dtx
 and the derived files
    accsupp.sty, accsupp.pdf, accsupp.ins, accsupp.drv,
-   accsupp-pdftex.def, accsupp-dvipdfm.def, accsupp-dvips.def,
+   accsupp-pdftex.def, accsupp-luatex.def, accsupp-dvipdfm.def,
+   accsupp-dvips.def,
    accsupp-example1.tex, accsupp-example2.tex,
    accsupp-test1.tex.
 
@@ -133,6 +136,7 @@ and the derived files
   \usedir{tex/latex/oberdiek}%
   \file{accsupp.sty}{\from{accsupp.dtx}{package}}%
   \file{accsupp-pdftex.def}{\from{accsupp.dtx}{pdftex}}%
+  \file{accsupp-luatex.def}{\from{accsupp.dtx}{luatex}}%
   \file{accsupp-dvipdfm.def}{\from{accsupp.dtx}{dvipdfm}}%
   \file{accsupp-dvips.def}{\from{accsupp.dtx}{dvips}}%
   \usedir{doc/latex/oberdiek}%
@@ -171,7 +175,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{accsupp.drv}%
-  [2016/05/16 v0.4 Accessibility support by marked content (HO)]%
+  [2018/03/28 v0.5 Accessibility support by marked content (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \begin{document}
@@ -200,7 +204,7 @@ and the derived files
 % \GetFileInfo{accsupp.drv}
 %
 % \title{The \xpackage{accsupp} package}
-% \date{2016/05/16 v0.4}
+% \date{2018/03/28 v0.5}
 % \author{Heiko Oberdiek\thanks
 % {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
 % \xemail{heiko.oberdiek at googlemail.com}}
@@ -333,7 +337,7 @@ and the derived files
 % \subsection{Driver options}
 %
 % Driver options are package options only.
-% The special \hologo{TeX} compilers \hologo{pdfTeX} and \hologo{XeTeX}
+% The special \hologo{TeX} compilers \hologo{pdfTeX}, \hologo{LuaTeX} and \hologo{XeTeX}
 % are detected automatically. The default for unrecognized drivers can be
 % set by defining \cs{ActualTextDriverDefault}. This can be done
 % in the configuration file \xfile{accsupp.cfg}.
@@ -347,6 +351,15 @@ and the derived files
 %   |pdfliteral=direct| $\Rightarrow$ |\pdfliteral direct{...}|
 % \end{quote}
 %
+% \subsubsection{Option \xoption{luatex}}\label{sec:luatex}
+% Package option \xoption{luatex} is used for \hologo{LuaTeX} in PDF mode.
+% Additionally \cs{BeginAccSupp} and \cs{EndAccSupp} understand
+% option \xoption{pdfliteral}. It controls
+% the modifier keyword for \cs{pdfextension} literal:
+% \begin{quote}
+%   |pdfliteral=direct| $\Rightarrow$ |\pdfextension literal direct{...}|
+% \end{quote}
+%
 % \subsubsection{Option \xoption{dvipdfm}}
 %
 % Package option \xoption{dvipdfm} and its aliases \xoption{dvipdfmx}
@@ -511,7 +524,7 @@ A\notparallel B
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{accsupp}%
-  [2016/05/16 v0.4 Accessibility support by marked content (HO)]
+  [2018/03/28 v0.5 Accessibility support by marked content (HO)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -553,6 +566,7 @@ A\notparallel B
 }
 \let\ACCSUPP@DisableOptions\@empty
 \ACCSUPP@DefineDriverKey{pdftex}
+\ACCSUPP@DefineDriverKey{luatex}
 \ACCSUPP@DefineDriverKey{dvips}
 \ACCSUPP@DefineDriverKey[dvips]{dvipsone}
 \ACCSUPP@DefineDriverKey{dvipdfm}
@@ -562,7 +576,11 @@ A\notparallel B
 \InputIfFileExists{accsupp.cfg}{}{}
 \providecommand*{\ActualTextDriverDefault}{dvips}
 \ifpdf
-  \def\ACCSUPP@driver{pdftex}%
+  \ifx\pdfextension\@undefined
+    \def\ACCSUPP@driver{pdftex}%
+  \else
+    \def\ACCSUPP@driver{luatex}%
+  \fi
 \else
   \ifxetex
     \def\ACCSUPP@driver{dvipdfm}%
@@ -586,11 +604,15 @@ A\notparallel B
 %    \begin{macrocode}
 \def\ACCSUPP@temp{pdftex}%
 \ifpdf
+  \ifx\pdfextension\@undefined\else
+    \def\ACCSUPP@temp{luatex}%
+  \fi
   \ifx\ACCSUPP@temp\ACCSUPP@driver
   \else
     \PackageWarningNoLine{accsupp}{%
       Wrong driver `\ACCSUPP@driver', using `pdftex' instead%
     }%
+ed as
     \let\ACCSUPP@driver\ACCSUPP@temp
   \fi
 \else
@@ -795,7 +817,7 @@ A\notparallel B
 %<*pdftex>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{accsupp-pdftex.def}%
-  [2016/05/16 v0.4 accsupp driver for pdfTeX (HO)]%
+  [2018/03/28 v0.5 accsupp driver for pdfTeX (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -810,13 +832,35 @@ A\notparallel B
 %</pdftex>
 %    \end{macrocode}
 %
+% \subsubsection{Driver \xoption{luatex}}
+%
+%    \begin{macrocode}
+%<*luatex>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{accsupp-luatex.def}%
+  [2018/03/28 v0.5 accsupp driver for pdfTeX (HO)]%
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\protected\def\ACCSUPP@pdf@literal{\pdfextension literal}
+\def\ACCSUPP@bdc{%
+  \ACCSUPP@pdf@literal\ACCSUPP@pdfliteral{\ACCSUPP@span BDC}%
+}
+\def\ACCSUPP@emc{%
+  \ACCSUPP@pdf@literal\ACCSUPP@pdfliteral{EMC}%
+}
+%    \end{macrocode}
+%    \begin{macrocode}
+%</luatex>
+%    \end{macrocode}
+%
 % \subsubsection{Driver \xoption{dvipdfm}}
 %
 %    \begin{macrocode}
 %<*dvipdfm>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{accsupp-dvipdfm.def}%
-  [2016/05/16 v0.4 accsupp driver for dvipdfm (HO)]%
+  [2018/03/28 v0.5 accsupp driver for dvipdfm (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -837,7 +881,7 @@ A\notparallel B
 %<*dvips>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{accsupp-dvips.def}%
-  [2016/05/16 v0.4 accsupp driver for dvips (HO)]%
+  [2018/03/28 v0.5 accsupp driver for dvips (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -897,7 +941,7 @@ A\notparallel B
   \catcode`\%=14 %
   \catcode`\ =10 %
   \catcode13=5 %
-  \RequirePackage{accsupp}[2016/05/16]\relax
+  \RequirePackage{accsupp}[2018/03/28]\relax
   \RestoreCatcodes
 }
 \Test
@@ -969,6 +1013,7 @@ A\notparallel B
 % \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   accsupp.sty & tex/latex/oberdiek/accsupp.sty\\
 %   accsupp-pdftex.def & tex/latex/oberdiek/accsupp-pdftex.def\\
+%   accsupp-luatex.def & tex/latex/oberdiek/accsupp-luatex.def\\
 %   accsupp-dvipdfm.def & tex/latex/oberdiek/accsupp-dvipdfm.def\\
 %   accsupp-dvips.def & tex/latex/oberdiek/accsupp-dvips.def\\
 %   accsupp.pdf & doc/latex/oberdiek/accsupp.pdf\\
@@ -1160,6 +1205,10 @@ A\notparallel B
 %   \item
 %     Documentation updates.
 %   \end{Version}
+%   \begin{Version}{2018/03/28 v0.5}
+%   \item
+%     LuaTeX support added.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index b9e2135d116..bde53bb30e8 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
@@ -65,7 +65,7 @@
 \batchinput{ifdraft.dtx}
 \batchinput{iflang.dtx}
 \batchinput{ifluatex.dtx}
-\batchinput{ifpdf.ins}
+\batchinput{ifpdf.dtx}
 \batchinput{ifvtex.dtx}
 \batchinput{infwarerr.dtx}
 \batchinput{inputenx.dtx}
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx
index e7296f2cdde..e99f1840da8 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % File: pdftexcmds.dtx
-% Version: 2018/01/21 v0.26
+% Version: 2018/01/30 v0.27
 % Info: Utility functions of pdfTeX for LuaTeX
 %
 % Copyright (C) 2007, 2009-2011 by
@@ -88,7 +88,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: pdftexcmds 2018/01/21 v0.26 Utility functions of pdfTeX for LuaTeX (HO)}
+\Msg{* Package: pdftexcmds 2018/01/30 v0.27 Utility functions of pdfTeX for LuaTeX (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -100,7 +100,7 @@
 This is a generated file.
 
 Project: pdftexcmds
-Version: 2018/01/21 v0.26
+Version: 2018/01/30 v0.27
 
 Copyright (C) 2007, 2009-2011 by
    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -201,7 +201,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{pdftexcmds.drv}%
-  [2018/01/21 v0.26 Utility functions of pdfTeX for LuaTeX (HO)]%
+  [2018/01/30 v0.27 Utility functions of pdfTeX for LuaTeX (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \usepackage{paralist}
@@ -239,7 +239,7 @@ and the derived files
 % \GetFileInfo{pdftexcmds.drv}
 %
 % \title{The \xpackage{pdftexcmds} package}
-% \date{2018/01/21 v0.26}
+% \date{2018/01/30 v0.27}
 % \author{Heiko Oberdiek\thanks
 % {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
 % \xemail{heiko.oberdiek at googlemail.com}}
@@ -618,7 +618,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@pdftexcmds.sty\endcsname
 \ProvidesPackage{pdftexcmds}%
-  [2018/01/21 v0.26 Utility functions of pdfTeX for LuaTeX (HO)]%
+  [2018/01/30 v0.27 Utility functions of pdfTeX for LuaTeX (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Catcodes}
@@ -768,14 +768,25 @@ and the derived files
       \pdffiledump offset#1 length#2{#3}%
     }%
   \fi
+%    \end{macrocode}
+%    \begin{macrocode}
   \begingroup\expandafter\expandafter\expandafter\endgroup
   \expandafter\ifx\csname pdfmdfivesum\endcsname\relax
-    \pdftexcmds@nopdftex
+    \begingroup\expandafter\expandafter\expandafter\endgroup
+    \expandafter\ifx\csname mdfivesum\endcsname\relax
+      \pdftexcmds@nopdftex
+    \else
+      \def\pdf@mdfivesum#{\mdfivesum}%
+      \let\pdf@mdfivesumnative\pdf@mdfivesum
+      \def\pdf@filemdfivesum#{\mdfivesum file}%
+    \fi
   \else
     \def\pdf@mdfivesum#{\pdfmdfivesum}%
     \let\pdf@mdfivesumnative\pdf@mdfivesum
     \def\pdf@filemdfivesum#{\pdfmdfivesum file}%
   \fi
+%    \end{macrocode}
+%    \begin{macrocode}
   \def\pdf@system#{%
     \immediate\write18%
   }%
@@ -1163,7 +1174,7 @@ and the derived files
   \fi
 \fi
 \begingroup
-  \def\x{2018/01/21 v0.26}%
+  \def\x{2018/01/30 v0.27}%
   \ltx@onelevel@sanitize\x
   \edef\y{%
     \pdftexcmds@directlua{%
@@ -1567,7 +1578,7 @@ and the derived files
 module("oberdiek.pdftexcmds", package.seeall)
 local systemexitstatus
 function getversion()
-  tex.write("2018/01/21 v0.26")
+  tex.write("2018/01/30 v0.27")
 end
 %    \end{macrocode}
 %
@@ -2694,6 +2705,10 @@ end
 %   \item
 %     use rb not r mode for file open github issue 34.
 %   \end{Version}
+%   \begin{Version}{2018/01/30 v0.27}
+%   \item
+%     \cs{pdf@mdfivesum} for \hologo{XeTeX}
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt b/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt
index 7157ada0512..80bc4aaa011 100644
--- a/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt
+++ b/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt
@@ -1,4 +1,4 @@
-README           2018/01/21
+README           2018/03/28
 
 This file describes the directory
   CTAN:macros/latex/contrib/oberdiek/
@@ -30,4 +30,4 @@ Happy TeXing
 Oberdiek Package Support Group
   ho-tex@tug.org
 Preferred bug reporting address is now
-  https://github.com/ho-tex/oberdiek/issues
\ No newline at end of file
+  https://github.com/ho-tex/oberdiek/issues