texinfo/makeinfo multi.c,1.6,1.7

[dirt]

Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv28239/makeinfo

Modified Files:
        multi.c 
Log Message:
2004-02-17  Alper Ersoy  <address@hidden>

        * makeinfo/multi.c (do_multitable): remove trailing newline when the
        output format is Docbook or XML, as output_paragraph becomes unusable
        later for xml_indent during select_output_environment.



Index: multi.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/multi.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** multi.c     13 Feb 2004 22:01:39 -0000      1.6
--- multi.c     16 Feb 2004 22:34:37 -0000      1.7
***************
*** 345,354 ****
    close_single_paragraph ();
  
    /* scan the current item function to get the field widths
       and number of columns, and set up the output environment list
       accordingly. */
-   /*  if (docbook)*/ /* 05-08 */
-   if (xml)
-     xml_no_para = 1;
    ncolumns = setup_multitable_parameters ();
    first_row = 1;
--- 345,358 ----
    close_single_paragraph ();
  
+   if (xml)
+     {
+       xml_no_para = 1;
+       if (output_paragraph[output_paragraph_offset-1] == '\n')
+         output_paragraph_offset--;
+     }
+ 
    /* scan the current item function to get the field widths
       and number of columns, and set up the output environment list
       accordingly. */
    ncolumns = setup_multitable_parameters ();
    first_row = 1;