diff options
author | Karl Berry <karl@freefriends.org> | 2006-12-22 01:30:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2006-12-22 01:30:06 +0000 |
commit | ea061adb20c4ae597923c35fa17dbd1a40874878 (patch) | |
tree | 09cb7e4f24cf2c99c9ea6a2d28d1a43cf1946a4d /Master/texmf-dist | |
parent | 495de94e4661ce50b1b7937ec438b604a8c39bf5 (diff) |
hyperref update (22dec06)
git-svn-id: svn://tug.org/texlive/trunk@2841 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
23 files changed, 111 insertions, 76 deletions
diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog b/Master/texmf-dist/doc/latex/hyperref/ChangeLog index 3bc2708ea86..b3cc9f4c606 100644 --- a/Master/texmf-dist/doc/latex/hyperref/ChangeLog +++ b/Master/texmf-dist/doc/latex/hyperref/ChangeLog @@ -1,3 +1,6 @@ +2006-12-21 6.75i Heiko Oberdiek + * Fix: \unichar in bookmarks with Unicode encoding. + 2006-11-30 6.75h Heiko Oberdiek * New options for pdf viewer preferences: pdfdirection, pdfviewarea, pdfviewclip, diff --git a/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf b/Master/texmf-dist/doc/latex/hyperref/ChangeLog.pdf Binary files differindex 151ddd5d3a7..324bfdf28a5 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/hyperref.pdf b/Master/texmf-dist/doc/latex/hyperref/hyperref.pdf Binary files differindex d8cd90e97e3..1de1a5ca899 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/source/latex/hyperref/hyperref.dtx b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx index 2769450701a..d83117dc5b7 100644 --- a/Master/texmf-dist/source/latex/hyperref/hyperref.dtx +++ b/Master/texmf-dist/source/latex/hyperref/hyperref.dtx @@ -37,7 +37,7 @@ %<pd1enc>\ProvidesFile{pd1enc.def} %<puenc>\ProvidesFile{puenc.def} %<puvnenc>\ProvidesFile{puvnenc.def} -%<!none> [2006/11/30 v6.75h +%<!none> [2006/12/21 v6.75i %<package> Hypertext links for LaTeX] %<nohyperref> Dummy hyperref (SR)] %<driver> Hyperref documentation driver file] @@ -113,7 +113,7 @@ \end{document} %</driver> % \fi -% \CheckSum{19396} +% \CheckSum{19423} % % \MakeShortVerb{|} % \StopEventually{} @@ -3024,40 +3024,55 @@ }% % \end{macrocode} % -% Input encoding |utf8x| of package |ucs| uses macro -% \cmd{\unichar}. It takes a macro name as argument. -% Then name obeys the following structure: -%\begin{verbatim} -%\u8-<first byte as decimal number>-[continuation byte]+ -%\end{verbatim} +% Input encoding |utf8x| of package |ucs| uses macro \cmd{\unichar}. +% Values greater than |"FFFF| are not supported. % \begin{macrocode} - \def\HyPsd@unichar#1{% - \expandafter\HyPsd@@unichar\string#1\@empty\@empty\@empty\@nil - }% - \def\HyPsd@@unichar #1-#2-#3#4#5#6\@nil{% - \ifnum#2>191 % - \ifnum#2<224 % - \expandafter\HyPsd@UTFviii@@two - \number\dimexpr.25\dimexpr#2sp\expandafter\relax\expandafter|% - \number#2\expandafter|% - \number\dimexpr.125\dimexpr`#3sp\expandafter\relax\expandafter|% - \number`#3 \@nil + \def\HyPsd@unichar#1{% + \ifHy@unicode + \ifnum#1>"FFFF % + \HyPsd@UnicodeReplacementCharacter % unsupported + \else + \ifnum#1>"7FF % + \9% + \expandafter\HyPsd@unichar@first@byte\expandafter{% + \number + \dimexpr.00390625\dimexpr\number#1sp\relax\relax + }% \else - \ifnum#2<240 % - \expandafter\HyPsd@UTFviii@@three - \number\dimexpr.25\dimexpr#2sp\expandafter\relax\expandafter|% - \number#2\expandafter|% - \number\ifnum\numexpr`#3-128\relax <32 0\else 1\fi\expandafter|% - \number\dimexpr.25\dimexpr`#3sp\expandafter\relax\expandafter|% - \number`#3\expandafter|% - \number\dimexpr.125\dimexpr`#4sp\expandafter\relax\expandafter|% - \number`#4 \@nil - \else - ?% unsupported - \fi + \8% + \number\dimexpr.00390625\dimexpr\number#1sp\relax\relax \fi + \expandafter\HyPsd@unichar@second@byte\expandafter{% + \number + \numexpr#1-256*\number + \dimexpr.00390625\dimexpr\number#1sp\relax\relax\relax + }% \fi + \else + .% unsupported (Unicode -> PDF Doc Encoding) + \fi + }% + \def\HyPsd@UnicodeReplacementCharacter{\9377\375} + \def\HyPsd@unichar@first@byte#1{% + \number\dimexpr.015625\dimexpr#1sp\relax\relax + \expandafter\HyPsd@unichar@octtwo\expandafter{% + \number + \numexpr#1-64*\number\dimexpr.015625\dimexpr#1sp\relax\relax\relax + }% + }% + \def\HyPsd@unichar@second@byte#1{% + \csname\number\dimexpr.015625\dimexpr#1sp\relax\relax\endcsname + \expandafter\HyPsd@unichar@octtwo\expandafter{% + \number + \numexpr#1-64*\number\dimexpr.015625\dimexpr#1sp\relax\relax\relax }% + }% + \def\HyPsd@unichar@octtwo#1{% + \number\dimexpr.125\dimexpr#1sp\relax\relax + \number\numexpr#1-8*\number\dimexpr.125\dimexpr#1sp\relax\relax\relax + }% +% \end{macrocode} +% \begin{macrocode} \fi % \end{macrocode} % diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def index a8690a7e94e..fe45fdbe202 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipdfm.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipdfm.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i 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 61ada6a17b0..625e7e6d907 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvips.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvips.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvips.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Hyperref driver for dvips] \input{pdfmark.def}% \ifx\@pdfproducer\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def index e87f8460830..5df18cde070 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdvipson.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdvipson.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdvipson.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Hyperref driver for dvipsone] \providecommand\@pdfborder{0 0 65781} \providecommand*\@pdfborderstyle{} diff --git a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def index ddbfa047a90..59cad941580 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hdviwind.def +++ b/Master/texmf-dist/tex/latex/hyperref/hdviwind.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hdviwind.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Hyperref driver for dviwindo] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def index e29e3b7da92..9f0607dc800 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hpdftex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hpdftex.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hpdftex.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i 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 2386eaa010d..e35985efb51 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.cfg @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.cfg} - [2006/11/30 v6.75h + [2006/12/21 v6.75i 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 fc91c67e315..ece8a141b00 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htex4ht.def +++ b/Master/texmf-dist/tex/latex/hyperref/htex4ht.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htex4ht.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Hyperref driver for TeX4ht] \@ifpackageloaded{tex4ht} {\typeout{hyperref tex4ht: tex4ht already loaded}}% diff --git a/Master/texmf-dist/tex/latex/hyperref/htexture.def b/Master/texmf-dist/tex/latex/hyperref/htexture.def index 059e3a2bb8c..8a86c4a4837 100644 --- a/Master/texmf-dist/tex/latex/hyperref/htexture.def +++ b/Master/texmf-dist/tex/latex/hyperref/htexture.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{htexture.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Hyperref driver for Textures] \begingroup \obeylines % diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtex.def b/Master/texmf-dist/tex/latex/hyperref/hvtex.def index c609002476c..5b1397f3b49 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtex.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtex.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Hyperref driver for VTeX in PDF/PS mode] \edef\Hy@VTeXversion{% \ifx\VTeXversion\@undefined diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def index 3c1dfce76f9..47ea89400c9 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexhtm.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexhtml.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Hyperref driver for VTeX in HTML mode] \RequirePackage{vtexhtml} \newif\if@Localurl diff --git a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def index 3b3554fd8d6..65c9bcabb56 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def +++ b/Master/texmf-dist/tex/latex/hyperref/hvtexmrk.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hvtexmrk.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Hyperref driver for VTeX in PDF/PS mode (pdfmark specials)] \input{pdfmark.def}% \ifx\@pdfproducer\relax diff --git a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty index 192a17e954b..594ae40d739 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/hyperref.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hyperref} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Hypertext links for LaTeX] \begingroup \@makeother\`% @@ -1197,33 +1197,50 @@ \number\dimexpr.25\dimexpr #2sp - 32\dimexpr#3sp\relax\relax\relax % ... }% - \def\HyPsd@unichar#1{% - \expandafter\HyPsd@@unichar\string#1\@empty\@empty\@empty\@nil - }% - \def\HyPsd@@unichar #1-#2-#3#4#5#6\@nil{% - \ifnum#2>191 % - \ifnum#2<224 % - \expandafter\HyPsd@UTFviii@@two - \number\dimexpr.25\dimexpr#2sp\expandafter\relax\expandafter|% - \number#2\expandafter|% - \number\dimexpr.125\dimexpr`#3sp\expandafter\relax\expandafter|% - \number`#3 \@nil + \def\HyPsd@unichar#1{% + \ifHy@unicode + \ifnum#1>"FFFF % + \HyPsd@UnicodeReplacementCharacter % unsupported + \else + \ifnum#1>"7FF % + \9% + \expandafter\HyPsd@unichar@first@byte\expandafter{% + \number + \dimexpr.00390625\dimexpr\number#1sp\relax\relax + }% \else - \ifnum#2<240 % - \expandafter\HyPsd@UTFviii@@three - \number\dimexpr.25\dimexpr#2sp\expandafter\relax\expandafter|% - \number#2\expandafter|% - \number\ifnum\numexpr`#3-128\relax <32 0\else 1\fi\expandafter|% - \number\dimexpr.25\dimexpr`#3sp\expandafter\relax\expandafter|% - \number`#3\expandafter|% - \number\dimexpr.125\dimexpr`#4sp\expandafter\relax\expandafter|% - \number`#4 \@nil - \else - ?% unsupported - \fi + \8% + \number\dimexpr.00390625\dimexpr\number#1sp\relax\relax \fi + \expandafter\HyPsd@unichar@second@byte\expandafter{% + \number + \numexpr#1-256*\number + \dimexpr.00390625\dimexpr\number#1sp\relax\relax\relax + }% \fi + \else + .% unsupported (Unicode -> PDF Doc Encoding) + \fi + }% + \def\HyPsd@UnicodeReplacementCharacter{\9377\375} + \def\HyPsd@unichar@first@byte#1{% + \number\dimexpr.015625\dimexpr#1sp\relax\relax + \expandafter\HyPsd@unichar@octtwo\expandafter{% + \number + \numexpr#1-64*\number\dimexpr.015625\dimexpr#1sp\relax\relax\relax }% + }% + \def\HyPsd@unichar@second@byte#1{% + \csname\number\dimexpr.015625\dimexpr#1sp\relax\relax\endcsname + \expandafter\HyPsd@unichar@octtwo\expandafter{% + \number + \numexpr#1-64*\number\dimexpr.015625\dimexpr#1sp\relax\relax\relax + }% + }% + \def\HyPsd@unichar@octtwo#1{% + \number\dimexpr.125\dimexpr#1sp\relax\relax + \number\numexpr#1-8*\number\dimexpr.125\dimexpr#1sp\relax\relax\relax + }% \fi \@ifclassloaded{memoir}{% \AtEndOfPackage{\RequirePackage{memhfixc}}% diff --git a/Master/texmf-dist/tex/latex/hyperref/hypertex.def b/Master/texmf-dist/tex/latex/hyperref/hypertex.def index 48be5f06212..753fe484739 100644 --- a/Master/texmf-dist/tex/latex/hyperref/hypertex.def +++ b/Master/texmf-dist/tex/latex/hyperref/hypertex.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{hypertex.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Hyperref driver for HyperTeX specials] \def\PDF@FinishDoc{} \def\PDF@SetupDoc{% diff --git a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty index ed05c1e8776..b0e1996e453 100644 --- a/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty +++ b/Master/texmf-dist/tex/latex/hyperref/nohyperref.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{nohyperref} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Dummy hyperref (SR)] \let\hyper@@anchor\@gobble \def\hyper@link#1#2#3{#3}% diff --git a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def index 33bde84708d..69b2f89b511 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pd1enc.def +++ b/Master/texmf-dist/tex/latex/hyperref/pd1enc.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pd1enc.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i 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 9afd0e7b9dd..bbb6f1caba4 100644 --- a/Master/texmf-dist/tex/latex/hyperref/pdfmark.def +++ b/Master/texmf-dist/tex/latex/hyperref/pdfmark.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{pdfmark.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Hyperref definitions for pdfmark specials] \def\Hy@PutCatalog#1{% \pdfmark{pdfmark=/PUT,Raw={\string{Catalog\string} << #1 >>}}% diff --git a/Master/texmf-dist/tex/latex/hyperref/puenc.def b/Master/texmf-dist/tex/latex/hyperref/puenc.def index 8d824410a60..c728fa53f7f 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puenc.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puenc.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i 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 29c86e7db23..80a063ecc89 100644 --- a/Master/texmf-dist/tex/latex/hyperref/puvnenc.def +++ b/Master/texmf-dist/tex/latex/hyperref/puvnenc.def @@ -22,7 +22,7 @@ %% given in the file `manifest.txt'. %% \ProvidesFile{puvnenc.def} - [2006/11/30 v6.75h + [2006/12/21 v6.75i Hyperref: Additions to puenc.def for VnTeX] \DeclareTextCommand{\abreve}{PU}{\81\003} \DeclareTextCommand{\acircumflex}{PU}{\80\342} diff --git a/Master/texmf-dist/tpm/hyperref.tpm b/Master/texmf-dist/tpm/hyperref.tpm index e353fa691b0..83d40bc9b85 100644 --- a/Master/texmf-dist/tpm/hyperref.tpm +++ b/Master/texmf-dist/tpm/hyperref.tpm @@ -3,7 +3,7 @@ <rdf:Description about="http://texlive.dante.de/texlive/Package/hyperref.zip"> <TPM:Name>hyperref</TPM:Name> <TPM:Type>Package</TPM:Type> - <TPM:Date>2006/11/30 09:10:05</TPM:Date> + <TPM:Date>2006/12/21 13:42:05</TPM:Date> <TPM:Version></TPM:Version> <TPM:Creator>rahtz</TPM:Creator> <TPM:Title>Extensive support for hypertext in LaTeX.</TPM:Title> @@ -24,7 +24,7 @@ backends. <TPM:Size>5976499</TPM:Size> <TPM:License></TPM:License> <TPM:Build/> - <TPM:RunFiles size="496064"> + <TPM:RunFiles size="496436"> texmf-dist/tex/latex/hyperref/backref.sty texmf-dist/tex/latex/hyperref/hdvipdfm.def texmf-dist/tex/latex/hyperref/hdvips.def @@ -51,7 +51,7 @@ texmf-dist/tex/latex/hyperref/puvnenc.def texmf-dist/tex/latex/hyperref/xr-hyper.sty texmf-dist/tpm/hyperref.tpm </TPM:RunFiles> - <TPM:DocFiles size="4674932"> + <TPM:DocFiles size="4679645"> texmf-dist/doc/latex/hyperref/ChangeLog texmf-dist/doc/latex/hyperref/ChangeLog.pdf texmf-dist/doc/latex/hyperref/README @@ -68,7 +68,7 @@ texmf-dist/doc/latex/hyperref/options.pdf texmf-dist/doc/latex/hyperref/paper.pdf texmf-dist/doc/latex/hyperref/slides.pdf </TPM:DocFiles> - <TPM:SourceFiles size="805503"> + <TPM:SourceFiles size="805794"> texmf-dist/source/latex/hyperref/backref.dtx texmf-dist/source/latex/hyperref/bmhydoc.sty texmf-dist/source/latex/hyperref/doc/fdl.tex |