diff options
author | Karl Berry <karl@freefriends.org> | 2019-07-27 21:06:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-07-27 21:06:35 +0000 |
commit | 6bef83deb7557e3f77db24324e41b44b69548a5d (patch) | |
tree | 8c233845613b1512435e52d0786ad2fd75dc816f /Master/texmf-dist/source/latex/oberdiek | |
parent | ec76c86235312c3a03dc62b40b28398a25cfe975 (diff) |
oberdiek (27jul19)
git-svn-id: svn://tug.org/texlive/trunk@51756 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/oberdiek')
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/README.txt (renamed from Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt) | 10 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx | 231 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/bookmark.dtx | 41 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/luacolor.dtx | 68 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/luatex.dtx | 25 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/magicnum.dtx | 35 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/oberdiek.tex | 14 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx | 72 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx | 28 |
9 files changed, 334 insertions, 190 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt b/Master/texmf-dist/source/latex/oberdiek/README.txt index 0a5140ad363..5387490be34 100644 --- a/Master/texmf-dist/source/latex/oberdiek/readme-ctan.txt +++ b/Master/texmf-dist/source/latex/oberdiek/README.txt @@ -1,4 +1,4 @@ -README 2018/11/30 +README 2019/07/25 This file describes the directory CTAN:macros/latex/contrib/oberdiek/ @@ -25,9 +25,9 @@ Other files in the CTAN directory: The name is a convenience to users of the program `texdoc'. Happy TeXing - Heiko Oberdiek <heiko.oberdiek at googlemail.com> - -Oberdiek Package Support Group + Heiko Oberdiek + and + Oberdiek Package Support Group ho-tex@tug.org -Preferred bug reporting address is now + Preferred bug reporting address is now https://github.com/ho-tex/oberdiek/issues diff --git a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx index d4e5a9090f6..0fd7e1f6a3e 100644 --- a/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/attachfile2.dtx @@ -1,12 +1,12 @@ % \iffalse meta-comment % % File: attachfile2.dtx -% Version: 2016/05/16 v2.8 +% Version: 2019/07/24 v2.9 % Info: Attach files into PDF % % Copyright (C) 2005-2010, 2012 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> -% 2016 +% 2019 % https://github.com/ho-tex/oberdiek/issues % % This work may be distributed and/or modified under the @@ -26,7 +26,7 @@ % This work consists of the main source file attachfile2.dtx % and the derived files % attachfile2.sty, attachfile2.pdf, attachfile2.ins, attachfile2.drv, -% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def, +% atfi-dvips.def, atfi-pdftex.def, atfi-dvipdfmx.def,atfi-luatex.def % pdfatfi.pl. % % Distribution: @@ -64,6 +64,7 @@ % TDS:tex/latex/oberdiek/atfi-dvips.def % TDS:tex/latex/oberdiek/atfi-pdftex.def % TDS:tex/latex/oberdiek/atfi-dvipdfmx.def +% TDS:tex/latex/oberdiek/atfi-luatex.def % TDS:scripts/oberdiek/pdfatfi.pl (exec flag) % TDS:doc/latex/oberdiek/attachfile2.pdf % TDS:source/latex/oberdiek/attachfile2.dtx @@ -83,7 +84,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: attachfile2 2016/05/16 v2.8 Attach files into PDF (HO)} +\Msg{* Package: attachfile2 2019/07/24 v2.9 Attach files into PDF (HO)} \Msg{************************************************************************} \keepsilent @@ -95,7 +96,7 @@ This is a generated file. Project: attachfile2 -Version: 2016/05/16 v2.8 +Version: 2019/07/24 v2.9 Copyright (C) 2005-2010, 2012 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -130,6 +131,7 @@ and the derived files \file{attachfile2.sty}{\from{attachfile2.dtx}{package}}% \file{atfi-dvips.def}{\from{attachfile2.dtx}{dvips}}% \file{atfi-pdftex.def}{\from{attachfile2.dtx}{pdftex}}% + \file{atfi-luatex.def}{\from{attachfile2.dtx}{luatex}}% \file{atfi-dvipdfmx.def}{\from{attachfile2.dtx}{dvipdfmx}}% \nopreamble \nopostamble @@ -169,7 +171,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{attachfile2.drv}% - [2016/05/16 v2.8 Attach files into PDF (HO)]% + [2019/07/24 v2.9 Attach files into PDF (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \begin{document} @@ -198,7 +200,7 @@ and the derived files % \GetFileInfo{attachfile2.drv} % % \title{The \xpackage{attachfile2} package} -% \date{2016/05/16 v2.8} +% \date{2019/07/24 v2.9} % \author{Heiko Oberdiek\thanks % {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\ % \xemail{heiko.oberdiek at googlemail.com}} @@ -427,7 +429,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{attachfile2}% - [2016/05/16 v2.8 Attach files into PDF (HO)]% + [2019/07/24 v2.9 Attach files into PDF (HO)]% % \end{macrocode} % % \subsubsection{Loading of packages} @@ -820,12 +822,24 @@ and the derived files % \begin{macrocode} \let\atfi@driver\ltx@empty \def\atfi@driver@pdftex{pdftex} +\def\atfi@driver@luatex{luatex} \def\atfi@driver@dvips{dvips} \def\atfi@driver@dvipdfmx{dvipdfmx} % \end{macrocode} % \begin{macrocode} \DeclareVoidOption{pdftex}{% + \ifpdf \let\atfi@driver\atfi@driver@pdftex + \else + \let\atfi@driver\ltx@empty + \PackageError{attachfile2}{% + Wrong driver option `pdftex',\MessageBreak + because pdfTeX in PDF mode is not detected% + }\@ehc + \fi +} +\DeclareVoidOption{luatex}{% + \let\atfi@driver\atfi@driver@luatex } \DeclareVoidOption{dvips}{% \let\atfi@driver\atfi@driver@dvips @@ -889,17 +903,13 @@ and the derived files % % \begin{macrocode} \ifpdf - % ignoring other driver options + \ifluatex + \let\atfi@driver\atfi@driver@luatex + \else \let\atfi@driver\atfi@driver@pdftex + \fi \else - \ifx\atfi@driver\atfi@driver@pdftex - \let\atfi@driver\ltx@empty - \PackageError{attachfile2}{% - Wrong driver option `pdftex',\MessageBreak - because pdfTeX in PDF mode is not detected% - }\@ehc - \fi - \ifxetex + \ifxetex \let\atfi@driver\atfi@driver@dvipdfmx \else \ifx\atfi@driver\ltx@empty @@ -1610,44 +1620,7 @@ and the derived files %<*pdftex> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atfi-pdftex.def}% - [2016/05/16 v2.8 attachfile2 driver for pdfTeX (HO)]% -% \end{macrocode} -% -% \paragraph{\LuaTeX} -% -% \begin{macrocode} -\ifluatex - \ifnum\luatexversion<39 % - \else - \begingroup - \escapechar=-1 % - \def\atfi@temp#1{% - \ltx@IfUndefined{\string#1}{% - \let#1\ltx@undefined - \directlua{% - if tex.enableprimitives then % - tex.enableprimitives('', {'\string#1'})% - end% - }% - \ltx@ifundefined{\string#1}{% - }{% - \global#1=#1% - \@PackageInfoNoLine{attachfile2}{% - \string#1 enabled% - }% - }% - }{}% - }% - \atfi@temp\pdfliteral - \atfi@temp\pdfobj - \atfi@temp\pdflastobj - \atfi@temp\pdfxform - \atfi@temp\pdflastxform - \atfi@temp\pdfrefxform - \atfi@temp\pdfannot - \endgroup - \fi -\fi + [2019/07/24 v2.9 attachfile2 driver for pdfTeX (HO)]% % \end{macrocode} % % \paragraph{Macros for graphics data} @@ -1826,13 +1799,146 @@ and the derived files %</pdftex> % \end{macrocode} % +% \subsection{luatex} +% \begin{macrocode} +%<*luatex> +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{atfi-luatex.def}% + [2019/07/24 v2.9 attachfile2 driver for luaTeX (HO)]% +\protected\def\atfi@literal {\pdfextension literal} +\def\atfi@GSAVE{q } +\def\atfi@GRESTORE{Q } +\def\atfi@SETLINEWIDTH{w } +\def\atfi@LINETO{l } +\def\atfi@MOVETO{m } +\def\atfi@STROKE{S } +\def\atfi@FILL{f } +\def\atfi@FILLSTROKE#1#2{#1#2B } +\def\atfi@SETRGBCOLORSTROKE{RG } +\def\atfi@SETRGBCOLORFILL{rg } +\def\atfi@SETGRAYSTROKE{G } +\def\atfi@SETGRAYFILL{g } +\def\atfi@SETCMYKCOLORSTROKE{K } +\def\atfi@SETCMYKCOLORFILL{k } +\def\atfi@RECTFILL{re f } +\def\atfi@RECTSTROKEFILL#1#2#3{#1#2#3re B } +\def\atfi@SETMITERLIMIT{M } +\def\atfi@SETFLAT{i } +\def\atfi@SETLINECAP{J } +\def\atfi@CURVETO{c } +\def\atfi@CURVETOV{v } +\def\atfi@CURVETOY{y } +\def\atfi@CLOSEPATH{h } +\def\atfi@SETLINEJOIN{j } +\define@key{AtFi@file}{Size}{% + \edef\atfi@params{\atfi@params/Size #1}% +} +\def\atfi@embedfile#1{% + \ltx@IfUndefined{atfi@fileobj@#1}{% + \begingroup + \let\atfi@params\ltx@empty + \expandafter\let\expandafter\atfi@temp + \csname atfi@file@#1\endcsname + \ifx\atfi@temp\ltx@empty + \let\atfi@temp\relax + \fi + \ifx\atfi@temp\relax + \atfi@pdftexdata{#1}% + \else + \edef\x{% + \noexpand\setkeys{AtFi@file}{\@nameuse{atfi@file@#1}}% + }% + \x + \fi + \ifx\atfi@params\ltx@empty + \else + \edef\atfi@params{/Params<<\atfi@params>>}% + \fi + \immediate\pdfextension obj stream attr {% + /Type/EmbeddedFile% + \atfi@mimetype + \atfi@params + } file {#1}% + \expandafter + \xdef\csname atfi@fileobj@#1\endcsname{\the\numexpr\pdffeedback lastobj\relax}% + \endgroup + }{% + % file already embedded + }% +} +\def\atfi@xform{% + \immediate\saveboxresource\atfi@appearancebox + \edef\atfi@appearanceobj{\the\lastsavedboxresourceindex}% +} +\let\atfi@xform@icon\atfi@xform +\def\atfi@refxform#1{% + \useboxresource#1\relax +} +\def\atfi@insert@file@annot#1{% + \rule{0pt}{0pt}% + \ifatfi@appearance + \def\atfi@appearance@dict{% + /AP<<% + /N \atfi@appearanceobj\space 0 R% + /R \atfi@appearanceobj\space 0 R% + /D \atfi@appearanceobj\space 0 R% + >>% + }% + \else + \let\atfi@appearance@dict\ltx@empty + \fi + \ltx@IfUndefined{atfi@fsobj@#1}{% + \begingroup + \hypersetup{unicode=false}% + \atfi@pdfstringdef\atfi@file{#1}% + \immediate\pdfextension obj{% + <<% + /Type/Filespec% + /F(\atfi@file)% + \ifx\atfi@ucfilespec\ltx@empty + \else + /UF(\atfi@ucfilespec)% + \fi + /EF<<% + /F \@nameuse{atfi@fileobj@#1} 0 R% + >>% + >>% + }% + \expandafter\xdef\csname atfi@fsobj@#1\endcsname{% + \the\numexpr\pdffeedback lastobj\relax + }% + \endgroup + }{% + }% + \pdfextension annot width \atfi@scale\atfi@appearancewidth + height \atfi@scale\atfi@appearanceheight + depth \atfi@scale\atfi@appearancedepth {% + /Subtype/FileAttachment% + \atfi@icon + \atfi@color@annot + \atfi@author + \atfi@date + \atfi@annotname + \atfi@description + \atfi@subject + \atfi@appearance@dict + /F \theatfi@flags + /FS \@nameuse{atfi@fsobj@#1} 0 R% + }% + \rule{0pt}{\atfi@appearanceheight}% + \rule[-\atfi@appearancedepth]{0pt}{\atfi@appearancedepth}% + \rule{\atfi@appearancewidth}{0pt}% +} +%</luatex> +% \end{macrocode} +% % \subsubsection{dvips} % % \begin{macrocode} %<*dvips> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atfi-dvips.def}% - [2016/05/16 v2.8 attachfile2 driver for dvips (HO)]% + [2019/07/24 v2.9 attachfile2 driver for dvips (HO)]% % \end{macrocode} % % \paragraph{Macros for graphics data} @@ -2407,7 +2513,7 @@ and the derived files %<*dvipdfmx> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{atfi-dvipdfmx.def}% - [2016/05/16 v2.8 attachfile2 driver for dvipdfmx/XeTeX (HO)]% + [2019/07/24 v2.9 attachfile2 driver for dvipdfmx/XeTeX (HO)]% % \end{macrocode} % % \paragraph{Macros for graphics data} @@ -2676,8 +2782,8 @@ $^W=1; # turn warning on my $prj = 'pdfatfi'; my $file = "$prj.pl"; my $program = uc($&) if $file =~ /^\w+/; -my $version = "2.7"; -my $date = "2016/05/16"; +my $version = "2.9"; +my $date = "2019/07/24"; my $author = "Heiko Oberdiek"; my $copyright = "Copyright (c) 2005-2010, 2012 by $author."; # @@ -2686,6 +2792,7 @@ my $copyright = "Copyright (c) 2005-2010, 2012 by $author."; # 2006/08/16 v2.2: Included in DTX file of attachfile2.dtx. # 2010/09/27 v2.6: Keys ModDateTZ and CreationDateTZ added. # 2016/05/16 v2.8: Option --version added. +# 2019/07/24 v2.9: adapted version to attachfile2 version. # use POSIX qw(strftime); # %z is used (GNU) @@ -3082,7 +3189,7 @@ __END__ <authorref id='auth:oberdiek'/> <copyright owner='Heiko Oberdiek' year='2005-2010,2012'/> <license type='lppl1.3'/> - <version number='2.8'/> + <version number='2.9'/> <description> This package can be used to attach files to a PDF document. It is a further development of Scott Pakin’s package @@ -3216,6 +3323,10 @@ __END__ % \item % Documentation updates. % \end{Version} +% \begin{Version}{2019/07/24 v2.9} +% \item +% Added luatex driver (UF, issue 69) +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx index a37ead2acc5..72c6b0d3eb4 100644 --- a/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/bookmark.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % File: bookmark.dtx -% Version: 2016/05/17 v1.26 +% Version: 2019/06/04 v1.27 % Info: PDF bookmarks % % Copyright (C) 2007-2011 by @@ -87,7 +87,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: bookmark 2016/05/17 v1.26 PDF bookmarks (HO)} +\Msg{* Package: bookmark 2019/06/04 v1.27 PDF bookmarks (HO)} \Msg{************************************************************************} \keepsilent @@ -99,7 +99,7 @@ This is a generated file. Project: bookmark -Version: 2016/05/17 v1.26 +Version: 2019/06/04 v1.27 Copyright (C) 2007-2011 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -173,7 +173,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bookmark.drv}% - [2016/05/17 v1.26 PDF bookmarks (HO)]% + [2019/06/04 v1.27 PDF bookmarks (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \begin{document} @@ -202,7 +202,7 @@ and the derived files % \GetFileInfo{bookmark.drv} % % \title{The \xpackage{bookmark} package} -% \date{2016/05/17 v1.26} +% \date{2019/06/04 v1.27} % \author{Heiko Oberdiek\thanks % {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\ % \xemail{heiko.oberdiek at googlemail.com}} @@ -307,9 +307,9 @@ and the derived files % and \hologo{VTeX} are automatically detected. % The default for the DVI drivers is \xoption{dvips}. This can % be changed in the configuration file \xfile{bookmark.cfg} by -% \cs{BookmarkDefaultDriver}, e.g.: +% \cs{BookmarkDriverDefault}, e.g.: % \begin{quote} -% |\def\BookmarkDefaultDriver{dvipdfm}| +% |\def\BookmarkDriverDefault{dvipdfm}| % \end{quote} % % \paragraph{Open bookmarks with dvipdfmx.} Since 2007-04-25 the @@ -663,7 +663,7 @@ and the derived files open, openlevel=2, atend -]{bookmark}[2016/05/17] +]{bookmark}[2019/06/04] \bookmarksetup{color=blue} @@ -766,7 +766,7 @@ and the derived files %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bookmark}% - [2016/05/17 v1.26 PDF bookmarks (HO)]% + [2019/06/04 v1.27 PDF bookmarks (HO)]% % \end{macrocode} % % \subsubsection{Requirements} @@ -1524,9 +1524,9 @@ and the derived files % \begin{macrocode} \def\BKM@StyleCall#1{% \@ifundefined{BKM@style@#1}{% - \PackageError{bookmark}{% - Undefined style `#1'% - }\@ehc + \PackageWarning{bookmark}{% + Ignoring unknown style `#1'% + }% }{% % \end{macrocode} % Check style stack. @@ -1894,7 +1894,7 @@ and the derived files %<*dvipdfm> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipdfm.def}% - [2016/05/17 v1.26 bookmark driver for dvipdfm (HO)]% + [2019/06/04 v1.27 bookmark driver for dvipdfm (HO)]% % \end{macrocode} % % \begin{macro}{\BKM@id} @@ -2069,7 +2069,7 @@ and the derived files %<*vtex> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-vtex.def}% - [2016/05/17 v1.26 bookmark driver for VTeX (HO)]% + [2019/06/04 v1.27 bookmark driver for VTeX (HO)]% % \end{macrocode} % % \begin{macrocode} @@ -2400,7 +2400,7 @@ and the derived files %<*pdftex> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-pdftex.def}% - [2016/05/17 v1.26 bookmark driver for pdfTeX (HO)]% + [2019/06/04 v1.27 bookmark driver for pdfTeX (HO)]% % \end{macrocode} % % \begin{macro}{\BKM@DO@entry} @@ -2556,7 +2556,7 @@ and the derived files %<*dvips> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvips.def}% - [2016/05/17 v1.26 bookmark driver for dvips (HO)]% + [2019/06/04 v1.27 bookmark driver for dvips (HO)]% % \end{macrocode} % \begin{macro}{\BKM@PSHeaderFile} % \begin{macrocode} @@ -2575,7 +2575,7 @@ and the derived files %<*dvipsone> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipsone.def}% - [2016/05/17 v1.26 bookmark driver for dvipsone (HO)]% + [2019/06/04 v1.27 bookmark driver for dvipsone (HO)]% % \end{macrocode} % \begin{macro}{\BKM@PSHeaderFile} % \begin{macrocode} @@ -2594,7 +2594,7 @@ and the derived files %<*textures> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-textures.def}% - [2016/05/17 v1.26 bookmark driver for textures (HO)]% + [2019/06/04 v1.27 bookmark driver for textures (HO)]% % \end{macrocode} % \begin{macro}{\BKM@PSHeaderFile} % \begin{macrocode} @@ -3514,6 +3514,11 @@ and the derived files % \item % define \cs{pdfbookmark} to allow pdftex driver to be used with Lua\TeX. % \end{Version} +% \begin{Version}{2019/06/04 v1.27} +% \item +% unknown style options are ignored (issue 67) +% \end{Version} + % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx b/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx index 9e35c025290..11bff2e38d1 100644 --- a/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % File: luacolor.dtx -% Version: 2018/11/22 v1.11 +% Version: 2019/07/25 v1.12 % Info: Color support via LuaTeX's attributes % % Copyright (C) 2007, 2009-2011 by @@ -84,7 +84,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: luacolor 2018/11/22 v1.11 Color support via LuaTeX's attributes (HO)} +\Msg{* Package: luacolor 2019/07/25 v1.12 Color support via LuaTeX's attributes (HO)} \Msg{************************************************************************} \keepsilent @@ -96,7 +96,7 @@ This is a generated file. Project: luacolor -Version: 2018/11/22 v1.11 +Version: 2019/07/25 v1.12 Copyright (C) 2007, 2009-2011 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -178,7 +178,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{luacolor.drv}% - [2018/11/22 v1.11 Color support via LuaTeX's attributes (HO)]% + [2019/07/25 v1.12 Color support via LuaTeX's attributes (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \usepackage{paralist} @@ -213,7 +213,7 @@ and the derived files % \GetFileInfo{luacolor.drv} % % \title{The \xpackage{luacolor} package} -% \date{2018/11/22 v1.11} +% \date{2019/07/25 v1.12} % \author{Heiko Oberdiek\thanks % {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\ % \xemail{heiko.oberdiek at googlemail.com}} @@ -357,7 +357,7 @@ and the derived files % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luacolor}% - [2018/11/22 v1.11 Color support via LuaTeX's attributes (HO)] + [2019/07/25 v1.12 Color support via LuaTeX's attributes (HO)] % \end{macrocode} % % \subsection{Check for \LuaTeX} @@ -415,7 +415,7 @@ and the derived files % \end{macrocode} % \begin{macrocode} \begingroup - \edef\x{\LuaCol@directlua{tex.write("2018/11/22 v1.11")}}% + \edef\x{\LuaCol@directlua{tex.write("2019/07/25 v1.12")}}% \edef\y{% \LuaCol@directlua{% if oberdiek.luacolor.getversion then % @@ -584,12 +584,14 @@ and the derived files % That is analyzed to get the prefix for the color setting % \cs{special}. % \begin{macrocode} -module("oberdiek.luacolor", package.seeall) +oberdiek = oberdiek or {} +local luacolor = oberdiek.luacolor or {} +oberdiek.luacolor = luacolor % \end{macrocode} % \begin{macro}{getversion()} % \begin{macrocode} -function getversion() - tex.write("2018/11/22 v1.11") +function luacolor.getversion() + tex.write("2019/07/25 v1.12") end % \end{macrocode} % \end{macro} @@ -597,12 +599,7 @@ end % \subsubsection{Driver detection} % % \begin{macrocode} -local ifpdf -if tonumber(tex.outputmode or tex.pdfoutput) > 0 then - ifpdf = true -else - ifpdf = false -end +local ifpdf = tonumber(tex.outputmode or tex.pdfoutput) > 0 local prefix local prefixes = { dvips = "color ", @@ -636,7 +633,7 @@ end % \end{macro} % \begin{macro}{dvidetect()} % \begin{macrocode} -function dvidetect() +function luacolor.dvidetect() local v = tex.box[0] assert(v.id == node.id("hlist")) for v in node.traverse_id(node.id("whatsit"), v.head) do @@ -667,14 +664,14 @@ local map = { % \end{macrocode} % \begin{macro}{get()} % \begin{macrocode} -function get(color) - tex.write("" .. getvalue(color)) +function luacolor.get(color) + tex.write("" .. luacolor.getvalue(color)) end % \end{macrocode} % \end{macro} % \begin{macro}{getvalue()} % \begin{macrocode} -function getvalue(color) +function luacolor.getvalue(color) local n = map[color] if not n then n = map.n + 1 @@ -692,7 +689,7 @@ end % \begin{macro}{setattribute()} % \begin{macrocode} local attribute -function setattribute(attr) +function luacolor.setattribute(attr) attribute = attr end % \end{macrocode} @@ -700,7 +697,7 @@ end % % \begin{macro}{getattribute()} % \begin{macrocode} -function getattribute() +function luacolor.getattribute() return attribute end % \end{macrocode} @@ -711,14 +708,15 @@ end % \begin{macrocode} local LIST = 1 local LIST_LEADERS = 2 -local COLOR = 3 +local LIST_DISC = 3 +local COLOR = 4 local RULE = node.id("rule") local node_types = { [node.id("hlist")] = LIST, [node.id("vlist")] = LIST, [node.id("rule")] = COLOR, [node.id("glyph")] = COLOR, - [node.id("disc")] = COLOR, + [node.id("disc")] = LIST_DISC, [node.id("whatsit")] = { [node.subtype("special")] = COLOR, [node.subtype("pdf_literal")] = COLOR, @@ -766,17 +764,21 @@ local function traverse(list, color, dry) if not list then return color end - if get_type(list) ~= LIST then + local head + if get_type(list) == LIST then + head = list.head + elseif get_type(list) == LIST_DISC then + head = list.replace + else texio.write_nl("!!! Error: Wrong list type: " .. node.type(list.id)) return color end %<debug>texio.write_nl("traverse: " .. node.type(list.id)) - local head = list.head for n in node.traverse(head) do %<debug>texio.write_nl(" node: " .. node.type(n.id)) local t = get_type(n) %<debug>texio.write_nl("TYPE "..tostring(t).. " "..tostring(node.type(node.getid(n))).." ".. tostring(node.getsubtype(n))) - if t == LIST then + if t == LIST or t == LIST_DISC then color = traverse(n, color, dry) elseif t == LIST_LEADERS then local color_after = traverse(n.leader, color, DRY_TRUE) @@ -810,7 +812,11 @@ local function traverse(list, color, dry) end end end - list.head = head + if get_type(list) == LIST then + list.head = head + else + list.replace = head + end return color end % \end{macrocode} @@ -818,7 +824,7 @@ end % % \begin{macro}{process()} % \begin{macrocode} -function process(box) +function luacolor.process(box) local color = "" local list = tex.getbox(box) traverse(list, color, DRY_FALSE) @@ -1275,6 +1281,10 @@ end % \item % removed pre-0.65 stuff % \end{Version} +% \begin{Version}{2019/07/25 v1.12} +% \item +% removed uses of module function, see PR70 +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/luatex.dtx b/Master/texmf-dist/source/latex/oberdiek/luatex.dtx index 7e05e211258..ef111a4efa3 100644 --- a/Master/texmf-dist/source/latex/oberdiek/luatex.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/luatex.dtx @@ -1,12 +1,12 @@ % \iffalse meta-comment % % File: luatex.dtx -% Version: 2016/05/16 v0.6 +% Version: 2019/07/25 v0.7 % Info: LuaTeX basic definition package % % Copyright (C) 2007, 2009, 2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> -% 2016 +% 2016, 2019 % https://github.com/ho-tex/oberdiek/issues % % This work may be distributed and/or modified under the @@ -89,7 +89,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: luatex 2016/05/16 v0.6 LuaTeX basic definition package (HO)} +\Msg{* Package: luatex 2019/07/25 v0.7 LuaTeX basic definition package (HO)} \Msg{************************************************************************} \keepsilent @@ -101,7 +101,7 @@ This is a generated file. Project: luatex -Version: 2016/05/16 v0.6 +Version: 2019/07/25 v0.7 Copyright (C) 2007, 2009, 2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -188,7 +188,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{luatex.drv}% - [2016/05/16 v0.6 LuaTeX basic definition package (HO)]% + [2019/07/25 v0.7 LuaTeX basic definition package (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \usepackage{paralist} @@ -218,7 +218,7 @@ and the derived files % \GetFileInfo{luatex.drv} % % \title{The \xpackage{luatex} package} -% \date{2016/05/16 v0.6} +% \date{2019/07/25 v0.7} % \author{Heiko Oberdiek\thanks % {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\ % \xemail{heiko.oberdiek at googlemail.com}} @@ -571,7 +571,7 @@ and the derived files \fi \expandafter\x\csname ver@luatex.sty\endcsname \ProvidesPackage{luatex}% - [2016/05/16 v0.6 LuaTeX basic definition package (HO)]% + [2019/07/25 v0.7 LuaTeX basic definition package (HO)]% % \end{macrocode} % % \subsection{Catcodes} @@ -1275,7 +1275,7 @@ and the derived files \fi \expandafter\x\csname ver@luatex-loader.sty\endcsname \ProvidesPackage{luatex-loader}% - [2016/05/16 v0.6 Lua module loader (HO)]% + [2019/07/25 v0.7 Lua module loader (HO)]% % \end{macrocode} % \begin{macrocode} \begingroup\catcode61\catcode48\catcode32=10\relax% @@ -1335,10 +1335,7 @@ and the derived files %<*lua> % \end{macrocode} % \begin{macrocode} -module("oberdiek.luatex", package.seeall) -% \end{macrocode} -% \begin{macrocode} -function kpse_module_loader(module) +local function kpse_module_loader(module) local script = module .. ".lua" local file = kpse.find_file(script, "texmfscripts") if file then @@ -1958,6 +1955,10 @@ table.insert(package.searchers or package.loaders, kpse_module_loader) % \item % Documentation updates. % \end{Version} +% \begin{Version}{2019/07/25 v0.7} +% \item +% remove uses of module function, see PR70 +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx b/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx index 535a9e12433..7c24944fedd 100644 --- a/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/magicnum.dtx @@ -1,12 +1,12 @@ % \iffalse meta-comment % % File: magicnum.dtx -% Version: 2016/05/16 v1.5 +% Version: 2019/07/25 v1.6 % Info: Magic numbers % % Copyright (C) 2007, 2009-2011 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> -% 2016 +% 2016, 2019 % https://github.com/ho-tex/oberdiek/issues % % This work may be distributed and/or modified under the @@ -89,7 +89,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: magicnum 2016/05/16 v1.5 Magic numbers (HO)} +\Msg{* Package: magicnum 2019/07/25 v1.6 Magic numbers (HO)} \Msg{************************************************************************} \keepsilent @@ -101,7 +101,7 @@ This is a generated file. Project: magicnum -Version: 2016/05/16 v1.5 +Version: 2019/07/25 v1.6 Copyright (C) 2007, 2009-2011 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -189,7 +189,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{magicnum.drv}% - [2016/05/16 v1.5 Magic numbers (HO)]% + [2019/07/25 v1.6 Magic numbers (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \usepackage{array} @@ -219,7 +219,7 @@ and the derived files % \GetFileInfo{magicnum.drv} % % \title{The \xpackage{magicnum} package} -% \date{2016/05/16 v1.5} +% \date{2019/07/25 v1.6} % \author{Heiko Oberdiek\thanks % {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\ % \xemail{heiko.oberdiek at googlemail.com}} @@ -515,7 +515,7 @@ and the derived files \fi \expandafter\x\csname ver@magicnum.sty\endcsname \ProvidesPackage{magicnum}% - [2016/05/16 v1.5 Magic numbers (HO)]% + [2019/07/25 v1.6 Magic numbers (HO)]% % \end{macrocode} % % \subsection{Catcodes} @@ -648,10 +648,10 @@ and the derived files % \end{macro} % \begin{macrocode} \magicnum@directlua{% - require("oberdiek.magicnum")% + require("magicnum")% }% \begingroup - \def\x{2016/05/16 v1.5}% + \def\x{2019/07/25 v1.6}% \def\StripPrefix#1>{}% \edef\x{\expandafter\StripPrefix\meaning\x}% \edef\y{% @@ -929,11 +929,13 @@ luatex.pdfliteral.mode %<*lua> % \end{macrocode} % \begin{macrocode} -module("oberdiek.magicnum", package.seeall) +oberdiek = oberdiek or {} +local magicnum = oberdiek.magicnum or {} +oberdiek.magicnum = magicnum % \end{macrocode} % \begin{macrocode} -function getversion() - tex.write("2016/05/16 v1.5") +function magicnum.getversion() + tex.write("2019/07/25 v1.6") end % \end{macrocode} % \begin{macrocode} @@ -1107,7 +1109,7 @@ local data = { } % \end{macrocode} % \begin{macrocode} -function get(name) +function magicnum.get(name) local startpos, endpos, category, entry = string.find(name, "^(%a[%a%d%.]*)%.(-?[%a%d]+)$") if not entry then @@ -1541,7 +1543,7 @@ end <authorref id='auth:oberdiek'/> <copyright owner='Heiko Oberdiek' year='2007,2009-2011'/> <license type='lppl1.3'/> - <version number='1.5'/> + <version number='1.6'/> <description> This package allows access to the various parameter values in TeX (catcode values), e-TeX (group, if and node types, and @@ -1589,6 +1591,11 @@ end % \item % Documentation updates. % \end{Version} +% \begin{Version}{2019/07/25 v1.6} +% \item +% remove uses of module function, see PR70 +% \end{Version} + % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex index 55d6aa21e38..32f1cd5b9b6 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex @@ -6,9 +6,9 @@ \newcommand*{\Subject}{CTAN:\CTANdir} \newcommand*{\Author}{Heiko Oberdiek} \newcommand*{\Email}{ho-tex at tug.org} -\newcommand*{\Date}{2018/11/30} +\newcommand*{\Date}{2019/07/25} -% Copyright (C) 2006-2018 by +% Copyright (C) 2006-2019 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> % % This work may be distributed and/or modified under the @@ -185,7 +185,7 @@ [\entrysep] \entry{atenddvi}{2007/04/17}{1.1}{At end DVI hook}% [\entrysep] -\entry{attachfile2}{2012/04/18}{2.7}{Attach files into PDF}% +\entry{attachfile2}{2019/07/24}{2.9}{Attach files into PDF}% [\entrysep] \entry{atveryend}{2011/06/30}{1.8}{Hooks at the very end of document}% [\entrysep] @@ -283,11 +283,11 @@ [\entrysep] \entry{ltxcmds}{2011/11/09}{1.22}{\hologo{LaTeX} kernel commands for general use}% [\entrysep] -\entry{luacolor}{2011/11/01}{1.8}{Color support via \hologo{LuaTeX}'s attributes}% +\entry{luacolor}{2019/07/25}{1.12}{Color support via \hologo{LuaTeX}'s attributes}% [\entrysep] -\entry{luatex}{2010/03/09}{0.4}{\hologo{LuaTeX} basic definition package}% +\entry{luatex}{2019/07/25}{0.7}{\hologo{LuaTeX} basic definition package}% [\entrysep] -\entry{magicnum}{2011/04/10}{1.4}{Magic numbers}% +\entry{magicnum}{2019/07/25}{1.6}{Magic numbers}% [\entrysep] \entry{makerobust}{2006/03/18}{1.0}{Make existing macro robust}% [\entrysep] @@ -315,7 +315,7 @@ [\entrysep] \entry{pdfrender}{2010/01/28}{1.2}{Access to some PDF graphics parameters}% [\entrysep] -\entry{pdftexcmds}{2011/11/29}{0.20}{Utility functions of \hologo{pdfTeX} for \hologo{LuaTeX}}% +\entry{pdftexcmds}{2019/07/25}{0.30}{Utility functions of \hologo{pdfTeX} for \hologo{LuaTeX}}% [\entrysep] \entry{picture}{2009/10/11}{1.3}{Dimens for picture macros}% [\entrysep] diff --git a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx index 541e20bdc4e..9a948c3c2da 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: 2018/09/10 v0.29 +% Version: 2019/07/25 v0.30 % 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 2018/09/10 v0.29 Utility functions of pdfTeX for LuaTeX (HO)} +\Msg{* Package: pdftexcmds 2019/07/25 v0.30 Utility functions of pdfTeX for LuaTeX (HO)} \Msg{************************************************************************} \keepsilent @@ -100,7 +100,7 @@ This is a generated file. Project: pdftexcmds -Version: 2018/09/10 v0.29 +Version: 2019/07/25 v0.30 Copyright (C) 2007, 2009-2011 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -201,7 +201,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{pdftexcmds.drv}% - [2018/09/10 v0.29 Utility functions of pdfTeX for LuaTeX (HO)]% + [2019/07/25 v0.30 Utility functions of pdfTeX for LuaTeX (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \usepackage{paralist} @@ -239,7 +239,7 @@ and the derived files % \GetFileInfo{pdftexcmds.drv} % % \title{The \xpackage{pdftexcmds} package} -% \date{2018/09/10 v0.29} +% \date{2019/07/25 v0.30} % \author{Heiko Oberdiek\thanks % {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\ % \xemail{heiko.oberdiek at googlemail.com}} @@ -618,7 +618,7 @@ and the derived files \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2018/09/10 v0.29 Utility functions of pdfTeX for LuaTeX (HO)]% + [2019/07/25 v0.30 Utility functions of pdfTeX for LuaTeX (HO)]% % \end{macrocode} % % \subsection{Catcodes} @@ -1174,7 +1174,7 @@ and the derived files \fi \fi \begingroup - \def\x{2018/09/10 v0.29}% + \def\x{2019/07/25 v0.30}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -1576,17 +1576,19 @@ and the derived files % \end{macrocode} % % \begin{macrocode} -module("oberdiek.pdftexcmds", package.seeall) +oberdiek = oberdiek or {} +local pdftexcmds = oberdiek.pdftexcmds or {} +oberdiek.pdftexcmds = pdftexcmds local systemexitstatus -function getversion() - tex.write("2018/09/10 v0.29") +function pdftexcmds.getversion() + tex.write("2019/07/25 v0.30") end % \end{macrocode} % % \subsubsection[Strings]{Strings \cite[``7.15 Strings'']{pdftex-manual}} % % \begin{macrocode} -function strcmp(A, B) +function pdftexcmds.strcmp(A, B) if A == B then tex.write("0") elseif A < B then @@ -1620,7 +1622,7 @@ local function utf8_to_byte(str) end return table.concat(t) end -function escapehex(str, mode) +function pdftexcmds.escapehex(str, mode) if mode == "byte" then str = utf8_to_byte(str) end @@ -1634,7 +1636,7 @@ end % See procedure |unescapehex| in file \xfile{utils.c} of \hologo{pdfTeX}. % Caution: |tex.write| ignores leading spaces. % \begin{macrocode} -function unescapehex(str, mode, patch) +function pdftexcmds.unescapehex(str, mode, patch) local a = 0 local first = true local result = {} @@ -1702,12 +1704,12 @@ function unescapehex(str, mode, patch) % change in the file. eroux, 28apr13. (v 0.21) % \begin{macrocode} local unpack = _G["unpack"] or table.unpack - tex.settoks(toks, string.char(unpack(result))) + tex.settoks(pdftexcmds.toks, string.char(unpack(result))) end % \end{macrocode} % See procedure |escapestring| in file \xfile{utils.c} of \hologo{pdfTeX}. % \begin{macrocode} -function escapestring(str, mode) +function pdftexcmds.escapestring(str, mode) if mode == "byte" then str = utf8_to_byte(str) end @@ -1730,7 +1732,7 @@ end % \end{macrocode} % See procedure |escapename| in file \xfile{utils.c} of \hologo{pdfTeX}. % \begin{macrocode} -function escapename(str, mode) +function pdftexcmds.escapename(str, mode) if mode == "byte" then str = utf8_to_byte(str) end @@ -1764,7 +1766,7 @@ end % \subsubsection[Files]{Files \cite[``7.18 Files'']{pdftex-manual}} % % \begin{macrocode} -function filesize(filename) +function pdftexcmds.filesize(filename) local foundfile = kpse.find_file(filename, "tex", true) if foundfile then local size = lfs.attributes(foundfile, "size") @@ -1776,7 +1778,7 @@ end % \end{macrocode} % See procedure |makepdftime| in file \xfile{utils.c} of \hologo{pdfTeX}. % \begin{macrocode} -function filemoddate(filename) +function pdftexcmds.filemoddate(filename) local foundfile = kpse.find_file(filename, "tex", true) if foundfile then local date = lfs.attributes(foundfile, "modification") @@ -1813,7 +1815,7 @@ function filemoddate(filename) end end end -function filedump(offset, length, filename) +function pdftexcmds.filedump(offset, length, filename) length = tonumber(length) if length and length > 0 then local foundfile = kpse.find_file(filename, "tex", true) @@ -1828,25 +1830,25 @@ function filedump(offset, length, filename) filehandle:seek("set", offset) end local dump = filehandle:read(length) - escapehex(dump) + pdftexcmds.escapehex(dump) filehandle:close() end end end end -function mdfivesum(str, mode) +function pdftexcmds.mdfivesum(str, mode) if mode == "byte" then str = utf8_to_byte(str) end - escapehex(md5.sum(str)) + pdftexcmds.escapehex(md5.sum(str)) end -function filemdfivesum(filename) +function pdftexcmds.filemdfivesum(filename) local foundfile = kpse.find_file(filename, "tex", true) if foundfile then local filehandle = io.open(foundfile, "rb") if filehandle then local contents = filehandle:read("*a") - escapehex(md5.sum(contents)) + pdftexcmds.escapehex(md5.sum(contents)) filehandle:close() end end @@ -1867,10 +1869,10 @@ end % \end{itemize} % \begin{macrocode} local basetime = 0 -function resettimer() +function pdftexcmds.resettimer() basetime = os.clock() end -function elapsedtime() +function pdftexcmds.elapsedtime() local val = (os.clock() - basetime) * 65536 + .5 if val > 2147483647 then val = 2147483647 @@ -1882,7 +1884,7 @@ end % \subsubsection[Miscellaneous]{Miscellaneous \cite[``7.21 Miscellaneous'']{pdftex-manual}} % % \begin{macrocode} -function shellescape() +function pdftexcmds.shellescape() if os.execute then if status and status.luatex_version @@ -1904,7 +1906,7 @@ function shellescape() tex.write("0") end end -function system(cmdline) +function pdftexcmds.system(cmdline) systemexitstatus = nil texio.write_nl("log", "system(" .. cmdline .. ") ") if os.execute then @@ -1914,20 +1916,20 @@ function system(cmdline) texio.write("log", "disabled.") end end -function lastsystemstatus() +function pdftexcmds.lastsystemstatus() local result = tonumber(systemexitstatus) if result then local x = math.floor(result / 256) tex.write(result - 256 * math.floor(result / 256)) end end -function lastsystemexit() +function pdftexcmds.lastsystemexit() local result = tonumber(systemexitstatus) if result then tex.write(math.floor(result / 256)) end end -function pipe(cmdline, patch) +function pdftexcmds.pipe(cmdline, patch) local result systemexitstatus = nil texio.write_nl("log", "pipe(" .. cmdline ..") ") @@ -1959,9 +1961,9 @@ function pipe(cmdline, patch) end result = temp end - tex.settoks(toks, result) + tex.settoks(pdftexcmds.toks, result) else - tex.settoks(toks, "") + tex.settoks(pdftexcmds.toks, "") end end % \end{macrocode} @@ -2718,6 +2720,10 @@ end % \item % Actually do the fix described above in the code, not just document it. % \end{Version} +% \begin{Version}{2019/07/25 v0.30} +% \item +% remove uses of module function, see PR70 +% \end{Version} % \end{History} % % \PrintIndex diff --git a/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx b/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx index 4f5eca4f667..d2c96ad89c1 100644 --- a/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/pmboxdraw.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % File: pmboxdraw.dtx -% Version: 2016/05/16 v1.2 +% Version: 2019/02/28 v1.3 % Info: Poor man's box drawing characters % % Copyright (C) 2006, 2011 by @@ -80,7 +80,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: pmboxdraw 2016/05/16 v1.2 Poor man's box drawing characters (HO)} +\Msg{* Package: pmboxdraw 2019/02/28 v1.3 Poor man's box drawing characters (HO)} \Msg{************************************************************************} \keepsilent @@ -92,7 +92,7 @@ This is a generated file. Project: pmboxdraw -Version: 2016/05/16 v1.2 +Version: 2019/02/28 v1.3 Copyright (C) 2006, 2011 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -157,7 +157,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{pmboxdraw.drv}% - [2016/05/16 v1.2 Poor man's box drawing characters (HO)]% + [2019/02/28 v1.3 Poor man's box drawing characters (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \usepackage{color} @@ -194,7 +194,7 @@ and the derived files % \GetFileInfo{pmboxdraw.drv} % % \title{The \xpackage{pmboxdraw} package} -% \date{2016/05/16 v1.2} +% \date{2019/02/28 v1.3} % \author{Heiko Oberdiek\thanks % {Please report any issues at https://github.com/ho-tex/oberdiek/issues}\\ % \xemail{heiko.oberdiek at googlemail.com}} @@ -215,7 +215,7 @@ and the derived files % \section{User interface} % % \begin{quote} -% \ttfamily +% \ttfamily\fontfamily{lmtt}\selectfont % \catcode`=\active % \catcode`|\active % \catcode`-\active @@ -226,7 +226,7 @@ and the derived files % \textSFxxxix===================\textSFxxv\\ % | P M B O X D R A W |\\ % \textSFxxxviii ==\textSFxlvii============\textSFxlvii===\textSFxxvi\\ -% ~~~\textSFxi~2016/05/16 \textSFxi\\ +% ~~~\textSFxi~2019/02/28 \textSFxi\\ % ~~~\textSFii------------\textSFiv % \end{quote} % @@ -562,7 +562,7 @@ and the derived files \fi \expandafter\x\csname ver@pmboxdraw.sty\endcsname \ProvidesPackage{pmboxdraw}% - [2016/05/16 v1.2 Poor man's box drawing characters (HO)]% + [2019/02/28 v1.3 Poor man's box drawing characters (HO)]% % \end{macrocode} % % \begin{macrocode} @@ -5118,7 +5118,7 @@ $ \kern.5\pmbd@C % \begin{macrocode} %<*utf8> \ProvidesFile{pmboxdrawenc.dfu}% - [2016/05/16 v1.2 UTF-8 support for box drawing characters]% + [2019/02/28 v1.3 UTF-8 support for box drawing characters]% % \end{macrocode} % % \begin{macrocode} @@ -5223,7 +5223,7 @@ $ \kern.5\pmbd@C \DeclareUnicodeCharacter{257C}{\pmboxdrawuni{257C}} \DeclareUnicodeCharacter{257D}{\pmboxdrawuni{257D}} \DeclareUnicodeCharacter{257E}{\pmboxdrawuni{257E}} -\DeclareUnicodeCharacter{257F}{\pmboxdrawuni{257R}} +\DeclareUnicodeCharacter{257F}{\pmboxdrawuni{257F}} \DeclareUnicodeCharacter{2580}{\textupblock} \DeclareUnicodeCharacter{2581}{\pmboxdrawuni{2581}} \DeclareUnicodeCharacter{2582}{\pmboxdrawuni{2582}} @@ -5266,7 +5266,7 @@ $ \kern.5\pmbd@C % % \begin{macrocode} %<*test1> -\def\LoadCommand{\RequirePackage{pmboxdraw}[2016/05/16]} +\def\LoadCommand{\RequirePackage{pmboxdraw}[2019/02/28]} %</test1> % \end{macrocode} % \subsection{Catcode checks for loading} @@ -5577,7 +5577,7 @@ $ \kern.5\pmbd@C <authorref id='auth:oberdiek'/> <copyright owner='Heiko Oberdiek' year='2006,2011'/> <license type='lppl1.3'/> - <version number='1.2'/> + <version number='1.3'/> <description> This package declares box drawing characters of old code pages, e.g. cp437. It uses rules instead of using a font. @@ -5635,6 +5635,10 @@ $ \kern.5\pmbd@C % \item % Documentation updates. % \end{Version} +% \begin{Version}{2019/02/28 v1.3} +% \item +% Fix character U+257F (gh issue 59) +% \end{Version} % \end{History} % % \PrintIndex |