hyperref (14oct12)

git-svn-id: svn://tug.org/texlive/trunk@27965 c570f23f-e606-0410-a88d-b1316a301751

29 files changed, 613 insertions, 99 deletions

diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
index f26eec545f2..d6bd12b8312 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog
@@ -1,3 +1,27 @@
+2012-10-13  6.83j  Heiko Oberdiek
+    * 6.83j
+    * PDF forms/hpdftex.def: Field option `calculatesortkey' added
+      (pdfTeX/LuateX only) to specify the calculation order for
+      calculated fields.
+    * Option `pdflinkmargin' implemented for pdfmark drivers.
+
+2012-10-12  6.83i  Heiko Oberdiek
+    * 6.83i
+    * PDF forms: /CO (calculation order) is set for fields with
+      calculations. Only document order is supported currently.
+    * pdfmark.def: /Fields is set like in the other PDF form drivers.
+
+2012-10-11  6.83h  Heiko Oberdiek
+    * 6.83h
+    * If `hyperref' is loaded in the document class, then it misses
+      the detection of package `tex4ht' of `htlatex' because it is
+      loaded after the documentclass. Therefore another test for
+      `\HCode' is added that is defined by `htlatex'.
+    * The setting of additional information entries is done globally
+      like the other standard options (pdfauthor, pdftitle, ...)
+      for the information dictionary. (Bug report:
+      http://tex.stackexchange.com/q/75684/16967)
+
 2012-09-27  6.83g  Heiko Oberdiek
     * 6.83g
     * Fix for \hyper@link@.
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
index f7180e144ff..55be977fead 100644
--- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf
diff --git a/Master/texmf-dist/doc/latex/hyperref/README b/Master/texmf-dist/doc/latex/hyperref/README
index 8351e4f7c38..80b8a4a4d84 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, 2012/09/26
+README for hyperref bundle, 2012/10/13
 
 
 TABLE OF CONTENTS
@@ -147,6 +147,8 @@ other packages:
     CTAN:macros/latex/contrib/oberdiek/intcalc.pdf
 * keyval.sty
     CTAN:macros/latex/required/graphics/
+* kvdefinekeys.sty
+    CTAN:macros/latex/contrib/oberdiek/kvsetkeys.pdf
 * kvoptions.sty:
     CTAN:macros/latex/contrib/oberdiek/kvoptions.pdf
 * kvsetkeys.sty:
@@ -183,6 +185,55 @@ other packages:
 5 NEW FEATURES
 ==============
 
+Option `pdflinkmargin'
+----------------------
+  Option `pdflinkmargin' is an experimental option for specifying
+  a link margin, if the driver supports this. Default is 1 pt for
+  supporting drivers.
+
+  pdfTeX:
+  * The link area also depends on the surrounding box.
+  * Settings have local effect.
+  * When a page is shipped out, pdfTeX uses the current setting
+    of the link margin for all links on the page.
+
+  pdfmark:
+  * Settings have global effect.
+
+  Other drivers: Unsupported.
+
+Field option `calculatesortkey'
+-------------------------------
+  Fields with calculated values are calculated in document order
+  by default. If calculated field values depend on other calculated
+  fields that appear later in the document, then the correct calculation
+  order can be specified with option `calculatesortkey'. Its value is
+  used as key to lexicographically sort the calculated fields.
+  The sort key do not need to be unique. Fields that share the same
+  key are sorted in document order.
+
+  Currently the field option `calculatesortkey' is only supported by
+  the driver for pdfTeX.
+
+Option `localanchorname'
+------------------------
+  When an anchor is set (e.g. via \refstepcounter), then the
+  anchor name is globally set to the current anchor name.
+
+  For example:
+    \section{Foobar}
+    \begin{equation}\end{equation}
+    \label{sec:foobar}
+  With the default global setting (localanchorname=false)
+  a reference to `sec:foobar' jumps to the equation before.
+  With option `localanchorname' the anchor of the equation
+  is forgotten after the environment and the reference
+  `sec:foobar' jumps to the section title.
+
+  Option `localanchorname' is an experimental option, there
+  might be situations, where the anchor name is not available
+  as expected.
+
 Option `customdriver'
 ---------------------
   The value of option `customdriver' is the name of an external
diff --git a/Master/texmf-dist/doc/latex/hyperref/README.pdf b/Master/texmf-dist/doc/latex/hyperref/README.pdf
index 53ae508d50c..b7b54dd64bb 100644
--- a/Master/texmf-dist/doc/latex/hyperref/README.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/README.pdf
diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf
index f653e4777ed..212cac72955 100644
--- a/Master/texmf-dist/doc/latex/hyperref/backref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/backref.pdf
diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
index ce664746b74..855f3318c50 100644
--- a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf
diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
index 8edb66ce690..bc93dc40034 100644
--- a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
+++ b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf
diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
index 7b3bc704dcf..a48c4bb61e4 100644
--- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
+++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx
@@ -45,7 +45,7 @@
 %<puvnenc>\ProvidesFile{puvnenc.def}
 %<puarenc>\ProvidesFile{puarenc.def}
 %<psdextra>\ProvidesFile{psdextra.def}
-%<!none>  [2012/09/27 v6.83g %
+%<!none>  [2012/10/13 v6.83j %
 %<package>  Hypertext links for LaTeX]
 %<nohyperref>  Dummy hyperref (SR)]
 %<driver>  Hyperref documentation driver file]
@@ -147,7 +147,7 @@
 \end{document}
 %</driver>
 % \fi
-% \CheckSum{39329}
+% \CheckSum{39588}
 %
 % \MakeShortVerb{|}
 % \StopEventually{}
@@ -618,6 +618,7 @@
 \RequirePackage{infwarerr}[2010/04/08]
 \RequirePackage{keyval}[1997/11/10]
 \RequirePackage{kvsetkeys}[2007/09/29]
+\RequirePackage{kvdefinekeys}[2011/04/07]
 \RequirePackage{pdfescape}[2007/11/11]
 \RequirePackage{ifvtex}
 \RequirePackage{ifxetex}[2006/08/21]
