texinfo/makeinfo toc.c,1.5,1.6 xml.c,1.13,1.14

[dirt]

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

Modified Files:
        toc.c xml.c 
Log Message:
2004-01-16  Alper Ersoy  <address@hidden>

        * makeinfo/toc.c (cm_contents): fixed Docbook element stack underflow.

        * makeinfo/xml.c (xml_insert_indexterm): set xml_dont_touch_items_defs
        for only XML output.



Index: toc.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/toc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** toc.c       8 Jan 2004 16:07:37 -0000       1.5
--- toc.c       15 Jan 2004 22:35:19 -0000      1.6
***************
*** 376,389 ****
    if (xml)
      {
!       if (arg != START)
!         return;
!       xml_insert_element (STREQ (command, "contents")
!           ? CONTENTS : SHORTCONTENTS, START);
!       xml_end_current_element ();
! 
!       return;
      }
! 
!   if (!handling_delayed_writes)
      {
        register_delayed_write (STREQ (command, "contents")
--- 376,387 ----
    if (xml)
      {
!       if (arg == START)
!         {
!           int elt = STREQ (command, "contents") ? CONTENTS : SHORTCONTENTS;
!           xml_insert_element (elt, START);
!           xml_insert_element (elt, END);
!         }
      }
!   else if (!handling_delayed_writes)
      {
        register_delayed_write (STREQ (command, "contents")

Index: xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** xml.c       9 Jan 2004 09:08:54 -0000       1.13
--- xml.c       15 Jan 2004 22:35:19 -0000      1.14
***************
*** 1656,1661 ****
  {
    /* @index commands can appear between @item and @itemx, @deffn and @deffnx. 
 */
-   xml_dont_touch_items_defs++;
- 
    if (!docbook)
      {
--- 1656,1659 ----
***************
*** 1668,1671 ****
--- 1666,1670 ----
          }
  
+       xml_dont_touch_items_defs++;
        xml_insert_element_with_attribute (INDEXTERM, START, "index=\"%s\"", 
index);
        in_indexterm = 1;
***************
*** 1673,1676 ****
--- 1672,1676 ----
        xml_insert_element (INDEXTERM, END);
        in_indexterm = 0;
+       xml_dont_touch_items_defs--;
      }
    else
***************
*** 1702,1707 ****
        in_indexterm = 0;
      }
- 
-   xml_dont_touch_items_defs--;
  }
  
--- 1702,1705 ----