Merge pull request #1172 from muzimuzhi/doc-v2

docs: ensure `doc` v2 is loaded docs: ensure active `^^M` is non-expandable
pgf-tikz · Jul 21, 2022 · 7b7209c · 7b7209c
2 parents 28917fd + 376ad0f
commit 7b7209c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/doc/generic/pgf/CHANGELOG.md b/doc/generic/pgf/CHANGELOG.md
@@ -93,6 +93,8 @@ lot of contributed changes. Thanks to everyone who volunteered their time!
 - Flatten the doc tree
 - Ensure `\tracinglostchars<3` in `\pgf@picture`
 - Use descriptive workflow job ids
+- Ensure `doc` v2 is loaded for pgfmanual
+- Ensure active `^^M` is non-expandable in `codeexample`
 
 ### Contributors
 

diff --git a/doc/generic/pgf/pgfmanual-test.tex b/doc/generic/pgf/pgfmanual-test.tex
@@ -7,7 +7,7 @@
 %
 % See the file doc/generic/pgf/licenses/LICENSE for more details.
 
-\documentclass[a4paper]{ltxdoc}
+\documentclass[a4paper,doc2]{ltxdoc}
 
 % pgf version is defined in \pgfversion in file
 % generic/pgf/utilities/pgfrcs.code.tex 

diff --git a/doc/generic/pgf/pgfmanual.tex b/doc/generic/pgf/pgfmanual.tex
@@ -7,7 +7,7 @@
 %
 % See the file doc/generic/pgf/licenses/LICENSE for more details.
 
-\documentclass[a4paper]{ltxdoc}
+\documentclass[a4paper,doc2]{ltxdoc}
 
 % pgf version is defined in \pgfversion in file
 % generic/pgf/utilities/pgfrcs.code.tex

diff --git a/tex/latex/pgf/doc/pgfmanual-en-macros.tex b/tex/latex/pgf/doc/pgfmanual-en-macros.tex
@@ -1711,6 +1711,9 @@
       {%
         \returntospace%
         \commenthandler%
+        % ensures the active ^^M is protected thus won't be expanded in the
+        % following \xdef\code@temp{#1}
+        \obeylines%
         \xdef\code@temp{#1}% removes returns and comments
       }%
       \edef\pgfmanualmcatcode{\the\catcode`\^^M}%
@@ -1727,6 +1730,9 @@
           {%
             \returntospace%
             \commenthandler%
+            % ensures the active ^^M is protected thus won't be expanded in the
+            % following \xdef\code@temp{#1}
+            \obeylines%
             \xdef\code@temp{#1}% removes returns and comments
           }%
           \catcode`\^^M=9%