@@ -6601,15 +6602,22 @@
           `\kv@key' is ignored%
         }%
       \else
-        \define@key{pdfinfo}{\HyInfo@Key}{%
-          \HyXeTeX@CheckUnicode
-          \HyPsd@XeTeXBigCharstrue
-          \HyPsd@PrerenderUnicode{##1}%
-          \pdfstringdef\HyInfo@Value{##1}%
-          \expandafter\let\csname HyInfo@Value@\HyInfo@Key\endcsname
-              \HyInfo@Value
+        \def\HyInfo@tmp##1{%
+          \kv@define@key{pdfinfo}{##1}{%
+            \HyXeTeX@CheckUnicode
+            \HyPsd@XeTeXBigCharstrue
+            \HyPsd@PrerenderUnicode{####1}%
+            \pdfstringdef\HyInfo@Value{####1}%
+            \global\expandafter
+            \let\csname HyInfo@Value@##1\endcsname
+                \HyInfo@Value
+          }%
         }%
-        \edef\HyInfo@AddonList{%
+        \expandafter\HyInfo@tmp\expandafter{\HyInfo@Key}%
+        \global\expandafter
+        \let\csname KV@pdfinfo@\HyInfo@Key\expandafter\endcsname
+            \csname KV@pdfinfo@\HyInfo@Key\endcsname
+        \xdef\HyInfo@AddonList{%
           \HyInfo@AddonList
           \HyInfo@do{\HyInfo@Key}%
         }%
@@ -6651,7 +6659,7 @@
     \x
   \fi
 }
-\let\HyInfo@AddonList\ltx@empty
+\global\let\HyInfo@AddonList\ltx@empty
 %    \end{macrocode}
 %    \begin{macrocode}
 \define@key{Hyp}{pdfview}{\calculate@pdfview#1 \\}
@@ -6858,10 +6866,18 @@
 %    Add option |tex4ht| if package |tex4ht| is loaded.
 %    \begin{macrocode}
 \@ifpackageloaded{tex4ht}{%
-  \@ifpackagewith{hyperref}{tex4ht}{}{%
+  \@ifpackagewith{hyperref}{tex4ht}{%
+  }{%
     \PassOptionsToPackage{tex4ht}{hyperref}%
   }%
 }{}
+\ltx@IfUndefined{HCode}{%
+}{%
+  \@ifpackagewith{hyperref}{tex4ht}{%
+  }{%
+    \PassOptionsToPackage{tex4ht}{hyperref}%
+  }%
+}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -9260,6 +9276,14 @@
 \Hy@temp{onblur}
 \Hy@temp{onenter}
 \Hy@temp{onexit}
+%    \end{macrocode}
+%    \begin{macrocode}
+\let\Fld@calculate@sortkey\ltx@empty
+\define@key{Field}{calculatesortkey}[1]{%
+  \def\Fld@calculate@sortkey{#1}%
+}
+%    \end{macrocode}
+%    \begin{macrocode}
 \ifHy@texht
   \def\Hy@temp#1{%
     \define@key{Field}{#1}{%
@@ -13438,7 +13462,12 @@
 %
 % First, allow for some changes and additions to pdftex  syntax:
 %    \begin{macrocode}
-\def\setpdflinkmargin#1{\pdflinkmargin#1}
+\def\setpdflinkmargin#1{%
+  \begingroup
+    \setlength{\dimen@}{#1}%
+  \expandafter\endgroup
+  \expandafter\pdflinkmargin\the\dimen@\relax
+}
 \ifx\pdfstartlink\@undefined% less than version 14
   \let\pdfstartlink\pdfannotlink
   \let\pdflinkmargin\@tempdima
@@ -16361,6 +16390,7 @@
   \edef\@processme{\noexpand\pdf@toks={\the\pdf@defaulttoks}}%
   \@processme
   \let\pdf@type\relax
+  \let\pdf@objdef\ltx@empty
   \kvsetkeys{PDF}{#2}%
   \ifHy@pdfmarkerror
   \else
@@ -16373,7 +16403,12 @@
     \else
        \ifx\\#1\\%
          \literalps@out{%
-           [\the\pdf@toks\space\pdf@type\space pdfmark%
+           [%
+           \ifx\pdf@objdef\ltx@empty
+           \else
+             /_objdef\string{\pdf@objdef\string}%
+           \fi
+           \the\pdf@toks\space\pdf@type\space pdfmark%
          }%
        \else
          \ltx@IfUndefined{@\pdf@linktype color}{%
@@ -16384,7 +16419,12 @@
          }%
          \pdf@rect{#1}%
          \literalps@out{%
-           [\the\pdf@toks\space\pdf@type\space pdfmark%
+           [%
+           \ifx\pdf@objdef\ltx@empty
+           \else
+             /_objdef\string{\pdf@objdef\string}%
+           \fi
+           \the\pdf@toks\space\pdf@type\space pdfmark%
          }%
          \Hy@endcolorlink
        \fi
@@ -16524,6 +16564,9 @@
 % what is the link type?
 \define@key{PDF}{linktype}{\def\pdf@linktype{#1}}
 \def\pdf@linktype{link}
+% named object?
+\define@key{PDF}{objdef}{\edef\pdf@objdef{#1}}
+\let\pdf@objdef\ltx@empty
 % parameter is a stream of PDF
 \define@key{PDF}{Raw}{\pdf@addtoksx{#1}}
 % parameter is a name
@@ -16938,6 +16981,18 @@
   \fi
   \Hy@DisableOption{setpagesize}%
 }
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\setpdflinkmargin#1{%
+  \begingroup
+    \setlength{\dimen@}{#1}%
+    \literalps@out{%
+      /HyperBorder{\strip@pt\dimen@\space PDFToDvips}def%
+    }%
+  \endgroup
+}
+%    \end{macrocode}
+%    \begin{macrocode}
 %</dvips>
 %    \end{macrocode}
 %
@@ -17037,6 +17092,18 @@
     } def%
   }%
 }
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\setpdflinkmargin#1{%
+  \begingroup
+    \setlength{\dimen@}{#1}%
+    \literalps@out{%
+      /HyperBorder{\strip@pt\dimen@}def%
+    }%
+  \endgroup
+}
+%    \end{macrocode}
+%    \begin{macrocode}
 %</vtexpdfmark>
 %    \end{macrocode}
 %
@@ -17194,6 +17261,16 @@
 }
 %    \end{macrocode}
 %    \begin{macrocode}
+\def\setpdflinkmargin#1{%
+  \begingroup
+    \setlength{\dimen@}{#1}%
+    \literalps@out{%
+      /HyperBorder{\strip@pt\dimen@\space PDFToDvips}def%
+    }%
+  \endgroup
+}
+%    \end{macrocode}
+%    \begin{macrocode}
 \Hy@AtBeginDocument{%
   \ifHy@colorlinks
     \headerps@out{/PDFBorder{/Border [0 0 0]}def}%
@@ -17503,6 +17580,18 @@
     } def%
   }%
 }
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\setpdflinkmargin#1{%
+  \begingroup
+    \setlength{\dimen@}{#1}%
+    \literalps@out{%
+      /HyperBorder{\strip@pt\dimen@\space PDFToDvips}def%
+    }%
+  \endgroup
+}
+%    \end{macrocode}
+%    \begin{macrocode}
 %</dvipsone>
 %    \end{macrocode}
 %
@@ -17744,6 +17833,10 @@
   /_objdef{afields}%
   /type/array%
 /OBJ pdfmark%
+[%
+  /_objdef{corder}%
+  /type/array%
+/OBJ pdfmark%
 {%
   [%
     /BBox[0 0 100 100]%
@@ -17844,10 +17937,6 @@
     /AcroForm{aform}%
   >>%
 /PUT pdfmark%
-[%
-  /_objdef{corder}%
-  /type/array%
-/OBJ pdfmark% dps
 }}%
   \kvsetkeys{Form}{#1}%
 }
@@ -17855,7 +17944,42 @@
 \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum
   \Hy@Message{Sorry, pdfmark drivers do not support FORM gauges}%
 }
+%    \end{macrocode}
+%    \begin{macrocode}
+\newcount\HyField@AnnotCount
+\HyField@AnnotCount=\z@
+\def\HyField@AdvanceAnnotCount{%
+  \global\advance\HyField@AnnotCount\@ne
+}
+\def\HyField@TheAnnotCount{%
+  \the\HyField@AnnotCount
+}
+%    \end{macrocode}
+%    \begin{macrocode}
 \edef\Fld@pageobjref{/P\string{ThisPage\string}}
+%    \end{macrocode}
+%    \begin{macrocode}
+\def\HyField@AddToFields#1{%
+  \pdfmark{%
+    pdfmark=/APPEND,%
+    Raw={%
+      \string{afields\string}%
+      \string{#1\HyField@TheAnnotCount\string}%
+    }%
+  }%
+  \ifx\Fld@calculate@code\ltx@empty
+  \else
+    \pdfmark{%
+      pdfmark=/APPEND,%
+      Raw={%
+        \string{corder\string}%
+        \string{#1\HyField@TheAnnotCount\string}%
+      }%
+    }%
+  \fi
+}
+%    \end{macrocode}
+%    \begin{macrocode}
 \def\@TextField[#1]#2{% parameters, label
   \def\Fld@name{#2}%
   \let\Fld@default\ltx@empty
@@ -17875,13 +17999,17 @@
     \HyField@FlagsText
     \ifFld@hidden\def\Fld@width{1sp}\fi
     \ifx\Fld@value\@empty\def\Fld@value{\Fld@default}\fi
+    \HyField@AdvanceAnnotCount
     \LayoutTextField{#2}{%
       \leavevmode
       \Hy@escapeform\PDFForm@Text
       \pdfmark[\MakeTextField{\Fld@width}{\Fld@height}]{%
-        pdfmark=/ANN,Raw={\PDFForm@Text}%
+        pdfmark=/ANN,%
+        objdef=text\HyField@TheAnnotCount,%
+        Raw={\PDFForm@Text}%
       }%
     }%
+    \HyField@AddToFields{text}%
   \endgroup
 }
 \def\@ChoiceMenu[#1]#2#3{% parameters, label, choices
@@ -17961,21 +18089,32 @@
     \Hy@StepCount\Fld@listcount
     \@currDisplay\space
     \Hy@escapeform\PDFForm@Radio
+    \ifnum\Fld@listcount=1 %
+      \HyField@AdvanceAnnotCount
+    \fi
     \pdfmark[\MakeRadioField{\Fld@width}{\Fld@height}]{%
       pdfmark=/ANN,%
+      objdef=\ifnum\Fld@listcount=1 radio\HyField@TheAnnotCount\fi,%
       Raw={%
         \PDFForm@Radio /AP <</N <</\@currValue\space {Check}>> >>%
       }%
     } % deliberate space between radio buttons
+    \ifnum\Fld@listcount=1 %
+      \HyField@AddToFields{radio}%
+    \fi
   }%
 }
 \newcount\Fld@listcount
 \def\@@Listbox#1{%
   \HyField@PDFChoices{#1}%
   \Hy@escapeform\PDFForm@List
+  \HyField@AdvanceAnnotCount
   \pdfmark[\MakeChoiceField{\Fld@width}{\Fld@height}]{%
-    pdfmark=/ANN,Raw={\PDFForm@List}%
+    pdfmark=/ANN,%
+    objdef=list\HyField@TheAnnotCount,%
+    Raw={\PDFForm@List}%
   }%
+  \HyField@AddToFields{list}%
 }
 \def\@PushButton[#1]#2{% parameters, label
   \def\Fld@name{#2}%
@@ -17994,13 +18133,17 @@
     \else
       \HyField@FlagsPushButton
       \ifFld@hidden\def\Fld@width{1sp}\fi
+      \HyField@AdvanceAnnotCount
       \LayoutPushButtonField{%
         \leavevmode
         \Hy@escapeform\PDFForm@Push
         \pdfmark[\MakeButtonField{#2}]{%
-          pdfmark=/ANN,Raw={\PDFForm@Push}%
+          pdfmark=/ANN,%
+          objdef=push\HyField@TheAnnotCount,%
+          Raw={\PDFForm@Push}%
         }%
       }%
+      \HyField@AddToFields{push}%
     \fi
   \endgroup
 }
@@ -18015,10 +18158,13 @@
     \HyField@FlagsSubmit
     \ifFld@hidden\def\Fld@width{1sp}\fi
     \Hy@escapeform\PDFForm@Submit
+    \HyField@AdvanceAnnotCount
     \pdfmark[\MakeButtonField{#2}]{%
       pdfmark=/ANN,%
-      Raw={\PDFForm@Submit /AP << /N {Submit} /D {SubmitP} >>}%
+      objdef=submit\HyField@TheAnnotCount,%
+      Raw={\PDFForm@Submit /AP<</N{Submit}/D{SubmitP}>>}%
     }%
+    \HyField@AddToFields{submit}%
   \endgroup
 }
 \def\@Reset[#1]#2{%
@@ -18038,9 +18184,13 @@
       \HyField@FlagsPushButton
       \ifFld@hidden\def\Fld@width{1sp}\fi
       \Hy@escapeform\PDFForm@Reset
+      \HyField@AdvanceAnnotCount
       \pdfmark[\MakeButtonField{#2}]{%
-        pdfmark=/ANN,Raw={\PDFForm@Reset}%
+        pdfmark=/ANN,%
+        objdef=reset\HyField@TheAnnotCount,%
+        Raw={\PDFForm@Reset}%
       }%
+      \HyField@AddToFields{reset}%
     \fi
   \endgroup
 }%
@@ -18055,13 +18205,17 @@
     }%
     \HyField@FlagsCheckBox
     \ifFld@hidden\def\Fld@width{1sp}\fi
+    \HyField@AdvanceAnnotCount
     \LayoutCheckField{#2}{%
       \leavevmode
       \Hy@escapeform\PDFForm@Check
       \pdfmark[\MakeCheckField{\Fld@width}{\Fld@height}]{%
-        pdfmark=/ANN,Raw={\PDFForm@Check}%
+        pdfmark=/ANN,%
+        objdef=check\HyField@TheAnnotCount,%
+        Raw={\PDFForm@Check}%
       }%
     }%
+    \HyField@AddToFields{check}%
   \endgroup
 }
 %</pdfmark>
@@ -18257,6 +18411,7 @@
 % \hbox to 0pt{\hskip-\maxdimen{\pdfrefxform \the\pdflastxform}}%
 }%
 \let\HyField@afields\ltx@empty
+\let\HyField@cofields\ltx@empty
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname pdflastlink\endcsname\relax
   \let\HyField@AddToFields\relax
@@ -18269,12 +18424,53 @@
   }%
 \else
   \let\HyField@AuxAddToFields\ltx@gobble
+  \let\HyField@AuxAddToCoFields\ltx@gobbletwo
   \def\HyField@AfterAuxOpen{\Hy@AtBeginDocument}%
+%    \end{macrocode}
+%    Insertion sort for calculation field list.
+%    In case of equal sort keys (for example, if `calculatesortkey`
+%    is not used at all) the keys keep document calling order.
+%    \begin{macrocode}
+  \def\HyField@ABD@AuxAddToCoFields#1#2{%
+    \begingroup
+      \Hy@safe@activestrue
+      \let\ltx@secondoftwo\relax
+      \ifx\HyField@cofields\ltx@empty
+        \xdef\HyField@cofields{%
+          \ltx@secondoftwo{#1}{ #2 0 R}%
+        }%
+      \else
+        \let\ltx@secondoftwo\relax
+        \def\HyField@AddCoField##1##2##3{%
+          \ifx##1\ltx@empty
+            \ltx@secondoftwo{#1}{ #2 0 R}%
+            \expandafter\ltx@gobble
+          \else
+            \ifnum\pdfstrcmp{##2}{#1}>\ltx@zero
+              \ltx@secondoftwo{#1}{ #2 0 R}%
+              \ltx@secondoftwo{##2}{##3}%
+              \expandafter\expandafter\expandafter\ltx@gobble
+            \else
+              \ltx@secondoftwo{##2}{##3}%
+            \fi
+          \fi
+          \HyField@AddCoField
+        }%
+        \xdef\HyField@cofields{%
+          \expandafter\HyField@AddCoField
+          \HyField@cofields\ltx@empty\ltx@empty\ltx@empty
+        }%
+      \fi
+    \endgroup
+  }%
   \Hy@AtBeginDocument{%
     \if@filesw
       \immediate\write\@mainaux{%
         \string\providecommand\string\HyField@AuxAddToFields[1]{}%
       }%
+      \immediate\write\@mainaux{%
+        \string\providecommand\string\HyField@AuxAddToCoFields[2]{}%
+      }%
     \fi
     \let\HyField@AfterAuxOpen\@firstofone
     \def\HyField@AuxAddToFields#1{%
@@ -18287,11 +18483,30 @@
         #1 0 R%
       }%
     }%
+    \let\HyField@AuxAddToCoFields\HyField@ABD@AuxAddToCoFields
   }%
   \def\HyField@AddToFields{%
     \expandafter\HyField@@AddToFields\expandafter{%
       \the\pdflastlink
     }%
+    \ifx\Fld@calculate@code\ltx@empty
+    \else
+      \begingroup
+        \Hy@safe@activestrue
+        \edef\Hy@temp{%
+          \endgroup
+          \if@filesw
+            \write\@mainaux{%
+              \string\HyField@AuxAddToCoFields{%
+                \Fld@calculate@sortkey
+              }{%
+                \the\pdflastlink
+              }%
+            }%
+          \fi
+        }%
+      \Hy@temp
+    \fi
   }%
   \def\HyField@@AddToFields#1{%
     \HyField@AfterAuxOpen{%
@@ -18317,6 +18532,10 @@
       \immediate\pdfobj{%
         <<%
           /Fields[\HyField@afields]%
+          \ifx\HyField@cofields\ltx@empty
+          \else
+            /CO[\romannumeral-`\Q\HyField@cofields]%
+          \fi
           /DR<<%
             /Font<<%
               /ZaDb \OBJ@ZaDb\space 0 R%
