On Sun, Dec 04, 2022 at 12:15:32PM +0000, Gavin Smith wrote:
> I am going to try to make a couple of changes to texinfo.tex and will
> post back.
I have committed the change at the end of this message.
It turns off hyphenation but allows breaking at spaces. It no longer
obeys line endings.
I checked the output for LaTeX (with texi2any --latex):
First, the output was wrong:
Test Test Test Test Test @verb{@foo@bar bar bar `doodle' doo tiddle di tiddle
toggle di toggle dum
di dum @} Test
This became
Test Test Test Test Test \verb@foo@bar bar bar `doodle' doo tiddle di tiddle
toggle di toggle dum
di dum @ Test
and the first @ terminated the \verb, making the arguement "foo" only.
When I used a different delimiter
Test Test Test Test Test \verb!foo@bar bar bar `doodle' doo tiddle di tiddle
toggle di toggle dum
di dum ! Test
there is an error message:
! LaTeX Error: \verb ended by end of line.
See the LaTeX manual or LaTeX Companion for explanation.
Type H <return> for immediate help.
...
l.44 ... doo tiddle di tiddle toggle di toggle dum
Apparently line breaks inside LaTeX \verb are forbidden completely. When
you place everything on one line:
Test Test Test Test Test \verb!foo@bar bar bar `doodle' doo tiddle di tiddle
toggle di toggle dum di dum ! Test
the output extends into the margin, not being wrapped.
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index ff3cd71487..5a2b87b0d0 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-03.17}
+\def\texinfoversion{2022-12-04.12}
%
% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
%
@@ -7424,15 +7424,13 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\endgroup
%
\def\setupverb{%
- \tt % easiest (and conventionally used) font for verbatim
+ \tt
\def\par{\leavevmode\endgraf}%
\setcodequotes
\tabeightspaces
- % Respect line breaks,
- % print special symbols as themselves, and
- % make each space count
- % must do in this order:
- \obeylines \uncatcodespecials \sepspaces
+ \nohyphenation
+ % print special symbols as themselves, and make each space count
+ \uncatcodespecials \obeyspaces
}
% Setup for the @verbatim environment
