texinfo/makeinfo float.c,1.18,1.19 index.c,1.10,1.11

[dirt]

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

Modified Files:
        float.c index.c 
Log Message:
2004-01-23  Alper Ersoy  <address@hidden>

        * makeinfo/float.c (cm_listoffloats):
        * makeinfo/index.c (cm_printindex): decrement line_number only if
        not handling delayed writes.

        * makeinfo/float.c (float_type_exists): check if float has a label.



Index: float.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/float.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** float.c     17 Jan 2004 12:52:34 -0000      1.18
--- float.c     23 Jan 2004 15:54:54 -0000      1.19
***************
*** 162,166 ****
  
    for (temp = float_stack; temp; temp = temp->next)
!     if (STREQ (temp->type, check_type))
        return 1;
  
--- 162,166 ----
  
    for (temp = float_stack; temp; temp = temp->next)
!     if (STREQ (temp->type, check_type) && temp->id && *temp->id)
        return 1;
  
***************
*** 177,181 ****
       so to make warnings/errors point to the correct line,
       we decrement the line_number again.  */
!   line_number--;
  
    if (handling_delayed_writes && !float_type_exists (float_type))
--- 177,182 ----
       so to make warnings/errors point to the correct line,
       we decrement the line_number again.  */
!   if (!handling_delayed_writes)
!     line_number--;
  
    if (handling_delayed_writes && !float_type_exists (float_type))

Index: index.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/index.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** index.c     21 Jan 2004 03:01:25 -0000      1.10
--- index.c     23 Jan 2004 15:54:54 -0000      1.11
***************
*** 663,671 ****
    char *index_name;
    get_rest_of_line (0, &index_name);
    /* get_rest_of_line increments the line number by one,
       so to make warnings/errors point to the correct line,
       we decrement the line_number again.  */
!   line_number--;
! 
  
    if (xml && !docbook)
--- 663,672 ----
    char *index_name;
    get_rest_of_line (0, &index_name);
+ 
    /* get_rest_of_line increments the line number by one,
       so to make warnings/errors point to the correct line,
       we decrement the line_number again.  */
!   if (!handling_delayed_writes)
!     line_number--;
  
    if (xml && !docbook)