texinfo/makeinfo multi.c,1.4,1.5

[karl]

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

Modified Files:
        multi.c 
Log Message:
(setup_multitable_parameters): compute width and
pass it, for clarity.


Index: multi.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/multi.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** multi.c     24 Jan 2004 15:58:10 -0000      1.4
--- multi.c     9 Feb 2004 23:20:24 -0000       1.5
***************
*** 2,6 ****
     $Id$
  
!    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
     Foundation, Inc.
  
--- 2,6 ----
     $Id$
  
!    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004 Free Software
     Foundation, Inc.
  
***************
*** 19,23 ****
     Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
     
!    Written by address@hidden (Paul Rubin).  */
  
  #include "system.h"
--- 19,23 ----
     Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
     
!    Originally written by address@hidden (Paul Rubin).  */
  
  #include "system.h"
***************
*** 294,309 ****
            while (*params && (*params == ' ' || *params == '\t'))
              params++;
!           /* Hmm, but what about @columnfractions 3foo.  Well, I suppose
               it's invalid input anyway.  */
            while (*params && *params != ' ' && *params != '\t'
                   && *params != '\n' && *params != '@')
              params++;
!           /* For html/xml/docbook environments, translate fractions into 
integer
!              percentages.  Add .005 to avoid rounding problems.  */
!           if (xml || html)
!             setup_output_environment (i, (int) ((columnfrac + .005) * 100));
!           else
!             setup_output_environment (i,
!                 (int) (columnfrac * (fill_column - current_indent) + .5));
          }
        }
--- 294,311 ----
            while (*params && (*params == ' ' || *params == '\t'))
              params++;
!           /* Hmm, but what about @columnfractions 3foo.  Oh well, 
               it's invalid input anyway.  */
            while (*params && *params != ' ' && *params != '\t'
                   && *params != '\n' && *params != '@')
              params++;
! 
!           {
!             /* For html/xml/docbook, translate fractions into integer
!                percentages, adding .005 to avoid rounding problems.  For
!                info, we want the character width.  */
!             int width = xml || html ? (columnfrac + .005) * 100
!                         : (columnfrac * (fill_column - current_indent) + .5);
!             setup_output_environment (i, width);
!           }
          }
        }