texinfo/makeinfo cmds.c,1.33,1.34

[dirt]

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

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

        * makeinfo/cmds.c (cm_center): fixed line wrapping after the @center
        command.



Index: cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** cmds.c      15 Feb 2004 15:17:35 -0000      1.33
--- cmds.c      16 Feb 2004 14:56:59 -0000      1.34
***************
*** 1410,1464 ****
    else
      {
!   int i, start, length;
!   unsigned char *line;
!   int save_indented_fill = indented_fill;
!   int save_filling_enabled = filling_enabled;
!   int fudge_factor = 1;
  
!   filling_enabled = indented_fill = 0;
!   cm_noindent ();
!   start = output_paragraph_offset;
  
!   if (html)
!     add_html_block_elt ("<div align=\"center\">");
  
!   inhibit_output_flushing ();
!   get_rest_of_line (0, (char **)&line);
!   execute_string ("%s", (char *)line);
!   free (line);
!   uninhibit_output_flushing ();
!   if (html)
!     add_html_block_elt ("</div>");
  
!    else
!      {
!        i = output_paragraph_offset - 1;
!        while (i > (start - 1) && output_paragraph[i] == '\n')
!        i--;
  
!        output_paragraph_offset = ++i;
!        length = output_paragraph_offset - start;
  
!        if (length < (fill_column - fudge_factor))
!        {
!          line = xmalloc (1 + length);
!          memcpy (line, (char *)(output_paragraph + start), length);
  
!          i = (fill_column - fudge_factor - length) / 2;
!          output_paragraph_offset = start;
  
!          while (i--)
!            insert (' ');
  
!          for (i = 0; i < length; i++)
!            insert (line[i]);
  
!          free (line);
!        }
!      }
  
!   insert ('\n');
!   filling_enabled = save_filling_enabled;
!   indented_fill = save_indented_fill;
      }
  }
--- 1410,1467 ----
    else
      {
!       int i, start, length;
!       unsigned char *line;
!       int save_indented_fill = indented_fill;
!       int save_filling_enabled = filling_enabled;
!       int fudge_factor = 1;
  
!       filling_enabled = indented_fill = 0;
!       cm_noindent ();
!       start = output_paragraph_offset;
  
!       if (html)
!         add_html_block_elt ("<div align=\"center\">");
  
!       inhibit_output_flushing ();
!       get_rest_of_line (0, (char **)&line);
!       execute_string ("%s", (char *)line);
!       free (line);
!       uninhibit_output_flushing ();
!       if (html)
!         add_html_block_elt ("</div>");
  
!        else
!          {
!            i = output_paragraph_offset - 1;
!            while (i > (start - 1) && output_paragraph[i] == '\n')
!              i--;
  
!            output_paragraph_offset = ++i;
!            length = output_paragraph_offset - start;
  
!            if (length < (fill_column - fudge_factor))
!              {
!                line = xmalloc (1 + length);
!                memcpy (line, (char *)(output_paragraph + start), length);
  
!                i = (fill_column - fudge_factor - length) / 2;
!                output_paragraph_offset = start;
  
!                while (i--)
!                  insert (' ');
  
!                for (i = 0; i < length; i++)
!                  insert (line[i]);
  
!                free (line);
!              }
!          }
  
!       insert ('\n');
!       filling_enabled = save_filling_enabled;
!       indented_fill = save_indented_fill;
!       close_single_paragraph ();
!       if (looking_at("\n"))
!         insert ('\n');
      }
  }