oberdiek (10jun16)

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

1 files changed, 16 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
index 60a208a8b7f..6a12c245b19 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
@@ -4561,7 +4561,7 @@ $ \x
 \fi
 \expandafter\x\csname ver@pdftexcmds.sty\endcsname
 \ProvidesPackage{pdftexcmds}%
- [2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)]%
+ [2016/05/21 v0.22 Utility functions of pdfTeX for LuaTeX (HO)]%
 \begingroup\catcode61\catcode48\catcode32=10\relax%
 \catcode13=5 % ^^M
 \endlinechar=13 %
@@ -4732,7 +4732,7 @@ $ \x
  if tex.enableprimitives then
  tex.enableprimitives(
  'pdf@',
-{'primitive', 'ifprimitive', 'pdfdraftmode'}
+{'primitive', 'ifprimitive', 'pdfdraftmode','draftmode'}
  )
  tex.enableprimitives('', {'luaescapestring'})
  end
@@ -4755,14 +4755,15 @@ $ \x
 \fi
 \fi
 }
-\pdftexcmds@temp{primitive}{pdfprimitive}{pdfprimitive}% pdfTeX, LuaTeX
-\pdftexcmds@temp{primitive}{primitive}{primitive}% XeTeX
-\pdftexcmds@temp{primitive}{luatexprimitive}{pdfprimitive}% LuaTeX
-\pdftexcmds@temp{primitive}{luatexpdfprimitive}{pdfprimitive}% LuaTeX
-\pdftexcmds@temp{ifprimitive}{ifpdfprimitive}{ifpdfprimitive}% pdfTeX, LuaTeX
-\pdftexcmds@temp{ifprimitive}{ifprimitive}{ifprimitive}% XeTeX
-\pdftexcmds@temp{ifprimitive}{luatexifprimitive}{ifpdfprimitive}% LuaTeX
-\pdftexcmds@temp{ifprimitive}{luatexifpdfprimitive}{ifpdfprimitive}% LuaTeX
+\pdftexcmds@temp{primitive}{pdfprimitive}{pdfprimitive}% pdfTeX, oldLuaTeX
+\pdftexcmds@temp{primitive}{primitive}{primitive}% XeTeX, luatex
+\pdftexcmds@temp{primitive}{luatexprimitive}{pdfprimitive}% oldLuaTeX
+\pdftexcmds@temp{primitive}{luatexpdfprimitive}{pdfprimitive}% oldLuaTeX
+\pdftexcmds@temp{ifprimitive}{ifpdfprimitive}{ifpdfprimitive}% pdfTeX, oldLuaTeX
+\pdftexcmds@temp{ifprimitive}{ifprimitive}{ifprimitive}% XeTeX, luatex
+\pdftexcmds@temp{ifprimitive}{luatexifprimitive}{ifpdfprimitive}% oldLuaTeX
+\pdftexcmds@temp{ifprimitive}{luatexifpdfprimitive}{ifpdfprimitive}% oldLuaTeX
+\ifluatex\else
 \begingroup
 \expandafter\ifx\csname pdf@primitive\endcsname\relax
 \else
@@ -4786,6 +4787,7 @@ $ \x
 \fi
 \fi
 \endgroup
+\fi
 \begingroup
 \@PackageInfoNoLine{pdftexcmds}{%
 \string\pdf@primitive\space is %
@@ -4867,6 +4869,9 @@ $ \x
 \fi
 }
 \ifluatex
+\ifx\pdfdraftmode\@undefined
+\let\pdfdraftmode\draftmode
+\fi
 \else
 \pdf@isprimitive
 \fi
@@ -4962,7 +4967,7 @@ $ \x
 \fi
 \fi
 \begingroup
-\def\x{2016/05/10 v0.21}%
+\def\x{2016/05/21 v0.22}%
 \ltx@onelevel@sanitize\x
 \edef\y{%
 \pdftexcmds@directlua{%