texinfo/makeinfo xml.c,1.12,1.13 xml.h,1.6,1.7 cmds.c,1.18,1.19

[dirt]

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

Modified Files:
        xml.c xml.h cmds.c 
Log Message:
2004-01-09  Alper Ersoy  <address@hidden>

        * makeinfo/xml.c:
        * makeinfo/xml.h: new variable xml_dont_touch_items_defs.

        * makeinfo/cmds.c (cm_comment, cm_sp):
        * makeinfo/xml.c (xml_insert_indexterm): set and unset
        xml_dont_touch_items_defs.

        * makeinfo/xml.c (xml_insert_element_with_attribute)
        (xml_add_char): do not do anything about @deffnx and @itemx commands
        if xml_dont_touch_items_defs is non-zero.



Index: xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** xml.c       6 Jan 2004 23:33:24 -0000       1.12
--- xml.c       9 Jan 2004 09:08:54 -0000       1.13
***************
*** 512,515 ****
--- 512,519 ----
  int xml_in_abstract = 0;
  
+ /* Non-zero if we are handling an element that can appear between
+    @item and @itemx, @deffn and @deffnx.  */
+ int xml_dont_touch_items_defs = 0;
+ 
  /* We need to keep footnote state, because elements inside footnote may try
     to close the previous parent para.  */
***************
*** 799,814 ****
      return;
  
!   if (xml_after_table_term && elt != TABLETERM)
!     {
!       xml_after_table_term = 0;
!       xml_insert_element (ITEM, START);
!     }
! 
!   if (xml_after_def_term && elt != DEFINITIONTERM && arg == START)
!     {
!       xml_after_def_term = 0;
!       xml_insert_element (DEFINITIONITEM, START);
!       xml_in_def_item[xml_definition_level] = 1;
!     }
  
    if (docbook && !only_macro_expansion && (in_menu || in_detailmenu))
--- 803,818 ----
      return;
  
!   if (!xml_dont_touch_items_defs)
!     if (xml_after_table_term && elt != TABLETERM)
!       {
!         xml_after_table_term = 0;
!         xml_insert_element (ITEM, START);
!       }
!     else if (xml_after_def_term && elt != DEFINITIONTERM && arg == START)
!       {
!         xml_after_def_term = 0;
!         xml_insert_element (DEFINITIONITEM, START);
!         xml_in_def_item[xml_definition_level] = 1;
!       }
  
    if (docbook && !only_macro_expansion && (in_menu || in_detailmenu))
***************
*** 1181,1196 ****
      }
  
!   if (xml_after_table_term && !xml_sort_index && !xml_in_xref_token)
!     {
!       xml_after_table_term = 0;
!       xml_insert_element (ITEM, START);
!     }
! 
!   if (xml_after_def_term && !xml_sort_index && !xml_in_xref_token)
!     {
!       xml_after_def_term = 0;
!       xml_insert_element (DEFINITIONITEM, START);
!       xml_in_def_item[xml_definition_level] = 1;
!     }
  
    if (xml_just_after_element && !xml_in_para && 
!inhibit_paragraph_indentation)
--- 1185,1200 ----
      }
  
!   if (!xml_sort_index && !xml_in_xref_token && !xml_dont_touch_items_defs)
!     if (xml_after_table_term)
!       {
!         xml_after_table_term = 0;
!         xml_insert_element (ITEM, START);
!       }
!     else if (xml_after_def_term)
!       {
!         xml_after_def_term = 0;
!         xml_insert_element (DEFINITIONITEM, START);
!         xml_in_def_item[xml_definition_level] = 1;
!       }
  
    if (xml_just_after_element && !xml_in_para && 
!inhibit_paragraph_indentation)
***************
*** 1651,1654 ****
--- 1655,1661 ----
      char *index;
  {
+   /* @index commands can appear between @item and @itemx, @deffn and @deffnx. 
 */
+   xml_dont_touch_items_defs++;
+ 
    if (!docbook)
      {
***************
*** 1695,1698 ****
--- 1702,1707 ----
        in_indexterm = 0;
      }
+ 
+   xml_dont_touch_items_defs--;
  }
  

Index: xml.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** xml.h       6 Jan 2004 23:33:24 -0000       1.6
--- xml.h       9 Jan 2004 09:08:54 -0000       1.7
***************
*** 41,44 ****
--- 41,48 ----
  extern int xml_in_abstract;
  
+ /* Non-zero if we are handling an element that can appear between
+    @item and @itemx, @deffn and @deffnx.  */
+ extern int xml_dont_touch_items_defs;
+ 
  enum xml_element
  {

Index: cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** cmds.c      8 Jan 2004 15:12:21 -0000       1.18
--- cmds.c      9 Jan 2004 09:08:54 -0000       1.19
***************
*** 647,650 ****
--- 647,653 ----
            escape_html = 0;
            xml_no_para = 1;
+           /* @c and @comment can appear between @item and @itemx,
+              @deffn and @deffnx.  */
+           xml_dont_touch_items_defs++;
  
            /* Crunch double hyphens in comments.  */
***************
*** 668,671 ****
--- 671,675 ----
            escape_html = save_escape_html;
            xml_no_para = save_xml_no_para;
+           xml_dont_touch_items_defs--;
          }
  
***************
*** 1375,1381 ****
--- 1379,1388 ----
        if (xml)
        {
+           /* @sp can appear between @item and @itemx, @deffn and @deffnx.  */
+           xml_dont_touch_items_defs++;
          xml_insert_element_with_attribute (SP, START, "lines=\"%s\"", line);
          /*      insert_string (line);*/
          xml_insert_element (SP, END);
+           xml_dont_touch_items_defs--;
        }
        else