@@ -18781,6 +19000,18 @@
 %    \end{macrocode}
 %    \end{macro}
 %
+%    \begin{macro}{\HyField@AddToFields}
+%    \begin{macrocode}
+\def\HyField@AddToFields#1{%
+  \@pdfm@mark{put @afields @#1\HyField@TheAnnotCount}%
+  \ifx\Fld@calculate@code\ltx@empty
+  \else
+    \@pdfm@mark{put @corder @#1\HyField@TheAnnotCount}%
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%
 %    \begin{macro}{\@TextField}
 %    \begin{macrocode}
 \def\@TextField[#1]#2{% parameters, label
@@ -18816,7 +19047,7 @@
       }%
     }%
     \unhbox\pdfm@box
-    \@pdfm@mark{put @afields @text\HyField@TheAnnotCount}%
+    \HyField@AddToFields{text}%
     % record in @afields array
   \endgroup
 }
@@ -18929,9 +19160,7 @@
     }%
     \unhcopy\pdfm@box\space% deliberate space between radio buttons
     \ifnum\Fld@listcount=1 %
-      \@pdfm@mark{%
-        put @afields @radio\HyField@TheAnnotCount
-      }%
+      \HyField@AddToFields{radio}%
     \fi
   }%
 }
@@ -18959,7 +19188,7 @@
     <<\PDFForm@List>>%
   }%
   \unhbox\pdfm@box
