From 90a0248cdfcfb319a340ecb87aad0d24aae44687 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Apr 2010 23:05:33 +0000 Subject: oberdiek update (2apr10) git-svn-id: svn://tug.org/texlive/trunk@17668 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def | 13 +- Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def | 13 +- .../texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def | 13 +- .../texmf-dist/tex/latex/oberdiek/bkm-pdftex.def | 13 +- .../texmf-dist/tex/latex/oberdiek/bkm-textures.def | 13 +- Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def | 13 +- Master/texmf-dist/tex/latex/oberdiek/bookmark.sty | 138 ++++++++++++++++++--- Master/texmf-dist/tex/latex/oberdiek/centernot.sty | 4 +- .../texmf-dist/tex/latex/oberdiek/zref-abspage.sty | 17 +-- Master/texmf-dist/tex/latex/oberdiek/zref-base.sty | 36 +++--- .../texmf-dist/tex/latex/oberdiek/zref-counter.sty | 17 +-- .../texmf-dist/tex/latex/oberdiek/zref-dotfill.sty | 19 +-- .../tex/latex/oberdiek/zref-hyperref.sty | 17 +-- .../tex/latex/oberdiek/zref-lastpage.sty | 19 +-- .../texmf-dist/tex/latex/oberdiek/zref-marks.sty | 131 +++++++++++++++++++ .../tex/latex/oberdiek/zref-nextpage.sty | 23 ++-- .../texmf-dist/tex/latex/oberdiek/zref-perpage.sty | 19 +-- Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty | 15 +-- .../texmf-dist/tex/latex/oberdiek/zref-savepos.sty | 21 ++-- .../texmf-dist/tex/latex/oberdiek/zref-thepage.sty | 19 +-- .../tex/latex/oberdiek/zref-titleref.sty | 17 +-- .../tex/latex/oberdiek/zref-totpages.sty | 21 ++-- Master/texmf-dist/tex/latex/oberdiek/zref-user.sty | 17 +-- Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty | 17 +-- Master/texmf-dist/tex/latex/oberdiek/zref.sty | 19 +-- 25 files changed, 448 insertions(+), 216 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty (limited to 'Master/texmf-dist/tex/latex/oberdiek') diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def index aa50299a50a..38719d16b86 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2009 by +%% Copyright (C) 2007-2010 by %% Heiko Oberdiek %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipdfm.def}% - [2009/12/17 v1.8 bookmark driver for dvipdfm (HO)]% + [2010/04/03 v1.10 bookmark driver for dvipdfm (HO)]% \newcount\BKM@id \BKM@id=\z@ \def\BKM@0{000} @@ -42,11 +42,8 @@ \newcommand*{\bookmark}[2][]{% \if@filesw \begingroup - \bookmarksetup{#1}% - \ifBKM@keeplevel - \else - \xdef\BKM@currentlevel{\BKM@level}% - \fi + \def\bookmark@text{#2}% + \BKM@setup{#1}% \edef\BKM@prev{\the\BKM@id}% \global\advance\BKM@id\@ne \BKM@swtrue @@ -73,7 +70,7 @@ \fi }% \csname HyPsd@XeTeXBigCharstrue\endcsname - \pdfstringdef\BKM@title{#2}% + \pdfstringdef\BKM@title{\bookmark@text}% \edef\BKM@FLAGS{\BKM@PrintStyle}% \let\BKM@action\@empty \ifx\BKM@gotor\@empty diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def index 20accf354b7..aafef108eac 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2009 by +%% Copyright (C) 2007-2010 by %% Heiko Oberdiek %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvips.def}% - [2009/12/17 v1.8 bookmark driver for dvips (HO)]% + [2010/04/03 v1.10 bookmark driver for dvips (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } @@ -188,11 +188,8 @@ \newcommand*{\bookmark}[2][]{% \if@filesw \begingroup - \bookmarksetup{#1}% - \ifBKM@keeplevel - \else - \xdef\BKM@currentlevel{\BKM@level}% - \fi + \def\bookmark@text{#2}% + \BKM@setup{#1}% \edef\BKM@prev{\the\BKM@id}% \global\advance\BKM@id\@ne \BKM@swtrue @@ -222,7 +219,7 @@ \fi \fi }% - \pdfstringdef\BKM@title{#2}% + \pdfstringdef\BKM@title{\bookmark@text}% \edef\BKM@FLAGS{\BKM@PrintStyle}% \csname BKM@HypDestOptHook\endcsname \BKM@EscapeHex\BKM@dest diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def index 6cd39ba05a3..109971305b2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2009 by +%% Copyright (C) 2007-2010 by %% Heiko Oberdiek %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-dvipsone.def}% - [2009/12/17 v1.8 bookmark driver for dvipsone (HO)]% + [2010/04/03 v1.10 bookmark driver for dvipsone (HO)]% \def\BKM@PSHeaderFile#1{% \special{header=#1}% } @@ -188,11 +188,8 @@ \newcommand*{\bookmark}[2][]{% \if@filesw \begingroup - \bookmarksetup{#1}% - \ifBKM@keeplevel - \else - \xdef\BKM@currentlevel{\BKM@level}% - \fi + \def\bookmark@text{#2}% + \BKM@setup{#1}% \edef\BKM@prev{\the\BKM@id}% \global\advance\BKM@id\@ne \BKM@swtrue @@ -222,7 +219,7 @@ \fi \fi }% - \pdfstringdef\BKM@title{#2}% + \pdfstringdef\BKM@title{\bookmark@text}% \edef\BKM@FLAGS{\BKM@PrintStyle}% \csname BKM@HypDestOptHook\endcsname \BKM@EscapeHex\BKM@dest diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def index 46068c0697f..8a7ead70a8c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2009 by +%% Copyright (C) 2007-2010 by %% Heiko Oberdiek %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-pdftex.def}% - [2009/12/17 v1.8 bookmark driver for pdfTeX (HO)]% + [2010/04/03 v1.10 bookmark driver for pdfTeX (HO)]% \def\BKM@DO@entry#1#2{% \begingroup \setkeys{BKM@DO}{#1}% @@ -143,11 +143,8 @@ \newcommand*{\bookmark}[2][]{% \if@filesw \begingroup - \bookmarksetup{#1}% - \ifBKM@keeplevel - \else - \xdef\BKM@currentlevel{\BKM@level}% - \fi + \def\bookmark@text{#2}% + \BKM@setup{#1}% \edef\BKM@prev{\the\BKM@id}% \global\advance\BKM@id\@ne \BKM@swtrue @@ -177,7 +174,7 @@ \fi \fi }% - \pdfstringdef\BKM@title{#2}% + \pdfstringdef\BKM@title{\bookmark@text}% \edef\BKM@FLAGS{\BKM@PrintStyle}% \csname BKM@HypDestOptHook\endcsname \BKM@EscapeHex\BKM@dest diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def index 440fddf3593..92a7f714893 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2009 by +%% Copyright (C) 2007-2010 by %% Heiko Oberdiek %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-textures.def}% - [2009/12/17 v1.8 bookmark driver for textures (HO)]% + [2010/04/03 v1.10 bookmark driver for textures (HO)]% \def\BKM@PSHeaderFile#1{% \special{prePostScriptfile #1}% } @@ -188,11 +188,8 @@ \newcommand*{\bookmark}[2][]{% \if@filesw \begingroup - \bookmarksetup{#1}% - \ifBKM@keeplevel - \else - \xdef\BKM@currentlevel{\BKM@level}% - \fi + \def\bookmark@text{#2}% + \BKM@setup{#1}% \edef\BKM@prev{\the\BKM@id}% \global\advance\BKM@id\@ne \BKM@swtrue @@ -222,7 +219,7 @@ \fi \fi }% - \pdfstringdef\BKM@title{#2}% + \pdfstringdef\BKM@title{\bookmark@text}% \edef\BKM@FLAGS{\BKM@PrintStyle}% \csname BKM@HypDestOptHook\endcsname \BKM@EscapeHex\BKM@dest diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def index 33276eee776..222813428e8 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2009 by +%% Copyright (C) 2007-2010 by %% Heiko Oberdiek %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{bkm-vtex.def}% - [2009/12/17 v1.8 bookmark driver for VTeX (HO)]% + [2010/04/03 v1.10 bookmark driver for VTeX (HO)]% \ifvtexpdf \else \PackageWarningNoLine{bookmark}{% @@ -48,11 +48,8 @@ \newcommand*{\bookmark}[2][]{% \if@filesw \begingroup - \bookmarksetup{#1}% - \ifBKM@keeplevel - \else - \xdef\BKM@currentlevel{\BKM@level}% - \fi + \def\bookmark@text{#2}% + \BKM@setup{#1}% \edef\BKM@prev{\the\BKM@id}% \global\advance\BKM@id\@ne \BKM@swtrue @@ -78,7 +75,7 @@ \fi \fi }% - \pdfstringdef\BKM@title{#2}% + \pdfstringdef\BKM@title{\bookmark@text}% \BKM@vtex@title \edef\BKM@FLAGS{\BKM@PrintStyle}% \let\BKM@action\@empty diff --git a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty index fd585bb8775..a65704d9cc3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2007-2009 by +%% Copyright (C) 2007-2010 by %% Heiko Oberdiek %% %% This work may be distributed and/or modified under the @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{bookmark}% - [2009/12/17 v1.8 PDF bookmarks (HO)]% + [2010/04/03 v1.10 PDF bookmarks (HO)]% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname numexpr\endcsname\relax \def\BKM@CalcExpr#1#2#3#4{% @@ -83,6 +83,7 @@ \RequirePackage{kvoptions}[2009/08/13] \RequirePackage{hycolor}[2008/09/08] \RequirePackage{bitset} +\RequirePackage{ltxcmds}[2010/03/01] \SetupKeyvalOptions{family=BKM,prefix=BKM@} \DeclareLocalOptions{% atend,% @@ -106,15 +107,25 @@ view,% } \newcommand*{\bookmarksetup}{\setkeys{BKM}} +\def\BKM@setup#1{% + \bookmarksetup{#1}% + \BKM@hook + \ifBKM@keeplevel + \else + \xdef\BKM@currentlevel{\BKM@level}% + \fi +} \DeclareBoolOption[\ifHy@bookmarksopen true\else false\fi]{open} +\def\bookmark@open{% + \ifBKM@open\ltx@one\else\ltx@zero\fi +} \DeclareStringOption[\maxdimen]{openlevel} \edef\BKM@openlevel{\number\@bookmarksopenlevel} -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname Hy@bookmarksdepth\endcsname\relax +\ltx@IfUndefined{Hy@bookmarksdepth}{% \def\BKM@depth{\c@tocdepth}% -\else +}{% \let\BKM@depth\Hy@bookmarksdepth -\fi +} \define@key{BKM}{depth}[]{% \edef\BKM@param{#1}% \ifx\BKM@param\@empty @@ -141,6 +152,7 @@ }% \fi } +\def\bookmark@depth{\BKM@depth} \def\BKM@SetDepth#1{% \begingroup \setbox\z@=\hbox{% @@ -156,6 +168,7 @@ \define@key{BKM}{rellevel}{% \BKM@CalcExpr\BKM@level{#1}+\BKM@currentlevel } +\def\bookmark@level{\BKM@level} \def\BKM@currentlevel{0} \DeclareBoolOption[% \ifHy@bookmarksnumbered true\else false\fi @@ -172,6 +185,9 @@ \g@addto@macro\Hy@bookmarksnumberedfalse{% \let\ifBKM@numbered\iffalse } +\def\bookmark@numbered{% + \ifBKM@numbered\ltx@one\else\ltx@zero\fi +} \def\BKM@PatchHyperrefOption#1{% \expandafter\BKM@@PatchHyperrefOption\csname KV@Hyp@#1\endcsname% } @@ -187,33 +203,46 @@ \BKM@PatchHyperrefOption{bookmarksopen}{open} \BKM@PatchHyperrefOption{bookmarksopenlevel}{openlevel} \BKM@PatchHyperrefOption{bookmarksdepth}{depth} -\bitsetReset{BKM@style}% +\bitsetReset{BKM@FontStyle}% \define@key{BKM}{italic}[true]{% \expandafter\ifx\csname if#1\endcsname\iftrue - \bitsetSet{BKM@style}{0}% + \bitsetSet{BKM@FontStyle}{0}% \else - \bitsetClear{BKM@style}{0}% + \bitsetClear{BKM@FontStyle}{0}% \fi }% \define@key{BKM}{bold}[true]{% \expandafter\ifx\csname if#1\endcsname\iftrue - \bitsetSet{BKM@style}{1}% + \bitsetSet{BKM@FontStyle}{1}% \else - \bitsetClear{BKM@style}{1}% + \bitsetClear{BKM@FontStyle}{1}% \fi }% +\def\bookmark@italic{% + \ifnum\bitsetGet{BKM@FontStyle}{0}=1 \ltx@one\else\ltx@zero\fi +} +\def\bookmark@bold{% + \ifnum\bitsetGet{BKM@FontStyle}{1}=1 \ltx@one\else\ltx@zero\fi +} \def\BKM@PrintStyle{% - \bitsetGetDec{BKM@style}% + \bitsetGetDec{BKM@FontStyle}% }% \define@key{BKM}{color}{% \HyColor@BookmarkColor{#1}\BKM@color{bookmark}{color}% } \let\BKM@color\@empty -\DeclareStringOption{dest} -\DeclareStringOption{named} -\DeclareStringOption{uri} -\DeclareStringOption{gotor} -\DeclareStringOption{rawaction} +\def\bookmark@color{\BKM@color} +\def\BKM@temp#1{% + \DeclareStringOption{#1}% + \expandafter\edef\csname BKM@#1\endcsname{% + \expandafter\noexpand\csname bookmark@#1\endcsname + }% +} +\BKM@temp{dest} +\BKM@temp{named} +\BKM@temp{uri} +\BKM@temp{gotor} +\BKM@temp{rawaction} \define@key{BKM}{page}{% \def\BKM@page{#1}% \ifx\BKM@page\@empty @@ -227,10 +256,12 @@ \fi } \let\BKM@page\@empty +\def\bookmark@page{\BKM@@page} \define@key{BKM}{view}{% \BKM@CheckView{#1}% } \let\BKM@view\@empty +\def\bookmark@view{\BKM@view} \def\BKM@CheckView#1{% \BKM@CheckViewType#1 \@nil } @@ -258,7 +289,7 @@ \BKM@CheckXYZ{#2}{ }% }% \@car{% - \PackageError{pdfbookmark}{% + \PackageError{bookmark}{% Unknown view type `\BKM@type',\MessageBreak using `FitH' instead% }\@ehc @@ -390,6 +421,76 @@ \def\BKM@DisableOptions{% \DisableKeyvalOption{BKM}{atend}% } +\newcommand*{\bookmarkdefinestyle}[2]{% + \@ifundefined{BKM@style@#1}{% + }{% + \PackageInfo{bookmark}{Redefining style `#1'}% + }% + \@namedef{BKM@style@#1}{#2}% +} +\define@key{BKM}{style}{% + \BKM@StyleCall{#1}% +} +\newif\ifBKM@ok +\def\BKM@StyleCall#1{% + \@ifundefined{BKM@style@#1}{% + \PackageError{bookmark}{% + Undefined style `#1'% + }\@ehc + }{% + \BKM@oktrue + \edef\BKM@StyleCurrent{#1}% + \@onelevel@sanitize\BKM@StyleCurrent + \let\BKM@StyleEntry\BKM@StyleEntryCheck + \BKM@StyleStack + \ifBKM@ok + \expandafter\@firstofone + \else + \PackageError{bookmark}{% + Ignoring recursive call of style `\BKM@StyleCurrent'% + }\@ehc + \expandafter\@gobble + \fi + {% + \let\BKM@StyleEntry\relax + \edef\BKM@StyleStack{% + \BKM@StyleEntry{\BKM@StyleCurrent}% + \BKM@StyleStack + }% + \expandafter\expandafter\expandafter\bookmarksetup + \expandafter\expandafter\expandafter{% + \csname BKM@style@\BKM@StyleCurrent\endcsname + }% + \BKM@StyleStackPop + }% + }% +} +\def\BKM@StyleStackPop{% + \let\BKM@StyleEntry\relax + \edef\BKM@StyleStack{% + \expandafter\@gobbletwo\BKM@StyleStack + }% +} +\def\BKM@StyleEntryCheck#1{% + \def\BKM@temp{#1}% + \ifx\BKM@temp\BKM@StyleCurrent + \BKM@okfalse + \fi +} +\def\BKM@StyleStack{} +\def\BKM@hook{} +\define@key{BKM}{addtohook}{% + \ltx@LocalAppendToMacro\BKM@hook{#1}% +} +\newcommand*{\bookmarkget}[1]{% + \romannumeral0% + \ltx@ifundefined{bookmark@#1}{% + \ltx@space + }{% + \expandafter\expandafter\expandafter\ltx@space + \csname bookmark@#1\endcsname + }% +} \def\BKM@DefineDriverKey#1{% \define@key{BKM}{#1}[]{% \def\BKM@driver{#1}% @@ -417,6 +518,7 @@ \g@addto@macro\BKM@DisableOptions{% \DisableKeyvalOption{BKM}{dvipdfmx-outline-open}% } +\def\bookmark@driver{\BKM@driver} \InputIfFileExists{bookmark.cfg}{}{} \providecommand*{\BookmarkDriverDefault}{dvips} \ifpdf diff --git a/Master/texmf-dist/tex/latex/oberdiek/centernot.sty b/Master/texmf-dist/tex/latex/oberdiek/centernot.sty index 6185e305fb0..0a95993ff4a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/centernot.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/centernot.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006, 2007 by +%% Copyright (C) 2006, 2007, 2010 by %% Heiko Oberdiek %% %% This work may be distributed and/or modified under the @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{centernot} - [2007/05/31 v1.1 Centers the not symbol horizontally (HO)]% + [2010/03/29 v1.2 Centers the not symbol horizontally (HO)]% \newcommand*{\centernot}{% \mathpalette\@centernot } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index 8c6fc3ebd8d..6403a6d5d98 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -29,17 +29,18 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2010/03/26 v2.8 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{atbegshi}% \begingroup diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty index 73f6f08b3cf..2682c1c7640 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty @@ -29,24 +29,19 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2010/03/26 v2.8 Module base for zref (HO)]% -\RequirePackage{ltxcmds}[2009/12/12] + [2010/03/29 v2.9 Module base for zref (HO)]% +\RequirePackage{ltxcmds}[2010/03/01] \def\ZREF@name{zref} -\def\ZREF@ErrorNoLine#1#2{% - \begingroup - \let\on@line\@empty - \PackageError\ZREF@name{#1}{#2}% - \endgroup -} \def\ZREF@UpdatePdfTeX{Update pdfTeX.} \newif\ifZREF@found \def\ZREF@patch#1{% @@ -60,7 +55,7 @@ \fi } \ltx@IfUndefined{eTeXversion}{% - \ZREF@ErrorNoLine{% + \PackageError\ZREF@name{% Missing support for eTeX; package is abandoned% }{% Use a TeX compiler that support eTeX and enable eTeX % @@ -71,7 +66,7 @@ \RequirePackage{etexcmds}[2007/09/09] \ifetex@unexpanded \else - \ZREF@ErrorNoLine{% + \PackageError\ZREF@name{% Missing e-TeX's \string\unexpanded.\MessageBreak Add \string\RequirePackage\string{etexcmds\string} before % \string\documentclass% @@ -153,7 +148,9 @@ Property `#2' is already in list `#1'% }% }{% - \expandafter\g@addto@macro\csname Z@L@#1\endcsname{{#2}}% + \edef\ZREF@temp{#2}% + \expandafter\g@addto@macro\csname Z@L@#1\expandafter\endcsname + \expandafter{\expandafter{\ZREF@temp}}% }% }% }% @@ -415,6 +412,11 @@ }% }{}% } +\ltx@IfUndefined{numexpr}{% + \let\ZREF@number\number +}{% + \def\ZREF@number#1{\the\numexpr#1}% +} \def\zref@setdefault#1{% \def\zref@default{#1}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index e1e157138ec..30edeeac494 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -29,17 +29,18 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2010/03/26 v2.8 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newprop{counter}{} \zref@addprop\ZREF@mainlist{counter} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty index d1285c9de64..17519438753 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -29,19 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2010/03/26 v2.8 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-savepos}[2010/03/26] +\RequirePackage{zref-savepos}[2010/03/29] \zref@require@unique \RequirePackage{keyval} \define@key{ZREF@DF}{unit}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty index 483d4e6e589..c579e444ba3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -29,17 +29,18 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2010/03/26 v2.8 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newprop{anchor}[]{% \ltx@ifundefined{@currentHref}{}{\@currentHref}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty index 9499cc12f6a..88289e42f69 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -29,18 +29,19 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2010/03/26 v2.8 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] -\RequirePackage{zref-abspage}[2010/03/26] + [2010/03/29 v2.9 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] +\RequirePackage{zref-abspage}[2010/03/29] \RequirePackage{atveryend}[2009/12/07] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newlist{LastPage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty new file mode 100644 index 00000000000..dde82e2783f --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty @@ -0,0 +1,131 @@ +%% +%% This is file `zref-marks.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref.dtx (with options: `marks') +%% +%% This is a generated file. +%% +%% Copyright (C) 2006-2010 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. +%% +%% This work consists of the main source file zref.dtx +%% and the derived files +%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, +%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{zref-marks}% + [2010/03/29 v2.9 Module marks for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] +\@ifundefined{ZREF@baseok}{\endinput}{} +\RequirePackage{kvsetkeys}[2009/07/30] +\newcommand*{\zref@marks@register}[3][]{% + \edef\ZREF@TempName{#1}% + \edef\ZREF@TempNum{\ZREF@number#2}% + \ifnum\ZREF@TempNum<\ltx@zero % + \PackageError\ZREF@name{% + \string\zref@marks@register\ltx@space is called with invalid% + \MessageBreak + marks register number (\ZREF@TempNum)% + }{% + Use `0' or the command, defined by \string\newmarks.\MessageBreak + \@ehc + }% + \else + \ifx\ZREF@TempName\ltx@empty + \edef\ZREF@TempName{mark\romannumeral\ZREF@TempNum}% + \else + \edef\ZREF@TempName{marks\ZREF@TempName}% + \fi + \ZREF@MARKS@DefineProp{top}% + \ZREF@MARKS@DefineProp{first}% + \ZREF@MARKS@DefineProp{bot}% + \kv@parse{#3}{% + \ifx\kv@value\relax + \def\kv@value{top,first,bot}% + \fi + \edef\ZREF@temp{\expandafter\@car\kv@key X\@nil}% + \ifx\ZREF@temp\ZREF@STAR + \edef\kv@key{\expandafter\@cdr\kv@key\@nil}% + \zref@newlist\kv@key + \fi + \expandafter\comma@parse\expandafter{\kv@value}{% + \ifcase0\ifx\comma@entry\ZREF@NAME@top 1\else + \ifx\comma@entry\ZREF@NAME@first 1\else + \ifx\comma@entry\ZREF@NAME@bot 1\fi\fi\fi\ltx@space + \PackageWarning\ZREF@name{% + Use `top', `first' or `bot' for the list values% + \MessageBreak + in the third argument of \string\zref@marks@register.% + \MessageBreak + Ignoring unkown value `\comma@entry'% + }% + \else + \zref@addprop{\kv@key}{\comma@entry\ZREF@TempName}% + \fi + \ltx@gobble + }% + \ltx@gobbletwo + }% + \fi +} +\def\ZREF@STAR{*} +\def\ZREF@NAME@top{top} +\def\ZREF@NAME@first{first} +\def\ZREF@NAME@bot{bot} +\def\ZREF@MARKS@DefineProp#1{% + \zref@ifpropundefined{#1\ZREF@TempName}{% + \ifnum\ZREF@TempNum=\ltx@zero + \begingroup + \edef\x{\endgroup + \noexpand\zref@newprop*{#1\ZREF@TempName}[]{% + \expandafter\noexpand\csname#1mark\endcsname + }% + }% + \x + \else + \begingroup + \edef\x{\endgroup + \noexpand\zref@newprop*{#1\ZREF@TempName}[]{% + \expandafter\noexpand\csname#1marks\endcsname + \ZREF@TempNum + }% + }% + \x + \fi + }{% + \PackageWarning\ZREF@name{% + \string\zref@marks@register\ltx@space does not generate the% + \MessageBreak + new property `#1\ZREF@TempName', because\MessageBreak + it is already defined% + }% + }% +} +\endinput +%% +%% End of file `zref-marks.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty index b556d838c92..fd14d22221e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty @@ -29,21 +29,22 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2010/03/26 v2.8 Module nextpage for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2010/03/26] -\RequirePackage{zref-thepage}[2010/03/26] -\RequirePackage{zref-lastpage}[2010/03/26] +\RequirePackage{zref-abspage}[2010/03/29] +\RequirePackage{zref-thepage}[2010/03/29] +\RequirePackage{zref-lastpage}[2010/03/29] \RequirePackage{uniquecounter}[2009/12/18] \UniqueCounterNew{znextpage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index eb71e521af3..cfe8cdb2fbe 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -29,19 +29,20 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2010/03/26 v2.8 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2010/03/26] +\RequirePackage{zref-abspage}[2010/03/29] \zref@newprop*{pagevalue}[0]{\number\c@page} \zref@newlist{perpage} \zref@addprop{perpage}{abspage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty index 0fe67466965..b1bccfa11a9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty @@ -29,16 +29,17 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2010/03/26 v2.8 Module runs for zref (HO)]% + [2010/03/29 v2.9 Module runs for zref (HO)]% \providecommand*{\zruns}{0}% \AtBeginDocument{% \edef\zruns{\number\numexpr\zruns+1}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty index fd55e1d592b..b69c49fb778 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -29,20 +29,21 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2010/03/26 v2.8 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} \ltx@IfUndefined{pdfsavepos}{% - \ZREF@ErrorNoLine{% + \PackageError\ZREF@name{% \string\pdfsavepos\space is not supported.\MessageBreak It is provided by pdfTeX (1.40) or XeTeX% }\ZREF@UpdatePdfTeX @@ -55,7 +56,7 @@ \expandafter\ifx\csname pdftexversion\endcsname\relax \else \ifnum\pdftexversion<140 % - \ZREF@ErrorNoLine{% + \PackageError\ZREF@name{% \string\pdfsavepos\space is not supported in DVI mode\MessageBreak of this pdfTeX version% }\ZREF@UpdatePdfTeX diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty index b32709f9a28..e9659f1c711 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty @@ -29,20 +29,21 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2010/03/26 v2.8 Module thepage for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{atbegshi} -\RequirePackage{zref-abspage}[2010/03/26] +\RequirePackage{zref-abspage}[2010/03/29] \zref@newlist{thepage} \zref@addprop{thepage}{page} \AtBeginShipout{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty index 20ea3adcdca..c0195ead668 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -29,17 +29,18 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2010/03/26 v2.8 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{gettitlestring}[2009/12/08] \RequirePackage{keyval} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index 460af656c15..7c2ab53dca2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -29,20 +29,21 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2010/03/26 v2.8 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2010/03/26] -\RequirePackage{zref-lastpage}[2010/03/26] +\RequirePackage{zref-abspage}[2010/03/29] +\RequirePackage{zref-lastpage}[2010/03/29] \newcommand*{\ztotpages}{% \zref@extractdefault{LastPage}{abspage}{0}% } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty index 3c0130cc545..051cee3f0b6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -29,17 +29,18 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2010/03/26 v2.8 Module user for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 Module user for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} \newcommand*\zlabel{% \ifx\label\ltx@gobble diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index edc7467aff6..2b74a8397a2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -29,17 +29,18 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2010/03/26 v2.8 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{keyval} \zref@newprop{url}{}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty index 15d9b45047d..4a4771916e6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -29,22 +29,23 @@ %% and the derived files %% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty, %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, -%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.sty, -%% zref-perpage.sty, zref-runs.sty, zref-savepos.sty, -%% zref-thepage.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex, -%% zref-example-lastpage.tex, zref-example-nextpage.tex, -%% zref-test1.tex, zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty, +%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty, +%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty, +%% zref-totpages.sty, zref-user.sty, zref-xr.sty, +%% zref-example.tex, zref-example-lastpage.tex, +%% zref-example-nextpage.tex, zref-test1.tex, +%% zref-test-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2010/03/26 v2.8 New reference scheme for LaTeX2e (HO)]% -\RequirePackage{zref-base}[2010/03/26] + [2010/03/29 v2.9 New reference scheme for LaTeX2e (HO)]% +\RequirePackage{zref-base}[2010/03/29] \@ifundefined{ZREF@baseok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2010/03/26]% + \RequirePackage{zref-#1}[2010/03/29]% }% }% } -- cgit v1.2.3