[latex3-commits] [git/LaTeX3-latex3-latex2e] doc-v3beta: changed my mind ... now loading hypdoc late (3d114140)

Frank Mittelbach frank.mittelbach at latex-project.org
Fri Nov 26 00:37:53 CET 2021


Repository : https://github.com/latex3/latex2e
On branch  : doc-v3beta
Link       : https://github.com/latex3/latex2e/commit/3d1141405c6a083179452799e9076958fdbcd5d6

>---------------------------------------------------------------

commit 3d1141405c6a083179452799e9076958fdbcd5d6
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Fri Nov 26 00:37:53 2021 +0100

    changed my mind ... now loading hypdoc late


>---------------------------------------------------------------

3d1141405c6a083179452799e9076958fdbcd5d6
 base/doc.dtx                             | 110 ++++++++++++++++++-------------
 base/testfiles-doc/tlb-dox002.luatex.tlg |   2 +-
 base/testfiles-doc/tlb-dox002.tlg        |   2 +-
 base/testfiles-doc/tlb-dox002.xetex.tlg  |   2 +-
 base/testfiles-doc/tlb-dox004.luatex.tlg |  72 +++++++++++---------
 base/testfiles-doc/tlb-dox004.tlg        |  72 +++++++++++---------
 base/testfiles-doc/tlb-dox004.xetex.tlg  |  70 +++++++++++---------
 7 files changed, 185 insertions(+), 145 deletions(-)

diff --git a/base/doc.dtx b/base/doc.dtx
index 244188ce..0bab05e9 100644
--- a/base/doc.dtx
+++ b/base/doc.dtx
@@ -1909,9 +1909,9 @@
 \RequirePackage{l3keys2e}
 \ExplSyntaxOn
 %    \end{macrocode}
-% These two options are available for use in \cs{usepackage} or in the
-% generated item \api's:
-% \fmi{cleanup documentation (and perhaps code)}
+% Some keys are available as options for use in \cs{usepackage} some are
+% for the generated item \api's:
+% \fmi{cleanup documentation (and code)}
 %    \begin{macrocode}
 \newif \ifdoc at noprint
 \newif \ifdoc at noindex
@@ -3362,7 +3362,6 @@
 % provided therein are making programming much easier. Over time I
 % will probably replace the rest of that \DOC code too.
 %    \begin{macrocode}
-\RequirePackage{expl3}
 \ExplSyntaxOn
 %    \end{macrocode}
 %
@@ -5531,65 +5530,73 @@
 % \section{Integrating hypdoc}
 %
 %    If the option \texttt{hyperref} is selected (which is the
-%    default), then we load the \pkg{hypdoc} package. That package
-%    currently expects some commands from \DOC version~2 being
-%    defined, so we first need to provide some dummy definitions for
-%    them.
+%    default), then we load the \pkg{hypdoc} package. We do that as
+%    late as possible so that we don't generate option clashes if it
+%    is also loaded in the preamble. That package currently changes
+%    more commands than it should (not knowing about their new
+%    definitions defined below) so we have to save and restore a few.
 %
 %    Midterm all this code in \pkg{hypdoc} should be directly included
 %    in \DOC. For now, while they are separate we have to do this
 %    juggling.
 %    \begin{macrocode}
-\ifdoc at hyperref
-  \let\PrintDescribeMacro \@empty
-  \let\PrintDescribeEnv   \@empty
-  \let\PrintMacroName     \@empty
-  \let\PrintEnvName       \@empty
-  \let\SpecialUsageIndex  \@empty
-  \let\SpecialEnvIndex    \@empty
+\AddToHook{begindocument/before}[doc/hyperref]{%
+ \ifdoc at hyperref
 %    \end{macrocode}
 %    Annoying to code around issue \#22
 %    \begin{macrocode}
   \expandafter\let\expandafter\doc at eoph@@k\csname doc.sty-h@@k\endcsname
 %    \end{macrocode}
-%    We load the package with the option it knows about. This way if
-%    it is later loaded again we don't get option clashes. The
-%    alternative is to delay the loading until \verb=\begin{document}=
-%    but that means we also have to delay a lot of other code so this
-%    is the simpler solution.
+%    We require the package without any option so if it was already
+%    loaded there is no option clash.
 %    \begin{macrocode}
-  \RequirePackage[numbered]{hypdoc}
+  \RequirePackage{hypdoc}
   \expandafter\let\csname doc.sty-h@@k\endcsname\doc at eoph@@k
 %    \end{macrocode}
 %    After \pkg{hypdoc} got loaded we need to undefine those macros
 %    again so that later on \texttt{Macro} and \texttt{Env} \DOC items
 %    appear to be undefined.
 %    \begin{macrocode}
-  \let\PrintDescribeMacro \relax
-  \let\PrintDescribeEnv   \relax
-  \let\PrintMacroName     \relax
-  \let\PrintEnvName       \relax
+  \let\PrintDescribeMacro \@@PrintDescribeMacro
+  \let\PrintDescribeEnv \@@PrintDescribeEnv
+  \let\PrintMacroName \@@PrintMacroName
+  \let\PrintEnvName \@@PrintEnvName
+  \let\SpecialUsageIndex \@@SpecialUsageIndex
+  \let\SpecialEnvIndex \@@SpecialEnvIndex
+  \let\SortIndex \@@SortIndex
+%    \end{macrocode}
+%    The package adds new definitions for \cs{special at index} into
+%    \cs{CodelineIndex} and \cs{PageIndex} but since we are loading it
+%    very late we are already past them (in the preamble). So we test
+%    the final state and do it here.
+%    \begin{macrocode}
+  \ifcodeline at index
+    \let\special at index\HD at codeline@wrindex
+  \else
+    \let\special at index\HD at page@wrindex
+  \fi
 %    \end{macrocode}
-%    That package adds extra code into |\index| entries but it doesn't
-% know about all the stuff that \DOC does (now). So we need to provide
-% us with two helpers that handle the |\encapchar| case in some entries.
+%    That package also adds extra code into |\index| entries but it doesn't
+%    know about all the stuff that \DOC does (now). So we need to provide
+%    us with two helpers that handle the |\encapchar| case in some entries.
 %    \begin{macrocode}
-  \def\doc at providetarget{\HD at target}
-  \def\doc at handleencap#1{\encapchar hdclindex{\the\c at HD@hypercount}{#1}}
+  \def\doc at providetarget{\HD at target}%
+  \def\doc at handleencap#1{\encapchar hdclindex{\the\c at HD@hypercount}{#1}}%
 %    \end{macrocode}
 %    If that package is not loaded these helpers do little to nothing.
 %    \begin{macrocode}
-\else
+ \else
   \let\doc at providetarget\@empty
-  \def\doc at handleencap#1{\encapchar #1}
+  \def\doc at handleencap#1{\encapchar #1}%
 %    \end{macrocode}
 %    We define the next commands just in case the user changed the option
 %    \texttt{hyperref} from \texttt{true} to \texttt{false} without
 %    removing the auxiliary files.
 %    \begin{macrocode}
-  \def\hdclindex#1#2{\ifx\@nil#2\@nil\else\csname #2\expandafter\endcsname\fi}
-  \def\hdpindex   #1{\ifx\@nil#1\@nil\else\csname #1\expandafter\endcsname\fi}
+  \def\hdclindex#1#2{\ifx\@nil#2\@nil\else\csname #2\expandafter\endcsname\fi}%
+  \def\hdpindex   #1{\ifx\@nil#1\@nil\else\csname #1\expandafter\endcsname\fi}%
 \fi
+}  
 %    \end{macrocode}
 %
 %
