texinfo/util texinfo.dtd,1.1,1.2

[dirt]

Update of /cvsroot/texinfo/texinfo/util
In directory sheep:/tmp/cvs-serv25433/util

Modified Files:
        texinfo.dtd 
Log Message:
2004-01-24  Alper Ersoy  <address@hidden>

        * makeinfo/multi.c (out_char): simple use add_char for XML and Docbook
        outputs too.

        * makeinfo/makeinfo.c (close_paragraph): just return when the output
        format is XML.

        * makeinfo/makeinfo.h: new variable xml_indendation_increment.

        * makeinfo/cmds.c (cm_comment): insert a newline before the comment,
        if there is not already one.
        (cm_noindent_cmd): skip whitespace after the command.

        * makeinfo/xml.c:
        * makeinfo/xml.h: new element DETAILMENU.

        * makeinfo/xml.c: menuentry and menucomment should not contain para.
        (xml_indent, xml_indent_end_para): use xml_indentation_increment
        value, and indent only if it is a positive number.
        (xml_start_para): apply indentation for XML output too.
        (xml_end_para): add newline if xml_indentation_increment is positive.
        (xml_insert_element_with_attribute): major indentation fixes.
        (xml_start_menu_entry): skip whitespace at the start of menu comments.
        (xml_add_char): fixed paragraph detection in menus, and added a check
        to detect multiple whitespaces after newline in menu comments.  Do not
        return when inside multitable to avoid concatenation of two lines
        without a space char in between.

        * makeinfo/insertion.c (cm_insert_copying, cm_lisp, cm_smalllisp)
        (cm_format, cm_smallformat, cm_display, cm_smalldisplay, cm_example)
        (cm_smallexample): do not insert newline when the output is XML.
        (end_insertion): ditto for the above mentioned block commands and
        @group.  Do not increment in_fixed_font for XML output.
        (begin_insertion, end_insertion): enclose @detailmenu in a detailmenu
        element.

        * util/texinfo.dtd: added detailmenu, and fixed menucomment and
        tableitem definitions.



Index: texinfo.dtd
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** texinfo.dtd 23 Jan 2004 13:19:13 -0000      1.1
--- texinfo.dtd 24 Jan 2004 15:58:10 -0000      1.2
***************
*** 225,233 ****
          role CDATA #IMPLIED>
  
! <!ELEMENT menu ((menuentry | para)*)>
  <!ELEMENT menuentry (menunode?, menutitle?, menucomment?)>
  <!ELEMENT menunode (#PCDATA)>
  <!ELEMENT menutitle (#PCDATA)>
! <!ELEMENT menucomment (#PCDATA | para)*>
  
  <!-- Lists -->
--- 225,234 ----
          role CDATA #IMPLIED>
  
! <!ELEMENT menu (menuentry | detailmenu | para)*>
! <!ELEMENT detailmenu (menuentry | para)*>
  <!ELEMENT menuentry (menunode?, menutitle?, menucomment?)>
  <!ELEMENT menunode (#PCDATA)>
  <!ELEMENT menutitle (#PCDATA)>
! <!ELEMENT menucomment (#PCDATA | %Inline.phrase; | footnote)*>
  
  <!-- Lists -->
***************
*** 244,248 ****
  <!-- Tables -->
  <!ELEMENT table (tableitem | indexterm)+>
! <!ELEMENT tableitem (tableterm+, indexterm*, item)>
  <!ELEMENT tableterm (#PCDATA | %Inline.phrase;)*>
  
--- 245,249 ----
  <!-- Tables -->
  <!ELEMENT table (tableitem | indexterm)+>
! <!ELEMENT tableitem ((tableterm, indexterm*)+, item)>
  <!ELEMENT tableterm (#PCDATA | %Inline.phrase;)*>