texinfo/makeinfo insertion.c,1.5,1.6

[dirt]

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

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

        * makeinfo/insertion.c (end_insertion, cm_example, cm_smallexample)
        (cm_lisp, cm_smalllisp, cm_format, cm_smallformat, cm_display)
        (cm_smalldisplay): unified whitespaces inside these elements
        in XML and Docbook output (always one newline at the beginning
        and one at the end).



Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** insertion.c 2003/12/18 22:18:55     1.5
--- insertion.c 2003/12/25 10:46:39     1.6
***************
*** 1132,1135 ****
--- 1132,1138 ----
          current_indent -= default_indentation_increment;
  
+       if (type != quotation && !docbook)
+         inhibit_paragraph_indentation = 1;
+ 
        if (html)
          { /* The complex code in close_paragraph that kills whitespace
***************
*** 1269,1273 ****
  
    if (xml)
!     xml_insert_element (EXAMPLE, START);
    begin_insertion (example);
  }
--- 1272,1288 ----
  
    if (xml)
!     {
!       /* Rollback previous newlines.  These occur between
!          </para> and <example>.  */
!       if (output_paragraph[output_paragraph_offset-1] == '\n')
!         output_paragraph_offset--;
! 
!       xml_insert_element (EXAMPLE, START);
! 
!       /* Make sure example text is starting on a new line
!          for improved readability.  */
!       add_char ('\n');
!     }
! 
    begin_insertion (example);
  }
***************
*** 1280,1284 ****
  
    if (xml)
!     xml_insert_element (SMALLEXAMPLE, START);
    begin_insertion (smallexample);
  }
--- 1295,1306 ----
  
    if (xml)
!     {
!       /* See cm_example comments about newlines.  */
!       if (output_paragraph[output_paragraph_offset-1] == '\n')
!         output_paragraph_offset--;
!       xml_insert_element (SMALLEXAMPLE, START);
!       add_char ('\n');
!     }
! 
    begin_insertion (smallexample);
  }
***************
*** 1291,1295 ****
  
    if (xml)
!     xml_insert_element (LISP, START);
    begin_insertion (lisp);
  }
--- 1313,1324 ----
  
    if (xml)
!     {
!       /* See cm_example comments about newlines.  */
!       if (output_paragraph[output_paragraph_offset-1] == '\n')
!         output_paragraph_offset--;
!       xml_insert_element (LISP, START);
!       add_char ('\n');
!     }
! 
    begin_insertion (lisp);
  }
***************
*** 1302,1306 ****
  
    if (xml)
!     xml_insert_element (SMALLLISP, START);
    begin_insertion (smalllisp);
  }
--- 1331,1342 ----
  
    if (xml)
!     {
!       /* See cm_example comments about newlines.  */
!       if (output_paragraph[output_paragraph_offset-1] == '\n')
!         output_paragraph_offset--;
!       xml_insert_element (SMALLLISP, START);
!       add_char ('\n');
!     }
! 
    begin_insertion (smalllisp);
  }
***************
*** 1384,1388 ****
        }
        else
!       xml_insert_element (FORMAT, START);
      }
    begin_insertion (format);
--- 1420,1430 ----
        }
        else
!         {
!           /* See cm_example comments about newlines.  */
!           if (output_paragraph[output_paragraph_offset-1] == '\n')
!             output_paragraph_offset--;
!           xml_insert_element (FORMAT, START);
!           add_char ('\n');
!         }
      }
    begin_insertion (format);
***************
*** 1393,1397 ****
  {
    if (xml)
!     xml_insert_element (SMALLFORMAT, START);
    begin_insertion (smallformat);
  }
--- 1435,1446 ----
  {
    if (xml)
!     {
!       /* See cm_example comments about newlines.  */
!       if (output_paragraph[output_paragraph_offset-1] == '\n')
!         output_paragraph_offset--;
!       xml_insert_element (SMALLFORMAT, START);
!       add_char ('\n');
!     }
! 
    begin_insertion (smallformat);
  }
***************
*** 1401,1405 ****
  {
    if (xml)
!     xml_insert_element (DISPLAY, START);
    begin_insertion (display);
  }
--- 1450,1461 ----
  {
    if (xml)
!     {
!       /* See cm_example comments about newlines.  */
!       if (output_paragraph[output_paragraph_offset-1] == '\n')
!         output_paragraph_offset--;
!       xml_insert_element (DISPLAY, START);
!       add_char ('\n');
!     }
! 
    begin_insertion (display);
  }
***************
*** 1409,1413 ****
  {
    if (xml)
!     xml_insert_element (SMALLDISPLAY, START);
    begin_insertion (smalldisplay);
  }
--- 1465,1476 ----
  {
    if (xml)
!     {
!       /* See cm_example comments about newlines.  */
!       if (output_paragraph[output_paragraph_offset-1] == '\n')
!         output_paragraph_offset--;
!       xml_insert_element (SMALLDISPLAY, START);
!       add_char ('\n');
!     }
! 
    begin_insertion (smalldisplay);
  }