@@ -5730,16 +5737,12 @@
     \ignorespaces}
 %    \end{macrocode}
 % \end{macro}
-
-
-
-
-
-
-
-
-
-
+%
+%
+%
+%
+%
+%
 % \begin{macro}{\doc at env}
 %   \marg{true-value}\marg{item}\oarg{options}\\
 %   Handle optional arguments and call \cs{@doc at env}. Because environments can
@@ -6237,8 +6240,23 @@
                ]{Env}{environment}
 %    \end{macrocode}
 %
-
-
+%
+%
+%    To be able to restore the definition after \pkg{hypdoc} is loaded
+%    we better save them here. We only load the package at the end of
+%    the preamble, but the user might do this earlier and then  chaos
+%    is ensured.
+%    \begin{macrocode}
+  \let\@@PrintDescribeMacro \PrintDescribeMacro
+  \let\@@PrintDescribeEnv \PrintDescribeEnv
+  \let\@@PrintMacroName \PrintMacroName
+  \let\@@PrintEnvName \PrintEnvName
+  \let\@@SpecialUsageIndex \SpecialUsageIndex
+  \let\@@SpecialEnvIndex \SpecialEnvIndex
+  \let\@@SortIndex \SortIndex
+%    \end{macrocode}
+%
+%
 % \section{Misc additions}
 
 % \begin{imacro}{\cs}
diff --git a/base/testfiles-doc/tlb-dox002.luatex.tlg b/base/testfiles-doc/tlb-dox002.luatex.tlg
index 7bc37b45..940838f1 100644
--- a/base/testfiles-doc/tlb-dox002.luatex.tlg
+++ b/base/testfiles-doc/tlb-dox002.luatex.tlg
@@ -59,6 +59,6 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 ]) (tlb-dox002.gls [4
 ]) (tlb-dox002.aux)
 Package rerunfilecheck Info: File `tlb-dox002.out' has not changed.
-(rerunfilecheck)             Checksum: 5A5BAB6336BD5D5F88050019C1564F8B;734.
+(rerunfilecheck)             Checksum: 349BDA914F2BE01D49890BA22F447C6E;700.
 Package rerunfilecheck Info: File `tlb-dox002.hd' has not changed.
 (rerunfilecheck)             Checksum: B76112794A5C6B08F6F1B4B642B0FBF5;64.
diff --git a/base/testfiles-doc/tlb-dox002.tlg b/base/testfiles-doc/tlb-dox002.tlg
index 7bc37b45..940838f1 100644
--- a/base/testfiles-doc/tlb-dox002.tlg
+++ b/base/testfiles-doc/tlb-dox002.tlg
@@ -59,6 +59,6 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 ]) (tlb-dox002.gls [4
 ]) (tlb-dox002.aux)
 Package rerunfilecheck Info: File `tlb-dox002.out' has not changed.
-(rerunfilecheck)             Checksum: 5A5BAB6336BD5D5F88050019C1564F8B;734.
+(rerunfilecheck)             Checksum: 349BDA914F2BE01D49890BA22F447C6E;700.
 Package rerunfilecheck Info: File `tlb-dox002.hd' has not changed.
 (rerunfilecheck)             Checksum: B76112794A5C6B08F6F1B4B642B0FBF5;64.
diff --git a/base/testfiles-doc/tlb-dox002.xetex.tlg b/base/testfiles-doc/tlb-dox002.xetex.tlg
index 7bc37b45..940838f1 100644
--- a/base/testfiles-doc/tlb-dox002.xetex.tlg
+++ b/base/testfiles-doc/tlb-dox002.xetex.tlg
@@ -59,6 +59,6 @@ LaTeX Font Info:    External font `cmex10' loaded for size
 ]) (tlb-dox002.gls [4
 ]) (tlb-dox002.aux)
 Package rerunfilecheck Info: File `tlb-dox002.out' has not changed.
