summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oberdiek
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-22 23:36:31 +0000
committerKarl Berry <karl@freefriends.org>2011-04-22 23:36:31 +0000
commitcd62c624e149e4c29e0e7aa29c016ae8b45cf086 (patch)
tree1279b8e45d65cd3fd93975997a8d3db844722b28 /Master/texmf-dist/tex/latex/oberdiek
parent2be6eaeb8090315538ca23046d0fbc8ffce6acdd (diff)
oberdiek (22apr11)
git-svn-id: svn://tug.org/texlive/trunk@22162 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek')
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def4
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def69
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def69
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def69
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def69
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def4
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bookmark.sty13
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/luacolor.sty15
8 files changed, 284 insertions, 28 deletions
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 <heiko.oberdiek at googlemail.com>
@@ -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 <heiko.oberdiek at googlemail.com>
@@ -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 <heiko.oberdiek at googlemail.com>
@@ -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 <heiko.oberdiek at googlemail.com>
@@ -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 <heiko.oberdiek at googlemail.com>
@@ -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 <heiko.oberdiek at googlemail.com>
@@ -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 <heiko.oberdiek at googlemail.com>
@@ -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 <heiko.oberdiek at googlemail.com>
@@ -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
}