-  \@pdfm@mark{put @afields @list\HyField@TheAnnotCount}%
+  \HyField@AddToFields{list}%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -18996,7 +19225,7 @@
         }%
       }%
       \unhbox\pdfm@box
-      \@pdfm@mark{put @afields @push\HyField@TheAnnotCount}%
+      \HyField@AddToFields{push}%
     \fi
   \endgroup
 }
@@ -19025,7 +19254,7 @@
       <<\PDFForm@Submit>>%
     }%
     \unhbox\pdfm@box%
-    \@pdfm@mark{put @afields @submit\HyField@TheAnnotCount}%
+    \HyField@AddToFields{submit}%
   \endgroup
 }
 %    \end{macrocode}
@@ -19058,7 +19287,7 @@
         <<\PDFForm@Reset>>%
       }%
       \unhbox\pdfm@box
-      \@pdfm@mark{put @afields @reset\HyField@TheAnnotCount}%
+      \HyField@AddToFields{reset}%
     \fi
   \endgroup
 }
@@ -19092,7 +19321,7 @@
         <<\PDFForm@Check>>%
       }%
       \unhbox\pdfm@box
-      \@pdfm@mark{put @afields @check\HyField@TheAnnotCount}%
+      \HyField@AddToFields{check}%
     }%
   \endgroup
 }
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
index 33acd18eea1..0e2f52683aa 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvipdfm.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref driver for dvipdfm]
 \Hy@VersionCheck{hdvipdfm.def}
 \def\Hy@PutCatalog#1{\@pdfm@mark{docview <<#1>>}}
@@ -695,6 +695,13 @@
   \the\HyField@AnnotCount
 }
 \def\Fld@pageobjref{/P @thispage}%
+\def\HyField@AddToFields#1{%
+  \@pdfm@mark{put @afields @#1\HyField@TheAnnotCount}%
+  \ifx\Fld@calculate@code\ltx@empty
+  \else
+    \@pdfm@mark{put @corder @#1\HyField@TheAnnotCount}%
+  \fi
+}
 \def\@TextField[#1]#2{% parameters, label
   \def\Fld@name{#2}%
   \let\Fld@default\ltx@empty
@@ -728,7 +735,7 @@
       }%
     }%
     \unhbox\pdfm@box
-    \@pdfm@mark{put @afields @text\HyField@TheAnnotCount}%
+    \HyField@AddToFields{text}%
     % record in @afields array
   \endgroup
 }
@@ -831,9 +838,7 @@
     }%
     \unhcopy\pdfm@box\space% deliberate space between radio buttons
     \ifnum\Fld@listcount=1 %
-      \@pdfm@mark{%
-        put @afields @radio\HyField@TheAnnotCount
-      }%
+      \HyField@AddToFields{radio}%
     \fi
   }%
 }
@@ -852,7 +857,7 @@
     <<\PDFForm@List>>%
   }%
   \unhbox\pdfm@box
