Re: XML target: CDATA contains improper escaping

[Torsten Bronger]

Hallöchen!

address@hidden (Karl Berry) writes:

>     Instead, the ]]> must be caught and converted to "]]>".
>
> Ick.
>
> Can you work on a patch?

The attached works for me.  BTW, what is the best way to submit
patches?

address@hidden:~/temp/texinfo/makeinfo> cvs diff -u
cvs diff: Diffing .
Index: insertion.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.55
diff -u -r1.55 insertion.c
--- insertion.c 11 Nov 2004 18:34:28 -0000      1.55
+++ insertion.c 26 Dec 2004 15:35:03 -0000
@@ -1651,8 +1651,6 @@
   else if (xml)
     {
       xml_insert_element (VERBATIM, START);
-      escape_html = 0;
-      add_word ("<![CDATA[");
     }

   while (input_text_offset < input_text_length)
@@ -1693,9 +1691,7 @@
     }
   else if (xml)
     {
-      add_word ("]]>");
       xml_insert_element (VERBATIM, END);
-      escape_html = save_escape_html;
     }

   in_fixed_width_font--;
Index: xml.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.52
diff -u -r1.52 xml.c
--- xml.c       19 Dec 2004 17:02:23 -0000      1.52
+++ xml.c       26 Dec 2004 15:35:04 -0000
@@ -1249,6 +1249,8 @@
       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)



-- 
Torsten Bronger, aquisgrana, europa vetus