diff options
Diffstat (limited to 'Master')
27 files changed, 94 insertions, 28 deletions
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index e4c5ce26b51..eec6dfd1c58 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,8 @@ +2008-08-14 6.78f Heiko Oberdiek + * 6.78f + * \nohyperref added to support custom entries in style files + of MakeIndex (delim_r, suffix_*), see README. + 2008-07-23 6.78e Heiko Oberdiek * 6.78e * Driver hdvipdfm.def: Missing code for option `setpagesize' added. diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf Binary files differindex 39e8bd0afd7..9f46a6edb38 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 8f71773f0c3..e308fc8936a 100644 --- a/Master/texmf-dist/doc/latex/hyperref/README +++ b/Master/texmf-dist/doc/latex/hyperref/README @@ -1,4 +1,4 @@ -README for hyperref bundle, 2008/07/23 +README for hyperref bundle, 2008/08/14 TABLE OF CONTENTS @@ -176,6 +176,27 @@ other packages: 5 NEW FEATURES ============== +Customizing index style file with \nohyperpage +---------------------------------------------- + Since version 2008/08/14 v6.78f. + + For hyperlink support in the index, hyperref inserts \hyperpage + into the index macros. After processing with Makeindex, \hyperpage + analyzes its argument to detect page ranges and page comma lists. + However, only the standard settings are supported directly: + delim_r "--" + delim_n ", " + (See manual page/documentation of Makeindex that explains + the keys that can be used in style files for Makeindex.) + Customized versions of + delim_r, delim_n, suffix_2p, suffix_3p, suffix_mp + needs markup that \hyperpage can detect and knows that + this stuff does not belong to a page number. Makro + \nohyperpage serves as this markup. Put the customized + code for these keys inside \nohyperpage, e.g.: + suffix_2p "\\nohyperpage{f.}" + suffix_3p "\\nohyperpage{ff.}" + Expert feature \HyperDestNameFilter ----------------------------------- Since version 2008/07/16 v6.78c. diff --git a/Master/texmf-dist/doc/latex/hyperref/README.pdf b/Master/texmf-dist/doc/latex/hyperref/README.pdf Binary files differindex 5059c54b14e..7d89315fef2 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 2db8f5326e7..f5288f1e8d2 100644 --- a/Master/texmf-dist/doc/latex/hyperref/backref.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/backref.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</S/GoTo/D[13 0 R/FitBH 752.95145]>> endobj -6 0 obj<</PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.8-2.2 (Web2C 7.5.7) kpathsea version 3.5.7)/Trapped/False/Subject(Bibliographical back referencing)/ModDate(D:20080810182625+02'00')/Author(David Carlisle and Sebastian Rahtz)/Producer(pdfTeX-1.40.8)/Title(Back referencing from bibliographical citations)/Creator(LaTeX with hyperref package)/CreationDate(D:20080810182625+02'00')>> +6 0 obj<</PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.8-2.2 (Web2C 7.5.7) kpathsea version 3.5.7)/Trapped/False/Subject(Bibliographical back referencing)/ModDate(D:20080814211420+02'00')/Author(David Carlisle and Sebastian Rahtz)/Producer(pdfTeX-1.40.8)/Title(Back referencing from bibliographical citations)/Creator(LaTeX with hyperref package)/CreationDate(D:20080814211420+02'00')>> endobj 7 0 obj<</Type/Pages/Kids[13 0 R 14 0 R 15 0 R 16 0 R 17 0 R 18 0 R]/Parent 2 0 R/Count 6>> endobj @@ -4086,7 +4086,7 @@ xref 0000239136 00000 n 0000239175 00000 n trailer -<</Size 1182/Root 1 0 R/Compress<</LengthO 278917/SpecO/1.4>>/Info 6 0 R/ID[(7=Vnq2q )(\(fmPtk~k)]>> +<</Size 1182/Root 1 0 R/Compress<</LengthO 278917/SpecO/1.4>>/Info 6 0 R/ID[(7mצsԝuේ)(_f#)]>> startxref 239214 %%EOF diff --git a/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf Binary files differindex df18071ffdd..5709c18e4f7 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 a23c25d2ac3..d4c554760f1 100644 --- a/Master/texmf-dist/doc/latex/hyperref/nameref.pdf +++ b/Master/texmf-dist/doc/latex/hyperref/nameref.pdf @@ -10,7 +10,7 @@ endobj endobj 5 0 obj<</S/GoTo/D[12 0 R/FitBH 752.95145]>> endobj -6 0 obj<</PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.8-2.2 (Web2C 7.5.7) kpathsea version 3.5.7)/Trapped/False/Subject(Cross-referencing by name of section)/ModDate(D:20080810182629+02'00')/Author(Sebastian Rahtz)/Producer(pdfTeX-1.40.8)/Title(Section name references in LaTeX)/Creator(LaTeX with hyperref package)/CreationDate(D:20080810182629+02'00')>> +6 0 obj<</PTEX.Fullbanner(This is pdfTeX, Version 3.1415926-1.40.8-2.2 (Web2C 7.5.7) kpathsea version 3.5.7)/Trapped/False/Subject(Cross-referencing by name of section)/ModDate(D:20080814211426+02'00')/Author(Sebastian Rahtz)/Producer(pdfTeX-1.40.8)/Title(Section name references in LaTeX)/Creator(LaTeX with hyperref package)/CreationDate(D:20080814211426+02'00')>> endobj 7 0 obj<</Type/Pages/Kids[12 0 R 13 0 R 14 0 R 15 0 R 16 0 R 17 0 R]/Parent 2 0 R/Count 6>> endobj @@ -4045,7 +4045,7 @@ xref 0000230439 00000 n 0000230478 00000 n trailer -<</Size 1182/Root 1 0 R/Compress<</LengthO 270328/SpecO/1.4>>/Info 6 0 R/ID[(G?RU>S5)(\( P#.)]>> +<</Size 1182/Root 1 0 R/Compress<</LengthO 270328/SpecO/1.4>>/Info 6 0 R/ID[(nG 0b )(3چ)]>> startxref 230517 %%EOF diff --git a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index cd02b0895e3..b729fa347f1 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -38,7 +38,7 @@ %<puenc>\ProvidesFile{puenc.def} %<puvnenc>\ProvidesFile{puvnenc.def} %<puarenc>\ProvidesFile{puarenc.def} -%<!none> [2008/07/23 v6.78e +%<!none> [2008/08/14 v6.78f %<package> Hypertext links for LaTeX] %<nohyperref> Dummy hyperref (SR)] %<driver> Hyperref documentation driver file] @@ -114,7 +114,7 @@ \end{document} %</driver> % \fi -% \CheckSum{22847} +% \CheckSum{22871} % % \MakeShortVerb{|} % \StopEventually{} @@ -7120,6 +7120,7 @@ \def\hyper@link@[#1]#2#3{}% \let\PDF@SetupDoc\@empty \let\PDF@FinishDoc\@empty +\def\nohyperpage#1{#1} % \end{macrocode} % Some top-level commands: % \begin{macrocode} @@ -9523,11 +9524,34 @@ \Hy@DisableOption{hyperindex} \Hy@DisableOption{encap} % \end{macrocode} +% +% \begin{macro}{\nohyperpage} +% The definition of \cs{nohyperpage} is just a precaution. +% It is used to mark code that does not belong to a page +% number, but \cs{nohyperpage} is never executed. +% \begin{macrocode} +\def\nohyperpage#1{#1} +% \end{macrocode} +% \end{macro} % This again is quite flaky, but allow for the common situation of a % page range separated by en-rule. We split this into two different % hyperlinked pages. % \begin{macrocode} -\def\hyperpage#1{\@hyperpage#1----\\} +\def\hyperpage#1{% + \HyInd@hyperpage#1\nohyperpage{}\@nil +} +\def\HyInd@hyperpage#1\nohyperpage#2#3\@nil{% + \HyInd@@hyperpage{#1}% + #2% + \def\Hy@temp{#3}% + \ifx\Hy@temp\@empty + \else + \Hy@ReturnAfterFi{% + \HyInd@hyperpage#3\@nil + }% + \fi +} +\def\HyInd@@hyperpage#1{\@hyperpage#1----\\} \def\@hyperpage#1--#2--#3\\{% \ifx\\#2\\% \@commahyperpage{#1}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index aceb56c3551..356a439ace3 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref driver for dvipdfm] \def\Hy@PutCatalog#1{\@pdfm@mark{docview << #1 >>}} \ifHy@pagelabels diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvips.def b/Master/texmf-dist/tex/latex/hyperref/hdvips.def index ab655f71583..5481e2e1832 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref driver for dvips] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index ed35322c5b7..4d7bee72987 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref driver for dvipsone] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index 06dbe31ea19..6efe7fb481a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref driver for dviwindo] \begingroup \toks@\expandafter{\Hy@FirstPageHook}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index fe62bfdc48b..7efd55a1c7b 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref driver for pdfTeX] \let\Hy@PutCatalog\pdfcatalog \ifHy@pagelabels diff --git a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg index 0952761561f..c71fb06ce48 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2008/07/23 v6.78e + [2008/08/14 v6.78f 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 f8c9c4e8456..f1cdc1b7d94 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref driver for TeX4ht] \providecommand*{\XR@ext}{html} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index b2ffb00bb0d..f7c7f8ea80e 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref driver for Textures] \providecommand*{\XR@ext}{pdf} \begingroup diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index 4904397d661..745abb59406 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref driver for VTeX in PDF/PS mode] \providecommand*{\XR@ext}{pdf} \edef\Hy@VTeXversion{% diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index d6a3e5dcd93..6511fd62dd9 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref driver for VTeX in HTML mode] \providecommand*{\XR@ext}{htm} \RequirePackage{vtexhtml} diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index 91a5f94c28b..c5cb86a48b9 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \providecommand*{\XR@ext}{pdf} \def\Hy@raisedlink{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index fb6092d9578..fc34d2b1768 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hyperref} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -5706,7 +5706,22 @@ \fi \Hy@DisableOption{hyperindex} \Hy@DisableOption{encap} -\def\hyperpage#1{\@hyperpage#1----\\} +\def\nohyperpage#1{#1} +\def\hyperpage#1{% + \HyInd@hyperpage#1\nohyperpage{}\@nil +} +\def\HyInd@hyperpage#1\nohyperpage#2#3\@nil{% + \HyInd@@hyperpage{#1}% + #2% + \def\Hy@temp{#3}% + \ifx\Hy@temp\@empty + \else + \Hy@ReturnAfterFi{% + \HyInd@hyperpage#3\@nil + }% + \fi +} +\def\HyInd@@hyperpage#1{\@hyperpage#1----\\} \def\@hyperpage#1--#2--#3\\{% \ifx\\#2\\% \@commahyperpage{#1}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index a32fdd78eae..6da09a30558 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref driver for HyperTeX specials] \providecommand*{\XR@ext}{dvi} \def\PDF@FinishDoc{} diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index 1791f093b42..50a6bfc148b 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -25,7 +25,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nohyperref} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Dummy hyperref (SR)] \let\hyper@@anchor\@gobble \def\hyper@link#1#2#3{#3}% @@ -38,6 +38,7 @@ \def\hyper@link@[#1]#2#3{}% \let\PDF@SetupDoc\@empty \let\PDF@FinishDoc\@empty +\def\nohyperpage#1{#1} \def\Acrobatmenu#1#2{\leavevmode#2} \let\pdfstringdefDisableCommands\@gobbletwo \let\texorpdfstring\@firstoftwo diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index 9b0fc6ff5e4..4a2e02c4a7a 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref: PDFDocEncoding definition (HO)] \DeclareFontEncoding{PD1}{}{} \DeclareTextCommand{\textLF}{PD1}{\012} % line feed diff --git a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def index 07012c767a4..88866a39323 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref definitions for pdfmark specials] \begingroup \toks@\expandafter{\Hy@FirstPageHook}% diff --git a/Master/texmf-dist/tex/latex/hyperref/puarenc.def b/Master/texmf-dist/tex/latex/hyperref/puarenc.def index 8ecd735bd20..1ce09c34850 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puarenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puarenc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puarenc.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref: Additions to puenc.def for Arabi] \DeclareTextCommand{\hamza}{PU}{\86\041}% 0621;afii57409;ARABIC LETTER HAMZA \DeclareTextCommand{\alefmadda}{PU}{\86\042}% 0622;afii57410;ARABIC LETTER ALEF WITH MADDA ABOVE diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def index 685d13727ba..736b829e4f6 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref: PDF Unicode definition (HO)] \DeclareFontEncoding{PU}{}{} \DeclareTextCommand{\textLF}{PU}{\80\012} % line feed diff --git a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def index f0353f2e8c7..928a463d571 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -24,7 +24,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puvnenc.def} - [2008/07/23 v6.78e + [2008/08/14 v6.78f Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} |