X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=sherlock%2Fxml%2Fxml.h;h=ac9ebefb70f8a88ab6f1056326dd876eb0e44002;hb=83400e61386e912475562889bfb2c39dc5ecf6d0;hp=bd4f9ffe522eadabacd46580b243e817e367e4ce;hpb=5da13cd16371faa6df5b880387b5b172a1704aef;p=libucw.git

diff --git a/sherlock/xml/xml.h b/sherlock/xml/xml.h
index bd4f9ffe..ac9ebefb 100644
--- a/sherlock/xml/xml.h
+++ b/sherlock/xml/xml.h
@@ -88,10 +88,8 @@ enum xml_flags {
   XML_HAS_INTERNAL_SUBSET =		0x00080000,	/* The document contains an internal subset */
   XML_SRC_EOF =				0x00100000,	/* EOF reached */
   XML_SRC_EXPECTED_DECL =		0x00200000,	/* Just before optional or required XMLDecl/TextDecl */
-  XML_SRC_NEW_LINE =			0x00400000,	/* The last read character is 0xD */
-  XML_SRC_SURROUND =			0x00800000,	/* Surround the text with 0x20 (references to parameter entities) */
-  XML_SRC_DOCUMENT =			0x01000000,	/* The document entity */
-  XML_SRC_EXTERNAL =			0x02000000,	/* An external entity */
+  XML_SRC_DOCUMENT =			0x00400000,	/* The document entity */
+  XML_SRC_EXTERNAL =			0x00800000,	/* An external entity */
 };
 
 enum xml_node_type {
@@ -151,6 +149,7 @@ struct xml_source {
   void (*refill)(struct xml_context *ctx);		/* Callback to decode source characters to the buffer */
   unsigned short *refill_in_to_x;			/* Libcharset input table */
   uns saved_depth;					/* Saved ctx->depth */
+  uns pending_0xd;					/* The last read character is 0xD */
 };
 
 struct xml_context {
@@ -211,11 +210,6 @@ struct xml_context {
   struct xml_dtd *dtd;					/* The DTD structure (or NULL) */
   uns state;						/* Current state for the PULL interface (XML_STATE_x) */
   uns pull;						/* Parameters for the PULL interface (XML_PULL_x) */
-
-  void (*start_entity)(struct xml_context *ctx);
-  void (*end_entity)(struct xml_context *ctx);
-  void (*notation_decl)(struct xml_context *ctx);
-  void (*unparsed_entity_decl)(struct xml_context *ctx);
 };
 
 /* Initialize XML context */