From 72f263dca3e2f3e22b2859443d2d65824e9f4a51 Mon Sep 17 00:00:00 2001 From: muzimuzhi Date: Sun, 3 Jul 2022 07:52:06 +0800 Subject: [PATCH 1/2] docs: ensure `doc` v2 is loaded Signed-off-by: muzimuzhi --- doc/generic/pgf/CHANGELOG.md | 1 + doc/generic/pgf/pgfmanual-test.tex | 2 +- doc/generic/pgf/pgfmanual.tex | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/generic/pgf/CHANGELOG.md b/doc/generic/pgf/CHANGELOG.md index 0aef99f64..43162ce45 100644 --- a/doc/generic/pgf/CHANGELOG.md +++ b/doc/generic/pgf/CHANGELOG.md @@ -93,6 +93,7 @@ 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 ### Contributors diff --git a/doc/generic/pgf/pgfmanual-test.tex b/doc/generic/pgf/pgfmanual-test.tex index d11d7a164..ca7224e1e 100644 --- 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 index 12ebb6b37..3ca876c72 100644 --- 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 From 376ad0fa691d74bfb42baa356d681e8312dd04eb Mon Sep 17 00:00:00 2001 From: muzimuzhi Date: Mon, 4 Jul 2022 10:17:17 +0800 Subject: [PATCH 2/2] docs: ensure active `^^M` is non-expandable Signed-off-by: muzimuzhi --- doc/generic/pgf/CHANGELOG.md | 1 + tex/latex/pgf/doc/pgfmanual-en-macros.tex | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/doc/generic/pgf/CHANGELOG.md b/doc/generic/pgf/CHANGELOG.md index 43162ce45..8e4fa23e4 100644 --- a/doc/generic/pgf/CHANGELOG.md +++ b/doc/generic/pgf/CHANGELOG.md @@ -94,6 +94,7 @@ lot of contributed changes. Thanks to everyone who volunteered their time! - 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/tex/latex/pgf/doc/pgfmanual-en-macros.tex b/tex/latex/pgf/doc/pgfmanual-en-macros.tex index 53cc74e0d..68ecfffc4 100644 --- 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%