texinfo/makeinfo sectioning.c,1.7,1.8 xml.c,1.18,1.19

[dirt]

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

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

        * makeinfo/xml.c: changed majorheading and the like with bridgehead
        for Docbook.

        * makeinfo/sectioning.c (sectioning_underscore): do not start sections
        with @majorheading and the like, only insert title.



Index: sectioning.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/sectioning.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sectioning.c        25 Jan 2004 14:26:48 -0000      1.7
--- sectioning.c        25 Jan 2004 15:16:52 -0000      1.8
***************
*** 349,353 ****
        /* If the section appears in the toc, it means it's a real section
         unlike majorheading, chapheading etc. */
!       if (section_alist[search_sectioning (cmd)].toc == TOC_YES || docbook)
        {
          xml_close_sections (level);
--- 349,353 ----
        /* If the section appears in the toc, it means it's a real section
         unlike majorheading, chapheading etc. */
!       if (section_alist[search_sectioning (cmd)].toc == TOC_YES)
        {
          xml_close_sections (level);
***************
*** 385,395 ****
        }
        else
!       {
!         xml_insert_element (xml_element (secname), START);
!         get_rest_of_line (0, &temp);
!         execute_string ("%s", temp);
!         free (temp);
!         xml_insert_element (xml_element (secname), END);
!       }
      }
    else if (html)
--- 385,407 ----
        }
        else
!         {
!           if (docbook)
!             {
!               if (level > 0)
!                 xml_insert_element_with_attribute (xml_element (secname), 
START,
!                     "renderas=\"sect%d\"", level);
!               else
!                 xml_insert_element_with_attribute (xml_element (secname), 
START,
!                     "renderas=\"other\"");
!             }
!           else
!             xml_insert_element (xml_element (secname), START);
! 
!           get_rest_of_line (0, &temp);
!           execute_string ("%s", temp);
!           free (temp);
! 
!           xml_insert_element (xml_element (secname), END);
!         }
      }
    else if (html)

Index: xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** xml.c       25 Jan 2004 14:26:48 -0000      1.18
--- xml.c       25 Jan 2004 15:16:52 -0000      1.19
***************
*** 277,285 ****
    { "sect3",               1, 0, 0 }, /* APPENDIXSUBSUBSEC */
  
!   { "chapter",             1, 0, 0 }, /* MAJORHEADING */
!   { "chapter",             1, 0, 0 }, /* CHAPHEADING */
!   { "sect1",               1, 0, 0 }, /* HEADING */
!   { "sect2",               1, 0, 0 }, /* SUBHEADING */
!   { "simplesect",          1, 0, 0 }, /* SUBSUBHEADING */
  
    { "",                    0, 0, 0 }, /* TITLEPAGE */
--- 277,285 ----
    { "sect3",               1, 0, 0 }, /* APPENDIXSUBSUBSEC */
  
!   { "bridgehead",          0, 0, 0 }, /* MAJORHEADING */
!   { "bridgehead",          0, 0, 0 }, /* CHAPHEADING */
!   { "bridgehead",          0, 0, 0 }, /* HEADING */
!   { "bridgehead",          0, 0, 0 }, /* SUBHEADING */
!   { "bridgehead",          0, 0, 0 }, /* SUBSUBHEADING */
  
    { "",                    0, 0, 0 }, /* TITLEPAGE */