[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: merge from master (conflicts resolved) (cc4f914f)

[David Carlisle]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/cc4f914f20720f4f312ded4f182c1f8b94b955a6

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

commit cc4f914f20720f4f312ded4f182c1f8b94b955a6
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Sun Nov 10 09:47:45 2019 +0000

    merge from master (conflicts resolved)


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

cc4f914f20720f4f312ded4f182c1f8b94b955a6
 base/changes.txt  | 4 ++++
 base/ltmiscen.dtx | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 32808da5..41bcc4b0 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -18,6 +18,10 @@ are not part of the distribution.
 # 2019-10-01 PL 3 Release
 #########################
 
+2019-11-10  David Carlisle  <David.Carlisle at latex-project.org>
+
+	* ltmiscen.dtx: fix special comment catcodes (gh/202)
+
 2019-11-09  David Carlisle  <David.Carlisle at latex-project.org>
 
 	* ltfiles.dtx: More filename normalisation: expand before
diff --git a/base/ltmiscen.dtx b/base/ltmiscen.dtx
index 0a93b1a3..263ed9b9 100644
--- a/base/ltmiscen.dtx
+++ b/base/ltmiscen.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltmiscen.dtx}
-             [2019/11/02 v1.1r LaTeX Kernel (Misc. Environments)]
+             [2019/11/02 v1.1s LaTeX Kernel (Misc. Environments)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltmiscen.dtx}
@@ -381,6 +381,7 @@
 %   group the braces aren't stripped. The |\expandafter| then expands
 %   this extra token away again.
 % \changes{v1.1q}{2019/10/25}{Allow unbalanced conditionals in \texttt{\#1} (gh/202)}
+% \changes{v1.1r}{2019/08/27}{fix to special comment catcodes (gh/202)}
 %    \begin{macrocode}
     {\ifx!#2!\expandafter\dont at add@percent at to@temptokena\else
              \expandafter\do at add@percent at to@temptokena\fi{#1}}
@@ -401,8 +402,8 @@
 %    \begin{macrocode}
 \begingroup
 \catcode`\%=12
-\long\gdef\do at add@percent at to@temptokena#1{%
-  \@temptokena\expandafter{#1%^^A
+\catcode`\^^A=14
+\long\gdef\do at add@percent at to@temptokena#1{\@temptokena\expandafter{#1%^^A
 %    \end{macrocode}
 %    Can't be on the same line as the |%| --- see above.
 %    \begin{macrocode}
@@ -705,7 +706,7 @@
 % \begin{macro}{\@centercr}
 % \changes{v1.0h}{1994/05/03}{\cs{@badcrerr} replaced by \cs{@nolnerr}}
 % \changes{v1.0z}{1995/07/13}{Use \cs{nobreak}}
-% \changes{v1.1r}{2019/11/02}{Make \cs{@centercr} robust (gh/203)}
+% \changes{v1.1s}{2019/11/02}{Make \cs{@centercr} robust (gh/203)}
 %    \begin{macrocode}
 %</2ekernel>
 %<*2ekernel|latexrelease>