texinfo/makeinfo insertion.c,1.8,1.9

[dirt]

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

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

        * makeinfo/insertion.c (cm_item): do not call close_single_paragraph
        and use rollback_empty_tag for empty <dd> removal.



Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** insertion.c 2003/12/28 11:48:52     1.8
--- insertion.c 2003/12/28 13:02:28     1.9
***************
*** 2140,2163 ****
                   an extra empty line for <dd><dt>, which makes @itemx
                   conversion look ugly.  */
!               if (output_paragraph_offset > 0)
!                 { /* Start comparing at this position.  */
!                   int check_position = 0;
! 
!                   /* Skip whitespace at the start of output_paragraph.  */
!                   while (output_paragraph[check_position] == ' '
!                       || output_paragraph[check_position] == '\n'
!                       || output_paragraph[check_position] == '\t')
!                     check_position++;
! 
!                   /* Since we flush output just before inserting a <dd>,
!                      output_paragraph is supposed to have only indentation
!                      whitespace and <dd>, if we are just after a <dt>.  If
!                      so, that means this is an @itemx.  Rollback the empty
!                      <dd>.  */
!                   if (strncmp ((char *) output_paragraph + check_position,
!                         "<dd>", sizeof ("<dd>") - 1) == 0
!                       && check_position + sizeof ("<dd>") - 1 == 
output_paragraph_offset)
!                     output_paragraph_offset = check_position;
!                 }
  
                /* Force the browser to render one blank line before
--- 2140,2144 ----
                   an extra empty line for <dd><dt>, which makes @itemx
                   conversion look ugly.  */
!               rollback_empty_tag ("dd");
  
                /* Force the browser to render one blank line before
***************
*** 2187,2193 ****
                if (current_insertion_type () == vtable)
                  execute_string ("%cvindex %s\n", COMMAND_PREFIX, 
rest_of_line);
!               /* Make sure output_position is updated, so we could
!                  remember it.  */
!               close_single_paragraph ();
                add_html_block_elt ("<dd>");
              }
--- 2168,2172 ----
                if (current_insertion_type () == vtable)
                  execute_string ("%cvindex %s\n", COMMAND_PREFIX, 
rest_of_line);
! 
                add_html_block_elt ("<dd>");
              }