Merge branch 'develop' into gh1459

# Conflicts: # base/changes.txt
latex3 · Nov 27, 2024 · 39ce431 · 39ce431
2 parents 18d9aab + 8915fa7
commit 39ce431
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/base/changes.txt b/base/changes.txt
@@ -6,6 +6,14 @@ to completeness or accuracy and it contains some references to files that are
 not part of the distribution.
 ================================================================================
 
+2024-11-27  Yukai Chou  <[email protected]>
+	* clsguide.tex:
+	Add opt-arg to syntax of \Make...case
+
+2024-11-27  Joseph Wright  <[email protected]>
+	* usrguide.tex:
+	Add syntax of \Make...case
+
 2024-11-26  Frank Mittelbach  <[email protected]>
 
 	* lthooks.dtx (subsection{Specifying code for next invocation}):
@@ -104,7 +112,7 @@ All changes above are only part of the development branch for the next release.
 
 	* fontdef.dtx:
 	Preload ts1cmr.fd, ts1cmss.fd, and ts1cmtt in the kernel
-	Drop unnessary \DeclareFontSubstitution declarations
+	Drop unnecessary \DeclareFontSubstitution declarations
 
 #########################
 # 2024-11-01 Release

diff --git a/base/doc/clsguide.tex b/base/doc/clsguide.tex
@@ -42,7 +42,7 @@
     \texttt{clsguide.tex} for full details.}%
 }
 
-\date{2024-11-14}
+\date{2024-11-27}
 
 \NewDocumentCommand\cs{m}{\texttt{\textbackslash\detokenize{#1}}}
 \NewDocumentCommand\marg{m}{\arg{#1}}
@@ -1147,16 +1147,16 @@ \subsection{Case changing}
 \label{sec:case}
 
 \begin{decl}
-  |\MakeUppercase| \arg{text} \\
-  |\MakeLowercase| \arg{text} \\
-  |\MakeTitlecase| \arg{text}
+  |\MakeUppercase| \oarg{keyvals} \arg{text} \\
+  |\MakeLowercase| \oarg{keyvals} \arg{text} \\
+  |\MakeTitlecase| \oarg{keyvals} \arg{text}
 \end{decl}
 
 As described in \texttt{usrguide}, case changing for text should be carried out
 using the commands |\MakeUppercase|, |\MakeLowercase| and
 |\MakeTitlecase|. If you need to change the case of programmatic material, the
 team strongly suggest using the L3 programming layer commands in the
-\texttt{str} module. If you do not wish to do this, you should use the \TeX{}
+\texttt{l3str} module. If you do not wish to do this, you should use the \TeX{}
 |\uppercase| and |\lowercase| primitives \emph{in this situation only}.
 
 \subsection{Better user-defined math display environments}

diff --git a/base/doc/usrguide.tex b/base/doc/usrguide.tex
@@ -43,7 +43,7 @@
     \texttt{usrguide.tex} for full details.}%
 }
 
-\date{2024-11-12}
+\date{2024-11-17}
 
 \NewDocumentCommand\cs{m}{\texttt{\textbackslash\detokenize{#1}}}
 \NewDocumentCommand\marg{m}{\arg{#1}}
@@ -1254,6 +1254,11 @@ \section{Expandable floating point (and other) calculations}
 
 \section{Case changing}
 
+\begin{decl}
+  |\MakeUppercase| \oarg{keyvals} \arg{text} \\
+  |\MakeLowercaes| \oarg{keyvals} \arg{text} \\
+  |\MakeTitlecase| \oarg{keyvals} \arg{text}
+\end{decl}
 \TeX{} provides two primitives \cs{uppercase} and \cs{lowercase} for changing
 the case of text. However, these have a range of limitations: they only change
 the case of explicit characters, do not account for the surrounding context, do