-  \@pdfm@mark{put @afields @list\HyField@TheAnnotCount}%
+  \HyField@AddToFields{list}%
 }
 \def\@PushButton[#1]#2{% parameters, label
   \def\Fld@name{#2}%
@@ -884,7 +889,7 @@
         }%
       }%
       \unhbox\pdfm@box
-      \@pdfm@mark{put @afields @push\HyField@TheAnnotCount}%
+      \HyField@AddToFields{push}%
     \fi
   \endgroup
 }
@@ -908,7 +913,7 @@
       <<\PDFForm@Submit>>%
     }%
     \unhbox\pdfm@box%
-    \@pdfm@mark{put @afields @submit\HyField@TheAnnotCount}%
+    \HyField@AddToFields{submit}%
   \endgroup
 }
 \def\@Reset[#1]#2{%
@@ -936,7 +941,7 @@
         <<\PDFForm@Reset>>%
       }%
       \unhbox\pdfm@box
-      \@pdfm@mark{put @afields @reset\HyField@TheAnnotCount}%
+      \HyField@AddToFields{reset}%
     \fi
   \endgroup
 }
@@ -965,7 +970,7 @@
         <<\PDFForm@Check>>%
       }%
       \unhbox\pdfm@box
-      \@pdfm@mark{put @afields @check\HyField@TheAnnotCount}%
+      \HyField@AddToFields{check}%
     }%
   \endgroup
 }
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
index 842cee6dbde..c721cff4b84 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvips.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref driver for dvips]
 \Hy@VersionCheck{hdvips.def}
 \providecommand*{\XR@ext}{pdf}
@@ -109,6 +109,14 @@
   \fi
   \Hy@DisableOption{setpagesize}%
 }
+\def\setpdflinkmargin#1{%
+  \begingroup
+    \setlength{\dimen@}{#1}%
+    \literalps@out{%
+      /HyperBorder{\strip@pt\dimen@\space PDFToDvips}def%
+    }%
+  \endgroup
+}
 \endinput
 %%
 %% End of file `hdvips.def'.
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
index 201def5f433..9fcf5ed63c1 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdvipson.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref driver for dvipsone]
 \Hy@VersionCheck{hdvipson.def}
 \providecommand*{\XR@ext}{pdf}
@@ -194,6 +194,14 @@
     } def%
   }%
 }
+\def\setpdflinkmargin#1{%
+  \begingroup
+    \setlength{\dimen@}{#1}%
+    \literalps@out{%
+      /HyperBorder{\strip@pt\dimen@\space PDFToDvips}def%
+    }%
+  \endgroup
+}
 \endinput
 %%
 %% End of file `hdvipson.def'.
diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
index 1bdc9560f83..1e7934ae41f 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hdviwind.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref driver for dviwindo]
 \Hy@VersionCheck{hdviwind.def}
 \begingroup
@@ -442,6 +442,7 @@
   \edef\@processme{\noexpand\pdf@toks={\the\pdf@defaulttoks}}%
   \@processme
   \let\pdf@type\relax
