From e0a2526f2f8befb2815eab43bb68ff44b35eee66 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 11 May 2016 21:38:01 +0000 Subject: oberdiek (10may16) git-svn-id: svn://tug.org/texlive/trunk@41047 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/oberdiek/hobsub-generic.sty | 16 ++++---- Master/texmf-dist/tex/generic/oberdiek/hologo.sty | 12 ++---- Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty | 48 ++++++++++++++++++++++ .../tex/generic/oberdiek/luatex-loader.sty | 4 +- Master/texmf-dist/tex/generic/oberdiek/luatex.sty | 12 +++++- .../texmf-dist/tex/generic/oberdiek/pdftexcmds.sty | 6 +-- 6 files changed, 75 insertions(+), 23 deletions(-) create mode 100644 Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty (limited to 'Master/texmf-dist/tex/generic/oberdiek') diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty index 2964ba0b6be..84fa473f009 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty @@ -39,7 +39,7 @@ %% This is a generated file. %% %% Project: hobsub -%% Version: 2012/05/28 v1.13 +%% Version: 2012/04/25 v1.12 %% %% Copyright (C) 2011, 2012 by %% Heiko Oberdiek @@ -132,7 +132,7 @@ \fi \expandafter\x\csname ver@hobsub-generic.sty\endcsname \ProvidesPackage{hobsub-generic}% - [2012/05/28 v1.13 Bundle oberdiek, subset generic (HO)]% + [2012/04/25 v1.12 Bundle oberdiek, subset generic (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -256,11 +256,11 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax \immediate\write-1{% - Package: hobsub 2012/05/28 v1.13 Construct package bundles (HO)% + Package: hobsub 2012/04/25 v1.12 Construct package bundles (HO)% }% \else \ProvidesPackage{hobsub}% - [2012/05/28 v1.13 Construct package bundles (HO)]% + [2012/04/25 v1.12 Construct package bundles (HO)]% \fi \endinput @@ -3402,7 +3402,7 @@ $ \next \hobsub@StopPackage \hobsub@StartPackage{ifpdf} %% Source File: ifpdf.dtx -%% Copyright 2016 LaTeX3 project +%% Copyright 2016 Heiko Oberdiek and LaTeX3 project %% %% This file may be distributed under the terms of the LPPL. %% See README for details. @@ -4455,7 +4455,7 @@ $ \x \fi \expandafter\x\csname ver@luatex-loader.sty\endcsname \ProvidesPackage{luatex-loader}% - [2010/03/09 v0.4 Lua module loader (HO)]% + [2016/05/10 v0.5 Lua module loader (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5\endlinechar=13\relax% \catcode10=12 % ^^J @@ -4560,7 +4560,7 @@ $ \x \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)]% + [2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -4961,7 +4961,7 @@ $ \x \fi \fi \begingroup -\def\x{2011/11/29 v0.20}% +\def\x{2016/05/10 v0.21}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty index 29167201e6a..642bce61e03 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty @@ -1337,16 +1337,12 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}% \def\HOLOGO@IfCharExists#1{% \ifnum \directlua{% - if luaotfload and luaotfload.aux then % - if luaotfload.aux.font_has_glyph(font.current(), \number#1) then % - tex.print("1") % - end % - elseif font and font.fonts and font.current then % - local f = font.fonts[font.current()] % + if font and font.fonts and font.current then % + local f = font.fonts[font.current()]% if f.characters and f.characters[\number#1] then % - tex.print("1") % + tex.print("1")% end % - end % + end% }0=\ltx@zero \expandafter\ltx@secondoftwo \else diff --git a/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty new file mode 100644 index 00000000000..55a25a8b577 --- /dev/null +++ b/Master/texmf-dist/tex/generic/oberdiek/ifpdf.sty @@ -0,0 +1,48 @@ +%% +%% This is file `ifpdf.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ifpdf.dtx (with options: `package') +%% +%% Source File: ifpdf.dtx +%% Copyright 2016 Heiko Oberdiek and LaTeX3 project +%% +%% 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}} +\expandafter\next\fi +\ProvidesPackage{ifpdf} +[2016/04/04 v3.0 Provides the ifpdf switch] +\expandafter\ifx\csname ifpdf\endcsname\relax + \csname newif\expandafter\endcsname\csname ifpdf\endcsname +\else + \ifx\pdftrue\undefined + \ifx\PackageError\undefined + \begingroup\def\PackageError#1#2#3{\endgroup\errmessage{#2}} + \fi + \PackageError{ifpdf}{incompatible ifpdf definition}{} + \expandafter\expandafter\expandafter + \fi +\fi +\let\ifpdf\iffalse +\ifx\directlua\undefined +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfoutput\endcsname\relax +\else + \ifnum\pdfoutput>0 % + \pdftrue + \fi +\fi +\else +\directlua{% +if (tex.outputmode or tex.pdfoutput or 0) > 0 then + tex.print('\string\\pdftrue') +end +} +\fi +\endinput +%% +%% End of file `ifpdf.sty'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty b/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty index 677916f6e11..b8b6c88b202 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/luatex-loader.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: luatex -%% Version: 2010/03/09 v0.4 +%% Version: 2016/05/10 v0.5 %% %% Copyright (C) 2007, 2009, 2010 by %% Heiko Oberdiek @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@luatex-loader.sty\endcsname \ProvidesPackage{luatex-loader}% - [2010/03/09 v0.4 Lua module loader (HO)]% + [2016/05/10 v0.5 Lua module loader (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5\endlinechar=13\relax% \catcode10=12 % ^^J diff --git a/Master/texmf-dist/tex/generic/oberdiek/luatex.sty b/Master/texmf-dist/tex/generic/oberdiek/luatex.sty index 2cf3f09d128..1a6697d552a 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/luatex.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/luatex.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: luatex -%% Version: 2010/03/09 v0.4 +%% Version: 2016/05/10 v0.5 %% %% Copyright (C) 2007, 2009, 2010 by %% Heiko Oberdiek @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@luatex.sty\endcsname \ProvidesPackage{luatex}% - [2010/03/09 v0.4 LuaTeX basic definition package (HO)]% + [2016/05/10 v0.5 LuaTeX basic definition package (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -360,6 +360,7 @@ \fi \newcount\LuT@AllocAttribute \LuT@AllocAttribute=\m@ne +\ifx\newattribute\@undefined \LuT@newcommand\newattribute[1]{% \ifnum\LuT@AllocAttribute<65535 % \global\advance\LuT@AllocAttribute\@ne @@ -371,9 +372,13 @@ \errmessage{No room for a new \string\attribute}% \fi } +\fi +\ifx\setattribute\@undefined \LuT@newcommand\setattribute[2]{% #1=\numexpr#2\relax } +\fi +\ifx\unsetattribute\@undefined \ifnum\luatexversion<37 \LuT@newcommand\LuT@UnsetAttributeValue[0]{}% \let\LuT@UnsetAttributeValue\m@ne @@ -383,10 +388,12 @@ \LuT@newcommand\unsetattribute[1]{% #1=\LuT@UnsetAttributeValue } +\fi \newcount\LuT@AllocCatcodeTable \LuT@AllocCatcodeTable=\m@ne \newcount\CatcodeTableStack \CatcodeTableStack=\z@ +\ifx\newcatcodetable\@undefined \LuT@newcommand\newcatcodetable[1]{% \ifnum\LuT@AllocCatcodeTable<1114110 % 0x10FFFF is maximal \chardef % or < 268435455 % 2^28 - 1 @@ -400,6 +407,7 @@ \errmessage{No room for a new \string\catcodetable}% \fi }% +\fi \LuT@newcommand\IncCatcodeTableStack[0]{% \ifnum\CatcodeTableStack<268435454 % \global\advance\CatcodeTableStack by\tw@ diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty index b2b48f13ab7..e9c72178ce6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pdftexcmds -%% Version: 2011/11/29 v0.20 +%% Version: 2016/05/10 v0.21 %% %% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek @@ -104,7 +104,7 @@ \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)]% + [2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -505,7 +505,7 @@ \fi \fi \begingroup - \def\x{2011/11/29 v0.20}% + \def\x{2016/05/10 v0.21}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% -- cgit v1.2.3