oberdiek (13may16)

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

9 files changed, 80 insertions, 63 deletions

diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/luacolor.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/luacolor.xml
index 6a0a082be37..777c09baf8d 100644
--- a/Master/texmf-dist/source/latex/oberdiek/catalogue/luacolor.xml
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/luacolor.xml
@@ -6,7 +6,7 @@
   <authorref id='auth:oberdiek'/>
   <copyright owner='Heiko Oberdiek' year='2007,2009-2011'/>
   <license type='lppl1.3'/>
-  <version number='1.8'/>
+  <version number='1.9'/>
   <description>
       This package implements color support based on LuaTeX's node
       attributes.
diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/luatex.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/luatex.xml
index 2ec6e643b97..3fb44146bf9 100644
--- a/Master/texmf-dist/source/latex/oberdiek/catalogue/luatex.xml
+++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/luatex.xml
@@ -6,7 +6,7 @@
   <authorref id='auth:oberdiek'/>
   <copyright owner='Heiko Oberdiek' year='2007,2009,2010'/>
   <license type='lppl1.3'/>
-  <version number='0.4'/>
+  <version number='0.5'/>
   <description>
     LuaTeX is an extended version of pdfTeX using Lua as an embedded
     scripting language.  The LuaTeX project&#x2019;s main objective
diff --git a/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx b/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx
index 17408f2e4dd..dd0d4a62783 100644
--- a/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx
@@ -190,7 +190,7 @@ and the derived files
 \ProvidesFile{fibnum.drv}%
   [2012/04/08 v1.0 Fibonacci numbers (HO)]%
 \documentclass{ltxdoc}
-\usepackage{amsmath}
+\usepackage{amsmath,amsfonts}
 \usepackage{siunitx}
 \usepackage{array}
 \usepackage{tabularx}
diff --git a/Master/texmf-dist/source/latex/oberdiek/hologo.dtx b/Master/texmf-dist/source/latex/oberdiek/hologo.dtx
index 78d52f74f02..7b56ecae32e 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hologo.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hologo.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % File: hologo.dtx
-% Version: 2012/04/26 v1.10
+% Version: 2016/05/12 v1.11
 % Info: A logo collection with bookmark support
 %
 % Copyright (C) 2010-2012 by
