diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/oberdiek/hologo.sty | 29 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/luacolor.sty | 13 |
3 files changed, 32 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty index 84fa473f009..cade10f1daa 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/04/25 v1.12 +%% Version: 2012/05/28 v1.13 %% %% Copyright (C) 2011, 2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -132,7 +132,7 @@ \fi \expandafter\x\csname ver@hobsub-generic.sty\endcsname \ProvidesPackage{hobsub-generic}% - [2012/04/25 v1.12 Bundle oberdiek, subset generic (HO)]% + [2012/05/28 v1.13 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/04/25 v1.12 Construct package bundles (HO)% + Package: hobsub 2012/05/28 v1.13 Construct package bundles (HO)% }% \else \ProvidesPackage{hobsub}% - [2012/04/25 v1.12 Construct package bundles (HO)]% + [2012/05/28 v1.13 Construct package bundles (HO)]% \fi \endinput <hobsub> diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty index 642bce61e03..de4c9c7a81a 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: hologo -%% Version: 2012/04/26 v1.10 +%% Version: 2016/05/12 v1.11 %% %% Copyright (C) 2010-2012 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -103,7 +103,7 @@ \fi \expandafter\x\csname ver@hologo.sty\endcsname \ProvidesPackage{hologo}% - [2012/04/26 v1.10 A logo collection with bookmark support (HO)]% + [2016/05/12 v1.11 A logo collection with bookmark support (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -1336,14 +1336,19 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}% \else \def\HOLOGO@IfCharExists#1{% \ifnum - \directlua{% - 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")% - end % - end% - }0=\ltx@zero + \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 f.characters and f.characters[\number#1] then % + tex.print("1")% + end % + end% + }0=\ltx@zero \expandafter\ltx@secondoftwo \else \expandafter\ltx@firstoftwo @@ -2214,6 +2219,10 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}% \def\hologoDriver{pdftex}% \let\HOLOGO@pdfliteral\pdfliteral \ifluatex + \ifx\pdfextension\@undefined\else + \protected\def\pdfliteral{\pdfextension literal}% + \let\HOLOGO@pdfliteral\pdfliteral + \fi \ltx@IfUndefined{HOLOGO@pdfliteral}{% \ifnum\luatexversion<36 % \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty index 534bc5c159b..25be8b831e1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: luacolor -%% Version: 2011/11/01 v1.8 +%% Version: 2016/05/13 v1.9 %% %% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -87,17 +87,19 @@ \edef\LuaCol@AtEnd{\LuaCol@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luacolor}% - [2011/11/01 v1.8 Color support via LuaTeX's attributes (HO)] + [2016/05/13 v1.9 Color support via LuaTeX's attributes (HO)] \RequirePackage{infwarerr}[2010/04/08]% \RequirePackage{ifluatex}[2010/03/01]% \RequirePackage{ifpdf}[2011/01/30]% \RequirePackage{ltxcmds}[2011/04/18]% \RequirePackage{color} \ifluatex + \ifx\newattribute\@undefined \ltx@ifpackageloaded{luatexbase-attr}{% }{% \RequirePackage{luatex}[2010/03/09]% }% + \fi \else \@PackageError{luacolor}{% This package may only be run using LuaTeX% @@ -124,7 +126,7 @@ require("oberdiek.luacolor\ifnum\luatexversion<65 -pre065\fi")% } \begingroup - \edef\x{\LuaCol@directlua{tex.write("2011/11/01 v1.8")}}% + \edef\x{\LuaCol@directlua{tex.write("2016/05/13 v1.9")}}% \edef\y{% \LuaCol@directlua{% if oberdiek.luacolor.getversion then % @@ -186,7 +188,7 @@ \protected\def\set@color{% \LuaCol@setattribute\LuaCol@Attribute{% \LuaCol@directlua{% - oberdiek.luacolor.get("\luatexluaescapestring{\current@color}")% + oberdiek.luacolor.get("\luaescapestring{\current@color}")% }% }% } @@ -202,6 +204,9 @@ } \set@color \ifpdf + \ifx\pdfxform\@undefined + \let\pdfxform\saveboxresource + \fi \ltx@IfUndefined{pdfxform}{% \ifnum\luatexversion>36 % \directlua{% |