Hello Bob and Karl,
On Sat, Feb 11, 2006 at 06:18:36PM -0600, Karl Berry wrote:
> Here's another attempt at a patch. [...]
below is my attempt to make an alternative patch.
Bob, I'd be very glad if you could test this one too; please forgive me
if it doesn't work at all, I just did this in a hurry, without any test.
Karl, I believe this one ignores everything to the end of the line, as you
want. The trick is that when \enddoignore is expanded, ^^M is still active.
(I also moved \obeylines from \dodoignore to \doignore, but this has
nothing to do with the problem, I'm just making things cleaner; please
forgive me that I actually mix two issues here...)
Have a nice day,
Stepan Kasal
--- texinfo.tex.orig 2006-02-13 21:41:40.000000000 +0100
+++ texinfo.tex 2006-02-13 21:48:42.000000000 +0100
@@ -2957,6 +2957,7 @@
\def\doignore#1{\begingroup
% Scan in ``verbatim'' mode:
+ \obeylines
\catcode`\@ = \other
\catcode`\{ = \other
\catcode`\} = \other
@@ -2977,19 +2978,16 @@
\gdef\dodoignore#1{%
% #1 contains the command name as a string, e.g., `ifinfo'.
%
- % Define a command to find the next [EMAIL PROTECTED] #1', which must be
on a line
- % by itself. Ignore anything after the `#1'; this matters in
- % verbatim environments, where otherwise the newline after an
- % ignored conditional would result in a blank line in the output.
- [EMAIL PROTECTED] #1##2^^M{%
+ % Define a command to find the next [EMAIL PROTECTED] #1'.
+ [EMAIL PROTECTED] #1{%
[EMAIL PROTECTED]
+ %
% And this command to find another #1 command, at the beginning of a
% line. (Otherwise, we would consider a line [EMAIL PROTECTED] @ifset',
for
% example, to count as an @ifset for nesting.)
[EMAIL PROTECTED]
%
% And now expand that command.
- \obeylines %
\doignoretext ^^M%
}%
}
@@ -3019,7 +3017,12 @@
}
% Finish off ignored text.
-\def\enddoignore{\endgroup\ignorespaces}
+{ \obeylines%
+ % Ignore anything after the last [EMAIL PROTECTED] #1'; this matters in
verbatim
+ % environments, where otherwise the newline after an ignored conditional
+ % would result in a blank line in the output.
+ \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
+}
% @set VAR sets the variable VAR to an empty value.
_______________________________________________
Texinfo home page: http://www.gnu.org/software/texinfo/
[email protected]
http://lists.gnu.org/mailman/listinfo/bug-texinfo
