Add a GMarkupParseFlags flag for treating CDATA as text.

2006-05-28  Matthias Clasen  <mclasen@redhat.com>

	* glib/gmarkup.h: Add a GMarkupParseFlags flag for
	treating CDATA as text.

	* glib/gmarkup.c (g_markup_parse_context_parse):
	Implement it here.

diff --git a/ChangeLog b/ChangeLog
index fb1f1cc22904f1f11b6ba76c9f757907136aeb08..acd157414218d534af98993d06d44d66ada7ab24 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmarkup.h: Add a GMarkupParseFlags flag for
+       treating CDATA as text. 
+
+       * glib/gmarkup.c (g_markup_parse_context_parse): 
+       Implement it here.
+
 2006-05-28  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/markups/expected-*: Output that test-markup

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index fb1f1cc22904f1f11b6ba76c9f757907136aeb08..acd157414218d534af98993d06d44d66ada7ab24 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2006-05-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gmarkup.h: Add a GMarkupParseFlags flag for
+       treating CDATA as text. 
+
+       * glib/gmarkup.c (g_markup_parse_context_parse): 
+       Implement it here.
+
 2006-05-28  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/markups/expected-*: Output that test-markup

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index b8b1f6f6b76edc08f2c58d0c78a7112af0aaf0d7..3f3870a716f6758cc1594f69c63ebb0253908742 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/tmpl/markup.sgml: Document G_MARKUP_TREAT_CDATA_AS_TEXT.
+
 2006-05-16  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/glib-sections.txt: Add g_ascii_strtoll

diff --git a/docs/reference/glib/tmpl/markup.sgml b/docs/reference/glib/tmpl/markup.sgml
index c14026f32cc7c1112d2e101bad1512027a496fef..29e8efe761a327406fb4e8cbc3db5911a865f66f 100644 (file)
--- a/docs/reference/glib/tmpl/markup.sgml
+++ b/docs/reference/glib/tmpl/markup.sgml
@@ -115,11 +115,16 @@ error domains.
 
 <!-- ##### ENUM GMarkupParseFlags ##### -->
 <para>
-There are no flags right now. Pass "0" for the flags argument to all 
-functions.
+Flags that affect the behaviour of the parser. 
 </para>
 
 @G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG: flag you should not use.
+@G_MARKUP_TREAT_CDATA_AS_TEXT: When this flag is set, CDATA marked
+  sections are not passed literally to the @passthrough function of
+  the parser. Instead, the content of the section (without the 
+  <literal>&lt;![CDATA[</literal> and <literal>]]&gt;</literal>) is
+  passed to the @text function. This flag was added in GLib 2.12. 
+
 
 <!-- ##### STRUCT GMarkupParseContext ##### -->
 <para>
@@ -141,14 +146,22 @@ g_markup_parse_context_parse() will report that error back to its caller.
 </para>
 
 @start_element: Callback to invoke when the opening tag of an element
-is seen.
-@end_element: Callback to invoke when the closing tag of an element is seen
+    is seen.
+@end_element: Callback to invoke when the closing tag of an element is seen.
+    Note that this is also called for empty tags like 
+    <literal>&lt;empty/&gt;</literal>.
 @text: Callback to invoke when some text is seen (text is always
-inside an element)
-@passthrough: Callback to invoke for comments, processing
-instructions and doctype declarations; if you're re-writing the parsed document, write the
-passthrough text back out in the same position
-@error: Callback to invoke when an error occurs
+    inside an element). Note that the text of an element may be spread
+    over multiple calls of this function. If the %G_MARKUP_TREAT_CDATA_AS_TEXT
+    flag is set, this function is also called for the content of CDATA marked 
+    sections.
+@passthrough: Callback to invoke for comments, processing instructions 
+    and doctype declarations; if you're re-writing the parsed document, 
+    write the passthrough text back out in the same position. If the
+    %G_MARKUP_TREAT_CDATA_AS_TEXT flag is not set, this function is also 
+    called for CDATA marked sections.
+@error: Callback to invoke when an error occurs.
+
 
 <!-- ##### FUNCTION g_markup_escape_text ##### -->
 <para>

diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index fad05d2c4b65b18ba481fac104d98084048a6a5a..484d448ef741f5bb250985271f5a8e511c4cf593 100644 (file)
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -1646,7 +1646,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
               /* The passthrough hasn't necessarily ended. Merge with
                * partial chunk, leave state unchanged.
                */
-              add_to_partial (context, context->start, context->iter);
+               add_to_partial (context, context->start, context->iter);
             }
           else
             {
@@ -1660,7 +1660,18 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
               advance_char (context); /* advance past close angle */
               add_to_partial (context, context->start, context->iter);
 
-              if (context->parser->passthrough)
+             if (context->flags & G_MARKUP_TREAT_CDATA_AS_TEXT &&
+                 g_str_has_prefix (context->partial_chunk->str, "<![CDATA[") &&
+                 g_str_has_suffix (context->partial_chunk->str, "]]>"))
+               {
+                 if (context->parser->text)
+                   (*context->parser->text) (context,
+                                             context->partial_chunk->str + strlen ("<![CDATA["),
+                                             context->partial_chunk->len - strlen ("<![CDATA[" "]]>"),
+                                             context->user_data,
+                                             &tmp_error);
+               }
+             else if (context->parser->passthrough)
                 (*context->parser->passthrough) (context,
                                                  context->partial_chunk->str,
                                                  context->partial_chunk->len,

diff --git a/glib/gmarkup.h b/glib/gmarkup.h
index 47e3e875346b573267036be2101c11c8bc5cceeb..b272d5ca7653eb43395d7d1c92cfd3d829fa6e11 100644 (file)
--- a/glib/gmarkup.h
+++ b/glib/gmarkup.h
@@ -46,9 +46,8 @@ GQuark g_markup_error_quark (void);
 
 typedef enum
 {
-  /* Hmm, can't think of any at the moment */
-  G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG = 1 << 0
-  
+  G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG = 1 << 0,
+  G_MARKUP_TREAT_CDATA_AS_TEXT              = 1 << 1  
 } GMarkupParseFlags;
 
 typedef struct _GMarkupParseContext GMarkupParseContext;