From cd62c624e149e4c29e0e7aa29c016ae8b45cf086 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 22 Apr 2011 23:36:31 +0000 Subject: oberdiek (22apr11) git-svn-id: svn://tug.org/texlive/trunk@22162 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/oberdiek/hobsub-generic.sty | 6 +- .../generic/oberdiek/hologo-test-spacefactor.tex | 94 -------------- .../tex/generic/oberdiek/hologo-test1.tex | 138 --------------------- Master/texmf-dist/tex/generic/oberdiek/hologo.sty | 4 +- .../texmf-dist/tex/generic/oberdiek/pdftexcmds.sty | 8 +- .../texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def | 4 +- Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def | 69 ++++++++++- .../texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def | 69 ++++++++++- .../texmf-dist/tex/latex/oberdiek/bkm-pdftex.def | 69 ++++++++++- .../texmf-dist/tex/latex/oberdiek/bkm-textures.def | 69 ++++++++++- Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def | 4 +- Master/texmf-dist/tex/latex/oberdiek/bookmark.sty | 13 +- Master/texmf-dist/tex/latex/oberdiek/luacolor.sty | 15 ++- 13 files changed, 293 insertions(+), 269 deletions(-) delete mode 100644 Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex delete mode 100644 Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty index a8beaaa9b3d..6263e7cdda1 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty @@ -4571,7 +4571,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2011/04/16 v0.15 Utilities of pdfTeX for LuaTeX (HO)]% + [2011/04/22 v0.16 Utilities of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -4945,7 +4945,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax require("oberdiek.pdftexcmds")% } \begingroup -\def\x{2011/04/16 v0.15}% +\def\x{2011/04/22 v0.16}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -5092,7 +5092,7 @@ $ \expandafter\ifx\csname KV@#1@#2@default\endcsname\relax oberdiek.pdftexcmds.filemdfivesum("\luaescapestring{#1}")% }% }% -\ifnum\luatexversion<70 % +\ifnum\luatexversion<68 % \else \def\pdf@shellescape{% \directlua0{% diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex b/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex deleted file mode 100644 index eeba78be973..00000000000 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex +++ /dev/null @@ -1,94 +0,0 @@ -%% -%% This is file `hologo-test-spacefactor.tex', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% hologo.dtx (with options: `test-spacefactor') -%% -%% This is a generated file. -%% -%% Project: hologo -%% Version: 2011/03/25 v1.4 -%% -%% Copyright (C) 2010, 2011 by -%% Heiko Oberdiek -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either -%% version 1.3c of this license or (at your option) any later -%% version. This version of this license is in -%% http://www.latex-project.org/lppl/lppl-1-3c.txt -%% and the latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of -%% LaTeX version 2005/12/01 or later. -%% -%% This work has the LPPL maintenance status "maintained". -%% -%% This Current Maintainer of this work is Heiko Oberdiek. -%% -%% The Base Interpreter refers to any `TeX-Format', -%% because some files are installed in TDS:tex/generic//. -%% -%% This work consists of the main source file hologo.dtx -%% and the derived files -%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex, -%% hologo-test-spacefactor.tex. -%% -\NeedsTeXFormat{LaTeX2e} -\documentclass{article} -\usepackage{hologo}[2011/03/25] -\usepackage{kvsetkeys} -\usepackage{qstest} -\IncludeTests{*} -\LogTests{log}{*}{*} -\begin{document} -\begin{qstest}{spacefactor}{spacefactor} -\newcommand*{\Test}[1]{% - \sbox0{% - \hologo{#1}% - \Expect*{1000 (#1)}*{\the\spacefactor\space(#1)}% - }% -}% -\makeatletter -\kv@parse@normalized{% - AmSLaTeX,% - AmSTeX,% - eTeX,% - iniTeX,% - LaTeX,% - LaTeX2e,% - LaTeX3,% - LaTeXe,% - LuaLaTeX,% - LuaTeX,% - pdfTeX,% - pdfLaTeX,% - plainTeX=,% - plainTeX={variant=space},% - plainTeX={variant=hyphen},% - plainTeX={variant=runtogether},% - TeX,% - virTeX,% - VTeX,% - XeLaTeX,% - XeTeX,% -}{% - \begingroup - \let\@logo=\kv@key - \ifx\kv@value\relax - \else - \expandafter\hologoLogoSetup\expandafter\@logo\expandafter{% - \kv@value - }% - \fi - \Test\@logo - \endgroup - \@gobbletwo -} -\end{qstest} -\end{document} -\endinput -%% -%% End of file `hologo-test-spacefactor.tex'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex b/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex deleted file mode 100644 index 7b5b5714c3f..00000000000 --- a/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex +++ /dev/null @@ -1,138 +0,0 @@ -%% -%% This is file `hologo-test1.tex', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% hologo.dtx (with options: `test1') -%% -%% This is a generated file. -%% -%% Project: hologo -%% Version: 2011/03/25 v1.4 -%% -%% Copyright (C) 2010, 2011 by -%% Heiko Oberdiek -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either -%% version 1.3c of this license or (at your option) any later -%% version. This version of this license is in -%% http://www.latex-project.org/lppl/lppl-1-3c.txt -%% and the latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of -%% LaTeX version 2005/12/01 or later. -%% -%% This work has the LPPL maintenance status "maintained". -%% -%% This Current Maintainer of this work is Heiko Oberdiek. -%% -%% The Base Interpreter refers to any `TeX-Format', -%% because some files are installed in TDS:tex/generic//. -%% -%% This work consists of the main source file hologo.dtx -%% and the derived files -%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex, -%% hologo-test-spacefactor.tex. -%% -\catcode`\{=1 % -\catcode`\}=2 % -\catcode`\#=6 % -\catcode`\@=11 % -\expandafter\ifx\csname count@\endcsname\relax - \countdef\count@=255 % -\fi -\expandafter\ifx\csname @gobble\endcsname\relax - \long\def\@gobble#1{}% -\fi -\expandafter\ifx\csname @firstofone\endcsname\relax - \long\def\@firstofone#1{#1}% -\fi -\expandafter\ifx\csname loop\endcsname\relax - \expandafter\@firstofone -\else - \expandafter\@gobble -\fi -{% - \def\loop#1\repeat{% - \def\body{#1}% - \iterate - }% - \def\iterate{% - \body - \let\next\iterate - \else - \let\next\relax - \fi - \next - }% - \let\repeat=\fi -}% -\def\RestoreCatcodes{} -\count@=0 % -\loop - \edef\RestoreCatcodes{% - \RestoreCatcodes - \catcode\the\count@=\the\catcode\count@\relax - }% -\ifnum\count@<255 % - \advance\count@ 1 % -\repeat - -\def\RangeCatcodeInvalid#1#2{% - \count@=#1\relax - \loop - \catcode\count@=15 % - \ifnum\count@<#2\relax - \advance\count@ 1 % - \repeat -} -\def\RangeCatcodeCheck#1#2#3{% - \count@=#1\relax - \loop - \ifnum#3=\catcode\count@ - \else - \errmessage{% - Character \the\count@\space - with wrong catcode \the\catcode\count@\space - instead of \number#3% - }% - \fi - \ifnum\count@<#2\relax - \advance\count@ 1 % - \repeat -} -\def\space{ } -\expandafter\ifx\csname LoadCommand\endcsname\relax - \def\LoadCommand{\input hologo.sty\relax}% -\fi -\def\Test{% - \RangeCatcodeInvalid{0}{47}% - \RangeCatcodeInvalid{58}{64}% - \RangeCatcodeInvalid{91}{96}% - \RangeCatcodeInvalid{123}{255}% - \catcode`\@=12 % - \catcode`\\=0 % - \catcode`\%=14 % - \LoadCommand - \RangeCatcodeCheck{0}{36}{15}% - \RangeCatcodeCheck{37}{37}{14}% - \RangeCatcodeCheck{38}{47}{15}% - \RangeCatcodeCheck{48}{57}{12}% - \RangeCatcodeCheck{58}{63}{15}% - \RangeCatcodeCheck{64}{64}{12}% - \RangeCatcodeCheck{65}{90}{11}% - \RangeCatcodeCheck{91}{91}{15}% - \RangeCatcodeCheck{92}{92}{0}% - \RangeCatcodeCheck{93}{96}{15}% - \RangeCatcodeCheck{97}{122}{11}% - \RangeCatcodeCheck{123}{255}{15}% - \RestoreCatcodes -} -\Test -\csname @@end\endcsname -\end -\endinput -%% -%% End of file `hologo-test1.tex'. diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty index c17673c2368..e582816df51 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: 2011/03/25 v1.4 +%% Version: 2011/04/21 v1.5 %% %% Copyright (C) 2010, 2011 by %% Heiko Oberdiek @@ -102,7 +102,7 @@ \fi \expandafter\x\csname ver@hologo.sty\endcsname \ProvidesPackage{hologo}% - [2011/03/25 v1.4 Logo collection (HO)]% + [2011/04/21 v1.5 Logo collection (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % diff --git a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty index 00653ad9a94..8d9895d56c7 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/pdftexcmds.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: pdftexcmds -%% Version: 2011/04/16 v0.15 +%% Version: 2011/04/22 v0.16 %% %% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek @@ -104,7 +104,7 @@ \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2011/04/16 v0.15 Utilities of pdfTeX for LuaTeX (HO)]% + [2011/04/22 v0.16 Utilities of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -478,7 +478,7 @@ require("oberdiek.pdftexcmds")% } \begingroup - \def\x{2011/04/16 v0.15}% + \def\x{2011/04/22 v0.16}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -625,7 +625,7 @@ oberdiek.pdftexcmds.filemdfivesum("\luaescapestring{#1}")% }% }% -\ifnum\luatexversion<70 % +\ifnum\luatexversion<68 % \else \def\pdf@shellescape{% \directlua0{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def index 23e69e33310..8372861da61 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/13 v1.20 +%% Version: 2011/04/21 v1.21 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipdfm.def}% - [2011/04/13 v1.20 bookmark driver for dvipdfm (HO)]% + [2011/04/21 v1.21 bookmark driver for dvipdfm (HO)]% \newcount\BKM@id \BKM@id=\z@ \@namedef{BKM@0}{000} diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def index d6dfacc44d2..e68d7ef7e2f 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/13 v1.20 +%% Version: 2011/04/21 v1.21 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek @@ -35,9 +35,26 @@ %% bkm-textures.def, bkm-pdftex.def, bkm-vtex.def, %% bookmark-example.tex. %% +\def\BKM@SourceLocation{% + \ifx\BKM@DO@srcfile\@empty + \ifx\BKM@DO@srcline\@empty + \else + .\MessageBreak + Source: line \BKM@DO@srcline + \fi + \else + \ifx\BKM@DO@srcline\@empty + .\MessageBreak + Source: file `\BKM@DO@srcfile'% + \else + .\MessageBreak + Source: file `\BKM@DO@srcfile', line \BKM@DO@srcline + \fi + \fi +} \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvips.def}% - [2011/04/13 v1.20 bookmark driver for dvips (HO)]% + [2011/04/21 v1.21 bookmark driver for dvips (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } @@ -69,6 +86,10 @@ \def\BKM@DO@entry#1#2{% \begingroup \kvsetkeys{BKM@DO}{#1}% + \ifx\BKM@DO@srcfile\@empty + \else + \BKM@UnescapeHex\BKM@DO@srcfile + \fi \def\BKM@DO@title{#2}% \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx @@ -89,7 +110,9 @@ \ifx\BKM@DO@rawaction\@empty \ifx\BKM@DO@uri\@empty \ifx\BKM@DO@page\@empty - \PackageError{bookmark}{Missing action}\@ehc + \PackageError{bookmark}{% + Missing action\BKM@SourceLocation + }\@ehc \edef\BKM@action{% /Action/GoTo% /Page 1% @@ -191,8 +214,13 @@ \newcommand*{\bookmark}[2][]{% \if@filesw \begingroup + \BKM@InitSourceLocation \def\bookmark@text{#2}% \BKM@setup{#1}% + \ifx\BKM@srcfile\@empty + \else + \BKM@EscapeHex\BKM@srcfile + \fi \edef\BKM@prev{\the\BKM@id}% \global\advance\BKM@id\@ne \BKM@swtrue @@ -249,6 +277,8 @@ \ifnum\BKM@FLAGS>\z@ ,flags=\BKM@FLAGS \fi + \BKM@auxentry{srcline}% + \BKM@auxentry{srcfile}% }{\BKM@title}% }% \endgroup @@ -265,6 +295,37 @@ ,#1={\csname BKM@#1\endcsname}% \fi } +\def\BKM@InitSourceLocation{% + \edef\BKM@srcline{\the\inputlineno}% + \BKM@LuaTeX@InitFile + \ifx\BKM@srcfile\@empty + \ltx@IfUndefined{currfilepath}{}{% + \edef\BKM@srcfile{\currfilepath}% + }% + \fi +} +\ifluatex + \ifnum\luatexversion>36 % + \def\BKM@LuaTeX@InitFile{% + \begingroup + \ltx@LocToksA={}% + \edef\x{\endgroup + \def\noexpand\BKM@srcfile{% + \the\expandafter\ltx@LocToksA + \directlua{% + if status and status.filename then % + tex.settoks('ltx@LocToksA', status.filename)% + end% + }% + }% + }\x + }% + \else + \let\BKM@LuaTeX@InitFile\relax + \fi +\else + \let\BKM@LuaTeX@InitFile\relax +\fi \SetupKeyvalOptions{family=BKM@DO,prefix=BKM@DO@} \DeclareStringOption[0]{id} \DeclareBoolOption{open} @@ -277,6 +338,8 @@ \DeclareStringOption{page} \DeclareStringOption{view} \DeclareStringOption{rawaction} +\DeclareStringOption{srcline} +\DeclareStringOption{srcfile} \AtBeginDocument{% \let\BKM@entry\BKM@DO@entry } diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def index 45ed3d2efb7..051ba32822d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/13 v1.20 +%% Version: 2011/04/21 v1.21 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek @@ -35,9 +35,26 @@ %% bkm-textures.def, bkm-pdftex.def, bkm-vtex.def, %% bookmark-example.tex. %% +\def\BKM@SourceLocation{% + \ifx\BKM@DO@srcfile\@empty + \ifx\BKM@DO@srcline\@empty + \else + .\MessageBreak + Source: line \BKM@DO@srcline + \fi + \else + \ifx\BKM@DO@srcline\@empty + .\MessageBreak + Source: file `\BKM@DO@srcfile'% + \else + .\MessageBreak + Source: file `\BKM@DO@srcfile', line \BKM@DO@srcline + \fi + \fi +} \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipsone.def}% - [2011/04/13 v1.20 bookmark driver for dvipsone (HO)]% + [2011/04/21 v1.21 bookmark driver for dvipsone (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } @@ -69,6 +86,10 @@ \def\BKM@DO@entry#1#2{% \begingroup \kvsetkeys{BKM@DO}{#1}% + \ifx\BKM@DO@srcfile\@empty + \else + \BKM@UnescapeHex\BKM@DO@srcfile + \fi \def\BKM@DO@title{#2}% \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx @@ -89,7 +110,9 @@ \ifx\BKM@DO@rawaction\@empty \ifx\BKM@DO@uri\@empty \ifx\BKM@DO@page\@empty - \PackageError{bookmark}{Missing action}\@ehc + \PackageError{bookmark}{% + Missing action\BKM@SourceLocation + }\@ehc \edef\BKM@action{% /Action/GoTo% /Page 1% @@ -191,8 +214,13 @@ \newcommand*{\bookmark}[2][]{% \if@filesw \begingroup + \BKM@InitSourceLocation \def\bookmark@text{#2}% \BKM@setup{#1}% + \ifx\BKM@srcfile\@empty + \else + \BKM@EscapeHex\BKM@srcfile + \fi \edef\BKM@prev{\the\BKM@id}% \global\advance\BKM@id\@ne \BKM@swtrue @@ -249,6 +277,8 @@ \ifnum\BKM@FLAGS>\z@ ,flags=\BKM@FLAGS \fi + \BKM@auxentry{srcline}% + \BKM@auxentry{srcfile}% }{\BKM@title}% }% \endgroup @@ -265,6 +295,37 @@ ,#1={\csname BKM@#1\endcsname}% \fi } +\def\BKM@InitSourceLocation{% + \edef\BKM@srcline{\the\inputlineno}% + \BKM@LuaTeX@InitFile + \ifx\BKM@srcfile\@empty + \ltx@IfUndefined{currfilepath}{}{% + \edef\BKM@srcfile{\currfilepath}% + }% + \fi +} +\ifluatex + \ifnum\luatexversion>36 % + \def\BKM@LuaTeX@InitFile{% + \begingroup + \ltx@LocToksA={}% + \edef\x{\endgroup + \def\noexpand\BKM@srcfile{% + \the\expandafter\ltx@LocToksA + \directlua{% + if status and status.filename then % + tex.settoks('ltx@LocToksA', status.filename)% + end% + }% + }% + }\x + }% + \else + \let\BKM@LuaTeX@InitFile\relax + \fi +\else + \let\BKM@LuaTeX@InitFile\relax +\fi \SetupKeyvalOptions{family=BKM@DO,prefix=BKM@DO@} \DeclareStringOption[0]{id} \DeclareBoolOption{open} @@ -277,6 +338,8 @@ \DeclareStringOption{page} \DeclareStringOption{view} \DeclareStringOption{rawaction} +\DeclareStringOption{srcline} +\DeclareStringOption{srcfile} \AtBeginDocument{% \let\BKM@entry\BKM@DO@entry } diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def index ae67cb5507e..b410a35f099 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/13 v1.20 +%% Version: 2011/04/21 v1.21 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek @@ -37,11 +37,15 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-pdftex.def}% - [2011/04/13 v1.20 bookmark driver for pdfTeX (HO)]% + [2011/04/21 v1.21 bookmark driver for pdfTeX (HO)]% \def\BKM@DO@entry#1#2{% \begingroup \kvsetkeys{BKM@DO}{#1}% \def\BKM@DO@title{#2}% + \ifx\BKM@DO@srcfile\@empty + \else + \BKM@UnescapeHex\BKM@DO@srcfile + \fi \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx \csname BKM@\BKM@DO@id\endcsname\@empty\@empty @@ -65,7 +69,9 @@ \ifx\BKM@DO@rawaction\@empty \ifx\BKM@DO@uri\@empty \ifx\BKM@DO@page\@empty - \PackageError{bookmark}{Missing action}\@ehc + \PackageError{bookmark}{% + Missing action\BKM@SourceLocation + }\@ehc \edef\BKM@action{goto page1{/Fit}}% \else \ifx\BKM@DO@view\@empty @@ -135,6 +141,23 @@ \BKM@EscapeString\BKM@DO@dest \edef#1{goto name{#2}}% } +\def\BKM@SourceLocation{% + \ifx\BKM@DO@srcfile\@empty + \ifx\BKM@DO@srcline\@empty + \else + .\MessageBreak + Source: line \BKM@DO@srcline + \fi + \else + \ifx\BKM@DO@srcline\@empty + .\MessageBreak + Source: file `\BKM@DO@srcfile'% + \else + .\MessageBreak + Source: file `\BKM@DO@srcfile', line \BKM@DO@srcline + \fi + \fi +} \RequirePackage{auxhook} \AddLineBeginMainAux{% \string\providecommand\string\BKM@entry[2]{}% @@ -146,8 +169,13 @@ \newcommand*{\bookmark}[2][]{% \if@filesw \begingroup + \BKM@InitSourceLocation \def\bookmark@text{#2}% \BKM@setup{#1}% + \ifx\BKM@srcfile\@empty + \else + \BKM@EscapeHex\BKM@srcfile + \fi \edef\BKM@prev{\the\BKM@id}% \global\advance\BKM@id\@ne \BKM@swtrue @@ -204,6 +232,8 @@ \ifnum\BKM@FLAGS>\z@ ,flags=\BKM@FLAGS \fi + \BKM@auxentry{srcline}% + \BKM@auxentry{srcfile}% }{\BKM@title}% }% \endgroup @@ -220,6 +250,37 @@ ,#1={\csname BKM@#1\endcsname}% \fi } +\def\BKM@InitSourceLocation{% + \edef\BKM@srcline{\the\inputlineno}% + \BKM@LuaTeX@InitFile + \ifx\BKM@srcfile\@empty + \ltx@IfUndefined{currfilepath}{}{% + \edef\BKM@srcfile{\currfilepath}% + }% + \fi +} +\ifluatex + \ifnum\luatexversion>36 % + \def\BKM@LuaTeX@InitFile{% + \begingroup + \ltx@LocToksA={}% + \edef\x{\endgroup + \def\noexpand\BKM@srcfile{% + \the\expandafter\ltx@LocToksA + \directlua{% + if status and status.filename then % + tex.settoks('ltx@LocToksA', status.filename)% + end% + }% + }% + }\x + }% + \else + \let\BKM@LuaTeX@InitFile\relax + \fi +\else + \let\BKM@LuaTeX@InitFile\relax +\fi \SetupKeyvalOptions{family=BKM@DO,prefix=BKM@DO@} \DeclareStringOption[0]{id} \DeclareBoolOption{open} @@ -232,6 +293,8 @@ \DeclareStringOption{page} \DeclareStringOption{view} \DeclareStringOption{rawaction} +\DeclareStringOption{srcline} +\DeclareStringOption{srcfile} \AtBeginDocument{% \let\BKM@entry\BKM@DO@entry } diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def index 1beb1cd288f..8638f461210 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/13 v1.20 +%% Version: 2011/04/21 v1.21 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek @@ -35,9 +35,26 @@ %% bkm-textures.def, bkm-pdftex.def, bkm-vtex.def, %% bookmark-example.tex. %% +\def\BKM@SourceLocation{% + \ifx\BKM@DO@srcfile\@empty + \ifx\BKM@DO@srcline\@empty + \else + .\MessageBreak + Source: line \BKM@DO@srcline + \fi + \else + \ifx\BKM@DO@srcline\@empty + .\MessageBreak + Source: file `\BKM@DO@srcfile'% + \else + .\MessageBreak + Source: file `\BKM@DO@srcfile', line \BKM@DO@srcline + \fi + \fi +} \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-textures.def}% - [2011/04/13 v1.20 bookmark driver for textures (HO)]% + [2011/04/21 v1.21 bookmark driver for textures (HO)]% \def\BKM@PSHeaderFile#1{% \special{prePostScriptfile #1}% } @@ -69,6 +86,10 @@ \def\BKM@DO@entry#1#2{% \begingroup \kvsetkeys{BKM@DO}{#1}% + \ifx\BKM@DO@srcfile\@empty + \else + \BKM@UnescapeHex\BKM@DO@srcfile + \fi \def\BKM@DO@title{#2}% \BKM@UnescapeHex\BKM@DO@title \expandafter\expandafter\expandafter\BKM@getx @@ -89,7 +110,9 @@ \ifx\BKM@DO@rawaction\@empty \ifx\BKM@DO@uri\@empty \ifx\BKM@DO@page\@empty - \PackageError{bookmark}{Missing action}\@ehc + \PackageError{bookmark}{% + Missing action\BKM@SourceLocation + }\@ehc \edef\BKM@action{% /Action/GoTo% /Page 1% @@ -191,8 +214,13 @@ \newcommand*{\bookmark}[2][]{% \if@filesw \begingroup + \BKM@InitSourceLocation \def\bookmark@text{#2}% \BKM@setup{#1}% + \ifx\BKM@srcfile\@empty + \else + \BKM@EscapeHex\BKM@srcfile + \fi \edef\BKM@prev{\the\BKM@id}% \global\advance\BKM@id\@ne \BKM@swtrue @@ -249,6 +277,8 @@ \ifnum\BKM@FLAGS>\z@ ,flags=\BKM@FLAGS \fi + \BKM@auxentry{srcline}% + \BKM@auxentry{srcfile}% }{\BKM@title}% }% \endgroup @@ -265,6 +295,37 @@ ,#1={\csname BKM@#1\endcsname}% \fi } +\def\BKM@InitSourceLocation{% + \edef\BKM@srcline{\the\inputlineno}% + \BKM@LuaTeX@InitFile + \ifx\BKM@srcfile\@empty + \ltx@IfUndefined{currfilepath}{}{% + \edef\BKM@srcfile{\currfilepath}% + }% + \fi +} +\ifluatex + \ifnum\luatexversion>36 % + \def\BKM@LuaTeX@InitFile{% + \begingroup + \ltx@LocToksA={}% + \edef\x{\endgroup + \def\noexpand\BKM@srcfile{% + \the\expandafter\ltx@LocToksA + \directlua{% + if status and status.filename then % + tex.settoks('ltx@LocToksA', status.filename)% + end% + }% + }% + }\x + }% + \else + \let\BKM@LuaTeX@InitFile\relax + \fi +\else + \let\BKM@LuaTeX@InitFile\relax +\fi \SetupKeyvalOptions{family=BKM@DO,prefix=BKM@DO@} \DeclareStringOption[0]{id} \DeclareBoolOption{open} @@ -277,6 +338,8 @@ \DeclareStringOption{page} \DeclareStringOption{view} \DeclareStringOption{rawaction} +\DeclareStringOption{srcline} +\DeclareStringOption{srcfile} \AtBeginDocument{% \let\BKM@entry\BKM@DO@entry } diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def index 616007520ca..4b909a50fac 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/13 v1.20 +%% Version: 2011/04/21 v1.21 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-vtex.def}% - [2011/04/13 v1.20 bookmark driver for VTeX (HO)]% + [2011/04/21 v1.21 bookmark driver for VTeX (HO)]% \ifvtexpdf \else \PackageWarningNoLine{bookmark}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty index 5d41e049926..0901af76fe9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: bookmark -%% Version: 2011/04/13 v1.20 +%% Version: 2011/04/21 v1.21 %% %% Copyright (C) 2007-2011 by %% Heiko Oberdiek @@ -37,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bookmark}% - [2011/04/13 v1.20 PDF bookmarks (HO)]% + [2011/04/21 v1.21 PDF bookmarks (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname numexpr\endcsname\relax \def\BKM@CalcExpr#1#2#3#4{% @@ -81,14 +81,15 @@ \RequirePackage{ifpdf}[2009/04/10] \RequirePackage{ifxetex} \RequirePackage{ifvtex}[2008/11/04] +\RequirePackage{ifluatex}[2010/03/01] \RequirePackage{pdftexcmds}[2010/11/04] \RequirePackage{hyperref}[2010/06/18] \RequirePackage{auxhook}[2007/04/06] \RequirePackage{kvsetkeys}[2010/03/01] \RequirePackage{kvoptions}[2009/08/13] \RequirePackage{hycolor}[2008/09/08] -\RequirePackage{bitset} -\RequirePackage{ltxcmds}[2010/04/08] +\RequirePackage{bitset}[2011/01/30] +\RequirePackage{ltxcmds}[2011/04/14] \SetupKeyvalOptions{family=BKM,prefix=BKM@} \DeclareLocalOptions{% atend,% @@ -109,6 +110,8 @@ page,% rawaction,% rellevel,% + srcfile,% + srcline,% startatroot,% uri,% view,% @@ -550,6 +553,8 @@ \fi } \def\BKM@StyleStack{} +\DeclareStringOption{srcline} +\DeclareStringOption{srcfile} \def\BKM@hook{} \define@key{BKM}{addtohook}{% \ltx@LocalAppendToMacro\BKM@hook{#1}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty index dcec8eecb1e..ba8ef1d35e2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% %% Project: luacolor -%% Version: 2011/03/29 v1.4 +%% Version: 2011/04/22 v1.5 %% %% Copyright (C) 2007, 2009-2011 by %% Heiko Oberdiek @@ -87,11 +87,11 @@ \edef\LuaCol@AtEnd{\LuaCol@AtEnd\noexpand\endinput} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luacolor}% - [2011/03/29 v1.4 Coloring based on LuaTeX's node attributes (HO)] -\RequirePackage{infwarerr}[2007/09/09]% -\RequirePackage{ifluatex}[2009/04/10]% -\RequirePackage{ifpdf}[2010/01/28]% -\RequirePackage{ltxcmds}[2010/04/26]% + [2011/04/22 v1.5 Coloring based on LuaTeX's node attributes (HO)] +\RequirePackage{infwarerr}[2010/04/08]% +\RequirePackage{ifluatex}[2010/03/01]% +\RequirePackage{ifpdf}[2011/01/30]% +\RequirePackage{ltxcmds}[2011/04/18]% \RequirePackage{color} \ifluatex \ltx@ifpackageloaded{luatexbase-attr}{% @@ -123,7 +123,6 @@ \LuaCol@directlua{% require("oberdiek.luacolor\ifnum\luatexversion<65 -pre065\fi")% } -\RequirePackage{ifpdf}[2007/09/09] \ifpdf \else \begingroup @@ -179,7 +178,7 @@ oberdiek.luacolor.process(\number#1)% }% } -\RequirePackage{atbegshi}[2007/09/09] +\RequirePackage{atbegshi}[2011/01/30] \AtBeginShipout{% \luacolorProcessBox\AtBeginShipoutBox } -- cgit v1.2.3