-(rerunfilecheck)             Checksum: 5A5BAB6336BD5D5F88050019C1564F8B;734.
+(rerunfilecheck)             Checksum: 349BDA914F2BE01D49890BA22F447C6E;700.
 Package rerunfilecheck Info: File `tlb-dox002.hd' has not changed.
 (rerunfilecheck)             Checksum: B76112794A5C6B08F6F1B4B642B0FBF5;64.
diff --git a/base/testfiles-doc/tlb-dox004.luatex.tlg b/base/testfiles-doc/tlb-dox004.luatex.tlg
index ebd0ded8..eafb53a8 100644
--- a/base/testfiles-doc/tlb-dox004.luatex.tlg
+++ b/base/testfiles-doc/tlb-dox004.luatex.tlg
@@ -37,7 +37,7 @@ Completed box being shipped out [1]
 ...\glue(\lineskip) 0.0
 ...\vbox(550.0+0.0)x345.0, glue set 497.94681fil, direction TLT
 ....\write-{}
-....\special{ps:SDict begin [/Count -9/Dest (section.1) cvn/Title (\376\377\0001\000\040\000I\000n\000d\000e\000x) /OUT pdfmark end}
+....\special{ps:SDict begin [/Count -9/Dest (index1.1) cvn/Title (\376\377\000I\000n\000d\000e\000x) /OUT pdfmark end}
 ....\special{ps:SDict begin [/Count -0/Dest (HD.Symbols.2) cvn/Title (\376\377\000S\000y\000m\000b\000o\000l\000s) /OUT pdfmark end}
 ....\special{ps:SDict begin [/Count -0/Dest (HD.D.2) cvn/Title (\376\377\000D) /OUT pdfmark end}
 ....\special{ps:SDict begin [/Count -0/Dest (HD.E.2) cvn/Title (\376\377\000E) /OUT pdfmark end}
@@ -47,7 +47,7 @@ Completed box being shipped out [1]
 ....\special{ps:SDict begin [/Count -0/Dest (HD.M.2) cvn/Title (\376\377\000M) /OUT pdfmark end}
 ....\special{ps:SDict begin [/Count -0/Dest (HD.N.2) cvn/Title (\376\377\000N) /OUT pdfmark end}
 ....\special{ps:SDict begin [/Count -0/Dest (HD.R.2) cvn/Title (\376\377\000R) /OUT pdfmark end}
-....\special{ps:SDict begin [/Count -0/Dest (section.2) cvn/Title (\376\377\0002\000\040\000C\000h\000a\000n\000g\000e\000\040\000H\000i\000s\000t\000o\000r\000y) /OUT pdfmark end}
+....\special{ps:SDict begin [/Count -0/Dest (glossary2.1) cvn/Title (\376\377\000C\000h\000a\000n\000g\000e\000\040\000H\000i\000s\000t\000o\000r\000y) /OUT pdfmark end}
 ....\special{ps:SDict begin [/PageMode /UseOutlines/Page 1/View [/FitBH 667.19638] /DOCVIEW pdfmark end}
 ....\special{ps:SDict begin [ {Catalog}<<>> /PUT pdfmark end}
 ....\special{ps:SDict begin H.S end}
@@ -1053,26 +1053,32 @@ Completed box being shipped out [4]
 ....\vbox(52.91658+0.0)x345.0, direction TLT
 .....\special{color push  Black}
 .....\vbox(52.91658+0.0)x345.0, direction TLT
-......\penalty -300
-......\glue 15.0694 plus 4.30554 minus 0.86108
+......\write5{\protect \BOOKMARK [1][-]{index1.1}{\376\377\000I\000n\000d\000e\000x}{}% 1}
 ......\special{ps:SDict begin H.S end}
 ......\special{ps:SDict begin 12 H.A end}
-......\special{ps:SDict begin [/View [/XYZ H.V]/Dest (section.1) cvn /DEST pdfmark end}
+......\special{ps:SDict begin [/View [/XYZ H.V]/Dest (index1.1) cvn /DEST pdfmark end}
 ......\penalty 10000
-......\glue -15.0694 plus -4.30554 minus -0.86108
+......\penalty -300
 ......\glue 15.0694 plus 4.30554 minus 0.86108
 ......\glue(\parskip) 0.0
 ......\glue(\parskip) 0.0
-......\hbox(9.99998+0.0)x345.0, glue set 280.72507fil, direction TLT
+......\hbox(9.99998+0.0)x345.0, glue set 305.02502fil, direction TLT
 .......\localpar
 ........\localinterlinepenalty=0
 ........\localbrokenpenalty=0
 ........\localleftbox=null
 ........\localrightbox=null
-.......\hbox(9.27998+0.0)x24.29997, direction TLT
+.......\hbox(0.0+0.0)x0.0, direction TLT
+........\glue 0.0
+.......\hbox(0.0+0.0)x0.0, direction TLT
+........\kern0.0
+........\special{ps:SDict begin H.S end}
+........\penalty 10000
 ........\glue 0.0
-........\OT1/cmr/bx/n/14.4 1
-........\glue 16.19998
+........\special{ps:SDict begin 18 H.A end}
+........\special{ps:SDict begin [/View [/XYZ H.V]/Dest (section*.1) cvn /DEST pdfmark end}
+........\penalty 10000
+........\glue 0.0 plus 1.0fil minus 1.0fil
 .......\OT1/cmr/bx/n/14.4 I
 .......\OT1/cmr/bx/n/14.4 n
 .......\discretionary (penalty 50)
@@ -1083,8 +1089,6 @@ Completed box being shipped out [4]
 .......\penalty 10000
 .......\glue(\parfillskip) 0.0 plus 1.0fil
 .......\glue(\rightskip) 0.0
-......\write5{\protect \BOOKMARK [1][-]{section.1}{\376\377\0001\000\040\000I\000n\000d\000e\000x}{}% 1}
-......\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}Index}{\thepage }{section.1}\protected at file@percent }}
 ......\penalty 10000
 ......\glue 9.90276 plus 0.86108
 ......\mark{{Index}{Index}}
@@ -1374,7 +1378,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0, direction TLT
 .........\hbox(0.0+0.0)x0.0, shifted -11.0, direction TLT
 ..........\kern-2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.Symbols.2}{\376\377\000S\000y\000m\000b\000o\000l\000s}{section.1}% 2}
+..........\write5{\protect \BOOKMARK [2][-]{HD.Symbols.2}{\376\377\000S\000y\000m\000b\000o\000l\000s}{index1.1}% 2}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -1521,7 +1525,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0, direction TLT
 .........\hbox(0.0+0.0)x0.0, shifted -11.0, direction TLT
 ..........\kern-2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.D.2}{\376\377\000D}{section.1}% 3}
+..........\write5{\protect \BOOKMARK [2][-]{HD.D.2}{\376\377\000D}{index1.1}% 3}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -1596,7 +1600,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0, direction TLT
 .........\hbox(0.0+0.0)x0.0, shifted -11.0, direction TLT
 ..........\kern-2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.E.2}{\376\377\000E}{section.1}% 4}
+..........\write5{\protect \BOOKMARK [2][-]{HD.E.2}{\376\377\000E}{index1.1}% 4}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -1737,7 +1741,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0, direction TLT
 .........\hbox(0.0+0.0)x0.0, shifted -11.0, direction TLT
 ..........\kern-2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.F.2}{\376\377\000F}{section.1}% 5}
+..........\write5{\protect \BOOKMARK [2][-]{HD.F.2}{\376\377\000F}{index1.1}% 5}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -1839,7 +1843,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0, direction TLT
 .........\hbox(0.0+0.0)x0.0, shifted -11.0, direction TLT
 ..........\kern-2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.H.2}{\376\377\000H}{section.1}% 6}
+..........\write5{\protect \BOOKMARK [2][-]{HD.H.2}{\376\377\000H}{index1.1}% 6}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -1916,7 +1920,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0, direction TLT
 .........\hbox(0.0+0.0)x0.0, shifted -11.0, direction TLT
 ..........\kern-2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.L.2}{\376\377\000L}{section.1}% 7}
+..........\write5{\protect \BOOKMARK [2][-]{HD.L.2}{\376\377\000L}{index1.1}% 7}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -2041,7 +2045,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0, direction TLT
 .........\hbox(0.0+0.0)x0.0, shifted -11.0, direction TLT
 ..........\kern-2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.M.2}{\376\377\000M}{section.1}% 8}
+..........\write5{\protect \BOOKMARK [2][-]{HD.M.2}{\376\377\000M}{index1.1}% 8}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -2291,7 +2295,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0, direction TLT
 .........\hbox(0.0+0.0)x0.0, shifted -11.0, direction TLT
 ..........\kern-2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.N.2}{\376\377\000N}{section.1}% 9}
+..........\write5{\protect \BOOKMARK [2][-]{HD.N.2}{\376\377\000N}{index1.1}% 9}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -2377,7 +2381,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0, direction TLT
 .........\hbox(0.0+0.0)x0.0, shifted -11.0, direction TLT
 ..........\kern-2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.R.2}{\376\377\000R}{section.1}% 10}
+..........\write5{\protect \BOOKMARK [2][-]{HD.R.2}{\376\377\000R}{index1.1}% 10}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -2502,26 +2506,32 @@ Completed box being shipped out [5]
 ....\vbox(17.77213+0.0)x345.0, direction TLT
 .....\special{color push  Black}
 .....\vbox(17.77213+0.0)x345.0, direction TLT
-......\penalty -300
-......\glue 15.0694 plus 4.30554 minus 0.86108
+......\write5{\protect \BOOKMARK [1][-]{glossary2.1}{\376\377\000C\000h\000a\000n\000g\000e\000\040\000H\000i\000s\000t\000o\000r\000y}{}% 11}
 ......\special{ps:SDict begin H.S end}
 ......\special{ps:SDict begin 12 H.A end}
-......\special{ps:SDict begin [/View [/XYZ H.V]/Dest (section.2) cvn /DEST pdfmark end}
+......\special{ps:SDict begin [/View [/XYZ H.V]/Dest (glossary2.1) cvn /DEST pdfmark end}
 ......\penalty 10000
-......\glue -15.0694 plus -4.30554 minus -0.86108
+......\penalty -300
 ......\glue 15.0694 plus 4.30554 minus 0.86108
 ......\glue(\parskip) 0.0
 ......\glue(\parskip) 0.0
-......\hbox(9.99998+2.79999)x345.0, glue set 209.11014fil, direction TLT
+......\hbox(9.99998+2.79999)x345.0, glue set 233.41011fil, direction TLT
 .......\localpar
 ........\localinterlinepenalty=0
 ........\localbrokenpenalty=0
 ........\localleftbox=null
 ........\localrightbox=null
-.......\hbox(9.27998+0.0)x24.29997, direction TLT
+.......\hbox(0.0+0.0)x0.0, direction TLT
+........\glue 0.0
+.......\hbox(0.0+0.0)x0.0, direction TLT
+........\kern0.0
+........\special{ps:SDict begin H.S end}
+........\penalty 10000
 ........\glue 0.0
-........\OT1/cmr/bx/n/14.4 2
-........\glue 16.19998
+........\special{ps:SDict begin 18 H.A end}
+........\special{ps:SDict begin [/View [/XYZ H.V]/Dest (section*.2) cvn /DEST pdfmark end}
+........\penalty 10000
+........\glue 0.0 plus 1.0fil minus 1.0fil
 .......\OT1/cmr/bx/n/14.4 C
 .......\OT1/cmr/bx/n/14.4 h
 .......\OT1/cmr/bx/n/14.4 a
@@ -2541,8 +2551,6 @@ Completed box being shipped out [5]
 .......\penalty 10000
 .......\glue(\parfillskip) 0.0 plus 1.0fil
 .......\glue(\rightskip) 0.0
-......\write5{\protect \BOOKMARK [1][-]{section.2}{\376\377\0002\000\040\000C\000h\000a\000n\000g\000e\000\040\000H\000i\000s\000t\000o\000r\000y}{}% 11}
-......\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}{Change History}}{\thepage }{section.2}\protected at file@percent }}
 ......\penalty 10000
 ......\glue 9.90276 plus 0.86108
 ......\mark{{{Change History}}{{Change History}}}
@@ -2940,6 +2948,6 @@ Completed box being shipped out [5]
 ....\special{color pop}
 ) (tlb-dox004.aux)
 Package rerunfilecheck Info: File `tlb-dox004.out' has not changed.
