pugixml 1.4

-Memory management + Memory management

pugixml requests the memory needed for document storage in big chunks, and @@ -549,22 +550,21 @@

-Custom memory allocation/deallocation + Custom memory allocation/deallocation functions

- All - memory for tree structure, tree data and XPath objects is allocated via - globally specified functions, which default to malloc/free. You can set - your own allocation functions with set_memory_management function. The - function interfaces are the same as that of malloc/free: +

+ All memory for tree structure, tree data and XPath objects is allocated + via globally specified functions, which default to malloc/free. You can + set your own allocation functions with set_memory_management function. + The function interfaces are the same as that of malloc/free:

typedef void* (*allocation_function)(size_t size);
 typedef void (*deallocation_function)(void* ptr);

- You can use the following accessor - functions to change or get current memory management functions: +

+ You can use the following accessor functions to change or get current memory + management functions:

void set_memory_management_functions(allocation_function allocate, deallocation_function deallocate);
 allocation_function get_memory_allocation_function();
@@ -589,6 +589,7 @@
           This is a simple example of custom memory management (samples/custom_memory_management.cpp):
         
 
+          
 
 void* custom_allocate(size_t size)
 {
@@ -603,6 +604,7 @@
 
         
 
+          
 
 pugi::set_memory_management_functions(custom_allocate, custom_deallocate);
 
@@ -617,7 +619,7 @@

-Memory consumption tuning + Memory consumption tuning

There are several important buffering optimizations in pugixml that rely @@ -629,7 +631,7 @@

These constants can be tuned via configuration defines, as discussed in - Additional configuration + Additional configuration options; it is recommended to set them in pugiconfig.hpp.

PUGIXML_MEMORY_OUTPUT_STACK @@ -649,6 +652,7 @@ using node output from threads with little stack space, decreasing this value can prevent stack overflows. A minimum size of 1 Kb is recommended.

+
PUGIXML_MEMORY_XPATH_PAGE_SIZE @@ -663,7 +667,7 @@

-Document memory management + Document memory management internals

@@ -673,7 +677,7 @@

When the document is loaded from file/buffer, unless an inplace loading - function is used (see Loading document from memory), a complete copy of character + function is used (see Loading document from memory), a complete copy of character stream is made; all names/values of nodes and attributes are allocated in this buffer. This buffer is allocated via a single large allocation and is only freed when document memory is reclaimed (i.e. if the xml_document object is destroyed or if another @@ -711,7 +715,7 @@

-pugixml 1.4 manual | +pugixml 1.5 manual | Overview | Installation | Document: diff --git a/docs/manual/install.html b/docs/manual/install.html index 5675651..af662c1 100644 --- a/docs/manual/install.html +++ b/docs/manual/install.html @@ -4,15 +4,15 @@ Installation - - - + + +

-pugixml 1.4 manual | +pugixml 1.5 manual | Overview | Installation | Document: @@ -28,48 +28,48 @@

-Installation + Installation

-Getting pugixml + Getting pugixml

pugixml is distributed in source form. You can either download a source distribution - or checkout the Subversion repository. + or clone the Git repository.

-Source distributions + Source distributions

You can download the latest source distribution via one of the following links:

https://github.com/zeux/pugixml/releases/download/v1.4/pugixml-1.4.zip
-https://github.com/zeux/pugixml/releases/download/v1.4/pugixml-1.4.tar.gz
+https://github.com/zeux/pugixml/releases/download/v1.5/pugixml-1.5.zip
+https://github.com/zeux/pugixml/releases/download/v1.5/pugixml-1.5.tar.gz
 
 
           The distribution contains library source, documentation (the manual you're
@@ -80,56 +80,54 @@
           line endings. Otherwise the files in both archives are identical.
         
 
-          If you need an older version, you can download it from the version
+          If you need an older version, you can download it from the version
           archive.

-Subversion repository + Git repository

- The Subversion repository is located at http://pugixml.googlecode.com/svn/. - There is a Subversion tag "release-{version}" for each version; - also there is the "latest" tag, which always points to the latest - stable release. + The Git repository is located at https://github.com/zeux/pugixml/. + There is a Git tag "v{version}" for each version; also there + is the "latest" tag, which always points to the latest stable + release.

For example, to checkout the current version, you can use this command:

svn checkout http://pugixml.googlecode.com/svn/tags/release-1.4 pugixml

- To checkout the latest version, you can use this command: -

svn checkout http://pugixml.googlecode.com/svn/tags/latest pugixml

git clone https://github.com/zeux/pugixml
+cd pugixml
+git checkout v1.5
+

The repository contains library source, documentation, code examples and full unit test suite.

- Use latest version tag if you want to automatically get new versions via - svn update. Use other tags if you want to switch to - new versions only explicitly (for example, using svn switch - command). Also please note that Subversion trunk contains the work-in-progress - version of the code; while this means that you can get new features and - bug fixes from trunk without waiting for a new release, this also means - that occasionally the code can be broken in some configurations. + Use latest version tag if you want to automatically get new versions. Use + other tags if you want to switch to new versions only explicitly. Also + please note that the master branch contains the work-in-progress version + of the code; while this means that you can get new features and bug fixes + from master without waiting for a new release, this also means that occasionally + the code can be broken in some configurations.

-Git repository + Subversion repository

- The Subversion repository is mirrored by a Git repository at https://github.com/zeux/pugixml. - The mirror is frequently updated and has the same structure in terms of - tags and contents as Subversion repository. + You can access the Git repository via Subversion using https://github.com/zeux/pugixml + URL. For example, to checkout the current version, you can use this command:

svn checkout https://github.com/zeux/pugixml/tags/v1.5 pugixml

-Building pugixml + Building pugixml

pugixml is distributed in source form without any pre-built binaries; you @@ -139,7 +137,7 @@ The complete pugixml source consists of three files - one source file, pugixml.cpp, and two header files, pugixml.hpp and pugiconfig.hpp. pugixml.hpp is the primary header which you need to include in order to use pugixml classes/functions; - pugiconfig.hpp is a supplementary configuration file (see Additional configuration + pugiconfig.hpp is a supplementary configuration file (see Additional configuration options). The rest of this guide assumes that pugixml.hpp is either in the current directory or in one of include directories of your projects, so that #include "pugixml.hpp" @@ -149,7 +147,7 @@

-Building pugixml as + Building pugixml as a part of another static library/executable

@@ -184,7 +182,7 @@

-Building pugixml as + Building pugixml as a standalone static library

@@ -194,7 +192,7 @@ are project files for Apple XCode3, Code::Blocks, Codelite, Microsoft Visual Studio 2005, 2008, 2010, and configuration scripts for CMake and premake4. You're welcome to submit project files/build scripts for other software; - see Feedback. + see Feedback.

There are two projects for each version of Microsoft Visual Studio: one @@ -247,7 +245,7 @@

-Building pugixml as + Building pugixml as a standalone shared library

@@ -282,10 +280,10 @@

-Using - pugixml in header-only mode + Using pugixml in header-only + mode

It's possible to use pugixml in header-only mode. This means that all source @@ -324,7 +322,7 @@

Note that it is safe to compile pugixml.cpp if PUGIXML_HEADER_ONLY is defined - so if you want to i.e. use header-only mode only in Release - configuration, you can include pugixml.cpp in your project (see Building pugixml as + configuration, you can include pugixml.cpp in your project (see Building pugixml as a part of another static library/executable), and conditionally enable header-only mode in pugiconfig.hpp, i.e.:

@@ -336,7 +334,7 @@

-Additional configuration + Additional configuration options

@@ -358,7 +356,7 @@ as character type) and UTF-16/32 style interface (the in-memory text encoding is assumed to be UTF-16/32, depending on wchar_t size, most functions use wchar_t - as character type). See Unicode interface for more details. + as character type). See Unicode interface for more details.

PUGIXML_NO_XPATH define disables XPath. @@ -388,7 +386,7 @@ is used instead. For example, to specify fixed calling convention, you can define PUGIXML_FUNCTION to i.e. __fastcall. Another - example is DLL import/export attributes in MSVC (see Building pugixml as + example is DLL import/export attributes in MSVC (see Building pugixml as a standalone shared library).

@@ -406,7 +404,7 @@ PUGIXML_MEMORY_PAGE_SIZE, PUGIXML_MEMORY_OUTPUT_STACK and PUGIXML_MEMORY_XPATH_PAGE_SIZE can be used to customize certain important sizes to optimize memory usage - for the application-specific patterns. For details see Memory consumption tuning. + for the application-specific patterns. For details see Memory consumption tuning.

PUGIXML_HAS_LONG_LONG define enables @@ -422,7 +420,7 @@

-Portability + Portability

pugixml is written in standard-compliant C++ with some compiler-specific @@ -502,7 +500,7 @@

-pugixml 1.4 manual | +pugixml 1.5 manual | Overview | Installation | Document: diff --git a/docs/manual/loading.html b/docs/manual/loading.html index e18cde6..d302f73 100644 --- a/docs/manual/loading.html +++ b/docs/manual/loading.html @@ -4,15 +4,15 @@ Loading document - - + +

-pugixml 1.4 manual | +pugixml 1.5 manual | Overview | Installation | Document: @@ -28,16 +28,16 @@

-Loading document + Loading document

Loading document from file
Loading document from memory
Loading document from C++ IOstreams
Handling parsing errors
Parsing options
Encodings
Conformance to W3C specification
Loading document from file
Loading document from memory
Loading document from C++ IOstreams
Handling parsing errors
Parsing options
Encodings
Conformance to W3C specification

pugixml provides several functions for loading XML data from various places @@ -49,26 +49,25 @@ EOL handling or attribute value normalization) can impact parsing speed and thus can be disabled. However for vast majority of XML documents there is no performance difference between different parsing options. Parsing options also - control whether certain XML nodes are parsed; see Parsing options for + control whether certain XML nodes are parsed; see Parsing options for more information.

- XML data is always converted to internal character format (see Unicode interface) + XML data is always converted to internal character format (see Unicode interface) before parsing. pugixml supports all popular Unicode encodings (UTF-8, UTF-16 (big and little endian), UTF-32 (big and little endian); UCS-2 is naturally supported since it's a strict subset of UTF-16) and handles all encoding conversions automatically. Unless explicit encoding is specified, loading functions perform automatic encoding detection based on first few characters of XML data, so in almost all cases you do not have to specify document encoding. Encoding - conversion is described in more detail in Encodings. + conversion is described in more detail in Encodings.

-Loading document from file + Loading document from file

- The - most common source of XML data is files; pugixml provides dedicated functions +

+ The most common source of XML data is files; pugixml provides dedicated functions for loading an XML document from file:

xml_parse_result xml_document::load_file(const char* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
@@ -76,8 +75,8 @@

These functions accept the file path as its first argument, and also two - optional arguments, which specify parsing options (see Parsing options) - and input data encoding (see Encodings). The path has the target + optional arguments, which specify parsing options (see Parsing options) + and input data encoding (see Encodings). The path has the target operating system format, so it can be a relative or absolute one, it should have the delimiters of the target system, it should have the exact case if the target file system is case-sensitive, etc. @@ -95,12 +94,13 @@ The result of the operation is returned in an xml_parse_result object; this object contains the operation status and the related information (i.e. last successfully parsed position in the input file, if parsing fails). - See Handling parsing errors for error handling details. + See Handling parsing errors for error handling details.

This is an example of loading XML document from file (samples/load_file.cpp):

pugi::xml_document doc;
 
@@ -113,19 +113,19 @@

-Loading document from memory + Loading document from memory

- Sometimes XML data should be - loaded from some other source than a file, i.e. HTTP URL; also you may want - to load XML data from file using non-standard functions, i.e. to use your - virtual file system facilities or to load XML from gzip-compressed files. - All these scenarios require loading document from memory. First you should - prepare a contiguous memory block with all XML data; then you have to invoke - one of buffer loading functions. These functions will handle the necessary - encoding conversions, if any, and then will parse the data into the corresponding - XML tree. There are several buffer loading functions, which differ in the - behavior and thus in performance/memory usage: +

+ Sometimes XML data should be loaded from some other source than a file, i.e. + HTTP URL; also you may want to load XML data from file using non-standard + functions, i.e. to use your virtual file system facilities or to load XML + from gzip-compressed files. All these scenarios require loading document + from memory. First you should prepare a contiguous memory block with all + XML data; then you have to invoke one of buffer loading functions. These + functions will handle the necessary encoding conversions, if any, and then + will parse the data into the corresponding XML tree. There are several buffer + loading functions, which differ in the behavior and thus in performance/memory + usage:

xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
 xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
@@ -135,7 +135,7 @@
         All functions accept the buffer which is represented by a pointer to XML
         data, contents, and data
         size in bytes. Also there are two optional arguments, which specify parsing
-        options (see Parsing options) and input data encoding (see Encodings).
+        options (see  Parsing options) and input data encoding (see  Encodings).
         The buffer does not have to be zero-terminated.
       
 
@@ -163,12 +163,11 @@
         is the recommended function if you have to load the document from memory
         and performance is critical.
       
-
-        There is also a simple helper function
-        for cases when you want to load the XML document from null-terminated character
-        string:
+

+        There is also a simple helper function for cases when you want to load the
+        XML document from null-terminated character string:
       
-xml_parse_result xml_document::load(const char_t* contents, unsigned int options = parse_default);
+xml_parse_result xml_document::load_string(const char_t* contents, unsigned int options = parse_default);
 
 
         It is equivalent to calling load_buffer
@@ -184,6 +183,7 @@
         (samples/load_memory.cpp):
       
 
+        
 
 const char source[] = "<mesh name='sphere'><bounds>0 0 1 1</bounds></mesh>";
 size_t size = sizeof(source);
@@ -191,57 +191,61 @@
 
       
 
+        
 
-// You can use load_buffer to load document from immutable memory block:
-pugi::xml_parse_result result = doc.load_buffer(source, size);
+// You can use load_buffer to load document from immutable memory block:
+pugi::xml_parse_result result = doc.load_buffer(source, size);
 
 
       
 
+        
 
-// You can use load_buffer_inplace to load document from mutable memory block; the block's lifetime must exceed that of document
-char* buffer = new char[size];
+// You can use load_buffer_inplace to load document from mutable memory block; the block's lifetime must exceed that of document
+char* buffer = new char[size];
 memcpy(buffer, source, size);
 
-// The block can be allocated by any method; the block is modified during parsing
-pugi::xml_parse_result result = doc.load_buffer_inplace(buffer, size);
+// The block can be allocated by any method; the block is modified during parsing
+pugi::xml_parse_result result = doc.load_buffer_inplace(buffer, size);
 
-// You have to destroy the block yourself after the document is no longer used
-delete[] buffer;
+// You have to destroy the block yourself after the document is no longer used
+delete[] buffer;
 
 
       
 
+        
 
-// You can use load_buffer_inplace_own to load document from mutable memory block and to pass the ownership of this block
-// The block has to be allocated via pugixml allocation function - using i.e. operator new here is incorrect
-char* buffer = static_cast<char*>(pugi::get_memory_allocation_function()(size));
+// You can use load_buffer_inplace_own to load document from mutable memory block and to pass the ownership of this block
+// The block has to be allocated via pugixml allocation function - using i.e. operator new here is incorrect
+char* buffer = static_cast<char*>(pugi::get_memory_allocation_function()(size));
 memcpy(buffer, source, size);
 
-// The block will be deleted by the document
-pugi::xml_parse_result result = doc.load_buffer_inplace_own(buffer, size);
+// The block will be deleted by the document
+pugi::xml_parse_result result = doc.load_buffer_inplace_own(buffer, size);
 
 
       
 
+        
 
-// You can use load to load document from null-terminated strings, for example literals:
-pugi::xml_parse_result result = doc.load("<mesh name='sphere'><bounds>0 0 1 1</bounds></mesh>");
+// You can use load to load document from null-terminated strings, for example literals:
+pugi::xml_parse_result result = doc.load_string("<mesh name='sphere'><bounds>0 0 1 1</bounds></mesh>");

-Loading document from C++ IOstreams + Loading document from C++ IOstreams

- To enhance interoperability, pugixml - provides functions for loading document from any object which implements - C++ std::istream interface. This allows you to load - documents from any standard C++ stream (i.e. file stream) or any third-party - compliant implementation (i.e. Boost Iostreams). There are two functions, - one works with narrow character streams, another handles wide character ones: +

+ To enhance interoperability, pugixml provides functions for loading document + from any object which implements C++ std::istream + interface. This allows you to load documents from any standard C++ stream + (i.e. file stream) or any third-party compliant implementation (i.e. Boost + Iostreams). There are two functions, one works with narrow character streams, + another handles wide character ones:

xml_parse_result xml_document::load(std::istream& stream, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
 xml_parse_result xml_document::load(std::wistream& stream, unsigned int options = parse_default);
@@ -271,6 +275,7 @@
         the sample code for more complex examples involving wide streams and locales:
       
 
+        
 
 std::ifstream stream("weekly-utf-8.xml");
 pugi::xml_parse_result result = doc.load(stream);
@@ -280,14 +285,12 @@

-Handling parsing errors + Handling parsing errors

- All document loading functions return the - parsing result via xml_parse_result - object. It contains parsing status, the offset of last successfully parsed - character from the beginning of the source stream, and the encoding of the - source stream: +

+ All document loading functions return the parsing result via xml_parse_result object. It contains parsing + status, the offset of last successfully parsed character from the beginning + of the source stream, and the encoding of the source stream:

struct xml_parse_result
 {
@@ -299,9 +302,8 @@
     const char* description() const;
 };

- Parsing - status is represented as the xml_parse_status +

+ Parsing status is represented as the xml_parse_status enumeration and can be one of the following:

status_ok

status_file_not_found is only @@ -327,6 +330,7 @@
status_internal_error means that something went horribly wrong; currently this error does not occur

+
status_unrecognized_tag means @@ -373,12 +377,14 @@ indicates an empty or invalid document

- description() member function can be used to convert - parsing status to a string; the returned message is always in English, so - you'll have to write your own function if you need a localized string. However - please note that the exact messages returned by description() function may change from version to version, - so any complex status handling should be based on status +

+ description() + member function can be used to convert parsing status to a string; the returned + message is always in English, so you'll have to write your own function if + you need a localized string. However please note that the exact messages + returned by description() + function may change from version to version, so any complex status handling + should be based on status value. Note that description() returns a char string even in PUGIXML_WCHAR_MODE; you'll have to call as_wide to get the wchar_t string. @@ -393,18 +399,16 @@ attribute attr will contain the string value>some data</node>.

- In addition to the status code, parsing - result has an offset member, - which contains the offset of last successfully parsed character if parsing - failed because of an error in source data; otherwise offset - is 0. For parsing efficiency reasons, pugixml does not track the current - line during parsing; this offset is in units of pugi::char_t - (bytes for character mode, wide characters for wide character mode). Many - text editors support 'Go To Position' feature - you can use it to locate - the exact error position. Alternatively, if you're loading the document from - memory, you can display the error chunk along with the error description - (see the example code below). +

+ In addition to the status code, parsing result has an offset + member, which contains the offset of last successfully parsed character if + parsing failed because of an error in source data; otherwise offset is 0. For parsing efficiency reasons, + pugixml does not track the current line during parsing; this offset is in + units of pugi::char_t (bytes for character + mode, wide characters for wide character mode). Many text editors support + 'Go To Position' feature - you can use it to locate the exact error position. + Alternatively, if you're loading the document from memory, you can display + the error chunk along with the error description (see the example code below).

@@ -417,17 +421,16 @@ track the error position.

- Parsing result also has an encoding member, which can be used to check - that the source data encoding was correctly guessed. It is equal to the exact - encoding used during parsing (i.e. with the exact endianness); see Encodings for - more information. -

- Parsing result object can be implicitly - converted to bool; if you do - not want to handle parsing errors thoroughly, you can just check the return - value of load functions as if it was a bool: +

+ Parsing result also has an encoding + member, which can be used to check that the source data encoding was correctly + guessed. It is equal to the exact encoding used during parsing (i.e. with + the exact endianness); see Encodings for more information. +

+ Parsing result object can be implicitly converted to bool; + if you do not want to handle parsing errors thoroughly, you can just check + the return value of load functions as if it was a bool: if (doc.load_file("file.xml")) { ... } else { ... }.

@@ -435,9 +438,10 @@ This is an example of handling loading errors (samples/load_error_handling.cpp):

pugi::xml_document doc;
-pugi::xml_parse_result result = doc.load(source);
+pugi::xml_parse_result result = doc.load_string(source);
 
 if (result)
     std::cout << "XML [" << source << "] parsed without errors, attr value: [" << doc.child("node").attribute("attr").value() << "]\n\n";
@@ -453,7 +457,7 @@

-Parsing options + Parsing options

All document loading functions accept the optional parameter options. This is a bitmask that customizes @@ -485,12 +489,14 @@ document declaration (node with type node_declaration) is to be put in DOM tree. If this flag is off, it is not put in the tree, but is still parsed and checked for correctness. This flag is off by default.

+

parse_doctype determines if XML document type declaration (node with type node_doctype) is to be put in DOM tree. If this flag is off, it is not put in the tree, but is still parsed and checked for correctness. This flag is off by default.

+

parse_pi determines if processing instructions @@ -498,18 +504,21 @@ in DOM tree. If this flag is off, they are not put in the tree, but are still parsed and checked for correctness. Note that <?xml ...?> (document declaration) is not considered to be a PI. This flag is off by default.

+

parse_comments determines if comments (nodes with type node_comment) are to be put in DOM tree. If this flag is off, they are not put in the tree, but are still parsed and checked for correctness. This flag is off by default.

+

parse_cdata determines if CDATA sections (nodes with type node_cdata) are to be put in DOM tree. If this flag is off, they are not put in the tree, but are still parsed and checked for correctness. This flag is on by default.

+

parse_trim_pcdata determines if leading @@ -518,6 +527,7 @@ often the application only cares about the non-whitespace contents so it's easier to trim whitespace from text during parsing. This flag is off by default.

+

parse_ws_pcdata determines if PCDATA @@ -536,6 +546,7 @@ one child when parse_ws_pcdata is not set. This flag is off by default.

+

parse_ws_pcdata_single determines @@ -554,6 +565,7 @@ This flag has no effect if parse_ws_pcdata is enabled. This flag is off by default.

+

parse_fragment determines if document @@ -598,6 +610,7 @@ ones). If character/entity reference can not be expanded, it is left as is, so you can do additional processing later. Reference expansion is performed on attribute values and PCDATA content. This flag is on by default.

+

parse_eol determines if EOL handling (that @@ -607,6 +620,7 @@ be performed on input data (that is, comments contents, PCDATA/CDATA contents and attribute values). This flag is on by default.

+

parse_wconv_attribute determines @@ -617,6 +631,7 @@ is set, i.e. \r\n is converted to a single space. This flag is on by default.

+

parse_wnorm_attribute determines @@ -656,6 +671,7 @@ so theoretically it is the fastest mode. However, as mentioned above, in practice parse_default is usually equally fast.

+

parse_default is the default set of flags, @@ -665,6 +681,7 @@ in attribute values and performing EOL handling. Note, that PCDATA sections consisting only of whitespace characters are not parsed (by default) for performance reasons.

+

parse_full is the set of flags which adds @@ -681,23 +698,24 @@ This is an example of using different parsing options (samples/load_options.cpp):

const char* source = "<!--comment--><node>&lt;</node>";
 
-// Parsing with default options; note that comment node is not added to the tree, and entity reference &lt; is expanded
-doc.load(source);
+// Parsing with default options; note that comment node is not added to the tree, and entity reference &lt; is expanded
+doc.load_string(source);
 std::cout << "First node value: [" << doc.first_child().value() << "], node child value: [" << doc.child_value("node") << "]\n";
 
-// Parsing with additional parse_comments option; comment node is now added to the tree
-doc.load(source, pugi::parse_default | pugi::parse_comments);
+// Parsing with additional parse_comments option; comment node is now added to the tree
+doc.load_string(source, pugi::parse_default | pugi::parse_comments);
 std::cout << "First node value: [" << doc.first_child().value() << "], node child value: [" << doc.child_value("node") << "]\n";
 
-// Parsing with additional parse_comments option and without the (default) parse_escapes option; &lt; is not expanded
-doc.load(source, (pugi::parse_default | pugi::parse_comments) & ~pugi::parse_escapes);
+// Parsing with additional parse_comments option and without the (default) parse_escapes option; &lt; is not expanded
+doc.load_string(source, (pugi::parse_default | pugi::parse_comments) & ~pugi::parse_escapes);
 std::cout << "First node value: [" << doc.first_child().value() << "], node child value: [" << doc.child_value("node") << "]\n";
 
-// Parsing with minimal option mask; comment node is not added to the tree, and &lt; is not expanded
-doc.load(source, pugi::parse_minimal);
+// Parsing with minimal option mask; comment node is not added to the tree, and &lt; is not expanded
+doc.load_string(source, pugi::parse_minimal);
 std::cout << "First node value: [" << doc.first_child().value() << "], node child value: [" << doc.child_value("node") << "]\n";

@@ -705,15 +723,14 @@

-Encodings + Encodings

- pugixml supports all popular Unicode encodings - (UTF-8, UTF-16 (big and little endian), UTF-32 (big and little endian); UCS-2 - is naturally supported since it's a strict subset of UTF-16) and handles - all encoding conversions. Most loading functions accept the optional parameter - encoding. This is a value - of enumeration type xml_encoding, +

+ pugixml supports all popular Unicode encodings (UTF-8, UTF-16 (big and little + endian), UTF-32 (big and little endian); UCS-2 is naturally supported since + it's a strict subset of UTF-16) and handles all encoding conversions. Most + loading functions accept the optional parameter encoding. + This is a value of enumeration type xml_encoding, that can have the following values:

Otherwise encoding is assumed to be UTF-8.

+

@@ -822,7 +840,7 @@

-Conformance to W3C specification + Conformance to W3C specification

pugixml is not fully W3C conformant - it can load any valid XML document, @@ -879,7 +897,7 @@

-pugixml 1.4 manual | +pugixml 1.5 manual | Overview | Installation | Document: diff --git a/docs/manual/modify.html b/docs/manual/modify.html index 05b0fbe..5e44d90 100644 --- a/docs/manual/modify.html +++ b/docs/manual/modify.html @@ -4,15 +4,15 @@ Modifying document data - - + +

-pugixml 1.4 manual | +pugixml 1.5 manual | Overview | Installation | Document: @@ -28,16 +28,17 @@

-Modifying document data + Modifying document data

Setting node data
Setting attribute data
Adding nodes/attributes
Removing nodes/attributes
Working with text contents
Cloning nodes/attributes
Assembling document from fragments
Setting node data
Setting attribute data
Adding nodes/attributes
Removing nodes/attributes
Working with text contents
Cloning nodes/attributes
Moving nodes
Assembling document from fragments

The document in pugixml is fully mutable: you can completely change the document @@ -61,12 +62,11 @@

-Setting node data + Setting node data

- As discussed - before, nodes can have name and value, both of which are strings. Depending - on node type, name or value may be absent. node_document +

+ As discussed before, nodes can have name and value, both of which are strings. + Depending on node type, name or value may be absent. node_document nodes do not have a name or value, node_element and node_declaration nodes always have a name but never have a value, node_pcdata, @@ -98,31 +98,31 @@ This is an example of setting node name and value (samples/modify_base.cpp):

pugi::xml_node node = doc.child("node");
 
-// change node name
-std::cout << node.set_name("notnode");
+// change node name
+std::cout << node.set_name("notnode");
 std::cout << ", new node name: " << node.name() << std::endl;
 
-// change comment text
-std::cout << doc.last_child().set_value("useless comment");
+// change comment text
+std::cout << doc.last_child().set_value("useless comment");
 std::cout << ", new comment text: " << doc.last_child().value() << std::endl;
 
-// we can't change value of the element or name of the comment
-std::cout << node.set_value("1") << ", " << doc.last_child().set_name("2") << std::endl;
+// we can't change value of the element or name of the comment
+std::cout << node.set_value("1") << ", " << doc.last_child().set_name("2") << std::endl;

-Setting attribute data + Setting attribute data

- All - attributes have name and value, both of which are strings (value may be empty). - You can set them with the following functions: +

+ All attributes have name and value, both of which are strings (value may + be empty). You can set them with the following functions:

bool xml_attribute::set_name(const char_t* rhs);
 bool xml_attribute::set_value(const char_t* rhs);
@@ -177,8 +177,8 @@
           including string conversions.

- For convenience, all set_value +

+ For convenience, all set_value functions have the corresponding assignment operators:

xml_attribute& xml_attribute::operator=(const char_t* rhs);
@@ -199,19 +199,20 @@
         This is an example of setting attribute name and value (samples/modify_base.cpp):
       
 
+        
 
 pugi::xml_attribute attr = node.attribute("id");
 
-// change attribute name/value
-std::cout << attr.set_name("key") << ", " << attr.set_value("345");
+// change attribute name/value
+std::cout << attr.set_name("key") << ", " << attr.set_value("345");
 std::cout << ", new attribute: " << attr.name() << "=" << attr.value() << std::endl;
 
-// we can use numbers or booleans
-attr.set_value(1.234);
+// we can use numbers or booleans
+attr.set_value(1.234);
 std::cout << "new attribute value: " << attr.value() << std::endl;
 
-// we can also use assignment operators for more concise code
-attr = true;
+// we can also use assignment operators for more concise code
+attr = true;
 std::cout << "final attribute value: " << attr.value() << std::endl;
 
 
@@ -219,11 +220,10 @@
 
 

 
-Adding nodes/attributes
+ Adding nodes/attributes
 
-
-        Nodes
-        and attributes do not exist without a document tree, so you can't create
+

+        Nodes and attributes do not exist without a document tree, so you can't create
         them without adding them to some document. A node or attribute can be created
         at the end of node/attribute list or before/after some other node:
       
@@ -317,19 +317,20 @@
         This is an example of adding new attributes/nodes to the document (samples/modify_add.cpp):
       
 
+        
 
-// add node with some name
-pugi::xml_node node = doc.append_child("node");
+// add node with some name
+pugi::xml_node node = doc.append_child("node");
 
-// add description node with text child
-pugi::xml_node descr = node.append_child("description");
+// add description node with text child
+pugi::xml_node descr = node.append_child("description");
 descr.append_child(pugi::node_pcdata).set_value("Simple node");
 
-// add param node before the description
-pugi::xml_node param = node.insert_child_before("param", descr);
+// add param node before the description
+pugi::xml_node param = node.insert_child_before("param", descr);
 
-// add attributes to param node
-param.append_attribute("name") = "version";
+// add attributes to param node
+param.append_attribute("name") = "version";
 param.append_attribute("value") = 1.1;
 param.insert_attribute_after("type", param.attribute("name")) = "float";
 
@@ -338,11 +339,10 @@
 
 
 
-Removing nodes/attributes
+ Removing nodes/attributes
 
-
-        If
-        you do not want your document to contain some node or attribute, you can
+

+        If you do not want your document to contain some node or attribute, you can
         remove it with one of the following functions:
       
 bool xml_node::remove_attribute(const xml_attribute& a);
@@ -394,17 +394,18 @@
         This is an example of removing attributes/nodes from the document (samples/modify_remove.cpp):
       
 
+        
 
-// remove description node with the whole subtree
-pugi::xml_node node = doc.child("node");
+// remove description node with the whole subtree
+pugi::xml_node node = doc.child("node");
 node.remove_child("description");
 
-// remove id attribute
-pugi::xml_node param = node.child("param");
+// remove id attribute
+pugi::xml_node param = node.child("param");
 param.remove_attribute("value");
 
-// we can also remove nodes/attributes by handles
-pugi::xml_attribute id = param.attribute("name");
+// we can also remove nodes/attributes by handles
+pugi::xml_attribute id = param.attribute("name");
 param.remove_attribute(id);
 
 
@@ -412,7 +413,7 @@
 
 
 
-Working with text contents
+ Working with text contents
 
 
         pugixml provides a special class, xml_text,
@@ -421,8 +422,8 @@
         documentation for accessing document data; this section describes
         the modification interface of xml_text.
       
-
-        Once you have an xml_text
+

+        Once you have an xml_text
         object, you can set the text contents using the following function:
       
 bool xml_text::set(const char_t* rhs);
@@ -439,9 +440,9 @@
         an element node, this function creates the PCDATA child node if necessary
         (i.e. if the element node does not have a PCDATA/CDATA child already).
       
-
-        In addition to a string function, several
-        functions are provided for handling text with numbers and booleans as contents:
+

+        In addition to a string function, several functions are provided for handling
+        text with numbers and booleans as contents:
       
 bool xml_text::set(int rhs);
 bool xml_text::set(unsigned int rhs);
@@ -457,8 +458,8 @@
         functions. You can refer to documentation
         for the attribute functions for details.
       
-
-        For convenience, all set
+

+        For convenience, all set
         functions have the corresponding assignment operators:
       
 xml_text& xml_text::operator=(const char_t* rhs);
@@ -480,29 +481,30 @@
         object to modify text contents (samples/text.cpp):
       
 
+        
 
-// change project version
-project.child("version").text() = 1.2;
+// change project version
+project.child("version").text() = 1.2;
 
-// add description element and set the contents
-// note that we do not have to explicitly add the node_pcdata child
-project.append_child("description").text().set("a test project");
+// add description element and set the contents
+// note that we do not have to explicitly add the node_pcdata child
+project.append_child("description").text().set("a test project");
 
 
       
 
 
 
-Cloning nodes/attributes
+ Cloning nodes/attributes
 
-
-        With
-        the help of previously described functions, it is possible to create trees
-        with any contents and structure, including cloning the existing data. However
-        since this is an often needed operation, pugixml provides built-in node/attribute
-        cloning facilities. Since nodes and attributes do not exist without a document
-        tree, you can't create a standalone copy - you have to immediately insert
-        it somewhere in the tree. For this, you can use one of the following functions:
+

+        With the help of previously described functions, it is possible to create
+        trees with any contents and structure, including cloning the existing data.
+        However since this is an often needed operation, pugixml provides built-in
+        node/attribute cloning facilities. Since nodes and attributes do not exist
+        without a document tree, you can't create a standalone copy - you have to
+        immediately insert it somewhere in the tree. For this, you can use one of
+        the following functions:
       
 xml_attribute xml_node::append_copy(const xml_attribute& proto);
 xml_attribute xml_node::prepend_copy(const xml_attribute& proto);
@@ -559,6 +561,7 @@
         node cloning and usage of other document modification functions:
       
 
+        
 
 bool load_preprocess(pugi::xml_document& doc, const char* path);
 
@@ -570,23 +573,23 @@
         {
             pugi::xml_node include = child;
 
-            // load new preprocessed document (note: ideally this should handle relative paths)
-            const char* path = include.value();
+            // load new preprocessed document (note: ideally this should handle relative paths)
+            const char* path = include.value();
 
             pugi::xml_document doc;
             if (!load_preprocess(doc, path)) return false;
 
-            // insert the comment marker above include directive
-            node.insert_child_before(pugi::node_comment, include).set_value(path);
+            // insert the comment marker above include directive
+            node.insert_child_before(pugi::node_comment, include).set_value(path);
 
-            // copy the document above the include directive (this retains the original order!)
-            for (pugi::xml_node ic = doc.first_child(); ic; ic = ic.next_sibling())
+            // copy the document above the include directive (this retains the original order!)
+            for (pugi::xml_node ic = doc.first_child(); ic; ic = ic.next_sibling())
             {
                 node.insert_copy_before(ic, include);
             }
 
-            // remove the include node and move to the next child
-            child = child.next_sibling();
+            // remove the include node and move to the next child
+            child = child.next_sibling();
 
             node.remove_child(include);
         }
@@ -603,8 +606,8 @@
 
 bool load_preprocess(pugi::xml_document& doc, const char* path)
 {
-    pugi::xml_parse_result result = doc.load_file(path, pugi::parse_default | pugi::parse_pi); // for <?include?>
-
+    pugi::xml_parse_result result = doc.load_file(path, pugi::parse_default | pugi::parse_pi); // for <?include?>
+    
     return result ? preprocess(doc) : false;
 }
 
@@ -613,13 +616,64 @@
 
 
 
-Assembling document from fragments
+ Moving nodes
 
+
+        Sometimes instead of cloning a node you need to move an existing node to
+        a different position in a tree. This can be accomplished by copying the node
+        and removing the original; however, this is expensive since it results in
+        a lot of extra operations. For moving nodes within the same document tree,
+        you can use of the following functions instead:
+      
+xml_node xml_node::append_move(const xml_node& moved);
+xml_node xml_node::prepend_move(const xml_node& moved);
+xml_node xml_node::insert_move_after(const xml_node& moved, const xml_node& node);
+xml_node xml_node::insert_move_before(const xml_node& moved, const xml_node& node);
+
+
+        These functions mirror the structure of append_copy,
+        prepend_copy, insert_copy_before and insert_copy_after
+        - they take the handle to the moved object and move it to the appropriate
+        place with all attributes and/or child nodes. The functions return the handle
+        to the resulting object (which is the same as the moved object), or null
+        handle on failure.
+      
 
-        pugixml provides several ways to assemble
-        an XML document from other XML documents. Assuming there is a set of document
-        fragments, represented as in-memory buffers, the implementation choices are
-        as follows:
+        The failure conditions resemble those of append_child,
+        insert_child_before and related
+        functions, consult their documentation
+        for more information. There are additional caveats specific to moving
+        functions:
+      
+
+
+            Moving null handles results in operation failure;
+          
+
+            Moving is only possible for nodes that belong to the same document; attempting
+            to move nodes between documents will fail.
+          
+
+            insert_move_after and
+            insert_move_before functions
+            fail if the moved node is the same as the node
+            argument (this operation would be a no-op otherwise).
+          
+
+            It is impossible to move a subtree to a child of some node inside this
+            subtree, i.e. node.append_move(node.parent().parent());
+            will fail.
+          
+
+
+
+
+ Assembling document from fragments
+
+
+        pugixml provides several ways to assemble an XML document from other XML
+        documents. Assuming there is a set of document fragments, represented as
+        in-memory buffers, the implementation choices are as follows:
       
 
             Use a temporary document to parse the data from a string, then clone
@@ -668,10 +722,10 @@
         - the input buffer is a byte buffer, with size in bytes; the buffer is not
         modified and can be freed after the function returns.
       
-
-        Since append_buffer
-        needs to append child nodes to the current node, it only works if the current
-        node is either document or element node. Calling append_buffer
+

+        Since append_buffer needs
+        to append child nodes to the current node, it only works if the current node
+        is either document or element node. Calling append_buffer
         on a node with any other type results in an error with status_append_invalid_root
         status.
       
@@ -687,7 +741,7 @@
 
 
 
-pugixml 1.4 manual |
+pugixml 1.5 manual |
 		Overview |
 		Installation |
 		Document:
diff --git a/docs/manual/saving.html b/docs/manual/saving.html
index 2c05a7b..7157d84 100644
--- a/docs/manual/saving.html
+++ b/docs/manual/saving.html
@@ -4,15 +4,15 @@
 Saving document
 
 
-
-
+
+
 
 
 
 
 
 
-pugixml 1.4 manual |
+pugixml 1.5 manual |
 		Overview |
 		Installation |
 		Document:
@@ -28,16 +28,16 @@
 
 
 
-Saving document
+ Saving document
 
 
-Saving document to a file
-Saving document to C++ IOstreams
-Saving document via writer interface
-Saving a single subtree
-Output options
-Encodings
-Customizing document declaration
+ Saving document to a file
+ Saving document to C++ IOstreams
+ Saving document via writer interface
+ Saving a single subtree
+ Output options
+ Encodings
+ Customizing document declaration
 
 
       Often after creating a new document or loading the existing one and processing
@@ -46,8 +46,8 @@
       include debug printing, serialization via network or other text-oriented medium,
       etc. pugixml provides several functions to output any subtree of the document
       to a file, stream or another generic transport interface; these functions allow
-      to customize the output format (see Output options), and also perform
-      necessary encoding conversions (see Encodings). This section documents
+      to customize the output format (see  Output options), and also perform
+      necessary encoding conversions (see  Encodings). This section documents
       the relevant functionality.
     
 
@@ -68,20 +68,19 @@
     
 
 
-Saving document to a file
+ Saving document to a file
 
-
-        If
-        you want to save the whole document to a file, you can use one of the following
-        functions:
+

+        If you want to save the whole document to a file, you can use one of the
+        following functions:
       
 bool xml_document::save_file(const char* path, const char_t* indent = "\t", unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
 bool xml_document::save_file(const wchar_t* path, const char_t* indent = "\t", unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
 
 
         These functions accept file path as its first argument, and also three optional
-        arguments, which specify indentation and other output options (see Output options)
-        and output data encoding (see Encodings). The path has the target
+        arguments, which specify indentation and other output options (see  Output options)
+        and output data encoding (see  Encodings). The path has the target
         operating system format, so it can be a relative or absolute one, it should
         have the delimiters of the target system, it should have the exact case if
         the target file system is case-sensitive, etc.
@@ -93,39 +92,38 @@
         a special file opening function if it is provided by the runtime library
         or converts the path to UTF-8 and uses the system file opening function.
       
-
-        save_file
-        opens the target file for writing, outputs the requested header (by default
-        a document declaration is output, unless the document already has one), and
-        then saves the document contents. If the file could not be opened, the function
-        returns false. Calling save_file is equivalent to creating an
-        xml_writer_file object with
-        FILE*
+

+        save_file opens the target
+        file for writing, outputs the requested header (by default a document declaration
+        is output, unless the document already has one), and then saves the document
+        contents. If the file could not be opened, the function returns false. Calling save_file
+        is equivalent to creating an xml_writer_file
+        object with FILE*
         handle as the only constructor argument and then calling save;
-        see Saving document via writer interface for writer interface details.
+        see  Saving document via writer interface for writer interface details.
       
 
         This is a simple example of saving XML document to file (samples/save_file.cpp):
       
 
+        
 
-// save document to file
-std::cout << "Saving result: " << doc.save_file("save_file_output.xml") << std::endl;
+// save document to file
+std::cout << "Saving result: " << doc.save_file("save_file_output.xml") << std::endl;
 
 
       
 
 
 
-Saving document to C++ IOstreams
+ Saving document to C++ IOstreams
 
-
-        To enhance interoperability pugixml
-        provides functions for saving document to any object which implements C++
-        std::ostream interface. This allows you to save
-        documents to any standard C++ stream (i.e. file stream) or any third-party
-        compliant implementation (i.e. Boost Iostreams). Most notably, this allows
-        for easy debug output, since you can use std::cout
+

+        To enhance interoperability pugixml provides functions for saving document
+        to any object which implements C++ std::ostream
+        interface. This allows you to save documents to any standard C++ stream (i.e.
+        file stream) or any third-party compliant implementation (i.e. Boost Iostreams).
+        Most notably, this allows for easy debug output, since you can use std::cout
         stream as saving target. There are two functions, one works with narrow character
         streams, another handles wide character ones:
       
@@ -145,19 +143,20 @@
         you with the ability to save documents to non-Unicode encodings, i.e. you
         can save Shift-JIS encoded data if you set the correct locale.
       
-
-        Calling save
-        with stream target is equivalent to creating an xml_writer_stream
-        object with stream as the only constructor argument and then calling save; see Saving document via writer interface for writer
+

+        Calling save with stream
+        target is equivalent to creating an xml_writer_stream
+        object with stream as the only constructor argument and then calling save; see  Saving document via writer interface for writer
         interface details.
       
 
         This is a simple example of saving XML document to standard output (samples/save_stream.cpp):
       
 
+        
 
-// save document to standard output
-std::cout << "Document:\n";
+// save document to standard output
+std::cout << "Document:\n";
 doc.save(std::cout);
 
 
@@ -165,11 +164,10 @@
 
 
 
-Saving document via writer interface
+ Saving document via writer interface
 
-
-        All
-        of the above saving functions are implemented in terms of writer interface.
+

+        All of the above saving functions are implemented in terms of writer interface.
         This is a simple interface with a single function, which is called several
         times during output process with chunks of document data as input:
       
@@ -205,6 +203,7 @@
         read the sample code for more complex examples:
       
 
+        
 
 struct xml_string_writer: pugi::xml_writer
 {
@@ -221,11 +220,10 @@
 
 
 
-Saving a single subtree
+ Saving a single subtree
 
-
-        While
-        the previously described functions save the whole document to the destination,
+

+        While the previously described functions save the whole document to the destination,
         it is easy to save a single subtree. The following functions are provided:
       
 void xml_node::print(std::ostream& os, const char_t* indent = "\t", unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
@@ -248,21 +246,22 @@
         illustrates the difference:
       
 
+        
 
-// get a test document
-pugi::xml_document doc;
-doc.load("<foo bar='baz'><call>hey</call></foo>");
+// get a test document
+pugi::xml_document doc;
+doc.load_string("<foo bar='baz'><call>hey</call></foo>");
 
-// print document to standard output (prints <?xml version="1.0"?><foo bar="baz"><call>hey</call></foo>)
-doc.save(std::cout, "", pugi::format_raw);
+// print document to standard output (prints <?xml version="1.0"?><foo bar="baz"><call>hey</call></foo>)
+doc.save(std::cout, "", pugi::format_raw);
 std::cout << std::endl;
 
-// print document to standard output as a regular node (prints <foo bar="baz"><call>hey</call></foo>)
-doc.print(std::cout, "", pugi::format_raw);
+// print document to standard output as a regular node (prints <foo bar="baz"><call>hey</call></foo>)
+doc.print(std::cout, "", pugi::format_raw);
 std::cout << std::endl;
 
-// print a subtree to standard output (prints <call>hey</call>)
-doc.child("foo").child("call").print(std::cout, "", pugi::format_raw);
+// print a subtree to standard output (prints <call>hey</call>)
+doc.child("foo").child("call").print(std::cout, "", pugi::format_raw);
 std::cout << std::endl;
 
 
@@ -270,7 +269,7 @@
 
 
 
-Output options
+ Output options
 
 
         All saving functions accept the optional parameter flags.
@@ -302,6 +301,7 @@
             node's depth relative to the output subtree. This flag has no effect
             if format_raw is enabled. This flag
             is on by default. 


+
           
 

             format_raw switches between formatted and
@@ -312,6 +312,7 @@
             with parse_ws_pcdata flag, to
             preserve the original document formatting as much as possible. This flag
             is off by default. 


+
           
 
             format_no_escapes disables output
@@ -337,6 +338,7 @@
             the document contents. Enabling this flag disables this declaration.
             This flag has no effect in xml_node::print
             functions: they never output the default declaration. This flag is off by default. 


+
           
 
             format_write_bom enables Byte Order
@@ -372,43 +374,44 @@
         This is an example that shows the outputs of different output options (samples/save_options.cpp):
       
 
+        
 
-// get a test document
-pugi::xml_document doc;
-doc.load("<foo bar='baz'><call>hey</call></foo>");
+// get a test document
+pugi::xml_document doc;
+doc.load_string("<foo bar='baz'><call>hey</call></foo>");
 
-// default options; prints
-// <?xml version="1.0"?>
-// <foo bar="baz">
-//         <call>hey</call>
-// </foo>
-doc.save(std::cout);
+// default options; prints
+// <?xml version="1.0"?>
+// <foo bar="baz">
+//         <call>hey</call>
+// </foo>
+doc.save(std::cout);
 std::cout << std::endl;
 
-// default options with custom indentation string; prints
-// <?xml version="1.0"?>
-// <foo bar="baz">
-// --<call>hey</call>
-// </foo>
-doc.save(std::cout, "--");
+// default options with custom indentation string; prints
+// <?xml version="1.0"?>
+// <foo bar="baz">
+// --<call>hey</call>
+// </foo>
+doc.save(std::cout, "--");
 std::cout << std::endl;
 
-// default options without indentation; prints
-// <?xml version="1.0"?>
-// <foo bar="baz">
-// <call>hey</call>
-// </foo>
-doc.save(std::cout, "\t", pugi::format_default & ~pugi::format_indent); // can also pass "" instead of indentation string for the same effect
-std::cout << std::endl;
+// default options without indentation; prints
+// <?xml version="1.0"?>
+// <foo bar="baz">
+// <call>hey</call>
+// </foo>
+doc.save(std::cout, "\t", pugi::format_default & ~pugi::format_indent); // can also pass "" instead of indentation string for the same effect
+std::cout << std::endl;
 
-// raw output; prints
-// <?xml version="1.0"?><foo bar="baz"><call>hey</call></foo>
-doc.save(std::cout, "\t", pugi::format_raw);
+// raw output; prints
+// <?xml version="1.0"?><foo bar="baz"><call>hey</call></foo>
+doc.save(std::cout, "\t", pugi::format_raw);
 std::cout << std::endl << std::endl;
 
-// raw output without declaration; prints
-// <foo bar="baz"><call>hey</call></foo>
-doc.save(std::cout, "\t", pugi::format_raw | pugi::format_no_declaration);
+// raw output without declaration; prints
+// <foo bar="baz"><call>hey</call></foo>
+doc.save(std::cout, "\t", pugi::format_raw | pugi::format_no_declaration);
 std::cout << std::endl;
 
 
@@ -416,7 +419,7 @@
 
 
 
-Encodings
+ Encodings
 
 
         pugixml supports all popular Unicode encodings (UTF-8, UTF-16 (big and little
@@ -424,7 +427,7 @@
         it's a strict subset of UTF-16) and handles all encoding conversions during
         output. The output encoding is set via the encoding
         parameter of saving functions, which is of type xml_encoding.
-        The possible values for the encoding are documented in Encodings;
+        The possible values for the encoding are documented in  Encodings;
         the only flag that has a different meaning is encoding_auto.
       
 
@@ -457,7 +460,7 @@
 
 
 
-Customizing document declaration
+ Customizing document declaration
 
 
         When you are saving the document using xml_document::save() or xml_document::save_file(), a default XML document declaration is
@@ -490,22 +493,23 @@
         This is an example that shows how to create a custom declaration node (samples/save_declaration.cpp):
       
 
+        
 
-// get a test document
-pugi::xml_document doc;
-doc.load("<foo bar='baz'><call>hey</call></foo>");
+// get a test document
+pugi::xml_document doc;
+doc.load_string("<foo bar='baz'><call>hey</call></foo>");
 
-// add a custom declaration node
-pugi::xml_node decl = doc.prepend_child(pugi::node_declaration);
+// add a custom declaration node
+pugi::xml_node decl = doc.prepend_child(pugi::node_declaration);
 decl.append_attribute("version") = "1.0";
 decl.append_attribute("encoding") = "UTF-8";
 decl.append_attribute("standalone") = "no";
 
-// <?xml version="1.0" encoding="UTF-8" standalone="no"?> 
-// <foo bar="baz">
-//         <call>hey</call>
-// </foo>
-doc.save(std::cout);
+// <?xml version="1.0" encoding="UTF-8" standalone="no"?> 
+// <foo bar="baz">
+//         <call>hey</call>
+// </foo>
+doc.save(std::cout);
 std::cout << std::endl;
 
 
@@ -522,7 +526,7 @@
 

 
 
-pugixml 1.4 manual |
+pugixml 1.5 manual |
 		Overview |
 		Installation |
 		Document:
diff --git a/docs/manual/toc.html b/docs/manual/toc.html
index 3bedd68..b36f757 100644
--- a/docs/manual/toc.html
+++ b/docs/manual/toc.html
@@ -4,14 +4,14 @@
 Table of Contents
 
 
-
-
+
+
 
 
 
 
 
-pugixml 1.4 manual |
+pugixml 1.5 manual |
 		Overview |
 		Installation |
 		Document:
@@ -27,112 +27,113 @@
 
 
 
-Table of Contents
+ Table of Contents
 
 
-Overview
+ Overview
 
-Introduction
-Feedback
-Acknowledgments
-License
+ Introduction
+ Feedback
+ Acknowledgments
+ License
 
-Installation
+ Installation
 
-Getting pugixml
+ Getting pugixml
 
-Source distributions
-Subversion repository
-Git repository
+ Source distributions
+ Git repository
+ Subversion repository
 
-Building pugixml
+ Building pugixml
 
-Building pugixml as
+
 Building pugixml as
         a part of another static library/executable
-Building pugixml as
+
 Building pugixml as
         a standalone static library
-Building pugixml as
+
 Building pugixml as
         a standalone shared library
-Using
-        pugixml in header-only mode
-Additional configuration
+
 Using pugixml in header-only
+        mode
+ Additional configuration
         options
 
-Portability
+ Portability
 
-Document object model
+ Document object model
 
-Tree structure
-C++ interface
-Unicode interface
-Thread-safety guarantees
-Exception guarantees
-Memory management
+ Tree structure
+ C++ interface
+ Unicode interface
+ Thread-safety guarantees
+ Exception guarantees
+ Memory management
 
-Custom memory allocation/deallocation
+
 Custom memory allocation/deallocation
         functions
-Memory consumption tuning
-Document memory management
+
 Memory consumption tuning
+ Document memory management
         internals
 
 
-Loading document
+ Loading document
 
-Loading document from file
-Loading document from memory
-Loading document from C++ IOstreams
-Handling parsing errors
-Parsing options
-Encodings
-Conformance to W3C specification
+ Loading document from file
+ Loading document from memory
+ Loading document from C++ IOstreams
+ Handling parsing errors
+ Parsing options
+ Encodings
+ Conformance to W3C specification
 
-Accessing document data
+ Accessing document data
 
-Basic traversal functions
-Getting node data
-Getting attribute data
-Contents-based traversal functions
-Range-based for-loop support
-Traversing node/attribute lists
+
 Basic traversal functions
+ Getting node data
+ Getting attribute data
+ Contents-based traversal functions
+ Range-based for-loop support
+ Traversing node/attribute lists
       via iterators
-Recursive traversal with xml_tree_walker
-Searching for nodes/attributes
+
 Recursive traversal with xml_tree_walker
+ Searching for nodes/attributes
       with predicates
-Working with text contents
-Miscellaneous functions
+ Working with text contents
+ Miscellaneous functions
 
-Modifying document data
+ Modifying document data
 
-Setting node data
-Setting attribute data
-Adding nodes/attributes
-Removing nodes/attributes
-Working with text contents
-Cloning nodes/attributes
-Assembling document from fragments
+ Setting node data
+ Setting attribute data
+ Adding nodes/attributes
+ Removing nodes/attributes
+ Working with text contents
+ Cloning nodes/attributes
+ Moving nodes
+ Assembling document from fragments
 
-Saving document
+ Saving document
 
-Saving document to a file
-Saving document to C++ IOstreams
-Saving document via writer interface
-Saving a single subtree
-Output options
-Encodings
-Customizing document declaration
+ Saving document to a file
+ Saving document to C++ IOstreams
+ Saving document via writer interface
+ Saving a single subtree
+ Output options
+ Encodings
+ Customizing document declaration
 
-XPath
+ XPath
 
-XPath types
-Selecting nodes via XPath expression
-Using query objects
-Using variables
-Error handling
-Conformance to W3C specification
+ XPath types
+ Selecting nodes via XPath expression
+ Using query objects
+ Using variables
+ Error handling
+ Conformance to W3C specification
 
-Changelog
-API Reference
-Table of Contents
+ Changelog
+ API Reference
+ Table of Contents
 
 
 
@@ -145,7 +146,7 @@
 

 

 
-pugixml 1.4 manual |
+pugixml 1.5 manual |
 		Overview |
 		Installation |
 		Document:
diff --git a/docs/manual/xpath.html b/docs/manual/xpath.html
index e2290e5..7194283 100644
--- a/docs/manual/xpath.html
+++ b/docs/manual/xpath.html
@@ -4,15 +4,15 @@
 XPath
 
 
-
-
+
+
 
 
 
 
 
 
-pugixml 1.4 manual |
+pugixml 1.5 manual |
 		Overview |
 		Installation |
 		Document:
@@ -28,15 +28,15 @@
 
 
 
-XPath
+ XPath
 
 
-XPath types
-Selecting nodes via XPath expression
-Using query objects
-Using variables
-Error handling
-Conformance to W3C specification
+ XPath types
+ Selecting nodes via XPath expression
+ Using query objects
+ Using variables
+ Error handling
+ Conformance to W3C specification
 
 
       If the task at hand is to select a subset of document nodes that match some
@@ -48,7 +48,7 @@
       for these cases. pugixml implements an almost complete subset of XPath 1.0.
       Because of differences in document object model and some performance implications,
       there are minor violations of the official specifications, which can be found
-      in Conformance to W3C specification. The rest of this section describes the interface for XPath
+      in  Conformance to W3C specification. The rest of this section describes the interface for XPath
       functionality. Please note that if you wish to learn to use XPath language,
       you have to look for other tutorials or manuals; for example, you can read
       W3Schools XPath tutorial,
@@ -58,12 +58,11 @@
     
 
 
-XPath types
+ XPath types
 
-
-        Each
-        XPath expression can have one of the following types: boolean, number, string
-        or node set. Boolean type corresponds to bool
+

+        Each XPath expression can have one of the following types: boolean, number,
+        string or node set. Boolean type corresponds to bool
         type, number type corresponds to double
         type, string type corresponds to either std::string
         or std::wstring, depending on whether wide
@@ -73,11 +72,11 @@
         xpath_type_number, xpath_type_string or xpath_type_node_set,
         accordingly.
       

-
-        Because an XPath node can be either a node or an
-        attribute, there is a special type, xpath_node,
-        which is a discriminated union of these types. A value of this type contains
-        two node handles, one of xml_node
+

+        Because an XPath node can be either a node or an attribute, there is a special
+        type, xpath_node, which is
+        a discriminated union of these types. A value of this type contains two node
+        handles, one of xml_node
         type, and another one of xml_attribute
         type; at most one of them can be non-null. The accessors to get these handles
         are available:
@@ -102,33 +101,30 @@
         handle. For null nodes, parent
         returns null handle.
       
-
-        Like
-        node and attribute handles, XPath node handles can be implicitly cast to
-        boolean-like object to check if it is a null node, and also can be compared
+

+        Like node and attribute handles, XPath node handles can be implicitly cast
+        to boolean-like object to check if it is a null node, and also can be compared
         for equality with each other.
       
-
-        You can also create XPath nodes with one of
-        the three constructors: the default constructor, the constructor that takes
-        node argument, and the constructor that takes attribute and node arguments
-        (in which case the attribute must belong to the attribute list of the node).
-        The constructor from xml_node
-        is implicit, so you can usually pass xml_node
-        to functions that expect xpath_node.
-        Apart from that you usually don't need to create your own XPath node objects,
-        since they are returned to you via selection functions.
-      
-
-        XPath expressions operate not on single nodes,
-        but instead on node sets. A node set is a collection of nodes, which can
-        be optionally ordered in either a forward document order or a reverse one.
-        Document order is defined in XPath specification; an XPath node is before
-        another node in document order if it appears before it in XML representation
-        of the corresponding document.
-      
-
-        Node sets are represented by xpath_node_set
+

+        You can also create XPath nodes with one of the three constructors: the default
+        constructor, the constructor that takes node argument, and the constructor
+        that takes attribute and node arguments (in which case the attribute must
+        belong to the attribute list of the node). The constructor from xml_node is implicit, so you can usually
+        pass xml_node to functions
+        that expect xpath_node. Apart
+        from that you usually don't need to create your own XPath node objects, since
+        they are returned to you via selection functions.
+      
+
+        XPath expressions operate not on single nodes, but instead on node sets.
+        A node set is a collection of nodes, which can be optionally ordered in either
+        a forward document order or a reverse one. Document order is defined in XPath
+        specification; an XPath node is before another node in document order if
+        it appears before it in XML representation of the corresponding document.
+      
+
+        Node sets are represented by xpath_node_set
         object, which has an interface that resembles one of sequential random-access
         containers. It has an iterator type along with usual begin/past-the-end iterator
         accessors:
@@ -137,9 +133,8 @@
 const_iterator xpath_node_set::begin() const;
 const_iterator xpath_node_set::end() const;
 
-

-        And it also can be iterated via indices, just
-        like std::vector:
+

+        And it also can be iterated via indices, just like std::vector:
       
 const xpath_node& xpath_node_set::operator[](size_t index) const;
 size_t xpath_node_set::size() const;
@@ -152,9 +147,9 @@
         set size results in undefined behavior. You can use both iterator-based and
         index-based access for iteration, however the iterator-based one can be faster.
       
-
-        The order of iteration depends on the order of
-        nodes inside the set; the order can be queried via the following function:
+

+        The order of iteration depends on the order of nodes inside the set; the
+        order can be queried via the following function:
       
 enum xpath_node_set::type_t {type_unsorted, type_sorted, type_sorted_reverse};
 type_t xpath_node_set::type() const;
@@ -178,10 +173,9 @@
         will return type_sorted or
         type_sorted_reverse.
       
-
-        Often the actual iteration is not needed;
-        instead, only the first element in document order is required. For this,
-        a special accessor is provided:
+

+        Often the actual iteration is not needed; instead, only the first element
+        in document order is required. For this, a special accessor is provided:
       
 xpath_node xpath_node_set::first() const;
 
@@ -193,11 +187,10 @@
         the complexity does - if the set is sorted, the complexity is constant, otherwise
         it is linear in the number of elements or worse.
       
-
-        While in the majority of cases the node
-        set is returned by XPath functions, sometimes there is a need to manually
-        construct a node set. For such cases, a constructor is provided which takes
-        an iterator range (const_iterator
+

+        While in the majority of cases the node set is returned by XPath functions,
+        sometimes there is a need to manually construct a node set. For such cases,
+        a constructor is provided which takes an iterator range (const_iterator
         is a typedef for const xpath_node*), and an optional type:
       
 xpath_node_set::xpath_node_set(const_iterator begin, const_iterator end, type_t type = type_unsorted);
@@ -212,41 +205,40 @@
 
 
 
-Selecting nodes via XPath expression
+ Selecting nodes via XPath expression
 
-
-        If
-        you want to select nodes that match some XPath expression, you can do it
-        with the following functions:
+

+        If you want to select nodes that match some XPath expression, you can do
+        it with the following functions:
       
-xpath_node xml_node::select_single_node(const char_t* query, xpath_variable_set* variables = 0) const;
+xpath_node xml_node::select_node(const char_t* query, xpath_variable_set* variables = 0) const;
 xpath_node_set xml_node::select_nodes(const char_t* query, xpath_variable_set* variables = 0) const;
 
 
         select_nodes function compiles
         the expression and then executes it with the node as a context node, and
-        returns the resulting node set. select_single_node
+        returns the resulting node set. select_node
         returns only the first node in document order from the result, and is equivalent
         to calling select_nodes(query).first().
         If the XPath expression does not match anything, or the node handle is null,
         select_nodes returns an empty
-        set, and select_single_node
-        returns null XPath node.
+        set, and select_node returns
+        null XPath node.
       
 
         If exception handling is not disabled, both functions throw xpath_exception
         if the query can not be compiled or if it returns a value with type other
-        than node set; see Error handling for details.
+        than node set; see  Error handling for details.
       
-
-        While
-        compiling expressions is fast, the compilation time can introduce a significant
-        overhead if the same expression is used many times on small subtrees. If
-        you're doing many similar queries, consider compiling them into query objects
-        (see Using query objects for further reference). Once you get a compiled query
-        object, you can pass it to select functions instead of an expression string:
+

+        While compiling expressions is fast, the compilation time can introduce a
+        significant overhead if the same expression is used many times on small subtrees.
+        If you're doing many similar queries, consider compiling them into query
+        objects (see  Using query objects for further reference). Once you get a compiled
+        query object, you can pass it to select functions instead of an expression
+        string:
       
-xpath_node xml_node::select_single_node(const xpath_query& query) const;
+xpath_node xml_node::select_node(const xpath_query& query) const;
 xpath_node_set xml_node::select_nodes(const xpath_query& query) const;
 
 
@@ -257,6 +249,7 @@
         This is an example of selecting nodes using XPath expressions (samples/xpath_select.cpp):
       
 
+        
 
 pugi::xpath_node_set tools = doc.select_nodes("/Profile/Tools/Tool[@AllowRemote='true' and @DeriveCaptionFrom='lastparam']");
 
@@ -268,7 +261,7 @@
     std::cout << node.node().attribute("Filename").value() << "\n";
 }
 
-pugi::xpath_node build_tool = doc.select_single_node("//Tool[contains(Description, 'build system')]");
+pugi::xpath_node build_tool = doc.select_node("//Tool[contains(Description, 'build system')]");
 
 if (build_tool)
     std::cout << "Build tool: " << build_tool.node().attribute("Filename").value() << "\n";
@@ -278,10 +271,10 @@
 
 
 
-Using query objects
+ Using query objects
 
-
-        When you call select_nodes
+

+        When you call select_nodes
         with an expression string as an argument, a query object is created behind
         the scenes. A query object represents a compiled XPath expression. Query
         objects can be needed in the following circumstances:
@@ -307,30 +300,29 @@
         operator and store pointers to xpath_query
         in the container.
       
-
-        You can create a query object with the constructor
-        that takes XPath expression as an argument:
+

+        You can create a query object with the constructor that takes XPath expression
+        as an argument:
       
 explicit xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables = 0);
 
-
-        The expression is compiled and the
-        compiled representation is stored in the new query object. If compilation
-        fails, xpath_exception is thrown if
-        exception handling is not disabled (see Error handling for details).
-        After the query is created, you can query the type of the evaluation result
-        using the following function:
+

+        The expression is compiled and the compiled representation is stored in the
+        new query object. If compilation fails, xpath_exception
+        is thrown if exception handling is not disabled (see  Error handling for
+        details). After the query is created, you can query the type of the evaluation
+        result using the following function:
       
 xpath_value_type xpath_query::return_type() const;
 
-
-        You
-        can evaluate the query using one of the following functions:
+

+        You can evaluate the query using one of the following functions:
       
 bool xpath_query::evaluate_boolean(const xpath_node& n) const;
 double xpath_query::evaluate_number(const xpath_node& n) const;
 string_t xpath_query::evaluate_string(const xpath_node& n) const;
 xpath_node_set xpath_query::evaluate_node_set(const xpath_node& n) const;
+xpath_node xpath_query::evaluate_node(const xpath_node& n) const;
 
 
         All functions take the context node as an argument, compute the expression
@@ -339,8 +331,9 @@
         value, but no type other than node set can be converted to node set. Because
         of this, evaluate_boolean,
         evaluate_number and evaluate_string always return a result,
-        but evaluate_node_set results
-        in an error if the return type is not node set (see Error handling).
+        but evaluate_node_set and
+        evaluate_node result in an
+        error if the return type is not node set (see  Error handling).
       
 
@@ -349,12 +342,12 @@
 
 
 
           Calling node.select_nodes("query")
-          is equivalent to calling xpath_query("query").evaluate_node_set(node).
+          is equivalent to calling xpath_query("query").evaluate_node_set(node). Calling node.select_node("query") is equivalent to calling xpath_query("query").evaluate_node(node).
         
 
-
-        Note that evaluate_string function returns the STL
-        string; as such, it's not available in PUGIXML_NO_STL
+

+        Note that evaluate_string
+        function returns the STL string; as such, it's not available in PUGIXML_NO_STL
         mode and also usually allocates memory. There is another string evaluation
         function:
       
@@ -386,20 +379,21 @@
         This is an example of using query objects (samples/xpath_query.cpp):
       
 
+        
 
-// Select nodes via compiled query
-pugi::xpath_query query_remote_tools("/Profile/Tools/Tool[@AllowRemote='true']");
+// Select nodes via compiled query
+pugi::xpath_query query_remote_tools("/Profile/Tools/Tool[@AllowRemote='true']");
 
 pugi::xpath_node_set tools = query_remote_tools.evaluate_node_set(doc);
 std::cout << "Remote tool: ";
 tools[2].node().print(std::cout);
 
-// Evaluate numbers via compiled query
-pugi::xpath_query query_timeouts("sum(//Tool/@Timeout)");
+// Evaluate numbers via compiled query
+pugi::xpath_query query_timeouts("sum(//Tool/@Timeout)");
 std::cout << query_timeouts.evaluate_number(doc) << std::endl;
 
-// Evaluate strings via compiled query for different context nodes
-pugi::xpath_query query_name_valid("string-length(substring-before(@Filename, '_')) > 0 and @OutputFileMasks");
+// Evaluate strings via compiled query for different context nodes
+pugi::xpath_query query_name_valid("string-length(substring-before(@Filename, '_')) > 0 and @OutputFileMasks");
 pugi::xpath_query query_name("concat(substring-before(@Filename, '_'), ' produces ', @OutputFileMasks)");
 
 for (pugi::xml_node tool = doc.first_element_by_path("Profile/Tools/Tool"); tool; tool = tool.next_sibling())
@@ -414,7 +408,7 @@
 
 
 
-Using variables
+ Using variables
 
 
         XPath queries may contain references to variables; this is useful if you
@@ -426,10 +420,10 @@
         Variable references have the form $name; in order to use them, you have to provide
         a variable set, which includes all variables present in the query with correct
         types. This set is passed to xpath_query
-        constructor or to select_nodes/select_single_node functions:
+        constructor or to select_nodes/select_node functions:
       
 explicit xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables = 0);
-xpath_node xml_node::select_single_node(const char_t* query, xpath_variable_set* variables = 0) const;
+xpath_node xml_node::select_node(const char_t* query, xpath_variable_set* variables = 0) const;
 xpath_node_set xml_node::select_nodes(const char_t* query, xpath_variable_set* variables = 0) const;
 
 
@@ -447,13 +441,12 @@
           that the lifetime of the set exceeds that of query object.
         
 
-
-        Variable sets correspond to xpath_variable_set type, which is essentially
-        a variable container.
+

+        Variable sets correspond to xpath_variable_set
+        type, which is essentially a variable container.
       
-
-        You can add new variables with the
-        following function:
+

+        You can add new variables with the following function:
       
 xpath_variable* xpath_variable_set::add(const char_t* name, xpath_value_type type);
 
@@ -470,9 +463,8 @@
         0 for numbers, false for booleans, empty string for strings
         and empty set for node sets.
       
-
-        You can get the existing variables
-        with the following functions:
+

+        You can get the existing variables with the following functions:
       
 xpath_variable* xpath_variable_set::get(const char_t* name);
 const xpath_variable* xpath_variable_set::get(const char_t* name) const;
@@ -481,14 +473,13 @@
         The functions return the variable handle, or null pointer if the variable
         with the specified name is not found.
       
-
-        Additionally, there are the helper
-        functions for setting the variable value by name; they try to add the variable
-        with the corresponding type, if it does not exist, and to set the value.
-        If the variable with the same name but with different type is already present,
-        they return false; they also
-        return false on allocation failure.
-        Note that these functions do not perform any type conversions.
+

+        Additionally, there are the helper functions for setting the variable value
+        by name; they try to add the variable with the corresponding type, if it
+        does not exist, and to set the value. If the variable with the same name
+        but with different type is already present, they return false;
+        they also return false on allocation
+        failure. Note that these functions do not perform any type conversions.
       
 bool xpath_variable_set::set(const char_t* name, bool value);
 bool xpath_variable_set::set(const char_t* name, double value);
@@ -499,15 +490,14 @@
         The variable values are copied to the internal variable storage, so you can
         modify or destroy them after the functions return.
       
-
-        If setting variables by name is not efficient
-        enough, or if you have to inspect variable information or get variable values,
-        you can use variable handles. A variable corresponds to the xpath_variable type, and a variable handle
-        is simply a pointer to xpath_variable.
+

+        If setting variables by name is not efficient enough, or if you have to inspect
+        variable information or get variable values, you can use variable handles.
+        A variable corresponds to the xpath_variable
+        type, and a variable handle is simply a pointer to xpath_variable.
       
-
-        In
-        order to get variable information, you can use one of the following functions:
+

+        In order to get variable information, you can use one of the following functions:
       
 const char_t* xpath_variable::name() const;
 xpath_value_type xpath_variable::type() const;
@@ -516,9 +506,8 @@
         Note that each variable has a distinct type which is specified upon variable
         creation and can not be changed later.
       
-
-        In
-        order to get variable value, you should use one of the following functions,
+

+        In order to get variable value, you should use one of the following functions,
         depending on the variable type:
       
 bool xpath_variable::get_boolean() const;
@@ -531,9 +520,9 @@
         are performed; if the type mismatch occurs, a dummy value is returned (false for booleans, NaN
         for numbers, empty string for strings and empty set for node sets).
       
-
-        In order to set variable value, you should
-        use one of the following functions, depending on the variable type:
+

+        In order to set variable value, you should use one of the following functions,
+        depending on the variable type:
       
 bool xpath_variable::set(bool value);
 bool xpath_variable::set(double value);
@@ -550,9 +539,10 @@
         This is an example of using variables in XPath queries (samples/xpath_variables.cpp):
       
 
+        
 
-// Select nodes via compiled query
-pugi::xpath_variable_set vars;
+// Select nodes via compiled query
+pugi::xpath_variable_set vars;
 vars.add("remote", pugi::xpath_type_boolean);
 
 pugi::xpath_query query_remote_tools("/Profile/Tools/Tool[@AllowRemote = string($remote)]", &vars);
@@ -569,8 +559,8 @@
 std::cout << "Local tool: ";
 tools_local[0].node().print(std::cout);
 
-// You can pass the context directly to select_nodes/select_single_node
-pugi::xpath_node_set tools_local_imm = doc.select_nodes("/Profile/Tools/Tool[@AllowRemote = string($remote)]", &vars);
+// You can pass the context directly to select_nodes/select_node
+pugi::xpath_node_set tools_local_imm = doc.select_nodes("/Profile/Tools/Tool[@AllowRemote = string($remote)]", &vars);
 
 std::cout << "Local tool imm: ";
 tools_local_imm[0].node().print(std::cout);
@@ -580,7 +570,7 @@
 
 
 
-Error handling
+ Error handling
 
 
         There are two different mechanisms for error handling in XPath implementation;
@@ -588,23 +578,21 @@
         is controlled with PUGIXML_NO_EXCEPTIONS
         define).
       
-
-        By default, XPath functions throw xpath_exception object in case of errors;
-        additionally, in the event any memory allocation fails, an std::bad_alloc
-        exception is thrown. Also xpath_exception
-        is thrown if the query is evaluated to a node set, but the return type is
-        not node set. If the query constructor succeeds (i.e. no exception is thrown),
-        the query object is valid. Otherwise you can get the error details via one
-        of the following functions:
+

+        By default, XPath functions throw xpath_exception
+        object in case of errors; additionally, in the event any memory allocation
+        fails, an std::bad_alloc exception is thrown. Also xpath_exception is thrown if the query
+        is evaluated to a node set, but the return type is not node set. If the query
+        constructor succeeds (i.e. no exception is thrown), the query object is valid.
+        Otherwise you can get the error details via one of the following functions:
       
 virtual const char* xpath_exception::what() const throw();
 const xpath_parse_result& xpath_exception::result() const;
 
-
-        If
-        exceptions are disabled, then in the event of parsing failure the query is
-        initialized to invalid state; you can test if the query object is valid by
-        using it in a boolean expression: if
+

+        If exceptions are disabled, then in the event of parsing failure the query
+        is initialized to invalid state; you can test if the query object is valid
+        by using it in a boolean expression: if
         (query) { ...
         }. Additionally, you can get parsing
         result via the result() accessor:
@@ -617,9 +605,8 @@
         a query as a node set results in an empty node set if the return type is
         not node set.
       

-
-        The information about parsing result is
-        returned via xpath_parse_result
+

+        The information about parsing result is returned via xpath_parse_result
         object. It contains parsing status and the offset of last successfully parsed
         character from the beginning of the source stream:
       
@@ -632,39 +619,39 @@
     const char* description() const;
 };
 

-
-        Parsing result is represented as
-        the error message; it is either a null pointer, in case there is no error,
-        or the error message in the form of ASCII zero-terminated string.
+

+        Parsing result is represented as the error message; it is either a null pointer,
+        in case there is no error, or the error message in the form of ASCII zero-terminated
+        string.
       
-
-        description() member function can be used to get the
-        error message; it never returns the null pointer, so you can safely use
+

+        description()
+        member function can be used to get the error message; it never returns the
+        null pointer, so you can safely use description() even if query parsing succeeded. Note that
         description()
-        even if query parsing succeeded. Note that description() returns a char
-        string even in PUGIXML_WCHAR_MODE;
-        you'll have to call as_wide to get the wchar_t string.
+        returns a char string even in
+        PUGIXML_WCHAR_MODE; you'll
+        have to call as_wide to get the wchar_t string.
       
-
-        In addition to the error message,
-        parsing result has an offset
+

+        In addition to the error message, parsing result has an offset
         member, which contains the offset of last successfully parsed character.
         This offset is in units of pugi::char_t (bytes
         for character mode, wide characters for wide character mode).
       
-
-        Parsing result object can be implicitly
-        converted to bool like this:
-        if (result) { ... }
+

+        Parsing result object can be implicitly converted to bool
+        like this: if (result) { ... }
         else { ... }.
       

 
         This is an example of XPath error handling (samples/xpath_error.cpp):
       
 
+        
 
-// Exception is thrown for incorrect query syntax
-try
+// Exception is thrown for incorrect query syntax
+try
 {
     doc.select_nodes("//nodes[#true()]");
 }
@@ -673,8 +660,8 @@
     std::cout << "Select failed: " << e.what() << std::endl;
 }
 
-// Exception is thrown for incorrect query semantics
-try
+// Exception is thrown for incorrect query semantics
+try
 {
     doc.select_nodes("(123)/next");
 }
@@ -683,8 +670,8 @@
     std::cout << "Select failed: " << e.what() << std::endl;
 }
 
-// Exception is thrown for query with incorrect return type
-try
+// Exception is thrown for query with incorrect return type
+try
 {
     doc.select_nodes("123");
 }
@@ -698,7 +685,7 @@
 
 
 
-Conformance to W3C specification
+ Conformance to W3C specification
 
 
         Because of the differences in document object models, performance considerations
@@ -745,7 +732,7 @@
 

 
 
-pugixml 1.4 manual |
+pugixml 1.5 manual |
 		Overview |
 		Installation |
 		Document:
diff --git a/docs/quickstart.html b/docs/quickstart.html
index 8f8fa4e..c702852 100644
--- a/docs/quickstart.html
+++ b/docs/quickstart.html
@@ -1,31 +1,31 @@
 
 
 
-pugixml 1.4
+pugixml 1.5
 
 
-
+
 
 
 
 
 
-pugixml 1.4 quick start guide
+ pugixml 1.5 quick start guide
 
 
-Introduction
-Installation
-Document object model
-Loading document
-Accessing document data
-Modifying document data
-Saving document
-Feedback
-License
+ Introduction
+ Installation
+ Document object model
+ Loading document
+ Accessing document data
+ Modifying document data
+ Saving document
+ Feedback
+ License
 
 
 
-Introduction
+ Introduction
 
 
         pugixml is a light-weight C++ XML
@@ -59,7 +59,7 @@
 
 
           No documentation is perfect, neither is this one. If you encounter a description
-          that is unclear, please file an issue as described in Feedback. Also if
+          that is unclear, please file an issue as described in  Feedback. Also if
           you can spare the time for a full proof-reading, including spelling and
           grammar, that would be great! Please send me an e-mail;
           as a token of appreciation, your name will be included into the corresponding
@@ -69,14 +69,14 @@
 
 

 
-Installation
+ Installation
 
 
         pugixml is distributed in source form. You can download a source distribution
         via one of the following links:
       
-https://github.com/zeux/pugixml/releases/download/v1.4/pugixml-1.4.zip
-https://github.com/zeux/pugixml/releases/download/v1.4/pugixml-1.4.tar.gz
+https://github.com/zeux/pugixml/releases/download/v1.5/pugixml-1.5.zip
+https://github.com/zeux/pugixml/releases/download/v1.5/pugixml-1.5.tar.gz
 
 
         The distribution contains library source, documentation (the guide you're
@@ -109,7 +109,7 @@
 
 
 
-Document object model
+ Document object model
 
 
         pugixml stores XML data in DOM-like way: the entire XML document (both document
@@ -226,7 +226,7 @@
 
 
 
-Loading document
+ Loading document
 
 
         pugixml provides several functions for loading XML data from various places
@@ -250,6 +250,7 @@
         This is an example of loading XML document from file (samples/load_file.cpp):
       
 
+        
 
 pugi::xml_document doc;
 
@@ -281,9 +282,10 @@
         This is an example of handling loading errors (samples/load_error_handling.cpp):
       
 
+        
 
 pugi::xml_document doc;
-pugi::xml_parse_result result = doc.load(source);
+pugi::xml_parse_result result = doc.load_string(source);
 
 if (result)
     std::cout << "XML [" << source << "] parsed without errors, attr value: [" << doc.child("node").attribute("attr").value() << "]\n\n";
@@ -322,6 +324,7 @@
         read the sample code for more examples:
       
 
+        
 
 const char source[] = "<mesh name='sphere'><bounds>0 0 1 1</bounds></mesh>";
 size_t size = sizeof(source);
@@ -329,16 +332,17 @@
 
       
 
+        
 
-// You can use load_buffer_inplace to load document from mutable memory block; the block's lifetime must exceed that of document
-char* buffer = new char[size];
+// You can use load_buffer_inplace to load document from mutable memory block; the block's lifetime must exceed that of document
+char* buffer = new char[size];
 memcpy(buffer, source, size);
 
-// The block can be allocated by any method; the block is modified during parsing
-pugi::xml_parse_result result = doc.load_buffer_inplace(buffer, size);
+// The block can be allocated by any method; the block is modified during parsing
+pugi::xml_parse_result result = doc.load_buffer_inplace(buffer, size);
 
-// You have to destroy the block yourself after the document is no longer used
-delete[] buffer;
+// You have to destroy the block yourself after the document is no longer used
+delete[] buffer;
 
 
       
@@ -348,6 +352,7 @@
         the sample code for more complex examples involving wide streams and locales:
       
 
+        
 
 std::ifstream stream("weekly-utf-8.xml");
 pugi::xml_parse_result result = doc.load(stream);
@@ -357,7 +362,7 @@
 
 
 
-Accessing document data
+ Accessing document data
 
 
         pugixml features an extensive interface for getting various types of data
@@ -394,6 +399,7 @@
         This is an example of using these functions (samples/traverse_base.cpp):
       
 
+        
 
 for (pugi::xml_node tool = tools.child("Tool"); tool; tool = tool.next_sibling("Tool"))
 {
@@ -414,6 +420,7 @@
         functions (samples/traverse_base.cpp):
       
 
+        
 
 std::cout << "Tool for *.dae generation: " << tools.find_child_by_attribute("Tool", "OutputFileMasks", "*.dae").attribute("Filename").value() << "\n";
 
@@ -438,6 +445,7 @@
         Here is an example of using iterators for document traversal (samples/traverse_iter.cpp):
       
 
+        
 
 for (pugi::xml_node_iterator it = tools.begin(); it != tools.end(); ++it)
 {
@@ -466,6 +474,7 @@
         (samples/traverse_rangefor.cpp):
       
 
+        
 
 for (pugi::xml_node tool: tools.children("Tool"))
 {
@@ -499,22 +508,24 @@
         This is an example of traversing tree hierarchy with xml_tree_walker (samples/traverse_walker.cpp):
       
 
+        
 
 struct simple_walker: pugi::xml_tree_walker
 {
     virtual bool for_each(pugi::xml_node& node)
     {
-        for (int i = 0; i < depth(); ++i) std::cout << "  "; // indentation
-
+        for (int i = 0; i < depth(); ++i) std::cout << "  "; // indentation
+
         std::cout << node_types[node.type()] << ": name='" << node.name() << "', value='" << node.value() << "'\n";
 
-        return true; // continue traversal
-    }
+        return true; // continue traversal
+    }
 };
 
 
       
 
+        
 
 simple_walker walker;
 doc.traverse(walker);
@@ -528,6 +539,7 @@
         examples:
       
 
+        
 
 pugi::xpath_node_set tools = doc.select_nodes("/Profile/Tools/Tool[@AllowRemote='true' and @DeriveCaptionFrom='lastparam']");
 
@@ -539,7 +551,7 @@
     std::cout << node.node().attribute("Filename").value() << "\n";
 }
 
-pugi::xpath_node build_tool = doc.select_single_node("//Tool[contains(Description, 'build system')]");
+pugi::xpath_node build_tool = doc.select_node("//Tool[contains(Description, 'build system')]");
 
 if (build_tool)
     std::cout << "Build tool: " << build_tool.node().attribute("Filename").value() << "\n";
@@ -559,7 +571,7 @@
 
 
 
-Modifying document data
+ Modifying document data
 
 
         The document in pugixml is fully mutable: you can completely change the document
@@ -590,36 +602,38 @@
         example of setting node/attribute name and value (samples/modify_base.cpp):
       
 
+        
 
 pugi::xml_node node = doc.child("node");
 
-// change node name
-std::cout << node.set_name("notnode");
+// change node name
+std::cout << node.set_name("notnode");
 std::cout << ", new node name: " << node.name() << std::endl;
 
-// change comment text
-std::cout << doc.last_child().set_value("useless comment");
+// change comment text
+std::cout << doc.last_child().set_value("useless comment");
 std::cout << ", new comment text: " << doc.last_child().value() << std::endl;
 
-// we can't change value of the element or name of the comment
-std::cout << node.set_value("1") << ", " << doc.last_child().set_name("2") << std::endl;
+// we can't change value of the element or name of the comment
+std::cout << node.set_value("1") << ", " << doc.last_child().set_name("2") << std::endl;
 
 
       
 
+        
 
 pugi::xml_attribute attr = node.attribute("id");
 
-// change attribute name/value
-std::cout << attr.set_name("key") << ", " << attr.set_value("345");
+// change attribute name/value
+std::cout << attr.set_name("key") << ", " << attr.set_value("345");
 std::cout << ", new attribute: " << attr.name() << "=" << attr.value() << std::endl;
 
-// we can use numbers or booleans
-attr.set_value(1.234);
+// we can use numbers or booleans
+attr.set_value(1.234);
 std::cout << "new attribute value: " << attr.value() << std::endl;
 
-// we can also use assignment operators for more concise code
-attr = true;
+// we can also use assignment operators for more concise code
+attr = true;
 std::cout << "final attribute value: " << attr.value() << std::endl;
 
 
@@ -649,19 +663,20 @@
         This is an example of adding new attributes/nodes to the document (samples/modify_add.cpp):
       
 
+        
 
-// add node with some name
-pugi::xml_node node = doc.append_child("node");
+// add node with some name
+pugi::xml_node node = doc.append_child("node");
 
-// add description node with text child
-pugi::xml_node descr = node.append_child("description");
+// add description node with text child
+pugi::xml_node descr = node.append_child("description");
 descr.append_child(pugi::node_pcdata).set_value("Simple node");
 
-// add param node before the description
-pugi::xml_node param = node.insert_child_before("param", descr);
+// add param node before the description
+pugi::xml_node param = node.insert_child_before("param", descr);
 
-// add attributes to param node
-param.append_attribute("name") = "version";
+// add attributes to param node
+param.append_attribute("name") = "version";
 param.append_attribute("value") = 1.1;
 param.insert_attribute_after("type", param.attribute("name")) = "float";
 
@@ -681,17 +696,18 @@
         This is an example of removing attributes/nodes from the document (samples/modify_remove.cpp):
       
 
+        
 
-// remove description node with the whole subtree
-pugi::xml_node node = doc.child("node");
+// remove description node with the whole subtree
+pugi::xml_node node = doc.child("node");
 node.remove_child("description");
 
-// remove id attribute
-pugi::xml_node param = node.child("param");
+// remove id attribute
+pugi::xml_node param = node.child("param");
 param.remove_attribute("value");
 
-// we can also remove nodes/attributes by handles
-pugi::xml_attribute id = param.attribute("name");
+// we can also remove nodes/attributes by handles
+pugi::xml_attribute id = param.attribute("name");
 param.remove_attribute(id);
 
 
@@ -699,7 +715,7 @@
 
 
 
-Saving document
+ Saving document
 
 
         Often after creating a new document or loading the existing one and processing
@@ -724,9 +740,10 @@
         of saving XML document to file (samples/save_file.cpp):
       
 
+        
 
-// save document to file
-std::cout << "Saving result: " << doc.save_file("save_file_output.xml") << std::endl;
+// save document to file
+std::cout << "Saving result: " << doc.save_file("save_file_output.xml") << std::endl;
 
 
       
@@ -743,9 +760,10 @@
         This is a simple example of saving XML document to standard output (samples/save_stream.cpp):
       
 
+        
 
-// save document to standard output
-std::cout << "Document:\n";
+// save document to standard output
+std::cout << "Document:\n";
 doc.save(std::cout);
 
 
@@ -765,6 +783,7 @@
         read the sample code for more complex examples:
       
 
+        
 
 struct xml_string_writer: pugi::xml_writer
 {
@@ -789,7 +808,7 @@
 
 
 
-Feedback
+ Feedback
 
 
         If you believe you've found a bug in pugixml, please file an issue via issue submission form.
@@ -798,14 +817,14 @@
         that uses pugixml and exhibits the bug, etc. Feature requests and contributions
         can be filed as issues, too.
       
-
-        If filing an issue is not possible due to privacy or
-        other concerns, you can contact pugixml author by e-mail directly: arseny.kapoulkine@gmail.com.
+

+        If filing an issue is not possible due to privacy or other concerns, you
+        can contact pugixml author by e-mail directly: arseny.kapoulkine@gmail.com.
       
 
 
 
-License
+ License
 
 
         The pugixml library is distributed under the MIT license:
@@ -854,7 +873,7 @@ pugixml
 
 
 
-
+Last revised: February 28, 2014 at 03:52:54 GMT Last revised: November 18, 2014 at 17:25:31 GMT
 
 
 
-- 
cgit v1.2.3

-Overview + Overview

-Introduction + Introduction

-Feedback + Feedback

-Acknowledgments + Acknowledgments

-License + License

-Accessing document data + Accessing document data

-Basic traversal functions + Basic traversal functions

-Getting node data + Getting node data

-Getting attribute data + Getting attribute data

-Contents-based traversal functions + Contents-based traversal functions

-Range-based for-loop support + Range-based for-loop support

-Traversing node/attribute lists + Traversing node/attribute lists via iterators

-Recursive traversal with xml_tree_walker + Recursive traversal with xml_tree_walker

-Searching for nodes/attributes + Searching for nodes/attributes with predicates

-Working with text contents + Working with text contents

-Miscellaneous functions + Miscellaneous functions

-API Reference + API Reference

-Changelog + Changelog

- - 27.02.2014 - - version 1.4 +

+ 27.11.2014 - version + 1.5 +

+ 27.02.2014 - version + 1.4

- - 1.05.2012 - - version 1.2 +

+ 1.05.2012 - version + 1.2

- - 1.11.2010 - - version 1.0 +

+ 1.11.2010 - version + 1.0

- - 1.07.2010 - - version 0.9 +

+ 1.07.2010 - version + 0.9

- - 8.11.2009 - - version 0.5 +

+ 8.11.2009 - version + 0.5

- - 17.09.2009 - - version 0.42 +

+ 17.09.2009 - version + 0.42

- - 8.02.2009 - - version 0.41 +

+ 8.02.2009 - version + 0.41

- - 18.01.2009 - - version 0.4 +

+ 18.01.2009 - version + 0.4

- - 31.10.2007 - - version 0.34 +

+ 31.10.2007 - version + 0.34

- - 21.02.2007 - - version 0.3 +

+ 21.02.2007 - version + 0.3

- - 6.11.2006 - - version 0.2 +

+ 6.11.2006 - version + 0.2

- - 15.07.2006 - - version 0.1 +

+ 15.07.2006 - version + 0.1

-Document object model + Document object model

-Tree structure + Tree structure

-C++ interface + C++ interface

-Unicode interface + Unicode interface

-Thread-safety guarantees + Thread-safety guarantees

-Exception guarantees + Exception guarantees