@@ -84,7 +84,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: hologo 2012/04/26 v1.10 A logo collection with bookmark support (HO)}
+\Msg{* Package: hologo 2016/05/12 v1.11 A logo collection with bookmark support (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -96,7 +96,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>
@@ -168,10 +168,10 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{hologo.drv}%
-  [2012/04/26 v1.10 A logo collection with bookmark support (HO)]%
+  [2016/05/12 v1.11 A logo collection with bookmark support (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
-\usepackage{hologo}[2012/04/26]
+\usepackage{hologo}[2016/05/12]
 \usepackage{longtable}
 \usepackage{array}
 \usepackage{paralist}
@@ -183,7 +183,6 @@ and the derived files
 %</driver>
 % \fi
 %
-% \CheckSum{2906}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -204,7 +203,7 @@ and the derived files
 % \GetFileInfo{hologo.drv}
 %
 % \title{The \xpackage{hologo} package}
-% \date{2012/04/26 v1.10}
+% \date{2016/05/12 v1.11}
 % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
 %
 % \maketitle
@@ -475,7 +474,7 @@ and the derived files
   vmargin=20mm,
 ]{geometry}
 \pagestyle{empty}
-\usepackage{hologo}[2012/04/26]
+\usepackage{hologo}[2016/05/12]
 \usepackage{longtable}
 \usepackage{array}
 \setlength{\extrarowheight}{2pt}
@@ -668,7 +667,7 @@ and the derived files
   \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)]%
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -2688,14 +2687,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
@@ -4243,6 +4247,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
@@ -4560,7 +4568,7 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
 %<*test-spacefactor>
 \NeedsTeXFormat{LaTeX2e}
 \documentclass{article}
-\usepackage{hologo}[2012/04/26]
+\usepackage{hologo}[2016/05/12]
 \usepackage{kvsetkeys}
 \usepackage{qstest}
 \IncludeTests{*}
@@ -4615,7 +4623,7 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
 %<*test-list>
 \NeedsTeXFormat{LaTeX2e}
 \documentclass[12pt,a4paper]{article}
-\usepackage{hologo}[2012/04/26]
+\usepackage{hologo}[2016/05/12]
 \usepackage[T1]{fontenc}
 \usepackage{lmodern}
 \usepackage{parskip}
@@ -5075,6 +5083,11 @@ $ #1{\string ^^^^0395}{\string ^^^^03b5}%
 %   \item
 %     Fix in bookmark version of logo ``\hologo{HanTheThanh}''.
 %   \end{Version}
+%   \begin{Version}{2016/05/12 v1.11}
+%   \item
+%     Update HOLOGO@IfCharExists (previously in texlive)
+%   \item define pdfliteral in current luatex.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
index e4e205d8224..4effb90014f 100644
--- a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx
@@ -20,7 +20,9 @@
 % \iffalse
 %<*driver>
 \documentclass{ltxdoc}
+\usepackage{hyperref}
 \begin{document}
+\tableofcontents
 \DocInput{ifpdf.dtx}
 \end{document}
 %</driver>
diff --git a/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx b/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx
index 4d4d4386e84..8fd55d6ae1d 100644
--- a/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx
@@ -1,11 +1,13 @@
 % \iffalse meta-comment
 %
 % File: luacolor.dtx
-% Version: 2011/11/01 v1.8
+% Version: 2016/05/13 v1.9
 % Info: Color support via LuaTeX's attributes
 %
 % Copyright (C) 2007, 2009-2011 by
 %    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+%    2016
+%    https://github.com/ho-tex/oberdiek/issues
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
@@ -85,7 +87,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: luacolor 2011/11/01 v1.8 Color support via LuaTeX's attributes (HO)}
+\Msg{* Package: luacolor 2016/05/13 v1.9 Color support via LuaTeX's attributes (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -97,7 +99,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>
@@ -183,7 +185,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{luacolor.drv}%
-  [2011/11/01 v1.8 Color support via LuaTeX's attributes (HO)]%
+  [2016/05/13 v1.9 Color support via LuaTeX's attributes (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \usepackage{paralist}
@@ -198,7 +200,6 @@ and the derived files
 %</driver>
 % \fi
 %
-% \CheckSum{473}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -219,8 +220,10 @@ and the derived files
 % \GetFileInfo{luacolor.drv}
 %
 % \title{The \xpackage{luacolor} package}
-% \date{2011/11/01 v1.8}
-% \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
+% \date{2016/05/13 v1.9}
+% \author{Heiko Oberdiek\thanks
+% {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\
+% \xemail{heiko.oberdiek at googlemail.com}}
 %
 % \maketitle
 %
@@ -361,7 +364,7 @@ and the derived files
 %    \begin{macrocode}
 \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)]
 %    \end{macrocode}
 %
 % \subsection{Check for \LuaTeX}
@@ -376,10 +379,12 @@ and the derived files
 %    \end{macrocode}
 %    \begin{macrocode}
 \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%
@@ -423,7 +428,7 @@ and the derived files
 %    \end{macrocode}
 %    \begin{macrocode}
 \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 %
@@ -501,7 +506,7 @@ and the derived files
 \protected\def\set@color{%
   \LuaCol@setattribute\LuaCol@Attribute{%
     \LuaCol@directlua{%
-      oberdiek.luacolor.get("\luatexluaescapestring{\current@color}")%
+      oberdiek.luacolor.get("\luaescapestring{\current@color}")%
     }%
   }%
 }
@@ -541,6 +546,9 @@ and the derived files
 %
 %    \begin{macrocode}
 \ifpdf
+  \ifx\pdfxform\@undefined
+    \let\pdfxform\saveboxresource
+  \fi
   \ltx@IfUndefined{pdfxform}{%
     \ifnum\luatexversion>36 %
       \directlua{%
@@ -598,7 +606,7 @@ module("oberdiek.luacolor", package.seeall)
 %    \begin{macro}{getversion()}
 %    \begin{macrocode}
 function getversion()
-  tex.write("2011/11/01 v1.8")
+  tex.write("2016/05/13 v1.9")
 end
 %    \end{macrocode}
 %    \end{macro}
@@ -607,7 +615,7 @@ end
 %
 %    \begin{macrocode}
 local ifpdf
-if tonumber(tex.pdfoutput) > 0 then
+if tonumber(tex.outputmode or tex.pdfoutput) > 0 then
   ifpdf = true
 else
   ifpdf = false
@@ -732,7 +740,7 @@ local node_types = {
   [node.id("whatsit")] = {
     [node.subtype("special")] = COLOR,
     [node.subtype("pdf_literal")] = COLOR,
-    [node.subtype("pdf_refximage")] = COLOR,
+-- TODO (DPC)    [node.subtype("pdf_refximage")] = COLOR,
   },
   [node.id("glue")] =
     function(n)
@@ -763,8 +771,8 @@ end
 %    \begin{macrocode}
 local mode = 2 -- luatex.pdfliteral.direct
 local WHATSIT = node.id("whatsit")
-local SPECIAL = 3
-local PDFLITERAL = 8
+local SPECIAL = node.subtype("special")
+local PDFLITERAL = node.subtype("pdf_literal")
 local DRY_FALSE = false
 local DRY_TRUE = true
 %    \end{macrocode}
@@ -978,7 +986,7 @@ end
   \pdfoutput=0 %
 \fi
 \documentclass{minimal}
-\usepackage{luacolor}[2011/11/01]
+\usepackage{luacolor}[2016/05/13]
 \csname @@end\endcsname
 \end
 %</test2>
@@ -990,7 +998,7 @@ end
 %    \end{macrocode}
 %    \begin{macrocode}
 \documentclass{minimal}
-\usepackage{luacolor}[2011/11/01]
+\usepackage{luacolor}[2016/05/13]
 \usepackage{qstest}
 \IncludeTests{*}
 \LogTests{log}{*}{*}
@@ -1206,7 +1214,7 @@ end
   <authorref id='auth:oberdiek'/>
   <copyright owner='Heiko Oberdiek' year='2007,2009-2011'/>
   <license type='lppl1.3'/>
-  <version number='1.8'/>
+  <version number='1.9'/>
   <description>
       This package implements color support based on LuaTeX's node
       attributes.
@@ -1288,6 +1296,11 @@ end
 %   \item
 %     Use of \texttt{node.subtype} instead of magic numbers.
 %   \end{Version}
+%   \begin{Version}{2016/05/13 v1.9}
+%   \item
+%     More use of \texttt{node.subtype} instead of magic numbers.
+%   \item luatex 85 updates
+%   \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 de8a679be49..b9e2135d116 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
@@ -1,5 +1,5 @@
 % oberdiek.ins
-% 2012/05/28
+% 2012/04/26
 %
 % Copyright (C) 1999, 2001, 2006 by
 %    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -65,7 +65,7 @@
 \batchinput{ifdraft.dtx}
 \batchinput{iflang.dtx}
 \batchinput{ifluatex.dtx}
-\batchinput{ifpdf.dtx}
+\batchinput{ifpdf.ins}
 \batchinput{ifvtex.dtx}
 \batchinput{infwarerr.dtx}
 \batchinput{inputenx.dtx}
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
index 741bfb072c4..164312da25c 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
@@ -6,7 +6,7 @@
 \newcommand*{\Subject}{CTAN:\CTANdir}
 \newcommand*{\Author}{Heiko Oberdiek}
 \newcommand*{\Email}{heiko.oberdiek at googlemail.com}
-\newcommand*{\Date}{2012/05/28}
+\newcommand*{\Date}{2012/04/26}
 
 % Copyright (C) 2006-2011 by
 %    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -114,7 +114,7 @@
     \makeatletter
     \def\@prj{#1}%
     \let\contentsline\foreign@contentsline
-    \input{../\@prj/\@prj.toc}%
+    \input{\@prj.toc}%
   \endgroup
 }
 \def\foreign@contentsline#1#2#3#4{%
@@ -233,13 +233,13 @@
 [\entrysep]
 \entry{grffile}{2012/04/05}{1.16}{Extended file name support for graphics}%
 [\entrysep]
-\entry{hobsub}{2012/05/28}{1.13}{Construct package bundles}%
+\entry{hobsub}{2012/04/25}{1.12}{Construct package bundles}%
 [\entrysep]
 \entry{hologo}{2012/04/26}{1.10}{A logo collection with bookmark support}%
 [\entrysep]
 \entry{holtxdoc}{2012/03/21}{0.24}{Private additional ltxdoc support}%
 [\entrysep]
-\entry{hopatch}{2012/05/28}{1.2}{Wrapper for package hooks}%
+\entry{hopatch}{2011/06/24}{1.1}{Wrapper for package hooks}%
 [\entrysep]
 \entry{hycolor}{2011/01/30}{1.7}{Color options for hyperref/bookmark}%
 [\entrysep]
diff --git a/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt b/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt
index d0897c98c74..61e9705a74c 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                              2012/04/26
+README           2016/05/13
 
 This file describes the directory
   CTAN:macros/latex/contrib/oberdiek/
@@ -6,17 +6,6 @@ This file describes the directory
 It contains several packages:
   <package>.dtx: source code
   <package>.pdf: documentation
-The PDF file also embeds the source code. Thus it is enough to
-download the PDF file, if you want to have the package.
-See the section `Installation' how to unpack and install the
-package in more detail. Here just short instructions are given:
-  1a. Download the DTX source file and the PDF documentation.
-  1b. Or skip the DTX source download and extract the embedded
-      source file, e.g.:
-          pdftk <package>.pdf unpack_files output .
-  2.  Unpack the package using docstrip:
-          tex <package>.dtx
-  3.  Install the files in your preferred TDS (texmf) tree.
 
 Installation is easier, if you want to install all packages:
 Just download
@@ -27,11 +16,6 @@ Hint for attachfile2: This package comes with a Perl script pdfatfi.pl
 that should be installed somewhere in PATH as `pdfatfi', see also
 package documentation.
 
-Hints for users of old PDF viewer software (AR <= 5) that cannot
-read PDF-1.5 files. Only the PDF files in oberdiek-tds.zip uses
-the compression features of PDF-1.5 to get smaller file sizes.
-If you must support older PDF viewers, then use the PDF files in
-the CTAN directory that do not use the new compression features.
 
 Other files in the CTAN directory:
 * README: This file.
@@ -42,3 +26,8 @@ Other files in the CTAN directory:
 
 Happy TeXing
   Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+
+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