texinfo update (Thu Nov 11 12:52:01 EST 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.408
retrieving revision 1.409
diff -c -r1.408 -r1.409
*** ChangeLog   9 Nov 2004 00:08:20 -0000       1.408
--- ChangeLog   11 Nov 2004 17:48:42 -0000      1.409
***************
*** 1,3 ****
--- 1,10 ----
+ 2004-11-11  Karl Berry  <address@hidden>
+ 
+       * makeinfo/makeinfo.c (expansion): save and restore xml_in_para,
+               so we don't get a spurious </para> after </dircategory>
+               (dircat test).
+       From: Vincent Lefevre, 20 Oct 2004 15:40:39 +0200.
+ 
  2004-11-08  Karl Berry  <address@hidden>
  
        * doc/texinfo.tex (\pdfmakeoutlines): in the first run through the
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -c -r1.68 -r1.69
*** makeinfo/makeinfo.c 7 Nov 2004 13:57:22 -0000       1.68
--- makeinfo/makeinfo.c 11 Nov 2004 17:48:43 -0000      1.69
***************
*** 1,5 ****
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.68 2004/11/07 13:57:22 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--- 1,5 ----
  /* makeinfo -- convert Texinfo source into other formats.
!    $Id: makeinfo.c,v 1.69 2004/11/11 17:48:43 karl Exp $
  
     Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
***************
*** 4015,4020 ****
--- 4015,4021 ----
  maybe_escaped_expansion (char *str, int implicit_code, int do_html_escape)
  {
    char *result;
+   extern int xml_in_para;
  
    /* Inhibit indentation and filling, so that extra newlines
       are not added to the expansion.  (This is undesirable if
***************
*** 4023,4028 ****
--- 4024,4033 ----
    int saved_indented_fill = indented_fill;
    int saved_no_indent = no_indent;
    int saved_escape_html = escape_html;
+   int saved_xml_in_para;
+ 
+   if (xml)
+     saved_xml_in_para = xml_in_para;
  
    filling_enabled = 0;
    indented_fill = 0;
***************
*** 4036,4041 ****
--- 4041,4049 ----
    no_indent = saved_no_indent;
    escape_html = saved_escape_html;
  
+   if (xml)
+     xml_in_para = saved_xml_in_para;
+ 
    return result;
  }
  
P ChangeLog
P makeinfo/makeinfo.c