diff options
| author | Karl Berry <karl@freefriends.org> | 2012-11-08 23:07:52 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2012-11-08 23:07:52 +0000 |
| commit | b7fa91e9e7a5170359bd088603d82c36334b95fa (patch) | |
| tree | bd1a1a08af41f099a0df3434b02d9c7ce7e9a591 /Master | |
| parent | 2f4b454ae76e5151ecb060ba24f829d1234cd737 (diff) | |
hyperref (8nov12)
git-svn-id: svn://tug.org/texlive/trunk@28213 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
34 files changed, 380 insertions, 72 deletions
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index 3f180aa5867..57444f73f9f 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,14 @@ +2012-11-06 6.83m Heiko Oberdiek + * 6.83m + * Option `pdflang': Default is `\relax' that suppresses + the entry in the PDF catalogue. An empty value (undetermined + language) is written to the PDF catalogue. + * Option `pdflang': Checks for well-formedness added + (if \pdfmatch is available). + * Option `hyperindex': The latest encapsulating command is repeated + for the close range entries, if it is not already given. That improves + compatibility to `xindy'. (Formatting commands remain unsupported.) + 2012-10-31 6.83l Heiko Oberdiek * 6.83l * Workaround for bug in `frenchb.ldf' 2010/08/21 v2.5a added that diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf Binary files differindex c5ff8a85fe6..8c111a4e8d4 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/backref.pdf b/Master/texmf-dist/doc/latex/hyperref/backref.pdf Binary files differindex 597cd7a641c..49708d8f5ff 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 Binary files differindex 8c7090b3cee..87a70abaf20 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/manual.html b/Master/texmf-dist/doc/latex/hyperref/manual.html index 9a32c97c2dd..03a503f6374 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual.html @@ -7,7 +7,7 @@ <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> <!-- html --> <meta name="src" content="manual.tex"> -<meta name="date" content="2012-08-18 23:33:00"> +<meta name="date" content="2012-11-07 03:08:00"> <link rel="stylesheet" type="text/css" href="manual.css"> </head><body > @@ -22,7 +22,7 @@ class="ec-lmr-12">Sebastian Rahtz </span><br class="and" /><span class="ec-lmr-12">Heiko Oberdiek</span></div><br /> <div class="date" ><span -class="ec-lmr-12">July 2012</span></div> +class="ec-lmr-12">November 2012</span></div> </div> <h3 class="likesectionHead"><a id="x1-1000"></a>Contents</h3> @@ -1821,7 +1821,7 @@ class="ec-lmvtt-10">pdflang </span></td><td style="whi class="td11"> <!--l. 740--><p class="noindent" >text </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-24-3" class="td11"> <span -class="ec-lmri-10">empty </span></td><td style="white-space:wrap; text-align:left;" id="TBL-8-24-4" +class="ec-lmri-10">relax </span></td><td style="white-space:wrap; text-align:left;" id="TBL-8-24-4" class="td10"> <!--l. 740--><p class="noindent" >PDF language identifier (RFC 3066) </td> </tr><tr @@ -2832,7 +2832,7 @@ class="td10"> class="td01"><span class="ec-lmvtt-10">pdflang </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-12-62-2" class="td11"> <span -class="ec-lmri-10">empty </span></td><td style="white-space:wrap; text-align:left;" id="TBL-12-62-3" +class="ec-lmri-10">relax </span></td><td style="white-space:wrap; text-align:left;" id="TBL-12-62-3" class="td10"> <!--l. 911--><p class="noindent" >PDF language identifier (RFC 3066) </td> </tr><tr diff --git a/Master/texmf-dist/doc/latex/hyperref/manual.pdf b/Master/texmf-dist/doc/latex/hyperref/manual.pdf Binary files differindex 8e629da618f..ce36f989f6e 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/manual.pdf diff --git a/Master/texmf-dist/doc/latex/hyperref/manual2.html b/Master/texmf-dist/doc/latex/hyperref/manual2.html index ce991186265..e043ca8416a 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual2.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual2.html @@ -7,7 +7,7 @@ <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> <!-- html --> <meta name="src" content="manual.tex"> -<meta name="date" content="2012-08-18 23:33:00"> +<meta name="date" content="2012-11-07 03:08:00"> <link rel="stylesheet" type="text/css" href="manual.css"> </head><body > diff --git a/Master/texmf-dist/doc/latex/hyperref/manual3.html b/Master/texmf-dist/doc/latex/hyperref/manual3.html index 2d16ffd93b8..a3d662cf743 100644 --- a/Master/texmf-dist/doc/latex/hyperref/manual3.html +++ b/Master/texmf-dist/doc/latex/hyperref/manual3.html @@ -7,7 +7,7 @@ <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> <!-- html --> <meta name="src" content="manual.tex"> -<meta name="date" content="2012-08-18 23:33:00"> +<meta name="date" content="2012-11-07 03:08:00"> <link rel="stylesheet" type="text/css" href="manual.css"> </head><body > diff --git a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf Binary files differindex 5bf81f1c79c..b2f9744c603 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/doc/latex/hyperref/options.pdf b/Master/texmf-dist/doc/latex/hyperref/options.pdf Binary files differindex 6c8e221c050..a370f136868 100644 --- a/Master/texmf-dist/doc/latex/hyperref/options.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/options.pdf diff --git a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex index 788a17e3e70..3a3bcda86cf 100644 --- a/Master/texmf-dist/source/latex/hyperref/doc/manual.tex +++ b/Master/texmf-dist/source/latex/hyperref/doc/manual.tex @@ -14,7 +14,7 @@ % * Heiko Oberdiek, 2006-2012. % -\def\mydate{July 2012} +\def\mydate{November 2012} \RequirePackage{ifpdf} \ifpdf % We are running pdfTeX in pdf mode @@ -737,7 +737,7 @@ pdfdisplaydoctitle & boolean & false & display document title instead of file name in title bar\\ pdfduplex & text & empty & paper handling option for print dialog\\ pdffitwindow & boolean & false & resize document window to fit document size \\ -pdflang & text & empty & PDF language identifier (RFC 3066)\\ +pdflang & text & relax & PDF language identifier (RFC 3066)\\ pdfmenubar & boolean & true & make PDF viewer's menu bar visible \\ pdfnewwindow & boolean & false & make links that open another PDF file start a new window \\ pdfnonfullscreenpagemode @@ -908,7 +908,7 @@ pdffitwindow & \textit{false} & resize document window to fit docu pdfhighlight & \textit{/I} & set highlighting of PDF links \\ pdfinfo & \textit{empty} & alternative interface for setting document information\\ pdfkeywords & \textit{empty} & text for PDF Keywords field \\ -pdflang & \textit{empty} & PDF language identifier (RFC 3066) \\ +pdflang & \textit{relax} & PDF language identifier (RFC 3066) \\ pdfmark & \textit{false} & an alias for \textsf{dvips} \\ pdfmenubar & \textit{true} & make PDF viewer's menu bar visible \\ pdfnewwindow & \textit{false} & make links that open another PDF \\ diff --git a/Master/texmf-dist/source/latex/hyperref/doc/options.tex b/Master/texmf-dist/source/latex/hyperref/doc/options.tex index 78e37d38775..d3e9d64d379 100644 --- a/Master/texmf-dist/source/latex/hyperref/doc/options.tex +++ b/Master/texmf-dist/source/latex/hyperref/doc/options.tex @@ -18,6 +18,7 @@ \author{Sebastian Rahtz, Heiko Oberdiek et al.} \date{July 28th 2012}% HO \newcommand{\optempty}{{\rmfamily\textit{empty}}} +\newcommand{\optrelax}{{\rmfamily\textit{relax}}} \newcommand*{\for}[1]{{\rmfamily(#1)}} \begin{document} \maketitle @@ -83,7 +84,7 @@ pdffitwindow &resize document window to fit document size&false\\ pdfhighlight &set highlighting of PDF links& /I\\ pdfinfo & alternative interface for document information & \optempty\\ pdfkeywords &text for PDF Keywords field&\optempty\\ -pdflang &PDF language identifier (RFC 3066)&\optempty\\ +pdflang &PDF language identifier (RFC 3066)&\optrelax\\ pdfmenubar &make PDF viewer's menu bar visible&true\\ pdfnewwindow &make links that open another PDF file start a new window&false\\ pdfnonfullscreenpagemode &page mode setting on exiting full-screen mode&\optempty\\ diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index 9bfdd062030..abcba9f722f 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/10/31 v6.83l % +%<!none> [2012/11/06 v6.83m % %<package> Hypertext links for LaTeX] %<nohyperref> Dummy hyperref (SR)] %<driver> Hyperref documentation driver file] @@ -147,7 +147,7 @@ \end{document} %</driver> % \fi -% \CheckSum{39643} +% \CheckSum{39761} % % \MakeShortVerb{|} % \StopEventually{} @@ -706,9 +706,9 @@ % % \begin{macrocode} \ltx@IfUndefined{pdfmatch}{% - \let\Hy@Match\ltx@gobblefour + \def\Hy@Match#1#2#3#4#5{}% }{% - \def\Hy@Match#1#2{% + \def\Hy@Match#1#2#3{% \begingroup \edef\^{\ltx@backslashchar\string^}% \edef\.{\ltx@backslashchar.}% @@ -724,7 +724,7 @@ \edef\}{\ltx@rightbracechar}% \edef\\{\ltx@backslashchar\ltx@backslashchar}% \let\ \ltx@space - \ifcase\pdfmatch{#2}{#1} % + \ifcase\pdfmatch#2{#3}{#1} % \endgroup \expandafter\ltx@secondoftwo \or @@ -733,7 +733,7 @@ \else \Hy@Warning{% Internal error: Wrong pattern!\MessageBreak - --> #2 <--\MessageBreak + --> #3 <--\MessageBreak Pattern check ignored% }% \endgroup @@ -5489,10 +5489,14 @@ \define@key{Hyp}{driverfallback}{% \ifHy@DviMode \def\HyOpt@DriverFallback{#1}% - \Hy@Match\HyOpt@DriverFallback{% + \Hy@Match\HyOpt@DriverFallback{}{% ^(|dvipdfm|dvipdfmx|dvips|dvipsone|dviwindo|hypertex|ps2pdf|% latex2html|tex4ht)$% }{}{% + \Hy@Warning{% + Invalid driver `#1' for option\MessageBreak + `driverfallback'% + }% \let\HyOpt@DriverFallback\ltx@empty }% \fi @@ -6245,7 +6249,7 @@ \let\@pdfpageduration\relax \define@key{Hyp}{pdfpageduration}{% \def\@pdfpageduration{#1}% - \Hy@Match\@pdfpageduration{% + \Hy@Match\@pdfpageduration{}{% ^(|[0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)$% }{}{% \Hy@Warning{% @@ -6331,7 +6335,7 @@ \define@key{Hyp}{pdfborder}{% \let\Hy@temp\@pdfborder \def\@pdfborder{#1}% - \Hy@Match\@pdfborder{% + \Hy@Match\@pdfborder{}{% ^\HyPat@NonNegativeReal/ % \HyPat@NonNegativeReal/ % \HyPat@NonNegativeReal/% @@ -6348,7 +6352,7 @@ \define@key{Hyp}{pdfborderstyle}{% \let\Hy@temp\@pdfborderstyle \def\@pdfborderstyle{#1}% - \Hy@Match\@pdfborderstyle{% + \Hy@Match\@pdfborderstyle{}{% ^% ( */Type */Border% | */W +\HyPat@NonNegativeReal/% @@ -6718,7 +6722,7 @@ \else \hypercalcbpdef\@pdfremotestartview{#1}% \edef\@pdfremotestartview{\@pdfremotestartview}% - \Hy@Match\@pdfremotestartview{% + \Hy@Match\@pdfremotestartview{}{% ^(XYZ -?(null|\HyPat@NonNegativeReal/) % -?(null|\HyPat@NonNegativeReal/) % (null|\HyPat@NonNegativeReal/)|% @@ -6788,7 +6792,130 @@ \do{TwoPageRight}{PDF 1.5}% } \define@key{Hyp}{pdflang}{% - \def\@pdflang{#1}% + \edef\@pdflang{#1}% + \def\Hy@temp{\relax}% + \ifx\@pdflang\Hy@temp + \let\@pdflang\relax + \fi + \ifx\@pdflang\relax + \else + \ifx\@pdflang\ltx@empty + \else +% \end{macrocode} +% Test according to ABNF of RFC 3066. +% \begin{macrocode} + \Hy@Match\@pdflang{icase}{% + ^% + [a-z]{1,8}% + (-[a-z0-9]{1,8})*% + $% + }{% +% \end{macrocode} +% Test according to ABNF of RFC 5646. +% \begin{macrocode} + \Hy@Match\@pdflang{icase}{% + ^% + (% + % langtag + (% language + [a-z]{2,3}% + ([a-z]{3}(-[a-z]{3}){0,2})?% extlang + |[a-z]{4}% reserved for future use + |[a-z]{5,8}% registered language subtag + )% + (-[a-z]{4})?% script + (-([a-z]{2}|[0-9]{3}))?% region + (-([a-z]{5,8}|[0-9][a-z0-9]{3}))*% variant + (-[0-9a-wyz](-[a-z0-9]{2,8})+)*% extension + (-x(-[a-z0-9]{1,8})+)?% privateuse + % privateuse + |x-([a-z0-9]{1,8})+% + % grandfathered/irregular + |en-GB-oed% + |i-(ami|bnn|default|enochian|hak|klingon|lux|% + mingo|navajo|pwn|tao|tay|tsu)% + |sgn-(BE-FR|BE-NL|CH-DE)% + % grandfathered/regular + |art-lojban% + |cel-gaulish% + |no-(bok|nyn)% + |zh-(guoyu|hakka|min|min-nan|xiang)% + )% + $% + }{% +% \end{macrocode} +% Test for unique extensions. +% \begin{macrocode} + \Hy@Match{-\@pdflang}{icase}{-[a-wyz0-9]-}{% + \Hy@Match\@pdflang{icase}{^x-}{}{% + % remove privateuse + \edef\Hy@temp{-\@pdflang}% + \Hy@Match\Hy@temp{icase}{% + ^% + (% + (-[a-wyz0-9]|-[a-z0-9]{2,8})*% + )% + -x-% + }{% + \edef\Hy@temp{% + \expandafter\strip@prefix\pdflastmatch1% + }% + }{}% + \Hy@Match\Hy@temp{icase}{% + (-[a-wyz0-9]-).*\ltx@backslashchar1% + }{% + \Hy@Warning{% + Invalid language identifier `#1'\MessageBreak + for option `pdflang', because it violates\MessageBreak + well-formedness defined in RFC 4646\MessageBreak + by duplicate singleton subtags% + }% + \let\@pdflang\relax + }{}% + }% + }{}% +% \end{macrocode} +% User-assigned country codes are forbidden in language tags (RFC 3066). +% \begin{macrocode} + \ifx\@pdflang\relax + \else + \Hy@Match\@pdflang{icase}{% + ^% + [a-zA-Z]{2}-% + (% + aa|AA|% + [qQ][m-zM-Z]|% + [xX][a-zA-Z]|% + zz|ZZ% + )% + (-|$)% + }{% + \Hy@Warning{% + Invalid language identifier `#1'\MessageBreak + for option `pdflang' because of invalid country code% + \MessageBreak + in second subtag (RFC 3066)% + }% + \let\@pdflang\relax + }{}% + \fi + }{% + \Hy@Warning{% + Invalid language identifier `#1'\MessageBreak + for option `pdflang', because it violates\MessageBreak + well-formedness defined in RFC 5646% + }% + \let\@pdflang\relax + }% + }{% + \Hy@Warning{% + Invalid language identifier `#1'\MessageBreak + for option `pdflang' (RFC 3066)% + }% + \let\@pdflang\relax + }% + \fi + \fi } \define@key{Hyp}{pdfpagelabels}[true]{% \Hy@boolkey{pdfpagelabels}{#1}% @@ -6820,7 +6947,7 @@ \def\@pdfremotestartview{/Fit} \def\@pdfstartpage{1} \let\@pdfprintpagerange\ltx@empty -\let\@pdflang\ltx@empty +\let\@pdflang\relax \let\PDF@SetupDoc\@empty \let\PDF@FinishDoc\@empty \let\phantomsection\@empty @@ -7753,7 +7880,7 @@ \edef\Hy@href@nextactionraw{#1}% \ifx\Hy@href@nextactionraw\@empty \else - \Hy@Match\Hy@href@nextactionraw{% + \Hy@Match\Hy@href@nextactionraw{}{% ^(\HyPat@ObjRef/|<<.*/S[ /].+>>|% \[( ?\HyPat@ObjRef/|<<.*/S[ /].+>>)+ ?])$% }{}{% @@ -9202,7 +9329,7 @@ \define@key{Field}{borderstyle}{% \let\Hy@temp\Fld@borderstyle \def\Fld@borderstyle{#1}% - \Hy@Match\Fld@borderstyle{% + \Hy@Match\Fld@borderstyle{}{% ^[SDBIU]$% }{}{% \Hy@Warning{% @@ -12595,13 +12722,25 @@ \else \ifx\\#3\\% \ifx\Hy@temp@A\HyInd@ParenRight + \HyInd@DefKey{#1}% + \ltx@IfUndefined{HyInd@(\HyInd@key)}{% + \let\Hy@temp\ltx@empty + }{% + \expandafter\let\expandafter\Hy@temp + \csname HyInd@(\HyInd@key)\endcsname + }% \protected@write\@indexfile{}{% - \string\indexentry{#1|#2}{\thepage}% + \string\indexentry{#1|#2\Hy@temp}{\thepage}% }% \else \protected@write\@indexfile{}{% \string\indexentry{#1|#2hyperpage}{\thepage}% }% + \HyInd@DefKey{#1}% + \expandafter + \gdef\csname HyInd@(\HyInd@key)\endcsname{% + hyperpage% + }% \fi \else \protected@write\@indexfile{}{% @@ -12609,9 +12748,24 @@ #1|#2hyperindexformat{/#3}% }{\thepage}% }% + \ifx\Hy@temp@A\HyInd@ParenLeft + \HyInd@DefKey{#1}% + \expandafter + \gdef\csname HyInd@(\HyInd@key)\endcsname{% + hyperindexformat{/#3}% + }% + \fi \fi \fi }% + \def\HyInd@DefKey#1{% + \begingroup + \let\protect\@unexpandable@protect + \edef\Hy@temp{#1}% + \ltx@onelevel@sanitize\Hy@temp + \global\let\HyInd@key\Hy@temp + \endgroup + }% \fi }% \fi @@ -13876,7 +14030,7 @@ /ViewerPreferences<<\Hy@temp>>% \fi \Hy@UseNameKey{PageLayout}\@pdfpagelayout - \ifx\@pdflang\@empty + \ifx\@pdflang\relax \else /Lang(\@pdflang)% \fi @@ -14628,7 +14782,7 @@ /ViewerPreferences<<\Hy@temp>>% \fi \Hy@UseNameKey{PageLayout}\@pdfpagelayout - \ifx\@pdflang\@empty + \ifx\@pdflang\relax \else /Lang(\@pdflang)% \fi @@ -15120,7 +15274,7 @@ /ViewerPreferences<<\Hy@temp>>% \fi \Hy@UseNameKey{PageLayout}\@pdfpagelayout - \ifx\@pdflang\@empty + \ifx\@pdflang\relax \else /Lang(\@pdflang)% \fi @@ -16395,7 +16549,7 @@ /ViewerPreferences<<\Hy@temp>>% \fi \Hy@UseNameKey{PageLayout}\@pdfpagelayout - \ifx\@pdflang\@empty + \ifx\@pdflang\relax \else /Lang(\@pdflang)% \fi @@ -17538,7 +17692,7 @@ /ViewerPreferences<<\Hy@temp>>% \fi \Hy@UseNameKey{PageLayout}\@pdfpagelayout - \ifx\@pdflang\@empty + \ifx\@pdflang\relax \else /Lang(\@pdflang)% \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index 0a99a5b87d3..a0a6b154968 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/10/31 v6.83l % + [2012/11/06 v6.83m % Hyperref driver for dvipdfm] \Hy@VersionCheck{hdvipdfm.def} \def\Hy@PutCatalog#1{\@pdfm@mark{docview <<#1>>}} @@ -585,7 +585,7 @@ /ViewerPreferences<<\Hy@temp>>% \fi \Hy@UseNameKey{PageLayout}\@pdfpagelayout - \ifx\@pdflang\@empty + \ifx\@pdflang\relax \else /Lang(\@pdflang)% \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index df4c13b944c..3876d50af58 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 f55d477f136..e32e08e9005 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/10/31 v6.83l % + [2012/11/06 v6.83m % Hyperref driver for dvipsone] \Hy@VersionCheck{hdvipson.def} \providecommand*{\XR@ext}{pdf} @@ -136,7 +136,7 @@ /ViewerPreferences<<\Hy@temp>>% \fi \Hy@UseNameKey{PageLayout}\@pdfpagelayout - \ifx\@pdflang\@empty + \ifx\@pdflang\relax \else /Lang(\@pdflang)% \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 1c7760ba522..e5065285853 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/10/31 v6.83l % + [2012/11/06 v6.83m % Hyperref driver for dviwindo] \Hy@VersionCheck{hdviwind.def} \begingroup @@ -395,7 +395,7 @@ /ViewerPreferences<<\Hy@temp>>% \fi \Hy@UseNameKey{PageLayout}\@pdfpagelayout - \ifx\@pdflang\@empty + \ifx\@pdflang\relax \else /Lang(\@pdflang)% \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index ad42ec581b9..26e3c6d922e 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/10/31 v6.83l % + [2012/11/06 v6.83m % Hyperref driver for pdfTeX] \Hy@VersionCheck{hpdftex.def} \pdf@ifdraftmode{% @@ -655,7 +655,7 @@ /ViewerPreferences<<\Hy@temp>>% \fi \Hy@UseNameKey{PageLayout}\@pdfpagelayout - \ifx\@pdflang\@empty + \ifx\@pdflang\relax \else /Lang(\@pdflang)% \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 719d3cfae6e..a26c691eb26 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 73442df8875..eecf16b69bc 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 6d8f9994207..7e56be4eece 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 41b51d9733e..8964b2a2c9b 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 841d8fa9767..5a953d9740f 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 f96ab82af49..881fb7861b7 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 28c635d4493..b66a2565128 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/10/31 v6.83l % + [2012/11/06 v6.83m % Hyperref driver for XeTeX] \Hy@VersionCheck{hxetex.def} \HyPsd@LoadUnicode @@ -667,7 +667,7 @@ /ViewerPreferences<<\Hy@temp>>% \fi \Hy@UseNameKey{PageLayout}\@pdfpagelayout - \ifx\@pdflang\@empty + \ifx\@pdflang\relax \else /Lang(\@pdflang)% \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index ef8c8a49774..443de9630d6 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/10/31 v6.83l % + [2012/11/06 v6.83m % Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -193,9 +193,9 @@ \def#1{#2 #3}% } \ltx@IfUndefined{pdfmatch}{% - \let\Hy@Match\ltx@gobblefour + \def\Hy@Match#1#2#3#4#5{}% }{% - \def\Hy@Match#1#2{% + \def\Hy@Match#1#2#3{% \begingroup \edef\^{\ltx@backslashchar\string^}% \edef\.{\ltx@backslashchar.}% @@ -211,7 +211,7 @@ \edef\}{\ltx@rightbracechar}% \edef\\{\ltx@backslashchar\ltx@backslashchar}% \let\ \ltx@space - \ifcase\pdfmatch{#2}{#1} % + \ifcase\pdfmatch#2{#3}{#1} % \endgroup \expandafter\ltx@secondoftwo \or @@ -220,7 +220,7 @@ \else \Hy@Warning{% Internal error: Wrong pattern!\MessageBreak - --> #2 <--\MessageBreak + --> #3 <--\MessageBreak Pattern check ignored% }% \endgroup @@ -3087,10 +3087,14 @@ \define@key{Hyp}{driverfallback}{% \ifHy@DviMode \def\HyOpt@DriverFallback{#1}% - \Hy@Match\HyOpt@DriverFallback{% + \Hy@Match\HyOpt@DriverFallback{}{% ^(|dvipdfm|dvipdfmx|dvips|dvipsone|dviwindo|hypertex|ps2pdf|% latex2html|tex4ht)$% }{}{% + \Hy@Warning{% + Invalid driver `#1' for option\MessageBreak + `driverfallback'% + }% \let\HyOpt@DriverFallback\ltx@empty }% \fi @@ -3587,7 +3591,7 @@ \let\@pdfpageduration\relax \define@key{Hyp}{pdfpageduration}{% \def\@pdfpageduration{#1}% - \Hy@Match\@pdfpageduration{% + \Hy@Match\@pdfpageduration{}{% ^(|[0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)$% }{}{% \Hy@Warning{% @@ -3647,7 +3651,7 @@ \define@key{Hyp}{pdfborder}{% \let\Hy@temp\@pdfborder \def\@pdfborder{#1}% - \Hy@Match\@pdfborder{% + \Hy@Match\@pdfborder{}{% ^\HyPat@NonNegativeReal/ % \HyPat@NonNegativeReal/ % \HyPat@NonNegativeReal/% @@ -3664,7 +3668,7 @@ \define@key{Hyp}{pdfborderstyle}{% \let\Hy@temp\@pdfborderstyle \def\@pdfborderstyle{#1}% - \Hy@Match\@pdfborderstyle{% + \Hy@Match\@pdfborderstyle{}{% ^% ( */Type */Border% | */W +\HyPat@NonNegativeReal/% @@ -4030,7 +4034,7 @@ \else \hypercalcbpdef\@pdfremotestartview{#1}% \edef\@pdfremotestartview{\@pdfremotestartview}% - \Hy@Match\@pdfremotestartview{% + \Hy@Match\@pdfremotestartview{}{% ^(XYZ -?(null|\HyPat@NonNegativeReal/) % -?(null|\HyPat@NonNegativeReal/) % (null|\HyPat@NonNegativeReal/)|% @@ -4100,7 +4104,118 @@ \do{TwoPageRight}{PDF 1.5}% } \define@key{Hyp}{pdflang}{% - \def\@pdflang{#1}% + \edef\@pdflang{#1}% + \def\Hy@temp{\relax}% + \ifx\@pdflang\Hy@temp + \let\@pdflang\relax + \fi + \ifx\@pdflang\relax + \else + \ifx\@pdflang\ltx@empty + \else + \Hy@Match\@pdflang{icase}{% + ^% + [a-z]{1,8}% + (-[a-z0-9]{1,8})*% + $% + }{% + \Hy@Match\@pdflang{icase}{% + ^% + (% + % langtag + (% language + [a-z]{2,3}% + ([a-z]{3}(-[a-z]{3}){0,2})?% extlang + |[a-z]{4}% reserved for future use + |[a-z]{5,8}% registered language subtag + )% + (-[a-z]{4})?% script + (-([a-z]{2}|[0-9]{3}))?% region + (-([a-z]{5,8}|[0-9][a-z0-9]{3}))*% variant + (-[0-9a-wyz](-[a-z0-9]{2,8})+)*% extension + (-x(-[a-z0-9]{1,8})+)?% privateuse + % privateuse + |x-([a-z0-9]{1,8})+% + % grandfathered/irregular + |en-GB-oed% + |i-(ami|bnn|default|enochian|hak|klingon|lux|% + mingo|navajo|pwn|tao|tay|tsu)% + |sgn-(BE-FR|BE-NL|CH-DE)% + % grandfathered/regular + |art-lojban% + |cel-gaulish% + |no-(bok|nyn)% + |zh-(guoyu|hakka|min|min-nan|xiang)% + )% + $% + }{% + \Hy@Match{-\@pdflang}{icase}{-[a-wyz0-9]-}{% + \Hy@Match\@pdflang{icase}{^x-}{}{% + % remove privateuse + \edef\Hy@temp{-\@pdflang}% + \Hy@Match\Hy@temp{icase}{% + ^% + (% + (-[a-wyz0-9]|-[a-z0-9]{2,8})*% + )% + -x-% + }{% + \edef\Hy@temp{% + \expandafter\strip@prefix\pdflastmatch1% + }% + }{}% + \Hy@Match\Hy@temp{icase}{% + (-[a-wyz0-9]-).*\ltx@backslashchar1% + }{% + \Hy@Warning{% + Invalid language identifier `#1'\MessageBreak + for option `pdflang', because it violates\MessageBreak + well-formedness defined in RFC 4646\MessageBreak + by duplicate singleton subtags% + }% + \let\@pdflang\relax + }{}% + }% + }{}% + \ifx\@pdflang\relax + \else + \Hy@Match\@pdflang{icase}{% + ^% + [a-zA-Z]{2}-% + (% + aa|AA|% + [qQ][m-zM-Z]|% + [xX][a-zA-Z]|% + zz|ZZ% + )% + (-|$)% + }{% + \Hy@Warning{% + Invalid language identifier `#1'\MessageBreak + for option `pdflang' because of invalid country code% + \MessageBreak + in second subtag (RFC 3066)% + }% + \let\@pdflang\relax + }{}% + \fi + }{% + \Hy@Warning{% + Invalid language identifier `#1'\MessageBreak + for option `pdflang', because it violates\MessageBreak + well-formedness defined in RFC 5646% + }% + \let\@pdflang\relax + }% + }{% + \Hy@Warning{% + Invalid language identifier `#1'\MessageBreak + for option `pdflang' (RFC 3066)% + }% + \let\@pdflang\relax + }% + \fi + \fi } \define@key{Hyp}{pdfpagelabels}[true]{% \Hy@boolkey{pdfpagelabels}{#1}% @@ -4129,7 +4244,7 @@ \def\@pdfremotestartview{/Fit} \def\@pdfstartpage{1} \let\@pdfprintpagerange\ltx@empty -\let\@pdflang\ltx@empty +\let\@pdflang\relax \let\PDF@SetupDoc\@empty \let\PDF@FinishDoc\@empty \let\phantomsection\@empty @@ -4902,7 +5017,7 @@ \edef\Hy@href@nextactionraw{#1}% \ifx\Hy@href@nextactionraw\@empty \else - \Hy@Match\Hy@href@nextactionraw{% + \Hy@Match\Hy@href@nextactionraw{}{% ^(\HyPat@ObjRef/|<<.*/S[ /].+>>|% \[( ?\HyPat@ObjRef/|<<.*/S[ /].+>>)+ ?])$% }{}{% @@ -5953,7 +6068,7 @@ \define@key{Field}{borderstyle}{% \let\Hy@temp\Fld@borderstyle \def\Fld@borderstyle{#1}% - \Hy@Match\Fld@borderstyle{% + \Hy@Match\Fld@borderstyle{}{% ^[SDBIU]$% }{}{% \Hy@Warning{% @@ -8146,13 +8261,25 @@ \else \ifx\\#3\\% \ifx\Hy@temp@A\HyInd@ParenRight + \HyInd@DefKey{#1}% + \ltx@IfUndefined{HyInd@(\HyInd@key)}{% + \let\Hy@temp\ltx@empty + }{% + \expandafter\let\expandafter\Hy@temp + \csname HyInd@(\HyInd@key)\endcsname + }% \protected@write\@indexfile{}{% - \string\indexentry{#1|#2}{\thepage}% + \string\indexentry{#1|#2\Hy@temp}{\thepage}% }% \else \protected@write\@indexfile{}{% \string\indexentry{#1|#2hyperpage}{\thepage}% }% + \HyInd@DefKey{#1}% + \expandafter + \gdef\csname HyInd@(\HyInd@key)\endcsname{% + hyperpage% + }% \fi \else \protected@write\@indexfile{}{% @@ -8160,9 +8287,24 @@ #1|#2hyperindexformat{/#3}% }{\thepage}% }% + \ifx\Hy@temp@A\HyInd@ParenLeft + \HyInd@DefKey{#1}% + \expandafter + \gdef\csname HyInd@(\HyInd@key)\endcsname{% + hyperindexformat{/#3}% + }% + \fi \fi \fi }% + \def\HyInd@DefKey#1{% + \begingroup + \let\protect\@unexpandable@protect + \edef\Hy@temp{#1}% + \ltx@onelevel@sanitize\Hy@temp + \global\let\HyInd@key\Hy@temp + \endgroup + }% \fi }% \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index 13d357856bb..9b947baedab 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 10f45008fb1..ca777eb4b0b 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 b69560b703c..3685a67bfa5 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 300a9e2cbaa..2b04b309371 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/10/31 v6.83l % + [2012/11/06 v6.83m % Hyperref definitions for pdfmark specials] \Hy@VersionCheck{pdfmark.def} \begingroup @@ -464,7 +464,7 @@ /ViewerPreferences<<\Hy@temp>>% \fi \Hy@UseNameKey{PageLayout}\@pdfpagelayout - \ifx\@pdflang\@empty + \ifx\@pdflang\relax \else /Lang(\@pdflang)% \fi diff --git a/Master/texmf-dist/tex/latex/hyperref/psdextra.def b/Master/texmf-dist/tex/latex/hyperref/psdextra.def index 9f018159f67..87528a2ce47 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 eb27dfa8439..d2e0b99b646 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 226ae908372..9d4a1f61f0f 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/10/31 v6.83l % + [2012/11/06 v6.83m % 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 856e2c5f1c7..6ae8636976f 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/10/31 v6.83l % + [2012/11/06 v6.83m % Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003}% U+0103 \DeclareTextCommand{\acircumflex}{PU}{\80\342}% U+00E2 |