From 038a5dc7d31591d03bb7dd2bee2ca5e89f0ff26a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 21 Feb 2007 23:54:19 +0000 Subject: oberdiek bookmark0.2, hypcap1.6 (20feb07) git-svn-id: svn://tug.org/texlive/trunk@3977 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def | 158 +++++++++ Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def | 274 +++++++++++++++ .../texmf-dist/tex/latex/oberdiek/bkm-pdftex.def | 236 +++++++++++++ .../texmf-dist/tex/latex/oberdiek/bmpsize-base.sty | 18 +- .../tex/latex/oberdiek/bmpsize-dvipdfm.def | 4 +- .../tex/latex/oberdiek/bmpsize-dvipdfmx.def | 4 +- .../tex/latex/oberdiek/bmpsize-dvips.def | 4 +- .../texmf-dist/tex/latex/oberdiek/bmpsize-test.tex | 2 +- Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty | 4 +- Master/texmf-dist/tex/latex/oberdiek/bookmark.sty | 388 +++++++++++++++++++++ Master/texmf-dist/tex/latex/oberdiek/flags.sty | 115 ++++++ Master/texmf-dist/tex/latex/oberdiek/hypcap.sty | 11 +- .../texmf-dist/tex/latex/oberdiek/zref-abspage.sty | 4 +- Master/texmf-dist/tex/latex/oberdiek/zref-base.sty | 5 +- .../texmf-dist/tex/latex/oberdiek/zref-counter.sty | 4 +- .../texmf-dist/tex/latex/oberdiek/zref-dotfill.sty | 6 +- .../tex/latex/oberdiek/zref-hyperref.sty | 4 +- .../tex/latex/oberdiek/zref-lastpage.sty | 4 +- .../texmf-dist/tex/latex/oberdiek/zref-perpage.sty | 6 +- .../texmf-dist/tex/latex/oberdiek/zref-savepos.sty | 24 +- .../tex/latex/oberdiek/zref-titleref.sty | 4 +- .../tex/latex/oberdiek/zref-totpages.sty | 8 +- Master/texmf-dist/tex/latex/oberdiek/zref-user.sty | 4 +- Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty | 4 +- Master/texmf-dist/tex/latex/oberdiek/zref.sty | 6 +- 25 files changed, 1242 insertions(+), 59 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def create mode 100644 Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def create mode 100644 Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def create mode 100644 Master/texmf-dist/tex/latex/oberdiek/bookmark.sty create mode 100644 Master/texmf-dist/tex/latex/oberdiek/flags.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 new file mode 100644 index 00000000000..7097a9b402c --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def @@ -0,0 +1,158 @@ +%% +%% This is file `bkm-dvipdfm.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bookmark.dtx (with options: `dvipdfm') +%% +%% This is a generated file. +%% +%% Copyright (C) 2007 by Heiko Oberdiek +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. 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 bookmark.dtx +%% and the derived files +%% bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, +%% bookmark-example.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{bkm-dvipdfm.def}% + [2007/02/20 v0.2 bookmark driver for dvipdfm (HO)] +\newcount\BKM@id +\BKM@id=\z@ +\def\BKM@0{000} +\newif\ifBKM@sw +\newcommand*{\bookmark}[2][]{% + \if@filesw + \begingroup + \bookmarksetup{#1}% + \ifBKM@keeplevel + \else + \xdef\BKM@currentlevel{\BKM@level}% + \fi + \edef\BKM@prev{\the\BKM@id}% + \global\advance\BKM@id\@ne + \BKM@swtrue + \@whilesw\ifBKM@sw\fi{% + \def\BKM@abslevel{1}% + \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ + \global\BKM@startatrootfalse + \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% + 0{\BKM@level}\BKM@abslevel + }% + \BKM@swfalse + \else + \expandafter\expandafter\expandafter\BKM@getx + \csname BKM@\BKM@prev\endcsname + \ifnum\BKM@level>\BKM@x@level\relax + \edef\BKM@abslevel{\the\numexpr\BKM@x@abslevel+1\relax}% + \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% + {\BKM@prev}{\BKM@level}\BKM@abslevel + }% + \BKM@swfalse + \else + \let\BKM@prev\BKM@x@parent + \fi + \fi + }% + \pdfstringdef\BKM@title{#2}% + \edef\BKM@FLAGS{\printflags{BKM@style}}% + \let\BKM@action\@empty + \ifx\BKM@gotor\@empty + \ifx\BKM@dest\@empty + \ifx\BKM@named\@empty + \ifx\BKM@rawaction\@empty + \ifx\BKM@uri\@empty + \ifx\BKM@page\@empty + \PackageError{bookmark}{Missing action}\@ehc + \edef\BKM@action{/Dest[@page1/Fit]}% + \else + \ifx\BKM@view\@empty + \def\BKM@view{Fit}% + \fi + \edef\BKM@action{/Dest[@page\BKM@page/\BKM@view]}% + \fi + \else + \edef\BKM@action{% + /A<<% + /S/URI% + /URI(\BKM@escapestring{\BKM@uri})% + >>% + }% + \fi + \else + \edef\BKM@action{/A<<\BKM@rawaction>>}% + \fi + \else + \edef\BKM@action{% + /A<>% + }% + \fi + \else + \edef\BKM@action{% + /A<<% + /S/GoTo% + /D(\BKM@escapestring{\BKM@dest})% + >>% + }% + \fi + \else + \ifx\BKM@dest\@empty + \ifx\BKM@page\@empty + \def\BKM@page{0}% + \else + \edef\BKM@page{\the\numexpr\BKM@page-1\relax}% + \fi + \ifx\BKM@view\@empty + \def\BKM@view{Fit}% + \fi + \edef\BKM@action{/D[\BKM@page/\BKM@view]}% + \else + \edef\BKM@action{/D(\BKM@escapestring{\BKM@dest})}% + \fi + \edef\BKM@action{% + /A<<% + /S/GoToR% + /F(\BKM@escapestring{\BKM@gotor})% + \BKM@action + >>% + }% + \fi + \special{pdf:% + out \BKM@abslevel + <<% + /Title(\BKM@title)% + \ifx\BKM@color\@empty + \else + /C[\BKM@color]% + \fi + \ifnum\BKM@FLAGS>\z@ + /F \BKM@FLAGS + \fi + \BKM@action + >>% + }% + \endgroup + \fi +} +\def\BKM@getx#1#2#3{% + \def\BKM@x@parent{#1}% + \def\BKM@x@level{#2}% + \def\BKM@x@abslevel{#3}% +} +\endinput +%% +%% End of file `bkm-dvipdfm.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def new file mode 100644 index 00000000000..1de078f8033 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def @@ -0,0 +1,274 @@ +%% +%% This is file `bkm-dvips.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bookmark.dtx (with options: `dvips') +%% +%% This is a generated file. +%% +%% Copyright (C) 2007 by Heiko Oberdiek +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. 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 bookmark.dtx +%% and the derived files +%% bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, +%% bookmark-example.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{bkm-dvips.def}% + [2007/02/20 v0.2 bookmark driver for dvips (HO)] +\def\BKM@filename{\jobname.out.ps} +\special{header=\BKM@filename} +\AtEndDocument{\BKM@dvips@out} +\def\BKM@dvips@out{% + \newwrite\BKM@file + \immediate\openout\BKM@file=\BKM@filename\relax + \BKM@write{\@percentchar!}% + \BKM@write{/pdfmark where{pop}}% + \BKM@write{% + {% + /globaldict where{pop globaldict}{userdict}ifelse% + /pdfmark/cleartomark load put% + }% + }% + \BKM@write{ifelse} +} +\def\BKM@write#{% + \immediate\write\BKM@file +} +\def\BKM@DO@entry#1#2{% + \begingroup + \setkeys{BKM@DO}{#1}% + \edef\BKM@DO@title{\BKM@unescapehex{#2}}% + \expandafter\expandafter\expandafter\BKM@getx + \csname BKM@\BKM@DO@id\endcsname\@empty\@empty + \let\BKM@attr\@empty + \ifx\BKM@DO@flags\@empty + \else + \edef\BKM@attr{\BKM@attr/F \BKM@DO@flags}% + \fi + \ifx\BKM@DO@color\@empty + \else + \edef\BKM@attr{\BKM@attr/C[\BKM@DO@color]}% + \fi + \let\BKM@action\@empty + \ifx\BKM@DO@gotor\@empty + \ifx\BKM@DO@dest\@empty + \ifx\BKM@DO@named\@empty + \ifx\BKM@DO@rawaction\@empty + \ifx\BKM@DO@uri\@empty + \ifx\BKM@DO@page\@empty + \PackageError{bookmark}{Missing action}\@ehc + \edef\BKM@action{% + /Action/GoTo% + /Page 1% + /View[/Fit]% + }% + \else + \ifx\BKM@DO@view\@empty + \def\BKM@DO@view{Fit}% + \fi + \edef\BKM@action{% + /Action/GoTo% + /Page \BKM@DO@page + /View[/\BKM@DO@view]% + }% + \fi + \else + \edef\BKM@action{% + /Action<<% + /Subtype/URI% + /URI(\BKM@escapestring{\BKM@unescapehex{\BKM@DO@uri}})% + >>% + }% + \fi + \else + \edef\BKM@action{% + /Action<<% + \BKM@unescapehex{\BKM@DO@rawaction}% + >>% + }% + \fi + \else + \edef\BKM@action{% + /Action<<% + /Subtype/Named% + /N/\BKM@escapename{\BKM@DO@named}% + >>% + }% + \fi + \else + \edef\BKM@action{% + /Action/GoTo% + /Dest(\BKM@escapestring{\BKM@DO@dest})cvn% + }% + \fi + \else + \ifx\BKM@DO@dest\@empty + \ifx\BKM@DO@page\@empty + \def\BKM@DO@page{1}% + \fi + \ifx\BKM@DO@view\@empty + \def\BKM@DO@view{Fit}% + \fi + \edef\BKM@action{% + /Page \BKM@DO@page + /View[/\BKM@DO@view]% + }% + \else + \edef\BKM@action{% + /Dest(\BKM@escapestring{\BKM@DO@dest})cvn% + }% + \fi + \edef\BKM@action{% + /Action/GoToR% + /F(\BKM@escapestring{\BKM@unescapehex{\BKM@DO@gotor}})% + \BKM@action + }% + \fi + \BKM@write{[}% + \BKM@write{/Title(\BKM@DO@title)}% + \ifnum\BKM@x@childs>\z@ + \BKM@write{/Count \ifBKM@DO@open\else-\fi\BKM@x@childs}% + \fi + \ifx\BKM@attr\@empty + \else + \BKM@write{\BKM@attr}% + \fi + \BKM@write{\BKM@action}% + \BKM@write{/OUT pdfmark}% + \endgroup +} +\RequirePackage{auxhook} +\AddLineBeginMainAux{% + \string\providecommand\string\BKM@entry[2]{}% +} +\newcount\BKM@id +\BKM@id=\z@ +\def\BKM@0{000} +\newif\ifBKM@sw +\newcommand*{\bookmark}[2][]{% + \if@filesw + \begingroup + \bookmarksetup{#1}% + \ifBKM@keeplevel + \else + \xdef\BKM@currentlevel{\BKM@level}% + \fi + \edef\BKM@prev{\the\BKM@id}% + \global\advance\BKM@id\@ne + \BKM@swtrue + \@whilesw\ifBKM@sw\fi{% + \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ + \global\BKM@startatrootfalse + \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% + 0{\BKM@level}0% + }% + \BKM@swfalse + \else + \expandafter\expandafter\expandafter\BKM@getx + \csname BKM@\BKM@prev\endcsname + \ifnum\BKM@level>\BKM@x@level\relax + \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% + {\BKM@prev}{\BKM@level}0% + }% + \ifnum\BKM@prev>\z@ + \expandafter\xdef\csname BKM@\BKM@prev\endcsname{% + {\BKM@x@parent}{\BKM@x@level}{% + \the\numexpr\BKM@x@childs+1\relax + }% + }% + \fi + \BKM@swfalse + \else + \let\BKM@prev\BKM@x@parent + \fi + \fi + }% + \pdfstringdef\BKM@title{#2}% + \edef\BKM@FLAGS{\printflags{BKM@style}}% + \immediate\write\@mainaux{% + \string\BKM@entry{% + id=\number\BKM@id + \ifBKM@open + \ifnum\BKM@level<\BKM@openlevel + ,open% + \fi + \fi + \ifx\BKM@dest\@empty + \else + ,dest={\BKM@dest}% + \fi + \ifx\BKM@named\@empty + \else + ,named={\BKM@named}% + \fi + \ifx\BKM@uri\@empty + \else + ,uri={\BKM@escapehex{\BKM@uri}}% + \fi + \ifx\BKM@gotor\@empty + \else + ,gotor={\BKM@escapehex{\BKM@gotor}}% + \fi + \ifx\BKM@page\@empty + \else + ,page=\BKM@page + \fi + \ifx\BKM@view\@empty + \else + ,view={\BKM@view}% + \fi + \ifx\BKM@rawaction\@empty + \else + ,rawaction={\BKM@escapehex{\BKM@rawaction}}% + \fi + \ifnum\BKM@FLAGS>\z@ + ,flags=\BKM@FLAGS + \fi + \ifx\BKM@color\@empty + \else + ,color={\BKM@color}% + \fi + }{\BKM@escapehex{\BKM@title}}% + }% + \endgroup + \fi +} +\def\BKM@getx#1#2#3{% + \def\BKM@x@parent{#1}% + \def\BKM@x@level{#2}% + \def\BKM@x@childs{#3}% +} +\SetupKeyvalOptions{family=BKM@DO,prefix=BKM@DO@} +\DeclareStringOption[0]{id} +\DeclareBoolOption{open} +\DeclareStringOption{flags} +\DeclareStringOption{color} +\DeclareStringOption{dest} +\DeclareStringOption{named} +\DeclareStringOption{uri} +\DeclareStringOption{gotor} +\DeclareStringOption{page} +\DeclareStringOption{view} +\DeclareStringOption{rawaction} +\AtBeginDocument{% + \let\BKM@entry\BKM@DO@entry +} +\endinput +%% +%% End of file `bkm-dvips.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def new file mode 100644 index 00000000000..1295407ba63 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def @@ -0,0 +1,236 @@ +%% +%% This is file `bkm-pdftex.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bookmark.dtx (with options: `pdftex') +%% +%% This is a generated file. +%% +%% Copyright (C) 2007 by Heiko Oberdiek +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. 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 bookmark.dtx +%% and the derived files +%% bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, +%% bookmark-example.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{bkm-pdftex.def}% + [2007/02/20 v0.2 bookmark driver for pdftex (HO)] +\def\BKM@DO@entry#1#2{% + \begingroup + \setkeys{BKM@DO}{#1}% + \edef\BKM@DO@title{\BKM@unescapehex{#2}}% + \expandafter\expandafter\expandafter\BKM@getx + \csname BKM@\BKM@DO@id\endcsname\@empty\@empty + \let\BKM@attr\@empty + \ifx\BKM@DO@flags\@empty + \else + \edef\BKM@attr{\BKM@attr/F \BKM@DO@flags}% + \fi + \ifx\BKM@DO@color\@empty + \else + \edef\BKM@attr{\BKM@attr/C[\BKM@DO@color]}% + \fi + \ifx\BKM@attr\@empty + \else + \edef\BKM@attr{attr{\BKM@attr}}% + \fi + \let\BKM@action\@empty + \ifx\BKM@DO@gotor\@empty + \ifx\BKM@DO@dest\@empty + \ifx\BKM@DO@named\@empty + \ifx\BKM@DO@rawaction\@empty + \ifx\BKM@DO@uri\@empty + \ifx\BKM@DO@page\@empty + \PackageError{bookmark}{Missing action}\@ehc + \edef\BKM@action{goto page1{/Fit}}% + \else + \ifx\BKM@DO@view\@empty + \def\BKM@DO@view{Fit}% + \fi + \edef\BKM@action{goto page\BKM@DO@page{/\BKM@DO@view}}% + \fi + \else + \edef\BKM@action{user{<>}}% + \fi + \else + \edef\BKM@action{% + user{% + <<% + \BKM@unescapehex{\BKM@DO@rawaction}% + >>% + }% + }% + \fi + \else + \edef\BKM@action{% + user{<>}% + }% + \fi + \else + \edef\BKM@action{goto name{\BKM@DO@dest}}% + \fi + \else + \ifx\BKM@DO@dest\@empty + \ifx\BKM@DO@page\@empty + \def\BKM@DO@page{0}% + \else + \edef\BKM@DO@page{\the\numexpr\BKM@DO@page-1\relax}% + \fi + \ifx\BKM@DO@view\@empty + \def\BKM@DO@view{Fit}% + \fi + \edef\BKM@action{/D[\BKM@DO@page/\BKM@DO@view]}% + \else + \edef\BKM@action{/D(\BKM@escapestring{\BKM@DO@dest})}% + \fi + \edef\BKM@action{% + user{% + <<% + /S/GoToR% + /F(\BKM@escapestring{\BKM@unescapehex{\BKM@DO@gotor}})% + \BKM@action + >>% + }% + }% + \fi + \pdfoutline\BKM@attr\BKM@action + count\ifBKM@DO@open\else-\fi\BKM@x@childs + {\BKM@DO@title}% + \endgroup +} +\RequirePackage{auxhook} +\AddLineBeginMainAux{% + \string\providecommand\string\BKM@entry[2]{}% +} +\newcount\BKM@id +\BKM@id=\z@ +\def\BKM@0{000} +\newif\ifBKM@sw +\newcommand*{\bookmark}[2][]{% + \if@filesw + \begingroup + \bookmarksetup{#1}% + \ifBKM@keeplevel + \else + \xdef\BKM@currentlevel{\BKM@level}% + \fi + \edef\BKM@prev{\the\BKM@id}% + \global\advance\BKM@id\@ne + \BKM@swtrue + \@whilesw\ifBKM@sw\fi{% + \ifnum\ifBKM@startatroot\z@\else\BKM@prev\fi=\z@ + \global\BKM@startatrootfalse + \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% + 0{\BKM@level}0% + }% + \BKM@swfalse + \else + \expandafter\expandafter\expandafter\BKM@getx + \csname BKM@\BKM@prev\endcsname + \ifnum\BKM@level>\BKM@x@level\relax + \expandafter\xdef\csname BKM@\the\BKM@id\endcsname{% + {\BKM@prev}{\BKM@level}0% + }% + \ifnum\BKM@prev>\z@ + \expandafter\xdef\csname BKM@\BKM@prev\endcsname{% + {\BKM@x@parent}{\BKM@x@level}{% + \the\numexpr\BKM@x@childs+1\relax + }% + }% + \fi + \BKM@swfalse + \else + \let\BKM@prev\BKM@x@parent + \fi + \fi + }% + \pdfstringdef\BKM@title{#2}% + \edef\BKM@FLAGS{\printflags{BKM@style}}% + \immediate\write\@mainaux{% + \string\BKM@entry{% + id=\number\BKM@id + \ifBKM@open + \ifnum\BKM@level<\BKM@openlevel + ,open% + \fi + \fi + \ifx\BKM@dest\@empty + \else + ,dest={\BKM@dest}% + \fi + \ifx\BKM@named\@empty + \else + ,named={\BKM@named}% + \fi + \ifx\BKM@uri\@empty + \else + ,uri={\BKM@escapehex{\BKM@uri}}% + \fi + \ifx\BKM@gotor\@empty + \else + ,gotor={\BKM@escapehex{\BKM@gotor}}% + \fi + \ifx\BKM@page\@empty + \else + ,page=\BKM@page + \fi + \ifx\BKM@view\@empty + \else + ,view={\BKM@view}% + \fi + \ifx\BKM@rawaction\@empty + \else + ,rawaction={\BKM@escapehex{\BKM@rawaction}}% + \fi + \ifnum\BKM@FLAGS>\z@ + ,flags=\BKM@FLAGS + \fi + \ifx\BKM@color\@empty + \else + ,color={\BKM@color}% + \fi + }{\BKM@escapehex{\BKM@title}}% + }% + \endgroup + \fi +} +\def\BKM@getx#1#2#3{% + \def\BKM@x@parent{#1}% + \def\BKM@x@level{#2}% + \def\BKM@x@childs{#3}% +} +\SetupKeyvalOptions{family=BKM@DO,prefix=BKM@DO@} +\DeclareStringOption[0]{id} +\DeclareBoolOption{open} +\DeclareStringOption{flags} +\DeclareStringOption{color} +\DeclareStringOption{dest} +\DeclareStringOption{named} +\DeclareStringOption{uri} +\DeclareStringOption{gotor} +\DeclareStringOption{page} +\DeclareStringOption{view} +\DeclareStringOption{rawaction} +\AtBeginDocument{% + \let\BKM@entry\BKM@DO@entry +} +\endinput +%% +%% End of file `bkm-pdftex.def'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty index 859617996b9..971dd8dcabb 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-base.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by Heiko Oberdiek +%% Copyright (C) 2006, 2007 by Heiko Oberdiek %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesPackage{bmpsize-base}% - [2006/08/24 v1.0 Basic part of bmpsize (HO)] + [2007/02/18 v1.1 Basic part of bmpsize (HO)] \RequirePackage{fp-basic} \RequirePackage{fp-snap} \long\def\@bmpsize@plain@loop#1\repeat{% @@ -421,7 +421,7 @@ \fi \let\loop\@bmpsize@org@plain@loop } -\def\bmpsize@unit@default{1in} +\def\bmpsize@unit@default{72.27pt}% more accurate than 1in \def\bmpsize@pixelx@default{72} \let\bmpsize@pixely@default\Gin@exclamation @@ -557,7 +557,7 @@ \expandafter\@secondoftwo \fi {% - \def\bmpsize@unit{1in}% + \def\bmpsize@unit{72.27pt}% }{% \ifnum\bmpsize@temp=2\relax \expandafter\@firstofone @@ -653,7 +653,7 @@ \or \let\bmpsize@unit\relax \or - \def\bmpsize@unit{1in}% + \def\bmpsize@unit{72.27pt}% \or \def\bmpsize@unit{1cm}% \else @@ -854,7 +854,7 @@ }% \def\bmpsize@read@tiff#1{% \@bmpsize@init - \def\bmpsize@unit{1in}% + \def\bmpsize@unit{72.27pt}% \@bmpsize@read{#1}{8}{0}% \@bmpsize@grab\bmpsize@temp{2}% \@bmpsize@skip@two @@ -908,7 +908,7 @@ \or \let\bmpsize@unit\relax \or - \def\bmpsize@unit{1in}% + \def\bmpsize@unit{72.27pt}% \or \def\bmpsize@unit{1cm}% \else @@ -1634,7 +1634,7 @@ \@bmpsize@ok \@bmpsize@num@two\bmpsize@pixelx \@bmpsize@num@two\bmpsize@pixely - \def\bmpsize@unit{1in}% + \def\bmpsize@unit{72.27pt}% \@bmpsize@stop \@nil \@bmpsize@end @@ -1661,7 +1661,7 @@ \@bmpsize@ok \@bmpsize@num@two\bmpsize@pixelx \@bmpsize@num@two\bmpsize@pixely - \def\bmpsize@unit{1in}% + \def\bmpsize@unit{72.27pt}% \ifnum\bmpsize@pixelx=0\relax \expandafter\@firstofone \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def index b661894c08b..e4887b954a9 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfm.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by Heiko Oberdiek +%% Copyright (C) 2006, 2007 by Heiko Oberdiek %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesFile{bmpsize-dvipdfm.def}% - [2006/08/24 v1.0 Graphics bitmap driver for dvipdfm (HO)] + [2007/02/18 v1.1 Graphics bitmap driver for dvipdfm (HO)] \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{% \catcode44 \the\catcode44 % , \catcode46 \the\catcode46 % . diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def index 17253a928ba..fdac5a349d8 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvipdfmx.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by Heiko Oberdiek +%% Copyright (C) 2006, 2007 by Heiko Oberdiek %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesFile{bmpsize-dvipdfmx.def}% - [2006/08/24 v1.0 Graphics bitmap driver for dvipdfmx (HO)] + [2007/02/18 v1.1 Graphics bitmap driver for dvipdfmx (HO)] \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{% \catcode46 \the\catcode46 % . \catcode64 \the\catcode64 % @ diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def index 6aba10a6a63..23d51a691c1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-dvips.def @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by Heiko Oberdiek +%% Copyright (C) 2006, 2007 by Heiko Oberdiek %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesFile{bmpsize-dvips.def}% - [2006/08/24 v1.0 Graphics bitmap driver for dvips (HO)] + [2007/02/18 v1.1 Graphics bitmap driver for dvips (HO)] \expandafter\edef\csname @bmpsize@driver@catcodes\endcsname{% \catcode44 \the\catcode44 % , \catcode58 \the\catcode58 % : diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex index fa5616956a7..7eed5335e0a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize-test.tex @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by Heiko Oberdiek +%% Copyright (C) 2006, 2007 by Heiko Oberdiek %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty index 812028bf206..26d12266463 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006 by Heiko Oberdiek +%% Copyright (C) 2006, 2007 by Heiko Oberdiek %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -29,7 +29,7 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesPackage{bmpsize}% - [2006/08/24 v1.0 Extract size and resolution data from bitmap files (HO)] + [2007/02/18 v1.1 Extract size and resolution data from bitmap files (HO)] \RequirePackage{ifpdf} \ifpdf \PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty new file mode 100644 index 00000000000..758cb6a6134 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty @@ -0,0 +1,388 @@ +%% +%% This is file `bookmark.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bookmark.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2007 by Heiko Oberdiek +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. 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 bookmark.dtx +%% and the derived files +%% bookmark.sty, bookmark.pdf, bookmark.ins, bookmark.drv, +%% bkm-dvipdfm.def, bkm-dvips.def, bkm-pdftex.def, +%% bookmark-example.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{bookmark}% + [2007/02/20 v0.2 PDF bookmarks (HO)] +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname pdfescapehex\endcsname\relax + \PackageWarningNoLine{bookmark}{% + Some features of pdfTeX 1.30 are missing that\MessageBreak + protect some arguments. Replacements for these\MessageBreak + features are not implemented. Thus the pdf file\MessageBreak + can become invalid or the .aux file breaks% + }% + \let\BKM@escapename\@firstofone + \let\BKM@escapestring\@firstofone + \let\BKM@escapehex\@firstofone + \let\BKM@unescapehex\@firstofone +\else + \let\BKM@escapename\pdfescapename + \let\BKM@escapestring\pdfescapestring + \let\BKM@escapehex\pdfescapehex + \let\BKM@unescapehex\pdfunescapehex +\fi +\RequirePackage{ifpdf} +\RequirePackage{ifxetex} +\RequirePackage{hyperref} +\RequirePackage{auxhook} +\RequirePackage{flags} +\RequirePackage{kvoptions} +\SetupKeyvalOptions{family=BKM,prefix=BKM@} +\newcommand*{\bookmarksetup}{\setkeys{BKM}} +\DeclareBoolOption{open} +\DeclareStringOption[\maxdimen]{openlevel} +\DeclareStringOption[\c@tocdepth]{depth} +\DeclareStringOption[\BKM@currentlevel]{level}[\BKM@currentlevel] +\DeclareBoolOption{keeplevel} +\DeclareBoolOption{startatroot} +\define@key{BKM}{rellevel}{% + \edef\BKM@level{\number\numexpr#1+\BKM@currentlevel\relax}% +} +\def\BKM@currentlevel{0} +\resetflags{BKM@style} +\define@key{BKM}{italic}[true]{% + \expandafter\ifx\csname if#1\endcsname\iftrue + \setflag{BKM@style}{1}% + \else + \clearflag{BKM@style}{1}% + \fi +} +\define@key{BKM}{bold}[true]{% + \expandafter\ifx\csname if#1\endcsname\iftrue + \setflag{BKM@style}{2}% + \else + \clearflag{BKM@style}{2}% + \fi +} +\define@key{BKM}{rgbcolor}{% + \def\BKM@color{#1}% +} +\define@key{BKM}{color}{% + \ifx\\#1\\% + \let\BKM@color\@empty + \else + \@ifundefined{XC@bordercolor}{% + \PackageWarning{bookmark}{% + Load package `xcolor' (version >= 2.11) first.\MessageBreak + Ignoring color specification% + }% + }{% + \begingroup + \csname @safe@activestrue\endcsname + \XC@bordercolor{}{#1}% + \expandafter\endgroup + \expandafter\def\expandafter\BKM@color\expandafter{\@bordercolor}% + }% + \fi +} +\let\BKM@color\@empty +\DeclareStringOption{dest} +\DeclareStringOption{named} +\DeclareStringOption{uri} +\DeclareStringOption{gotor} +\DeclareStringOption{rawaction} +\define@key{BKM}{page}{% + \def\BKM@page{#1}% + \ifx\BKM@page\@empty + \else + \edef\BKM@page{\number\BKM@page}% + \ifnum\BKM@page>\z@ + \else + \PackageError{bookmark}{Page must be positive}\@ehc + \def\BKM@page{1}% + \fi + \fi +} +\let\BKM@page\@empty +\define@key{BKM}{view}{% + \BKM@CheckView{#1}% +} +\let\BKM@view\@empty +\def\BKM@CheckView#1{% + \BKM@CheckViewType#1 \@nil +} +\def\BKM@CheckViewType#1 #2\@nil{% + \def\BKM@type{#1}% + \@onelevel@sanitize\BKM@type + \BKM@TestViewType{Fit}{}% + \BKM@TestViewType{FitB}{}% + \BKM@TestViewType{FitH}{% + \BKM@CheckParam#2 \@nil{top}% + }% + \BKM@TestViewType{FitBH}{% + \BKM@CheckParam#2 \@nil{top}% + }% + \BKM@TestViewType{FitV}{% + \BKM@CheckParam#2 \@nil{bottom}% + }% + \BKM@TestViewType{FitBV}{% + \BKM@CheckParam#2 \@nil{bottom}% + }% + \BKM@TestViewType{FitR}{% + \BKM@CheckRect{#2}{ }% + }% + \BKM@TestViewType{XYZ}{% + \BKM@CheckXYZ{#2}{ }% + }% + \@car{% + \PackageError{pdfbookmark}{% + Unknown view type `\BKM@type',\MessageBreak + using `FitH' instead% + }\@ehc + \def\BKM@view{FitH}% + }% + \@nil +} +\def\BKM@TestViewType#1{% + \def\BKM@temp{#1}% + \@onelevel@sanitize\BKM@temp + \ifx\BKM@type\BKM@temp + \let\BKM@view\BKM@temp + \expandafter\@car + \else + \expandafter\@gobble + \fi +} +\def\BKM@CheckParam#1 #2\@nil#3{% + \def\BKM@param{#1}% + \ifx\BKM@param\@empty + \PackageWarning{bookmark}{% + Missing parameter (#3) for `\BKM@type',\MessageBreak + using 0% + }% + \def\BKM@param{0}% + \else + \BKM@CalcParam + \fi + \edef\BKM@view{\BKM@view\space\BKM@param}% +} +\def\BKM@CheckRect#1#2{% + \BKM@@CheckRect#1#2#2#2#2\@nil +} +\def\BKM@@CheckRect#1 #2 #3 #4 #5\@nil{% + \def\BKM@temp{0}% + \def\BKM@param{#1}% + \ifx\BKM@param\@empty + \def\BKM@param{0}% + \def\BKM@temp{1}% + \else + \BKM@CalcParam + \fi + \edef\BKM@view{\BKM@view\space\BKM@param}% + \def\BKM@param{#2}% + \ifx\BKM@param\@empty + \def\BKM@param{0}% + \def\BKM@temp{1}% + \else + \BKM@CalcParam + \fi + \edef\BKM@view{\BKM@view\space\BKM@param}% + \def\BKM@param{#3}% + \ifx\BKM@param\@empty + \def\BKM@param{0}% + \def\BKM@temp{1}% + \else + \BKM@CalcParam + \fi + \edef\BKM@view{\BKM@view\space\BKM@param}% + \def\BKM@param{#4}% + \ifx\BKM@param\@empty + \def\BKM@param{0}% + \def\BKM@temp{1}% + \else + \BKM@CalcParam + \fi + \edef\BKM@view{\BKM@view\space\BKM@param}% + \ifnum\BKM@temp>\z@ + \PackageWarning{bookmark}{Missing parameters for `\BKM@type'}% + \fi +} +\def\BKM@CheckXYZ#1#2{% + \BKM@@CheckXYZ#1#2#2#2\@nil +} +\def\BKM@@CheckXYZ#1 #2 #3 #4\@nil{% + \def\BKM@param{#1}% + \let\BKM@temp\BKM@param + \@onelevel@sanitize\BKM@temp + \ifx\BKM@param\@empty + \let\BKM@param\BKM@null + \else + \ifx\BKM@temp\BKM@null + \else + \BKM@CalcParam + \fi + \fi + \edef\BKM@view{\BKM@view\space\BKM@param}% + \def\BKM@param{#2}% + \let\BKM@temp\BKM@param + \@onelevel@sanitize\BKM@temp + \ifx\BKM@param\@empty + \let\BKM@param\BKM@null + \ifx\BKM@temp\BKM@null + \else + \BKM@CalcParam + \fi + \fi + \edef\BKM@view{\BKM@view\space\BKM@param}% + \def\BKM@param{#3}% + \ifx\BKM@param\@empty + \let\BKM@param\BKM@null + \fi + \edef\BKM@view{\BKM@view\space\BKM@param}% +} +\def\BKM@null{null} +\@onelevel@sanitize\BKM@null +\def\BKM@CalcParam{% + \begingroup + \let\calc\@firstofone + \expandafter\BKM@@CalcParam\BKM@param\@empty\@empty\@nil +} +\def\BKM@@CalcParam#1#2#3\@nil{% + \ifx\calc#1% + \@ifundefined{calc@assign@dimen}{% + \setlength{\dimen@}{\dimexpr#2\relax}% + }{% + \setlength{\dimen@}{#2}% + }% + \dimen@.99626\dimen@ + \edef\BKM@param{\strip@pt\dimen@}% + \expandafter\endgroup + \expandafter\def\expandafter\BKM@param\expandafter{\BKM@param}% + \else + \endgroup + \fi +} +\define@key{BKM}{pdftex}[]{% + \def\BKM@driver{pdftex}% +} +\define@key{BKM}{dvips}[]{% + \def\BKM@driver{dvips}% +} +\define@key{BKM}{dvipdfm}[]{% + \def\BKM@driver{dvipdfm}% +} +\define@key{BKM}{dvipdfmx}[]{% + \def\BKM@driver{dvipdfm}% +} +\define@key{BKM}{xetex}[]{% + \def\BKM@driver{dvipdfm}% +} +\InputIfFileExists{bookmark.cfg}{}{} +\providecommand*{\BookmarkDriverDefault}{dvips} +\ifpdf + \def\BKM@driver{pdftex}% +\else + \ifxetex + \def\BKM@driver{dvipdfm}% + \else + \let\BKM@driver\BookmarkDriverDefault + \fi +\fi +\ProcessKeyvalOptions* +\DisableKeyvalOption{BKM}{pdftex} +\DisableKeyvalOption{BKM}{dvips} +\DisableKeyvalOption{BKM}{dvipdfm} +\DisableKeyvalOption{BKM}{dvipdfmx} +\DisableKeyvalOption{BKM}{xetex} +\def\BKM@temp{pdftex}% +\ifpdf + \ifx\BKM@temp\BKM@driver + \else + \PackageWarningNoLine{bookmark}{% + Wrong driver `\BKM@driver', using `pdftex' instead% + }% + \let\BKM@driver\BKM@temp + \fi +\else + \ifx\BKM@temp\BKM@driver + \PackageError{bookmark}{% + Wrong driver, pdfTeX is not running in PDF mode.\MessageBreak + Package loading is aborted% + }\@ehc + \expandafter\expandafter\expandafter\endinput + \fi + \def\BKM@temp{dvipdfm}% + \ifxetex + \ifx\BKM@temp\BKM@driver + \else + \PackageWarningNoLine{bookmark}{% + Wrong driver `\BKM@driver',\MessageBreak + using `dvipdfm' for XeTeX instead% + }% + \let\BKM@driver\BKM@temp + \fi + \fi +\fi +\InputIfFileExists{bkm-\BKM@driver.def}{}{% + \PackageError{bookmark}{% + Unsupported driver `\BKM@driver'.\MessageBreak + Package loading is aborted% + }\@ehc + \endinput +} +\renewcommand*{\pdfbookmark}[3][0]{% + \bookmark[level=#1,dest={#3.#1}]{#2}% + \hyper@anchorstart{#3.#1}\hyper@anchorend +} +\renewcommand*{\currentpdfbookmark}{% + \pdfbookmark[\BKM@currentlevel]% +} +\renewcommand*{\subpdfbookmark}{% + \expandafter\pdfbookmark\expandafter[% + \the\numexpr\BKM@currentlevel+1\relax + ]% +} +\renewcommand*{\belowpdfbookmark}[2]{% + \xdef\BKM@gtemp{\number\BKM@currentlevel}% + \subpdfbookmark{#1}{#2}% + \global\let\BKM@currentlevel\BKM@gtemp +} +\renewcommand*{\Hy@writebookmark}[5]{% + \ifnum#4>\Hy@bookmarksdepth\relax + \else + \begingroup + \ifHy@bookmarksnumbered + \let\numberline\Hy@numberline + \let\partnumberline\Hy@numberline + \let\chapternumberline\Hy@numberline + \else + \let\numberline\@gobble + \let\partnumberline\@gobble + \let\chapternumberline\@gobble + \fi + \bookmark[level=#4,dest={#3}]{#2}% + \endgroup + \fi +} +\let\ReadBookmarks\relax +\endinput +%% +%% End of file `bookmark.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/flags.sty b/Master/texmf-dist/tex/latex/oberdiek/flags.sty new file mode 100644 index 00000000000..d27d287ff7d --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/flags.sty @@ -0,0 +1,115 @@ +%% +%% This is file `flags.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% flags.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2007 by Heiko Oberdiek +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. 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 flags.dtx +%% and the derived files +%% flags.sty, flags.pdf, flags.ins, flags.drv. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{flags}% + [2007/02/18 v0.1 Flag setting in bit fields (HO)] +\newcommand*{\resetflags}[1]{% + \expandafter\let\csname flags@#1\endcsname\@empty +} +\newcommand*{\printflags}[1]{% + \expandafter\@printflags\csname flags@#1\endcsname +} +\def\@printflags#1{% + \expandafter\@firstofone\expandafter{% + \number\numexpr + \ifx#1\@empty + 0% + \else + \expandafter\@@printflags#1% + \fi + }% +} +\def\@@printflags#1#2\fi{% + \fi + #1% + \ifx\\#2\\% + \else + +2*\numexpr\expandafter\@@printflags#2% + \fi +} +\newcommand*{\setflag}[2]{% + \expandafter\@setflag\csname flags@#1\expandafter\endcsname + \expandafter{\romannumeral\number\numexpr#2-1\relax000}% +} +\def\@setflag#1#2{% + \edef#1{% + \expandafter\@@setflag\expandafter{#1}{#2}% + }% +} +\def\@@setflag#1#2{% + \ifx\\#1\\% + \FLAGS@zero#2\relax + 1% + \else + \ifx\\#2\\% + 1\@gobble#1% + \else + \@car#1\@nil + \expandafter\@@@setflag\expandafter{\@gobble#2}{#1}% + \fi + \fi +} +\def\@@@setflag#1#2\fi\fi{% + \fi\fi + \expandafter\@@setflag\expandafter{\@cdr#2\@nil}{#1}% +} +\newcommand*{\clearflag}[2]{% + \expandafter\@clearflag\csname flags@#1\expandafter\endcsname + \expandafter{\romannumeral\number\numexpr#2-1\relax000}% +} +\def\@clearflag#1#2{% + \edef#1{% + \expandafter\@@clearflag\expandafter{#1}{#2}% + }% +} +\def\@@clearflag#1#2{% + \ifx\\#1\\% + \else + \ifx\\#2\\% + 0\@gobble#1% + \else + \@car#1\@nil + \expandafter\@@@clearflag\expandafter{\@gobble#2}{#1}% + \fi + \fi +} +\def\@@@clearflag#1#2\fi\fi{% + \fi\fi + \expandafter\@@clearflag\expandafter{\@cdr#2\@nil}{#1}% +} +\def\FLAGS@zero#1{% + \ifx#1\relax + \else + 0% + \expandafter\FLAGS@zero + \fi +} +\endinput +%% +%% End of file `flags.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty b/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty index 9d87bd2d252..dfecf584ad2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 1999-2001, 2006 by +%% Copyright (C) 1999-2001, 2006, 2007 by %% Heiko Oberdiek %% %% This work may be distributed and/or modified under the @@ -29,7 +29,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypcap}% - [2006/02/20 v1.5 Adjusting anchors of captions (HO)] + [2007/02/19 v1.6 Adjusting anchors of captions (HO)] \@ifundefined{hyper@@anchor}{% \PackageError{hypcap}{You have to load 'hyperref' first}\@ehc \endinput @@ -41,6 +41,7 @@ \newcommand*\capstart{% \H@refstepcounter\@captype % first part of caption \hyper@makecurrent\@captype + \global\let\hc@currentHref\@currentHref \vspace*{-\hypcapspace}% \begingroup \let\leavevmode\relax @@ -56,7 +57,11 @@ \long\def\hc@@caption#1[#2]#3{% \let\caption\hc@org@caption \global\@capstartfalse - \hyper@makecurrent\@captype + \ifHy@hypertexnames + \hyper@makecurrent\@captype + \else + \global\let\@currentHref\hc@currentHref + \fi \par\addcontentsline{% \csname ext@#1\endcsname}{#1}{% \protect\numberline{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index fdc0eba202e..270b021ff9c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2007/01/23 v1.4 Module abspage for zref (HO)] -\RequirePackage{zref-base}[2007/01/23] + [2007/02/18 v1.5 Module abspage for zref (HO)] +\RequirePackage{zref-base}[2007/02/18] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{everyshi}% \newcounter{abspage}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty index bd4e627c48d..50eaea33a1c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty @@ -33,7 +33,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2007/01/23 Module base for zref (HO)] + [2007/02/18 Module base for zref (HO)] \def\ZREF@name{zref} \def\ZREF@ErrorNoLine#1#2{% \begingroup @@ -171,6 +171,9 @@ \def\zref@setcurrent#1{% \expandafter\def\csname Z@C@#1\endcsname } +\def\zref@getcurrent#1{% + \csname Z@C@#1\endcsname +} \def\zref@label#1{% \zref@labelbylist{#1}\ZREF@mainlist } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index 4625851aaeb..894bbf6e1a5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2007/01/23 v1.4 Module counter for zref (HO)] -\RequirePackage{zref-base}[2007/01/23] + [2007/02/18 v1.5 Module counter for zref (HO)] +\RequirePackage{zref-base}[2007/02/18] \@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 ad258ee9656..b3d84d4131a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -33,10 +33,10 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2007/01/23 v1.4 Module dotfill for zref (HO)] -\RequirePackage{zref-base}[2007/01/23] + [2007/02/18 v1.5 Module dotfill for zref (HO)] +\RequirePackage{zref-base}[2007/02/18] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-savepos}[2007/01/23] +\RequirePackage{zref-savepos}[2007/02/18] \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 1ef719054dd..dea0d847acb 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2007/01/23 v1.4 Module hyperref for zref (HO)] -\RequirePackage{zref-base}[2007/01/23] + [2007/02/18 v1.5 Module hyperref for zref (HO)] +\RequirePackage{zref-base}[2007/02/18] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newprop{anchor}[]{% \@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 915fbd1bb1f..cf8fc71037e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2007/01/23 v1.4 Module lastpage for zref (HO)] -\RequirePackage{zref-base}[2007/01/23] + [2007/02/18 v1.5 Module lastpage for zref (HO)] +\RequirePackage{zref-base}[2007/02/18] \@ifundefined{ZREF@baseok}{\endinput}{} \AtBeginDocument{% \AtEndDocument{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index 01b42bd2ce0..098e30ba839 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -33,10 +33,10 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2007/01/23 v1.4 Module perpage for zref (HO)] -\RequirePackage{zref-base}[2007/01/23] + [2007/02/18 v1.5 Module perpage for zref (HO)] +\RequirePackage{zref-base}[2007/02/18] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2007/01/23] +\RequirePackage{zref-abspage}[2007/02/18] \zref@newprop*{pagevalue}[0]{\number\c@page} \zref@newlist{perpage} \zref@addprop{perpage}{abspage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty index 547fc105a61..7aec935d066 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -33,14 +33,14 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2007/01/23 v1.4 Module savepos for zref (HO)] -\RequirePackage{zref-base}[2007/01/23] + [2007/02/18 v1.5 Module savepos for zref (HO)] +\RequirePackage{zref-base}[2007/02/18] \@ifundefined{ZREF@baseok}{\endinput}{} \begingroup \@ifundefined{pdfsavepos}{% \ZREF@ErrorNoLine{% - \string\pdfsavepos\space is not supported\MessageBreak - in this pdfTeX version% + \string\pdfsavepos\space is not supported.\MessageBreak + It is provided by pdfTeX (1.40) or XeTeX% }\ZREF@UpdatePdfTeX \endgroup \endinput @@ -49,12 +49,16 @@ \RequirePackage{ifpdf} \ifpdf \else - \ifnum\pdftexversion<140 % - \ZREF@ErrorNoLine{% - \string\pdfsavepos\space is not supported in DVI mode\MessageBreak - of this pdfTeX version% - }\ZREF@UpdatePdfTeX - \expandafter\expandafter\expandafter\endinput + \begingroup\expandafter\expandafter\expandafter\endgroup + \expandafter\ifx\csname pdftexversion\endcsname\relax + \else + \ifnum\pdftexversion<140 % + \ZREF@ErrorNoLine{% + \string\pdfsavepos\space is not supported in DVI mode\MessageBreak + of this pdfTeX version% + }\ZREF@UpdatePdfTeX + \expandafter\expandafter\expandafter\endinput + \fi \fi \fi \zref@newlist{savepos} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty index 62d5e5b2257..1a44aabc8e0 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2007/01/23 v1.4 Module titleref for zref (HO)] -\RequirePackage{zref-base}[2007/01/23] + [2007/02/18 v1.5 Module titleref for zref (HO)] +\RequirePackage{zref-base}[2007/02/18] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{keyval} \let\zref@titleref@current\@empty diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index 20470f4add1..7cba89f1e69 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -33,11 +33,11 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2007/01/23 v1.4 Module totpages for zref (HO)] -\RequirePackage{zref-base}[2007/01/23] + [2007/02/18 v1.5 Module totpages for zref (HO)] +\RequirePackage{zref-base}[2007/02/18] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2007/01/23] -\RequirePackage{zref-lastpage}[2007/01/23] +\RequirePackage{zref-abspage}[2007/02/18] +\RequirePackage{zref-lastpage}[2007/02/18] \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 aae1366d12a..39703379ca3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2007/01/23 v1.4 Module user for zref (HO)] -\RequirePackage{zref-base}[2007/01/23] + [2007/02/18 v1.5 Module user for zref (HO)] +\RequirePackage{zref-base}[2007/02/18] \@ifundefined{ZREF@baseok}{\endinput}{} \newcommand*\zlabel{% \ifx\label\@gobble diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index 29e7426d9d5..4907b2ddb7c 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -33,8 +33,8 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2007/01/23 v1.4 Module xr for zref (HO)] -\RequirePackage{zref-base}[2007/01/23] + [2007/02/18 v1.5 Module xr for zref (HO)] +\RequirePackage{zref-base}[2007/02/18] \@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 2c03e84ecf1..ea6f14395e5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -33,13 +33,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2007/01/23 v1.4 New reference scheme for LaTeX2e (HO)] -\RequirePackage{zref-base}[2007/01/23] + [2007/02/18 v1.5 New reference scheme for LaTeX2e (HO)] +\RequirePackage{zref-base}[2007/02/18] \@ifundefined{ZREF@baseok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2007/01/23]% + \RequirePackage{zref-#1}[2007/02/18]% }% }% } -- cgit v1.2.3