+  \let\pdf@objdef\ltx@empty
   \kvsetkeys{PDF}{#2}%
   \ifHy@pdfmarkerror
   \else
@@ -454,7 +455,12 @@
     \else
        \ifx\\#1\\%
          \literalps@out{%
-           [\the\pdf@toks\space\pdf@type\space pdfmark%
+           [%
+           \ifx\pdf@objdef\ltx@empty
+           \else
+             /_objdef\string{\pdf@objdef\string}%
+           \fi
+           \the\pdf@toks\space\pdf@type\space pdfmark%
          }%
        \else
          \ltx@IfUndefined{@\pdf@linktype color}{%
@@ -465,7 +471,12 @@
          }%
          \pdf@rect{#1}%
          \literalps@out{%
-           [\the\pdf@toks\space\pdf@type\space pdfmark%
+           [%
+           \ifx\pdf@objdef\ltx@empty
+           \else
+             /_objdef\string{\pdf@objdef\string}%
+           \fi
+           \the\pdf@toks\space\pdf@type\space pdfmark%
          }%
          \Hy@endcolorlink
        \fi
@@ -564,6 +575,8 @@
 \define@key{PDF}{pdfmark}{\def\pdf@type{#1}}
 \define@key{PDF}{linktype}{\def\pdf@linktype{#1}}
 \def\pdf@linktype{link}
+\define@key{PDF}{objdef}{\edef\pdf@objdef{#1}}
+\let\pdf@objdef\ltx@empty
 \define@key{PDF}{Raw}{\pdf@addtoksx{#1}}
 \define@key{PDF}{Action}{\pdf@addtoks{#1}{Action}}
 \define@key{PDF}{Border}{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
index 90c7f3c8b05..3a869732214 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hpdftex.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref driver for pdfTeX]
 \Hy@VersionCheck{hpdftex.def}
 \pdf@ifdraftmode{%
@@ -319,7 +319,12 @@
 \else
   \Hy@DisableOption{ocgcolorlinks}%
 \fi
-\def\setpdflinkmargin#1{\pdflinkmargin#1}
+\def\setpdflinkmargin#1{%
+  \begingroup
+    \setlength{\dimen@}{#1}%
+  \expandafter\endgroup
+  \expandafter\pdflinkmargin\the\dimen@\relax
+}
 \ifx\pdfstartlink\@undefined% less than version 14
   \let\pdfstartlink\pdfannotlink
   \let\pdflinkmargin\@tempdima
@@ -873,6 +878,7 @@
   }%
 }%
 \let\HyField@afields\ltx@empty
+\let\HyField@cofields\ltx@empty
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname pdflastlink\endcsname\relax
   \let\HyField@AddToFields\relax
@@ -885,12 +891,48 @@
   }%
 \else
   \let\HyField@AuxAddToFields\ltx@gobble
+  \let\HyField@AuxAddToCoFields\ltx@gobbletwo
   \def\HyField@AfterAuxOpen{\Hy@AtBeginDocument}%
+  \def\HyField@ABD@AuxAddToCoFields#1#2{%
+    \begingroup
+      \Hy@safe@activestrue
+      \let\ltx@secondoftwo\relax
+      \ifx\HyField@cofields\ltx@empty
+        \xdef\HyField@cofields{%
+          \ltx@secondoftwo{#1}{ #2 0 R}%
+        }%
+      \else
+        \let\ltx@secondoftwo\relax
+        \def\HyField@AddCoField##1##2##3{%
+          \ifx##1\ltx@empty
+            \ltx@secondoftwo{#1}{ #2 0 R}%
+            \expandafter\ltx@gobble
+          \else
+            \ifnum\pdfstrcmp{##2}{#1}>\ltx@zero
+              \ltx@secondoftwo{#1}{ #2 0 R}%
+              \ltx@secondoftwo{##2}{##3}%
+              \expandafter\expandafter\expandafter\ltx@gobble
+            \else
+              \ltx@secondoftwo{##2}{##3}%
+            \fi
+          \fi
+          \HyField@AddCoField
+        }%
+        \xdef\HyField@cofields{%
+          \expandafter\HyField@AddCoField
+          \HyField@cofields\ltx@empty\ltx@empty\ltx@empty
+        }%
+      \fi
+    \endgroup
+  }%
   \Hy@AtBeginDocument{%
     \if@filesw
       \immediate\write\@mainaux{%
         \string\providecommand\string\HyField@AuxAddToFields[1]{}%
       }%
+      \immediate\write\@mainaux{%
+        \string\providecommand\string\HyField@AuxAddToCoFields[2]{}%
+      }%
     \fi
     \let\HyField@AfterAuxOpen\@firstofone
     \def\HyField@AuxAddToFields#1{%
@@ -903,11 +945,30 @@
         #1 0 R%
       }%
     }%
+    \let\HyField@AuxAddToCoFields\HyField@ABD@AuxAddToCoFields
   }%
   \def\HyField@AddToFields{%
     \expandafter\HyField@@AddToFields\expandafter{%
       \the\pdflastlink
     }%
+    \ifx\Fld@calculate@code\ltx@empty
+    \else
+      \begingroup
+        \Hy@safe@activestrue
+        \edef\Hy@temp{%
+          \endgroup
+          \if@filesw
+            \write\@mainaux{%
+              \string\HyField@AuxAddToCoFields{%
+                \Fld@calculate@sortkey
+              }{%
+                \the\pdflastlink
+              }%
+            }%
+          \fi
+        }%
+      \Hy@temp
+    \fi
   }%
   \def\HyField@@AddToFields#1{%
     \HyField@AfterAuxOpen{%
@@ -933,6 +994,10 @@
       \immediate\pdfobj{%
         <<%
           /Fields[\HyField@afields]%
+          \ifx\HyField@cofields\ltx@empty
+          \else
+            /CO[\romannumeral-`\Q\HyField@cofields]%
+          \fi
           /DR<<%
             /Font<<%
               /ZaDb \OBJ@ZaDb\space 0 R%
diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
index dabced4eab4..86bbfda718f 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htex4ht.cfg}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   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 9ed45276c21..945d6d92fb2 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htex4ht.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref driver for TeX4ht]
 \Hy@VersionCheck{htex4ht.def}
 \providecommand*{\XR@ext}{html}
diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def
index 4f6f92e2f41..e508cb78c87 100644
--- a/Master/texmf-dist/tex/latex/hyperref/htexture.def
+++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{htexture.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref driver for Textures]
 \Hy@VersionCheck{htexture.def}
 \providecommand*{\XR@ext}{pdf}
@@ -111,6 +111,14 @@
     } def\Hy@ps@CR
   }%
 }
+\def\setpdflinkmargin#1{%
+  \begingroup
+    \setlength{\dimen@}{#1}%
+    \literalps@out{%
+      /HyperBorder{\strip@pt\dimen@\space PDFToDvips}def%
+    }%
+  \endgroup
+}
 \Hy@AtBeginDocument{%
   \ifHy@colorlinks
     \headerps@out{/PDFBorder{/Border [0 0 0]}def}%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
index 4906cc2fe29..6293044e144 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtex.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref driver for VTeX in PDF/PS mode]
 \Hy@VersionCheck{hvtex.def}
 \providecommand*{\XR@ext}{pdf}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
index e8a20670ee3..e87245c91ce 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtexhtml.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref driver for VTeX in HTML mode]
 \Hy@VersionCheck{hvtexhtm.def}
 \providecommand*{\XR@ext}{htm}
diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
index 6d92efd0b11..0f3c44f441e 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hvtexmrk.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
  Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)]
 \Hy@VersionCheck{hvtexmrk.def}
 \providecommand*{\XR@ext}{pdf}
@@ -89,6 +89,14 @@
     } def%
   }%
 }
+\def\setpdflinkmargin#1{%
+  \begingroup
+    \setlength{\dimen@}{#1}%
+    \literalps@out{%
+      /HyperBorder{\strip@pt\dimen@}def%
+    }%
+  \endgroup
+}
 \endinput
 %%
 %% End of file `hvtexmrk.def'.
diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
index 9cfd9275464..639db802921 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hxetex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hxetex.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hxetex.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref driver for XeTeX]
 \Hy@VersionCheck{hxetex.def}
 \HyPsd@LoadUnicode
@@ -757,6 +757,13 @@
   \the\HyField@AnnotCount
 }
 \def\Fld@pageobjref{/P @thispage}%
+\def\HyField@AddToFields#1{%
+  \@pdfm@mark{put @afields @#1\HyField@TheAnnotCount}%
+  \ifx\Fld@calculate@code\ltx@empty
+  \else
+    \@pdfm@mark{put @corder @#1\HyField@TheAnnotCount}%
+  \fi
+}
 \def\@TextField[#1]#2{% parameters, label
   \def\Fld@name{#2}%
   \let\Fld@default\ltx@empty
@@ -790,7 +797,7 @@
       }%
     }%
     \unhbox\pdfm@box
-    \@pdfm@mark{put @afields @text\HyField@TheAnnotCount}%
+    \HyField@AddToFields{text}%
     % record in @afields array
   \endgroup
 }
@@ -893,9 +900,7 @@
     }%
     \unhcopy\pdfm@box\space% deliberate space between radio buttons
     \ifnum\Fld@listcount=1 %
-      \@pdfm@mark{%
-        put @afields @radio\HyField@TheAnnotCount
-      }%
+      \HyField@AddToFields{radio}%
     \fi
   }%
 }
@@ -914,7 +919,7 @@
     <<\PDFForm@List>>%
   }%
   \unhbox\pdfm@box
-  \@pdfm@mark{put @afields @list\HyField@TheAnnotCount}%
+  \HyField@AddToFields{list}%
 }
 \def\@PushButton[#1]#2{% parameters, label
   \def\Fld@name{#2}%
@@ -946,7 +951,7 @@
         }%
       }%
       \unhbox\pdfm@box
-      \@pdfm@mark{put @afields @push\HyField@TheAnnotCount}%
+      \HyField@AddToFields{push}%
     \fi
   \endgroup
 }
@@ -970,7 +975,7 @@
       <<\PDFForm@Submit>>%
     }%
     \unhbox\pdfm@box%
-    \@pdfm@mark{put @afields @submit\HyField@TheAnnotCount}%
+    \HyField@AddToFields{submit}%
   \endgroup
 }
 \def\@Reset[#1]#2{%
@@ -998,7 +1003,7 @@
         <<\PDFForm@Reset>>%
       }%
       \unhbox\pdfm@box
-      \@pdfm@mark{put @afields @reset\HyField@TheAnnotCount}%
+      \HyField@AddToFields{reset}%
     \fi
   \endgroup
 }
@@ -1027,7 +1032,7 @@
         <<\PDFForm@Check>>%
       }%
       \unhbox\pdfm@box
-      \@pdfm@mark{put @afields @check\HyField@TheAnnotCount}%
+      \HyField@AddToFields{check}%
     }%
   \endgroup
 }
diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
index f97bf4a6c6a..2b463313eb7 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty
@@ -30,7 +30,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{hyperref}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hypertext links for LaTeX]
 \begingroup
   \@makeother\`%
@@ -125,6 +125,7 @@
 \RequirePackage{infwarerr}[2010/04/08]
 \RequirePackage{keyval}[1997/11/10]
 \RequirePackage{kvsetkeys}[2007/09/29]
+\RequirePackage{kvdefinekeys}[2011/04/07]
 \RequirePackage{pdfescape}[2007/11/11]
 \RequirePackage{ifvtex}
 \RequirePackage{ifxetex}[2006/08/21]
@@ -3921,15 +3922,22 @@
           `\kv@key' is ignored%
         }%
       \else
-        \define@key{pdfinfo}{\HyInfo@Key}{%
-          \HyXeTeX@CheckUnicode
-          \HyPsd@XeTeXBigCharstrue
-          \HyPsd@PrerenderUnicode{##1}%
-          \pdfstringdef\HyInfo@Value{##1}%
-          \expandafter\let\csname HyInfo@Value@\HyInfo@Key\endcsname
-              \HyInfo@Value
+        \def\HyInfo@tmp##1{%
+          \kv@define@key{pdfinfo}{##1}{%
+            \HyXeTeX@CheckUnicode
+            \HyPsd@XeTeXBigCharstrue
+            \HyPsd@PrerenderUnicode{####1}%
+            \pdfstringdef\HyInfo@Value{####1}%
+            \global\expandafter
+            \let\csname HyInfo@Value@##1\endcsname
+                \HyInfo@Value
+          }%
         }%
-        \edef\HyInfo@AddonList{%
+        \expandafter\HyInfo@tmp\expandafter{\HyInfo@Key}%
+        \global\expandafter
+        \let\csname KV@pdfinfo@\HyInfo@Key\expandafter\endcsname
+            \csname KV@pdfinfo@\HyInfo@Key\endcsname
+        \xdef\HyInfo@AddonList{%
           \HyInfo@AddonList
           \HyInfo@do{\HyInfo@Key}%
         }%
@@ -3971,7 +3979,7 @@
     \x
   \fi
 }
-\let\HyInfo@AddonList\ltx@empty
+\global\let\HyInfo@AddonList\ltx@empty
 \define@key{Hyp}{pdfview}{\calculate@pdfview#1 \\}
 \define@key{Hyp}{pdflinkmargin}{\setpdflinkmargin{#1}}
 \let\setpdflinkmargin\@gobble
@@ -4156,10 +4164,18 @@
   a4paper,a5paper,b5paper,letterpaper,legalpaper,executivepaper%
 }
 \@ifpackageloaded{tex4ht}{%
-  \@ifpackagewith{hyperref}{tex4ht}{}{%
+  \@ifpackagewith{hyperref}{tex4ht}{%
+  }{%
     \PassOptionsToPackage{tex4ht}{hyperref}%
   }%
 }{}
+\ltx@IfUndefined{HCode}{%
+}{%
+  \@ifpackagewith{hyperref}{tex4ht}{%
+  }{%
+    \PassOptionsToPackage{tex4ht}{hyperref}%
+  }%
+}
 \let\ReadBookmarks\relax
 \ProcessKeyvalOptions{Hyp}
 \def\Hy@xspace@end{}
@@ -6011,6 +6027,10 @@
 \Hy@temp{onblur}
 \Hy@temp{onenter}
 \Hy@temp{onexit}
+\let\Fld@calculate@sortkey\ltx@empty
+\define@key{Field}{calculatesortkey}[1]{%
+  \def\Fld@calculate@sortkey{#1}%
+}
 \ifHy@texht
   \def\Hy@temp#1{%
     \define@key{Field}{#1}{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
index 98ffac4b695..b39de7cdda4 100644
--- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def
+++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{hypertex.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref driver for HyperTeX specials]
 \Hy@VersionCheck{hypertex.def}
 \providecommand*{\XR@ext}{dvi}
diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
index 2a73448ae8e..9e980f362e8 100644
--- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
+++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty
@@ -30,7 +30,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{nohyperref}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Dummy hyperref (SR)]
 \RequirePackage{letltxmacro}[2008/06/13]
 \let\hyper@@anchor\@gobble
diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
index f695ead113c..a7eaeaa3c43 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{pd1enc.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref: PDFDocEncoding definition (HO)]
 \DeclareFontEncoding{PD1}{}{}
 \DeclareTextAccent{\`}{PD1}{\textasciigrave}
diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
index d5fb37914d7..3ba3a695a3a 100644
--- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
+++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{pdfmark.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref definitions for pdfmark specials]
 \Hy@VersionCheck{pdfmark.def}
 \begingroup
@@ -483,6 +483,7 @@
   \edef\@processme{\noexpand\pdf@toks={\the\pdf@defaulttoks}}%
   \@processme
   \let\pdf@type\relax
+  \let\pdf@objdef\ltx@empty
   \kvsetkeys{PDF}{#2}%
   \ifHy@pdfmarkerror
   \else
@@ -495,7 +496,12 @@
     \else
        \ifx\\#1\\%
          \literalps@out{%
-           [\the\pdf@toks\space\pdf@type\space pdfmark%
+           [%
+           \ifx\pdf@objdef\ltx@empty
+           \else
+             /_objdef\string{\pdf@objdef\string}%
+           \fi
+           \the\pdf@toks\space\pdf@type\space pdfmark%
          }%
        \else
          \ltx@IfUndefined{@\pdf@linktype color}{%
@@ -506,7 +512,12 @@
          }%
          \pdf@rect{#1}%
          \literalps@out{%
-           [\the\pdf@toks\space\pdf@type\space pdfmark%
+           [%
+           \ifx\pdf@objdef\ltx@empty
+           \else
+             /_objdef\string{\pdf@objdef\string}%
+           \fi
+           \the\pdf@toks\space\pdf@type\space pdfmark%
          }%
          \Hy@endcolorlink
        \fi
@@ -605,6 +616,8 @@
 \define@key{PDF}{pdfmark}{\def\pdf@type{#1}}
 \define@key{PDF}{linktype}{\def\pdf@linktype{#1}}
 \def\pdf@linktype{link}
+\define@key{PDF}{objdef}{\edef\pdf@objdef{#1}}
+\let\pdf@objdef\ltx@empty
 \define@key{PDF}{Raw}{\pdf@addtoksx{#1}}
 \define@key{PDF}{Action}{\pdf@addtoks{#1}{Action}}
 \define@key{PDF}{Border}{%
@@ -911,6 +924,10 @@
   /_objdef{afields}%
   /type/array%
 /OBJ pdfmark%
+[%
+  /_objdef{corder}%
+  /type/array%
+/OBJ pdfmark%
 {%
   [%
     /BBox[0 0 100 100]%
@@ -1011,10 +1028,6 @@
     /AcroForm{aform}%
   >>%
 /PUT pdfmark%
-[%
-  /_objdef{corder}%
-  /type/array%
-/OBJ pdfmark% dps
 }}%
   \kvsetkeys{Form}{#1}%
 }
@@ -1022,7 +1035,34 @@
 \def\@Gauge[#1]#2#3#4{% parameters, label, minimum, maximum
   \Hy@Message{Sorry, pdfmark drivers do not support FORM gauges}%
 }
+\newcount\HyField@AnnotCount
+\HyField@AnnotCount=\z@
+\def\HyField@AdvanceAnnotCount{%
+  \global\advance\HyField@AnnotCount\@ne
+}
+\def\HyField@TheAnnotCount{%
+  \the\HyField@AnnotCount
+}
 \edef\Fld@pageobjref{/P\string{ThisPage\string}}
+\def\HyField@AddToFields#1{%
+  \pdfmark{%
+    pdfmark=/APPEND,%
+    Raw={%
+      \string{afields\string}%
+      \string{#1\HyField@TheAnnotCount\string}%
+    }%
+  }%
+  \ifx\Fld@calculate@code\ltx@empty
+  \else
+    \pdfmark{%
+      pdfmark=/APPEND,%
+      Raw={%
+        \string{corder\string}%
+        \string{#1\HyField@TheAnnotCount\string}%
+      }%
+    }%
+  \fi
+}
 \def\@TextField[#1]#2{% parameters, label
   \def\Fld@name{#2}%
   \let\Fld@default\ltx@empty
@@ -1042,13 +1082,17 @@
     \HyField@FlagsText
     \ifFld@hidden\def\Fld@width{1sp}\fi
     \ifx\Fld@value\@empty\def\Fld@value{\Fld@default}\fi
+    \HyField@AdvanceAnnotCount
     \LayoutTextField{#2}{%
       \leavevmode
       \Hy@escapeform\PDFForm@Text
       \pdfmark[\MakeTextField{\Fld@width}{\Fld@height}]{%
-        pdfmark=/ANN,Raw={\PDFForm@Text}%
+        pdfmark=/ANN,%
+        objdef=text\HyField@TheAnnotCount,%
+        Raw={\PDFForm@Text}%
       }%
     }%
+    \HyField@AddToFields{text}%
   \endgroup
 }
 \def\@ChoiceMenu[#1]#2#3{% parameters, label, choices
@@ -1128,21 +1172,32 @@
     \Hy@StepCount\Fld@listcount
     \@currDisplay\space
     \Hy@escapeform\PDFForm@Radio
+    \ifnum\Fld@listcount=1 %
+      \HyField@AdvanceAnnotCount
+    \fi
     \pdfmark[\MakeRadioField{\Fld@width}{\Fld@height}]{%
       pdfmark=/ANN,%
+      objdef=\ifnum\Fld@listcount=1 radio\HyField@TheAnnotCount\fi,%
       Raw={%
         \PDFForm@Radio /AP <</N <</\@currValue\space {Check}>> >>%
       }%
     } % deliberate space between radio buttons
+    \ifnum\Fld@listcount=1 %
+      \HyField@AddToFields{radio}%
+    \fi
   }%
 }
 \newcount\Fld@listcount
 \def\@@Listbox#1{%
   \HyField@PDFChoices{#1}%
   \Hy@escapeform\PDFForm@List
+  \HyField@AdvanceAnnotCount
   \pdfmark[\MakeChoiceField{\Fld@width}{\Fld@height}]{%
-    pdfmark=/ANN,Raw={\PDFForm@List}%
+    pdfmark=/ANN,%
+    objdef=list\HyField@TheAnnotCount,%
+    Raw={\PDFForm@List}%
   }%
+  \HyField@AddToFields{list}%
 }
 \def\@PushButton[#1]#2{% parameters, label
   \def\Fld@name{#2}%
@@ -1161,13 +1216,17 @@
     \else
       \HyField@FlagsPushButton
       \ifFld@hidden\def\Fld@width{1sp}\fi
+      \HyField@AdvanceAnnotCount
       \LayoutPushButtonField{%
         \leavevmode
         \Hy@escapeform\PDFForm@Push
         \pdfmark[\MakeButtonField{#2}]{%
-          pdfmark=/ANN,Raw={\PDFForm@Push}%
+          pdfmark=/ANN,%
+          objdef=push\HyField@TheAnnotCount,%
+          Raw={\PDFForm@Push}%
         }%
       }%
+      \HyField@AddToFields{push}%
     \fi
   \endgroup
 }
@@ -1182,10 +1241,13 @@
     \HyField@FlagsSubmit
     \ifFld@hidden\def\Fld@width{1sp}\fi
     \Hy@escapeform\PDFForm@Submit
+    \HyField@AdvanceAnnotCount
     \pdfmark[\MakeButtonField{#2}]{%
       pdfmark=/ANN,%
-      Raw={\PDFForm@Submit /AP << /N {Submit} /D {SubmitP} >>}%
+      objdef=submit\HyField@TheAnnotCount,%
+      Raw={\PDFForm@Submit /AP<</N{Submit}/D{SubmitP}>>}%
     }%
+    \HyField@AddToFields{submit}%
   \endgroup
 }
 \def\@Reset[#1]#2{%
@@ -1205,9 +1267,13 @@
       \HyField@FlagsPushButton
       \ifFld@hidden\def\Fld@width{1sp}\fi
       \Hy@escapeform\PDFForm@Reset
+      \HyField@AdvanceAnnotCount
       \pdfmark[\MakeButtonField{#2}]{%
-        pdfmark=/ANN,Raw={\PDFForm@Reset}%
+        pdfmark=/ANN,%
+        objdef=reset\HyField@TheAnnotCount,%
+        Raw={\PDFForm@Reset}%
       }%
+      \HyField@AddToFields{reset}%
     \fi
   \endgroup
 }%
@@ -1222,13 +1288,17 @@
     }%
     \HyField@FlagsCheckBox
     \ifFld@hidden\def\Fld@width{1sp}\fi
+    \HyField@AdvanceAnnotCount
     \LayoutCheckField{#2}{%
       \leavevmode
       \Hy@escapeform\PDFForm@Check
       \pdfmark[\MakeCheckField{\Fld@width}{\Fld@height}]{%
-        pdfmark=/ANN,Raw={\PDFForm@Check}%
+        pdfmark=/ANN,%
+        objdef=check\HyField@TheAnnotCount,%
+        Raw={\PDFForm@Check}%
       }%
     }%
+    \HyField@AddToFields{check}%
   \endgroup
 }
 \providecommand*{\Fld@pageobjref}{}
diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def
index 9e28e668121..270d964b4b1 100644
--- a/Master/texmf-dist/tex/latex/hyperref/psdextra.def
+++ b/Master/texmf-dist/tex/latex/hyperref/psdextra.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{psdextra.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref: Additions to PDF string support]
 \Hy@VersionCheck{psdextra.def}
 \newcommand*{\psdmapshortnames}{%
diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
index 1c391388cd9..7f51f680411 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puarenc.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref: Additions to puenc.def for Arabi]
 \DeclareTextCommand{\hamza}{PU}{\86\041}% U+0621
 \DeclareTextCommand{\alefmadda}{PU}{\86\042}% U+0622
diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def
index 6706a7eb69e..9ccfdd79bce 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puenc.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref: PDF Unicode definition (HO)]
 \DeclareFontEncoding{PU}{}{}
 \DeclareTextCommand{\`}{PU}[1]{#1\83\000}% U+0300
diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
index c415c1a1bb5..1480518c4d4 100644
--- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
+++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def
@@ -29,7 +29,7 @@
 %% given in the file `manifest.txt'.
 %%
 \ProvidesFile{puvnenc.def}
-  [2012/09/27 v6.83g %
+  [2012/10/13 v6.83j %
   Hyperref: Additions to puenc.def for VnTeX]
 \DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103
 \DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2