Below is a fix for the line offset problem in error messages.
Additionally, it fixes a problem with macros enclosed in @ifnotinfo
environments: If a script contained different macro definitions in
@ifinfo and @ifnotinfo, both were removed.  I haven't extensively
tested whether this additional fix (the last three lines in the diff)
always works.


    Werner


PS: Has makeinfo fixed meanwhile to avoid this clumsy script, using
    the --no-ifinfo option and its friends?

======================================================================
--- /usr/bin/texi2dvi   Tue May  9 01:00:47 2000
+++ texi2dvi    Wed Mar 21 08:42:37 2001
@@ -205,13 +205,23 @@
     s/^@c texi2dvi//
   }
 }
-/^@html/,/^@end html/d
-/^@ifhtml/,/^@end ifhtml/d
-/^@ifnottex/,/^@end ifnottex/d
+/^@html/,/^@end html/{
+  s/^/@c (texi2dvi)/
+}
+/^@ifhtml/,/^@end ifhtml/{
+  s/^/@c (texi2dvi)/
+}
+/^@ifnottex/,/^@end ifnottex/{
+  s/^/@c (texi2dvi)/
+}
 /^@ifinfo/,/^@end ifinfo/{
   /^@node/p
   /^@menu/,/^@end menu/p
-  d
+  t
+  s/^/@c (texi2dvi)/
+  /^@c (texi2dvi)@macro/,/^@c (texi2dvi)@end macro/{
+    s/^@c (texi2dvi)//
+  }
 }
 EOF
 # Uncommenting is simple: Remove any leading `@c texi2dvi'.

_______________________________________________
Bug-texinfo mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/bug-texinfo

Reply via email to