diff options
Diffstat (limited to 'Master/texmf-dist/source')
6 files changed, 50 insertions, 122 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/hologo-eroux.patch b/Master/texmf-dist/source/latex/oberdiek/hologo-eroux.patch deleted file mode 100644 index 9b0b4ac84c0..00000000000 --- a/Master/texmf-dist/source/latex/oberdiek/hologo-eroux.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- hologo-old.dtx 2013-05-13 16:33:39.000000000 +0200 -+++ hologo-new.dtx 2013-05-13 16:31:27.000000000 +0200 -@@ -2689,12 +2689,16 @@ - \def\HOLOGO@IfCharExists#1{% - \ifnum - \directlua{% -- if font and font.fonts and font.current then % -- local f = font.fonts[font.current()]% -+ 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")% -+ tex.print("1") % - end % -- end% -+ end % - }0=\ltx@zero - \expandafter\ltx@secondoftwo - \else diff --git a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx index 9ab7d2ea5ee..e4e205d8224 100644 --- a/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/ifpdf.dtx @@ -1,6 +1,6 @@ % \iffalse %% Source File: ifpdf.dtx -%% Copyright 2016 LaTeX3 project +%% Copyright 2016 Heiko Oberdiek and LaTeX3 project %% %% This file may be distributed under the terms of the LPPL. %% See README for details. @@ -31,7 +31,7 @@ % \title{The \textsf{ifpdf} Package\thanks{This file % has version number \fileversion, last % revised \filedate. -% Please report any issues at https://github.com/davidcarlisle/ifpdf/issues}} +% Please report any issues at https://github.com/ho-tex/oberdiek/issues}} % \author{LaTeX3 project} % \date{\filedate} % \maketitle diff --git a/Master/texmf-dist/source/latex/oberdiek/luatex.dtx b/Master/texmf-dist/source/latex/oberdiek/luatex.dtx index c5e43771787..5b525d60304 100644 --- a/Master/texmf-dist/source/latex/oberdiek/luatex.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/luatex.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % % File: luatex.dtx -% Version: 2010/03/09 v0.4 +% Version: 2016/05/10 v0.5 % Info: LuaTeX basic definition package % % Copyright (C) 2007, 2009, 2010 by @@ -87,7 +87,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: luatex 2010/03/09 v0.4 LuaTeX basic definition package (HO)} +\Msg{* Package: luatex 2016/05/10 v0.5 LuaTeX basic definition package (HO)} \Msg{************************************************************************} \keepsilent @@ -99,7 +99,7 @@ This is a generated file. Project: luatex -Version: 2010/03/09 v0.4 +Version: 2016/05/10 v0.5 Copyright (C) 2007, 2009, 2010 by Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -186,7 +186,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{luatex.drv}% - [2010/03/09 v0.4 LuaTeX basic definition package (HO)]% + [2016/05/10 v0.5 LuaTeX basic definition package (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2011/11/22] \usepackage{paralist} @@ -196,7 +196,6 @@ and the derived files %</driver> % \fi % -% \CheckSum{1429} % % \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 @@ -217,7 +216,7 @@ and the derived files % \GetFileInfo{luatex.drv} % % \title{The \xpackage{luatex} package} -% \date{2010/03/09 v0.4} +% \date{2016/05/10 v0.5} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -572,7 +571,7 @@ and the derived files \fi \expandafter\x\csname ver@luatex.sty\endcsname \ProvidesPackage{luatex}% - [2010/03/09 v0.4 LuaTeX basic definition package (HO)]% + [2016/05/10 v0.5 LuaTeX basic definition package (HO)]% % \end{macrocode} % % \subsection{Catcodes} @@ -952,6 +951,7 @@ and the derived files % \end{macro} % \begin{macro}{\newattribute} % \begin{macrocode} +\ifx\newattribute\@undefined \LuT@newcommand\newattribute[1]{% \ifnum\LuT@AllocAttribute<65535 % \global\advance\LuT@AllocAttribute\@ne @@ -963,6 +963,7 @@ and the derived files \errmessage{No room for a new \string\attribute}% \fi } +\fi % \end{macrocode} % \end{macro} % @@ -970,13 +971,16 @@ and the derived files % % \begin{macro}{\setattribute} % \begin{macrocode} +\ifx\setattribute\@undefined \LuT@newcommand\setattribute[2]{% #1=\numexpr#2\relax } +\fi % \end{macrocode} % \end{macro} % \begin{macro}{\unsetattribute} % \begin{macrocode} +\ifx\unsetattribute\@undefined \ifnum\luatexversion<37 \LuT@newcommand\LuT@UnsetAttributeValue[0]{}% \let\LuT@UnsetAttributeValue\m@ne @@ -986,6 +990,7 @@ and the derived files \LuT@newcommand\unsetattribute[1]{% #1=\LuT@UnsetAttributeValue } +\fi % \end{macrocode} % \end{macro} % @@ -1003,6 +1008,7 @@ and the derived files % \end{macro} % \begin{macro}{\newcatcodetable} % \begin{macrocode} +\ifx\newcatcodetable\@undefined \LuT@newcommand\newcatcodetable[1]{% \ifnum\LuT@AllocCatcodeTable<1114110 % 0x10FFFF is maximal \chardef % or < 268435455 % 2^28 - 1 @@ -1016,6 +1022,7 @@ and the derived files \errmessage{No room for a new \string\catcodetable}% \fi }% +\fi % \end{macrocode} % \end{macro} % @@ -1268,7 +1275,7 @@ and the derived files \fi \expandafter\x\csname ver@luatex-loader.sty\endcsname \ProvidesPackage{luatex-loader}% - [2010/03/09 v0.4 Lua module loader (HO)]% + [2016/05/10 v0.5 Lua module loader (HO)]% % \end{macrocode} % \begin{macrocode} \begingroup\catcode61\catcode48\catcode32=10\relax% @@ -1345,7 +1352,12 @@ function kpse_module_loader(module) end return "\n\t[oberdiek.luatex.kpse_module_loader] Search failed" end -table.insert(package.loaders, kpse_module_loader) +% \end{macrocode} +% following line changed to use package.searchers instead of +% package.loaders for current luatex; this is the only change in the +% code. eroux, 28apr13, (or package.loaders), 29mar14. +% \begin{macrocode} +table.insert(package.searchers or package.loaders, kpse_module_loader) % \end{macrocode} % \begin{macrocode} %</lua> @@ -1886,7 +1898,7 @@ table.insert(package.loaders, kpse_module_loader) <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’s main objective @@ -1935,6 +1947,13 @@ table.insert(package.loaders, kpse_module_loader) % \item % Calling tex.enableprimitives for used primitives. % \end{Version} +% \begin{Version}{2016/05/10 v0.5} +% \item +% Use package.searchers +% \item only conditionally define commands such as +% \verb|\newcatcodetable| +% that are now defined in the Lua\LaTeX\ format. +% \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 02880550112..de8a679be49 100644 --- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins +++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins @@ -65,8 +65,7 @@ \batchinput{ifdraft.dtx} \batchinput{iflang.dtx} \batchinput{ifluatex.dtx} -% incompatible with current luatex -%\batchinput{ifpdf.dtx} +\batchinput{ifpdf.dtx} \batchinput{ifvtex.dtx} \batchinput{infwarerr.dtx} \batchinput{inputenx.dtx} diff --git a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds-eroux.patch b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds-eroux.patch deleted file mode 100644 index 671dfb5b6b3..00000000000 --- a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds-eroux.patch +++ /dev/null @@ -1,77 +0,0 @@ -Index: pdftexcmds.lua -=================================================================== ---- pdftexcmds.lua (revision 30140) -+++ pdftexcmds.lua (working copy) -@@ -6,12 +6,12 @@ - -- - -- pdftexcmds.dtx (with options: `lua') - -- ---- This is a generated file. -+-- This (was) a generated file. - -- - -- Project: pdftexcmds ---- Version: 2011/11/29 v0.20 -+-- Version: 2013/04/28 v0.20-eroux - -- ---- Copyright (C) 2007, 2009-2011 by -+-- Copyright (C) 2007, 2009-2011, 2013 by - -- Heiko Oberdiek <heiko.oberdiek at googlemail.com> - -- - -- This work may be distributed and/or modified under the -@@ -42,6 +42,8 @@ - local systemexitstatus - function getversion() - tex.write("2011/11/29 v0.20") -+ -- could not change above version string due to runtime version checks. -+ -- eroux/karl, 28apr13 - end - function strcmp(A, B) - if A == B then -@@ -150,6 +152,9 @@ - end - result = utf8 - end -+ -- this next line added for current luatex; this is the only -+ -- change in the file. eroux, 28apr13. -+ local unpack = _G["unpack"] or table.unpack - tex.settoks(toks, string.char(unpack(result))) - end - function escapestring(str, mode) -Index: oberdiek.luatex.lua -=================================================================== ---- oberdiek.luatex.lua (revision 30140) -+++ oberdiek.luatex.lua (working copy) -@@ -6,12 +6,12 @@ - -- - -- luatex.dtx (with options: `lua') - -- ---- This is a generated file. -+-- This (was) a generated file. - -- - -- Project: luatex ---- Version: 2010/03/09 v0.4 -+-- Version: 2013/04/28 v0.4-roux - -- ---- Copyright (C) 2007, 2009, 2010 by -+-- Copyright (C) 2007, 2009, 2010, 2013 by - -- Heiko Oberdiek <heiko.oberdiek at googlemail.com> - -- - -- This work may be distributed and/or modified under the -@@ -47,11 +47,14 @@ - texio.write_nl("(" .. file .. ")") - return loader - end -- return "\n\t[oberdiek.luatex.kpse_module_loader] Loading error:\n\t" -+ return "\n\t[oberdiek.luatex.kpse_module_loader]-eroux Loading error:\n\t" - .. error - end -- return "\n\t[oberdiek.luatex.kpse_module_loader] Search failed" -+ return "\n\t[oberdiek.luatex.kpse_module_loader]-eroux Search failed" - end --table.insert(package.loaders, kpse_module_loader) -+-- following line changed to use package.searchers instead of -+-- package.loaders for current luatex; this is the only change in the -+-- code. eroux, 28apr13. -+table.insert(package.searchers, kpse_module_loader) - -- - -- End of File `oberdiek.luatex.lua'. diff --git a/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx b/Master/texmf-dist/source/latex/oberdiek/pdftexcmds.dtx index 455f5b95d17..2e775889f46 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: 2011/11/29 v0.20 +% Version: 2016/05/10 v0.21 % 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 2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)} +\Msg{* Package: pdftexcmds 2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)} \Msg{************************************************************************} \keepsilent @@ -100,7 +100,7 @@ This is a generated file. Project: pdftexcmds -Version: 2011/11/29 v0.20 +Version: 2016/05/10 v0.21 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}% - [2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)]% + [2016/05/10 v0.21 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{2011/11/29 v0.20} +% \date{2016/05/10 v0.21} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -615,7 +615,7 @@ and the derived files \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO)]% + [2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)]% % \end{macrocode} % % \subsection{Catcodes} @@ -1153,7 +1153,7 @@ and the derived files \fi \fi \begingroup - \def\x{2011/11/29 v0.20}% + \def\x{2016/05/10 v0.21}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -1560,7 +1560,7 @@ and the derived files module("oberdiek.pdftexcmds", package.seeall) local systemexitstatus function getversion() - tex.write("2011/11/29 v0.20") + tex.write("2016/05/10 v0.21") end % \end{macrocode} % @@ -1678,6 +1678,11 @@ function unescapehex(str, mode, patch) end result = utf8 end +% \end{macrocode} +% this next line added for current luatex; this is the only +% 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))) end % \end{macrocode} @@ -2653,6 +2658,11 @@ end % \cs{pdf@resettimer} and \cs{pdf@elapsedtime} added % (thanks Andy Thomas). % \end{Version} +% \begin{Version}{2016/05/10 v0.21} +% \item +% local unpack added +% (thanks \'{E}lie Roux). +% \end{Version} % \end{History} % % \PrintIndex |