[latex3-commits] [latex3/hyperref] develop: add missing nopatch commands to nameref, issue #302 (90b879b)
github at latex-project.org
github at latex-project.org
Thu Oct 5 19:38:47 CEST 2023
Repository : https://github.com/latex3/hyperref
On branch : develop
Link : https://github.com/latex3/hyperref/commit/90b879b32b73daa75940205e0bfcc266840b1ebc
>---------------------------------------------------------------
commit 90b879b32b73daa75940205e0bfcc266840b1ebc
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Thu Oct 5 19:38:47 2023 +0200
add missing nopatch commands to nameref, issue #302
>---------------------------------------------------------------
90b879b32b73daa75940205e0bfcc266840b1ebc
nameref.dtx | 19 +++++++++++--------
testfiles/121-makeuppercase.tlg | 12 ++++++------
testfiles/nameref-nopatch.tlg | 2 +-
testfiles/test1.luatex.tlg | 2 +-
testfiles/testnb.luatex.tlg | 20 ++++++++++----------
5 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/nameref.dtx b/nameref.dtx
index c11127a..025edc5 100644
--- a/nameref.dtx
+++ b/nameref.dtx
@@ -648,13 +648,16 @@
% \subsubsection{Theorems}
%
% \begin{macrocode}
-\ltx at IfUndefined{@opargbegintheorem}{}{%
- \let\NRorg at opargbegintheorem\@opargbegintheorem
- \def\@opargbegintheorem#1#2#3{%
- \NR at gettitle{#3}%
- \NRorg at opargbegintheorem{#1}{#2}{#3}%
- }%
-}
+\@ifundefined{NR at nopatch@theorem}{%
+ \ltx at IfUndefined{@opargbegintheorem}{}{%
+ \let\NRorg at opargbegintheorem\@opargbegintheorem
+ \def\@opargbegintheorem#1#2#3{%
+ \NR at gettitle{#3}%
+ \NRorg at opargbegintheorem{#1}{#2}{#3}%
+ }%
+ }
+}{}
+\@ifundefined{NR at nopatch@amsthm}{%
\AtBeginDocument{%
\@ifpackageloaded{amsthm}{%
\let\NRorg at begintheorem\@begintheorem
@@ -672,7 +675,7 @@
}%
\fi
}{}%
-}
+}}{}
% \end{macrocode}
%
% \subsection{Referencing stuff}
diff --git a/testfiles/121-makeuppercase.tlg b/testfiles/121-makeuppercase.tlg
index 1a55689..871965e 100644
--- a/testfiles/121-makeuppercase.tlg
+++ b/testfiles/121-makeuppercase.tlg
@@ -104,10 +104,10 @@ Completed box being shipped out [1]
.....\penalty 10000
.....\glue(\parfillskip) 0.0 plus 1.0fil
.....\glue(\rightskip) 0.0
-....\marks1{\MakeUppercase []{Contents}}
-....\marks2{\MakeUppercase []{Contents}}
-....\marks3{\MakeUppercase []{Contents}}
-....\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}}
+....\marks1{\MakeTextUppercase []{Contents}}
+....\marks2{\MakeTextUppercase []{Contents}}
+....\marks3{\MakeTextUppercase []{Contents}}
+....\mark{{\MakeTextUppercase []{Contents}}{\MakeTextUppercase []{Contents}}}
....\penalty 10000
....\glue 40.0
....\glue 10.00002 plus 1.0
@@ -343,9 +343,9 @@ Completed box being shipped out [1]
.....\glue 0.0 plus 1.0fil minus 1.0fil
....\write-{}
....\pdfdest name{chapter.1} xyz
-....\marks1{\MakeUppercase []{Chapter\ 1. \ A chapter}}
+....\marks1{\MakeTextUppercase []{Chapter\ 1. \ A chapter}}
....\marks2{\prg_do_nothing: }
-....\mark{{\MakeUppercase []{Chapter\ 1. \ A chapter}}{}}
+....\mark{{\MakeTextUppercase []{Chapter\ 1. \ A chapter}}{}}
....\write1{\@writefile{lof}{\protect \addvspace {10pt}}}
....\write1{\@writefile{lot}{\protect \addvspace {10pt}}}
....\glue(\topskip) 10.0
diff --git a/testfiles/nameref-nopatch.tlg b/testfiles/nameref-nopatch.tlg
index bc0a4ca..a67f269 100644
--- a/testfiles/nameref-nopatch.tlg
+++ b/testfiles/nameref-nopatch.tlg
@@ -4,7 +4,7 @@ Don't change this file in any respect.
#1#2#3#4#5->\@tempskipa #3\relax \ifdim \@tempskipa >\z@ \begingroup #4{\@hangfrom {\hskip #1}\interlinepenalty \@M #5\@@par }\endgroup \else \def \@svsechd {#4{\hskip #1\relax #5}}\fi \@xsect {#3}.
l. ...\show\@ssect
> \@opargbegintheorem=macro:
-#1#2#3->\NR at gettitle {#3}\NRorg at opargbegintheorem {#1}{#2}{#3}.
+#1#2#3->\trivlist \item [\hskip \labelsep {\bfseries #1\ #2\ (#3)}]\itshape .
l. ...\show\@opargbegintheorem
> \@chapter=undefined.
l. ...\show\@chapter
diff --git a/testfiles/test1.luatex.tlg b/testfiles/test1.luatex.tlg
index 8c62126..dc39703 100644
--- a/testfiles/test1.luatex.tlg
+++ b/testfiles/test1.luatex.tlg
@@ -1292,7 +1292,7 @@ Underfull \vbox (badness 10000) has occurred while \output is active
.\penalty 10150
.\glue(\baselineskip) 2.65001
.\hbox(8.2125+2.7375)x360.0, glue set 59.55385fil, direction TLT
-..\TU/lmr/m/n/10.95 – (ligature --)
+..\TU/lmr/m/n/10.95 –
..\glue(\spaceskip) 3.64635 plus 1.82318 minus 1.21545
..\TU/lmr/m/n/10.95 2
..\hbox(0.0+0.0)x0.0, direction TLT
diff --git a/testfiles/testnb.luatex.tlg b/testfiles/testnb.luatex.tlg
index 82af283..99314c9 100644
--- a/testfiles/testnb.luatex.tlg
+++ b/testfiles/testnb.luatex.tlg
@@ -68,8 +68,8 @@ Completed box being shipped out [1]
.....\TU/lmr/m/n/10 r
.....\TU/lmr/m/n/10 y
.....\discretionary (penalty 50)
-......< \TU/lmr/m/n/10 — (ligature ---)
-......= \TU/lmr/m/n/10 — (ligature ---)
+......< \TU/lmr/m/n/10 —
+......= \TU/lmr/m/n/10 —
.....\TU/lmr/m/n/10 t
.....\TU/lmr/m/n/10 h
.....\TU/lmr/m/n/10 a
@@ -126,7 +126,7 @@ Completed box being shipped out [1]
.....\TU/lmr/m/n/10 a
.....\TU/lmr/m/n/10 n
.....\TU/lmr/m/n/10 n
-.....\TU/lmr/m/n/10 — (ligature ---)
+.....\TU/lmr/m/n/10 —
.....\discretionary (penalty 50)
.....\glue(\rightskip) 0.0
....\penalty 250
@@ -256,7 +256,7 @@ Completed box being shipped out [1]
......\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[.5 .5 0]} action goto name{cite.luhm:DoS}
......\TU/lmr/m/n/10 1
......\pdfendlink
-.....\TU/lmr/m/n/10 – (ligature --)
+.....\TU/lmr/m/n/10 –
.....\penalty 1000
.....\hbox(6.66+0.22)x5.0, direction TLT
......\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[.5 .5 0]} action goto name{cite.luhm:WrtdG}
@@ -367,7 +367,7 @@ Completed box being shipped out [1]
......< \TU/lmr/m/n/10 f
......< \TU/lmr/m/n/10 -
......> \TU/lmr/m/n/10 f
-......= \TU/lmr/m/n/10 ff (ligature ff)
+......= \TU/lmr/m/n/10 ff
.....\TU/lmr/m/n/10 e
.....\discretionary (penalty 50)
......< \TU/lmr/m/n/10 -
@@ -409,7 +409,7 @@ Completed box being shipped out [1]
......< \TU/lmr/m/n/10 f
......< \TU/lmr/m/n/10 -
......> \TU/lmr/m/n/10 l
-......= \TU/lmr/m/n/10 fl (ligature fl)
+......= \TU/lmr/m/n/10 fl
.....\TU/lmr/m/n/10 y
.....\glue(\spaceskip) 3.33 plus 1.665 minus 1.11
.....\TU/lmr/m/n/10 p
@@ -566,7 +566,7 @@ Completed box being shipped out [1]
......< \TU/lmr/m/it/10 f
......< \TU/lmr/m/it/10 -
......> \TU/lmr/m/it/10 f
-......= \TU/lmr/m/it/10 ff (ligature ff)
+......= \TU/lmr/m/it/10 ff
.....\TU/lmr/m/it/10 e
.....\discretionary (penalty 50)
......< \TU/lmr/m/it/10 -
@@ -750,7 +750,7 @@ Completed box being shipped out [1]
......< \TU/lmr/m/n/10 f
......< \TU/lmr/m/n/10 -
......> \TU/lmr/m/n/10 f
-......= \TU/lmr/m/n/10 ff (ligature ff)
+......= \TU/lmr/m/n/10 ff
.....\TU/lmr/m/n/10 e
.....\discretionary (penalty 50)
......< \TU/lmr/m/n/10 -
@@ -836,7 +836,7 @@ Completed box being shipped out [1]
......< \TU/lmr/m/n/10 f
......< \TU/lmr/m/n/10 -
......> \TU/lmr/m/n/10 f
-......= \TU/lmr/m/n/10 ff (ligature ff)
+......= \TU/lmr/m/n/10 ff
.....\TU/lmr/m/n/10 r
.....\TU/lmr/m/n/10 e
.....\TU/lmr/m/n/10 y
@@ -975,7 +975,7 @@ Completed box being shipped out [1]
.....\TU/lmr/m/n/10 1
.....\TU/lmr/m/n/10 1
.....\TU/lmr/m/n/10 2
-.....\TU/lmr/m/n/10 – (ligature --)
+.....\TU/lmr/m/n/10 –
.....\TU/lmr/m/n/10 3
.....\TU/lmr/m/n/10 1
.....\TU/lmr/m/n/10 .
More information about the latex3-commits
mailing list.