[latex3-commits] [git/LaTeX3-latex3-latex2e] gh981: Merge branch 'develop' into gh981 (f8f83477)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : gh981
Link       : https://github.com/latex3/latex2e/commit/f8f8347748bb4e849570e61cfc6dca18edbeb4c9

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

commit f8f8347748bb4e849570e61cfc6dca18edbeb4c9
Merge: 78547fd5 17ab93ac
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Wed Mar 29 11:09:46 2023 +0200

    Merge branch 'develop' into gh981
    
    # Conflicts:
    #       base/changes.txt


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

f8f8347748bb4e849570e61cfc6dca18edbeb4c9
 base/changes.txt                                   |  7 ++++++-
 base/doc/ltnews37.tex                              |  9 ++++++++
 base/ltfinal.dtx                                   | 21 ++++++++-----------
 base/ltxdoc.dtx                                    |  2 +-
 base/testfiles/github-1021.lvt                     | 24 ++++++++++++++++++++++
 .../github-0675.tlg => testfiles/github-1021.tlg}  |  4 +---
 6 files changed, 49 insertions(+), 18 deletions(-)

diff --cc base/changes.txt
index 5d1991a2,fd6eec48..f9ad2a92
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -6,10 -6,10 +6,15 @@@ completeness or accuracy and it contain
  are not part of the distribution.
  ================================================================================
  
 +2023-03-28  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 +
 +	* ltxdoc.dtx (section{Options}):
- 	Define \cs if doc is rolled back to v2
++	Define \cs if doc is rolled back to v2 (gh/981)
++
+ 2023-03-28  David Carlisle  <David.Carlisle at latex-project.org>
+ 
+ 	* ltfinal.dtx: Restore groups to \MakeUppercase and
+           \MakeLowercase, and add a group to \MakeTitlecase. (gh/1021)
  
  2023-03-22  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
  
diff --cc base/ltxdoc.dtx
index a050b833,a4ad8d21..e147c9d2
--- a/base/ltxdoc.dtx
+++ b/base/ltxdoc.dtx
@@@ -182,13 -182,9 +182,13 @@@
  %
  %    Support rolling back \pkg{doc} to version 2:
  % \changes{v2.1e}{2022/05/27}{Support rolling  back doc to version 2}
- % \changes{v2.1j}{2023/03/28}{Define \cs{cs} if doc is rolled back to v2}
++% \changes{v2.1j}{2023/03/28}{Define \cs{cs} if doc is rolled back to v2 (gh/981)}
  %    \begin{macrocode}
  \let\ltxdoc at doc@version\@empty  % use current version by default
 -\DeclareOption{doc2}{\def\ltxdoc at doc@version{=v2}}
 +\DeclareOption{doc2}{%
 +  \def\ltxdoc at doc@version{=v2}%
 +  \DeclareRobustCommand\cs[1]{\texttt{\bslash #1}}%
 +}
  %    \end{macrocode}
  % 
  %    \begin{macrocode}