summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-04-19 17:08:57 +0000
committerKarl Berry <karl@freefriends.org>2008-04-19 17:08:57 +0000
commite01d0e61ce7553ae7d91e31196d754100e418bfc (patch)
treee5f559860bd3378e2d1e36db609b4ae256b0515f /Master
parent3ebb5d696023c7c1dd3c42045057c647fbe5cd2f (diff)
hyperref update (18apr08)
git-svn-id: svn://tug.org/texlive/trunk@7520 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/ChangeLog25
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdfbin289413 -> 291512 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/README60
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/README.pdfbin270631 -> 271734 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hyperref/hyperref.pdfbin3327761 -> 3375499 bytes
-rw-r--r--Master/texmf-dist/source/latex/hyperref/bmhydoc.sty10
-rw-r--r--Master/texmf-dist/source/latex/hyperref/hyperref.dtx809
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def253
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvips.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdvipson.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hdviwind.def7
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hpdftex.def219
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htex4ht.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/htexture.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtex.def34
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hyperref.sty311
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/hypertex.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/nohyperref.sty4
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/pd1enc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/pdfmark.def200
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puarenc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puenc.def2
-rw-r--r--Master/texmf-dist/tex/latex/hyperref/puvnenc.def2
-rwxr-xr-xMaster/tlpkg/bin/ctan2tds14
27 files changed, 1254 insertions, 716 deletions
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
index fec50825bc6..6b827be4bb2 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
@@ -1,3 +1,28 @@
+2008-04-17 6.77q Heiko Oberdiek
+ * 6.77q
+ * Fix for small problem with XeLaTeX (\string^^f4).
+
+2008-04-16 6.77p Heiko Oberdiek
+ * 6.77p
+ * Patch for missing anchor settings with amsmath (multline) by
+ Ross Moore.
+ * New option `pdfa' to improve compatibility with PDF/A,
+ see README.
+
+2008-04-15 6.77o Heiko Oberdiek
+ * 6.77o
+ * Babel 2008/03/16 v3.8j disables shorthands for bookmarks.
+ This reduces the probability of warnings, but at the cost
+ of ugly bookmarks. Therefore hyperref tries to undo this.
+ See LaTeX bug-report `babel/4017'.
+ * Fix for bulgarian.ldf's \@Alph and \@alph for \hyper@makecurrent.
+ * Patch for missing anchor settings with amsmath (multline) by
+ Ross Moore.
+
+2008-04-13 6.77n Heiko Oberdiek
+ * 6.77n
+ * New option `linktoc' added, see README.
+
2008-04-12 6.77m Heiko Oberdiek
* 6.77m
* Surrogate support for bookmarks (utf8.def, including utf8
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
index f3273100ddc..da7d5e08040 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hyperref/README b/Master/texmf-dist/doc/latex/hyperref/README
index ac07b2858ae..f2329a13fce 100644
--- a/Master/texmf-dist/doc/latex/hyperref/README
+++ b/Master/texmf-dist/doc/latex/hyperref/README
@@ -1,4 +1,4 @@
-README for hyperref bundle, 2008/04/12
+README for hyperref bundle, 2008/04/16
TABLE OF CONTENTS
@@ -45,8 +45,6 @@ b) nameref' a package to allow reference to the *names* of sections rather
Also a ZIP file is provided that contains the files, already sorted
in a TDS tree:
- CTAN:macros/latex/contrib/hyperref/hyperref.tds.zip
-or
CTAN:install/macros/latex/contrib/hyperref.tds.zip
`CTAN:' means one of the `Comprehensive TeX Archive Network'
@@ -172,6 +170,46 @@ other packages apart from nameref and backref:
5 NEW FEATURES
==============
+Option `pdfa' added
+-------`----'------
+ The new option `pdfa' tries to avoid violations of PDF/A in code
+ generated by hyperref. However, the result is usually not in PDF/A,
+ because many features aren't controlled by hyperref (XMP metadata,
+ fonts, colors, driver dependend low level stuff, ...).
+
+ Currently, option `pdfa' sets and disables the following items:
+ * Enabled annotation flags: Print, NoZoom, NoRotate [PDF/A 6.5.3].
+ * Disabled annotation flags: Hidden, Invisible, NoView [PDF/A 6.5.3].
+ * Disabled: Launch action (\href{run:...} [PDF/A 6.6.1].
+ * Restricted: Named actions (\Acrobatmenu: NextPage, PrevPage,
+ FirstPage, LastPage) [PDF/A 6.6.1].
+ * Many things are disabled in PDF formulars:
+ * JavaScript actions [PDF/A 6.6.1]
+ * Trigger events (additional actions) [PDF/A 6.6.2]
+ * Push button (because of JavaScript)
+ * Interactive Forms: Flag NeedAppearances is the default `false'
+ (Because of this, hyperref's implementation of Forms looks ugly).
+ [PDF/A 6.9]
+
+ The default value of the new option `pdfa' is `false'. It influences
+ the loading of the package and cannot be changed after hyperref is
+ loaded (\usepackage{hyperref}).
+
+ ToDo:
+ * XMP support
+ * ...
+ But perhaps Adobe Acrobat is now happy and can now convert
+ the PDF file to PDF/A.
+
+Option `linktoc' added
+-------`-------'------
+ The new option `linktoc' allows more control which part
+ of an entry in the table of contents is made into a link:
+ * `linktoc=none' (no links)
+ * `linktoc=section' (default behaviour, same as `linktocpage=false')
+ * `linktoc=page' (same as `linktocpage=true')
+ * `linktoc=all' (both the section and page part are links)
+
Option `pdfnewwindow' changed
-------`------------'--------
Before 6.77b:
@@ -642,24 +680,12 @@ float
foiltex
-------
+ Update to version 2008/01/28 v2.1.4b:
Since version 6.77a hyperref does not hack into \@begindvi,
it uses package `atbegshi' instead, that hooks into \shipout.
Thus the patch of `foils.cls' regarding hyperref is now obsolete
and causes an undefined error message about \@hyperfixhead.
- Workaround:
- \makeatletter
- \providecommand*{\@hyperfixhead}{}
- \makeatother
- If you don't want to have page anchors (page anchors are the default),
- then \HyPL@EveryPage gets executed twice on each page, this can be
- avoided by disabling page anchors later:
- \documentclass{foils}
- \usepackage{hyperref}
- \makeatletter
- \providecommand*{\@hyperfixhead}{}
- \makeatother
- \begin{document}
- \hypersetup{pageanchor=false}
+ This is fixed in FoilTeX 2.1.4b.
footnote
--------
diff --git a/Master/texmf-dist/doc/latex/hyperref/README.pdf b/Master/texmf-dist/doc/latex/hyperref/README.pdf
index 1634651fdc6..d3ee9441eaf 100644
--- a/Master/texmf-dist/doc/latex/hyperref/README.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/README.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
index 3d9b7376a1a..6d94485dd72 100644
--- a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/hyperref/bmhydoc.sty b/Master/texmf-dist/source/latex/hyperref/bmhydoc.sty
index dc9d5d847fa..a250f2261e6 100644
--- a/Master/texmf-dist/source/latex/hyperref/bmhydoc.sty
+++ b/Master/texmf-dist/source/latex/hyperref/bmhydoc.sty
@@ -71,14 +71,16 @@
\ignorespaces
}%
\begin{description}
- \entry{manual.pdf}{Manual}
- The user documentation is also available as HTML.
- \entry{README.pdf}{README}
+ \entry{manual.pdf}{\textbf{Manual}}
+ The \textbf{USER MANUAL} (also available as HTML).
+ \entry{README.pdf}{\textbf{README}}
+ The \textbf{README} file (also available as text file).
Here information is collected that is not yet
in the manual: new features, package compatibility,
limitations, known problems, \dots
\entry{ChangeLog.pdf}{ChangeLog}
- This file records the version history.
+ This file records the version history
+ (also available as text file).
\entry{options.pdf}{Options}
This file provides a short option summary.
\entry{slides.pdf}{Bookmark talk, slides}
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index 3fcb559f2f3..f38a70fe03c 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -39,7 +39,7 @@
%<puenc>\ProvidesFile{puenc.def}
%<puvnenc>\ProvidesFile{puvnenc.def}
%<puarenc>\ProvidesFile{puarenc.def}
-%<!none> [2008/04/12 v6.77m
+%<!none> [2008/04/17 v6.77q
%<package> Hypertext links for LaTeX]
%<nohyperref> Dummy hyperref (SR)]
%<driver> Hyperref documentation driver file]
@@ -116,7 +116,7 @@
\end{document}
%</driver>
% \fi
-% \CheckSum{22290}
+% \CheckSum{22578}
%
% \MakeShortVerb{|}
% \StopEventually{}
@@ -625,6 +625,7 @@
\newif\ifHy@verbose
\newif\ifHy@windowui
\newif\ifHy@displaydoctitle
+\newif\ifHy@pdfa
% \end{macrocode}
% Defaults for the switches are now set.
% \begin{macrocode}
@@ -663,6 +664,7 @@
\Hy@verbosefalse
\Hy@windowuitrue
\Hy@displaydoctitlefalse
+\Hy@pdfafalse
% \end{macrocode}
%
% \section{Common help macros}
@@ -3186,7 +3188,9 @@
}%
}%
\def\HyPsd@UTFviii@ccxliv@undef{\@inpenc@undefined@{utf8}}%
- \edef\HyPsd@UTFviii@ccxliv@def{\noexpand\UTFviii@four@octets\string^^f4}%
+ \edef\HyPsd@UTFviii@ccxliv@def{%
+ \noexpand\UTFviii@four@octets\string ^^f4%
+ }%
% \end{macrocode}
%
% The two octet form of UTF-8 |110aaabb| (A) and |10cccddd| (B)
@@ -3453,7 +3457,7 @@
% \begin{macrocode}
\let\literalps@out\@gobble
\newcommand\pdfbookmark[3][]{}
-\let\Acrobatmenu\@gobble
+\def\Acrobatmenu#1#2{\leavevmode#2}
\def\Hy@writebookmark#1#2#3#4#5{}%
% \end{macrocode}
%
@@ -3733,6 +3737,32 @@
}
\define@key{Hyp}{linktocpage}[true]{%
\Hy@boolkey{linktocpage}{#1}%
+ \ifHy@linktocpage
+ \let\Hy@linktoc\Hy@linktoc@page
+ \else
+ \let\Hy@linktoc\Hy@linktoc@section
+ \fi
+}
+\chardef\Hy@linktoc@none=0 %
+\chardef\Hy@linktoc@section=1 %
+\chardef\Hy@linktoc@page=2 %
+\chardef\Hy@linktoc@all=3 %
+\ifHy@linktocpage
+ \let\Hy@linktoc\Hy@linktoc@page
+\else
+ \let\Hy@linktoc\Hy@linktoc@section
+\fi
+\define@key{Hyp}{linktoc}{%
+ \@ifundefined{Hy@linktoc@#1}{%
+ \Hy@Warning{%
+ Unexpected value `#1' of\MessageBreak
+ option `linktoc' instead of `none',\MessageBreak
+ `section', `page' or `all'%
+ }%
+ }{%
+ \expandafter\let\expandafter\Hy@linktoc
+ \csname Hy@linktoc@#1\endcsname
+ }%
}
\define@key{Hyp}{extension}{\def\XR@ext{#1}}
\def\XR@ext{dvi}
@@ -4934,6 +4964,9 @@
\define@key{Hyp}{pdfdisplaydoctitle}[true]{%
\Hy@boolkey[pdfdisplaydoctitle]{displaydoctitle}{#1}%
}
+\define@key{Hyp}{pdfa}[true]{%
+ \Hy@boolkey{pdfa}{#1}%
+}
\define@key{Hyp}{pdfnewwindow}[true]{%
\def\Hy@temp{#1}%
\ifx\Hy@temp\@empty
@@ -5081,7 +5114,7 @@
\def\hyper@linkurl#1#2{#1}%
\def\hyper@linkfile#1#2#3{#1}%
\def\hyper@link@[#1]#2#3{}%
- \def\Acrobatmenu#1#2{#2}%
+ \def\Acrobatmenu#1#2{\leavevmode#2}%
\let\PDF@SetupDoc\@empty
\let\PDF@FinishDoc\@empty
\let\@fifthoffive\@secondoftwo
@@ -5097,6 +5130,59 @@
\Hy@DisableOption{pdfversion}%
% \end{macrocode}
%
+% \subsection{PDF/A}
+%
+% \begin{macrocode}
+\Hy@DisableOption{pdfa}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\ifHy@pdfa
+ \def\Hy@Acrobatmenu#1#2{%
+ \leavevmode
+ \begingroup
+ \edef\x{#1}%
+ \@onelevel@sanitize\x
+ \ifx\x\Hy@NextPage
+ \let\y=Y%
+ \else
+ \ifx\x\Hy@PrevPage
+ \let\y=Y%
+ \else
+ \ifx\x\Hy@FirstPage
+ \let\y=Y%
+ \else
+ \ifx\x\Hy@LastPage
+ \let\y=Y%
+ \else
+ \let\y=N%
+ \fi
+ \fi
+ \fi
+ \fi
+ \expandafter\endgroup
+ \ifx\y Y%
+ \else
+ \PackageError{hyperref}{%
+ PDF/A: Named action `#1' is not permitted%
+ }\@ehc
+ {#2}%
+ \expandafter\@gobble
+ \fi
+ }%
+ \def\Hy@temp#1{%
+ \expandafter\def\csname Hy@#1\endcsname{#1}%
+ \expandafter\@onelevel@sanitize\csname Hy@#1\endcsname
+ }%
+ \Hy@temp{NextPage}%
+ \Hy@temp{PrevPage}%
+ \Hy@temp{FirstPage}%
+ \Hy@temp{LastPage}%
+\else
+ \def\Hy@Acrobatmenu#1#2{\leavevmode}%
+\fi
+% \end{macrocode}
+%
% \subsection{Patch for babel's
% \texorpdfstring{\cs{texttilde}}{\\texttilde}}
% Babel does not define \cmd{\texttilde} in NFSS2 manner,
@@ -5113,6 +5199,43 @@
\fi
% \end{macrocode}
%
+% \subsection{Patch for babel 3.8j}
+% Babel 2008/03/16 v3.8j adds a patch to disable shorthands
+% for bookmarks. That reduces warnings, but the bookmarks
+% are ugly. Therefore the following patch tries to undo this.
+% \begin{macrocode}
+\@ifpackageloaded{babel}{%
+ \@ifpackagelater{babel}{2008/03/16}{%
+ \def\Hy@PatchLanguageShorthands#1{%
+ \begingroup
+ \edef\x{#1}%
+ \@onelevel@sanitize\x
+ \def\y{system}%
+ \@onelevel@sanitize\y
+ \expandafter\endgroup
+ \ifx\x\y
+ \else
+ \HyOrg@languageshorthands{#1}%
+ \fi
+ }%
+ \AtBeginDocument{%
+ \begingroup
+ \toks0=\expandafter{\pdfstringdefPreHook}%
+ \xdef\pdfstringdefPreHook{%
+ \let\noexpand\HyOrg@languageshorthands
+ \noexpand\languageshorthands
+ \let\noexpand\languageshorthands
+ \noexpand\Hy@PatchLanguageShorthands
+ \the\toks0 %
+ \let\noexpand\languageshorthands
+ \noexpand\HyOrg@languageshorthands
+ }%
+ \endgroup
+ }%
+ }{}%
+}{}
+% \end{macrocode}
+%
% \begin{macrocode}
\ifHy@figures
\Hy@Info{Hyper figures ON}%
@@ -5698,7 +5821,17 @@
% if it starts `run:', its to launch an application.
% \begin{macrocode}
\ifx\@pdftempa\@pdftempwordrun
- \expandafter\@hyper@launch#7\\{#3}{#2}%
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Launch action is prohibited%
+ }\@ehc
+ \begingroup
+ \leavevmode
+ #2%
+ \endgroup
+ \else
+ \expandafter\@hyper@launch#7\\{#3}{#2}%
+ \fi
\else
% \end{macrocode}
% otherwise its a URL
@@ -6041,6 +6174,41 @@
\HyField@NewFlag{F}{LockedContents}{10}% PDF 1.7
% \end{macrocode}
%
+% \begin{macrocode}
+\ifHy@pdfa
+ \def\HyField@PDFAFlagWarning#1#2{%
+ \Hy@Warning{%
+ PDF/A: Annotation flag `#1' must\MessageBreak
+ be set to `#2'%
+ }%
+ }%
+ \Fld@invisiblefalse
+ \def\Fld@invisibletrue{%
+ \HyField@PDFAFlagWarning{invisible}{false}%
+ }%
+ \Fld@hiddenfalse
+ \def\Fld@hiddentrue{%
+ \HyField@PDFAFlagWarning{hidden}{false}%
+ }%
+ \Fld@printtrue
+ \def\Fld@printfalse{%
+ \HyField@PDFAFlagWarning{print}{true}%
+ }%
+ \Fld@nozoomtrue
+ \def\Fld@nozoomfalse{%
+ \HyField@PDFAFlagWarning{nozoom}{true}%
+ }%
+ \Fld@norotatetrue
+ \def\Fld@norotatefalse{%
+ \HyField@PDFAFlagWarning{norotate}{true}%
+ }%
+ \Fld@noviewfalse
+ \def\Fld@noviewtrue{%
+ \HyField@PDFAFlagWarning{noview}{false}%
+ }%
+\fi
+% \end{macrocode}
+%
% Submit flags. Flag 1 Include/Exclude is not supported,
% use option noexport instead.
% \begin{macrocode}
@@ -6573,67 +6741,42 @@
\def\Fld@onmouseup@code{}
\def\Fld@onenter@code{}
\def\Fld@onexit@code{}
-\define@key{Field}{keystroke}{%
- \def\Fld@keystroke@code{#1}%
-}
-\define@key{Field}{format}{%
- \def\Fld@format@code{#1}%
-}
-\define@key{Field}{validate}{%
- \def\Fld@validate@code{#1}%
-}
-\define@key{Field}{calculate}{%
- \def\Fld@calculate@code{#1}%
-}
-\define@key{Field}{onfocus}{%
- \def\Fld@onfocus@code{#1}%
-}
-\define@key{Field}{onblur}{%
- \def\Fld@onblur@code{#1}%
-}
-\define@key{Field}{onenter}{%
- \def\Fld@onenter@code{#1}%
-}
-\define@key{Field}{onexit}{%
- \def\Fld@onexit@code{#1}%
-}
-\define@key{Field}{onselect}{%
- \Field@addtoks{onselect}{#1}%
-}
-\define@key{Field}{onchange}{%
- \Field@addtoks{onchange}{#1}%
-}
-\define@key{Field}{onclick}{%
- \def\Fld@onclick{#1}%
- \Field@addtoks{onclick}{#1}%
-}
-\define@key{Field}{ondblclick}{%
- \Field@addtoks{ondblclick}{#1}%
-}
-\define@key{Field}{onmousedown}{%
- \Field@addtoks{onmousedown}{#1}%
-}
-\define@key{Field}{onmouseup}{%
- \Field@addtoks{onmouseup}{#1}%
-}
-\define@key{Field}{onmouseover}{%
- \Field@addtoks{onmouseover}{#1}%
-}
-\define@key{Field}{onmousemove}{%
- \Field@addtoks{onmousemove}{#1}%
-}
-\define@key{Field}{onmouseout}{%
- \Field@addtoks{onmouseout}{#1}%
-}
-\define@key{Field}{onkeypress}{%
- \Field@addtoks{onkeypress}{#1}%
-}
-\define@key{Field}{onkeydown}{%
- \Field@addtoks{onkeydown}{#1}%
+\def\Hy@temp#1{%
+ \expandafter\Hy@@temp\csname Fld@#1@code\endcsname{#1}%
}
-\define@key{Field}{onkeyup}{%
- \Field@addtoks{onkeyup}{#1}%
+\def\Hy@@temp#1#2{%
+ \ifHy@pdfa
+ \define@key{Field}{#2}{%
+ \PackageError{hyperref}{%
+ PDF/A: Additional action #2 is prohibited%
+ }\@ehc
+ }%
+ \else
+ \define@key{Field}{#2}{%
+ \def#1{##1}%
+ }%
+ \fi
}
+\Hy@temp{keystroke}
+\Hy@temp{format}
+\Hy@temp{validate}
+\Hy@temp{calculate}
+\Hy@temp{onfocus}
+\Hy@temp{onblur}
+\Hy@temp{onenter}
+\Hy@temp{onexit}
+\Hy@temp{onselect}
+\Hy@temp{onchange}
+\Hy@temp{onclick}
+\Hy@temp{ondblclick}
+\Hy@temp{onmousedown}
+\Hy@temp{onmouseup}
+\Hy@temp{onmouseover}
+\Hy@temp{onmousemove}
+\Hy@temp{onmouseout}
+\Hy@temp{onkeypress}
+\Hy@temp{onkeydown}
+\Hy@temp{onkeyup}
%
\DeclareRobustCommand\TextField{%
\@ifnextchar[{\@TextField}{\@TextField[]}%
@@ -6853,7 +6996,7 @@
% \end{macrocode}
% Some top-level commands:
% \begin{macrocode}
-\let\Acrobatmenu\@gobble
+\def\Acrobatmenu#1#2{\leavevmode#2}
\let\pdfstringdefDisableCommands\@gobbletwo
\let\texorpdfstring\@firstoftwo
\let\pdfbookmark\@undefined
@@ -7718,6 +7861,12 @@
\def\@Alph{Alph\@arabic}%
\fi
}%
+ \ifx\@Alph\@Alph@bul
+ \def\@Alph{Alph\@arabic}%
+ \fi
+ \ifx\@alph\@alph@bul
+ \def\@alph{alph\@arabic}%
+ \fi
\ifHy@naturalnames
\let\textlatin\@firstofone
\xdef\@currentHlabel{\csname the#1\endcsname}%
@@ -8960,14 +9109,22 @@
\ifx\\#4\\%
\csname l@#1\endcsname{#2}{#3}%
\else
- \ifHy@linktocpage
+ \ifcase\Hy@linktoc % none
+ \csname l@#1\endcsname{#2}{#3}%
+ \or % section
+ \csname l@#1\endcsname{%
+ \hyper@linkstart{link}{#4}{#2}\hyper@linkend
+ }{#3}%
+ \or % page
\csname l@#1\endcsname{{#2}}{%
\hyper@linkstart{link}{#4}{#3}\hyper@linkend
}%
- \else
+ \else % all
\csname l@#1\endcsname{%
\hyper@linkstart{link}{#4}{#2}\hyper@linkend
- }{#3}%
+ }{%
+ \hyper@linkstart{link}{#4}{#3}\hyper@linkend
+ }%
\fi
\fi
}
@@ -9013,22 +9170,34 @@
% of theirs. Damned if we are going to try and work out what
% they get up to. Just stick a label of `AMS' on the front, and use the
% label \emph{they} worked out. If that produces something invalid, I give
-% up. They'll change all the code again anyway, I expect.
+% up. They'll change all the code again anyway, I expect (SR).
+%
+% Version 6.77p uses a patch by Ross Moore.
% \begin{macrocode}
-\let\Hmake@df@tag@@\make@df@tag@@
-\def\make@df@tag@@#1{%
- \Hmake@df@tag@@{#1}%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{AMS.\the\Hy@linkcounter}%
- \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
-}
-\let\Hmake@df@tag@@@\make@df@tag@@@
-\def\make@df@tag@@@#1{%
- \Hmake@df@tag@@@{#1}%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{AMS.\the\Hy@linkcounter}%
- \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
-}
+\@ifpackageloaded{amsmath}{%
+ \def\Hy@make@anchor{%
+ \Hy@GlobalStepCount\Hy@linkcounter
+ \xdef\@currentHref{AMS.\the\Hy@linkcounter}%
+ \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
+ }%
+ \def\Hy@make@df@tag@@#1{%
+ \gdef\df@tag{%
+ \maketag@@@{\Hy@make@anchor#1}%
+ \def\@currentlabel{#1}%
+ }%
+ }%
+ \def\Hy@make@df@tag@@@#1{%
+ \gdef\df@tag{%
+ \tagform@{\Hy@make@anchor#1}%
+ \toks@\@xp{\p@equation{#1}}%
+ \edef\@currentlabel{\the\toks@}%
+ }%
+ }%
+ \let\HyOrg@make@df@tag@@\make@df@tag@@
+ \let\HyOrg@make@df@tag@@@\make@df@tag@@@
+ \let\make@df@tag@@\Hy@make@df@tag@@
+ \let\make@df@tag@@@\Hy@make@df@tag@@@
+}{}
% \end{macrocode}
% Only play with |\seteqlebal| if we are using pdftex. Other drivers
% cause problems; requested by Michael Downes (AMS).
@@ -9924,6 +10093,7 @@
\Hy@pstringdef\Hy@testname\Hy@testname
\fi
\Hy@StartlinkName{%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\@pdfhighlight\@empty
\else
@@ -9980,6 +10150,7 @@
}%
user{%
/Subtype/Link%
+ \ifHy@pdfa /F 4\fi
/A<<%
/Type/Action%
/S/URI%
@@ -9993,8 +10164,8 @@
}
\def\hyper@linkfile#1#2#3{% anchor text, filename, linkname
\begingroup
- \Hy@pstringdef\Hy@pstringF{#2}%
- \Hy@pstringdef\Hy@pstringD{#3}%
+ \Hy@pstringdef\Hy@pstringF{#2}%
+ \Hy@pstringdef\Hy@pstringD{#3}%
\leavevmode
\pdfstartlink
attr{%
@@ -10010,6 +10181,7 @@
}%
user {%
/Subtype/Link%
+ \ifHy@pdfa /F 4\fi
/A<<%
/F(\Hy@pstringF)%
/S/GoToR%
@@ -10059,6 +10231,7 @@
}%
user {%
/Subtype/Link%
+ \ifHy@pdfa /F 4\fi
/A<<%
/F(\Hy@pstringF)%
/S/Launch%
@@ -10441,27 +10614,29 @@
\Hy@DisableOption{setpagesize}%
}
\def\Acrobatmenu#1#2{%
- \leavevmode
- \pdfstartlink
- attr{%
- \Hy@setpdfborder
- \ifx\@pdfhighlight\@empty
- \else
- /H\@pdfhighlight
- \fi
- \ifx\@menubordercolor\relax
- \else
- /C[\@menubordercolor]%
- \fi
- }%
- user{%
- /Subtype/Link%
- /A<<%
- /S/Named/N/#1%
- >>%
- }%
- \relax
- \Hy@colorlink\@menucolor#2\close@pdflink
+ \Hy@Acrobatmenu{#1}{#2}{%
+ \pdfstartlink
+ attr{%
+ \Hy@setpdfborder
+ \ifx\@pdfhighlight\@empty
+ \else
+ /H\@pdfhighlight
+ \fi
+ \ifx\@menubordercolor\relax
+ \else
+ /C[\@menubordercolor]%
+ \fi
+ }%
+ user{%
+ /Subtype/Link%
+ \ifHy@pdfa /F 4\fi
+ /A<<%
+ /S/Named/N/#1%
+ >>%
+ }%
+ \relax
+ \Hy@colorlink\@menucolor#2\close@pdflink
+ }%
}
%</pdftex>
%<*hypertex>
@@ -10938,6 +11113,7 @@
bann<<%
/Type/Annot%
/Subtype/Link%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\expandafter\ifx\csname @#1bordercolor\endcsname\relax
\else
@@ -10966,6 +11142,7 @@
bann<<%
/Type/Annot%
/Subtype/Link%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\@filebordercolor\relax
\else
@@ -10982,33 +11159,6 @@
\Hy@colorlink\@filecolor#1\Hy@endcolorlink
\@pdfm@mark{eann}%
}
-\def\@hyper@launch run:#1\\#2#3{% filename, anchor text linkname
- \Hy@pstringdef\Hy@pstringF{#1}%
- \Hy@pstringdef\Hy@pstringP{#3}%
- \leavevmode
- \@pdfm@mark{%
- bann<<%
- /Type/Annot%
- /Subtype/Link%
- \Hy@setpdfborder
- \ifx\@runbordercolor\relax
- \else
- /C[\@runbordercolor]%
- \fi
- /A<<%
- /S/Launch%
- /F(\Hy@pstringF)%
- \Hy@SetNewWindow
- \ifx\\#3\\%
- \else
- /Win<</P(\Hy@pstringP)/F(\Hy@pstringF)>>%
- \fi
- >>%
- >>%
- }%
- \Hy@colorlink\@runcolor#2\Hy@endcolorlink
- \@pdfm@mark{eann}%
-}
\def\hyper@linkurl#1#2{%
\Hy@pstringdef\Hy@pstringURI{#2}%
\leavevmode
@@ -11016,6 +11166,7 @@
bann<<%
/Type/Annot%
/Subtype/Link%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\@urlbordercolor\relax
\else
@@ -11031,24 +11182,26 @@
\@pdfm@mark{eann}%
}
\def\Acrobatmenu#1#2{%
- \leavevmode
- \@pdfm@mark{%
- bann<<%
- /Type/Annot%
- /Subtype/Link%
- /A<<%
- /S/Named%
- /N/#1%
+ \Hy@Acrobatmenu{#1}{#2}{%
+ \@pdfm@mark{%
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
+ \ifHy@pdfa /F 4\fi
+ /A<<%
+ /S/Named%
+ /N/#1%
+ >>%
+ \Hy@setpdfborder
+ \ifx\@menubordercolor\relax
+ \relax
+ /C[\@menubordercolor]%
+ \fi
>>%
- \Hy@setpdfborder
- \ifx\@menubordercolor\relax
- \relax
- /C[\@menubordercolor]%
- \fi
- >>%
+ }%
+ \Hy@colorlink\@menucolor#2\Hy@endcolorlink
+ \@pdfm@mark{eann}%
}%
- \Hy@colorlink\@menucolor#2\Hy@endcolorlink
- \@pdfm@mark{eann}%
}
\ifx\@pdfproducer\relax
\def\@pdfproducer{dvipdfm}%
@@ -11349,6 +11502,7 @@
\special{!%
aref <u=/Type /Action /S /URI /URI (\Hy@pstringURI)>;%
a=<%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\CurrentBorderColor\relax
\else
@@ -11364,6 +11518,7 @@
\special{!%
aref \Hy@testname;%
a=<%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\CurrentBorderColor\relax
\else
@@ -11384,6 +11539,7 @@
\ifnum\Hy@VTeXversion>753 \ifHy@newwindow n\fi\fi
f=#2>#3;%
a=<%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\@filebordercolor\relax
\else
@@ -11402,6 +11558,7 @@
\special{!%
aref <u=/Type /Action /S /URI /URI (\Hy@pstringURI)>;%
a=<%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\@urlbordercolor\relax
\else
@@ -11427,6 +11584,7 @@
\special{!%
aref \Hy@testname;%
a=<%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\CurrentBorderColor\relax
\else
@@ -11453,6 +11611,7 @@
\ifx\\#3\\\else /Win<</F(\Hy@pstringF)/P(\Hy@pstringP)>>\fi%
>;%
a=<%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\@runbordercolor\relax
\else
@@ -11464,19 +11623,21 @@
\special{!endaref}%
}
\def\Acrobatmenu#1#2{%
- \leavevmode
- \special{!%
- aref <u=/S /Named /N /#1>;%
- a=<%
- \Hy@setpdfborder
- \ifx\@menubordercolor\relax
- \else
- /C[\@menubordercolor]%
- \fi
- >%
+ \Hy@Acrobatmenu{#1}{#2}{%
+ \special{!%
+ aref <u=/S /Named /N /#1>;%
+ a=<%
+ \ifHy@pdfa /F 4\fi
+ \Hy@setpdfborder
+ \ifx\@menubordercolor\relax
+ \else
+ /C[\@menubordercolor]%
+ \fi
+ >%
+ }%
+ \Hy@colorlink\@menucolor#2\Hy@endcolorlink
+ \special{!endaref}%
}%
- \Hy@colorlink\@menucolor#2\Hy@endcolorlink
- \special{!endaref}%
}
% \end{macrocode}
%
@@ -12006,6 +12167,7 @@
pdfmark=/ANN,%
linktype=link,%
Subtype=/Link,%
+ PDFAFlags=4,%
Dest=\hyper@currentanchor,%
AcroHighlight=\@pdfhighlight,%
Border=\@pdfborder,%
@@ -12141,6 +12303,7 @@
BorderStyle=\@pdfborderstyle,%
pdfmark=/ANN,%
Subtype=/Link,%
+ PDFAFlags=4,%
Dest=\Hy@testname
}%
%</pdfmarkbase>
@@ -12472,6 +12635,11 @@
\define@key{PDF}{File}{\pdf@addtoks{(#1)}{File}}
% parameter is a int
\define@key{PDF}{Flags}{\pdf@addtoks{#1}{Flags}}
+\define@key{PDF}{PDFAFlags}{%
+ \ifHy@pdfa
+ \pdf@addtoks{#1}{F}%
+ \fi
+}
% parameter is a name
\define@key{PDF}{AcroHighlight}{%
\begingroup
@@ -12530,14 +12698,17 @@
%</pdfmarkbase|dvipdf>
%<*pdfmark|dvipdf>
\def\Acrobatmenu#1#2{%
- \pdfmark[{#2}]{%
- linktype=menu,%
- pdfmark=/ANN,%
- AcroHighlight=\@pdfhighlight,%
- Border=\@pdfborder,%
- BorderStyle=\@pdfborderstyle,%
- Action={<< /Subtype /Named /N /#1 >>},%
- Subtype=/Link%
+ \Hy@Acrobatmenu{#1}{#2}{%
+ \pdfmark[{#2}]{%
+ linktype=menu,%
+ pdfmark=/ANN,%
+ AcroHighlight=\@pdfhighlight,%
+ Border=\@pdfborder,%
+ BorderStyle=\@pdfborderstyle,%
+ Action={<< /Subtype /Named /N /#1 >>},%
+ Subtype=/Link,%
+ PDFAFlags=4%
+ }%
}%
}
% \end{macrocode}
@@ -12552,6 +12723,7 @@
Color=.2 .1 .5,%
pdfmark=/ANN,%
Subtype=/Link,%
+ PDFAFlags=4,%
Page=/Next%
}%
}
@@ -12566,6 +12738,7 @@
Color=.4 .4 .1,%
pdfmark=/ANN,%
Subtype=/Link,%
+ PDFAFlags=4,%
Page=/Prev%
}%
}
@@ -12589,7 +12762,8 @@
BorderStyle=\@pdfborderstyle,%
Color=\@urlbordercolor,%
Action={<< /Subtype /URI /URI (\Hy@pstringURI) >>},%
- Subtype=/Link%
+ Subtype=/Link,%
+ PDFAFlags=4%
}%
%</pdfmarkbase>
%<*dvipdf>
@@ -12614,6 +12788,7 @@
\pdfmark[{#1}]{%
pdfmark=/ANN,%
Subtype=/Link,%
+ PDFAFlags=4,%
AcroHighlight=\@pdfhighlight,%
Border=\@pdfborder,%
BorderStyle=\@pdfborderstyle,%
@@ -12658,6 +12833,7 @@
\pdfmark[{#2}]{%
pdfmark=/ANN,%
Subtype=/Link,%
+ PDFAFlags=4,%
AcroHighlight=\@pdfhighlight,%
Border=\@pdfborder,%
BorderStyle=\@pdfborderstyle,%
@@ -13673,7 +13849,10 @@
>>%
/DA(/Helv 10 Tf 0 g)%
/CO{corder}%
- /NeedAppearances true%
+ \ifHy@pdfa
+ \else
+ /NeedAppearances true%
+ \fi
>>%
/PUT pdfmark%
[%
@@ -13818,14 +13997,25 @@
\expandafter\HyField@SetKeys\expandafter{%
\DefaultOptionsofPushButton,#1%
}%
- \HyField@FlagsPushButton
- \ifFld@hidden\def\Fld@width{1sp}\fi
- \LayoutPushButtonField{%
- \Hy@escapeform\PDFForm@Push
- \pdfmark[\MakeButtonField{#2}]{%
- pdfmark=/ANN,Raw={\PDFForm@Push}%
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Push button with JavaScript is prohibited%
+ }\@ehc
+ \LayoutPushButtonField{%
+ \leavevmode
+ \MakeButtonField{#2}%
}%
- }%
+ \else
+ \HyField@FlagsPushButton
+ \ifFld@hidden\def\Fld@width{1sp}\fi
+ \LayoutPushButtonField{%
+ \leavevmode
+ \Hy@escapeform\PDFForm@Push
+ \pdfmark[\MakeButtonField{#2}]{%
+ pdfmark=/ANN,Raw={\PDFForm@Push}%
+ }%
+ }%
+ \fi
\endgroup
}
\def\@Submit[#1]#2{%
@@ -13854,14 +14044,22 @@
\expandafter\HyField@SetKeys\expandafter{%
\DefaultOptionsofReset,#1%
}%
- \HyField@FlagsPushButton
- \ifFld@hidden\def\Fld@width{1sp}\fi
- \Hy@escapeform\PDFForm@Reset
- \pdfmark[\MakeButtonField{#2}]{%
- pdfmark=/ANN,Raw={\PDFForm@Reset}%
- }%
+ \leavevmode
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Reset action is prohibited%
+ }\@ehc
+ \MakeButtonField{#2}%
+ \else
+ \HyField@FlagsPushButton
+ \ifFld@hidden\def\Fld@width{1sp}\fi
+ \Hy@escapeform\PDFForm@Reset
+ \pdfmark[\MakeButtonField{#2}]{%
+ pdfmark=/ANN,Raw={\PDFForm@Reset}%
+ }%
+ \fi
\endgroup
-}
+}%
\def\@CheckBox[#1]#2{% parameters, label
\def\Fld@name{#2}%
\def\Fld@default{0}%
@@ -14264,15 +14462,25 @@
\DefaultOptionsofPushButton,#1%
}%
\PDFForm@Name
- \HyField@FlagsPushButton
- \ifFld@hidden\def\Fld@width{1sp}\fi
- \LayoutPushButtonField{%
- \leavevmode
- \Hy@escapeform\PDFForm@Push
- \pdfstartlink user {\PDFForm@Push}\relax
- \MakeButtonField{#2}%
- \pdfendlink
- }%
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Push button with JavaScript is prohibited%
+ }\@ehc
+ \LayoutPushButtonField{%
+ \leavevmode
+ \MakeButtonField{#2}%
+ }%
+ \else
+ \HyField@FlagsPushButton
+ \ifFld@hidden\def\Fld@width{1sp}\fi
+ \LayoutPushButtonField{%
+ \leavevmode
+ \Hy@escapeform\PDFForm@Push
+ \pdfstartlink user {\PDFForm@Push}\relax
+ \MakeButtonField{#2}%
+ \pdfendlink
+ }%
+ \fi
\endgroup
}
\def\@Submit[#1]#2{%
@@ -14305,13 +14513,20 @@
\expandafter\HyField@SetKeys\expandafter{%
\DefaultOptionsofReset,#1%
}%
- \HyField@FlagsPushButton
- \ifFld@hidden\def\Fld@width{1sp}\fi
\leavevmode
- \Hy@escapeform\PDFForm@Reset
- \pdfstartlink user {\PDFForm@Reset}\relax
- \MakeButtonField{#2}%
- \pdfendlink
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Reset action is prohibited%
+ }\@ehc
+ \MakeButtonField{#2}%
+ \else
+ \HyField@FlagsPushButton
+ \ifFld@hidden\def\Fld@width{1sp}\fi
+ \Hy@escapeform\PDFForm@Reset
+ \pdfstartlink user {\PDFForm@Reset}\relax
+ \MakeButtonField{#2}%
+ \pdfendlink
+ \fi
\endgroup
}
\def\@CheckBox[#1]#2{% parameters, label
@@ -14398,7 +14613,10 @@
>>%
>>%
/DA(/Helv 10 Tf 0 g)%
- /NeedAppearances true%
+ \ifHy@pdfa
+ \else
+ /NeedAppearances true%
+ \fi
>>%
}
\edef\OBJ@acroform{\the\pdflastobj}
@@ -14438,7 +14656,10 @@
>>%
/DA(/Helv 10 Tf 0 g)%
/CO @corder%
- /NeedAppearances true%
+ \ifHy@pdfa
+ \else
+ /NeedAppearances true%
+ \fi
>>%
}%
\@pdfm@mark{put @catalog <</AcroForm @aform>>}%
@@ -14666,21 +14887,31 @@
\DefaultOptionsofPushButton,#1%
}%
\PDFForm@Name
- \HyField@FlagsPushButton
- \ifFld@hidden\def\Fld@width{1sp}\fi
- \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}%
- \HyField@AdvanceAnnotCount
- \LayoutPushButtonField{%
- \leavevmode
- \Hy@escapeform\PDFForm@Push
- \@pdfm@mark{%
- ann @push\HyField@TheAnnotCount\space
- \dvipdfm@setdim
- <<\PDFForm@Push>>%
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Push button with JavaScript is prohibited%
+ }\@ehc
+ \LayoutPushButtonField{%
+ \leavevmode
+ \MakeButtonField{#2}%
}%
- }%
- \unhbox\pdfm@box
- \@pdfm@mark{put @afields @push\HyField@TheAnnotCount}%
+ \else
+ \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}%
+ \HyField@FlagsPushButton
+ \ifFld@hidden\def\Fld@width{1sp}\fi
+ \HyField@AdvanceAnnotCount
+ \LayoutPushButtonField{%
+ \leavevmode
+ \Hy@escapeform\PDFForm@Push
+ \@pdfm@mark{%
+ ann @push\HyField@TheAnnotCount\space
+ \dvipdfm@setdim
+ <<\PDFForm@Push>>%
+ }%
+ }%
+ \unhbox\pdfm@box
+ \@pdfm@mark{put @afields @push\HyField@TheAnnotCount}%
+ \fi
\endgroup
}
% \end{macrocode}
@@ -14725,19 +14956,26 @@
\expandafter\HyField@SetKeys\expandafter{%
\DefaultOptionsofReset,#1%
}%
- \HyField@FlagsPushButton
- \ifFld@hidden\def\Fld@width{1sp}\fi
- \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}%
\leavevmode
- \Hy@escapeform\PDFForm@Reset
- \HyField@AdvanceAnnotCount
- \@pdfm@mark{%
- ann @reset\HyField@TheAnnotCount\space
- \dvipdfm@setdim
- <<\PDFForm@Reset>>%
- }%
- \unhbox\pdfm@box
- \@pdfm@mark{put @afields @reset\HyField@TheAnnotCount}%
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Reset action is prohibited%
+ }\@ehc
+ \MakeButtonField{#2}%
+ \else
+ \HyField@FlagsPushButton
+ \ifFld@hidden\def\Fld@width{1sp}\fi
+ \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}%
+ \Hy@escapeform\PDFForm@Reset
+ \HyField@AdvanceAnnotCount
+ \@pdfm@mark{%
+ ann @reset\HyField@TheAnnotCount\space
+ \dvipdfm@setdim
+ <<\PDFForm@Reset>>%
+ }%
+ \unhbox\pdfm@box
+ \@pdfm@mark{put @afields @reset\HyField@TheAnnotCount}%
+ \fi
\endgroup
}
% \end{macrocode}
@@ -14929,31 +15167,34 @@
% \end{macro}
% \begin{macro}{\PDFForm@Push}
% \begin{macrocode}
-\def\PDFForm@Push{%
- /Subtype/Widget%
- \Fld@annotflags
- /T(\Fld@name)%
- /FT/Btn%
- \Fld@flags
- /H/P%
- /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
- \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
- \ifx\Fld@bordercolor\relax\else 1\fi
- \space
- \else
- /MK<<%
- \ifnum\Fld@rotation=\z@
- \else
- /R \Fld@rotation
- \fi
- \ifx\Fld@bordercolor\relax
- \else
- /BC[\Fld@bordercolor]%
- \fi
- >>%
- \fi
- /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>%
-}
+\ifHy@pdfa
+\else
+ \def\PDFForm@Push{%
+ /Subtype/Widget%
+ \Fld@annotflags
+ /T(\Fld@name)%
+ /FT/Btn%
+ \Fld@flags
+ /H/P%
+ /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
+ \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
+ \ifx\Fld@bordercolor\relax\else 1\fi
+ \space
+ \else
+ /MK<<%
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
+ >>%
+ \fi
+ /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>%
+ }%
+\fi
% \end{macrocode}
% \end{macro}
%
@@ -15034,7 +15275,10 @@
\def\Fld@additionalactions{%
\if-\Fld@@additionalactions-%
\else
- /AA<<\Fld@@additionalactions>>%
+ \ifHy@pdfa
+ \else
+ /AA<<\Fld@@additionalactions>>%
+ \fi
\fi
}
% \end{macrocode}
@@ -15190,34 +15434,37 @@
% \end{macro}
% \begin{macro}{\PDFForm@Reset}
% \begin{macrocode}
-\def\PDFForm@Reset{%
- /Subtype/Widget%
- \Fld@annotflags
- /T(\Fld@name)%
- /FT/Btn%
- \Fld@flags
- /H/P%
- /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)%
- \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
- \ifx\Fld@bordercolor\relax\else 1\fi
- \space
- \else
- /MK<<%
- \ifnum\Fld@rotation=\z@
- \else
- /R \Fld@rotation
- \fi
- \ifx\Fld@bordercolor\relax
- \else
- /BC[\Fld@bordercolor]%
- \fi
+\ifHy@pdfa
+\else
+ \def\PDFForm@Reset{%
+ /Subtype/Widget%
+ \Fld@annotflags
+ /T(\Fld@name)%
+ /FT/Btn%
+ \Fld@flags
+ /H/P%
+ /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)%
+ \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
+ \ifx\Fld@bordercolor\relax\else 1\fi
+ \space
+ \else
+ /MK<<%
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
% /CA (Clear)
% /AC (Done)
- >>%
- \fi
- /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
- /A<</S/ResetForm>>%
-}
+ >>%
+ \fi
+ /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
+ /A<</S/ResetForm>>%
+ }%
+\fi
% \end{macrocode}
% \end{macro}
% \begin{macrocode}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 6021aeb9ddc..22b791a45a4 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvipdfm.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref driver for dvipdfm]
\def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}}
\ifHy@pagelabels
@@ -195,6 +195,7 @@
bann<<%
/Type/Annot%
/Subtype/Link%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\expandafter\ifx\csname @#1bordercolor\endcsname\relax
\else
@@ -223,6 +224,7 @@
bann<<%
/Type/Annot%
/Subtype/Link%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\@filebordercolor\relax
\else
@@ -239,33 +241,6 @@
\Hy@colorlink\@filecolor#1\Hy@endcolorlink
\@pdfm@mark{eann}%
}
-\def\@hyper@launch run:#1\\#2#3{% filename, anchor text linkname
- \Hy@pstringdef\Hy@pstringF{#1}%
- \Hy@pstringdef\Hy@pstringP{#3}%
- \leavevmode
- \@pdfm@mark{%
- bann<<%
- /Type/Annot%
- /Subtype/Link%
- \Hy@setpdfborder
- \ifx\@runbordercolor\relax
- \else
- /C[\@runbordercolor]%
- \fi
- /A<<%
- /S/Launch%
- /F(\Hy@pstringF)%
- \Hy@SetNewWindow
- \ifx\\#3\\%
- \else
- /Win<</P(\Hy@pstringP)/F(\Hy@pstringF)>>%
- \fi
- >>%
- >>%
- }%
- \Hy@colorlink\@runcolor#2\Hy@endcolorlink
- \@pdfm@mark{eann}%
-}
\def\hyper@linkurl#1#2{%
\Hy@pstringdef\Hy@pstringURI{#2}%
\leavevmode
@@ -273,6 +248,7 @@
bann<<%
/Type/Annot%
/Subtype/Link%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\@urlbordercolor\relax
\else
@@ -288,24 +264,26 @@
\@pdfm@mark{eann}%
}
\def\Acrobatmenu#1#2{%
- \leavevmode
- \@pdfm@mark{%
- bann<<%
- /Type/Annot%
- /Subtype/Link%
- /A<<%
- /S/Named%
- /N/#1%
+ \Hy@Acrobatmenu{#1}{#2}{%
+ \@pdfm@mark{%
+ bann<<%
+ /Type/Annot%
+ /Subtype/Link%
+ \ifHy@pdfa /F 4\fi
+ /A<<%
+ /S/Named%
+ /N/#1%
+ >>%
+ \Hy@setpdfborder
+ \ifx\@menubordercolor\relax
+ \relax
+ /C[\@menubordercolor]%
+ \fi
>>%
- \Hy@setpdfborder
- \ifx\@menubordercolor\relax
- \relax
- /C[\@menubordercolor]%
- \fi
- >>%
+ }%
+ \Hy@colorlink\@menucolor#2\Hy@endcolorlink
+ \@pdfm@mark{eann}%
}%
- \Hy@colorlink\@menucolor#2\Hy@endcolorlink
- \@pdfm@mark{eann}%
}
\ifx\@pdfproducer\relax
\def\@pdfproducer{dvipdfm}%
@@ -426,7 +404,10 @@
>>%
/DA(/Helv 10 Tf 0 g)%
/CO @corder%
- /NeedAppearances true%
+ \ifHy@pdfa
+ \else
+ /NeedAppearances true%
+ \fi
>>%
}%
\@pdfm@mark{put @catalog <</AcroForm @aform>>}%
@@ -601,21 +582,31 @@
\DefaultOptionsofPushButton,#1%
}%
\PDFForm@Name
- \HyField@FlagsPushButton
- \ifFld@hidden\def\Fld@width{1sp}\fi
- \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}%
- \HyField@AdvanceAnnotCount
- \LayoutPushButtonField{%
- \leavevmode
- \Hy@escapeform\PDFForm@Push
- \@pdfm@mark{%
- ann @push\HyField@TheAnnotCount\space
- \dvipdfm@setdim
- <<\PDFForm@Push>>%
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Push button with JavaScript is prohibited%
+ }\@ehc
+ \LayoutPushButtonField{%
+ \leavevmode
+ \MakeButtonField{#2}%
}%
- }%
- \unhbox\pdfm@box
- \@pdfm@mark{put @afields @push\HyField@TheAnnotCount}%
+ \else
+ \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}%
+ \HyField@FlagsPushButton
+ \ifFld@hidden\def\Fld@width{1sp}\fi
+ \HyField@AdvanceAnnotCount
+ \LayoutPushButtonField{%
+ \leavevmode
+ \Hy@escapeform\PDFForm@Push
+ \@pdfm@mark{%
+ ann @push\HyField@TheAnnotCount\space
+ \dvipdfm@setdim
+ <<\PDFForm@Push>>%
+ }%
+ }%
+ \unhbox\pdfm@box
+ \@pdfm@mark{put @afields @push\HyField@TheAnnotCount}%
+ \fi
\endgroup
}
\def\@Submit[#1]#2{%
@@ -650,19 +641,26 @@
\expandafter\HyField@SetKeys\expandafter{%
\DefaultOptionsofReset,#1%
}%
- \HyField@FlagsPushButton
- \ifFld@hidden\def\Fld@width{1sp}\fi
- \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}%
\leavevmode
- \Hy@escapeform\PDFForm@Reset
- \HyField@AdvanceAnnotCount
- \@pdfm@mark{%
- ann @reset\HyField@TheAnnotCount\space
- \dvipdfm@setdim
- <<\PDFForm@Reset>>%
- }%
- \unhbox\pdfm@box
- \@pdfm@mark{put @afields @reset\HyField@TheAnnotCount}%
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Reset action is prohibited%
+ }\@ehc
+ \MakeButtonField{#2}%
+ \else
+ \HyField@FlagsPushButton
+ \ifFld@hidden\def\Fld@width{1sp}\fi
+ \setbox\pdfm@box=\hbox{\MakeButtonField{#2}}%
+ \Hy@escapeform\PDFForm@Reset
+ \HyField@AdvanceAnnotCount
+ \@pdfm@mark{%
+ ann @reset\HyField@TheAnnotCount\space
+ \dvipdfm@setdim
+ <<\PDFForm@Reset>>%
+ }%
+ \unhbox\pdfm@box
+ \@pdfm@mark{put @afields @reset\HyField@TheAnnotCount}%
+ \fi
\endgroup
}
\def\@CheckBox[#1]#2{% parameters, label
@@ -821,31 +819,34 @@
/H/P%
\ifFld@checked /V/Yes\else /V/Off\fi
}
-\def\PDFForm@Push{%
- /Subtype/Widget%
- \Fld@annotflags
- /T(\Fld@name)%
- /FT/Btn%
- \Fld@flags
- /H/P%
- /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
- \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
- \ifx\Fld@bordercolor\relax\else 1\fi
- \space
- \else
- /MK<<%
- \ifnum\Fld@rotation=\z@
- \else
- /R \Fld@rotation
- \fi
- \ifx\Fld@bordercolor\relax
- \else
- /BC[\Fld@bordercolor]%
- \fi
- >>%
- \fi
- /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>%
-}
+\ifHy@pdfa
+\else
+ \def\PDFForm@Push{%
+ /Subtype/Widget%
+ \Fld@annotflags
+ /T(\Fld@name)%
+ /FT/Btn%
+ \Fld@flags
+ /H/P%
+ /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
+ \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
+ \ifx\Fld@bordercolor\relax\else 1\fi
+ \space
+ \else
+ /MK<<%
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
+ >>%
+ \fi
+ /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>%
+ }%
+\fi
\def\Fld@@additionalactions{%
\ifx\Fld@keystroke@code\@empty
\else
@@ -891,7 +892,10 @@
\def\Fld@additionalactions{%
\if-\Fld@@additionalactions-%
\else
- /AA<<\Fld@@additionalactions>>%
+ \ifHy@pdfa
+ \else
+ /AA<<\Fld@@additionalactions>>%
+ \fi
\fi
}
\def\PDFForm@List{%
@@ -1026,32 +1030,35 @@
\Fld@submitflags
>>%
}
-\def\PDFForm@Reset{%
- /Subtype/Widget%
- \Fld@annotflags
- /T(\Fld@name)%
- /FT/Btn%
- \Fld@flags
- /H/P%
- /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)%
- \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
- \ifx\Fld@bordercolor\relax\else 1\fi
- \space
- \else
- /MK<<%
- \ifnum\Fld@rotation=\z@
- \else
- /R \Fld@rotation
- \fi
- \ifx\Fld@bordercolor\relax
- \else
- /BC[\Fld@bordercolor]%
- \fi
- >>%
- \fi
- /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
- /A<</S/ResetForm>>%
-}
+\ifHy@pdfa
+\else
+ \def\PDFForm@Reset{%
+ /Subtype/Widget%
+ \Fld@annotflags
+ /T(\Fld@name)%
+ /FT/Btn%
+ \Fld@flags
+ /H/P%
+ /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)%
+ \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
+ \ifx\Fld@bordercolor\relax\else 1\fi
+ \space
+ \else
+ /MK<<%
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
+ >>%
+ \fi
+ /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
+ /A<</S/ResetForm>>%
+ }%
+\fi
\def\Hy@writebookmark#1#2#3#4#5{%
% section number, text, label, level, file
\ifx\WriteBookmarks\relax%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index 495bf388297..971eb187bf0 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvips.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref driver for dvips]
\input{pdfmark.def}%
\ifx\@pdfproducer\relax
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
index fac61e54b69..4d6675957ce 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdvipson.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref driver for dvipsone]
\providecommand*\@pdfborder{0 0 1}
\providecommand*\@pdfborderstyle{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
index 61d90bac0a2..7fa6400b0c7 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hdviwind.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref driver for dviwindo]
\def\Hy@PutCatalog#1{%
\pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}%
@@ -511,6 +511,11 @@
\define@key{PDF}{Dir}{\pdf@addtoks{(#1)}{Dir}}
\define@key{PDF}{File}{\pdf@addtoks{(#1)}{File}}
\define@key{PDF}{Flags}{\pdf@addtoks{#1}{Flags}}
+\define@key{PDF}{PDFAFlags}{%
+ \ifHy@pdfa
+ \pdf@addtoks{#1}{F}%
+ \fi
+}
\define@key{PDF}{AcroHighlight}{%
\begingroup
\edef\x{#1}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index 188e211ed61..4ac6e978500 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hpdftex.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref driver for pdfTeX]
\let\Hy@PutCatalog\pdfcatalog
\ifHy@pagelabels
@@ -164,6 +164,7 @@
\Hy@pstringdef\Hy@testname\Hy@testname
\fi
\Hy@StartlinkName{%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\@pdfhighlight\@empty
\else
@@ -220,6 +221,7 @@
}%
user{%
/Subtype/Link%
+ \ifHy@pdfa /F 4\fi
/A<<%
/Type/Action%
/S/URI%
@@ -233,8 +235,8 @@
}
\def\hyper@linkfile#1#2#3{% anchor text, filename, linkname
\begingroup
- \Hy@pstringdef\Hy@pstringF{#2}%
- \Hy@pstringdef\Hy@pstringD{#3}%
+ \Hy@pstringdef\Hy@pstringF{#2}%
+ \Hy@pstringdef\Hy@pstringD{#3}%
\leavevmode
\pdfstartlink
attr{%
@@ -250,6 +252,7 @@
}%
user {%
/Subtype/Link%
+ \ifHy@pdfa /F 4\fi
/A<<%
/F(\Hy@pstringF)%
/S/GoToR%
@@ -285,6 +288,7 @@
}%
user {%
/Subtype/Link%
+ \ifHy@pdfa /F 4\fi
/A<<%
/F(\Hy@pstringF)%
/S/Launch%
@@ -586,27 +590,29 @@
\Hy@DisableOption{setpagesize}%
}
\def\Acrobatmenu#1#2{%
- \leavevmode
- \pdfstartlink
- attr{%
- \Hy@setpdfborder
- \ifx\@pdfhighlight\@empty
- \else
- /H\@pdfhighlight
- \fi
- \ifx\@menubordercolor\relax
- \else
- /C[\@menubordercolor]%
- \fi
- }%
- user{%
- /Subtype/Link%
- /A<<%
- /S/Named/N/#1%
- >>%
- }%
- \relax
- \Hy@colorlink\@menucolor#2\close@pdflink
+ \Hy@Acrobatmenu{#1}{#2}{%
+ \pdfstartlink
+ attr{%
+ \Hy@setpdfborder
+ \ifx\@pdfhighlight\@empty
+ \else
+ /H\@pdfhighlight
+ \fi
+ \ifx\@menubordercolor\relax
+ \else
+ /C[\@menubordercolor]%
+ \fi
+ }%
+ user{%
+ /Subtype/Link%
+ \ifHy@pdfa /F 4\fi
+ /A<<%
+ /S/Named/N/#1%
+ >>%
+ }%
+ \relax
+ \Hy@colorlink\@menucolor#2\close@pdflink
+ }%
}
\def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum
\typeout{Sorry, pdftex does not support FORM gauges}%
@@ -781,15 +787,25 @@
\DefaultOptionsofPushButton,#1%
}%
\PDFForm@Name
- \HyField@FlagsPushButton
- \ifFld@hidden\def\Fld@width{1sp}\fi
- \LayoutPushButtonField{%
- \leavevmode
- \Hy@escapeform\PDFForm@Push
- \pdfstartlink user {\PDFForm@Push}\relax
- \MakeButtonField{#2}%
- \pdfendlink
- }%
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Push button with JavaScript is prohibited%
+ }\@ehc
+ \LayoutPushButtonField{%
+ \leavevmode
+ \MakeButtonField{#2}%
+ }%
+ \else
+ \HyField@FlagsPushButton
+ \ifFld@hidden\def\Fld@width{1sp}\fi
+ \LayoutPushButtonField{%
+ \leavevmode
+ \Hy@escapeform\PDFForm@Push
+ \pdfstartlink user {\PDFForm@Push}\relax
+ \MakeButtonField{#2}%
+ \pdfendlink
+ }%
+ \fi
\endgroup
}
\def\@Submit[#1]#2{%
@@ -822,13 +838,20 @@
\expandafter\HyField@SetKeys\expandafter{%
\DefaultOptionsofReset,#1%
}%
- \HyField@FlagsPushButton
- \ifFld@hidden\def\Fld@width{1sp}\fi
\leavevmode
- \Hy@escapeform\PDFForm@Reset
- \pdfstartlink user {\PDFForm@Reset}\relax
- \MakeButtonField{#2}%
- \pdfendlink
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Reset action is prohibited%
+ }\@ehc
+ \MakeButtonField{#2}%
+ \else
+ \HyField@FlagsPushButton
+ \ifFld@hidden\def\Fld@width{1sp}\fi
+ \Hy@escapeform\PDFForm@Reset
+ \pdfstartlink user {\PDFForm@Reset}\relax
+ \MakeButtonField{#2}%
+ \pdfendlink
+ \fi
\endgroup
}
\def\@CheckBox[#1]#2{% parameters, label
@@ -915,7 +938,10 @@
>>%
>>%
/DA(/Helv 10 Tf 0 g)%
- /NeedAppearances true%
+ \ifHy@pdfa
+ \else
+ /NeedAppearances true%
+ \fi
>>%
}
\edef\OBJ@acroform{\the\pdflastobj}
@@ -999,31 +1025,34 @@
/H/P%
\ifFld@checked /V/Yes\else /V/Off\fi
}
-\def\PDFForm@Push{%
- /Subtype/Widget%
- \Fld@annotflags
- /T(\Fld@name)%
- /FT/Btn%
- \Fld@flags
- /H/P%
- /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
- \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
- \ifx\Fld@bordercolor\relax\else 1\fi
- \space
- \else
- /MK<<%
- \ifnum\Fld@rotation=\z@
- \else
- /R \Fld@rotation
- \fi
- \ifx\Fld@bordercolor\relax
- \else
- /BC[\Fld@bordercolor]%
- \fi
- >>%
- \fi
- /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>%
-}
+\ifHy@pdfa
+\else
+ \def\PDFForm@Push{%
+ /Subtype/Widget%
+ \Fld@annotflags
+ /T(\Fld@name)%
+ /FT/Btn%
+ \Fld@flags
+ /H/P%
+ /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
+ \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
+ \ifx\Fld@bordercolor\relax\else 1\fi
+ \space
+ \else
+ /MK<<%
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
+ >>%
+ \fi
+ /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>%
+ }%
+\fi
\def\Fld@@additionalactions{%
\ifx\Fld@keystroke@code\@empty
\else
@@ -1069,7 +1098,10 @@
\def\Fld@additionalactions{%
\if-\Fld@@additionalactions-%
\else
- /AA<<\Fld@@additionalactions>>%
+ \ifHy@pdfa
+ \else
+ /AA<<\Fld@@additionalactions>>%
+ \fi
\fi
}
\def\PDFForm@List{%
@@ -1204,32 +1236,35 @@
\Fld@submitflags
>>%
}
-\def\PDFForm@Reset{%
- /Subtype/Widget%
- \Fld@annotflags
- /T(\Fld@name)%
- /FT/Btn%
- \Fld@flags
- /H/P%
- /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)%
- \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
- \ifx\Fld@bordercolor\relax\else 1\fi
- \space
- \else
- /MK<<%
- \ifnum\Fld@rotation=\z@
- \else
- /R \Fld@rotation
- \fi
- \ifx\Fld@bordercolor\relax
- \else
- /BC[\Fld@bordercolor]%
- \fi
- >>%
- \fi
- /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
- /A<</S/ResetForm>>%
-}
+\ifHy@pdfa
+\else
+ \def\PDFForm@Reset{%
+ /Subtype/Widget%
+ \Fld@annotflags
+ /T(\Fld@name)%
+ /FT/Btn%
+ \Fld@flags
+ /H/P%
+ /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)%
+ \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
+ \ifx\Fld@bordercolor\relax\else 1\fi
+ \space
+ \else
+ /MK<<%
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
+ >>%
+ \fi
+ /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
+ /A<</S/ResetForm>>%
+ }%
+\fi
\def\Hy@writebookmark#1#2#3#4#5{%
% section number, text, label, level, file
\ifx\WriteBookmarks\relax%
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index cf95acdbc7e..d3544cfc16b 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htex4ht.cfg}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref configuration file for TeX4ht]
\IfFileExists{\jobname.cfg}{\endinput}{}
\Preamble{html}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
index 49aa471139a..0cb48dabdfb 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htex4ht.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref driver for TeX4ht]
\@ifpackageloaded{tex4ht}{%
\typeout{hyperref tex4ht: tex4ht already loaded}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def
index 129561aa2de..5efd1d77bcb 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htexture.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{htexture.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref driver for Textures]
\begingroup
\obeylines %
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index 81c4d61a8f4..5745045fa45 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtex.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref driver for VTeX in PDF/PS mode]
\edef\Hy@VTeXversion{%
\ifx\VTeXversion\@undefined
@@ -198,6 +198,7 @@
\special{!%
aref <u=/Type /Action /S /URI /URI (\Hy@pstringURI)>;%
a=<%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\CurrentBorderColor\relax
\else
@@ -213,6 +214,7 @@
\special{!%
aref \Hy@testname;%
a=<%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\CurrentBorderColor\relax
\else
@@ -233,6 +235,7 @@
\ifnum\Hy@VTeXversion>753 \ifHy@newwindow n\fi\fi
f=#2>#3;%
a=<%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\@filebordercolor\relax
\else
@@ -251,6 +254,7 @@
\special{!%
aref <u=/Type /Action /S /URI /URI (\Hy@pstringURI)>;%
a=<%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\@urlbordercolor\relax
\else
@@ -276,6 +280,7 @@
\special{!%
aref \Hy@testname;%
a=<%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\CurrentBorderColor\relax
\else
@@ -302,6 +307,7 @@
\ifx\\#3\\\else /Win<</F(\Hy@pstringF)/P(\Hy@pstringP)>>\fi%
>;%
a=<%
+ \ifHy@pdfa /F 4\fi
\Hy@setpdfborder
\ifx\@runbordercolor\relax
\else
@@ -313,19 +319,21 @@
\special{!endaref}%
}
\def\Acrobatmenu#1#2{%
- \leavevmode
- \special{!%
- aref <u=/S /Named /N /#1>;%
- a=<%
- \Hy@setpdfborder
- \ifx\@menubordercolor\relax
- \else
- /C[\@menubordercolor]%
- \fi
- >%
+ \Hy@Acrobatmenu{#1}{#2}{%
+ \special{!%
+ aref <u=/S /Named /N /#1>;%
+ a=<%
+ \ifHy@pdfa /F 4\fi
+ \Hy@setpdfborder
+ \ifx\@menubordercolor\relax
+ \else
+ /C[\@menubordercolor]%
+ \fi
+ >%
+ }%
+ \Hy@colorlink\@menucolor#2\Hy@endcolorlink
+ \special{!endaref}%
}%
- \Hy@colorlink\@menucolor#2\Hy@endcolorlink
- \special{!endaref}%
}
\ifnum\Hy@VTeXversion<702 %
\else
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index 0e05b03d9e4..f2ed5054ba8 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtexhtml.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref driver for VTeX in HTML mode]
\RequirePackage{vtexhtml}
\newif\if@Localurl
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
index fef6b7bd923..89bfade9877 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hvtexmrk.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)]
\input{pdfmark.def}%
\ifx\@pdfproducer\relax
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index 71cf12df18c..777459a5046 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
@@ -25,7 +25,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hyperref}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hypertext links for LaTeX]
\begingroup
\@makeother\`%
@@ -145,6 +145,7 @@
\newif\ifHy@verbose
\newif\ifHy@windowui
\newif\ifHy@displaydoctitle
+\newif\ifHy@pdfa
\Hy@backreffalse
\Hy@bookmarksnumberedfalse
\Hy@bookmarksopenfalse
@@ -180,6 +181,7 @@
\Hy@verbosefalse
\Hy@windowuitrue
\Hy@displaydoctitlefalse
+\Hy@pdfafalse
\def\Hy@StepCount#1{\advance#1 by 1 }%
\def\Hy@GlobalStepCount#1{\global\advance#1 by 1 }%
\newdimen\@linkdim
@@ -1364,7 +1366,9 @@
}%
}%
\def\HyPsd@UTFviii@ccxliv@undef{\@inpenc@undefined@{utf8}}%
- \edef\HyPsd@UTFviii@ccxliv@def{\noexpand\UTFviii@four@octets\string^^f4}%
+ \edef\HyPsd@UTFviii@ccxliv@def{%
+ \noexpand\UTFviii@four@octets\string ^^f4%
+ }%
\def\HyPsd@UTFviii@two#1#2{%
\expandafter\HyPsd@UTFviii@@two
\number\dimexpr.25\dimexpr`#1sp\expandafter\relax\expandafter|%
@@ -1538,7 +1542,7 @@
\def\Hy@false{false}
\let\literalps@out\@gobble
\newcommand\pdfbookmark[3][]{}
-\let\Acrobatmenu\@gobble
+\def\Acrobatmenu#1#2{\leavevmode#2}
\def\Hy@writebookmark#1#2#3#4#5{}%
\let\HyperRaiseLinkHook\@empty
\def\HyperRaiseLinkDefault{\baselineskip}
@@ -1730,6 +1734,32 @@
}
\define@key{Hyp}{linktocpage}[true]{%
\Hy@boolkey{linktocpage}{#1}%
+ \ifHy@linktocpage
+ \let\Hy@linktoc\Hy@linktoc@page
+ \else
+ \let\Hy@linktoc\Hy@linktoc@section
+ \fi
+}
+\chardef\Hy@linktoc@none=0 %
+\chardef\Hy@linktoc@section=1 %
+\chardef\Hy@linktoc@page=2 %
+\chardef\Hy@linktoc@all=3 %
+\ifHy@linktocpage
+ \let\Hy@linktoc\Hy@linktoc@page
+\else
+ \let\Hy@linktoc\Hy@linktoc@section
+\fi
+\define@key{Hyp}{linktoc}{%
+ \@ifundefined{Hy@linktoc@#1}{%
+ \Hy@Warning{%
+ Unexpected value `#1' of\MessageBreak
+ option `linktoc' instead of `none',\MessageBreak
+ `section', `page' or `all'%
+ }%
+ }{%
+ \expandafter\let\expandafter\Hy@linktoc
+ \csname Hy@linktoc@#1\endcsname
+ }%
}
\define@key{Hyp}{extension}{\def\XR@ext{#1}}
\def\XR@ext{dvi}
@@ -2610,6 +2640,9 @@
\define@key{Hyp}{pdfdisplaydoctitle}[true]{%
\Hy@boolkey[pdfdisplaydoctitle]{displaydoctitle}{#1}%
}
+\define@key{Hyp}{pdfa}[true]{%
+ \Hy@boolkey{pdfa}{#1}%
+}
\define@key{Hyp}{pdfnewwindow}[true]{%
\def\Hy@temp{#1}%
\ifx\Hy@temp\@empty
@@ -2722,7 +2755,7 @@
\def\hyper@linkurl#1#2{#1}%
\def\hyper@linkfile#1#2#3{#1}%
\def\hyper@link@[#1]#2#3{}%
- \def\Acrobatmenu#1#2{#2}%
+ \def\Acrobatmenu#1#2{\leavevmode#2}%
\let\PDF@SetupDoc\@empty
\let\PDF@FinishDoc\@empty
\let\@fifthoffive\@secondoftwo
@@ -2736,6 +2769,51 @@
\Hy@DisableOption{final}%
}
\Hy@DisableOption{pdfversion}%
+\Hy@DisableOption{pdfa}
+\ifHy@pdfa
+ \def\Hy@Acrobatmenu#1#2{%
+ \leavevmode
+ \begingroup
+ \edef\x{#1}%
+ \@onelevel@sanitize\x
+ \ifx\x\Hy@NextPage
+ \let\y=Y%
+ \else
+ \ifx\x\Hy@PrevPage
+ \let\y=Y%
+ \else
+ \ifx\x\Hy@FirstPage
+ \let\y=Y%
+ \else
+ \ifx\x\Hy@LastPage
+ \let\y=Y%
+ \else
+ \let\y=N%
+ \fi
+ \fi
+ \fi
+ \fi
+ \expandafter\endgroup
+ \ifx\y Y%
+ \else
+ \PackageError{hyperref}{%
+ PDF/A: Named action `#1' is not permitted%
+ }\@ehc
+ {#2}%
+ \expandafter\@gobble
+ \fi
+ }%
+ \def\Hy@temp#1{%
+ \expandafter\def\csname Hy@#1\endcsname{#1}%
+ \expandafter\@onelevel@sanitize\csname Hy@#1\endcsname
+ }%
+ \Hy@temp{NextPage}%
+ \Hy@temp{PrevPage}%
+ \Hy@temp{FirstPage}%
+ \Hy@temp{LastPage}%
+\else
+ \def\Hy@Acrobatmenu#1#2{\leavevmode}%
+\fi
\Hy@nextfalse
\@ifundefined{spanish@sh@"@sel}{}{\Hy@nexttrue}
\@ifundefined{galician@sh@"@sel}{}{\Hy@nexttrue}
@@ -2743,6 +2821,36 @@
\ifHy@next
\let\texttilde\~%
\fi
+\@ifpackageloaded{babel}{%
+ \@ifpackagelater{babel}{2008/03/16}{%
+ \def\Hy@PatchLanguageShorthands#1{%
+ \begingroup
+ \edef\x{#1}%
+ \@onelevel@sanitize\x
+ \def\y{system}%
+ \@onelevel@sanitize\y
+ \expandafter\endgroup
+ \ifx\x\y
+ \else
+ \HyOrg@languageshorthands{#1}%
+ \fi
+ }%
+ \AtBeginDocument{%
+ \begingroup
+ \toks0=\expandafter{\pdfstringdefPreHook}%
+ \xdef\pdfstringdefPreHook{%
+ \let\noexpand\HyOrg@languageshorthands
+ \noexpand\languageshorthands
+ \let\noexpand\languageshorthands
+ \noexpand\Hy@PatchLanguageShorthands
+ \the\toks0 %
+ \let\noexpand\languageshorthands
+ \noexpand\HyOrg@languageshorthands
+ }%
+ \endgroup
+ }%
+ }{}%
+}{}
\ifHy@figures
\Hy@Info{Hyper figures ON}%
\else
@@ -3201,7 +3309,17 @@
\expandafter\@hyper@linkfile#7\\{#3}{#2}%
\else
\ifx\@pdftempa\@pdftempwordrun
- \expandafter\@hyper@launch#7\\{#3}{#2}%
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Launch action is prohibited%
+ }\@ehc
+ \begingroup
+ \leavevmode
+ #2%
+ \endgroup
+ \else
+ \expandafter\@hyper@launch#7\\{#3}{#2}%
+ \fi
\else
\hyper@linkurl{#3}{#7\ifx\\#2\\\else\hyper@hash#2\fi}%
\fi
@@ -3393,6 +3511,38 @@
\HyField@NewFlag{F}{Locked}{8}% PDF 1.4
\HyField@NewFlag{F}{ToggleNoView}{9}% PDF 1.5
\HyField@NewFlag{F}{LockedContents}{10}% PDF 1.7
+\ifHy@pdfa
+ \def\HyField@PDFAFlagWarning#1#2{%
+ \Hy@Warning{%
+ PDF/A: Annotation flag `#1' must\MessageBreak
+ be set to `#2'%
+ }%
+ }%
+ \Fld@invisiblefalse
+ \def\Fld@invisibletrue{%
+ \HyField@PDFAFlagWarning{invisible}{false}%
+ }%
+ \Fld@hiddenfalse
+ \def\Fld@hiddentrue{%
+ \HyField@PDFAFlagWarning{hidden}{false}%
+ }%
+ \Fld@printtrue
+ \def\Fld@printfalse{%
+ \HyField@PDFAFlagWarning{print}{true}%
+ }%
+ \Fld@nozoomtrue
+ \def\Fld@nozoomfalse{%
+ \HyField@PDFAFlagWarning{nozoom}{true}%
+ }%
+ \Fld@norotatetrue
+ \def\Fld@norotatefalse{%
+ \HyField@PDFAFlagWarning{norotate}{true}%
+ }%
+ \Fld@noviewfalse
+ \def\Fld@noviewtrue{%
+ \HyField@PDFAFlagWarning{noview}{false}%
+ }%
+\fi
\HyField@NewFlag{Submit}{IncludeNoValueFields}{2}
\HyField@NewFlagOnly{Submit}{ExportFormat}{3}
\HyField@NewFlag{Submit}{GetMethod}{4}
@@ -3838,67 +3988,42 @@
\def\Fld@onmouseup@code{}
\def\Fld@onenter@code{}
\def\Fld@onexit@code{}
-\define@key{Field}{keystroke}{%
- \def\Fld@keystroke@code{#1}%
-}
-\define@key{Field}{format}{%
- \def\Fld@format@code{#1}%
-}
-\define@key{Field}{validate}{%
- \def\Fld@validate@code{#1}%
-}
-\define@key{Field}{calculate}{%
- \def\Fld@calculate@code{#1}%
-}
-\define@key{Field}{onfocus}{%
- \def\Fld@onfocus@code{#1}%
-}
-\define@key{Field}{onblur}{%
- \def\Fld@onblur@code{#1}%
-}
-\define@key{Field}{onenter}{%
- \def\Fld@onenter@code{#1}%
-}
-\define@key{Field}{onexit}{%
- \def\Fld@onexit@code{#1}%
-}
-\define@key{Field}{onselect}{%
- \Field@addtoks{onselect}{#1}%
-}
-\define@key{Field}{onchange}{%
- \Field@addtoks{onchange}{#1}%
-}
-\define@key{Field}{onclick}{%
- \def\Fld@onclick{#1}%
- \Field@addtoks{onclick}{#1}%
-}
-\define@key{Field}{ondblclick}{%
- \Field@addtoks{ondblclick}{#1}%
-}
-\define@key{Field}{onmousedown}{%
- \Field@addtoks{onmousedown}{#1}%
-}
-\define@key{Field}{onmouseup}{%
- \Field@addtoks{onmouseup}{#1}%
-}
-\define@key{Field}{onmouseover}{%
- \Field@addtoks{onmouseover}{#1}%
-}
-\define@key{Field}{onmousemove}{%
- \Field@addtoks{onmousemove}{#1}%
-}
-\define@key{Field}{onmouseout}{%
- \Field@addtoks{onmouseout}{#1}%
-}
-\define@key{Field}{onkeypress}{%
- \Field@addtoks{onkeypress}{#1}%
-}
-\define@key{Field}{onkeydown}{%
- \Field@addtoks{onkeydown}{#1}%
+\def\Hy@temp#1{%
+ \expandafter\Hy@@temp\csname Fld@#1@code\endcsname{#1}%
}
-\define@key{Field}{onkeyup}{%
- \Field@addtoks{onkeyup}{#1}%
+\def\Hy@@temp#1#2{%
+ \ifHy@pdfa
+ \define@key{Field}{#2}{%
+ \PackageError{hyperref}{%
+ PDF/A: Additional action #2 is prohibited%
+ }\@ehc
+ }%
+ \else
+ \define@key{Field}{#2}{%
+ \def#1{##1}%
+ }%
+ \fi
}
+\Hy@temp{keystroke}
+\Hy@temp{format}
+\Hy@temp{validate}
+\Hy@temp{calculate}
+\Hy@temp{onfocus}
+\Hy@temp{onblur}
+\Hy@temp{onenter}
+\Hy@temp{onexit}
+\Hy@temp{onselect}
+\Hy@temp{onchange}
+\Hy@temp{onclick}
+\Hy@temp{ondblclick}
+\Hy@temp{onmousedown}
+\Hy@temp{onmouseup}
+\Hy@temp{onmouseover}
+\Hy@temp{onmousemove}
+\Hy@temp{onmouseout}
+\Hy@temp{onkeypress}
+\Hy@temp{onkeydown}
+\Hy@temp{onkeyup}
\DeclareRobustCommand\TextField{%
\@ifnextchar[{\@TextField}{\@TextField[]}%
}
@@ -4469,6 +4594,12 @@
\def\@Alph{Alph\@arabic}%
\fi
}%
+ \ifx\@Alph\@Alph@bul
+ \def\@Alph{Alph\@arabic}%
+ \fi
+ \ifx\@alph\@alph@bul
+ \def\@alph{alph\@arabic}%
+ \fi
\ifHy@naturalnames
\let\textlatin\@firstofone
\xdef\@currentHlabel{\csname the#1\endcsname}%
@@ -5316,14 +5447,22 @@
\ifx\\#4\\%
\csname l@#1\endcsname{#2}{#3}%
\else
- \ifHy@linktocpage
+ \ifcase\Hy@linktoc % none
+ \csname l@#1\endcsname{#2}{#3}%
+ \or % section
+ \csname l@#1\endcsname{%
+ \hyper@linkstart{link}{#4}{#2}\hyper@linkend
+ }{#3}%
+ \or % page
\csname l@#1\endcsname{{#2}}{%
\hyper@linkstart{link}{#4}{#3}\hyper@linkend
}%
- \else
+ \else % all
\csname l@#1\endcsname{%
\hyper@linkstart{link}{#4}{#2}\hyper@linkend
- }{#3}%
+ }{%
+ \hyper@linkstart{link}{#4}{#3}\hyper@linkend
+ }%
\fi
\fi
}
@@ -5339,20 +5478,30 @@
\csname the\@ifundefined{theH#2}{}{H}#2\endcsname.\arabic{#1}%
}%
}
-\let\Hmake@df@tag@@\make@df@tag@@
-\def\make@df@tag@@#1{%
- \Hmake@df@tag@@{#1}%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{AMS.\the\Hy@linkcounter}%
- \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
-}
-\let\Hmake@df@tag@@@\make@df@tag@@@
-\def\make@df@tag@@@#1{%
- \Hmake@df@tag@@@{#1}%
- \Hy@GlobalStepCount\Hy@linkcounter
- \xdef\@currentHref{AMS.\the\Hy@linkcounter}%
- \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
-}
+\@ifpackageloaded{amsmath}{%
+ \def\Hy@make@anchor{%
+ \Hy@GlobalStepCount\Hy@linkcounter
+ \xdef\@currentHref{AMS.\the\Hy@linkcounter}%
+ \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}%
+ }%
+ \def\Hy@make@df@tag@@#1{%
+ \gdef\df@tag{%
+ \maketag@@@{\Hy@make@anchor#1}%
+ \def\@currentlabel{#1}%
+ }%
+ }%
+ \def\Hy@make@df@tag@@@#1{%
+ \gdef\df@tag{%
+ \tagform@{\Hy@make@anchor#1}%
+ \toks@\@xp{\p@equation{#1}}%
+ \edef\@currentlabel{\the\toks@}%
+ }%
+ }%
+ \let\HyOrg@make@df@tag@@\make@df@tag@@
+ \let\HyOrg@make@df@tag@@@\make@df@tag@@@
+ \let\make@df@tag@@\Hy@make@df@tag@@
+ \let\make@df@tag@@@\Hy@make@df@tag@@@
+}{}
\@ifpackagewith{hyperref}{pdftex}{%
\let\H@seteqlabel\@seteqlabel
\def\@seteqlabel#1{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index 705c4a96b57..2bd830644c2 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{hypertex.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref driver for HyperTeX specials]
\def\PDF@FinishDoc{}
\def\PDF@SetupDoc{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index b81466819d3..efadc65c000 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
@@ -25,7 +25,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{nohyperref}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Dummy hyperref (SR)]
\let\hyper@@anchor\@gobble
\def\hyper@link#1#2#3{#3}%
@@ -38,7 +38,7 @@
\def\hyper@link@[#1]#2#3{}%
\let\PDF@SetupDoc\@empty
\let\PDF@FinishDoc\@empty
-\let\Acrobatmenu\@gobble
+\def\Acrobatmenu#1#2{\leavevmode#2}
\let\pdfstringdefDisableCommands\@gobbletwo
\let\texorpdfstring\@firstoftwo
\let\pdfbookmark\@undefined
diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
index 9fa7423bba0..f7602eb7624 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{pd1enc.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref: PDFDocEncoding definition (HO)]
\DeclareFontEncoding{PD1}{}{}
\DeclareTextCommand{\textLF}{PD1}{\012} % line feed
diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
index b1892ecb34e..acdefa9d555 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{pdfmark.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref definitions for pdfmark specials]
\def\Hy@PutCatalog#1{%
\pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}%
@@ -202,6 +202,7 @@
pdfmark=/ANN,%
linktype=link,%
Subtype=/Link,%
+ PDFAFlags=4,%
Dest=\hyper@currentanchor,%
AcroHighlight=\@pdfhighlight,%
Border=\@pdfborder,%
@@ -295,6 +296,7 @@
BorderStyle=\@pdfborderstyle,%
pdfmark=/ANN,%
Subtype=/Link,%
+ PDFAFlags=4,%
Dest=\Hy@testname
}%
\endgroup
@@ -550,6 +552,11 @@
\define@key{PDF}{Dir}{\pdf@addtoks{(#1)}{Dir}}
\define@key{PDF}{File}{\pdf@addtoks{(#1)}{File}}
\define@key{PDF}{Flags}{\pdf@addtoks{#1}{Flags}}
+\define@key{PDF}{PDFAFlags}{%
+ \ifHy@pdfa
+ \pdf@addtoks{#1}{F}%
+ \fi
+}
\define@key{PDF}{AcroHighlight}{%
\begingroup
\edef\x{#1}%
@@ -585,14 +592,17 @@
\define@key{PDF}{Base}{\pdf@addtoks{(#1)}{Base}}
\define@key{PDF}{URI}{\pdf@addtoks{#1}{URI}}
\def\Acrobatmenu#1#2{%
- \pdfmark[{#2}]{%
- linktype=menu,%
- pdfmark=/ANN,%
- AcroHighlight=\@pdfhighlight,%
- Border=\@pdfborder,%
- BorderStyle=\@pdfborderstyle,%
- Action={<< /Subtype /Named /N /#1 >>},%
- Subtype=/Link%
+ \Hy@Acrobatmenu{#1}{#2}{%
+ \pdfmark[{#2}]{%
+ linktype=menu,%
+ pdfmark=/ANN,%
+ AcroHighlight=\@pdfhighlight,%
+ Border=\@pdfborder,%
+ BorderStyle=\@pdfborderstyle,%
+ Action={<< /Subtype /Named /N /#1 >>},%
+ Subtype=/Link,%
+ PDFAFlags=4%
+ }%
}%
}
\def\PDFNextPage{\@ifnextchar[{\PDFNextPage@}{\PDFNextPage@[]}}
@@ -604,6 +614,7 @@
Color=.2 .1 .5,%
pdfmark=/ANN,%
Subtype=/Link,%
+ PDFAFlags=4,%
Page=/Next%
}%
}
@@ -618,6 +629,7 @@
Color=.4 .4 .1,%
pdfmark=/ANN,%
Subtype=/Link,%
+ PDFAFlags=4,%
Page=/Prev%
}%
}
@@ -637,7 +649,8 @@
BorderStyle=\@pdfborderstyle,%
Color=\@urlbordercolor,%
Action={<< /Subtype /URI /URI (\Hy@pstringURI) >>},%
- Subtype=/Link%
+ Subtype=/Link,%
+ PDFAFlags=4%
}%
\endgroup
}
@@ -649,6 +662,7 @@
\pdfmark[{#1}]{%
pdfmark=/ANN,%
Subtype=/Link,%
+ PDFAFlags=4,%
AcroHighlight=\@pdfhighlight,%
Border=\@pdfborder,%
BorderStyle=\@pdfborderstyle,%
@@ -673,6 +687,7 @@
\pdfmark[{#2}]{%
pdfmark=/ANN,%
Subtype=/Link,%
+ PDFAFlags=4,%
AcroHighlight=\@pdfhighlight,%
Border=\@pdfborder,%
BorderStyle=\@pdfborderstyle,%
@@ -854,7 +869,10 @@
>>%
/DA(/Helv 10 Tf 0 g)%
/CO{corder}%
- /NeedAppearances true%
+ \ifHy@pdfa
+ \else
+ /NeedAppearances true%
+ \fi
>>%
/PUT pdfmark%
[%
@@ -999,14 +1017,25 @@
\expandafter\HyField@SetKeys\expandafter{%
\DefaultOptionsofPushButton,#1%
}%
- \HyField@FlagsPushButton
- \ifFld@hidden\def\Fld@width{1sp}\fi
- \LayoutPushButtonField{%
- \Hy@escapeform\PDFForm@Push
- \pdfmark[\MakeButtonField{#2}]{%
- pdfmark=/ANN,Raw={\PDFForm@Push}%
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Push button with JavaScript is prohibited%
+ }\@ehc
+ \LayoutPushButtonField{%
+ \leavevmode
+ \MakeButtonField{#2}%
}%
- }%
+ \else
+ \HyField@FlagsPushButton
+ \ifFld@hidden\def\Fld@width{1sp}\fi
+ \LayoutPushButtonField{%
+ \leavevmode
+ \Hy@escapeform\PDFForm@Push
+ \pdfmark[\MakeButtonField{#2}]{%
+ pdfmark=/ANN,Raw={\PDFForm@Push}%
+ }%
+ }%
+ \fi
\endgroup
}
\def\@Submit[#1]#2{%
@@ -1035,14 +1064,22 @@
\expandafter\HyField@SetKeys\expandafter{%
\DefaultOptionsofReset,#1%
}%
- \HyField@FlagsPushButton
- \ifFld@hidden\def\Fld@width{1sp}\fi
- \Hy@escapeform\PDFForm@Reset
- \pdfmark[\MakeButtonField{#2}]{%
- pdfmark=/ANN,Raw={\PDFForm@Reset}%
- }%
+ \leavevmode
+ \ifHy@pdfa
+ \PackageError{hyperref}{%
+ PDF/A: Reset action is prohibited%
+ }\@ehc
+ \MakeButtonField{#2}%
+ \else
+ \HyField@FlagsPushButton
+ \ifFld@hidden\def\Fld@width{1sp}\fi
+ \Hy@escapeform\PDFForm@Reset
+ \pdfmark[\MakeButtonField{#2}]{%
+ pdfmark=/ANN,Raw={\PDFForm@Reset}%
+ }%
+ \fi
\endgroup
-}
+}%
\def\@CheckBox[#1]#2{% parameters, label
\def\Fld@name{#2}%
\def\Fld@default{0}%
@@ -1143,31 +1180,34 @@
/H/P%
\ifFld@checked /V/Yes\else /V/Off\fi
}
-\def\PDFForm@Push{%
- /Subtype/Widget%
- \Fld@annotflags
- /T(\Fld@name)%
- /FT/Btn%
- \Fld@flags
- /H/P%
- /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
- \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
- \ifx\Fld@bordercolor\relax\else 1\fi
- \space
- \else
- /MK<<%
- \ifnum\Fld@rotation=\z@
- \else
- /R \Fld@rotation
- \fi
- \ifx\Fld@bordercolor\relax
- \else
- /BC[\Fld@bordercolor]%
- \fi
- >>%
- \fi
- /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>%
-}
+\ifHy@pdfa
+\else
+ \def\PDFForm@Push{%
+ /Subtype/Widget%
+ \Fld@annotflags
+ /T(\Fld@name)%
+ /FT/Btn%
+ \Fld@flags
+ /H/P%
+ /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
+ \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
+ \ifx\Fld@bordercolor\relax\else 1\fi
+ \space
+ \else
+ /MK<<%
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
+ >>%
+ \fi
+ /A<</S/JavaScript/JS(\Hy@escapestring{\Fld@onclick})>>%
+ }%
+\fi
\def\Fld@@additionalactions{%
\ifx\Fld@keystroke@code\@empty
\else
@@ -1213,7 +1253,10 @@
\def\Fld@additionalactions{%
\if-\Fld@@additionalactions-%
\else
- /AA<<\Fld@@additionalactions>>%
+ \ifHy@pdfa
+ \else
+ /AA<<\Fld@@additionalactions>>%
+ \fi
\fi
}
\def\PDFForm@List{%
@@ -1348,32 +1391,35 @@
\Fld@submitflags
>>%
}
-\def\PDFForm@Reset{%
- /Subtype/Widget%
- \Fld@annotflags
- /T(\Fld@name)%
- /FT/Btn%
- \Fld@flags
- /H/P%
- /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)%
- \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
- \ifx\Fld@bordercolor\relax\else 1\fi
- \space
- \else
- /MK<<%
- \ifnum\Fld@rotation=\z@
- \else
- /R \Fld@rotation
- \fi
- \ifx\Fld@bordercolor\relax
- \else
- /BC[\Fld@bordercolor]%
- \fi
- >>%
- \fi
- /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
- /A<</S/ResetForm>>%
-}
+\ifHy@pdfa
+\else
+ \def\PDFForm@Reset{%
+ /Subtype/Widget%
+ \Fld@annotflags
+ /T(\Fld@name)%
+ /FT/Btn%
+ \Fld@flags
+ /H/P%
+ /DA(/Helv \strip@pt\Fld@charsize\space Tf 0 0 1 rg)%
+ \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
+ \ifx\Fld@bordercolor\relax\else 1\fi
+ \space
+ \else
+ /MK<<%
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
+ >>%
+ \fi
+ /BS<</W \Fld@borderwidth/S/\Fld@borderstyle>>%
+ /A<</S/ResetForm>>%
+ }%
+\fi
\def\Hy@writebookmark#1#2#3#4#5{%
% section number, text, label, level, file
\ifx\WriteBookmarks\relax%
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index 1a1cc2a8c6c..8e301a2a2ef 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puarenc.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref: Additions to puenc.def for Arabi]
\DeclareTextCommand{\hamza}{PU}{\86\041}% 0621;afii57409;ARABIC LETTER HAMZA
\DeclareTextCommand{\alefmadda}{PU}{\86\042}% 0622;afii57410;ARABIC LETTER ALEF WITH MADDA ABOVE
diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def
index 8594f6a06b0..f123239ab7c 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puenc.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref: PDF Unicode definition (HO)]
\DeclareFontEncoding{PU}{}{}
\DeclareTextCommand{\textLF}{PU}{\80\012} % line feed
diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
index cddefabebf3..bf8235be5c8 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
@@ -24,7 +24,7 @@
%% given in the file `manifest.txt'.
%%
\ProvidesFile{puvnenc.def}
- [2008/04/12 v6.77m
+ [2008/04/17 v6.77q
Hyperref: Additions to puenc.def for VnTeX]
\DeclareTextCommand{\abreve}{PU}{\81\003}
\DeclareTextCommand{\acircumflex}{PU}{\80\342}
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index a98d58c2964..434a62a039d 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -192,7 +192,7 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'grtimes', "die 'skipping, requires nonfree monotype times'",
'hfbright', "&MAKEflatten",
'hfoldsty', "&MAKEflatten",
- 'hyperref', "&MAKEhyperref",
+ 'hyperref', "&MAKEunzip",
'hyphen-german',"die 'please install hyphen-german by hand, sorry'",
'ibycus-babel',"&MAKEibycusbabel",
'ibygrk', "&MAKEflatten",
@@ -2205,18 +2205,6 @@ sub MAKEgermbib {
&MAKEflatten ();
}
-sub MAKEhyperref {
- &xchdir ($packagedir);
- #
- print "\t SPECIAL $package unzip tds and copy\n";
- &SYSTEM ("rm -rf doc test"); # we will use prepared zip
- &SYSTEM ("unzip -q $package.tds.zip");
- &SYSTEM ("$RM * 2>/dev/null"); # remove top-level files
- #
- &xchdir ("..");
- &MAKEcopy ();
-}
-
sub MAKEoberdiek {
&xchdir ($packagedir);
#