branch master updated: Title for cartouche

[Gavin D. Smith]

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 603edc6e96 Title for cartouche
603edc6e96 is described below

commit 603edc6e9624e89540399834291f46a9cb9f82f5
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Fri Dec 23 23:48:02 2022 +0000

    Title for cartouche
    
    * doc/texinfo.tex (\cartouche): Define with \envparseargdef so
    to take an argument.  If argument is given, use it as a title for
    the box.
    (\envparseargdef): Define with \long.
    
    Feature request from Arnold Robbins.
---
 ChangeLog       | 11 +++++++++++
 doc/texinfo.tex | 30 ++++++++++++++++--------------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fede481d70..2fbbbe4001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-12-23  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Title for cartouche
+
+       * doc/texinfo.tex (\cartouche): Define with \envparseargdef so
+       to take an argument.  If argument is given, use it as a title for
+       the box.
+       (\envparseargdef): Define with \long.
+
+       Feature request from Arnold Robbins.
+
 2022-12-23  Patrice Dumas  <pertusus@free.fr>
 
        * .gitattributes: set tp/t/results/*/*.pl file always diff-able.
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 3e0f1c53b0..73987116db 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-12-19.22}
+\def\texinfoversion{2022-12-23.23}
 %
 % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
 %
@@ -530,7 +530,7 @@
 
 % ... but they get defined via ``\envdef\foo{...}'':
 \long\def\envdef#1#2{\def#1{\startenvironment#1#2}}
-\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
+\long\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
 
 % Check whether we're in the right environment:
 \def\checkenv#1{%
@@ -7135,8 +7135,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
 \newdimen\cartouter\newdimen\cartinner
 \newskip\normbskip\newskip\normpskip\newskip\normlskip
 
-
-\envdef\cartouche{%
+\envparseargdef\cartouche{%
   \cartouchefontdefs
   \ifhmode\par\fi  % can't be in the midst of a paragraph.
   \startsavinginserts
@@ -7166,16 +7165,19 @@ might help (with 'rm \jobname.?? \jobname.??s')%
       \baselineskip=0pt\parskip=0pt\lineskip=0pt
       \carttop
       \hbox\bgroup
-         \hskip\lskip
-         \vrule\kern3pt
-         \vbox\bgroup
-             \kern3pt
-             \hsize=\cartinner
-             \baselineskip=\normbskip
-             \lineskip=\normlskip
-             \parskip=\normpskip
-             \vskip -\parskip
-             \comment % For explanation, see the end of def\group.
+          \hskip\lskip
+          \vrule\kern3pt
+          \vbox\bgroup
+              \hsize=\cartinner
+              \baselineskip=\normbskip
+              \lineskip=\normlskip
+              \parskip=\normpskip
+              \def\arg{#1}%
+              \ifx\arg\empty\else
+                \centerV{\hfil \bf #1 \hfil}%
+              \fi
+              \kern3pt
+              \vskip -\parskip
 }
 \def\Ecartouche{%
               \ifhmode\par\fi