From 8de464391f34ff48f5909697c17029955fab69ba Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 26 Mar 2017 21:48:50 +0000 Subject: oberdiek (26mar17) git-svn-id: svn://tug.org/texlive/trunk@43610 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/oberdiek/askinclude.dtx | 1 + .../source/latex/oberdiek/catalogue/hypdoc.xml | 2 +- Master/texmf-dist/source/latex/oberdiek/fibnum.dtx | 1 + Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx | 30 ++++++--- Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx | 38 ++++++++++-- .../texmf-dist/source/latex/oberdiek/oberdiek.tex | 4 +- .../source/latex/oberdiek/pdftexcmds.dtx | 72 +++++++++++++--------- .../source/latex/oberdiek/readme-ctan.txt | 2 +- .../source/latex/oberdiek/thepdfnumber.dtx | 1 + 9 files changed, 104 insertions(+), 47 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx b/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx index 2c7ff8aca99..f3dedd16cd0 100644 --- a/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/askinclude.dtx @@ -285,6 +285,7 @@ and the derived files \fi \usepackage{csquotes} \usepackage[ + backend=bibtex, bibencoding=ascii, alldates=iso8601, ]{biblatex}[2011/11/13] diff --git a/Master/texmf-dist/source/latex/oberdiek/catalogue/hypdoc.xml b/Master/texmf-dist/source/latex/oberdiek/catalogue/hypdoc.xml index 717624d87e8..9c80b58dd31 100644 --- a/Master/texmf-dist/source/latex/oberdiek/catalogue/hypdoc.xml +++ b/Master/texmf-dist/source/latex/oberdiek/catalogue/hypdoc.xml @@ -6,7 +6,7 @@ - + This package adds hypertext features to the package doc that is used in the documentation diff --git a/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx b/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx index 7916ce4cab5..24db6cf89df 100644 --- a/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/fibnum.dtx @@ -200,6 +200,7 @@ and the derived files \usepackage{holtxdoc}[2011/11/22] \usepackage{csquotes} \usepackage[ + backend=bibtex, bibencoding=ascii, alldates=iso8601, ]{biblatex}[2011/11/13] diff --git a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx index 495b0ff6925..1f6183830d2 100644 --- a/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/hypdoc.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % File: hypdoc.dtx -% Version: 2016/05/16 v1.12 +% Version: 2016/10/02 v1.13 % Info: Hyper extensions for doc.sty % % Copyright (C) 2002, 2006, 2007, 2009-2011 by @@ -77,7 +77,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: hypdoc 2016/05/16 v1.12 Hyper extensions for doc.sty (HO)} +\Msg{* Package: hypdoc 2016/10/02 v1.13 Hyper extensions for doc.sty (HO)} \Msg{************************************************************************} \keepsilent @@ -89,7 +89,7 @@ This is a generated file. Project: hypdoc -Version: 2016/05/16 v1.12 +Version: 2016/10/02 v1.13 Copyright (C) 2002, 2006, 2007, 2009-2011 by Heiko Oberdiek @@ -150,7 +150,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{hypdoc.drv}% - [2016/05/16 v1.12 Hyper extensions for doc.sty (HO)]% + [2016/10/02 v1.13 Hyper extensions for doc.sty (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \begin{document} @@ -179,7 +179,7 @@ and the derived files % \GetFileInfo{hypdoc.drv} % % \title{The \xpackage{hypdoc} package} -% \date{2016/05/16 v1.12} +% \date{2016/10/02 v1.13} % \author{Heiko Oberdiek\thanks % {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\ % \xemail{heiko.oberdiek at googlemail.com}} @@ -358,7 +358,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdoc}% - [2016/05/16 v1.12 Hyper extensions for doc.sty (HO)]% + [2016/10/02 v1.13 Hyper extensions for doc.sty (HO)]% % \end{macrocode} % The package identification is done at the top of the |.dtx| file % in order to use only one identification string. @@ -563,7 +563,7 @@ and the derived files \else \stepcounter{HD@unique}% \pdfbookmark[\HD@guesstoclevel{\HDorg@listoffigures}]% - {\contentsname}{toc\theHD@unique}% + {\listfigurename}{toc\theHD@unique}% \fi \begingroup \HD@sectionpatch @@ -587,7 +587,7 @@ and the derived files \else \stepcounter{HD@unique}% \pdfbookmark[\HD@guesstoclevel{\HDorg@listoftables}]% - {\contentsname}{toc\theHD@unique}% + {\listtablename}{toc\theHD@unique}% \fi \begingroup \HD@sectionpatch @@ -722,7 +722,7 @@ and the derived files \let\Hy@writebookmark\HDorg@writebookmark \stepcounter{HD@unique}% \pdfbookmark[\HD@guesstoclevel{\HDorg@glossary@prologue}]% - {\glossaryname}{glossary\theHD@unique}% + {\changehistoryname}{glossary\theHD@unique}% \endgroup \fi \HDorg@glossary@prologue @@ -737,6 +737,12 @@ and the derived files % \end{macrocode} % \end{macro} % +% \begin{macro}{\glossaryname} +% \begin{macrocode} +\providecommand*{\changehistoryname}{\glossaryname} +% \end{macrocode} +% \end{macro} +% % \subsection{Index} % % \begin{macrocode} @@ -1333,7 +1339,7 @@ and the derived files - + This package adds hypertext features to the package doc that is used in the documentation @@ -1420,6 +1426,10 @@ and the derived files % \item % Documentation updates. % \end{Version} +% \begin{Version}{2016/10/02 v1.13} +% \item +% Fixes to bookmarknames, also introduce \cs{changehistoryname} +% \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 db7de6a05a4..eabc0aa26b3 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx @@ -1,24 +1,50 @@ % \iffalse %% Source File: ifpdf.dtx -%% Copyright 2016 Heiko Oberdiek and LaTeX3 project +%% Copyright 2016-2017 Heiko Oberdiek and LaTeX3 project %% %% This file may be distributed under the terms of the LPPL. -%% See README for details. +%% https://www.latex-project.org/lppl/ % +%<*ignore> +\ifx\ProvidesFile\undefined\let\install y\fi +\ifx\install y\else +\long\def\tmp#1\endbatchfile{} +\expandafter\tmp +\fi +% +%<*install> +\input docstrip +\keepsilent +\preamble +\endpreamble + +\askforoverwritefalse + +\generate{ +%<*ignore> +\file{ifpdf.ins}{\from{ifpdf.dtx}{install}} +% +\file{ifpdf.sty}{\from{ifpdf.dtx}{package}} +} + +\endbatchfile +% %<*dtx> \ProvidesFile{ifpdf.dtx} % +%<*!install> %\ifx\ProvidesPackage\undefined %\def\next#1#2[#3]{\wlog{#2 #3}\expandafter\gdef -%\csname ver@ifpdf.sty\endcsname{#3}} +%\csname ver\string @ifpdf.sty\endcsname{#3}} %\expandafter\next\fi %\ProvidesPackage{ifpdf} % \ProvidesFile{ifpdf.drv} % \fi % \ProvidesFile{ifpdf.dtx} -[2016/05/14 v3.1 Provides the ifpdf switch] -% +[2017/03/15 v3.2 Provides the ifpdf switch] % \iffalse +% +% %<*driver> \documentclass{ltxdoc} \usepackage{hyperref} @@ -111,3 +137,5 @@ end % \endinput % 2016/04/04 v3.0 rewrite to be self standing and work with new luatex/ % 2016/05/14 v3.1 define ver@ifpdf.sty in plain tex. +% 2017/03/15 v3.2 define ver\string@ifpdf.sty in amstex tex. +% https://github.com/ho-tex/oberdiek/issues/23 diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index 20eee77de52..d6c81d6a665 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex @@ -5,8 +5,8 @@ \newcommand*{\CTANroot}{ftp://ftp.ctan.org/tex-archive/} \newcommand*{\Subject}{CTAN:\CTANdir} \newcommand*{\Author}{Heiko Oberdiek} -\newcommand*{\Email}{heiko.oberdiek at googlemail.com} -\newcommand*{\Date}{2016/06/09} +\newcommand*{\Email}{ho-tex at tug.org} +\newcommand*{\Date}{2017/03/19} % Copyright (C) 2006-2011 by % Heiko Oberdiek diff --git a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx index 08e4a9438d4..9231d0ffc88 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % File: pdftexcmds.dtx -% Version: 2016/05/21 v0.22 +% Version: 2017/03/19 v0.25 % Info: Utility functions of pdfTeX for LuaTeX % % Copyright (C) 2007, 2009-2011 by @@ -88,7 +88,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: pdftexcmds 2016/05/21 v0.22 Utility functions of pdfTeX for LuaTeX (HO)} +\Msg{* Package: pdftexcmds 2017/03/19 v0.25 Utility functions of pdfTeX for LuaTeX (HO)} \Msg{************************************************************************} \keepsilent @@ -100,7 +100,7 @@ This is a generated file. Project: pdftexcmds -Version: 2016/05/21 v0.22 +Version: 2017/03/19 v0.25 Copyright (C) 2007, 2009-2011 by Heiko Oberdiek @@ -201,12 +201,13 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{pdftexcmds.drv}% - [2016/05/21 v0.22 Utility functions of pdfTeX for LuaTeX (HO)]% + [2017/03/19 v0.25 Utility functions of pdfTeX for LuaTeX (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \usepackage{paralist} \usepackage{csquotes} \usepackage[ + backend=bibtex, bibencoding=ascii, alldates=iso8601, ]{biblatex}[2011/11/13] @@ -238,7 +239,7 @@ and the derived files % \GetFileInfo{pdftexcmds.drv} % % \title{The \xpackage{pdftexcmds} package} -% \date{2016/05/21 v0.22} +% \date{2017/03/19 v0.25} % \author{Heiko Oberdiek\thanks % {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\ % \xemail{heiko.oberdiek at googlemail.com}} @@ -617,7 +618,7 @@ and the derived files \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2016/05/21 v0.22 Utility functions of pdfTeX for LuaTeX (HO)]% + [2017/03/19 v0.25 Utility functions of pdfTeX for LuaTeX (HO)]% % \end{macrocode} % % \subsection{Catcodes} @@ -1129,20 +1130,22 @@ and the derived files % \end{macrocode} % % \begin{macrocode} -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname RequirePackage\endcsname\relax - \def\TMP@RequirePackage#1[#2]{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname ver@#1.sty\endcsname\relax - \input #1.sty\relax - \fi - }% - \TMP@RequirePackage{luatex-loader}[2009/04/10]% -\else - \RequirePackage{luatex-loader}[2009/04/10]% +\ifnum\luatexversion<80 + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname RequirePackage\endcsname\relax + \def\TMP@RequirePackage#1[#2]{% + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname ver@#1.sty\endcsname\relax + \input #1.sty\relax + \fi + }% + \TMP@RequirePackage{luatex-loader}[2009/04/10]% + \else + \RequirePackage{luatex-loader}[2009/04/10]% + \fi \fi \pdftexcmds@directlua{% - require("oberdiek.pdftexcmds")% + require("pdftexcmds")% } \ifnum\luatexversion>37 % \ifnum0% @@ -1154,13 +1157,13 @@ and the derived files \everyjob\expandafter{% \the\everyjob \pdftexcmds@directlua{% - require("oberdiek.pdftexcmds")% + require("pdftexcmds")% }% }% \fi \fi \begingroup - \def\x{2016/05/21 v0.22}% + \def\x{2017/03/19 v0.25}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -1483,15 +1486,12 @@ and the derived files % \subsubsection{Shell escape} % % \begin{macro}{\pdf@shellescape} -% Caution: Catcode of digit zero might be `ignore'. +% % \begin{macrocode} \ifnum\luatexversion<68 % \else - \def\pdf@shellescape{% - \directlua0{% - oberdiek.pdftexcmds.shellescape()% - }% - }% + \protected\edef\pdf@shellescape{% + \numexpr\directlua{tex.sprint(status.shell_escape)}\relax} \fi % \end{macrocode} % \end{macro} @@ -1567,7 +1567,7 @@ and the derived files module("oberdiek.pdftexcmds", package.seeall) local systemexitstatus function getversion() - tex.write("2016/05/21 v0.22") + tex.write("2017/03/19 v0.25") end % \end{macrocode} % @@ -1817,6 +1817,7 @@ function filedump(offset, length, filename) end local dump = filehandle:read(length) escapehex(dump) + filehandle:close() end end end @@ -1834,6 +1835,7 @@ function filemdfivesum(filename) if filehandle then local contents = filehandle:read("*a") escapehex(md5.sum(contents)) + filehandle:close() end end end @@ -2672,7 +2674,21 @@ end % \end{Version} % \begin{Version}{2016/05/21 v0.22} % \item -% adjust textbackslash usage in bib file for biber bug. +% adjust \cs{textbackslas}h usage in bib file for biber bug. +% \end{Version} +% \begin{Version}{2016/10/02 v0.23} +% \item +% add file.close to lua filehandles (github pull request). +% \end{Version} +% \begin{Version}{2017/01/29 v0.24} +% \item +% Avoid loading luatex-loader for current luatex. (Use +% pdftexcmds.lua not oberdiek.pdftexcmds.lua to simplify file +% search with standard require) +% \end{Version} +% \begin{Version}{2017/03/19 v0.25} +% \item +% New \cs{pdf@shellescape} for Lua\TeX, see github issue 20. % \end{Version} % \end{History} % diff --git a/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt b/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt index 70e55cbccae..6b8d5793611 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 2016/06/09 +README 2017/03/19 This file describes the directory CTAN:macros/latex/contrib/oberdiek/ diff --git a/Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx b/Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx index 74f73a56e96..29dca3a2702 100644 --- a/Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/thepdfnumber.dtx @@ -168,6 +168,7 @@ and the derived files \usepackage{holtxdoc}[2011/11/22] \usepackage{csquotes} \usepackage[ + backend=bibtex, bibencoding=ascii, alldates=iso8601, ]{biblatex}[2011/11/13] -- cgit v1.2.3