From 64d11249a51c1a10e87b51bc1fa633d4605d483e Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Wed, 15 Aug 2012 09:10:50 +0800 Subject: [PATCH] Fix missing xmlsave.h module which was ignored in recent builds due to "save.h" rule discarding it too --- doc/apibuild.py | 8 +- doc/libxml2-api.xml | 149 ++++++++++++++++++++- doc/libxml2-refs.xml | 311 +++++++++++++++++++++++++++++++++++++------ libxml2.syms | 23 ++++ 4 files changed, 439 insertions(+), 52 deletions(-) diff --git a/doc/apibuild.py b/doc/apibuild.py index c9d51737..f7383e1c 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -55,7 +55,7 @@ ignored_files = { "xzlib.h": "Internal API only 2.8.0", "buf.h": "Internal API only 2.9.0", "enc.h": "Internal API only 2.9.0", - "save.h": "Internal API only 2.9.0", + "/save.h": "Internal API only 2.9.0", } ignored_words = { @@ -1681,7 +1681,8 @@ class docBuilder: skip = 0 for excl in self.excludes: if string.find(file, excl) != -1: - skip = 1; + print "Skipping %s" % file + skip = 1 break if skip == 0: self.modules[file] = None; @@ -1690,7 +1691,8 @@ class docBuilder: skip = 0 for excl in self.excludes: if string.find(file, excl) != -1: - skip = 1; + print "Skipping %s" % file + skip = 1 break if skip == 0: self.headers[file] = None; diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 9c6d38a0..16f7a63e 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -717,10 +717,11 @@ + - + @@ -3022,6 +3023,32 @@ + + the XML document serializer + API to save document or subtree of document + Daniel Veillard + + + + + + + + + + + + + + + + + + + + + + incomplete XML Schemas structure implementation interface to the XML Schemas handling and schema validity checking, it is incomplete right now. @@ -3067,12 +3094,14 @@ + + @@ -3081,6 +3110,7 @@ + @@ -5086,6 +5116,7 @@ and not by parsing an instance'/> + @@ -5094,7 +5125,7 @@ crash if you try to modify the tree)'/> - + @@ -5306,10 +5337,18 @@ crash if you try to modify the tree)'/> + + + + + + + + @@ -6551,6 +6590,9 @@ actually an xmlCharEncoding'/> + + + @@ -10172,7 +10214,7 @@ Could we use @subtypes for this?'/> - Get line number of @node. This requires activation of this option before invoking the parser by calling xmlLineNumbersDefault(1) + Get line number of @node. Try to override the limitation of lines being store in 16 bits ints if XML_PARSE_BIG_LINES parser option was used @@ -11024,14 +11066,14 @@ Could we use @subtypes for this?'/> defined(LIBXML_MODULES_ENABLED) - Opens a module/shared library given its name or path TODO: options are not yet implemented. + Opens a module/shared library given its name or path NOTE: that due to portability issues, behaviour can only be guaranteed with @name using ASCII. We canot guarantee that an UTF-8 string would work, which is why name is a const char * and not a const xmlChar * . TODO: options are not yet implemented. defined(LIBXML_MODULES_ENABLED) - Lookup for a symbol address in the given module + Lookup for a symbol address in the given module NOTE: that due to portability issues, behaviour can only be guaranteed with @name using ASCII. We canot guarantee that an UTF-8 string would work, which is why name is a const char * and not a const xmlChar * . @@ -13440,6 +13482,19 @@ Could we use @subtypes for this?'/> + + defined(LIBXML_OUTPUT_ENABLED) + Close a document saving context, i.e. make sure that all bytes have been output and free the associated data. + + + + + defined(LIBXML_OUTPUT_ENABLED) + Save a full document to a saving context TODO: The function is not fully implemented yet as it does not return the byte count but 0 instead + + + + defined(LIBXML_OUTPUT_ENABLED) Dump an XML document to a file. Will use compression if compiled in and enabled. If @filename is "-" the stdout file is used. @@ -13463,6 +13518,12 @@ Could we use @subtypes for this?'/> + + defined(LIBXML_OUTPUT_ENABLED) + Flush a document saving context, i.e. make sure that all bytes have been output. + + + defined(LIBXML_OUTPUT_ENABLED) Dump an XML document to a file. Will use compression if compiled in and enabled. If @filename is "-" the stdout file is used. If @format is set then the document will be indented on output. Note that @format = 1 provide node indenting only if xmlIndentTreeOutput = 1 or xmlKeepBlanksDefault(0) was called @@ -13489,6 +13550,61 @@ Could we use @subtypes for this?'/> + + defined(LIBXML_OUTPUT_ENABLED) + Set a custom escaping function to be used for text in attribute content + + + + + + defined(LIBXML_OUTPUT_ENABLED) + Set a custom escaping function to be used for text in element content + + + + + + defined(LIBXML_OUTPUT_ENABLED) + Create a document saving context serializing to a buffer with the encoding and the options given + + + + + + + defined(LIBXML_OUTPUT_ENABLED) + Create a document saving context serializing to a file descriptor with the encoding and the options given. + + + + + + + defined(LIBXML_OUTPUT_ENABLED) + Create a document saving context serializing to a filename or possibly to an URL (but this is less reliable) with the encoding and the options given. + + + + + + + defined(LIBXML_OUTPUT_ENABLED) + Create a document saving context serializing to a file descriptor with the encoding and the options given + + + + + + + + + defined(LIBXML_OUTPUT_ENABLED) + Save a subtree starting at the node parameter to a saving context TODO: The function is not fully implemented yet as it does not return the byte count but 0 instead + + + + Save the URI as an escaped string @@ -13895,6 +14011,21 @@ Could we use @subtypes for this?'/> + + defined(LIBXML_SCHEMAS_ENABLED) + Workaround to provide file error reporting information when this is not provided by current APIs + + + + + + defined(LIBXML_SCHEMAS_ENABLED) + Allows to set a locator function to the validation context, which will be used to provide file and line information since those are not provided as part of the SAX validation flow Setting @f to NULL disable the locator. + + + + + defined(LIBXML_SCHEMAS_ENABLED) Validate an input based on a flow of SAX event from the parser and forward the events to the @sax handler with the provided @user_data the user provided @sax handler must be a SAX2 one. @@ -13913,6 +14044,14 @@ Could we use @subtypes for this?'/> + + defined(LIBXML_SCHEMAS_ENABLED) + A schemas validation locator, a callback called by the validator. This is used when file or node informations are not available to find out what file and line number are affected + + + + + defined(LIBXML_SCHEMAS_ENABLED) Signature of a warning callback from an XSD validation diff --git a/doc/libxml2-refs.xml b/doc/libxml2-refs.xml index 8be77ef3..c74811d7 100644 --- a/doc/libxml2-refs.xml +++ b/doc/libxml2-refs.xml @@ -586,6 +586,7 @@ + @@ -804,10 +805,18 @@ + + + + + + + + @@ -2703,13 +2712,26 @@ + + + + + + + + + + + + + @@ -2802,8 +2824,11 @@ + + + @@ -4155,6 +4180,7 @@ + @@ -4373,10 +4399,18 @@ + + + + + + + + @@ -6308,13 +6342,26 @@ + + + + + + + + + + + + + @@ -6407,8 +6454,11 @@ + + + @@ -7257,6 +7307,8 @@ + + @@ -7801,6 +7853,12 @@ + + + + + + @@ -8013,6 +8071,7 @@ + @@ -8624,6 +8683,7 @@ + @@ -8860,12 +8920,15 @@ + + + @@ -9020,6 +9083,7 @@ + @@ -9137,6 +9201,8 @@ + + @@ -9264,6 +9330,7 @@ + @@ -9676,6 +9743,7 @@ + @@ -9849,6 +9917,7 @@ + @@ -9859,6 +9928,7 @@ + @@ -10128,6 +10198,14 @@ + + + + + + + + @@ -10207,6 +10285,8 @@ + + @@ -10218,6 +10298,9 @@ + + + @@ -11275,6 +11358,7 @@ + @@ -13543,6 +13627,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -13605,8 +13712,11 @@ + + + @@ -14303,6 +14413,7 @@ + @@ -14316,6 +14427,8 @@ + + @@ -14408,6 +14521,7 @@ + @@ -14946,6 +15060,7 @@ + @@ -15771,6 +15886,7 @@ + @@ -16575,6 +16691,8 @@ + + @@ -17537,6 +17655,8 @@ + + @@ -17661,6 +17781,9 @@ + + + @@ -17889,6 +18012,8 @@ + + @@ -18032,6 +18157,7 @@ + @@ -18368,6 +18494,9 @@ + + + @@ -18505,6 +18634,9 @@ + + + @@ -18782,9 +18914,6 @@ - - - @@ -18916,6 +19045,9 @@ + + + @@ -19599,7 +19731,6 @@ - @@ -19648,6 +19779,8 @@ + + @@ -19697,6 +19830,9 @@ + + + @@ -19919,7 +20055,6 @@ - @@ -19973,6 +20108,10 @@ + + + + @@ -20286,6 +20425,7 @@ + @@ -20716,6 +20856,10 @@ + + + + @@ -21035,6 +21179,8 @@ + + @@ -21145,6 +21291,8 @@ + + @@ -21523,6 +21671,8 @@ + + @@ -21747,6 +21897,7 @@ + @@ -21840,38 +21991,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21981,6 +22100,10 @@ + + + + @@ -22414,6 +22537,8 @@ + + @@ -22879,6 +23004,7 @@ + @@ -22969,6 +23095,7 @@ + @@ -23148,6 +23275,7 @@ + @@ -23157,6 +23285,8 @@ + + @@ -23442,6 +23572,14 @@ + + + + + + + + @@ -23782,6 +23920,8 @@ + + @@ -24074,7 +24214,10 @@ + + + @@ -24103,6 +24246,7 @@ + @@ -24255,6 +24399,8 @@ + + @@ -24360,6 +24506,9 @@ + + + @@ -24369,9 +24518,6 @@ - - - @@ -24387,6 +24533,10 @@ + + + + @@ -24647,6 +24797,7 @@ + @@ -24795,6 +24946,7 @@ + @@ -24805,6 +24957,9 @@ + + + @@ -24904,6 +25059,8 @@ + + @@ -25020,6 +25177,8 @@ + + @@ -26163,6 +26322,10 @@ + + + + @@ -26258,6 +26421,7 @@ + @@ -26291,6 +26455,7 @@ + @@ -26601,6 +26766,8 @@ + + @@ -26644,6 +26811,7 @@ + @@ -27059,6 +27227,8 @@ + + @@ -27580,6 +27750,9 @@ + + + @@ -27700,6 +27873,7 @@ + @@ -27768,7 +27942,6 @@ - @@ -28094,6 +28267,7 @@ + @@ -28118,6 +28292,16 @@ + + + + + + + + + + @@ -28170,6 +28354,7 @@ + @@ -28313,6 +28498,10 @@ + + + + @@ -28321,6 +28510,12 @@ + + + + + + @@ -28529,6 +28724,7 @@ + @@ -28871,6 +29067,7 @@ + @@ -28973,6 +29170,7 @@ + @@ -29242,6 +29440,7 @@ + @@ -29292,6 +29491,8 @@ + + @@ -29377,6 +29578,8 @@ + + @@ -29586,6 +29789,7 @@ + @@ -29708,6 +29912,7 @@ + @@ -30275,6 +30480,9 @@ + + + @@ -30492,6 +30700,7 @@ + @@ -30567,6 +30776,10 @@ + + + + @@ -30655,6 +30868,8 @@ + + @@ -30680,6 +30895,8 @@ + + @@ -30700,6 +30917,7 @@ + @@ -31204,9 +31422,6 @@ - - - @@ -31560,6 +31775,12 @@ + + + + + + @@ -31796,6 +32017,8 @@ + + diff --git a/libxml2.syms b/libxml2.syms index 93eff536..20131016 100644 --- a/libxml2.syms +++ b/libxml2.syms @@ -2244,3 +2244,26 @@ LIBXML2_2.8.0 { xmlInitializeDict; } LIBXML2_2.7.4; +LIBXML2_2.9.0 { + global: + +# tree + xmlBufContent; + xmlBufEnd; + xmlBufGetNodeContent; + xmlBufNodeDump; + xmlBufUse; + +# dict + xmlDictGetUsage; + xmlDictSetLimit; + +# xmlschemas + xmlSchemaValidateSetFilename; + xmlSchemaValidateSetLocator; + +# xmlIO + xmlOutputBufferGetContent; + xmlOutputBufferGetSize; +} LIBXML2_2.8.0; +