texinfo update (Sun Jan 16 19:52:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.449
retrieving revision 1.450
diff -c -r1.449 -r1.450
*** ChangeLog   17 Jan 2005 00:20:22 -0000      1.449
--- ChangeLog   17 Jan 2005 00:25:15 -0000      1.450
***************
*** 1,5 ****
--- 1,11 ----
  2005-01-16  Torsten Bronger <address@hidden>
  
+       * makeinfo/insertion.c (handle_verbatim_environment): do HTML
+               conversions, to make ]]> work.
+       * makeinfo/xml.c (xml_add_char): also escape >.
+ 
+ 2005-01-16  Torsten Bronger <address@hidden>
+ 
        * makeinfo/cmds.c (cm_tie): use &nbsp; for HTML, &#xa0; for
                XML/Docbook.
  
Index: makeinfo/insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -c -r1.55 -r1.56
*** makeinfo/insertion.c        11 Nov 2004 18:34:28 -0000      1.55
--- makeinfo/insertion.c        17 Jan 2005 00:25:15 -0000      1.56
***************
*** 1,8 ****
  /* insertion.c -- insertions for Texinfo.
!    $Id: insertion.c,v 1.55 2004/11/11 18:34:28 karl Exp $
  
!    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
!    Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,8 ----
  /* insertion.c -- insertions for Texinfo.
!    $Id: insertion.c,v 1.56 2005/01/17 00:25:15 karl Exp $
  
!    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free
!    Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 1651,1658 ****
    else if (xml)
      {
        xml_insert_element (VERBATIM, START);
-       escape_html = 0;
-       add_word ("<![CDATA[");
      }
  
    while (input_text_offset < input_text_length)
--- 1651,1656 ----
***************
*** 1693,1701 ****
      }
    else if (xml)
      {
-       add_word ("]]>");
        xml_insert_element (VERBATIM, END);
-       escape_html = save_escape_html;
      }
    
    in_fixed_width_font--;
--- 1691,1697 ----
Index: makeinfo/xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -c -r1.52 -r1.53
*** makeinfo/xml.c      19 Dec 2004 17:02:23 -0000      1.52
--- makeinfo/xml.c      17 Jan 2005 00:25:15 -0000      1.53
***************
*** 1,7 ****
  /* xml.c -- xml output.
!    $Id: xml.c,v 1.52 2004/12/19 17:02:23 karl Exp $
  
!    Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,7 ----
  /* 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.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 1249,1254 ****
--- 1249,1256 ----
        insert_string ("&amp;");
    else if (character == '<' && escape_html)
        insert_string ("&lt;");
+   else if (character == '>' && escape_html)
+       insert_string ("&gt;");
    else if (character == '\n' && !xml_keep_space)
      {
        if (!xml_in_para && xml_just_after_element && !multitable_active)
P ChangeLog
P makeinfo/insertion.c
P makeinfo/xml.c