summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oberdiek
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek')
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def17
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def80
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def79
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/bookmark.sty69
4 files changed, 126 insertions, 119 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def
index 7097a9b402c..ad3ea1d3260 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def
@@ -30,7 +30,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bkm-dvipdfm.def}%
- [2007/02/20 v0.2 bookmark driver for dvipdfm (HO)]
+ [2007/02/22 v0.4 bookmark driver for dvipdfm (HO)]
\newcount\BKM@id
\BKM@id=\z@
\def\BKM@0{000}
@@ -86,10 +86,11 @@
\edef\BKM@action{/Dest[@page\BKM@page/\BKM@view]}%
\fi
\else
+ \BKM@EscapeString\BKM@uri
\edef\BKM@action{%
/A<<%
/S/URI%
- /URI(\BKM@escapestring{\BKM@uri})%
+ /URI(\BKM@uri)%
>>%
}%
\fi
@@ -97,15 +98,17 @@
\edef\BKM@action{/A<<\BKM@rawaction>>}%
\fi
\else
+ \BKM@EscapeName\BKM@named
\edef\BKM@action{%
- /A<</S/Named/N/\BKM@escapename{\BKM@named}>>%
+ /A<</S/Named/N/\BKM@named>>%
}%
\fi
\else
+ \BKM@EscapeString\BKM@dest
\edef\BKM@action{%
/A<<%
/S/GoTo%
- /D(\BKM@escapestring{\BKM@dest})%
+ /D(\BKM@dest)%
>>%
}%
\fi
@@ -121,12 +124,14 @@
\fi
\edef\BKM@action{/D[\BKM@page/\BKM@view]}%
\else
- \edef\BKM@action{/D(\BKM@escapestring{\BKM@dest})}%
+ \BKM@EscapeString\BKM@dest
+ \edef\BKM@action{/D(\BKM@dest)}%
\fi
+ \BKM@EscapeString\BKM@gotor
\edef\BKM@action{%
/A<<%
/S/GoToR%
- /F(\BKM@escapestring{\BKM@gotor})%
+ /F(\BKM@gotor)%
\BKM@action
>>%
}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def
index 1de078f8033..a10ac2f354d 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def
@@ -30,7 +30,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bkm-dvips.def}%
- [2007/02/20 v0.2 bookmark driver for dvips (HO)]
+ [2007/02/22 v0.4 bookmark driver for dvips (HO)]
\def\BKM@filename{\jobname.out.ps}
\special{header=\BKM@filename}
\AtEndDocument{\BKM@dvips@out}
@@ -53,7 +53,8 @@
\def\BKM@DO@entry#1#2{%
\begingroup
\setkeys{BKM@DO}{#1}%
- \edef\BKM@DO@title{\BKM@unescapehex{#2}}%
+ \def\BKM@DO@title{#2}%
+ \BKM@UnescapeHex\BKM@DO@title
\expandafter\expandafter\expandafter\BKM@getx
\csname BKM@\BKM@DO@id\endcsname\@empty\@empty
\let\BKM@attr\@empty
@@ -89,32 +90,38 @@
}%
\fi
\else
+ \BKM@UnescapeHex\BKM@DO@uri
+ \BKM@EscapeString\BKM@DO@uri
\edef\BKM@action{%
/Action<<%
/Subtype/URI%
- /URI(\BKM@escapestring{\BKM@unescapehex{\BKM@DO@uri}})%
+ /URI(\BKM@DO@uri)%
>>%
}%
\fi
\else
+ \BKM@UnescapeHex\BKM@DO@rawaction
\edef\BKM@action{%
/Action<<%
- \BKM@unescapehex{\BKM@DO@rawaction}%
+ \BKM@DO@rawaction
>>%
}%
\fi
\else
+ \BKM@EscapeName\BKM@DO@named
\edef\BKM@action{%
/Action<<%
/Subtype/Named%
- /N/\BKM@escapename{\BKM@DO@named}%
+ /N/\BKM@DO@named
>>%
}%
\fi
\else
+ \BKM@UnescapeHex\BKM@DO@dest
+ \BKM@EscapeString\BKM@DO@dest
\edef\BKM@action{%
/Action/GoTo%
- /Dest(\BKM@escapestring{\BKM@DO@dest})cvn%
+ /Dest(\BKM@DO@dest)cvn%
}%
\fi
\else
@@ -130,13 +137,17 @@
/View[/\BKM@DO@view]%
}%
\else
+ \BKM@UnescapeHex\BKM@DO@dest
+ \BKM@EscapeString\BKM@DO@dest
\edef\BKM@action{%
- /Dest(\BKM@escapestring{\BKM@DO@dest})cvn%
+ /Dest(\BKM@DO@dest)cvn%
}%
\fi
+ \BKM@UnescapeHex\BKM@DO@gotor
+ \BKM@EscapeString\BKM@DO@gotor
\edef\BKM@action{%
/Action/GoToR%
- /F(\BKM@escapestring{\BKM@unescapehex{\BKM@DO@gotor}})%
+ /F(\BKM@DO@gotor)%
\BKM@action
}%
\fi
@@ -201,6 +212,11 @@
}%
\pdfstringdef\BKM@title{#2}%
\edef\BKM@FLAGS{\printflags{BKM@style}}%
+ \BKM@EscapeHex\BKM@dest
+ \BKM@EscapeHex\BKM@uri
+ \BKM@EscapeHex\BKM@gotor
+ \BKM@EscapeHex\BKM@rawaction
+ \BKM@EscapeHex\BKM@title
\immediate\write\@mainaux{%
\string\BKM@entry{%
id=\number\BKM@id
@@ -209,42 +225,18 @@
,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
+ \BKM@auxentry{dest}%
+ \BKM@auxentry{named}%
+ \BKM@auxentry{uri}%
+ \BKM@auxentry{gotor}%
+ \BKM@auxentry{page}%
+ \BKM@auxentry{view}%
+ \BKM@auxentry{rawaction}%
+ \BKM@auxentry{color}%
\ifnum\BKM@FLAGS>\z@
,flags=\BKM@FLAGS
\fi
- \ifx\BKM@color\@empty
- \else
- ,color={\BKM@color}%
- \fi
- }{\BKM@escapehex{\BKM@title}}%
+ }{\BKM@title}%
}%
\endgroup
\fi
@@ -254,6 +246,12 @@
\def\BKM@x@level{#2}%
\def\BKM@x@childs{#3}%
}
+\def\BKM@auxentry#1{%
+ \expandafter\ifx\csname BKM@#1\endcsname\@empty
+ \else
+ ,#1={\csname BKM@#1\endcsname}%
+ \fi
+}
\SetupKeyvalOptions{family=BKM@DO,prefix=BKM@DO@}
\DeclareStringOption[0]{id}
\DeclareBoolOption{open}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def
index 1295407ba63..e8fb50f63d4 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def
@@ -30,11 +30,12 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{bkm-pdftex.def}%
- [2007/02/20 v0.2 bookmark driver for pdftex (HO)]
+ [2007/02/22 v0.4 bookmark driver for pdftex (HO)]
\def\BKM@DO@entry#1#2{%
\begingroup
\setkeys{BKM@DO}{#1}%
- \edef\BKM@DO@title{\BKM@unescapehex{#2}}%
+ \def\BKM@DO@title{#2}%
+ \BKM@UnescapeHex\BKM@DO@title
\expandafter\expandafter\expandafter\BKM@getx
\csname BKM@\BKM@DO@id\endcsname\@empty\@empty
\let\BKM@attr\@empty
@@ -66,24 +67,29 @@
\edef\BKM@action{goto page\BKM@DO@page{/\BKM@DO@view}}%
\fi
\else
- \edef\BKM@action{user{<</S/URI/URI(%
- \BKM@escapestring{\BKM@unescapehex{\BKM@DO@uri}})>>}}%
+ \BKM@UnescapeHex\BKM@DO@uri
+ \BKM@EscapeString\BKM@DO@uri
+ \edef\BKM@action{user{<</S/URI/URI(\BKM@DO@uri)>>}}%
\fi
\else
+ \BKM@UnescapeHex\BKM@DO@rawaction
\edef\BKM@action{%
user{%
<<%
- \BKM@unescapehex{\BKM@DO@rawaction}%
+ \BKM@DO@rawaction
>>%
}%
}%
\fi
\else
+ \BKM@EscapeName\BKM@DO@named
\edef\BKM@action{%
- user{<</S/Named/N/\BKM@escapename{\BKM@DO@named}>>}%
+ user{<</S/Named/N/\BKM@DO@named>>}%
}%
\fi
\else
+ \BKM@UnescapeHex\BKM@DO@dest
+ \BKM@EscapeString\BKM@DO@dest
\edef\BKM@action{goto name{\BKM@DO@dest}}%
\fi
\else
@@ -98,13 +104,17 @@
\fi
\edef\BKM@action{/D[\BKM@DO@page/\BKM@DO@view]}%
\else
- \edef\BKM@action{/D(\BKM@escapestring{\BKM@DO@dest})}%
+ \BKM@UnescapeHex\BKM@DO@dest
+ \BKM@EscapeString\BKM@DO@dest
+ \edef\BKM@action{/D(\BKM@DO@dest)}%
\fi
+ \BKM@UnescapeHex\BKM@DO@gotor
+ \BKM@EscapeString\BKM@DO@gotor
\edef\BKM@action{%
user{%
<<%
/S/GoToR%
- /F(\BKM@escapestring{\BKM@unescapehex{\BKM@DO@gotor}})%
+ /F(\BKM@DO@gotor)%
\BKM@action
>>%
}%
@@ -163,6 +173,11 @@
}%
\pdfstringdef\BKM@title{#2}%
\edef\BKM@FLAGS{\printflags{BKM@style}}%
+ \BKM@EscapeHex\BKM@dest
+ \BKM@EscapeHex\BKM@uri
+ \BKM@EscapeHex\BKM@gotor
+ \BKM@EscapeHex\BKM@rawaction
+ \BKM@EscapeHex\BKM@title
\immediate\write\@mainaux{%
\string\BKM@entry{%
id=\number\BKM@id
@@ -171,42 +186,18 @@
,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
+ \BKM@auxentry{dest}%
+ \BKM@auxentry{named}%
+ \BKM@auxentry{uri}%
+ \BKM@auxentry{gotor}%
+ \BKM@auxentry{page}%
+ \BKM@auxentry{view}%
+ \BKM@auxentry{rawaction}%
+ \BKM@auxentry{color}%
\ifnum\BKM@FLAGS>\z@
,flags=\BKM@FLAGS
\fi
- \ifx\BKM@color\@empty
- \else
- ,color={\BKM@color}%
- \fi
- }{\BKM@escapehex{\BKM@title}}%
+ }{\BKM@title}%
}%
\endgroup
\fi
@@ -216,6 +207,12 @@
\def\BKM@x@level{#2}%
\def\BKM@x@childs{#3}%
}
+\def\BKM@auxentry#1{%
+ \expandafter\ifx\csname BKM@#1\endcsname\@empty
+ \else
+ ,#1={\csname BKM@#1\endcsname}%
+ \fi
+}
\SetupKeyvalOptions{family=BKM@DO,prefix=BKM@DO@}
\DeclareStringOption[0]{id}
\DeclareBoolOption{open}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty
index 758cb6a6134..cbf01370757 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty
@@ -30,25 +30,29 @@
%%
\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
+ [2007/02/22 v0.4 PDF bookmarks (HO)]
+\RequirePackage{pdfescape}%
+\def\BKM@EscapeName#1{%
+ \ifx#1\@empty
+ \else
+ \EdefEscapeName#1#1%
+ \fi
+}%
+\def\BKM@EscapeString#1{%
+ \ifx#1\@empty
+ \else
+ \EdefEscapeString#1#1%
+ \fi
+}%
+\def\BKM@EscapeHex#1{%
+ \ifx#1\@empty
+ \else
+ \EdefEscapeHex#1#1%
+ \fi
+}%
+\def\BKM@UnescapeHex#1{%
+ \EdefUnescapeHex#1#1%
+}%
\RequirePackage{ifpdf}
\RequirePackage{ifxetex}
\RequirePackage{hyperref}
@@ -368,18 +372,21 @@
\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
+ \def\BKM@type{#5}%
+ \ifx\BKM@type\Hy@bookmarkstype
+ \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
\fi
}
\let\ReadBookmarks\relax
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 16:59:44 +0000