-(rerunfilecheck)             Checksum: 5A5BAB6336BD5D5F88050019C1564F8B;734.
+(rerunfilecheck)             Checksum: 349BDA914F2BE01D49890BA22F447C6E;700.
 Package rerunfilecheck Info: File `tlb-dox004.hd' has not changed.
 (rerunfilecheck)             Checksum: 3638BFF492BA6EF3464E9B7B191EB03B;15.
diff --git a/base/testfiles-doc/tlb-dox004.tlg b/base/testfiles-doc/tlb-dox004.tlg
index 7ba9a51a..0f052b8a 100644
--- a/base/testfiles-doc/tlb-dox004.tlg
+++ b/base/testfiles-doc/tlb-dox004.tlg
@@ -37,7 +37,7 @@ Completed box being shipped out [1]
 ...\glue(\lineskip) 0.0
 ...\vbox(550.0+0.0)x345.0, glue set 497.94681fil
 ....\write-{}
-....\special{ps:SDict begin [/Count -9/Dest (section.1) cvn/Title (\376\377\0001\000\040\000I\000n\000d\000e\000x) /OUT pdfmark end}
+....\special{ps:SDict begin [/Count -9/Dest (index1.1) cvn/Title (\376\377\000I\000n\000d\000e\000x) /OUT pdfmark end}
 ....\special{ps:SDict begin [/Count -0/Dest (HD.Symbols.2) cvn/Title (\376\377\000S\000y\000m\000b\000o\000l\000s) /OUT pdfmark end}
 ....\special{ps:SDict begin [/Count -0/Dest (HD.D.2) cvn/Title (\376\377\000D) /OUT pdfmark end}
 ....\special{ps:SDict begin [/Count -0/Dest (HD.E.2) cvn/Title (\376\377\000E) /OUT pdfmark end}
@@ -47,7 +47,7 @@ Completed box being shipped out [1]
 ....\special{ps:SDict begin [/Count -0/Dest (HD.M.2) cvn/Title (\376\377\000M) /OUT pdfmark end}
 ....\special{ps:SDict begin [/Count -0/Dest (HD.N.2) cvn/Title (\376\377\000N) /OUT pdfmark end}
 ....\special{ps:SDict begin [/Count -0/Dest (HD.R.2) cvn/Title (\376\377\000R) /OUT pdfmark end}
-....\special{ps:SDict begin [/Count -0/Dest (section.2) cvn/Title (\376\377\0002\000\040\000C\000h\000a\000n\000g\000e\000\040\000H\000i\000s\000t\000o\000r\000y) /OUT pdfmark end}
+....\special{ps:SDict begin [/Count -0/Dest (glossary2.1) cvn/Title (\376\377\000C\000h\000a\000n\000g\000e\000\040\000H\000i\000s\000t\000o\000r\000y) /OUT pdfmark end}
 ....\special{ps:SDict begin [/PageMode /UseOutlines/Page 1/View [/FitBH 667.19638] /DOCVIEW pdfmark end}
 ....\special{ps:SDict begin [ {Catalog}<<>> /PUT pdfmark end}
 ....\special{ps:SDict begin H.S end}
@@ -944,21 +944,27 @@ Completed box being shipped out [4]
 ....\vbox(52.91658+0.0)x345.0
 .....\special{color push  Black}
 .....\vbox(52.91658+0.0)x345.0
-......\penalty -300
-......\glue 15.0694 plus 4.30554 minus 0.86108
+......\write5{\protect \BOOKMARK [1][-]{index1.1}{\376\377\000I\000n\000d\000e\000x}{}% 1}
 ......\special{ps:SDict begin H.S end}
 ......\special{ps:SDict begin 12 H.A end}
-......\special{ps:SDict begin [/View [/XYZ H.V]/Dest (section.1) cvn /DEST pdfmark end}
+......\special{ps:SDict begin [/View [/XYZ H.V]/Dest (index1.1) cvn /DEST pdfmark end}
 ......\penalty 10000
-......\glue -15.0694 plus -4.30554 minus -0.86108
+......\penalty -300
 ......\glue 15.0694 plus 4.30554 minus 0.86108
 ......\glue(\parskip) 0.0
 ......\glue(\parskip) 0.0
-......\hbox(9.99998+0.0)x345.0, glue set 280.72507fil
-.......\hbox(9.27998+0.0)x24.29997
+......\hbox(9.99998+0.0)x345.0, glue set 305.02504fil
+.......\hbox(0.0+0.0)x0.0
 ........\glue 0.0
-........\OT1/cmr/bx/n/14.4 1
-........\glue 16.19998
+.......\hbox(0.0+0.0)x0.0
+........\kern 0.0
+........\special{ps:SDict begin H.S end}
+........\penalty 10000
+........\glue 0.0
+........\special{ps:SDict begin 18 H.A end}
+........\special{ps:SDict begin [/View [/XYZ H.V]/Dest (section*.1) cvn /DEST pdfmark end}
+........\penalty 10000
+........\glue 0.0 plus 1.0fil minus 1.0fil
 .......\OT1/cmr/bx/n/14.4 I
 .......\OT1/cmr/bx/n/14.4 n
 .......\OT1/cmr/bx/n/14.4 d
@@ -967,8 +973,6 @@ Completed box being shipped out [4]
 .......\penalty 10000
 .......\glue(\parfillskip) 0.0 plus 1.0fil
 .......\glue(\rightskip) 0.0
-......\write5{\protect \BOOKMARK [1][-]{section.1}{\376\377\0001\000\040\000I\000n\000d\000e\000x}{}% 1}
-......\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}Index}{\thepage }{section.1}\protected at file@percent }}
 ......\penalty 10000
 ......\glue 9.90276 plus 0.86108
 ......\mark{{Index}{Index}}
@@ -1204,7 +1208,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.Symbols.2}{\376\377\000S\000y\000m\000b\000o\000l\000s}{section.1}% 2}
+..........\write5{\protect \BOOKMARK [2][-]{HD.Symbols.2}{\376\377\000S\000y\000m\000b\000o\000l\000s}{index1.1}% 2}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -1334,7 +1338,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.D.2}{\376\377\000D}{section.1}% 3}
+..........\write5{\protect \BOOKMARK [2][-]{HD.D.2}{\376\377\000D}{index1.1}% 3}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -1399,7 +1403,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.E.2}{\376\377\000E}{section.1}% 4}
+..........\write5{\protect \BOOKMARK [2][-]{HD.E.2}{\376\377\000E}{index1.1}% 4}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -1519,7 +1523,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.F.2}{\376\377\000F}{section.1}% 5}
+..........\write5{\protect \BOOKMARK [2][-]{HD.F.2}{\376\377\000F}{index1.1}% 5}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -1609,7 +1613,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.H.2}{\376\377\000H}{section.1}% 6}
+..........\write5{\protect \BOOKMARK [2][-]{HD.H.2}{\376\377\000H}{index1.1}% 6}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -1676,7 +1680,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.L.2}{\376\377\000L}{section.1}% 7}
+..........\write5{\protect \BOOKMARK [2][-]{HD.L.2}{\376\377\000L}{index1.1}% 7}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -1786,7 +1790,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.M.2}{\376\377\000M}{section.1}% 8}
+..........\write5{\protect \BOOKMARK [2][-]{HD.M.2}{\376\377\000M}{index1.1}% 8}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -2010,7 +2014,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.N.2}{\376\377\000N}{section.1}% 9}
+..........\write5{\protect \BOOKMARK [2][-]{HD.N.2}{\376\377\000N}{index1.1}% 9}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -2086,7 +2090,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.R.2}{\376\377\000R}{section.1}% 10}
+..........\write5{\protect \BOOKMARK [2][-]{HD.R.2}{\376\377\000R}{index1.1}% 10}
 ..........\special{ps:SDict begin H.S end}
 ..........\penalty 10000
 ..........\glue 0.0
@@ -2206,21 +2210,27 @@ Completed box being shipped out [5]
 ....\vbox(17.77213+0.0)x345.0
 .....\special{color push  Black}
 .....\vbox(17.77213+0.0)x345.0
-......\penalty -300
-......\glue 15.0694 plus 4.30554 minus 0.86108
+......\write5{\protect \BOOKMARK [1][-]{glossary2.1}{\376\377\000C\000h\000a\000n\000g\000e\000\040\000H\000i\000s\000t\000o\000r\000y}{}% 11}
 ......\special{ps:SDict begin H.S end}
 ......\special{ps:SDict begin 12 H.A end}
-......\special{ps:SDict begin [/View [/XYZ H.V]/Dest (section.2) cvn /DEST pdfmark end}
+......\special{ps:SDict begin [/View [/XYZ H.V]/Dest (glossary2.1) cvn /DEST pdfmark end}
 ......\penalty 10000
-......\glue -15.0694 plus -4.30554 minus -0.86108
+......\penalty -300
 ......\glue 15.0694 plus 4.30554 minus 0.86108
 ......\glue(\parskip) 0.0
 ......\glue(\parskip) 0.0
-......\hbox(9.99998+2.79999)x345.0, glue set 209.11014fil
-.......\hbox(9.27998+0.0)x24.29997
+......\hbox(9.99998+2.79999)x345.0, glue set 233.41011fil
+.......\hbox(0.0+0.0)x0.0
 ........\glue 0.0
-........\OT1/cmr/bx/n/14.4 2
-........\glue 16.19998
+.......\hbox(0.0+0.0)x0.0
+........\kern 0.0
+........\special{ps:SDict begin H.S end}
+........\penalty 10000
+........\glue 0.0
+........\special{ps:SDict begin 18 H.A end}
+........\special{ps:SDict begin [/View [/XYZ H.V]/Dest (section*.2) cvn /DEST pdfmark end}
+........\penalty 10000
+........\glue 0.0 plus 1.0fil minus 1.0fil
 .......\OT1/cmr/bx/n/14.4 C
 .......\OT1/cmr/bx/n/14.4 h
 .......\OT1/cmr/bx/n/14.4 a
@@ -2238,8 +2248,6 @@ Completed box being shipped out [5]
 .......\penalty 10000
 .......\glue(\parfillskip) 0.0 plus 1.0fil
 .......\glue(\rightskip) 0.0
-......\write5{\protect \BOOKMARK [1][-]{section.2}{\376\377\0002\000\040\000C\000h\000a\000n\000g\000e\000\040\000H\000i\000s\000t\000o\000r\000y}{}% 11}
-......\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}{Change History}}{\thepage }{section.2}\protected at file@percent }}
 ......\penalty 10000
 ......\glue 9.90276 plus 0.86108
 ......\mark{{{Change History}}{{Change History}}}
@@ -2593,6 +2601,6 @@ Completed box being shipped out [5]
 ....\special{color pop}
 ) (tlb-dox004.aux)
 Package rerunfilecheck Info: File `tlb-dox004.out' has not changed.
