[latex3-commits] [latex3/latex2e] ltproperties-activechars: change property currentlabel to label (cf245760)
github at latex-project.org
github at latex-project.org
Thu Oct 12 00:58:25 CEST 2023
Repository : https://github.com/latex3/latex2e
On branch : ltproperties-activechars
Link : https://github.com/latex3/latex2e/commit/cf245760125d09498baa65158da413216041ba52
>---------------------------------------------------------------
commit cf245760125d09498baa65158da413216041ba52
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Thu Oct 12 00:58:25 2023 +0200
change property currentlabel to label
>---------------------------------------------------------------
cf245760125d09498baa65158da413216041ba52
base/ltproperties.dtx | 6 +++---
base/testfiles/properties-001.lvt | 21 ++++++++++-----------
base/testfiles/properties-001.tlg | 14 +++++++-------
base/testfiles/properties-004-predeclare.lvt | 2 +-
base/testfiles/properties-004-predeclare.tlg | 2 +-
5 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/base/ltproperties.dtx b/base/ltproperties.dtx
index a068a5c5..46bfa783 100644
--- a/base/ltproperties.dtx
+++ b/base/ltproperties.dtx
@@ -399,7 +399,7 @@
% comparisions.
% \end{variable}
%
-% \begin{variable}{currentlabel}
+% \begin{variable}{label}
% (now) The content of \cs{@currentlabel}. This is the value that
% you get also with the standard \cs{label}/\cs{ref}.
% \end{variable}
@@ -858,9 +858,9 @@
% \end{macrocode}
% \end{variable}
%
-% \begin{variable}{currentlabel}
+% \begin{variable}{label}
% \begin{macrocode}
-\property_new:nnnn { currentlabel } { now } { ?? } { \@currentlabel }
+\property_new:nnnn { label } { now } { ?? } { \@currentlabel }
% \end{macrocode}
% \end{variable}
%
diff --git a/base/testfiles/properties-001.lvt b/base/testfiles/properties-001.lvt
index 1db6c0ee..2e5ff638 100644
--- a/base/testfiles/properties-001.lvt
+++ b/base/testfiles/properties-001.lvt
@@ -8,16 +8,15 @@
\begin{document}
\START \pagenumbering{roman} \label{blub}
\section{Spacing}
-\showoutput
-aaaa \RecordProperties{test1}{page,abspage,currentlabel} aaaa
+\showoutput aaaa \RecordProperties{test1}{page,abspage,label} aaaa
\ExplSyntaxOn
-aaaa~\property_record:nn{test2}{page,abspage,currentlabel}~aaaa
+aaaa~\property_record:nn{test2}{page,abspage,label}~aaaa
\ExplSyntaxOff
\section{Expansion}
-\newcommand\mylist{page,abspage,currentlabel}
+\newcommand\mylist{page,abspage,label}
\setcounter{test}{3}
aaaa \RecordProperties{test\arabic{test}}{\mylist} aaaa
@@ -43,10 +42,10 @@ aaaa~\property_record:nV{test6}\mylist~aaaa\par
\TYPE{\RefProperty{test1}{page}}
\TYPE{abspage}
\TYPE{\RefProperty{test1}{abspage}}
- \TYPE{currentlabel}
- \TYPE{\RefProperty{test1}{currentlabel}}
+ \TYPE{label}
+ \TYPE{\RefProperty{test1}{label}}
\TYPE{unknown label}
- \TYPE{\RefProperty{unknown}{currentlabel}}
+ \TYPE{\RefProperty{unknown}{label}}
\TYPE{\RefProperty[UNKNOWN]{unknown}{page}}
}
@@ -57,11 +56,11 @@ aaaa~\property_record:nV{test6}\mylist~aaaa\par
\TYPE{\property_ref:nn {test1}{page}}
\TYPE{abspage}
\TYPE{\property_ref:nn {test1}{abspage}}
- \TYPE{currentlabel}
- \TYPE{\property_ref:nn {test1}{currentlabel}}
+ \TYPE{label}
+ \TYPE{\property_ref:nn {test1}{label}}
\TYPE{unknown~label}
- \TYPE{\property_ref:nn {unknown}{currentlabel}}
- \TYPE{\property_ref:nnn{unknown}{currentlabel}{UNKNOWN}}
+ \TYPE{\property_ref:nn {unknown}{label}}
+ \TYPE{\property_ref:nnn{unknown}{label}{UNKNOWN}}
}
\ExplSyntaxOff
diff --git a/base/testfiles/properties-001.tlg b/base/testfiles/properties-001.tlg
index e7b419a0..707c369d 100644
--- a/base/testfiles/properties-001.tlg
+++ b/base/testfiles/properties-001.tlg
@@ -19,7 +19,7 @@ page
i
abspage
1
-currentlabel
+label
1
unknown label
??
@@ -32,7 +32,7 @@ page
i
abspage
1
-currentlabel
+label
1
unknown label
??
@@ -103,7 +103,7 @@ Completed box being shipped out [1]
....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 a
....\glue 3.33333 plus 1.66666 minus 1.11111
-....\write1{\new at label@record{test1}{{page}{\__property_code_page: }{abspage}{\__property_code_abspage: }{currentlabel}{1}}}
+....\write1{\new at label@record{test1}{{page}{\__property_code_page: }{abspage}{\__property_code_abspage: }{label}{1}}}
....\penalty 10000
....\glue 0.0
....\OT1/cmr/m/n/10 a
@@ -123,7 +123,7 @@ Completed box being shipped out [1]
....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 a
....\glue 3.33333 plus 1.66666 minus 1.11111
-....\write1{\new at label@record{test2}{{page}{\__property_code_page: }{abspage}{\__property_code_abspage: }{currentlabel}{1}}}
+....\write1{\new at label@record{test2}{{page}{\__property_code_page: }{abspage}{\__property_code_abspage: }{label}{1}}}
....\glue 3.33333 plus 1.66666 minus 1.11111
....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 a
@@ -166,7 +166,7 @@ Completed box being shipped out [1]
....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 a
....\glue 3.33333 plus 1.66666 minus 1.11111
-....\write1{\new at label@record{test3}{{page}{\__property_code_page: }{abspage}{\__property_code_abspage: }{currentlabel}{2}}}
+....\write1{\new at label@record{test3}{{page}{\__property_code_page: }{abspage}{\__property_code_abspage: }{label}{2}}}
....\penalty 10000
....\glue 0.0
....\OT1/cmr/m/n/10 a
@@ -205,7 +205,7 @@ Completed box being shipped out [1]
....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 a
....\glue 3.33333 plus 1.66666 minus 1.11111
-....\write1{\new at label@record{test5}{{page}{\__property_code_page: }{abspage}{\__property_code_abspage: }{currentlabel}{2}}}
+....\write1{\new at label@record{test5}{{page}{\__property_code_page: }{abspage}{\__property_code_abspage: }{label}{2}}}
....\glue 3.33333 plus 1.66666 minus 1.11111
....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 a
@@ -224,7 +224,7 @@ Completed box being shipped out [1]
....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 a
....\glue 3.33333 plus 1.66666 minus 1.11111
-....\write1{\new at label@record{test6}{{page}{\__property_code_page: }{abspage}{\__property_code_abspage: }{currentlabel}{2}}}
+....\write1{\new at label@record{test6}{{page}{\__property_code_page: }{abspage}{\__property_code_abspage: }{label}{2}}}
....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 a
....\OT1/cmr/m/n/10 a
diff --git a/base/testfiles/properties-004-predeclare.lvt b/base/testfiles/properties-004-predeclare.lvt
index e4e9a246..77276a43 100644
--- a/base/testfiles/properties-004-predeclare.lvt
+++ b/base/testfiles/properties-004-predeclare.lvt
@@ -18,7 +18,7 @@ xxx\newpage
page,
pagenum,
abspage,
- currentlabel,
+ label,
title,
target,
counter,
diff --git a/base/testfiles/properties-004-predeclare.tlg b/base/testfiles/properties-004-predeclare.tlg
index 2c8e5d9b..2d48a1c8 100644
--- a/base/testfiles/properties-004-predeclare.tlg
+++ b/base/testfiles/properties-004-predeclare.tlg
@@ -16,7 +16,7 @@ TEST 3: Property abspage
2
============================================================
============================================================
-TEST 4: Property currentlabel
+TEST 4: Property label
============================================================
1
============================================================
More information about the latex3-commits
mailing list.