texinfo/makeinfo cmds.c,1.26,1.27 xml.c,1.22,1.23 xref.c,1.1,1.2

[dirt]

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

Modified Files:
        cmds.c xml.c xref.c 
Log Message:
2004-02-02  Arnold D. Robbins  <address@hidden>

        * cmds.c (cm_TeX, cm_LaTeX): Add docbook support.
        (cm_code): Add opening and closing single quotes for @samp in the
        Docbook output.
        * xml.c (xml_begin_document): Add `tex' and `latex' entities.
        * xref.c (cm_xref): Add `See' and `see' strings for docbook and xml.



Index: cmds.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** cmds.c      31 Jan 2004 15:14:52 -0000      1.26
--- cmds.c      2 Feb 2004 12:04:56 -0000       1.27
***************
*** 549,553 ****
    if (arg == START)
      {
!       if (xml && !docbook)
        xml_insert_entity ("tex");
        else
--- 549,553 ----
    if (arg == START)
      {
!       if (xml)
        xml_insert_entity ("tex");
        else
***************
*** 572,576 ****
    if (arg == START)
      {
!       if (xml && !docbook)
          xml_insert_entity ("latex");
        else
--- 572,576 ----
    if (arg == START)
      {
!       if (xml)
          xml_insert_entity ("latex");
        else
***************
*** 834,838 ****
        xml_insert_element (OPTION, arg);
        else if (STREQ (command, "samp"))
!       xml_insert_element (SAMP, arg);
        else
        xml_insert_element (CODE, arg);
--- 834,851 ----
        xml_insert_element (OPTION, arg);
        else if (STREQ (command, "samp"))
!         {
!           if (docbook && arg == START)
!             {
!               /* Temporarily reset in_fixed_width_font, so add_char
!                  can start a paragraph if necessary.  */
!               int save_in_fixed_width_font = in_fixed_width_font;
!               in_fixed_width_font = 0;
!               add_char ('`');
!               in_fixed_width_font = save_in_fixed_width_font;
!             }
!           xml_insert_element (SAMP, arg);
!           if (docbook && arg == END)
!             add_char ('\'');
!         }
        else
        xml_insert_element (CODE, arg);
***************
*** 855,858 ****
--- 868,874 ----
            add_meta_char ('\'');
      }
+ 
+   if (arg == END)
+     in_fixed_width_font--;
  }
  

Index: xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** xml.c       31 Jan 2004 13:05:07 -0000      1.22
--- xml.c       2 Feb 2004 12:04:56 -0000       1.23
***************
*** 612,616 ****
    if (docbook)
      {
!       insert_string ("<!DOCTYPE book PUBLIC \"-//OASIS//DTD DocBook XML 
V4.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\";>");
        xml_element_list = docbook_element_list;
      }
--- 612,616 ----
    if (docbook)
      {
!       insert_string ("<!DOCTYPE book PUBLIC \"-//OASIS//DTD DocBook XML 
V4.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"; [\n  
<!ENTITY tex \"TeX\">\n  <!ENTITY latex \"LaTeX\">\n]>");
        xml_element_list = docbook_element_list;
      }

Index: xref.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xref.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xref.c      6 Jan 2004 18:42:10 -0000       1.1
--- xref.c      2 Feb 2004 12:04:56 -0000       1.2
***************
*** 38,42 ****
       int expand;
  {
!   char *string;
  
    if (docbook)
--- 38,42 ----
       int expand;
  {
!   char *string = 0;
  
    if (docbook)
***************
*** 103,106 ****
--- 103,109 ----
        if (docbook)
          {
+           if (!ref_flag)
+             add_word_args ("%s", px_ref_flag ? _("see ") : _("See "));
+ 
            if (!*arg4 && !*arg5)
              {
***************
*** 108,112 ****
  
                if (!*arg2 && !*arg3)
!                 arg3 = xstrdup (xml_get_assoc_for_id (arg1_id));
  
                if (*arg2 || *arg3)
--- 111,118 ----
  
                if (!*arg2 && !*arg3)
!                 {
!                   free (arg3);
!                   arg3 = xstrdup (xml_get_assoc_for_id (arg1_id));
!                 }
  
                if (*arg2 || *arg3)
***************
*** 140,143 ****
--- 146,152 ----
        else if (xml)
          {
+           if (!ref_flag)
+             add_word_args ("%s", px_ref_flag ? _("see ") : _("See "));
+ 
            xml_insert_element (XREF, START);
            xml_insert_element (XREFNODENAME, START);