[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Sat Sep 17 18:22:01 EDT 2005)
From: |
Karl Berry |
Subject: |
texinfo update (Sat Sep 17 18:22:01 EDT 2005) |
Date: |
Sat, 17 Sep 2005 18:22:05 -0400 |
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.535
retrieving revision 1.536
diff -c -r1.535 -r1.536
*** ChangeLog 5 Sep 2005 18:54:06 -0000 1.535
--- ChangeLog 17 Sep 2005 21:56:54 -0000 1.536
***************
*** 1,3 ****
--- 1,9 ----
+ 2005-09-17 Sergey Poznyakoff <address@hidden> (tiny change)
+
+ * makeinfo/cmds.c (handle_include): don't expand @verbatiminclude,
+ so that texi2dvi will pass it through to texinfo.tex. Otherwise
+ the dvi/pdf output is wrong.
+
2005-09-05 Stepan Kasal <address@hidden>
* doc/texinfo.tex: Fix typo in a comment.
Index: makeinfo/cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -c -r1.61 -r1.62
*** makeinfo/cmds.c 1 Aug 2005 22:49:37 -0000 1.61
--- makeinfo/cmds.c 17 Sep 2005 21:56:55 -0000 1.62
***************
*** 1,5 ****
/* cmds.c -- Texinfo commands.
! $Id: cmds.c,v 1.61 2005/08/01 22:49:37 karl Exp $
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
Software Foundation, Inc.
--- 1,5 ----
/* cmds.c -- Texinfo commands.
! $Id: cmds.c,v 1.62 2005/09/17 21:56:55 karl Exp $
Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
Software Foundation, Inc.
***************
*** 1685,1699 ****
if (!insertion_stack)
close_paragraph (); /* No blank lines etc. if not at outer level. */
get_rest_of_line (0, &arg);
/* We really only want to expand @value, but it's easier to just do
everything. TeX will only work with @value. */
filename = text_expansion (arg);
free (arg);
!
if (macro_expansion_output_stream && !executing_string)
remember_itext (input_text, input_text_offset);
!
pushfile ();
/* In verbose mode we print info about including another file. */
--- 1685,1705 ----
if (!insertion_stack)
close_paragraph (); /* No blank lines etc. if not at outer level. */
+ if (macro_expansion_output_stream && verbatim_include)
+ {
+ me_append_before_this_command ();
+ return;
+ }
+
get_rest_of_line (0, &arg);
/* We really only want to expand @value, but it's easier to just do
everything. TeX will only work with @value. */
filename = text_expansion (arg);
free (arg);
!
if (macro_expansion_output_stream && !executing_string)
remember_itext (input_text, input_text_offset);
!
pushfile ();
/* In verbose mode we print info about including another file. */
P ChangeLog
P makeinfo/cmds.c
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Sat Sep 17 18:22:01 EDT 2005),
Karl Berry <=