texinfo/makeinfo insertion.c,1.6,1.7 xml.c,1.8,1.9

[dirt]

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

Modified Files:
        insertion.c xml.c 
Log Message:
2003-12-25  Alper Ersoy  <address@hidden>

        * makeinfo/insertion.c (end_insertion): inhibit paragraph indentation
        for more cases after example, display and the like environments.

        * makeinfo/xml.c (xml_start_para, xml_end_para): made <para> and
        </para> indentation more newline-aware.



Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** insertion.c 2003/12/25 10:46:39     1.6
--- insertion.c 2003/12/25 11:04:58     1.7
***************
*** 1132,1136 ****
          current_indent -= default_indentation_increment;
  
!       if (type != quotation && !docbook)
          inhibit_paragraph_indentation = 1;
  
--- 1132,1137 ----
          current_indent -= default_indentation_increment;
  
!       if ((type != quotation && !docbook)
!           || (type != example && type != smallexample && docbook))
          inhibit_paragraph_indentation = 1;
  

Index: xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** xml.c       2003/12/23 10:28:13     1.8
--- xml.c       2003/12/25 11:04:58     1.9
***************
*** 678,683 ****
    if (xml_in_para || xml_in_footnote)
      return;
    if (docbook)
!     xml_indent ();
    insert_string ("<para");
    if (xml_no_indent)
--- 678,689 ----
    if (xml_in_para || xml_in_footnote)
      return;
+ 
    if (docbook)
!     {
!       while (output_paragraph[output_paragraph_offset-1] == '\n')
!         output_paragraph_offset--;
!       xml_indent ();
!     }
! 
    insert_string ("<para");
    if (xml_no_indent)
***************
*** 693,698 ****
    if (!xml_in_para || xml_in_footnote)
      return;
!   if (docbook)
      xml_indent_end_para ();
    insert_string ("</para>");
    xml_in_para = 0;
--- 699,708 ----
    if (!xml_in_para || xml_in_footnote)
      return;
! 
!   if (docbook && output_paragraph[output_paragraph_offset-1] == '\n')
      xml_indent_end_para ();
+   if (!docbook && output_paragraph[output_paragraph_offset-1] == ' ')
+     output_paragraph_offset--;
+ 
    insert_string ("</para>");
    xml_in_para = 0;