From 71147fa86bd892e6a89bf394448ad5aada518bdb Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 2 Nov 2023 19:56:02 +0000
Subject: latex-dev (2nov23)

git-svn-id: svn://tug.org/texlive/trunk@68730 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex-dev/base/latex.ltx | 71 ++++++++++++++++++--------
 1 file changed, 51 insertions(+), 20 deletions(-)

(limited to 'Master/texmf-dist/tex/latex-dev/base/latex.ltx')

diff --git a/Master/texmf-dist/tex/latex-dev/base/latex.ltx b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
index 54b3e969575..fe599414688 100644
--- a/Master/texmf-dist/tex/latex-dev/base/latex.ltx
+++ b/Master/texmf-dist/tex/latex-dev/base/latex.ltx
@@ -707,8 +707,8 @@
 %%% From File: ltvers.dtx
 \def\fmtname{LaTeX2e}
 \edef\fmtversion
-   {2023-11-01}
-\def\patch@level{-1}
+   {2024-06-01}
+\def\patch@level{0}
 \edef\development@branch@name{develop \the\year-\the\month-\the\day}
 \iffalse
 \def\reserved@a#1/#2/#3\@nil{%
@@ -1179,6 +1179,7 @@
 \msg_new:nnn { kernel } { unknown-arg-expansion }
   { Unknown~arg~expansion~"#1" }
 \ExplSyntaxOff
+\def\IfExplAtLeastTF{\@ifl@t@r\ExplLoaderFileDate}
 %%% From File: ltdefns.dtx
 \def\two@digits#1{\ifnum#1<10 0\fi\number#1}
 \protected\long\def\typeout#1{\begingroup
@@ -4539,7 +4540,7 @@
 
 %%% From File: lthooks.dtx
 \def\lthooksversion{v1.1f}
-\def\lthooksdate{2023/08/11}
+\def\lthooksdate{2023/10/02}
 \ExplSyntaxOn
 \bool_new:N \g__hook_debug_bool
 \cs_new_eq:NN \__hook_debug:n \use_none:n
@@ -7611,7 +7612,12 @@ Type  H <return>  for immediate help.}%
 \DeclareRobustCommand{\nobreakspace}{%
    \leavevmode\nobreak\ }
 \catcode `\~=13
-\def~{\nobreakspace{}}
+\protected\edef~{%
+  \noexpand\ifincsname\noexpand\expandafter\string~%
+  \noexpand\else
+    \noexpand\expandafter\noexpand\nobreakspace
+  \noexpand\fi
+}
 \expandafter\let\expandafter\@xobeysp\csname nobreakspace \endcsname
 \let\@xobeytab\@xobeysp
 \def\@{\spacefactor\@m{}}%
@@ -11944,8 +11950,8 @@ Type  H <return>  for immediate help.}%
    {\IfBooleanTF{#1}{\@kernel@sRef}{\@kernel@Ref}}
 \def\@currentlabel{}
 %% File: ltproperties.dtx
-\def\ltpropertiesversion{1.0b}
-\def\ltpropertiesdate{2023-09-13}
+\def\ltpropertiesversion{1.0c}
+\def\ltpropertiesdate{2023-10-15}
 
 
 
@@ -11963,7 +11969,7 @@ Type  H <return>  for immediate help.}%
   }
 \cs_new_protected:Npn \property_gset:nnnn #1#2#3#4
   {
-    \__property_gset:xnnn { \tl_to_str:n {#1} }
+    \__property_gset:ennn { \tl_to_str:n {#1} }
       {#2} {#3} {#4}
   }
 \cs_new_protected:Npn \__property_gset:nnnn #1#2#3#4
@@ -11981,20 +11987,22 @@ Type  H <return>  for immediate help.}%
       }
       { \msg_error:nnnn { property } { unknown-setpoint } {#1} {#2} }
   }
-\cs_generate_variant:Nn \__property_gset:nnnn {xnnn}
+\cs_generate_variant:Nn \__property_gset:nnnn {ennn}
 \cs_new_protected:Npn \NewProperty #1#2#3#4
   {
-    \exp_args:Nx \property_new:nnnn {#1}{#2}{#3}{#4}
+    \protected@edef\reserved@a{#1}
+    \exp_args:No \property_new:nnnn {\reserved@a} {#2}{#3}{#4}
   }
 \cs_new_protected:Npn \SetProperty #1#2#3#4
   {
-    \exp_args:Nx \property_gset:nnnn {#1}{#2}{#3}{#4}
+    \protected@edef\reserved@a{#1}
+    \exp_args:No \property_gset:nnnn {\reserved@a} {#2}{#3}{#4}
   }
 \cs_new_protected:Npn \property_record:nN #1#2
   { \property_record:nV {#1} #2 }
 \cs_new_protected:Npn \property_record:nn #1#2
-  { \__property_record:xn { \tl_to_str:n {#1} } {#2} }
-\cs_generate_variant:Nn \property_record:nn { nV , xx }
+  { \__property_record:en { \tl_to_str:n {#1} } {#2} }
+\cs_generate_variant:Nn \property_record:nn { nV , ee, oo }
 \cs_new_protected:Npn \__property_record:nn #1#2
   {
     \legacy_if:nT { @filesw }
@@ -12007,7 +12015,7 @@ Type  H <return>  for immediate help.}%
           }
       }
   }
-\cs_generate_variant:Nn \__property_record:nn { x }
+\cs_generate_variant:Nn \__property_record:nn { e }
 \cs_new:Npn \__property_record_value:n #1
   { \__property_record_value_aux:e { \tl_to_str:n {#1} } }
 \cs_new:Npn \__property_record_value_aux:n #1
@@ -12028,7 +12036,9 @@ Type  H <return>  for immediate help.}%
 \NewDocumentCommand\RecordProperties { m m }
   {
     \@bsphack
-    \property_record:xx {#1}{#2}
+    \protected@edef\reserved@a{#1}
+    \protected@edef\reserved@b{#2}
+    \property_record:oo {\reserved@a}{\reserved@b}
     \@esphack
   }
 \flag_new:n { l__property_ref_flag }
@@ -12167,16 +12177,19 @@ Type  H <return>  for immediate help.}%
        \@latex@warning { Reference~`#1'~on~page~\thepage\space undefined }%
     }
  }
