From 5f3fb5495c302e1763dddd4711b02aa8afd54174 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 13 May 2016 21:31:18 +0000 Subject: oberdiek (13may16) git-svn-id: svn://tug.org/texlive/trunk@41097 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/oberdiek/hobsub-generic.sty | 8 +++--- Master/texmf-dist/tex/generic/oberdiek/hologo.sty | 29 ++++++++++++++-------- 2 files changed, 23 insertions(+), 14 deletions(-) (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 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 @@ -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 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 @@ -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 -- cgit v1.2.3