From bab961693da2dc268bc289e71ae458271993c75c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 3 Aug 2012 21:31:30 +0000 Subject: hyperref git-svn-id: svn://tug.org/texlive/trunk@27298 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hyperref/ChangeLog | 17 +++++- Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf | Bin 171326 -> 170164 bytes Master/texmf-dist/doc/latex/hyperref/backref.pdf | Bin 169374 -> 169374 bytes Master/texmf-dist/doc/latex/hyperref/hyperref.pdf | Bin 2251401 -> 2253342 bytes Master/texmf-dist/doc/latex/hyperref/nameref.pdf | Bin 159444 -> 162450 bytes .../texmf-dist/source/latex/hyperref/hyperref.dtx | 68 +++++++++++++++++++-- .../texmf-dist/source/latex/hyperref/nameref.dtx | 38 ++++++++---- Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdvips.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdvipson.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hdviwind.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hpdftex.def | 2 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg | 2 +- Master/texmf-dist/tex/latex/hyperref/htex4ht.def | 2 +- Master/texmf-dist/tex/latex/hyperref/htexture.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtex.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hxetex.def | 2 +- Master/texmf-dist/tex/latex/hyperref/hyperref.sty | 46 ++++++++++++-- Master/texmf-dist/tex/latex/hyperref/hypertex.def | 2 +- Master/texmf-dist/tex/latex/hyperref/nameref.sty | 3 +- .../texmf-dist/tex/latex/hyperref/nohyperref.sty | 2 +- Master/texmf-dist/tex/latex/hyperref/pd1enc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/pdfmark.def | 2 +- Master/texmf-dist/tex/latex/hyperref/psdextra.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puarenc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puenc.def | 2 +- Master/texmf-dist/tex/latex/hyperref/puvnenc.def | 2 +- 29 files changed, 166 insertions(+), 46 deletions(-) diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index c6d003dec90..a14366caf55 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,18 @@ +2012-08-03 6.82y Heiko Oberdiek + * 6.82y + * Unique destination names: Lookup for parent counters added + for counters that are defined before hyperref is loaded and + \theH is not provided. + * Fixes: File `psdextra.def` was loaded always with option `unicode', + restriction of set option `psdextra' was missing. Also the + catcode was not explicitely set to `letter', when the file is loaded. + (Thanks Daniel Halperin for bug report.) + +2012-07-31 6.82x Heiko Oberdiek + * 6.82x + * nameref 2.42: Definition for \strip@period provided. + It was removed in 2.41, but it is needed by package `subfig'. + 2012-07-30 6.82w Heiko Oberdiek * 6.82w * Bug fix in \pdfstringdef: Active characters defined with @@ -16,7 +31,7 @@ 2012-07-28 6.82u Heiko Oberdiek * 6.82u * Option `destlabel' and \HyperDestRename added. - * nameref 1.41: + * nameref 2.41: * The hook \label@hook is added to \label. * \strip@period is fixed (unnecessary addition of \relax) and renamed to \NR@strip@period. diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf index a887148ffb9..255b0261553 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf and b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf index 39e99186fb1..67e4d8f700a 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/backref.pdf and b/Master/texmf-dist/doc/latex/hyperref/backref.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf index b734fff8213..2fad657907e 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf and b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf differ diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf index 262f4a16aaa..83136e86619 100644 Binary files a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf and b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf differ diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index f4a8744d2ab..f20946dfdbe 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -45,7 +45,7 @@ %\ProvidesFile{puvnenc.def} %\ProvidesFile{puarenc.def} %\ProvidesFile{psdextra.def} -% [2012/07/30 v6.82w % +% [2012/08/03 v6.82y % % Hypertext links for LaTeX] % Dummy hyperref (SR)] % Hyperref documentation driver file] @@ -147,7 +147,7 @@ \end{document} % % \fi -% \CheckSum{37293} +% \CheckSum{37357} % % \MakeShortVerb{|} % \StopEventually{} @@ -2079,7 +2079,12 @@ \DeclareFontFamily{PU}{pdf}{}% \DeclareFontShape{PU}{pdf}{m}{n}{ <-> cmr10 }{}% \DeclareFontSubstitution{PU}{pdf}{m}{n}% - \input{psdextra.def}% + \ifHy@psdextra + \edef\Hy@atrestore{\catcode64=\the\catcode64\relax}% @ + \makeatletter + \input{psdextra.def}% + \Hy@atrestore + \fi \let\HyPsd@LoadUnicode\relax } % \end{macrocode} @@ -10289,9 +10294,7 @@ \let\theHequation\newname }{}% \fi - \@ifundefined{theH#1}{% - \expandafter\def\csname theH#1\endcsname{\arabic{#1}}% - }{}% + \HyCnt@ProvideTheHCounter{#1}% \hyper@makecurrent{#1}% \ifmeasuring@ \else @@ -10302,6 +10305,59 @@ } % \end{macrocode} % \end{macro} +% \begin{macro}{\Hy@ProvideTheHCounter} +% \cs{theH} is not set for counters that +% are defined before `hyperref' is loaded. +% In \cs{cl@@ckpt}, the clear counter list of +% the artificial counter |@ckpt|, \LaTeX\ remembers +% the defined counters (needed for \cs{include}). We check +% the clear counter lists, whether our counter is present. +% If we found it, then we add the parent counter value +% to \cs{theH}. The \cs{@elt} list is +% used in sanitized form for the comparison, because the list +% might contain other stuff than \cs{@elt}s. Also it simplifies +% the implementation, because \LaTeX', substring search +% \cs{in@} can be used. +% \begin{macrocode} +\def\HyCnt@ProvideTheHCounter#1{% + \@ifundefined{theH#1}{% + \expandafter\def\csname theH#1\endcsname{}% + \def\Hy@temp{\@elt{#1}}% + \ltx@onelevel@sanitize\Hy@temp + \edef\@elt{% + \noexpand\HyCnt@LookForParentCounter + \expandafter\noexpand\csname theH#1\endcsname + }% + \cl@@ckpt + \expandafter + \ltx@LocalAppendToMacro\csname theH#1\expandafter\endcsname + \expandafter{% + \expandafter\@arabic\csname c@#1\endcsname + }% + }{}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\Hy@LookForParentCounter} +% \begin{macrocode} +\def\HyCnt@LookForParentCounter#1#2{% + \expandafter\let\expandafter\Hy@temp@A\csname cl@#2\endcsname + \ltx@ifundefined{cl@#2}{% + }{% + \ltx@onelevel@sanitize\Hy@temp@A + \edef\Hy@temp@A{% + \noexpand\in@{\Hy@temp}{\Hy@temp@A}% + }\Hy@temp@A + \ifin@ + \expandafter\ltx@LocalAppendToMacro\expandafter#1% + \expandafter{% + \expandafter\@arabic\csname c@#2\endcsname.% + }% + \fi + }% +} +% \end{macrocode} +% \end{macro} % % After \cmd{\appendix} ``chapter'' (or ``section'' for classes % without chapter) should be replaced diff --git a/Master/texmf-dist/source/latex/hyperref/nameref.dtx b/Master/texmf-dist/source/latex/hyperref/nameref.dtx index 7aa3251e3c5..fff510b9bf6 100644 --- a/Master/texmf-dist/source/latex/hyperref/nameref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/nameref.dtx @@ -30,17 +30,19 @@ %\ProvidesFile{nameref.drv} % \fi % \ProvidesFile{nameref.dtx} - [2012/07/28 v2.41 Cross-referencing by name of section]% + [2012/07/31 v2.42 Cross-referencing by name of section]% % -% \CheckSum{696} +% \CheckSum{700} % % \iffalse %<*driver> \documentclass{ltxdoc} \usepackage[numbered]{hypdoc} \usepackage{bmhydoc} +\usepackage{hologo} \EnableCrossrefs \CodelineIndex +\newcommand*{\xpackage}[1]{\textsf{#1}} \begin{document} \GetFileInfo{nameref.sty}% \title{% @@ -119,7 +121,7 @@ % % We redefine |\label| so that it also writes the name of the % current section to the .aux file; if the name ends in a dot, -% we zap it. To allow for the hyperref package, also write +% we zap it. To allow for the \xpackage{hyperref} package, also write % fourth and fifth fields (empty by default; % used for cross-ref name, and file). % \begin{macro}{\NR@strip@period} @@ -128,6 +130,15 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\strip@period} +% Macro \cs{strip@period} was removed in \xpackage{nameref} +% 2012/07/28 v2.41 and reinserted in 2012/07/31 v2.42 for compatibilty +% reasons with package \xpackage{subfig}. +% \begin{macrocode} +\def\strip@period#1.\relax#2\@@@{#1} +% \end{macrocode} +% \end{macro} +% % \begin{macrocode} \def\NR@sanitize@labelname{% \@onelevel@sanitize\@currentlabelname @@ -140,8 +151,8 @@ % % \subsection{\cs{label} stuff} % -% Here is tested, whether package showkeys is loaded. -% But if option final is used, the macros of showkeys +% Here is tested, whether package \xpackage{showkeys} is loaded. +% But if option final is used, the macros of \xpackage{showkeys} % are not defined, so we have to check an additional % test. % \begin{macro}{\ifNR@showkeys} @@ -241,7 +252,7 @@ } % \end{macrocode} % \end{macro} -% Overload an AMS \LaTeX\ command, which uses |\newlabel|. Sigh! +% Overload an AMS \hologo{LaTeX} command, which uses |\newlabel|. Sigh! % \begin{macro}{\@writetocindents@} % \begin{macrocode} \def\@writetocindents@{% @@ -529,7 +540,7 @@ % We have to redefine |\ref| and |\pageref| to know about extra % reference elements. Make them robust, and compatible with Babel. % The Babel switch is mimicked if not already defined. -% Some support for package |showkeys| is implemented. If +% Some support for package \xpackage{showkeys} is implemented. If % option |notref| of that package is set, |\SK@ref| has the % meaning of |\@empty|. % \begin{macro}{\@safe@activestrue} @@ -606,11 +617,12 @@ \fi \fi % \end{macrocode} -% Package |hyperref| uses its own definitions of |\ref| and +% Package \xpackage{hyperref} uses its own definitions of |\ref| and % |\pageref| because it extends the syntax by the star form. -% |\DeclareRobustCommand| is used by hyperref. -% Package |nameref| can be loaded before, after hyperref or after -% hyperref's definitions in |\AtBeginDocument|. +% |\DeclareRobustCommand| is used by \xpackage{hyperref}. +% Package |nameref| can be loaded before, after +% \xpackage{hyperref} or after +% \xpackage{hyperref}'s definitions in |\AtBeginDocument|. % \begin{macrocode} \@ifpackageloaded{hyperref}{% }{% @@ -719,7 +731,7 @@ % \subsection{Compatibility with varioref} % % [This section was derived by Corey Minyard \texttt{minyard@acm.org} -% from the varioref package] +% from the \xpackage{varioref} package] % \begin{macrocode} \AtBeginDocument{% \ifx\csname @@vpageref\endcsname\relax @@ -846,7 +858,7 @@ }% % \end{macrocode} % -% \subsection{Support for listings} +% \subsection{Support for package \xpackage{listings}} % % \begin{macrocode} \AtBeginDocument{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index a11f6f75ec5..6f6675d397f 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/07/30 v6.82w % + [2012/08/03 v6.82y % Hyperref driver for dvipdfm] \Hy@VersionCheck{hdvipdfm.def} \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index fa69dc283de..7c487ced93f 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/07/30 v6.82w % + [2012/08/03 v6.82y % Hyperref driver for dvips] \Hy@VersionCheck{hdvips.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index 233cdfd0c02..ec0493a55cb 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/07/30 v6.82w % + [2012/08/03 v6.82y % Hyperref driver for dvipsone] \Hy@VersionCheck{hdvipson.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 74ff9b23dff..98eb64f650d 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/07/30 v6.82w % + [2012/08/03 v6.82y % Hyperref driver for dviwindo] \Hy@VersionCheck{hdviwind.def} \begingroup diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index ea6bef2c41e..0822932acc7 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/07/30 v6.82w % + [2012/08/03 v6.82y % Hyperref driver for pdfTeX] \Hy@VersionCheck{hpdftex.def} \pdf@ifdraftmode{% diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index ff0d13544ea..e40d9e67676 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/07/30 v6.82w % + [2012/08/03 v6.82y % 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 26d3900999c..3189c37a59f 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/07/30 v6.82w % + [2012/08/03 v6.82y % 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 05ded082f88..502f69f8c1d 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/07/30 v6.82w % + [2012/08/03 v6.82y % Hyperref driver for Textures] \Hy@VersionCheck{htexture.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index 4b11dd74af3..8248565dd8f 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/07/30 v6.82w % + [2012/08/03 v6.82y % 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 d5ccaa95fa6..e6bd087a004 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/07/30 v6.82w % + [2012/08/03 v6.82y % 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 0b5ceb322e1..8485958748f 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/07/30 v6.82w % + [2012/08/03 v6.82y % Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \Hy@VersionCheck{hvtexmrk.def} \providecommand*{\XR@ext}{pdf} diff --git a/Master/texmf-dist/tex/latex/hyperref/hxetex.def b/Master/texmf-dist/tex/latex/hyperref/hxetex.def index e7280d58ea2..781f4ca02d9 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/07/30 v6.82w % + [2012/08/03 v6.82y % Hyperref driver for XeTeX] \Hy@VersionCheck{hxetex.def} \HyPsd@LoadUnicode diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 2142b0071e6..ddae40e9480 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/07/30 v6.82w % + [2012/08/03 v6.82y % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -795,7 +795,12 @@ \DeclareFontFamily{PU}{pdf}{}% \DeclareFontShape{PU}{pdf}{m}{n}{ <-> cmr10 }{}% \DeclareFontSubstitution{PU}{pdf}{m}{n}% - \input{psdextra.def}% + \ifHy@psdextra + \edef\Hy@atrestore{\catcode64=\the\catcode64\relax}% @ + \makeatletter + \input{psdextra.def}% + \Hy@atrestore + \fi \let\HyPsd@LoadUnicode\relax } \def\texorpdfstring{% @@ -6496,9 +6501,7 @@ \let\theHequation\newname }{}% \fi - \@ifundefined{theH#1}{% - \expandafter\def\csname theH#1\endcsname{\arabic{#1}}% - }{}% + \HyCnt@ProvideTheHCounter{#1}% \hyper@makecurrent{#1}% \ifmeasuring@ \else @@ -6507,6 +6510,39 @@ }% \fi } +\def\HyCnt@ProvideTheHCounter#1{% + \@ifundefined{theH#1}{% + \expandafter\def\csname theH#1\endcsname{}% + \def\Hy@temp{\@elt{#1}}% + \ltx@onelevel@sanitize\Hy@temp + \edef\@elt{% + \noexpand\HyCnt@LookForParentCounter + \expandafter\noexpand\csname theH#1\endcsname + }% + \cl@@ckpt + \expandafter + \ltx@LocalAppendToMacro\csname theH#1\expandafter\endcsname + \expandafter{% + \expandafter\@arabic\csname c@#1\endcsname + }% + }{}% +} +\def\HyCnt@LookForParentCounter#1#2{% + \expandafter\let\expandafter\Hy@temp@A\csname cl@#2\endcsname + \ltx@ifundefined{cl@#2}{% + }{% + \ltx@onelevel@sanitize\Hy@temp@A + \edef\Hy@temp@A{% + \noexpand\in@{\Hy@temp}{\Hy@temp@A}% + }\Hy@temp@A + \ifin@ + \expandafter\ltx@LocalAppendToMacro\expandafter#1% + \expandafter{% + \expandafter\@arabic\csname c@#2\endcsname.% + }% + \fi + }% +} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname chapter\endcsname\relax \def\Hy@chapterstring{section}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index dc1c4314870..6c955783b6a 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/07/30 v6.82w % + [2012/08/03 v6.82y % Hyperref driver for HyperTeX specials] \Hy@VersionCheck{hypertex.def} \providecommand*{\XR@ext}{dvi} diff --git a/Master/texmf-dist/tex/latex/hyperref/nameref.sty b/Master/texmf-dist/tex/latex/hyperref/nameref.sty index 0cb76115da7..01e884231ff 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nameref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nameref.sty @@ -30,11 +30,12 @@ %% given in the file `manifest.txt'. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nameref} - [2012/07/28 v2.41 Cross-referencing by name of section]% + [2012/07/31 v2.42 Cross-referencing by name of section]% \RequirePackage{refcount}[2006/02/12] \RequirePackage{gettitlestring}[2009/12/18] \RequirePackage{ltxcmds}[2009/12/12] \def\NR@strip@period#1.\ltx@empty#2\@nil{#1} +\def\strip@period#1.\relax#2\@@@{#1} \def\NR@sanitize@labelname{% \@onelevel@sanitize\@currentlabelname \edef\@currentlabelname{% diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index 493aaa83caa..ca829dee1c8 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/07/30 v6.82w % + [2012/08/03 v6.82y % 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 d492ba692c2..0166ee3c9fe 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/07/30 v6.82w % + [2012/08/03 v6.82y % 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 a9f38396693..2952c2c4869 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/07/30 v6.82w % + [2012/08/03 v6.82y % Hyperref definitions for pdfmark specials] \Hy@VersionCheck{pdfmark.def} \begingroup diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def index 8a7eb334f6e..039c8f6f1b9 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/07/30 v6.82w % + [2012/08/03 v6.82y % 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 08645c485cb..7e8b6ba00e9 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/07/30 v6.82w % + [2012/08/03 v6.82y % 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 51da8f16cf3..db56934c26d 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/07/30 v6.82w % + [2012/08/03 v6.82y % 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 c1e993904cc..57a2cae151f 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/07/30 v6.82w % + [2012/08/03 v6.82y % Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103 \DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2 -- cgit v1.2.3