[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: texinfo.tex scanning contexts
From: |
Gavin D. Smith |
Subject: |
branch master updated: texinfo.tex scanning contexts |
Date: |
Mon, 25 Jul 2022 16:50:24 -0400 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new e1c2bad176 texinfo.tex scanning contexts
e1c2bad176 is described below
commit e1c2bad17672f7efdf3b357c19a422f50d1a2341
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Jul 25 21:50:14 2022 +0100
texinfo.tex scanning contexts
* doc/texinfo.tex (\scanctxt, \scanargctxt, \macrobodyctxt)
(\macroargctxt, \macrolineargctxt): Simplify slightly by
setting active newline in \scanctxt and "other" catcode for @,
as \scanctxt is used by the other macros that need these changes.
* doc/texinfo-tex-test.texi (Special characters in macro argument):
New example, as this change may have affected braceless macro
invocations.
---
ChangeLog | 15 ++++++++++++++-
doc/texinfo-tex-test.texi | 10 ++++++++++
doc/texinfo.tex | 11 +++--------
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index df74868b83..c213afc9c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2022-07-25 Gavin Smith <gavinsmith0123@gmail.com>
+
+ texinfo.tex scanning contexts
+
+ * doc/texinfo.tex (\scanctxt, \scanargctxt, \macrobodyctxt)
+ (\macroargctxt, \macrolineargctxt): Simplify slightly by
+ setting active newline in \scanctxt and "other" catcode for @,
+ as \scanctxt is used by the other macros that need these changes.
+
+ * doc/texinfo-tex-test.texi (Special characters in macro argument):
+ New example, as this change may have affected braceless macro
+ invocations.
+
2022-07-25 Patrice Dumas <pertusus@free.fr>
LaTeX @def* argument and category formated more like in TeX
@@ -85,7 +98,7 @@
2022-07-24 Gavin Smith <gavinsmith0123@gmail.com>
- @def* in LaTex
+ @def* in LaTeX
* tp/Texinfo/Convert/LaTex.pm (_convert) <def_line>:
Float category to end of line and typeset in typewriter font, as
diff --git a/doc/texinfo-tex-test.texi b/doc/texinfo-tex-test.texi
index 27ef16f744..bd7fa09d2c 100644
--- a/doc/texinfo-tex-test.texi
+++ b/doc/texinfo-tex-test.texi
@@ -279,6 +279,16 @@ other spaces:@*
@Mactwo{h \\, i \\}@*
@Mactwo{h a, i b}@*
+
+@section Special characters in macro argument
+
+Braceless single line macro invocation with special characters. Compare:
+
+@Mac "+<>^+|~@@@{@}
+
+A"+<>^+|~@@@{@}A
+
+
@section Spaces in macro bodies
Distance between the two x's should be the same
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 7f317d65e5..7bb4ecc4f5 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2022-07-25.13}
+\def\texinfoversion{2022-07-25.20}
%
% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
%
@@ -8063,23 +8063,21 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\catcode`\_=\other
\catcode`\|=\other
\catcode`\~=\other
+ \catcode`\@=\other
+ \catcode`\^^M=\other
\passthroughcharstrue
}
\def\scanargctxt{% used for copying and captions, not macros.
\scanctxt
- \catcode`\@=\other
\catcode`\\=\other
- \catcode`\^^M=\other
}
\def\macrobodyctxt{% used for @macro definitions
\scanctxt
\catcode`\ =\other
- \catcode`\@=\other
\catcode`\{=\other
\catcode`\}=\other
- \catcode`\^^M=\other
\usembodybackslash
}
@@ -8089,14 +8087,11 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\def\macroargctxt{%
\scanctxt
\catcode`\ =\active
- \catcode`\@=\other
- \catcode`\^^M=\other
\catcode`\\=\active
}
\def\macrolineargctxt{% used for whole-line arguments without braces
\scanctxt
- \catcode`\@=\other
\catcode`\{=\other
\catcode`\}=\other
}
- branch master updated: texinfo.tex scanning contexts,
Gavin D. Smith <=