texinfo update (Sat Feb 5 12:52:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.459
retrieving revision 1.461
diff -c -r1.459 -r1.461
*** ChangeLog   31 Jan 2005 01:05:43 -0000      1.459
--- ChangeLog   5 Feb 2005 17:44:01 -0000       1.461
***************
*** 1,3 ****
--- 1,17 ----
+ 2005-02-05  Per Bothner  <address@hidden>
+ 
+       * makeinfo/xml.c (docbook_element_list): Add two missing entries.
+ 
+       * makeinfo/xml.c (xml_begin_document): Check for mipatch between
+       enum xml_element and texinfoml_element_list/docbook_element_list.
+ 
+       bug-texinfo-mail, 05 Feb 2005 00:13:44 -0800.
+ 
+ 2005-02-05  Per Bothner  <address@hidden>
+ 
+       * makeinfo/xref.c (cm_uref): Ulink urls in Docbook need to be
+               html-escaped.  bug-texinfo mail, 05 Feb 2005 00:57:55 -0800.
+ 
  2005-01-30  Karl Berry  <address@hidden>
  
        * doc/texinfo.tex (\chapmacro) <Ynothingkeyword>: failed to
Index: makeinfo/xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -c -r1.53 -r1.54
*** makeinfo/xml.c      17 Jan 2005 00:25:15 -0000      1.53
--- makeinfo/xml.c      5 Feb 2005 17:44:01 -0000       1.54
***************
*** 1,5 ****
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.53 2005/01/17 00:25:15 karl Exp $
  
     Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
--- 1,5 ----
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.54 2005/02/05 17:44:01 karl Exp $
  
     Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
***************
*** 329,334 ****
--- 329,336 ----
    { "wordasword",          0, 1, 0 }, /* I */
    { "emphasis",            0, 1, 0 }, /* B */
    { "",                    0, 1, 0 }, /* R */
+   { "",                    0, 1, 0 }, /* SLANTED */
+   { "",                    0, 1, 0 }, /* SANSSERIF */
  
    { "",                    0, 0, 0 }, /* EXDENT */
  
***************
*** 635,640 ****
--- 637,649 ----
        insert_string ("/texinfo.dtd\">");
        xml_element_list = texinfoml_element_list;
      }
+ 
+   if (strcmp (xml_element_list[PARA].name, "para"))
+     {
+       printf ("internal error: xml_element_list table inconsistent");
+       xexit (-1);
+     }
+ 
    if (language_code != last_language_code)
      {
        if (docbook)
Index: makeinfo/xref.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xref.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** makeinfo/xref.c     15 Jan 2005 23:30:07 -0000      1.5
--- makeinfo/xref.c     5 Feb 2005 17:40:59 -0000       1.6
***************
*** 1,5 ****
  /* xref.c -- cross references for Texinfo.
!    $Id: xref.c,v 1.5 2005/01/15 23:30:07 karl Exp $
  
     Copyright (C) 2004 Free Software Foundation, Inc.
  
--- 1,5 ----
  /* xref.c -- cross references for Texinfo.
!    $Id: xref.c,v 1.6 2005/02/05 17:40:59 karl Exp $
  
     Copyright (C) 2004 Free Software Foundation, Inc.
  
***************
*** 495,501 ****
        if (docbook)
          {
            xml_insert_element_with_attribute (UREF, START, "url=\"%s\"",
!               text_expansion (url));
            if (*replacement)
              execute_string ("%s", replacement);
            else if (*desc)
--- 495,501 ----
        if (docbook)
          {
            xml_insert_element_with_attribute (UREF, START, "url=\"%s\"",
!                                            maybe_escaped_expansion (url, 0, 
1));
            if (*replacement)
              execute_string ("%s", replacement);
            else if (*desc)
P ChangeLog
P makeinfo/xml.c
P makeinfo/xref.c