-\cs_generate_variant:Nn \property_ref_undefined_warn:nn {xx}
-\cs_set_eq:NN \RefUndefinedWarn \property_ref_undefined_warn:xx
+\cs_generate_variant:Nn \property_ref_undefined_warn:nn {ee}
+\cs_set_eq:NN \RefUndefinedWarn \property_ref_undefined_warn:ee
 \property_new:nnnn { abspage } { shipout }
   { 0 } { \int_use:N \g_shipout_readonly_int }
 \property_new:nnnn  { page } { shipout } { 0 } { \thepage }
 \property_new:nnnn  { pagenum } { shipout } { 0 } { \the \value { page } }
-\property_new:nnnn  { currentlabel } { now } { ?? } { \@currentlabel }
+\property_new:nnnn  { label } { now } { ?? } { \@currentlabel }
 \property_new:nnnn  { title } { now }
   { \exp_not:n { \textbf { ?? } } } { \@currentlabelname }
 \property_new:nnnn  { target } { now } { } { \@currentHref }
+\newcommand\@currentHpage{}
+\property_new:nnnn  { pagetarget } { shipout } { } { \@currentHpage }
+
 \property_new:nnnn  { counter } { now }  { } { \@currentcounter }
 \property_new:nnnn  { xpos } { shipout } { 0} { \int_use:N \tex_lastxpos:D }
 \property_new:nnnn  { ypos } { shipout } { 0} { \int_use:N \tex_lastypos:D }
@@ -13028,7 +13041,13 @@ Type  H <return>  for immediate help.}%
 \long\def\@imakebox[#1][#2]#3{%
   \@begin@tempboxa\hbox{#3}%
     \setlength\@tempdima{#1}%       support calc
-    \hb@xt@\@tempdima{\csname bm@#2\endcsname}%
+    \hb@xt@\@tempdima{%
+     \expandafter\ifx\csname bm@#2\endcsname\relax
+       \bm@c
+       \@latex@warning{Unexpected alignment #2}%
+     \else
+       \csname bm@#2\endcsname
+     \fi}%
   \@end@tempboxa}
 \def\@makepicbox(#1,#2){%
   \@ifnextchar[{\@imakepicbox(#1,#2)}{\@imakepicbox(#1,#2)[]}}
@@ -13119,7 +13138,14 @@ Type  H <return>  for immediate help.}%
   \@begin@tempboxa\hbox{#3}%
     \setlength\@tempdima{#1}%
     \setbox\@tempboxa\hb@xt@\@tempdima
-         {\kern\fboxsep\csname bm@#2\endcsname\kern\fboxsep}%
+         {\kern\fboxsep
+          \expandafter\ifx\csname bm@#2\endcsname\relax
+            \bm@c
+            \@latex@warning{Unexpected alignment #2}%
+          \else
+            \csname bm@#2\endcsname
+          \fi
+          \kern\fboxsep}%
     \@frameb@x{\kern-\fboxrule}%
   \@end@tempboxa}
 \def\@frameb@x#1{%
@@ -13175,7 +13201,12 @@ Type  H <return>  for immediate help.}%
     \else\@pboxswtrue $\vcenter
     \fi\fi\fi
     \@parboxto{\let\hss\vss\let\unhbox\unvbox
-       \csname bm@#3\endcsname}%
+     \expandafter\ifx\csname bm@#3\endcsname\relax
+       \bm@c
+       \@latex@warning{Unexpected alignment #3}%
+     \else
+       \csname bm@#3\endcsname
+     \fi}%
     \if@pboxsw \m@th$\fi
   \@end@tempboxa}
 \def\@arrayparboxrestore{%
-- 
cgit v1.2.3

