texinfo/makeinfo sectioning.c,1.10,1.11

[dirt]

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

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

        * makeinfo/sectioning.c (handle_enum_increment): do not increment
        counters for ENUM_SECT_NO heading commands (ie. @unnumbered,
        @majorheading, etc.)



Index: sectioning.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/sectioning.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sectioning.c        18 Feb 2004 13:58:14 -0000      1.10
--- sectioning.c        20 Feb 2004 02:42:19 -0000      1.11
***************
*** 292,298 ****
  {
    /* Here is how TeX handles enumeration:
!      - Anything below @unnumbered is not enumerated.
!      - Counters are incremented below @chapter and @appendix, but not
!        printed for their @unnumbered* children.  */
    int i;
  
--- 292,297 ----
  {
    /* Here is how TeX handles enumeration:
!      - Anything starting with @unnumbered is not enumerated.
!      - @majorheading and the like are not enumberated.  */
    int i;
  
***************
*** 301,309 ****
      return xstrdup ("");
  
    /* reset all counters which are one level deeper */
    for (i = level; i < 3; i++)
      numbers [i + 1] = 0;
  
-   /* Second constraint.  */
    numbers[level]++;
    if (section_alist[index].num == ENUM_SECT_NO || enum_marker == 
UNNUMBERED_MAGIC
--- 300,311 ----
      return xstrdup ("");
  
+   /* Second constraint.  */
+   if (section_alist[index].num == ENUM_SECT_NO)
+     return xstrdup ("");
+ 
    /* reset all counters which are one level deeper */
    for (i = level; i < 3; i++)
      numbers [i + 1] = 0;
  
    numbers[level]++;
    if (section_alist[index].num == ENUM_SECT_NO || enum_marker == 
UNNUMBERED_MAGIC