-(rerunfilecheck)             Checksum: 5A5BAB6336BD5D5F88050019C1564F8B;734.
+(rerunfilecheck)             Checksum: 349BDA914F2BE01D49890BA22F447C6E;700.
 Package rerunfilecheck Info: File `tlb-dox004.hd' has not changed.
 (rerunfilecheck)             Checksum: 3638BFF492BA6EF3464E9B7B191EB03B;15.
diff --git a/base/testfiles-doc/tlb-dox004.xetex.tlg b/base/testfiles-doc/tlb-dox004.xetex.tlg
index 4769cbb5..06328d8c 100644
--- a/base/testfiles-doc/tlb-dox004.xetex.tlg
+++ b/base/testfiles-doc/tlb-dox004.xetex.tlg
@@ -33,7 +33,7 @@ Completed box being shipped out [1]
 ....\write-{}
 ....\special{pdf:majorversion 1}
 ....\special{pdf:minorversion 5}
-....\special{pdf:outline [-] 1<</Title(\376\377\0001\000\040\000I\000n\000d\000e\000x)/A<</S/GoTo/D(section.1)>>>>}
+....\special{pdf:outline [-] 1<</Title(\376\377\000I\000n\000d\000e\000x)/A<</S/GoTo/D(index1.1)>>>>}
 ....\special{pdf:outline [-] 2<</Title(\376\377\000S\000y\000m\000b\000o\000l\000s)/A<</S/GoTo/D(HD.Symbols.2)>>>>}
 ....\special{pdf:outline [-] 2<</Title(\376\377\000D)/A<</S/GoTo/D(HD.D.2)>>>>}
 ....\special{pdf:outline [-] 2<</Title(\376\377\000E)/A<</S/GoTo/D(HD.E.2)>>>>}
@@ -43,7 +43,7 @@ Completed box being shipped out [1]
 ....\special{pdf:outline [-] 2<</Title(\376\377\000M)/A<</S/GoTo/D(HD.M.2)>>>>}
 ....\special{pdf:outline [-] 2<</Title(\376\377\000N)/A<</S/GoTo/D(HD.N.2)>>>>}
 ....\special{pdf:outline [-] 2<</Title(\376\377\000R)/A<</S/GoTo/D(HD.R.2)>>>>}
-....\special{pdf:outline [-] 1<</Title(\376\377\0002\000\040\000C\000h\000a\000n\000g\000e\000\040\000H\000i\000s\000t\000o\000r\000y)/A<</S/GoTo/D(section.2)>>>>}
+....\special{pdf:outline [-] 1<</Title(\376\377\000C\000h\000a\000n\000g\000e\000\040\000H\000i\000s\000t\000o\000r\000y)/A<</S/GoTo/D(glossary2.1)>>>>}
 ....\special{pdf:docview<</OpenAction[@page1/FitBH 667.19638]/PageMode/UseOutlines>>}
 ....\special{pdf:dest (Doc-Start) [@thispage /XYZ @xpos @ypos null]}
 ....\glue(\topskip) 3.05556
@@ -910,19 +910,24 @@ Completed box being shipped out [4]
 ....\vbox(52.91658+0.0)x345.0
 .....\special{color push  Black}
 .....\vbox(52.91658+0.0)x345.0
-......\penalty -300
-......\glue 15.0694 plus 4.30554 minus 0.86108
-......\special{pdf:dest (section.1) [@thispage /XYZ @xpos @ypos null]}
+......\write5{\protect \BOOKMARK [1][-]{index1.1}{\376\377\000I\000n\000d\000e\000x}{}% 1}
+......\special{pdf:dest (index1.1) [@thispage /XYZ @xpos @ypos null]}
 ......\penalty 10000
-......\glue -15.0694 plus -4.30554 minus -0.86108
+......\penalty -300
 ......\glue 15.0694 plus 4.30554 minus 0.86108
 ......\glue(\parskip) 0.0
 ......\glue(\parskip) 0.0
-......\hbox(9.99998+0.0)x345.0, glue set 280.72507fil
-.......\hbox(9.27998+0.0)x24.29997
+......\hbox(9.99998+0.0)x345.0, glue set 305.02504fil
+.......\hbox(0.0+0.0)x0.0
 ........\glue 0.0
-........\OT1/cmr/bx/n/14.4 1
-........\glue 16.19998
+.......\hbox(0.0+0.0)x0.0
+........\kern 0.0
+........\penalty 10000
+........\hbox(0.0+0.0)x0.0
+.........\hbox(0.0+0.0)x0.0, shifted -18.0
+..........\special{pdf:dest (section*.1) [@thispage /XYZ @xpos @ypos null]}
+..........\penalty 10000
+........\glue 0.0 plus 1.0fil minus 1.0fil
 .......\OT1/cmr/bx/n/14.4 I
 .......\OT1/cmr/bx/n/14.4 n
 .......\OT1/cmr/bx/n/14.4 d
@@ -931,8 +936,6 @@ Completed box being shipped out [4]
 .......\penalty 10000
 .......\glue(\parfillskip) 0.0 plus 1.0fil
 .......\glue(\rightskip) 0.0
-......\write5{\protect \BOOKMARK [1][-]{section.1}{\376\377\0001\000\040\000I\000n\000d\000e\000x}{}% 1}
-......\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}Index}{\thepage }{section.1}\protected at file@percent }}
 ......\penalty 10000
 ......\glue 9.90276 plus 0.86108
 ......\mark{{Index}{Index}}
@@ -1168,7 +1171,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.Symbols.2}{\376\377\000S\000y\000m\000b\000o\000l\000s}{section.1}% 2}
+..........\write5{\protect \BOOKMARK [2][-]{HD.Symbols.2}{\376\377\000S\000y\000m\000b\000o\000l\000s}{index1.1}% 2}
 ..........\special{pdf:dest (HD.Symbols.2) [@thispage /XYZ @xpos @ypos null]}
 ..........\penalty 10000
 ..........\kern 2.84526
@@ -1284,7 +1287,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.D.2}{\376\377\000D}{section.1}% 3}
+..........\write5{\protect \BOOKMARK [2][-]{HD.D.2}{\376\377\000D}{index1.1}% 3}
 ..........\special{pdf:dest (HD.D.2) [@thispage /XYZ @xpos @ypos null]}
 ..........\penalty 10000
 ..........\kern 2.84526
@@ -1340,7 +1343,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.E.2}{\376\377\000E}{section.1}% 4}
+..........\write5{\protect \BOOKMARK [2][-]{HD.E.2}{\376\377\000E}{index1.1}% 4}
 ..........\special{pdf:dest (HD.E.2) [@thispage /XYZ @xpos @ypos null]}
 ..........\penalty 10000
 ..........\kern 2.84526
@@ -1446,7 +1449,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.F.2}{\376\377\000F}{section.1}% 5}
+..........\write5{\protect \BOOKMARK [2][-]{HD.F.2}{\376\377\000F}{index1.1}% 5}
 ..........\special{pdf:dest (HD.F.2) [@thispage /XYZ @xpos @ypos null]}
 ..........\penalty 10000
 ..........\kern 2.84526
@@ -1522,7 +1525,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.H.2}{\376\377\000H}{section.1}% 6}
+..........\write5{\protect \BOOKMARK [2][-]{HD.H.2}{\376\377\000H}{index1.1}% 6}
 ..........\special{pdf:dest (HD.H.2) [@thispage /XYZ @xpos @ypos null]}
 ..........\penalty 10000
 ..........\kern 2.84526
@@ -1580,7 +1583,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.L.2}{\376\377\000L}{section.1}% 7}
+..........\write5{\protect \BOOKMARK [2][-]{HD.L.2}{\376\377\000L}{index1.1}% 7}
 ..........\special{pdf:dest (HD.L.2) [@thispage /XYZ @xpos @ypos null]}
 ..........\penalty 10000
 ..........\kern 2.84526
@@ -1676,7 +1679,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.M.2}{\376\377\000M}{section.1}% 8}
+..........\write5{\protect \BOOKMARK [2][-]{HD.M.2}{\376\377\000M}{index1.1}% 8}
 ..........\special{pdf:dest (HD.M.2) [@thispage /XYZ @xpos @ypos null]}
 ..........\penalty 10000
 ..........\kern 2.84526
@@ -1871,7 +1874,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.N.2}{\376\377\000N}{section.1}% 9}
+..........\write5{\protect \BOOKMARK [2][-]{HD.N.2}{\376\377\000N}{index1.1}% 9}
 ..........\special{pdf:dest (HD.N.2) [@thispage /XYZ @xpos @ypos null]}
 ..........\penalty 10000
 ..........\kern 2.84526
@@ -1938,7 +1941,7 @@ Completed box being shipped out [4]
 ........\hbox(0.0+0.0)x0.0
 .........\hbox(0.0+0.0)x0.0, shifted -11.0
 ..........\kern -2.84526
-..........\write5{\protect \BOOKMARK [2][-]{HD.R.2}{\376\377\000R}{section.1}% 10}
+..........\write5{\protect \BOOKMARK [2][-]{HD.R.2}{\376\377\000R}{index1.1}% 10}
 ..........\special{pdf:dest (HD.R.2) [@thispage /XYZ @xpos @ypos null]}
 ..........\penalty 10000
 ..........\kern 2.84526
@@ -2044,19 +2047,24 @@ Completed box being shipped out [5]
 ....\vbox(17.77213+0.0)x345.0
 .....\special{color push  Black}
 .....\vbox(17.77213+0.0)x345.0
-......\penalty -300
-......\glue 15.0694 plus 4.30554 minus 0.86108
-......\special{pdf:dest (section.2) [@thispage /XYZ @xpos @ypos null]}
+......\write5{\protect \BOOKMARK [1][-]{glossary2.1}{\376\377\000C\000h\000a\000n\000g\000e\000\040\000H\000i\000s\000t\000o\000r\000y}{}% 11}
+......\special{pdf:dest (glossary2.1) [@thispage /XYZ @xpos @ypos null]}
 ......\penalty 10000
-......\glue -15.0694 plus -4.30554 minus -0.86108
+......\penalty -300
 ......\glue 15.0694 plus 4.30554 minus 0.86108
 ......\glue(\parskip) 0.0
 ......\glue(\parskip) 0.0
-......\hbox(9.99998+2.79999)x345.0, glue set 209.11014fil
-.......\hbox(9.27998+0.0)x24.29997
+......\hbox(9.99998+2.79999)x345.0, glue set 233.41011fil
+.......\hbox(0.0+0.0)x0.0
 ........\glue 0.0
-........\OT1/cmr/bx/n/14.4 2
-........\glue 16.19998
+.......\hbox(0.0+0.0)x0.0
+........\kern 0.0
+........\penalty 10000
+........\hbox(0.0+0.0)x0.0
+.........\hbox(0.0+0.0)x0.0, shifted -18.0
+..........\special{pdf:dest (section*.2) [@thispage /XYZ @xpos @ypos null]}
+..........\penalty 10000
+........\glue 0.0 plus 1.0fil minus 1.0fil
 .......\OT1/cmr/bx/n/14.4 C
 .......\OT1/cmr/bx/n/14.4 h
 .......\OT1/cmr/bx/n/14.4 a
@@ -2074,8 +2082,6 @@ Completed box being shipped out [5]
 .......\penalty 10000
 .......\glue(\parfillskip) 0.0 plus 1.0fil
 .......\glue(\rightskip) 0.0
-......\write5{\protect \BOOKMARK [1][-]{section.2}{\376\377\0002\000\040\000C\000h\000a\000n\000g\000e\000\040\000H\000i\000s\000t\000o\000r\000y}{}% 11}
-......\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}{Change History}}{\thepage }{section.2}\protected at file@percent }}
 ......\penalty 10000
 ......\glue 9.90276 plus 0.86108
 ......\mark{{{Change History}}{{Change History}}}
@@ -2409,6 +2415,6 @@ Completed box being shipped out [5]
 ....\special{color pop}
 ) (tlb-dox004.aux)
 Package rerunfilecheck Info: File `tlb-dox004.out' has not changed.
-(rerunfilecheck)             Checksum: 5A5BAB6336BD5D5F88050019C1564F8B;734.
+(rerunfilecheck)             Checksum: 349BDA914F2BE01D49890BA22F447C6E;700.
 Package rerunfilecheck Info: File `tlb-dox004.hd' has not changed.
 (rerunfilecheck)             Checksum: 3638BFF492BA6EF3464E9B7B191EB03B;15.





More information about the latex3-commits mailing list.