Menu
▾
▴
xmlwrapp-commits — notifications of Subversion commits
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(18) |
Dec
(18) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(8) |
Feb
(8) |
Mar
|
Apr
(2) |
May
(8) |
Jun
(5) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(5) |
| 2010 |
Jan
|
Feb
(4) |
Mar
(8) |
Apr
(6) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
(39) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <vac...@us...> - 2009-01-21 23:19:50
|
Revision: 125
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=125&view=rev
Author: vaclavslavik
Date: 2009-01-21 23:19:45 +0000 (Wed, 21 Jan 2009)
Log Message:
-----------
moved xml::node::end() implementation inline so that its calls can be optimized by the compiler
Modified Paths:
--------------
trunk/include/xmlwrapp/node.h
trunk/src/libxml/node.cxx
Modified: trunk/include/xmlwrapp/node.h
===================================================================
--- trunk/include/xmlwrapp/node.h 2009-01-05 23:33:51 UTC (rev 124)
+++ trunk/include/xmlwrapp/node.h 2009-01-21 23:19:45 UTC (rev 125)
@@ -547,7 +547,7 @@
* @author Peter Jones
**/
//####################################################################
- iterator end (void);
+ iterator end (void) { return iterator(); }
//####################################################################
/**
@@ -558,7 +558,7 @@
* @author Peter Jones
**/
//####################################################################
- const_iterator end (void) const;
+ const_iterator end (void) const { return const_iterator(); }
//####################################################################
/**
Modified: trunk/src/libxml/node.cxx
===================================================================
--- trunk/src/libxml/node.cxx 2009-01-05 23:33:51 UTC (rev 124)
+++ trunk/src/libxml/node.cxx 2009-01-21 23:19:45 UTC (rev 125)
@@ -392,14 +392,6 @@
return const_iterator(pimpl_->xmlnode_->children);
}
//####################################################################
-xml::node::iterator xml::node::end (void) {
- return iterator();
-}
-//####################################################################
-xml::node::const_iterator xml::node::end (void) const {
- return const_iterator();
-}
-//####################################################################
xml::node::iterator xml::node::self (void) {
return iterator(pimpl_->xmlnode_);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2009-01-05 23:33:55
|
Revision: 124
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=124&view=rev
Author: vaclavslavik
Date: 2009-01-05 23:33:51 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
added xml::node::set_namespace() too
Modified Paths:
--------------
trunk/NEWS
trunk/include/xmlwrapp/node.h
trunk/src/libxml/node.cxx
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-01-03 12:08:34 UTC (rev 123)
+++ trunk/NEWS 2009-01-05 23:33:51 UTC (rev 124)
@@ -25,7 +25,7 @@
PDF version of the manual is no longer provided, use HTML documentation
included with xmlwrapp source distribution.
- Added xml::node::get_namespace() function.
+ Added xml::node::get_namespace() and set_namespace() functions.
Added new constructor to the xml::node class for creating text nodes,
using xml::node::text helper struct.
Modified: trunk/include/xmlwrapp/node.h
===================================================================
--- trunk/include/xmlwrapp/node.h 2009-01-03 12:08:34 UTC (rev 123)
+++ trunk/include/xmlwrapp/node.h 2009-01-05 23:33:51 UTC (rev 124)
@@ -374,6 +374,17 @@
//####################################################################
/**
+ * Sets the namespace of this xml::node.
+ *
+ * @param href URI of the namespace to associate with the node.
+ * @author Vaclav Slavik
+ * @since 0.6.0
+ **/
+ //####################################################################
+ void set_namespace(const char *href);
+
+ //####################################################################
+ /**
* Find out if this node is a text node or sometiming like a text node,
* CDATA for example.
*
Modified: trunk/src/libxml/node.cxx
===================================================================
--- trunk/src/libxml/node.cxx 2009-01-03 12:08:34 UTC (rev 123)
+++ trunk/src/libxml/node.cxx 2009-01-05 23:33:51 UTC (rev 124)
@@ -364,6 +364,10 @@
: NULL;
}
//####################################################################
+void xml::node::set_namespace (const char *href) {
+ xmlNewNs(pimpl_->xmlnode_, reinterpret_cast<const xmlChar*>(href), 0);
+}
+//####################################################################
bool xml::node::is_text (void) const {
return xmlNodeIsText(pimpl_->xmlnode_) != 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2009-01-03 12:08:39
|
Revision: 123
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=123&view=rev
Author: vaclavslavik
Date: 2009-01-03 12:08:34 +0000 (Sat, 03 Jan 2009)
Log Message:
-----------
added @since Doxygen tag to get_namespace's documentation
Modified Paths:
--------------
trunk/include/xmlwrapp/node.h
Modified: trunk/include/xmlwrapp/node.h
===================================================================
--- trunk/include/xmlwrapp/node.h 2008-12-22 00:55:26 UTC (rev 122)
+++ trunk/include/xmlwrapp/node.h 2009-01-03 12:08:34 UTC (rev 123)
@@ -367,6 +367,7 @@
* @return The namespace of this node or NULL if no namespace is
* associated.
* @author Vaclav Slavik
+ * @since 0.6.0
**/
//####################################################################
const char* get_namespace (void) const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-22 00:55:30
|
Revision: 122
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=122&view=rev
Author: vaclavslavik
Date: 2008-12-22 00:55:26 +0000 (Mon, 22 Dec 2008)
Log Message:
-----------
move implementation code (helpers, pimpls etc.) into xml::impl namespace; leave only public API in xml namespace
Modified Paths:
--------------
trunk/include/xmlwrapp/_cbfo.h
trunk/include/xmlwrapp/attributes.h
trunk/include/xmlwrapp/document.h
trunk/include/xmlwrapp/event_parser.h
trunk/include/xmlwrapp/node.h
trunk/include/xmlwrapp/tree_parser.h
trunk/src/libxml/ait_impl.cxx
trunk/src/libxml/ait_impl.h
trunk/src/libxml/attributes.cxx
trunk/src/libxml/document.cxx
trunk/src/libxml/dtd_impl.cxx
trunk/src/libxml/dtd_impl.h
trunk/src/libxml/event_parser.cxx
trunk/src/libxml/node.cxx
trunk/src/libxml/node_iterator.cxx
trunk/src/libxml/node_iterator.h
trunk/src/libxml/node_manip.cxx
trunk/src/libxml/node_manip.h
trunk/src/libxml/pimpl_base.h
trunk/src/libxml/tree_parser.cxx
trunk/src/libxml/utility.cxx
trunk/src/libxml/utility.h
trunk/src/libxslt/result.h
trunk/src/libxslt/stylesheet.cxx
Modified: trunk/include/xmlwrapp/_cbfo.h
===================================================================
--- trunk/include/xmlwrapp/_cbfo.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/include/xmlwrapp/_cbfo.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -36,8 +36,11 @@
#include <functional>
namespace xml {
- class node;
+class node;
+
+namespace impl {
+
struct cbfo_node_compare : public std::binary_function<xml::node, xml::node, bool> {
virtual ~cbfo_node_compare (void) { }
virtual bool operator() (const xml::node &lhs, const xml::node &rhs) = 0;
@@ -51,5 +54,8 @@
T &t_;
};
-}
+
+} // namespace impl
+
+} // namespace xml
#endif
Modified: trunk/include/xmlwrapp/attributes.h
===================================================================
--- trunk/include/xmlwrapp/attributes.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/include/xmlwrapp/attributes.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -49,8 +49,11 @@
// forward declarations
class node;
+
+namespace impl {
class ait_impl;
struct node_impl;
+}
/**
* The xml::attributes class is used to access all the attributes of one
@@ -154,7 +157,7 @@
void set_data (void *node, void *prop);
void set_data (const char *name, const char *value, bool);
- friend class ait_impl;
+ friend class impl::ait_impl;
}; // end xml::attributes::attr class
/**
@@ -185,7 +188,7 @@
friend bool operator== (const iterator &lhs, const iterator &rhs);
friend bool operator!= (const iterator &lhs, const iterator &rhs);
private:
- ait_impl *pimpl_;
+ impl::ait_impl *pimpl_;
iterator (void *node, void *prop);
iterator (const char *name, const char *value, bool);
void swap (iterator &other);
@@ -223,7 +226,7 @@
friend bool operator== (const const_iterator &lhs, const const_iterator &rhs);
friend bool operator!= (const const_iterator &lhs, const const_iterator &rhs);
private:
- ait_impl *pimpl_;
+ impl::ait_impl *pimpl_;
const_iterator (void *node, void *prop);
const_iterator (const char *name, const char *value, bool);
void swap (const_iterator &other);
@@ -378,7 +381,7 @@
void set_data (void *node);
void* get_data (void);
- friend struct node_impl;
+ friend struct impl::node_impl;
friend class node;
}; // end xml::attributes class
Modified: trunk/include/xmlwrapp/document.h
===================================================================
--- trunk/include/xmlwrapp/document.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/include/xmlwrapp/document.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -48,15 +48,20 @@
// forward declaration
namespace xslt {
+ class stylesheet;
+ namespace impl {
class result;
- class stylesheet;
+ }
} // end xslt namespace
namespace xml {
// forward declarations
class tree_parser;
+
+namespace impl {
struct doc_impl;
+}
/**
* The xml::document class is used to hold the XML tree and various bits of
@@ -534,9 +539,9 @@
friend std::ostream& operator<< (std::ostream &stream, const document &doc);
private:
- doc_impl *pimpl_;
+ impl::doc_impl *pimpl_;
void set_doc_data (void *data);
- void set_doc_data_from_xslt (void *data, xslt::result *xr);
+ void set_doc_data_from_xslt (void *data, xslt::impl::result *xr);
void* get_doc_data (void);
void* get_doc_data_read_only (void) const;
void* release_doc_data (void);
Modified: trunk/include/xmlwrapp/event_parser.h
===================================================================
--- trunk/include/xmlwrapp/event_parser.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/include/xmlwrapp/event_parser.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -47,8 +47,12 @@
#include <map>
namespace xml {
- struct epimpl; // forward declaration of private implementation
+
+namespace impl {
+struct epimpl; // forward declaration of private implementation
+}
+
/**
* The xml::event_parser is used to parse an XML document by calling member
* functions when certain things in the XML document are parsed. In order to
@@ -255,8 +259,8 @@
//####################################################################
void set_error_message (const char *message);
private:
- friend struct epimpl;
- epimpl *pimpl_; // private implementation
+ friend struct impl::epimpl;
+ impl::epimpl *pimpl_; // private implementation
/*
* Don't allow anyone to copy construct an event_parser or to call the
Modified: trunk/include/xmlwrapp/node.h
===================================================================
--- trunk/include/xmlwrapp/node.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/include/xmlwrapp/node.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -53,10 +53,16 @@
// forward declarations
class document;
class attributes;
+
+namespace impl {
+class node_iterator;
struct node_impl;
+struct doc_impl;
struct nipimpl;
struct node_cmp;
+}
+
/**
* The xml::node class is used to hold information about one XML node. This
* includes the name of the node, the namespace of the node and attributes
@@ -428,7 +434,7 @@
friend bool operator== (const iterator &lhs, const iterator &rhs);
friend bool operator!= (const iterator &lhs, const iterator &rhs);
private:
- nipimpl *pimpl_;
+ impl::nipimpl *pimpl_;
explicit iterator (void *data);
void* get_raw_node (void);
void swap (iterator &other);
@@ -468,7 +474,7 @@
friend bool operator== (const const_iterator &lhs, const const_iterator &rhs);
friend bool operator!= (const const_iterator &lhs, const const_iterator &rhs);
private:
- nipimpl *pimpl_;
+ impl::nipimpl *pimpl_;
explicit const_iterator (void *data);
void* get_raw_node (void);
void swap (const_iterator &other);
@@ -776,7 +782,7 @@
**/
//####################################################################
template <typename T> void sort (T compare)
- { sort_callback<T> cb(compare); sort_fo(cb); }
+ { impl::sort_callback<T> cb(compare); sort_fo(cb); }
//####################################################################
/**
@@ -802,7 +808,7 @@
friend std::ostream& operator<< (std::ostream &stream, const node &n);
private:
- node_impl *pimpl_;
+ impl::node_impl *pimpl_;
// private ctor to create uninitialized instance
explicit node (int);
@@ -811,12 +817,12 @@
void* get_node_data (void);
void* release_node_data (void);
friend class tree_parser;
- friend class node_iterator;
+ friend class impl::node_iterator;
friend class document;
- friend struct doc_impl;
- friend struct node_cmp;
+ friend struct impl::doc_impl;
+ friend struct impl::node_cmp;
- void sort_fo (cbfo_node_compare &fo);
+ void sort_fo (impl::cbfo_node_compare &fo);
}; // end xml::node class
} // end xml namespace
Modified: trunk/include/xmlwrapp/tree_parser.h
===================================================================
--- trunk/include/xmlwrapp/tree_parser.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/include/xmlwrapp/tree_parser.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -47,8 +47,10 @@
namespace xml {
// forward declarations
+class document;
+namespace impl {
struct tree_impl;
-class document;
+}
/**
* The xml::tree_parser class is used to parse an XML document and generate
@@ -166,7 +168,7 @@
//####################################################################
const xml::document& get_document (void) const;
private:
- tree_impl *pimpl_; // private implementation
+ impl::tree_impl *pimpl_; // private implementation
/*
* Don't allow anyone to copy construct a xml::tree_parser or allow the
Modified: trunk/src/libxml/ait_impl.cxx
===================================================================
--- trunk/src/libxml/ait_impl.cxx 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/ait_impl.cxx 2008-12-22 00:55:26 UTC (rev 122)
@@ -31,7 +31,7 @@
*/
/** @file
- * This file implements the xml::ait_impl, xml::attributes::iterator,
+ * This file implements the ait_impl, xml::attributes::iterator,
* xml::attributes::const_iterator and xml::attributes::attr classes.
**/
@@ -47,16 +47,19 @@
// libxml2 includes
#include <libxml/tree.h>
+using namespace xml;
+using namespace xml::impl;
+
/*
- * First we have the xml::ait_impl class.
+ * First we have the ait_impl class.
*/
//####################################################################
-xml::ait_impl::ait_impl (xmlNodePtr node, xmlAttrPtr prop) : xmlnode_(node), xmlattr_(prop), fake_(false) {
+ait_impl::ait_impl (xmlNodePtr node, xmlAttrPtr prop) : xmlnode_(node), xmlattr_(prop), fake_(false) {
attr_.set_data(xmlnode_, xmlattr_);
}
//####################################################################
-xml::ait_impl::ait_impl (const char *name, const char *value, bool) : xmlnode_(0), xmlattr_(0), fake_(true) {
+ait_impl::ait_impl (const char *name, const char *value, bool) : xmlnode_(0), xmlattr_(0), fake_(true) {
/*
* in this constructor and in the functions to follow, the last
* parameter, the bool, is only used to create a unique signature
@@ -64,12 +67,12 @@
attr_.set_data(name, value, true);
}
//####################################################################
-xml::ait_impl::ait_impl (const ait_impl &other) : xmlnode_(other.xmlnode_), xmlattr_(other.xmlattr_), fake_(other.fake_) {
+ait_impl::ait_impl (const ait_impl &other) : xmlnode_(other.xmlnode_), xmlattr_(other.xmlattr_), fake_(other.fake_) {
if (fake_) attr_.set_data(other.attr_.get_name(), other.attr_.get_value(), true);
else attr_.set_data(xmlnode_, xmlattr_);
}
//####################################################################
-xml::ait_impl& xml::ait_impl::operator= (const ait_impl &other) {
+ait_impl& ait_impl::operator= (const ait_impl &other) {
ait_impl tmp(other);
std::swap(xmlnode_, tmp.xmlnode_);
@@ -80,15 +83,15 @@
return *this;
}
//####################################################################
-xml::attributes::attr* xml::ait_impl::get (void) {
+xml::attributes::attr* ait_impl::get (void) {
return &attr_;
}
//####################################################################
-xmlAttrPtr xml::ait_impl::get_raw_attr (void) {
+xmlAttrPtr ait_impl::get_raw_attr (void) {
return xmlattr_;
}
//####################################################################
-xml::ait_impl& xml::ait_impl::operator++ (void) {
+ait_impl& ait_impl::operator++ (void) {
if (xmlattr_) xmlattr_ = xmlattr_->next;
else fake_ = false;
@@ -96,7 +99,7 @@
return *this;
}
//####################################################################
-xml::ait_impl xml::ait_impl::operator++ (int) {
+ait_impl ait_impl::operator++ (int) {
ait_impl tmp(xmlnode_, xmlattr_);
++(*this);
return tmp;
@@ -288,6 +291,8 @@
//####################################################################
namespace xml {
+
+namespace impl {
//####################################################################
xmlAttrPtr find_prop (xmlNodePtr xmlnode, const char *name) {
xmlAttrPtr prop = xmlnode->properties;
@@ -320,16 +325,9 @@
return 0;
}
+}
+
//####################################################################
- bool operator== (const ait_impl &lhs, const ait_impl &rhs) {
- if (lhs.fake_ || rhs.fake_) return false;
- return lhs.xmlattr_ == rhs.xmlattr_;
- }
- //####################################################################
- bool operator!= (const ait_impl &lhs, const ait_impl &rhs) {
- return !(lhs == rhs);
- }
- //####################################################################
bool operator== (const attributes::iterator &lhs, const attributes::iterator &rhs) {
return *(lhs.pimpl_) == *(rhs.pimpl_);
}
@@ -346,5 +344,16 @@
return !(lhs == rhs);
}
//####################################################################
+namespace impl {
+ bool operator== (const ait_impl &lhs, const ait_impl &rhs) {
+ if (lhs.fake_ || rhs.fake_) return false;
+ return lhs.xmlattr_ == rhs.xmlattr_;
+ }
+ //####################################################################
+ bool operator!= (const ait_impl &lhs, const ait_impl &rhs) {
+ return !(lhs == rhs);
+ }
}
+ //####################################################################
+}
//####################################################################
Modified: trunk/src/libxml/ait_impl.h
===================================================================
--- trunk/src/libxml/ait_impl.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/ait_impl.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -47,6 +47,8 @@
namespace xml {
+namespace impl {
+
/**
* the class that does all the work behind xml::attributes::iterator and
* xml::attributes::const_iterator.
@@ -78,5 +80,7 @@
xmlAttrPtr find_prop (xmlNodePtr xmlnode, const char *name);
xmlAttributePtr find_default_prop (xmlNodePtr xmlnode, const char *name);
+} // end impl namespace
+
} // end xml namespace
#endif
Modified: trunk/src/libxml/attributes.cxx
===================================================================
--- trunk/src/libxml/attributes.cxx 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/attributes.cxx 2008-12-22 00:55:26 UTC (rev 122)
@@ -46,8 +46,11 @@
// libxml2 includes
#include <libxml/tree.h>
+using namespace xml;
+using namespace xml::impl;
+
//####################################################################
-struct xml::attributes::pimpl : public xml::pimpl_base<xml::attributes::pimpl> {
+struct xml::attributes::pimpl : public pimpl_base<xml::attributes::pimpl> {
//####################################################################
pimpl (void) : owner_(true) {
xmlnode_ = xmlNewNode(0, reinterpret_cast<const xmlChar*>("blank"));
Modified: trunk/src/libxml/document.cxx
===================================================================
--- trunk/src/libxml/document.cxx 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/document.cxx 2008-12-22 00:55:26 UTC (rev 122)
@@ -56,12 +56,16 @@
// bring in private libxslt stuff (see bug #1927398)
#include "../libxslt/result.h"
+using namespace xml;
+using namespace xml::impl;
+
+
//####################################################################
namespace {
const char const_default_encoding[] = "ISO-8859-1";
}
//####################################################################
-struct xml::doc_impl {
+struct xml::impl::doc_impl {
//####################################################################
doc_impl (void) : doc_(0), xslt_result_(0) {
xmlDocPtr tmpdoc;
@@ -123,7 +127,7 @@
//####################################################################
xmlDocPtr doc_;
- xslt::result *xslt_result_;
+ xslt::impl::result *xslt_result_;
node root_;
std::string version_;
mutable std::string encoding_;
@@ -259,17 +263,17 @@
//####################################################################
void xml::document::push_back (const node &child) {
if (child.get_type() == node::type_element) throw std::runtime_error("xml::document::push_back can't take element type nodes");
- xmlwrapp::node_insert(reinterpret_cast<xmlNodePtr>(pimpl_->doc_), 0, static_cast<xmlNodePtr>(const_cast<node&>(child).get_node_data()));
+ xml::impl::node_insert(reinterpret_cast<xmlNodePtr>(pimpl_->doc_), 0, static_cast<xmlNodePtr>(const_cast<node&>(child).get_node_data()));
}
//####################################################################
xml::node::iterator xml::document::insert (const node &n) {
if (n.get_type() == node::type_element) throw std::runtime_error("xml::document::insert can't take element type nodes");
- return node::iterator(xmlwrapp::node_insert(reinterpret_cast<xmlNodePtr>(pimpl_->doc_), 0, static_cast<xmlNodePtr>(const_cast<node&>(n).get_node_data())));
+ return node::iterator(xml::impl::node_insert(reinterpret_cast<xmlNodePtr>(pimpl_->doc_), 0, static_cast<xmlNodePtr>(const_cast<node&>(n).get_node_data())));
}
//####################################################################
xml::node::iterator xml::document::insert (node::iterator position, const node &n) {
if (n.get_type() == node::type_element) throw std::runtime_error("xml::document::insert can't take element type nodes");
- return node::iterator(xmlwrapp::node_insert(reinterpret_cast<xmlNodePtr>(pimpl_->doc_), static_cast<xmlNodePtr>(position.get_raw_node()), static_cast<xmlNodePtr>(const_cast<node&>(n).get_node_data())));
+ return node::iterator(xml::impl::node_insert(reinterpret_cast<xmlNodePtr>(pimpl_->doc_), static_cast<xmlNodePtr>(position.get_raw_node()), static_cast<xmlNodePtr>(const_cast<node&>(n).get_node_data())));
}
//####################################################################
xml::node::iterator xml::document::replace (node::iterator old_node, const node &new_node) {
@@ -277,12 +281,12 @@
throw std::runtime_error("xml::document::replace can't replace element type nodes");
}
- return node::iterator(xmlwrapp::node_replace(static_cast<xmlNodePtr>(old_node.get_raw_node()), static_cast<xmlNodePtr>(const_cast<node&>(new_node).get_node_data())));
+ return node::iterator(xml::impl::node_replace(static_cast<xmlNodePtr>(old_node.get_raw_node()), static_cast<xmlNodePtr>(const_cast<node&>(new_node).get_node_data())));
}
//####################################################################
xml::node::iterator xml::document::erase (node::iterator to_erase) {
if (to_erase->get_type() == node::type_element) throw std::runtime_error("xml::document::erase can't erase element type nodes");
- return node::iterator(xmlwrapp::node_erase(static_cast<xmlNodePtr>(to_erase.get_raw_node())));
+ return node::iterator(xml::impl::node_erase(static_cast<xmlNodePtr>(to_erase.get_raw_node())));
}
//####################################################################
xml::node::iterator xml::document::erase (node::iterator first, node::iterator last) {
@@ -330,7 +334,7 @@
pimpl_->xslt_result_ = 0;
}
//####################################################################
-void xml::document::set_doc_data_from_xslt (void *data, xslt::result *xr) {
+void xml::document::set_doc_data_from_xslt (void *data, xslt::impl::result *xr) {
// this document came from a XSLT transformation
pimpl_->set_doc_data(static_cast<xmlDocPtr>(data), false);
pimpl_->xslt_result_ = xr;
Modified: trunk/src/libxml/dtd_impl.cxx
===================================================================
--- trunk/src/libxml/dtd_impl.cxx 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/dtd_impl.cxx 2008-12-22 00:55:26 UTC (rev 122)
@@ -31,7 +31,7 @@
*/
/** @file
- * This file implements the xml::dtd_impl class.
+ * This file implements the dtd_impl class.
**/
// xmlwrapp includes
@@ -47,26 +47,29 @@
#include <libxml/valid.h>
#include <libxml/tree.h>
+using namespace xml;
+using namespace xml::impl;
+
//####################################################################
namespace {
extern "C" void dtd_error (void *ctxt, const char *message, ...);
extern "C" void dtd_warning (void *ctxt, const char*, ...);
} // end anonymous namespace
//####################################################################
-xml::dtd_impl::dtd_impl (const char *filename) : warnings_(0), dtd_(0) {
+dtd_impl::dtd_impl (const char *filename) : warnings_(0), dtd_(0) {
if ( (dtd_ = xmlParseDTD(0, reinterpret_cast<const xmlChar*>(filename))) == 0) {
error_ = "unable to parse DTD "; error_ += filename;
}
}
//####################################################################
-xml::dtd_impl::dtd_impl (void) : warnings_(0), dtd_(0) {
+dtd_impl::dtd_impl (void) : warnings_(0), dtd_(0) {
}
//####################################################################
-xml::dtd_impl::~dtd_impl (void) {
+dtd_impl::~dtd_impl (void) {
if (dtd_) xmlFreeDtd(dtd_);
}
//####################################################################
-void xml::dtd_impl::init_ctxt (void) {
+void dtd_impl::init_ctxt (void) {
std::memset(&vctxt_, 0, sizeof(vctxt_));
vctxt_.userData = this;
@@ -74,14 +77,14 @@
vctxt_.warning = dtd_warning;
}
//####################################################################
-bool xml::dtd_impl::validate (xmlDocPtr xmldoc) {
+bool dtd_impl::validate (xmlDocPtr xmldoc) {
init_ctxt();
if (dtd_) return xmlValidateDtd(&vctxt_, xmldoc, dtd_) != 0;
else return xmlValidateDocument(&vctxt_, xmldoc) != 0;
}
//####################################################################
-xmlDtdPtr xml::dtd_impl::release (void) {
+xmlDtdPtr dtd_impl::release (void) {
xmlDtdPtr xmldtd = dtd_;
dtd_ = 0;
return xmldtd;
@@ -90,16 +93,16 @@
namespace {
//####################################################################
extern "C" void dtd_error (void *ctxt, const char *message, ...) {
- xml::dtd_impl *dtd = static_cast<xml::dtd_impl*>(ctxt);
+ dtd_impl *dtd = static_cast<dtd_impl*>(ctxt);
va_list ap;
va_start(ap, message);
- xml::printf2string(dtd->error_, message, ap);
+ printf2string(dtd->error_, message, ap);
va_end(ap);
}
//####################################################################
extern "C" void dtd_warning (void *ctxt, const char*, ...) {
- xml::dtd_impl *dtd = static_cast<xml::dtd_impl*>(ctxt);
+ dtd_impl *dtd = static_cast<dtd_impl*>(ctxt);
++dtd->warnings_;
}
//####################################################################
Modified: trunk/src/libxml/dtd_impl.h
===================================================================
--- trunk/src/libxml/dtd_impl.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/dtd_impl.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -47,6 +47,8 @@
namespace xml {
+namespace impl {
+
class dtd_impl {
public:
/*
@@ -83,7 +85,9 @@
dtd_impl (const dtd_impl&);
dtd_impl& operator= (const dtd_impl&);
void init_ctxt (void);
-}; // end xml::dtd_impl class
+}; // end xml::impl::dtd_impl class
+} // end impl namespace
+
} // end xml namespace
#endif
Modified: trunk/src/libxml/event_parser.cxx
===================================================================
--- trunk/src/libxml/event_parser.cxx 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/event_parser.cxx 2008-12-22 00:55:26 UTC (rev 122)
@@ -55,6 +55,9 @@
#include <iostream>
#include <fstream>
+using namespace xml;
+using namespace xml::impl;
+
//####################################################################
/*
* This is a hack to fix a problem with a change in the libxml2 API for
@@ -80,7 +83,7 @@
extern "C" void cb_ignore (void*, const xmlChar*, int);
} // end anonymous namespace
//####################################################################
-struct xml::epimpl {
+struct xml::impl::epimpl {
public:
epimpl (event_parser &parent);
~epimpl (void);
@@ -168,7 +171,7 @@
pimpl_->last_error_message_ = message;
}
//####################################################################
-xml::epimpl::epimpl (event_parser &parent)
+epimpl::epimpl (event_parser &parent)
: parser_status_(true), parent_(parent)
{
std::memset(&sax_handler_, 0, sizeof(sax_handler_));
@@ -191,11 +194,11 @@
}
}
//####################################################################
-xml::epimpl::~epimpl (void) {
+epimpl::~epimpl (void) {
xmlFreeParserCtxt(parser_context_);
}
//####################################################################
-void xml::epimpl::event_start_element (const xmlChar *tag, const xmlChar **props) {
+void epimpl::event_start_element (const xmlChar *tag, const xmlChar **props) {
if (!parser_status_) return;
try {
@@ -214,7 +217,7 @@
if (!parser_status_) xmlStopParser(parser_context_);
}
//####################################################################
-void xml::epimpl::event_end_element (const xmlChar *tag) {
+void epimpl::event_end_element (const xmlChar *tag) {
if (!parser_status_) return;
try {
@@ -226,7 +229,7 @@
if (!parser_status_) xmlStopParser(parser_context_);
}
//####################################################################
-void xml::epimpl::event_text (const xmlChar *text, int length) {
+void epimpl::event_text (const xmlChar *text, int length) {
if (!parser_status_) return;
try {
@@ -238,7 +241,7 @@
if (!parser_status_) xmlStopParser(parser_context_);
}
//####################################################################
-void xml::epimpl::event_pi (const xmlChar *target, const xmlChar *data) {
+void epimpl::event_pi (const xmlChar *target, const xmlChar *data) {
if (!parser_status_) return;
try {
@@ -251,7 +254,7 @@
if (!parser_status_) xmlStopParser(parser_context_);
}
//####################################################################
-void xml::epimpl::event_comment (const xmlChar *text) {
+void epimpl::event_comment (const xmlChar *text) {
if (!parser_status_) return;
try {
@@ -263,7 +266,7 @@
if (!parser_status_) xmlStopParser(parser_context_);
}
//####################################################################
-void xml::epimpl::event_cdata (const xmlChar *text, int length) {
+void epimpl::event_cdata (const xmlChar *text, int length) {
if (!parser_status_) return;
try {
@@ -275,7 +278,7 @@
if (!parser_status_) xmlStopParser(parser_context_);
}
//####################################################################
-void xml::epimpl::event_warning (const std::string &message) {
+void epimpl::event_warning (const std::string &message) {
if (!parser_status_) return;
try {
@@ -287,7 +290,7 @@
if (!parser_status_) xmlStopParser(parser_context_);
}
//####################################################################
-void xml::epimpl::event_error (const std::string &message) {
+void epimpl::event_error (const std::string &message) {
try { last_error_message_ = message; } catch ( ... ) { }
parser_status_ = false;
xmlStopParser(parser_context_);
@@ -299,32 +302,32 @@
{ return xmlGetPredefinedEntity(name); }
//####################################################################
extern "C" void cb_start_element (void *parser, const xmlChar *tag, const xmlChar **props)
- { static_cast<xml::epimpl*>(parser)->event_start_element(tag, props); }
+ { static_cast<epimpl*>(parser)->event_start_element(tag, props); }
//####################################################################
extern "C" void cb_end_element (void *parser, const xmlChar *tag)
- { static_cast<xml::epimpl*>(parser)->event_end_element(tag); }
+ { static_cast<epimpl*>(parser)->event_end_element(tag); }
//####################################################################
extern "C" void cb_text (void *parser, const xmlChar *text, int length)
- { static_cast<xml::epimpl*>(parser)->event_text(text, length); }
+ { static_cast<epimpl*>(parser)->event_text(text, length); }
//####################################################################
extern "C" void cb_pi (void *parser, const xmlChar *target, const xmlChar *data)
- { static_cast<xml::epimpl*>(parser)->event_pi(target, data); }
+ { static_cast<epimpl*>(parser)->event_pi(target, data); }
//####################################################################
extern "C" void cb_comment (void *parser, const xmlChar *text)
- { static_cast<xml::epimpl*>(parser)->event_comment(text); }
+ { static_cast<epimpl*>(parser)->event_comment(text); }
//####################################################################
extern "C" void cb_cdata (void *parser, const xmlChar *text, int length)
- { static_cast<xml::epimpl*>(parser)->event_cdata(text, length); }
+ { static_cast<epimpl*>(parser)->event_cdata(text, length); }
//####################################################################
extern "C" void cb_warning (void *parser, const char *message, ...) {
std::string complete_message;
va_list ap;
va_start(ap, message);
- xml::printf2string(complete_message, message, ap);
+ printf2string(complete_message, message, ap);
va_end(ap);
- static_cast<xml::epimpl*>(parser)->event_warning(complete_message);
+ static_cast<epimpl*>(parser)->event_warning(complete_message);
}
//####################################################################
extern "C" void cb_error (void *parser, const char *message, ...) {
@@ -332,10 +335,10 @@
va_list ap;
va_start(ap, message);
- xml::printf2string(complete_message, message, ap);
+ printf2string(complete_message, message, ap);
va_end(ap);
- static_cast<xml::epimpl*>(parser)->event_error(complete_message);
+ static_cast<epimpl*>(parser)->event_error(complete_message);
}
//####################################################################
extern "C" void cb_ignore (void*, const xmlChar*, int) {
Modified: trunk/src/libxml/node.cxx
===================================================================
--- trunk/src/libxml/node.cxx 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/node.cxx 2008-12-22 00:55:26 UTC (rev 122)
@@ -58,8 +58,11 @@
#include <libxml/tree.h>
#include <libxml/parser.h>
+using namespace xml;
+using namespace xml::impl;
+
//####################################################################
-struct xml::node_impl : public xml::pimpl_base<xml::node_impl> {
+struct xml::impl::node_impl : public pimpl_base<xml::impl::node_impl> {
//####################################################################
node_impl (void) : xmlnode_(0), owner_(true), attrs_(0)
{ }
@@ -80,7 +83,7 @@
std::string tmp_string;
};
//####################################################################
-struct xml::node_cmp : public std::binary_function<xmlNodePtr, xmlNodePtr, bool> {
+struct xml::impl::node_cmp : public std::binary_function<xmlNodePtr, xmlNodePtr, bool> {
//####################################################################
node_cmp (cbfo_node_compare &cb) : cb_(cb) { }
//####################################################################
@@ -138,11 +141,11 @@
xmlAttrPtr attr_l, attr_r;
xmlAttributePtr dtd_l(0), dtd_r(0);
- attr_l = xml::find_prop(lhs, name_);
- if (attr_l == 0 && (dtd_l = xml::find_default_prop(lhs, name_)) == 0) return true;
+ attr_l = find_prop(lhs, name_);
+ if (attr_l == 0 && (dtd_l = find_default_prop(lhs, name_)) == 0) return true;
- attr_r = xml::find_prop(rhs, name_);
- if (attr_r == 0 && (dtd_r = xml::find_default_prop(rhs, name_)) == 0) return false;
+ attr_r = find_prop(rhs, name_);
+ if (attr_r == 0 && (dtd_r = find_default_prop(rhs, name_)) == 0) return false;
xmlChar *value_l, *value_r;
@@ -366,7 +369,7 @@
}
//####################################################################
void xml::node::push_back (const node &child) {
- xmlwrapp::node_insert(pimpl_->xmlnode_, 0, child.pimpl_->xmlnode_);
+ xml::impl::node_insert(pimpl_->xmlnode_, 0, child.pimpl_->xmlnode_);
}
//####################################################################
xml::node::size_type xml::node::size (void) const {
@@ -436,19 +439,19 @@
}
//####################################################################
xml::node::iterator xml::node::insert (const node &n) {
- return iterator(xmlwrapp::node_insert(pimpl_->xmlnode_, 0, n.pimpl_->xmlnode_));
+ return iterator(xml::impl::node_insert(pimpl_->xmlnode_, 0, n.pimpl_->xmlnode_));
}
//####################################################################
xml::node::iterator xml::node::insert (iterator position, const node &n) {
- return iterator(xmlwrapp::node_insert(pimpl_->xmlnode_, static_cast<xmlNodePtr>(position.get_raw_node()), n.pimpl_->xmlnode_));
+ return iterator(xml::impl::node_insert(pimpl_->xmlnode_, static_cast<xmlNodePtr>(position.get_raw_node()), n.pimpl_->xmlnode_));
}
//####################################################################
xml::node::iterator xml::node::replace (iterator old_node, const node &new_node) {
- return iterator(xmlwrapp::node_replace(static_cast<xmlNodePtr>(old_node.get_raw_node()), new_node.pimpl_->xmlnode_));
+ return iterator(xml::impl::node_replace(static_cast<xmlNodePtr>(old_node.get_raw_node()), new_node.pimpl_->xmlnode_));
}
//####################################################################
xml::node::iterator xml::node::erase (iterator to_erase) {
- return iterator(xmlwrapp::node_erase(static_cast<xmlNodePtr>(to_erase.get_raw_node())));
+ return iterator(xml::impl::node_erase(static_cast<xmlNodePtr>(to_erase.get_raw_node())));
}
//####################################################################
xml::node::iterator xml::node::erase (iterator first, iterator last) {
Modified: trunk/src/libxml/node_iterator.cxx
===================================================================
--- trunk/src/libxml/node_iterator.cxx 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/node_iterator.cxx 2008-12-22 00:55:26 UTC (rev 122)
@@ -31,7 +31,7 @@
*/
/** @file
- * This file implements the xml::node_iterator class for libxml2.
+ * This file implements the xml::impl::node_iterator class for libxml2.
**/
// definition include
@@ -47,8 +47,11 @@
// libxml includes
#include <libxml/tree.h>
+using namespace xml;
+using namespace xml::impl;
+
// xml::node::iterator pimpl
-struct xml::nipimpl : public xml::pimpl_base<xml::nipimpl> {
+struct xml::impl::nipimpl : public pimpl_base<xml::impl::nipimpl> {
node_iterator it;
nipimpl (void) {};
@@ -57,27 +60,27 @@
};
/*
- * xml::node_iterator Real Iterator class
+ * xml::impl::node_iterator Real Iterator class
*/
//####################################################################
-xml::node* xml::node_iterator::get (void) const {
+xml::node* xml::impl::node_iterator::get (void) const {
fake_node_.set_node_data(node_);
return &fake_node_;
}
//####################################################################
-xml::node_iterator& xml::node_iterator::operator++ (void) {
+xml::impl::node_iterator& xml::impl::node_iterator::operator++ (void) {
node_ = node_->next;
return *this;
}
//####################################################################
-xml::node_iterator xml::node_iterator::operator++ (int) {
+xml::impl::node_iterator xml::impl::node_iterator::operator++ (int) {
node_iterator old(*this);
++(*this);
return old;
}
//####################################################################
-xmlNodePtr xml::node_iterator::get_raw_node (void) {
+xmlNodePtr xml::impl::node_iterator::get_raw_node (void) {
return node_;
}
//####################################################################
@@ -196,6 +199,8 @@
}
//####################################################################
namespace xml {
+
+namespace impl {
bool operator== (const node_iterator &lhs, const node_iterator &rhs) {
return lhs.node_ == rhs.node_;
}
@@ -203,6 +208,7 @@
bool operator!= (const node_iterator &lhs, const node_iterator &rhs) {
return !(lhs == rhs);
}
+}
bool operator== (const node::iterator &lhs, const node::iterator &rhs) {
return lhs.pimpl_->it == rhs.pimpl_->it;
Modified: trunk/src/libxml/node_iterator.h
===================================================================
--- trunk/src/libxml/node_iterator.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/node_iterator.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -31,7 +31,7 @@
*/
/** @file
- * This file defines the xml::node_iterator class for libxml2.
+ * This file defines the xml::impl::node_iterator class for libxml2.
**/
#ifndef _xmlwrapp_node_iterator_h_
@@ -45,6 +45,8 @@
namespace xml {
+namespace impl {
+
// base iterator class
class node_iterator {
public:
@@ -65,7 +67,9 @@
private:
mutable node fake_node_;
xmlNodePtr node_;
-}; // end xml::node_iterator class
+}; // end xml::impl::node_iterator class
+} // end impl namespace
+
} // end xml namespace
#endif
Modified: trunk/src/libxml/node_manip.cxx
===================================================================
--- trunk/src/libxml/node_manip.cxx 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/node_manip.cxx 2008-12-22 00:55:26 UTC (rev 122)
@@ -45,7 +45,7 @@
#include <libxml/tree.h>
//####################################################################
-xmlNodePtr xmlwrapp::node_insert (xmlNodePtr parent, xmlNodePtr before, xmlNodePtr to_add) {
+xmlNodePtr xml::impl::node_insert (xmlNodePtr parent, xmlNodePtr before, xmlNodePtr to_add) {
xmlNodePtr new_xml_node = xmlCopyNode(to_add, 1);
if (!new_xml_node) throw std::bad_alloc();
@@ -64,7 +64,7 @@
return new_xml_node;
}
//####################################################################
-xmlNodePtr xmlwrapp::node_replace (xmlNodePtr old_node, xmlNodePtr new_node) {
+xmlNodePtr xml::impl::node_replace (xmlNodePtr old_node, xmlNodePtr new_node) {
xmlNodePtr copied_node = xmlCopyNode(new_node, 1);
if (!copied_node) throw std::bad_alloc();
@@ -81,7 +81,7 @@
return copied_node;
}
//####################################################################
-xmlNodePtr xmlwrapp::node_erase (xmlNodePtr to_erase) {
+xmlNodePtr xml::impl::node_erase (xmlNodePtr to_erase) {
xmlNodePtr after = to_erase->next;
xmlUnlinkNode(to_erase);
Modified: trunk/src/libxml/node_manip.h
===================================================================
--- trunk/src/libxml/node_manip.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/node_manip.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -41,8 +41,10 @@
// libxml includes
#include <libxml/tree.h>
-namespace xmlwrapp {
+namespace xml {
+namespace impl {
+
//####################################################################
/**
* Insert a node somewhere in the child list of a parent node.
@@ -80,4 +82,6 @@
//####################################################################
xmlNodePtr node_erase (xmlNodePtr to_erase);
}
+
+}
#endif
Modified: trunk/src/libxml/pimpl_base.h
===================================================================
--- trunk/src/libxml/pimpl_base.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/pimpl_base.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -41,6 +41,9 @@
namespace xml
{
+namespace impl
+{
+
// Base class for all pimpl classes. Uses custom pool allocator for better
// performance. Usage: derive your class FooImpl from pimpl_base<FooImpl>.
template<typename T>
@@ -72,6 +75,8 @@
#endif // HAVE_BOOST_POOL_SINGLETON_POOL_HPP
};
+} // namespace impl
+
} // namespace xml
#endif // _xmlwrapp_pimpl_base_h_
Modified: trunk/src/libxml/tree_parser.cxx
===================================================================
--- trunk/src/libxml/tree_parser.cxx 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/tree_parser.cxx 2008-12-22 00:55:26 UTC (rev 122)
@@ -52,6 +52,9 @@
#include <string>
#include <memory>
+using namespace xml;
+using namespace xml::impl;
+
//####################################################################
/*
* This is a hack to fix a problem with a change in the libxml2 API for
@@ -70,7 +73,7 @@
extern "C" void cb_tree_ignore (void*, const xmlChar*, int);
}
//####################################################################
-struct xml::tree_impl {
+struct xml::impl::tree_impl {
tree_impl (void) : last_error_(const_default_error), warnings_(false), okay_(false) {
std::memset(&sax_, 0, sizeof(sax_));
initxmlDefaultSAXHandler(&sax_, 0);
@@ -166,12 +169,12 @@
try {
xmlParserCtxtPtr ctxt = static_cast<xmlParserCtxtPtr>(v);
- xml::tree_impl *p = static_cast<xml::tree_impl*>(ctxt->_private);
+ tree_impl *p = static_cast<tree_impl*>(ctxt->_private);
if (!p) return; // handle bug in older versions of libxml
va_list ap;
va_start(ap, message);
- xml::printf2string(p->last_error_, message, ap);
+ printf2string(p->last_error_, message, ap);
va_end(ap);
xmlStopParser(ctxt);
@@ -182,7 +185,7 @@
try {
xmlParserCtxtPtr ctxt = static_cast<xmlParserCtxtPtr>(v);
- xml::tree_impl *p = static_cast<xml::tree_impl*>(ctxt->_private);
+ tree_impl *p = static_cast<tree_impl*>(ctxt->_private);
if (!p) return; // handle bug in older versions of libxml
p->warnings_ = true;
Modified: trunk/src/libxml/utility.cxx
===================================================================
--- trunk/src/libxml/utility.cxx 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/utility.cxx 2008-12-22 00:55:26 UTC (rev 122)
@@ -44,6 +44,8 @@
namespace xml {
+namespace impl {
+
//####################################################################
void printf2string (std::string &s, const char *message, va_list ap) {
char buffer[512];
@@ -60,4 +62,6 @@
}
//####################################################################
+} // end impl namespace
+
} // end xml namespace
Modified: trunk/src/libxml/utility.h
===================================================================
--- trunk/src/libxml/utility.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxml/utility.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -42,6 +42,8 @@
namespace xml {
+namespace impl {
+
/*
* exception safe wrapper around xmlChar*s that are returned from some
* of the libxml functions that the user must free.
@@ -62,5 +64,7 @@
void printf2string (std::string &s, const char *message, va_list ap);
+} // end impl namespace
+
} // end xml namespace
#endif
Modified: trunk/src/libxslt/result.h
===================================================================
--- trunk/src/libxslt/result.h 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxslt/result.h 2008-12-22 00:55:26 UTC (rev 122)
@@ -45,6 +45,8 @@
namespace xslt {
+namespace impl {
+
/**
* The xslt::result class is used as a callback by xml::document to allow
* special treatment of XML documents which were created by XSLT.
@@ -90,6 +92,8 @@
virtual ~result (void) { }
};
+} // end impl namespace
+
} // end xslt namespace
#endif
Modified: trunk/src/libxslt/stylesheet.cxx
===================================================================
--- trunk/src/libxslt/stylesheet.cxx 2008-12-21 15:56:37 UTC (rev 121)
+++ trunk/src/libxslt/stylesheet.cxx 2008-12-22 00:55:26 UTC (rev 122)
@@ -60,7 +60,7 @@
// implementation of xslt::result using xslt::stylesheet: we pass this object
// to xml::document for the documents obtained via XSLT so that some operations
// (currently only saving) could be done differently for them
-class result_impl : public xslt::result {
+class result_impl : public xslt::impl::result {
public:
// We don't own the pointers given to us, their lifetime must be greater
// than the lifetime of this object.
@@ -73,7 +73,7 @@
if (xsltSaveResultToString(&xml_string, &xml_string_length, doc_, ss_) >= 0)
{
- xml::xmlchar_helper helper(xml_string);
+ xml::impl::xmlchar_helper helper(xml_string);
if (xml_string_length) s.assign(helper.get(), xml_string_length);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-21 15:56:41
|
Revision: 121
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=121&view=rev
Author: vaclavslavik
Date: 2008-12-21 15:56:37 +0000 (Sun, 21 Dec 2008)
Log Message:
-----------
added test_node-14 to ignorelist
Property Changed:
----------------
trunk/tests/node/
Property changes on: trunk/tests/node
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
.deps
.libs
test_node-01
test_node-02a
test_node-02b
test_node-02c
test_node-02d
test_node-03a
test_node-03b
test_node-04a
test_node-04b
test_node-05a
test_node-05b
test_node-05c
test_node-05d
test_node-06
test_node-07
test_node-08
test_node-09
test_node-10
test_node-11
test_node-12
test_node-13
+ Makefile
Makefile.in
.deps
.libs
test_node-01
test_node-02a
test_node-02b
test_node-02c
test_node-02d
test_node-03a
test_node-03b
test_node-04a
test_node-04b
test_node-05a
test_node-05b
test_node-05c
test_node-05d
test_node-06
test_node-07
test_node-08
test_node-09
test_node-10
test_node-11
test_node-12
test_node-13
test_node-14
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-21 15:55:54
|
Revision: 120
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=120&view=rev
Author: vaclavslavik
Date: 2008-12-21 15:55:51 +0000 (Sun, 21 Dec 2008)
Log Message:
-----------
Improved iterators performance by using pool allocator instead of standard operator new to allocate pimpl objects (only if Boost.Pool is available)
Modified Paths:
--------------
trunk/NEWS
trunk/configure.ac
trunk/src/Makefile.am
trunk/src/libxml/ait_impl.h
trunk/src/libxml/attributes.cxx
trunk/src/libxml/node.cxx
trunk/src/libxml/node_iterator.cxx
Added Paths:
-----------
trunk/src/libxml/pimpl_base.h
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-12-21 01:38:53 UTC (rev 119)
+++ trunk/NEWS 2008-12-21 15:55:51 UTC (rev 120)
@@ -30,6 +30,8 @@
Added new constructor to the xml::node class for creating text nodes,
using xml::node::text helper struct.
+ Improved iterators performance (only if Boost.Pool is available).
+
Version 0.5.1
Various compilation fixes.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-12-21 01:38:53 UTC (rev 119)
+++ trunk/configure.ac 2008-12-21 15:55:51 UTC (rev 120)
@@ -84,6 +84,10 @@
fi
+AC_LANG_PUSH([C++])
+AC_CHECK_HEADERS([boost/pool/singleton_pool.hpp])
+AC_LANG_POP([C++])
+
dnl === Compiler-specific stuff ===
if test "x$GCC" == "xyes"; then
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-12-21 01:38:53 UTC (rev 119)
+++ trunk/src/Makefile.am 2008-12-21 15:55:51 UTC (rev 120)
@@ -25,6 +25,7 @@
libxml/node_iterator.h \
libxml/node_manip.cxx \
libxml/node_manip.h \
+ libxml/pimpl_base.h \
libxml/tree_parser.cxx \
libxml/utility.cxx \
libxml/utility.h
Modified: trunk/src/libxml/ait_impl.h
===================================================================
--- trunk/src/libxml/ait_impl.h 2008-12-21 01:38:53 UTC (rev 119)
+++ trunk/src/libxml/ait_impl.h 2008-12-21 15:55:51 UTC (rev 120)
@@ -40,6 +40,8 @@
// xmlwrapp includes
#include "xmlwrapp/attributes.h"
+#include "pimpl_base.h"
+
// libxml2 includes
#include <libxml/tree.h>
@@ -49,7 +51,7 @@
* the class that does all the work behind xml::attributes::iterator and
* xml::attributes::const_iterator.
*/
-class ait_impl {
+class ait_impl : public pimpl_base<ait_impl> {
public:
ait_impl (xmlNodePtr node, xmlAttrPtr prop);
ait_impl (const char *name, const char *value, bool);
Modified: trunk/src/libxml/attributes.cxx
===================================================================
--- trunk/src/libxml/attributes.cxx 2008-12-21 01:38:53 UTC (rev 119)
+++ trunk/src/libxml/attributes.cxx 2008-12-21 15:55:51 UTC (rev 120)
@@ -37,6 +37,7 @@
// xmlwrapp includes
#include "xmlwrapp/attributes.h"
#include "ait_impl.h"
+#include "pimpl_base.h"
// standard includes
#include <new>
@@ -46,7 +47,7 @@
#include <libxml/tree.h>
//####################################################################
-struct xml::attributes::pimpl {
+struct xml::attributes::pimpl : public xml::pimpl_base<xml::attributes::pimpl> {
//####################################################################
pimpl (void) : owner_(true) {
xmlnode_ = xmlNewNode(0, reinterpret_cast<const xmlChar*>("blank"));
Modified: trunk/src/libxml/node.cxx
===================================================================
--- trunk/src/libxml/node.cxx 2008-12-21 01:38:53 UTC (rev 119)
+++ trunk/src/libxml/node.cxx 2008-12-21 15:55:51 UTC (rev 120)
@@ -40,6 +40,7 @@
#include "utility.h"
#include "ait_impl.h"
#include "node_manip.h"
+#include "pimpl_base.h"
// standard includes
#include <cstring>
@@ -58,7 +59,7 @@
#include <libxml/parser.h>
//####################################################################
-struct xml::node_impl {
+struct xml::node_impl : public xml::pimpl_base<xml::node_impl> {
//####################################################################
node_impl (void) : xmlnode_(0), owner_(true), attrs_(0)
{ }
Modified: trunk/src/libxml/node_iterator.cxx
===================================================================
--- trunk/src/libxml/node_iterator.cxx 2008-12-21 01:38:53 UTC (rev 119)
+++ trunk/src/libxml/node_iterator.cxx 2008-12-21 15:55:51 UTC (rev 120)
@@ -36,6 +36,7 @@
// definition include
#include "node_iterator.h"
+#include "pimpl_base.h"
// xmlwrapp includes
#include "xmlwrapp/node.h"
@@ -47,7 +48,7 @@
#include <libxml/tree.h>
// xml::node::iterator pimpl
-struct xml::nipimpl {
+struct xml::nipimpl : public xml::pimpl_base<xml::nipimpl> {
node_iterator it;
nipimpl (void) {};
Added: trunk/src/libxml/pimpl_base.h
===================================================================
--- trunk/src/libxml/pimpl_base.h (rev 0)
+++ trunk/src/libxml/pimpl_base.h 2008-12-21 15:55:51 UTC (rev 120)
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2008 Vaclav Slavik (vs...@fa...)
+ * All Rights Reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of the Author nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _xmlwrapp_pimpl_base_h_
+#define _xmlwrapp_pimpl_base_h_
+
+#ifdef HAVE_BOOST_POOL_SINGLETON_POOL_HPP
+ #include <cassert>
+ #include <boost/pool/singleton_pool.hpp>
+#endif // HAVE_BOOST_POOL_SINGLETON_POOL_HPP
+
+namespace xml
+{
+
+// Base class for all pimpl classes. Uses custom pool allocator for better
+// performance. Usage: derive your class FooImpl from pimpl_base<FooImpl>.
+template<typename T>
+class pimpl_base
+{
+#ifdef HAVE_BOOST_POOL_SINGLETON_POOL_HPP
+public:
+ struct xmlwrapp_pool_tag {};
+
+ // NB: we can't typedef the pool type as pimpl_base<T> subtype,
+ // because sizeof(T) is unknown (incomplete type) at this point,
+ // but it's OK to use the type in implementation of operators
+ // (compiled only when T, and so sizeof(T), is known)
+ #define XMLWRAPP_PIMPL_ALLOCATOR_TYPE(T) \
+ boost::singleton_pool<xmlwrapp_pool_tag, sizeof(T)>
+
+ static void* operator new(size_t size)
+ {
+ assert( size == sizeof(T) );
+ return XMLWRAPP_PIMPL_ALLOCATOR_TYPE(T)::malloc();
+ }
+
+ static void operator delete(void *ptr, size_t size)
+ {
+ assert( size == sizeof(T) );
+ if ( ptr )
+ XMLWRAPP_PIMPL_ALLOCATOR_TYPE(T)::free(ptr);
+ }
+#endif // HAVE_BOOST_POOL_SINGLETON_POOL_HPP
+};
+
+} // namespace xml
+
+#endif // _xmlwrapp_pimpl_base_h_
Property changes on: trunk/src/libxml/pimpl_base.h
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-21 01:39:21
|
Revision: 118
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=118&view=rev
Author: vaclavslavik
Date: 2008-12-21 01:36:38 +0000 (Sun, 21 Dec 2008)
Log Message:
-----------
made node_iterator creation a bit faster: don't initialize fake_node_ to blank node and avoid xmlNewNode() call and accompanying memory allocation
Modified Paths:
--------------
trunk/include/xmlwrapp/attributes.h
trunk/include/xmlwrapp/node.h
trunk/src/libxml/node.cxx
trunk/src/libxml/node_iterator.h
Modified: trunk/include/xmlwrapp/attributes.h
===================================================================
--- trunk/include/xmlwrapp/attributes.h 2008-12-16 19:05:11 UTC (rev 117)
+++ trunk/include/xmlwrapp/attributes.h 2008-12-21 01:36:38 UTC (rev 118)
@@ -372,7 +372,10 @@
private:
struct pimpl; pimpl *pimpl_;
+
+ // private ctor to create uninitialized instance
explicit attributes (int);
+
void set_data (void *node);
void* get_data (void);
friend struct node_impl;
Modified: trunk/include/xmlwrapp/node.h
===================================================================
--- trunk/include/xmlwrapp/node.h 2008-12-16 19:05:11 UTC (rev 117)
+++ trunk/include/xmlwrapp/node.h 2008-12-21 01:36:38 UTC (rev 118)
@@ -800,8 +800,13 @@
**/
//####################################################################
friend std::ostream& operator<< (std::ostream &stream, const node &n);
+
private:
node_impl *pimpl_;
+
+ // private ctor to create uninitialized instance
+ explicit node (int);
+
void set_node_data (void *data);
void* get_node_data (void);
void* release_node_data (void);
Modified: trunk/src/libxml/node.cxx
===================================================================
--- trunk/src/libxml/node.cxx 2008-12-16 19:05:11 UTC (rev 117)
+++ trunk/src/libxml/node.cxx 2008-12-21 01:36:38 UTC (rev 118)
@@ -175,6 +175,10 @@
xmlNodePtr find_node(const char *name, xmlNodePtr first);
}
//####################################################################
+xml::node::node (int) {
+ pimpl_ = new node_impl;
+}
+//####################################################################
xml::node::node (void) {
std::auto_ptr<node_impl> ap(pimpl_ = new node_impl);
Modified: trunk/src/libxml/node_iterator.h
===================================================================
--- trunk/src/libxml/node_iterator.h 2008-12-16 19:05:11 UTC (rev 117)
+++ trunk/src/libxml/node_iterator.h 2008-12-21 01:36:38 UTC (rev 118)
@@ -48,10 +48,10 @@
// base iterator class
class node_iterator {
public:
- node_iterator (void) : node_(0) {}
- node_iterator (node &parent) : node_(reinterpret_cast<xmlNodePtr>(parent.get_node_data())) {}
- node_iterator (xmlNodePtr xmlnode) : node_(xmlnode) {}
- node_iterator (const node_iterator &other) : node_(other.node_) {}
+ node_iterator (void) : fake_node_(0), node_(0) {}
+ node_iterator (node &parent) : fake_node_(0), node_(reinterpret_cast<xmlNodePtr>(parent.get_node_data())) {}
+ node_iterator (xmlNodePtr xmlnode) : fake_node_(0), node_(xmlnode) {}
+ node_iterator (const node_iterator &other) : fake_node_(0), node_(other.node_) {}
node_iterator& operator= (const node_iterator &other) { node_ = other.node_; return *this;}
node* get (void) const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-21 01:39:21
|
Revision: 119
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=119&view=rev
Author: vaclavslavik
Date: 2008-12-21 01:38:53 +0000 (Sun, 21 Dec 2008)
Log Message:
-----------
ignore xsltwrapp.pc too
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
xmlwrapp-config
xmlwrapp.pc
config.log
config.status
stamp-h1
libtool
+ Makefile
Makefile.in
xmlwrapp-config
xmlwrapp.pc
xsltwrapp.pc
config.log
config.status
stamp-h1
libtool
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-16 19:05:16
|
Revision: 117
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=117&view=rev
Author: vaclavslavik
Date: 2008-12-16 19:05:11 +0000 (Tue, 16 Dec 2008)
Log Message:
-----------
added ability to create text nodes, using xml::node::text
Modified Paths:
--------------
trunk/NEWS
trunk/include/xmlwrapp/node.h
trunk/src/libxml/node.cxx
trunk/tests/node/Makefile.am
trunk/tests/node/runtest.pl
Added Paths:
-----------
trunk/tests/node/data/14.out
trunk/tests/node/test_node-14.cxx
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-12-16 18:24:46 UTC (rev 116)
+++ trunk/NEWS 2008-12-16 19:05:11 UTC (rev 117)
@@ -27,6 +27,9 @@
Added xml::node::get_namespace() function.
+ Added new constructor to the xml::node class for creating text nodes,
+ using xml::node::text helper struct.
+
Version 0.5.1
Various compilation fixes.
Modified: trunk/include/xmlwrapp/node.h
===================================================================
--- trunk/include/xmlwrapp/node.h 2008-12-16 18:24:46 UTC (rev 116)
+++ trunk/include/xmlwrapp/node.h 2008-12-16 19:05:11 UTC (rev 117)
@@ -130,6 +130,18 @@
const char *n, *c;
};
+ /**
+ * Helper struct for creating a xml::node of type_text.
+ *
+ * @code
+ * xml::node mynode(xml::node::text("This is an XML text fragment"));
+ * @endcode
+ */
+ struct text {
+ explicit text (const char *text) : t(text) { }
+ const char *t;
+ };
+
//####################################################################
/**
* Construct a new blank xml::node.
@@ -212,6 +224,22 @@
//####################################################################
/**
+ * Construct a new xml::node that is of type_text. The text_info
+ * parameter should contain the text.
+ *
+ * @note Sample Use Example:
+ * @code
+ * xml::node mynode(xml::node::text("This is XML text"));
+ * @endcode
+ *
+ * @param text_info A text struct that tells xml::node what the text will be.
+ * @author Vaclav Slavik
+ **/
+ //####################################################################
+ explicit node (text text_info);
+
+ //####################################################################
+ /**
* Construct a new xml::node by copying another xml::node.
*
* @param other The other node to copy.
Modified: trunk/src/libxml/node.cxx
===================================================================
--- trunk/src/libxml/node.cxx 2008-12-16 18:24:46 UTC (rev 116)
+++ trunk/src/libxml/node.cxx 2008-12-16 19:05:11 UTC (rev 117)
@@ -240,6 +240,16 @@
ap.release();
}
//####################################################################
+xml::node::node (text text_info) {
+ std::auto_ptr<node_impl> ap(pimpl_ = new node_impl);
+
+ if ( (pimpl_->xmlnode_ = xmlNewText(reinterpret_cast<const xmlChar*>(text_info.t))) == 0) {
+ throw std::bad_alloc();
+ }
+
+ ap.release();
+}
+//####################################################################
xml::node::node (const node &other) {
std::auto_ptr<node_impl> ap(pimpl_ = new node_impl);
Modified: trunk/tests/node/Makefile.am
===================================================================
--- trunk/tests/node/Makefile.am 2008-12-16 18:24:46 UTC (rev 116)
+++ trunk/tests/node/Makefile.am 2008-12-16 19:05:11 UTC (rev 117)
@@ -25,7 +25,8 @@
test_node-10 \
test_node-11 \
test_node-12 \
- test_node-13
+ test_node-13 \
+ test_node-14
test_node_01_SOURCES = test_node-01.cxx
test_node_02a_SOURCES = test_node-02a.cxx
@@ -48,3 +49,4 @@
test_node_11_SOURCES = test_node-11.cxx
test_node_12_SOURCES = test_node-12.cxx
test_node_13_SOURCES = test_node-13.cxx
+test_node_14_SOURCES = test_node-14.cxx
Added: trunk/tests/node/data/14.out
===================================================================
--- trunk/tests/node/data/14.out (rev 0)
+++ trunk/tests/node/data/14.out 2008-12-16 19:05:11 UTC (rev 117)
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<root>some text</root>
Modified: trunk/tests/node/runtest.pl
===================================================================
--- trunk/tests/node/runtest.pl 2008-12-16 18:24:46 UTC (rev 116)
+++ trunk/tests/node/runtest.pl 2008-12-16 19:05:11 UTC (rev 117)
@@ -81,5 +81,7 @@
###########################################################################
$test->regression("empty (13)", "./test_node-13", "data/13.out");
###########################################################################
+ $test->regression("empty (14)", "./test_node-14", "data/14.out");
+ ###########################################################################
}
###########################################################################
Added: trunk/tests/node/test_node-14.cxx
===================================================================
--- trunk/tests/node/test_node-14.cxx (rev 0)
+++ trunk/tests/node/test_node-14.cxx 2008-12-16 19:05:11 UTC (rev 117)
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2001-2003 Peter J Jones (pj...@pm...)
+ * All Rights Reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name of the Author nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * This test checks xml::node::node(text)
+ */
+
+#include <xmlwrapp/xmlwrapp.h>
+#include <iostream>
+#include <exception>
+
+int main (int argc, char *argv[]) {
+ if (argc != 1) {
+ std::cerr << "Usage: " << argv[0] << "\n";
+ return 1;
+ }
+
+ try {
+ xml::node root("root");
+ xml::node n(xml::node::text("some text"));
+ root.push_back(n);
+ std::cout << root;
+ } catch (const std::exception &e) {
+ std::cout << e.what() << std::endl;
+ return 1;
+ }
+
+ return 0;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-16 18:24:52
|
Revision: 116
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=116&view=rev
Author: vaclavslavik
Date: 2008-12-16 18:24:46 +0000 (Tue, 16 Dec 2008)
Log Message:
-----------
added xml::node::get_namespace() function (patch #2102276)
Modified Paths:
--------------
trunk/NEWS
trunk/include/xmlwrapp/node.h
trunk/src/libxml/node.cxx
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-12-16 18:19:01 UTC (rev 115)
+++ trunk/NEWS 2008-12-16 18:24:46 UTC (rev 116)
@@ -25,6 +25,8 @@
PDF version of the manual is no longer provided, use HTML documentation
included with xmlwrapp source distribution.
+ Added xml::node::get_namespace() function.
+
Version 0.5.1
Various compilation fixes.
Modified: trunk/include/xmlwrapp/node.h
===================================================================
--- trunk/include/xmlwrapp/node.h 2008-12-16 18:19:01 UTC (rev 115)
+++ trunk/include/xmlwrapp/node.h 2008-12-16 18:24:46 UTC (rev 116)
@@ -328,6 +328,17 @@
//####################################################################
/**
+ * Get the namespace of this xml::node.
+ *
+ * @return The namespace of this node or NULL if no namespace is
+ * associated.
+ * @author Vaclav Slavik
+ **/
+ //####################################################################
+ const char* get_namespace (void) const;
+
+ //####################################################################
+ /**
* Find out if this node is a text node or sometiming like a text node,
* CDATA for example.
*
Modified: trunk/src/libxml/node.cxx
===================================================================
--- trunk/src/libxml/node.cxx 2008-12-16 18:19:01 UTC (rev 115)
+++ trunk/src/libxml/node.cxx 2008-12-16 18:24:46 UTC (rev 116)
@@ -340,6 +340,12 @@
return pimpl_->attrs_;
}
//####################################################################
+const char *xml::node::get_namespace (void) const {
+ return pimpl_->xmlnode_->ns
+ ? reinterpret_cast<const char*>(pimpl_->xmlnode_->ns->href)
+ : NULL;
+}
+//####################################################################
bool xml::node::is_text (void) const {
return xmlNodeIsText(pimpl_->xmlnode_) != 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-16 18:19:04
|
Revision: 115
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=115&view=rev
Author: vaclavslavik
Date: 2008-12-16 18:19:01 +0000 (Tue, 16 Dec 2008)
Log Message:
-----------
removed (old) homepage pages from repository
Removed Paths:
-------------
trunk/docs/project/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-16 18:12:42
|
Revision: 114
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=114&view=rev
Author: vaclavslavik
Date: 2008-12-16 18:12:33 +0000 (Tue, 16 Dec 2008)
Log Message:
-----------
Converted the manual to Doxygen format. Also removed duplicate
versions of the manual and made minor updates to reflect recent
changes. Removed parts of the manual that exist elsewhere (e.g.
contents of NEWS or AUTHORS files) or that were out of date
(TODO list).
Modified Paths:
--------------
trunk/NEWS
Added Paths:
-----------
trunk/README
trunk/docs/Doxyfile
trunk/docs/manual/attributes.doxygen
trunk/docs/manual/documents.doxygen
trunk/docs/manual/intro.doxygen
trunk/docs/manual/mainpage.doxygen
trunk/docs/manual/node.doxygen
trunk/docs/manual/parsing.doxygen
trunk/docs/manual/prepare.doxygen
trunk/docs/manual/tips.doxygen
trunk/docs/manual/whatnext.doxygen
trunk/docs/manual/xslt.doxygen
Removed Paths:
-------------
trunk/README.docs
trunk/docs/doxygen/
trunk/docs/manual/Makefile
trunk/docs/manual/attributes.texi
trunk/docs/manual/bundling.texi
trunk/docs/manual/changelog.texi
trunk/docs/manual/copyright.texi
trunk/docs/manual/credits.texi
trunk/docs/manual/documents.texi
trunk/docs/manual/intro.texi
trunk/docs/manual/license.texi
trunk/docs/manual/manual.texi
trunk/docs/manual/node.texi
trunk/docs/manual/parsing.texi
trunk/docs/manual/prepare.texi
trunk/docs/manual/quickstart.texi
trunk/docs/manual/tips.texi
trunk/docs/manual/todo.texi
trunk/docs/manual/whatnext.texi
trunk/docs/manual/xslt.texi
trunk/docs/manual_xml/
trunk/project-xslt/
Property Changed:
----------------
trunk/docs/
trunk/docs/manual/
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-12-14 15:00:16 UTC (rev 113)
+++ trunk/NEWS 2008-12-16 18:12:33 UTC (rev 114)
@@ -20,6 +20,11 @@
Configuration methods of xml/xslt::init classes are now static.
+ The previously separate manual was merged with Doxygen documentation so
+ that all documentation is available in single place. As a consequence,
+ PDF version of the manual is no longer provided, use HTML documentation
+ included with xmlwrapp source distribution.
+
Version 0.5.1
Various compilation fixes.
Added: trunk/README
===================================================================
--- trunk/README (rev 0)
+++ trunk/README 2008-12-16 18:12:33 UTC (rev 114)
@@ -0,0 +1,41 @@
+
+
+1. Requirements
+---------------
+
+In order to build xmlwrapp, you need libxml2 version 2.4.28 or newer. When
+building with XSLT support, libxslt 1.1.6 or newer is required. Both libraries
+are available from http://xmlsoft.org.
+
+
+2. Building on Unix
+-------------------
+
+On Unix, the usual Autotools-based build system is used. Building xmlwrapp is
+usually as simple as running the following three commands:
+
+ ./configure
+ make
+ make install
+
+See the output of `./configure --help` for additional settings and options.
+
+
+3. Building on Windows
+----------------------
+
+At this time, only building with Visual C++ compiler is supported. The required
+project files are located in platform/Win32 directory.
+
+
+4. Using xmlwrapp
+-----------------
+
+On Unix, you should use pkg-config to get compiler flags for xmlwrapp or
+xsltwrapp libraries:
+
+ c++ -c `pkg-config --cflags xmlwrapp` ...
+ c++ -o ... `pkg-config --libs xmlwrapp`
+
+On Windows, you need to link against xmlwrapp libraries and add the include/
+directory to compiler's headers search path.
Deleted: trunk/README.docs
===================================================================
--- trunk/README.docs 2008-12-14 15:00:16 UTC (rev 113)
+++ trunk/README.docs 2008-12-16 18:12:33 UTC (rev 114)
@@ -1,22 +0,0 @@
-Things I had to do to be able to "make docs":
-
-docs/manual
-
- Collected project-xslt directory.
-
- Modified project-xslt/docbook.mk file.
-
- Changed my local /usr/share/texmf/web2c/texmf.cnf file so "save_size" was
- increased from 5000 to 90000.
-
- Use 'pmake' instead of 'make'.
-
- Went looking for LaTeX font packages (base on WARNINGs in pdf/manual.log):
- tipa
- Elsevier
- mmasym
-
- Tried to track down LaTeX failure:
-
-l.43 ...2" hyphenation-remain-character-count="2">
- Chapter^^c2^^a01.^^c2^^a0I...
Property changes on: trunk/docs
___________________________________________________________________
Modified: svn:ignore
- manual-0.5.0.pdf
texi_test
+ html
Copied: trunk/docs/Doxyfile (from rev 106, trunk/docs/doxygen/doxyfile)
===================================================================
--- trunk/docs/Doxyfile (rev 0)
+++ trunk/docs/Doxyfile 2008-12-16 18:12:33 UTC (rev 114)
@@ -0,0 +1,1473 @@
+# Doxyfile 1.5.7.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+# TAG = value [value, ...]
+# For lists items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME = xmlwrapp
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY =
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
+# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene,
+# Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH = ../include
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will rougly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = YES
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = YES
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = YES
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST = NO
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST = NO
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST = NO
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= NO
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page. This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
+# doxygen. The layout file controls the global structure of the generated output files
+# in an output format independent way. The create the layout file that represents
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name
+# of the layout file.
+
+LAYOUT_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = YES
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT = ../include manual
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS = *.h *.doxygen
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS = _cbfo.h
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output. If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS = NO
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code. Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET =
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS = YES
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
+# are set, an additional index file will be generated that can be used as input for
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
+# HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#namespace">Qt Help Project / Namespace</a>.
+
+QHP_NAMESPACE = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>.
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file .
+
+QHG_LOCATION =
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to FRAME, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# probably better off using the HTML help feature. Other possible values
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list;
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which
+# disables this behavior completely. For backwards compatibility with previous
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE
+# respectively.
+
+GENERATE_TREEVIEW = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH = 250
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE = 10
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader. This is useful
+# if you want to understand what is going on. On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
+# powerful graphs.
+
+CLASS_DIAGRAMS = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH =
+
+# If set to YES, th...
[truncated message content] |
|
From: <vac...@us...> - 2008-12-14 15:00:19
|
Revision: 113
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=113&view=rev
Author: vaclavslavik
Date: 2008-12-14 15:00:16 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
no real changes: removed extra newline
Modified Paths:
--------------
trunk/NEWS
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-12-14 14:51:23 UTC (rev 112)
+++ trunk/NEWS 2008-12-14 15:00:16 UTC (rev 113)
@@ -64,7 +64,6 @@
Updated the TODO list.
-
Version 0.4.2
Version 0.4.2 is a maintenance release. A few small bugs were
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-14 14:51:27
|
Revision: 112
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=112&view=rev
Author: vaclavslavik
Date: 2008-12-14 14:51:23 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
removed (empty) ToDo file
Removed Paths:
-------------
trunk/ToDo
Deleted: trunk/ToDo
===================================================================
--- trunk/ToDo 2008-12-14 14:50:48 UTC (rev 111)
+++ trunk/ToDo 2008-12-14 14:51:23 UTC (rev 112)
@@ -1,3 +0,0 @@
-Clean up directory for commit.
-
-Get ChangeLog up to snuff.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-14 14:50:55
|
Revision: 111
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=111&view=rev
Author: vaclavslavik
Date: 2008-12-14 14:50:48 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
renamed ChangeLog file to NEWS, that's what its level of details is
Added Paths:
-----------
trunk/NEWS
Removed Paths:
-------------
trunk/ChangeLog
Deleted: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-14 14:27:46 UTC (rev 110)
+++ trunk/ChangeLog 2008-12-14 14:50:48 UTC (rev 111)
@@ -1,261 +0,0 @@
-Version 0.6.0
-
- Fixed libxmlwrapp to not depend on libxslt if XSLT support
- is enabled (Vadim Zeitlin, #1927398).
-
- Ported Unix build system to Autotools.
-
- Split pkg-config file xmlwrapp.pc into xmlwrapp.pc and
- xsltwrapp.pc. Applications that use libxsltwrapp need to be
- updated to use the latter (too).
-
- Input document to xslt::stylesheet::apply() is now passed as
- const reference instead of non-const one.
-
- It is no longer necessary to instantiate xml/xslt::init object before
- using the library; this is now done automatically (thread safety is
- preserved) and new code shouldn't do it. Moreover, creating multiple
- xml/xslt::init object instances is now possible and doesn't result in
- multiple initialization/shutdown of the library.
-
- Configuration methods of xml/xslt::init classes are now static.
-
-Version 0.5.1
-
- Various compilation fixes.
-
-Version 0.5.0
-
- Fixed a null pointer dereference problem in
- xml::attributes, Bug ID 20. Thanks goes to John K. Hohm
- for finding this and providing a working patch.
-
- Added three new constructors to the xml::node class for creating
- CDATA sections, XML comments, and XML processing instructions. This
- is done using three new helper structs, xml::node::cdata,
- xml::node::comment, and xml::node::pi.
-
- Added new member functions to the xml::node class.
- They are: size and empty.
-
- Added new member functions to the xml::document class.
- They are: size, push_back, insert, replace, and erase.
-
- Added the ability to compress XML files saved with the
- xml::document::save_to_file member function (Bug ID 19).
-
- Major clean ups in the test harness. Test code should be a lot easier
- to write now.
-
-Version 0.4.4
-
- Small changes so that xmlwrapp can work with libxml2
- version 2.6.0. Thanks goes to Craig Wiesen and Jonathan
- Wakely for finding this. (Bug ID 18).
-
- Fixed a typo in the manual. Thanks goes to Bill
- Luoma. (Bug ID 16).
-
-Version 0.4.3
-
- Fixed a build problem on Linux (bug 10). This happens when
- libxslt was installed in /usr. configure.pl could not find
- libxslt because xslt-config does not list /usr/include.
-
- Updated the TODO list.
-
-
-Version 0.4.2
-
- Version 0.4.2 is a maintenance release. A few small bugs were
- fixed and a work around for a bug in Perl 5.8 was added.
-
- Updated Perl scripts to work around a bug in the Perl 5.8
- regex parser. Thanks goes to Andy Chou.
-
- Added an encoding patch from Dmitriy Nikitinskiy.
-
-Version 0.4.1
-
- Version 0.4.1 fixes a few small bugs and also includes some new
- features. It is binary compatible with version 0.4.0.
-
- Typos in the doxygen documentation were fixed thanks to Jonathan
- Wakely, Stephen Blake and Chris de Hoop.
-
- Fixed a bug in configure.pl that caused a bad xmlwrapp-config to
- be generated when XSLT was enabled.
-
- Added support for pkg-config and the xmlwrapp.pc file.
-
- Added support for libexslt.
-
- Added the xml::init::remove_whitespace member function to skip
- ignorable whitespace from parsed XML documents. Default value is
- false, so whitespace is included in the node tree by default.
-
- Added the xml::node::self and xml::node::parent member
- functions. They return @code{xml::node::iterator} or
- xml::node::const_iterator objects.
-
- Added a new version of the xml::node::insert member function that
- does not require a location iterator, but instead inserts at the
- end of the child list like the xml::node::push_back member
- function does.
-
- Added a range version of the xml::node::erase member function and
- a version that takes the name of a node to erase. All nodes with
- matching names will be removed from the child list.
-
- Added two versions of the xml::node::sort member function. The
- first, will sort child nodes with the given name using one of
- their attributes as a sort key. The other, uses a user supplied
- function object to sort the child nodes.
-
-Version 0.4.0
-
- Version 0.4.0 is a feature release. xmlwrapp now supports XSLT via
- libxslt. This support is called xsltwrapp and is optional.
-
- Added the xslt::init and xslt::stylesheet classes to support XSLT.
-
- Added the xml::init::load_external_subsets member function to make
- libxml load external subsets by default.
-
-Version 0.3.0
-
- This version contains a lot of new features. Because of this,
- certain API calls have been changed or removed. The following list
- should help you update code that is using xmlwrapp.
-
- Changed configure.pl to require at least version 2.4.28 of
- libxml2.
-
- The xml::tree_parser constructors can now throw exceptions if
- there was an error during parsing. This is optional, and is
- controlled by a bool flag passed to the constructors. This also
- means that xml::tree_parser will now prevent libxml2 from sending
- error messages to standard error. The new default behavior is to
- throw an exception.
-
- Some of the xml::event_parser callback member functions have
- changed. There are also new callbacks so that you can catch CDATA
- sections, processing instructions and XML comments.
-
- It is now safe to throw exceptions from within an
- xml::event_parser callback. The exception will not be passed up
- the stack to the caller of one of the parsing member
- functions. Instead, it will stop the parsing and set an error
- condition.
-
- There is a new xml::document class that allows you to set XML
- document variables such as the encoding and version. The document
- class also supports saving itself to a file, string or a
- std::ostream. It also includes functions for validating a document
- against an internal or external DTD.
-
- The xml::tree_parser class no longer contains a get_root_node()
- member function. It has been replaced with get_document() which
- will return a reference to a xml::document object. That object can
- then be used to call get_root_node().
-
- Another new class, xml::attributes, for getting and setting the
- attributes of a node. This class replaces all the member functions
- of xml::node that dealt with attributes. This class is much better
- than using the old xml::node member functions because it supports
- iterators and functions like find.
-
- The xml::init class will prevent libxml2 from sending any messages
- to stderr. This should not be a problem since most classes will
- catch the message and use it in an exception or store it for later
- use.
-
- xml::init will now set some default libxml2 global
- variables. Indenting of output XML text is turned on. Default
- substitution of entities on turned on. Validating of all
- documents by default is turned off. There are new member functions
- you can use to change these defaults.
-
- Compiler flags will no longer contain quotes around directory
- names. This was added for cygwin when people have a space in the
- current working directory path. It was removed because it was
- causing problems on other platforms.
-
- There is a new header file, xmlwrapp/xmlwrapp.h, that includes all
- of the other xmlwrapp header files.
-
- A real working test harness has been added with several tests.
-
- New member functions for xml::node.
-
- 4 different versions of xml::node::find.
-
- xml::node::insert.
-
- xml::node::replace.
-
- xml::node::erase.
-
- xml::node::get_attributes.
-
- xml::node::get_type.
-
-Version 0.2.2
-
- Version 0.2.2 was a bug fix release.
-
- Changed include guards so that they don't violate the C++
- standard. Thanks to Greg Chicares.
-
- Include <cstddef> to get std::size_t and std::ptrdiff_t. Thanks to
- Greg Chicares.
-
- Fix a major bug where a pimpl was not created in
- xml::tree_parser. Thanks to Greg Chicares.
-
- Added a call to xmlKeepBlanksDefault(0) in xml::init constructor
- to produce better looking XML. If this causes any problems we will
- have to remove it. This was suggested by Daniel Evison.
-
- Fixed an issue with command quoting in the configure.pl script.
-
-Version 0.2.1
-
- Version 0.2.1 was a bug fix release.
-
- Fixed a bug in the xml::event_parser class that caused parsing to
- continue even when one of the event member functions returned
- false. Thanks to Michael Grabner for finding this one.
-
- There were a few reports that xmlwrapp could be compiled using
- MSVC on Win32. A project file for MSVC was added so that no one
- would have to do this again. The STLport is needed on the Win32
- platform.
-
- The get_namespace and set_namespace functions were removed from
- the xml::node class since they were defined but not yet
- implemented.
-
-Version 0.2.0
-
- Version 0.2.0 of xmlwrapp was the first public release. It
- included the following changes from version 0.1.0.
-
- First draft of the documentation.
-
- Added example programs.
-
- Changed operator<< for xml::node from a template function to a
- normal function that takes a std::ostream. This allows xmlwrapp
- to compile with GCC < 3.0.
-
- Replaced calls to std::free with xmlFree in the libxml2 backend
- wrapper.
-
-Version 0.1.0
-
- Version 0.1.0 was the first packaged version. It was packaged for
- <http://pmade.org/software/clo++/,clo++>.
-
- It included no documentation or examples, and was not intended for
- use by other developers.
Copied: trunk/NEWS (from rev 109, trunk/ChangeLog)
===================================================================
--- trunk/NEWS (rev 0)
+++ trunk/NEWS 2008-12-14 14:50:48 UTC (rev 111)
@@ -0,0 +1,261 @@
+Version 0.6.0
+
+ Fixed libxmlwrapp to not depend on libxslt if XSLT support
+ is enabled (Vadim Zeitlin, #1927398).
+
+ Ported Unix build system to Autotools.
+
+ Split pkg-config file xmlwrapp.pc into xmlwrapp.pc and
+ xsltwrapp.pc. Applications that use libxsltwrapp need to be
+ updated to use the latter (too).
+
+ Input document to xslt::stylesheet::apply() is now passed as
+ const reference instead of non-const one.
+
+ It is no longer necessary to instantiate xml/xslt::init object before
+ using the library; this is now done automatically (thread safety is
+ preserved) and new code shouldn't do it. Moreover, creating multiple
+ xml/xslt::init object instances is now possible and doesn't result in
+ multiple initialization/shutdown of the library.
+
+ Configuration methods of xml/xslt::init classes are now static.
+
+Version 0.5.1
+
+ Various compilation fixes.
+
+Version 0.5.0
+
+ Fixed a null pointer dereference problem in
+ xml::attributes, Bug ID 20. Thanks goes to John K. Hohm
+ for finding this and providing a working patch.
+
+ Added three new constructors to the xml::node class for creating
+ CDATA sections, XML comments, and XML processing instructions. This
+ is done using three new helper structs, xml::node::cdata,
+ xml::node::comment, and xml::node::pi.
+
+ Added new member functions to the xml::node class.
+ They are: size and empty.
+
+ Added new member functions to the xml::document class.
+ They are: size, push_back, insert, replace, and erase.
+
+ Added the ability to compress XML files saved with the
+ xml::document::save_to_file member function (Bug ID 19).
+
+ Major clean ups in the test harness. Test code should be a lot easier
+ to write now.
+
+Version 0.4.4
+
+ Small changes so that xmlwrapp can work with libxml2
+ version 2.6.0. Thanks goes to Craig Wiesen and Jonathan
+ Wakely for finding this. (Bug ID 18).
+
+ Fixed a typo in the manual. Thanks goes to Bill
+ Luoma. (Bug ID 16).
+
+Version 0.4.3
+
+ Fixed a build problem on Linux (bug 10). This happens when
+ libxslt was installed in /usr. configure.pl could not find
+ libxslt because xslt-config does not list /usr/include.
+
+ Updated the TODO list.
+
+
+Version 0.4.2
+
+ Version 0.4.2 is a maintenance release. A few small bugs were
+ fixed and a work around for a bug in Perl 5.8 was added.
+
+ Updated Perl scripts to work around a bug in the Perl 5.8
+ regex parser. Thanks goes to Andy Chou.
+
+ Added an encoding patch from Dmitriy Nikitinskiy.
+
+Version 0.4.1
+
+ Version 0.4.1 fixes a few small bugs and also includes some new
+ features. It is binary compatible with version 0.4.0.
+
+ Typos in the doxygen documentation were fixed thanks to Jonathan
+ Wakely, Stephen Blake and Chris de Hoop.
+
+ Fixed a bug in configure.pl that caused a bad xmlwrapp-config to
+ be generated when XSLT was enabled.
+
+ Added support for pkg-config and the xmlwrapp.pc file.
+
+ Added support for libexslt.
+
+ Added the xml::init::remove_whitespace member function to skip
+ ignorable whitespace from parsed XML documents. Default value is
+ false, so whitespace is included in the node tree by default.
+
+ Added the xml::node::self and xml::node::parent member
+ functions. They return @code{xml::node::iterator} or
+ xml::node::const_iterator objects.
+
+ Added a new version of the xml::node::insert member function that
+ does not require a location iterator, but instead inserts at the
+ end of the child list like the xml::node::push_back member
+ function does.
+
+ Added a range version of the xml::node::erase member function and
+ a version that takes the name of a node to erase. All nodes with
+ matching names will be removed from the child list.
+
+ Added two versions of the xml::node::sort member function. The
+ first, will sort child nodes with the given name using one of
+ their attributes as a sort key. The other, uses a user supplied
+ function object to sort the child nodes.
+
+Version 0.4.0
+
+ Version 0.4.0 is a feature release. xmlwrapp now supports XSLT via
+ libxslt. This support is called xsltwrapp and is optional.
+
+ Added the xslt::init and xslt::stylesheet classes to support XSLT.
+
+ Added the xml::init::load_external_subsets member function to make
+ libxml load external subsets by default.
+
+Version 0.3.0
+
+ This version contains a lot of new features. Because of this,
+ certain API calls have been changed or removed. The following list
+ should help you update code that is using xmlwrapp.
+
+ Changed configure.pl to require at least version 2.4.28 of
+ libxml2.
+
+ The xml::tree_parser constructors can now throw exceptions if
+ there was an error during parsing. This is optional, and is
+ controlled by a bool flag passed to the constructors. This also
+ means that xml::tree_parser will now prevent libxml2 from sending
+ error messages to standard error. The new default behavior is to
+ throw an exception.
+
+ Some of the xml::event_parser callback member functions have
+ changed. There are also new callbacks so that you can catch CDATA
+ sections, processing instructions and XML comments.
+
+ It is now safe to throw exceptions from within an
+ xml::event_parser callback. The exception will not be passed up
+ the stack to the caller of one of the parsing member
+ functions. Instead, it will stop the parsing and set an error
+ condition.
+
+ There is a new xml::document class that allows you to set XML
+ document variables such as the encoding and version. The document
+ class also supports saving itself to a file, string or a
+ std::ostream. It also includes functions for validating a document
+ against an internal or external DTD.
+
+ The xml::tree_parser class no longer contains a get_root_node()
+ member function. It has been replaced with get_document() which
+ will return a reference to a xml::document object. That object can
+ then be used to call get_root_node().
+
+ Another new class, xml::attributes, for getting and setting the
+ attributes of a node. This class replaces all the member functions
+ of xml::node that dealt with attributes. This class is much better
+ than using the old xml::node member functions because it supports
+ iterators and functions like find.
+
+ The xml::init class will prevent libxml2 from sending any messages
+ to stderr. This should not be a problem since most classes will
+ catch the message and use it in an exception or store it for later
+ use.
+
+ xml::init will now set some default libxml2 global
+ variables. Indenting of output XML text is turned on. Default
+ substitution of entities on turned on. Validating of all
+ documents by default is turned off. There are new member functions
+ you can use to change these defaults.
+
+ Compiler flags will no longer contain quotes around directory
+ names. This was added for cygwin when people have a space in the
+ current working directory path. It was removed because it was
+ causing problems on other platforms.
+
+ There is a new header file, xmlwrapp/xmlwrapp.h, that includes all
+ of the other xmlwrapp header files.
+
+ A real working test harness has been added with several tests.
+
+ New member functions for xml::node.
+
+ 4 different versions of xml::node::find.
+
+ xml::node::insert.
+
+ xml::node::replace.
+
+ xml::node::erase.
+
+ xml::node::get_attributes.
+
+ xml::node::get_type.
+
+Version 0.2.2
+
+ Version 0.2.2 was a bug fix release.
+
+ Changed include guards so that they don't violate the C++
+ standard. Thanks to Greg Chicares.
+
+ Include <cstddef> to get std::size_t and std::ptrdiff_t. Thanks to
+ Greg Chicares.
+
+ Fix a major bug where a pimpl was not created in
+ xml::tree_parser. Thanks to Greg Chicares.
+
+ Added a call to xmlKeepBlanksDefault(0) in xml::init constructor
+ to produce better looking XML. If this causes any problems we will
+ have to remove it. This was suggested by Daniel Evison.
+
+ Fixed an issue with command quoting in the configure.pl script.
+
+Version 0.2.1
+
+ Version 0.2.1 was a bug fix release.
+
+ Fixed a bug in the xml::event_parser class that caused parsing to
+ continue even when one of the event member functions returned
+ false. Thanks to Michael Grabner for finding this one.
+
+ There were a few reports that xmlwrapp could be compiled using
+ MSVC on Win32. A project file for MSVC was added so that no one
+ would have to do this again. The STLport is needed on the Win32
+ platform.
+
+ The get_namespace and set_namespace functions were removed from
+ the xml::node class since they were defined but not yet
+ implemented.
+
+Version 0.2.0
+
+ Version 0.2.0 of xmlwrapp was the first public release. It
+ included the following changes from version 0.1.0.
+
+ First draft of the documentation.
+
+ Added example programs.
+
+ Changed operator<< for xml::node from a template function to a
+ normal function that takes a std::ostream. This allows xmlwrapp
+ to compile with GCC < 3.0.
+
+ Replaced calls to std::free with xmlFree in the libxml2 backend
+ wrapper.
+
+Version 0.1.0
+
+ Version 0.1.0 was the first packaged version. It was packaged for
+ <http://pmade.org/software/clo++/,clo++>.
+
+ It included no documentation or examples, and was not intended for
+ use by other developers.
Property changes on: trunk/NEWS
___________________________________________________________________
Added: svn:mergeinfo
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-14 14:27:50
|
Revision: 110
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=110&view=rev
Author: vaclavslavik
Date: 2008-12-14 14:27:46 +0000 (Sun, 14 Dec 2008)
Log Message:
-----------
added Doxygen docs for xmlwrapp namespaces
Modified Paths:
--------------
trunk/include/xmlwrapp/init.h
trunk/include/xsltwrapp/init.h
Modified: trunk/include/xmlwrapp/init.h
===================================================================
--- trunk/include/xmlwrapp/init.h 2008-12-13 22:28:53 UTC (rev 109)
+++ trunk/include/xmlwrapp/init.h 2008-12-14 14:27:46 UTC (rev 110)
@@ -37,6 +37,7 @@
#ifndef _xmlwrapp_init_h_
#define _xmlwrapp_init_h_
+/// XML library namespace
namespace xml {
/**
Modified: trunk/include/xsltwrapp/init.h
===================================================================
--- trunk/include/xsltwrapp/init.h 2008-12-13 22:28:53 UTC (rev 109)
+++ trunk/include/xsltwrapp/init.h 2008-12-14 14:27:46 UTC (rev 110)
@@ -40,6 +40,7 @@
// xmlwrapp includes
#include "xmlwrapp/init.h"
+/// XSLT library namespace
namespace xslt {
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-13 22:28:56
|
Revision: 109
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=109&view=rev
Author: vaclavslavik
Date: 2008-12-13 22:28:53 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
copied 0.5.0's changelog to ChangeLog file
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-13 21:53:17 UTC (rev 108)
+++ trunk/ChangeLog 2008-12-13 22:28:53 UTC (rev 109)
@@ -26,8 +26,27 @@
Version 0.5.0
- ?
+ Fixed a null pointer dereference problem in
+ xml::attributes, Bug ID 20. Thanks goes to John K. Hohm
+ for finding this and providing a working patch.
+ Added three new constructors to the xml::node class for creating
+ CDATA sections, XML comments, and XML processing instructions. This
+ is done using three new helper structs, xml::node::cdata,
+ xml::node::comment, and xml::node::pi.
+
+ Added new member functions to the xml::node class.
+ They are: size and empty.
+
+ Added new member functions to the xml::document class.
+ They are: size, push_back, insert, replace, and erase.
+
+ Added the ability to compress XML files saved with the
+ xml::document::save_to_file member function (Bug ID 19).
+
+ Major clean ups in the test harness. Test code should be a lot easier
+ to write now.
+
Version 0.4.4
Small changes so that xmlwrapp can work with libxml2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-13 22:03:23
|
Revision: 108
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=108&view=rev
Author: vaclavslavik
Date: 2008-12-13 21:53:17 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
fix Doxygen warning about unknown tag <chapter>
Modified Paths:
--------------
trunk/include/xmlwrapp/node.h
Modified: trunk/include/xmlwrapp/node.h
===================================================================
--- trunk/include/xmlwrapp/node.h 2008-12-13 13:39:53 UTC (rev 107)
+++ trunk/include/xmlwrapp/node.h 2008-12-13 21:53:17 UTC (rev 108)
@@ -75,7 +75,7 @@
/// enum for the different types of XML nodes
enum node_type {
- type_element, ///< XML element such as <chapter/>
+ type_element, ///< XML element such as "<chapter/>"
type_text, ///< Text node
type_cdata, ///< <![CDATA[text]]>
type_pi, ///< Processing Instruction
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-13 13:39:58
|
Revision: 107
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=107&view=rev
Author: vaclavslavik
Date: 2008-12-13 13:39:53 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
removed the need for explicit use of xml/xslt::init: use nifty counters technique to do the initialization at app startup time
Modified Paths:
--------------
trunk/ChangeLog
trunk/examples/01-tree_parsing/example.cxx
trunk/examples/02-event_parsing/example.cxx
trunk/examples/03-xml_generation/example.cxx
trunk/examples/04-xslt/example.cxx
trunk/include/xmlwrapp/attributes.h
trunk/include/xmlwrapp/document.h
trunk/include/xmlwrapp/event_parser.h
trunk/include/xmlwrapp/init.h
trunk/include/xmlwrapp/node.h
trunk/include/xmlwrapp/tree_parser.h
trunk/include/xmlwrapp/xmlwrapp.h
trunk/include/xsltwrapp/init.h
trunk/include/xsltwrapp/stylesheet.h
trunk/include/xsltwrapp/xsltwrapp.h
trunk/src/libxml/init.cxx
trunk/src/libxslt/init.cxx
trunk/tests/attributes/test_attr-01.cxx
trunk/tests/attributes/test_attr-02.cxx
trunk/tests/attributes/test_attr-03.cxx
trunk/tests/attributes/test_attr-04.cxx
trunk/tests/attributes/test_attr-05.cxx
trunk/tests/attributes/test_attr-06.cxx
trunk/tests/attributes/test_attr-07.cxx
trunk/tests/attributes/test_attr-08.cxx
trunk/tests/attributes/test_attr-09.cxx
trunk/tests/attributes/test_attr-10.cxx
trunk/tests/document/test_document-01.cxx
trunk/tests/document/test_document-02.cxx
trunk/tests/document/test_document-03.cxx
trunk/tests/document/test_document-04.cxx
trunk/tests/document/test_document-05.cxx
trunk/tests/document/test_document-06.cxx
trunk/tests/document/test_document-07.cxx
trunk/tests/document/test_document-08.cxx
trunk/tests/document/test_document-09.cxx
trunk/tests/document/test_document-10.cxx
trunk/tests/document/test_document-11.cxx
trunk/tests/document/test_document-12.cxx
trunk/tests/document/test_document-13.cxx
trunk/tests/document/test_document-14.cxx
trunk/tests/document/test_document-15.cxx
trunk/tests/document/test_document-16.cxx
trunk/tests/document/test_document-17.cxx
trunk/tests/document/test_document-18.cxx
trunk/tests/document/test_document-19.cxx
trunk/tests/document/test_document-20.cxx
trunk/tests/document/test_document-21.cxx
trunk/tests/document/test_document-22.cxx
trunk/tests/event/test_event-01.cxx
trunk/tests/event/test_event-02.cxx
trunk/tests/event/test_event-03.cxx
trunk/tests/node/test_node-01.cxx
trunk/tests/node/test_node-02a.cxx
trunk/tests/node/test_node-02b.cxx
trunk/tests/node/test_node-02c.cxx
trunk/tests/node/test_node-02d.cxx
trunk/tests/node/test_node-03a.cxx
trunk/tests/node/test_node-03b.cxx
trunk/tests/node/test_node-04a.cxx
trunk/tests/node/test_node-04b.cxx
trunk/tests/node/test_node-05a.cxx
trunk/tests/node/test_node-05b.cxx
trunk/tests/node/test_node-05c.cxx
trunk/tests/node/test_node-05d.cxx
trunk/tests/node/test_node-06.cxx
trunk/tests/node/test_node-07.cxx
trunk/tests/node/test_node-08.cxx
trunk/tests/node/test_node-09.cxx
trunk/tests/node/test_node-10.cxx
trunk/tests/node/test_node-11.cxx
trunk/tests/node/test_node-12.cxx
trunk/tests/node/test_node-13.cxx
trunk/tests/tree/test_tree-01.cxx
trunk/tests/tree/test_tree-02.cxx
trunk/tests/tree/test_tree-03.cxx
trunk/tests/tree/test_tree-04.cxx
trunk/tests/tree/test_tree-05.cxx
trunk/tests/tree/test_tree-06.cxx
trunk/tests/xslt/test_xslt-01.cxx
trunk/tests/xslt/test_xslt-02.cxx
trunk/tests/xslt/test_xslt-03.cxx
trunk/tests/xslt/test_xslt-04.cxx
trunk/tests/xslt/test_xslt-05.cxx
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/ChangeLog 2008-12-13 13:39:53 UTC (rev 107)
@@ -12,6 +12,14 @@
Input document to xslt::stylesheet::apply() is now passed as
const reference instead of non-const one.
+ It is no longer necessary to instantiate xml/xslt::init object before
+ using the library; this is now done automatically (thread safety is
+ preserved) and new code shouldn't do it. Moreover, creating multiple
+ xml/xslt::init object instances is now possible and doesn't result in
+ multiple initialization/shutdown of the library.
+
+ Configuration methods of xml/xslt::init classes are now static.
+
Version 0.5.1
Various compilation fixes.
Modified: trunk/examples/01-tree_parsing/example.cxx
===================================================================
--- trunk/examples/01-tree_parsing/example.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/examples/01-tree_parsing/example.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -51,7 +51,6 @@
try {
- xml::init init;
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/examples/02-event_parsing/example.cxx
===================================================================
--- trunk/examples/02-event_parsing/example.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/examples/02-event_parsing/example.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -74,7 +74,6 @@
return 1;
}
- xml::init init;
myparser parser;
if (!parser.parse_file(argv[1])) {
Modified: trunk/examples/03-xml_generation/example.cxx
===================================================================
--- trunk/examples/03-xml_generation/example.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/examples/03-xml_generation/example.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -53,9 +53,6 @@
#include <exception>
int main (void) {
- // prepare the XML parser
- xml::init init;
-
// create a new XML document and set the root node
xml::document xmldoc("abook");
xml::node &root = xmldoc.get_root_node();
Modified: trunk/examples/04-xslt/example.cxx
===================================================================
--- trunk/examples/04-xslt/example.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/examples/04-xslt/example.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -44,9 +44,6 @@
int main (void) {
try {
- // prepare the XSLT engine and XML parser
- xslt::init init;
-
// parse the input XML document
xml::tree_parser parser("example.xml");
xml::document &doc = parser.get_document();
Modified: trunk/include/xmlwrapp/attributes.h
===================================================================
--- trunk/include/xmlwrapp/attributes.h 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/include/xmlwrapp/attributes.h 2008-12-13 13:39:53 UTC (rev 107)
@@ -37,6 +37,9 @@
#ifndef _xmlwrapp_attributes_h_
#define _xmlwrapp_attributes_h_
+// xmlwrapp includes
+#include "xmlwrapp/init.h"
+
// standard includes
#include <cstddef>
#include <iosfwd>
Modified: trunk/include/xmlwrapp/document.h
===================================================================
--- trunk/include/xmlwrapp/document.h 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/include/xmlwrapp/document.h 2008-12-13 13:39:53 UTC (rev 107)
@@ -38,7 +38,8 @@
#define _xmlwrapp_document_h_
// xmlwrapp includes
-#include <xmlwrapp/node.h>
+#include "xmlwrapp/init.h"
+#include "xmlwrapp/node.h"
// standard includes
#include <iosfwd>
Modified: trunk/include/xmlwrapp/event_parser.h
===================================================================
--- trunk/include/xmlwrapp/event_parser.h 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/include/xmlwrapp/event_parser.h 2008-12-13 13:39:53 UTC (rev 107)
@@ -37,6 +37,9 @@
#ifndef _xmlwrapp_event_parser_h_
#define _xmlwrapp_event_parser_h_
+// xmlwrapp includes
+#include "xmlwrapp/init.h"
+
// standard includes
#include <cstddef>
#include <string>
Modified: trunk/include/xmlwrapp/init.h
===================================================================
--- trunk/include/xmlwrapp/init.h 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/include/xmlwrapp/init.h 2008-12-13 13:39:53 UTC (rev 107)
@@ -40,107 +40,100 @@
namespace xml {
/**
- * The xml::init class is used to initialize the XML parser. For thread
- * safety it should be instantiated one time in the main thread before any
- * other threads use xmlwrapp. Non-threaded programs should instantiate a
- * xml::init class before using xmlwrapp as well, at least for
- * consistency.
+ * The xml::init class is used to configure the XML parser.
*
* If you want to use and of the xml::init member functions, do so before
* you start any threads or use any other part of xmlwrapp. The member
- * functions may alter global and/or static variables. In other words, this
- * class is not thread safe.
+ * functions may alter global and/or static variables and affect the behavior
+ * of subsequently created classes (and the parser in particular).
+ * In other words, this class is not thread safe.
+ *
+ * @note In xmlwrapp versions prior to 0.6.0, this class was used to initialize
+ * the library and exactly one instance had to be created before first
+ * use. This is no longer true: user code doesn't have to create any
+ * instances, but it @em can create as many instances as it wants.
**/
class init {
public:
- //####################################################################
- /**
- * Create a new xml::init object. This constructor will prepare the XML
- * parser and set some default values for the parsers global variables.
- *
- * @author Peter Jones
- **/
- //####################################################################
init (void);
-
- //####################################################################
- /**
- * Clean up the XML parser. Don't let the xml::init object go out of
- * scope before you are done using the xmlwrapp library!
- *
- * @note The destructor is intentionally not virtual, this class and
- * derived classes are meant to be used in RAII manner.
- *
- * @author Peter Jones
- **/
- //####################################################################
~init (void);
//####################################################################
/**
* This member function controls whether or not the XML parser should
* add text nodes for indenting when generating XML text output from a
- * node tree. The default, set in the xml::init constructor, is true.
+ * node tree. The default is true.
*
* @param flag True to turn on indenting, false to turn it off.
* @author Peter Jones
**/
//####################################################################
- void indent_output (bool flag);
+ static void indent_output (bool flag);
//####################################################################
/**
* This member function controls whether or not the XML parser should
- * remove ignorable whitespace around XML elements. The default, set in
- * the xml::init constructor, is false.
+ * remove ignorable whitespace around XML elements. The default
+ * is false.
*
* @param flag True to remove whitespace, false to leave alone.
* @author Peter Jones
**/
//####################################################################
- void remove_whitespace (bool flag);
+ static void remove_whitespace (bool flag);
//####################################################################
/**
* This member function controls whether or not the XML parser should
- * substitute entities while parsing. The default, set in the xml::init
- * constructor, is true.
+ * substitute entities while parsing. The default is true.
*
* @param flag True to turn on substitution, false to turn off.
* @author Peter Jones
**/
//####################################################################
- void substitute_entities (bool flag);
+ static void substitute_entities (bool flag);
//####################################################################
/**
* This member function controls whether or not the XML parser should
* load external (DTD) subsets while parsing. This will only affect the
* loading of the subsets, it does not cause files to be validated. The
- * default, set in the xml::init constructor, is true.
+ * default is true.
*
* @param flag True to turn on loading, false to turn it off.
* @author Peter Jones
**/
//####################################################################
- void load_external_subsets (bool flag);
+ static void load_external_subsets (bool flag);
//####################################################################
/**
* This member function controls whether or not the XML parser should
- * validate every XML document that is parses with its DTD. The default,
- * set in the xml::init constructor, is false.
+ * validate every XML document that is parses with its DTD. The default
+ * is false.
*
* @return flag True to turn on validation, false to turn it off.
* @author Peter Jones
**/
//####################################################################
- void validate_xml (bool flag);
+ static void validate_xml (bool flag);
private:
init (const init&);
init& operator= (const init&);
+
+ void init_library();
+ void shutdown_library();
+
+ static int ms_counter;
}; // end xml::init class
-
+
} // end xml namespace
+
+// use a "nifty counter" to ensure that any source file that uses xmlwrapp
+// will initialize the library prior to its first use
+namespace {
+ xml::init g_xmlwrapp_initializer;
+}
+
#endif
Modified: trunk/include/xmlwrapp/node.h
===================================================================
--- trunk/include/xmlwrapp/node.h 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/include/xmlwrapp/node.h 2008-12-13 13:39:53 UTC (rev 107)
@@ -37,8 +37,11 @@
#ifndef _xmlwrapp_node_h_
#define _xmlwrapp_node_h_
+// xmlwrapp includes
+#include "xmlwrapp/init.h"
+
// hidden stuff
-#include <xmlwrapp/_cbfo.h>
+#include "xmlwrapp/_cbfo.h"
// standard includes
#include <cstddef>
Modified: trunk/include/xmlwrapp/tree_parser.h
===================================================================
--- trunk/include/xmlwrapp/tree_parser.h 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/include/xmlwrapp/tree_parser.h 2008-12-13 13:39:53 UTC (rev 107)
@@ -37,6 +37,9 @@
#ifndef _xmlwrapp_tree_parser_h_
#define _xmlwrapp_tree_parser_h_
+// xmlwrapp includes
+#include "xmlwrapp/init.h"
+
// standard includes
#include <cstddef>
#include <string>
Modified: trunk/include/xmlwrapp/xmlwrapp.h
===================================================================
--- trunk/include/xmlwrapp/xmlwrapp.h 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/include/xmlwrapp/xmlwrapp.h 2008-12-13 13:39:53 UTC (rev 107)
@@ -33,11 +33,11 @@
#ifndef _xmlwrapp_xmlwrapp_h_
#define _xmlwrapp_xmlwrapp_h_
-#include <xmlwrapp/init.h>
-#include <xmlwrapp/node.h>
-#include <xmlwrapp/attributes.h>
-#include <xmlwrapp/document.h>
-#include <xmlwrapp/tree_parser.h>
-#include <xmlwrapp/event_parser.h>
+#include "xmlwrapp/init.h"
+#include "xmlwrapp/node.h"
+#include "xmlwrapp/attributes.h"
+#include "xmlwrapp/document.h"
+#include "xmlwrapp/tree_parser.h"
+#include "xmlwrapp/event_parser.h"
#endif
Modified: trunk/include/xsltwrapp/init.h
===================================================================
--- trunk/include/xsltwrapp/init.h 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/include/xsltwrapp/init.h 2008-12-13 13:39:53 UTC (rev 107)
@@ -38,68 +38,55 @@
#define _xsltwrapp_init_h_
// xmlwrapp includes
-#include <xmlwrapp/init.h>
+#include "xmlwrapp/init.h"
namespace xslt {
/**
- * The xslt::init class is used to initialize the XSLT engine. For thread
- * safety it should be instantiated one time in the main thread before any
- * other threads use xsltwrapp. Non-threaded programs should instantiate a
- * xslt::init class before using xsltwrapp as well, at least for
- * consistency.
+ * The xslt::init class is used to configure the XSLT engine.
*
* If you want to use any of the xslt::init member functions, do so before
* you start any threads or use any other part of xsltwrapp. The member
* functions may alter global and/or static variables. In other words, this
* class is not thread safe.
*
- * Since this class is derived from the xml::init it is not necessary to
- * use both classes. If you are going to be using xsltwrapp, you should only
- * use this class to initialize both xmlwrapp and xsltwrapp.
+ * @note In xmlwrapp versions prior to 0.6.0, this class was used to initialize
+ * the library and exactly one instance had to be created before first
+ * use. This is no longer true: user code doesn't have to create any
+ * instances, but it @em can create as many instances as it wants.
**/
class init : public xml::init {
public:
- //####################################################################
- /**
- * Create a new xslt::init object. This constructor will prepare the
- * XSLT engine parser and set some default values for the engine's
- * global variables.
- *
- * @author Peter Jones
- **/
- //####################################################################
init (void);
-
- //####################################################################
- /**
- * Clean up the XSLT engine. Don't let the xslt::init object go out of
- * scope before you are done using the xsltwrapp or xmlwrapp libraries!
- *
- * @note The destructor is intentionally not virtual, this class and
- * derived classes are meant to be used in RAII manner.
- *
- * @author Peter Jones
- **/
- //####################################################################
~init (void);
//####################################################################
/**
* This function controls whether or not the XSLT engine will process
- * XInclusions by default while parsing the stylesheet. The default, set
- * in the xslt::init constructor, is true.
+ * XInclusions by default while parsing the stylesheet. The default is
+ * true.
*
* @param flag True to enable XInclusing processing; False otherwise.
* @author Peter Jones
**/
//####################################################################
- void process_xincludes (bool flag);
+ static void process_xincludes (bool flag);
private:
init (const init&);
init& operator= (const init&);
+
+ void init_library();
+ void shutdown_library();
+
+ static int ms_counter;
}; // end xslt::init class
-
+
+// use a "nifty counter" to ensure that any source file that uses xsltwrapp
+// will initialize the library prior to its first use
+namespace {
+ xslt::init g_xsltwrapp_initializer;
+}
+
} // end xslt namespace
#endif
Modified: trunk/include/xsltwrapp/stylesheet.h
===================================================================
--- trunk/include/xsltwrapp/stylesheet.h 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/include/xsltwrapp/stylesheet.h 2008-12-13 13:39:53 UTC (rev 107)
@@ -38,7 +38,8 @@
#define _xsltwrapp_stylesheet_h_
// xmlwrapp includes
-#include <xmlwrapp/document.h>
+#include "xsltwrapp/init.h"
+#include "xmlwrapp/document.h"
// standard includes
#include <map>
Modified: trunk/include/xsltwrapp/xsltwrapp.h
===================================================================
--- trunk/include/xsltwrapp/xsltwrapp.h 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/include/xsltwrapp/xsltwrapp.h 2008-12-13 13:39:53 UTC (rev 107)
@@ -33,8 +33,8 @@
#ifndef _xsltwrapp_xsltwrapp_h_
#define _xsltwrapp_xsltwrapp_h_
-#include <xmlwrapp/xmlwrapp.h>
-#include <xsltwrapp/init.h>
-#include <xsltwrapp/stylesheet.h>
+#include "xmlwrapp/xmlwrapp.h"
+#include "xsltwrapp/init.h"
+#include "xsltwrapp/stylesheet.h"
#endif
Modified: trunk/src/libxml/init.cxx
===================================================================
--- trunk/src/libxml/init.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/src/libxml/init.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -47,7 +47,19 @@
extern "C" void xml_error (void *, const char*, ...);
}
//####################################################################
+int xml::init::ms_counter = 0;
+//####################################################################
xml::init::init (void) {
+ if ( ms_counter++ == 0 )
+ init_library();
+}
+//####################################################################
+xml::init::~init (void) {
+ if ( --ms_counter == 0 )
+ shutdown_library();
+}
+//####################################################################
+void xml::init::init_library() {
// set some libxml global variables
indent_output(true);
remove_whitespace(false);
@@ -62,7 +74,7 @@
xmlInitParser();
}
//####################################################################
-xml::init::~init (void) {
+void xml::init::shutdown_library() {
xmlCleanupParser();
}
//####################################################################
Modified: trunk/src/libxslt/init.cxx
===================================================================
--- trunk/src/libxslt/init.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/src/libxslt/init.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -49,7 +49,19 @@
extern "C" void xslt_error (void *, const char*, ...);
}
//####################################################################
+int xslt::init::ms_counter = 0;
+//####################################################################
xslt::init::init (void) {
+ if ( ms_counter++ == 0 )
+ init_library();
+}
+//####################################################################
+xslt::init::~init (void) {
+ if ( --ms_counter == 0 )
+ shutdown_library();
+}
+//####################################################################
+void xslt::init::init_library() {
xsltInit();
// set some defautls
@@ -63,7 +75,7 @@
exsltRegisterAll();
}
//####################################################################
-xslt::init::~init (void) {
+void xslt::init::shutdown_library() {
xsltCleanupGlobals();
}
//####################################################################
Modified: trunk/tests/attributes/test_attr-01.cxx
===================================================================
--- trunk/tests/attributes/test_attr-01.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/attributes/test_attr-01.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -42,7 +42,6 @@
if (argc != 2) return 1;
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
const xml::attributes &attrs = parser.get_document().get_root_node().get_attributes();
Modified: trunk/tests/attributes/test_attr-02.cxx
===================================================================
--- trunk/tests/attributes/test_attr-02.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/attributes/test_attr-02.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
if (argc != 2) return 1;
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::attributes &attrs = parser.get_document().get_root_node().get_attributes();
Modified: trunk/tests/attributes/test_attr-03.cxx
===================================================================
--- trunk/tests/attributes/test_attr-03.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/attributes/test_attr-03.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
if (argc != 3) return 1;
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
const xml::attributes &attrs = parser.get_document().get_root_node().get_attributes();
Modified: trunk/tests/attributes/test_attr-04.cxx
===================================================================
--- trunk/tests/attributes/test_attr-04.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/attributes/test_attr-04.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
if (argc != 3) return 1;
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::attributes &attrs = parser.get_document().get_root_node().get_attributes();
Modified: trunk/tests/attributes/test_attr-05.cxx
===================================================================
--- trunk/tests/attributes/test_attr-05.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/attributes/test_attr-05.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
if (argc != 3) return 1;
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::attributes &attrs = parser.get_document().get_root_node().get_attributes();
Modified: trunk/tests/attributes/test_attr-06.cxx
===================================================================
--- trunk/tests/attributes/test_attr-06.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/attributes/test_attr-06.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
if (argc != 2) return 1;
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::attributes &attrs = parser.get_document().get_root_node().get_attributes();
Modified: trunk/tests/attributes/test_attr-07.cxx
===================================================================
--- trunk/tests/attributes/test_attr-07.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/attributes/test_attr-07.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
if (argc != 2) return 1;
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::attributes &attrs = parser.get_document().get_root_node().get_attributes();
Modified: trunk/tests/attributes/test_attr-08.cxx
===================================================================
--- trunk/tests/attributes/test_attr-08.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/attributes/test_attr-08.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
if (argc != 2) return 1;
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
/* MAKE A COPY! */
Modified: trunk/tests/attributes/test_attr-09.cxx
===================================================================
--- trunk/tests/attributes/test_attr-09.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/attributes/test_attr-09.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
if (argc != 3) return 1;
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
if (parser.get_document().has_internal_subset() && !parser.get_document().validate()) {
Modified: trunk/tests/attributes/test_attr-10.cxx
===================================================================
--- trunk/tests/attributes/test_attr-10.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/attributes/test_attr-10.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -42,7 +42,6 @@
if (argc != 3) return 1;
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
if (parser.get_document().has_internal_subset() && !parser.get_document().validate()) {
Modified: trunk/tests/document/test_document-01.cxx
===================================================================
--- trunk/tests/document/test_document-01.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-01.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -47,7 +47,7 @@
}
try {
- xml::init xml; xml.substitute_entities(false);
+ xml::init::substitute_entities(false);
xml::tree_parser parser(argv[1]);
xml::node::iterator i=parser.get_document().begin(), end=parser.get_document().end();
Modified: trunk/tests/document/test_document-02.cxx
===================================================================
--- trunk/tests/document/test_document-02.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-02.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
int main (void) {
try {
- xml::init xml;
xml::document doc;
std::cout << doc;
Modified: trunk/tests/document/test_document-03.cxx
===================================================================
--- trunk/tests/document/test_document-03.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-03.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -42,7 +42,6 @@
int main (void) {
try {
- xml::init xml;
xml::document doc("root");
std::cout << doc;
Modified: trunk/tests/document/test_document-04.cxx
===================================================================
--- trunk/tests/document/test_document-04.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-04.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
int main (void) {
try {
- xml::init xml;
xml::node n("root", "pcdata");
xml::document doc(n);
std::cout << doc;
Modified: trunk/tests/document/test_document-05.cxx
===================================================================
--- trunk/tests/document/test_document-05.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-05.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
int main (void) {
try {
- xml::init xml;
xml::node n("root", "pcdata");
xml::document doc(n);
Modified: trunk/tests/document/test_document-06.cxx
===================================================================
--- trunk/tests/document/test_document-06.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-06.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
int main (void) {
try {
- xml::init xml;
xml::node n("root", "pcdata");
xml::document doc(n);
xml::document doc_copy;
Modified: trunk/tests/document/test_document-07.cxx
===================================================================
--- trunk/tests/document/test_document-07.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-07.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,7 +41,6 @@
int main (void) {
try {
- xml::init xml;
xml::node n("root", "pcdata");
xml::document doc(n);
std::cout << doc.get_root_node();
Modified: trunk/tests/document/test_document-08.cxx
===================================================================
--- trunk/tests/document/test_document-08.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-08.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -41,8 +41,6 @@
int main (void) {
try {
- xml::init xml;
-
xml::node n("root", "pcdata");
xml::document doc;
Modified: trunk/tests/document/test_document-09.cxx
===================================================================
--- trunk/tests/document/test_document-09.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-09.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -43,7 +43,6 @@
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
std::cout << parser.get_document().get_version() << "\n";
Modified: trunk/tests/document/test_document-10.cxx
===================================================================
--- trunk/tests/document/test_document-10.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-10.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -43,7 +43,6 @@
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
parser.get_document().set_version("1.1");
std::cout << parser.get_document();
Modified: trunk/tests/document/test_document-11.cxx
===================================================================
--- trunk/tests/document/test_document-11.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-11.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -43,7 +43,6 @@
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
std::cout << parser.get_document().get_encoding() << "\n";
Modified: trunk/tests/document/test_document-12.cxx
===================================================================
--- trunk/tests/document/test_document-12.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-12.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -43,7 +43,6 @@
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
parser.get_document().set_encoding("UTF-8");
std::cout << parser.get_document();
Modified: trunk/tests/document/test_document-13.cxx
===================================================================
--- trunk/tests/document/test_document-13.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-13.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -44,7 +44,6 @@
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
bool sa = parser.get_document().get_is_standalone();
Modified: trunk/tests/document/test_document-14.cxx
===================================================================
--- trunk/tests/document/test_document-14.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-14.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -43,7 +43,6 @@
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
std::cout << parser.get_document().process_xinclude() << "\n";
std::cout << parser.get_document();
Modified: trunk/tests/document/test_document-15.cxx
===================================================================
--- trunk/tests/document/test_document-15.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-15.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -44,8 +44,6 @@
try {
- xml::init xml;
-
xml::document doc("root");
doc.get_root_node().push_back(xml::node("child"));
doc.save_to_file(argv[1], std::atoi(argv[2]));
Modified: trunk/tests/document/test_document-16.cxx
===================================================================
--- trunk/tests/document/test_document-16.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-16.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -42,8 +42,6 @@
int main (void) {
try {
- xml::init xml;
-
xml::document doc_01("root");
std::cout << doc_01.size() << "\n";
doc_01.push_back(xml::node(xml::node::comment("This is a comment")));
Modified: trunk/tests/document/test_document-17.cxx
===================================================================
--- trunk/tests/document/test_document-17.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-17.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -42,7 +42,6 @@
int main (void) {
try {
- xml::init xml;
xml::document doc("root");
doc.push_back(xml::node(xml::node::comment(" Comment From push_back ")));
Modified: trunk/tests/document/test_document-18.cxx
===================================================================
--- trunk/tests/document/test_document-18.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-18.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,7 +45,6 @@
try {
- xml::init xml;
xml::document doc("root");
switch (*argv[1]) {
Modified: trunk/tests/document/test_document-19.cxx
===================================================================
--- trunk/tests/document/test_document-19.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-19.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -43,7 +43,6 @@
try {
- xml::init xml;
xml::document doc("root");
xml::node::iterator n(doc.insert(xml::node(xml::node::comment(" To Be Replaced "))));
Modified: trunk/tests/document/test_document-20.cxx
===================================================================
--- trunk/tests/document/test_document-20.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-20.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,7 +45,6 @@
try {
- xml::init xml;
xml::document doc("root");
xml::node::iterator n(doc.insert(xml::node(xml::node::comment(" To Be Replaced "))));
Modified: trunk/tests/document/test_document-21.cxx
===================================================================
--- trunk/tests/document/test_document-21.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-21.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -42,7 +42,6 @@
int main (void) {
try {
- xml::init xml;
xml::document doc("root");
doc.push_back(xml::node(xml::node::comment(" Comment from push_back ")));
Modified: trunk/tests/document/test_document-22.cxx
===================================================================
--- trunk/tests/document/test_document-22.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/document/test_document-22.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -43,7 +43,6 @@
int main (void) {
try {
- xml::init xml;
xml::document doc("root");
doc.push_back(xml::node(xml::node::comment(" Comment from push_back ")));
Modified: trunk/tests/event/test_event-01.cxx
===================================================================
--- trunk/tests/event/test_event-01.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/event/test_event-01.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -80,7 +80,6 @@
return 1;
}
- xml::init init;
test_parser parser;
if (!parser.parse_file(argv[1])) {
Modified: trunk/tests/event/test_event-02.cxx
===================================================================
--- trunk/tests/event/test_event-02.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/event/test_event-02.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -118,7 +118,6 @@
return 1;
}
- xml::init init;
test_parser parser(argv[2],argc == 4);
bool status = parser.parse_file(argv[1]);
std::cout << "\n";
Modified: trunk/tests/event/test_event-03.cxx
===================================================================
--- trunk/tests/event/test_event-03.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/event/test_event-03.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -64,7 +64,6 @@
return 1;
}
- xml::init init;
test_parser parser;
if (!parser.parse_file(argv[1])) return 1;
return 0;
Modified: trunk/tests/node/test_node-01.cxx
===================================================================
--- trunk/tests/node/test_node-01.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-01.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -39,8 +39,6 @@
#include <iostream>
int main (void) {
- xml::init xml;
-
xml::node root_node("root");
xml::node one("count", "one");
xml::node two("count", "two");
Modified: trunk/tests/node/test_node-02a.cxx
===================================================================
--- trunk/tests/node/test_node-02a.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-02a.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,7 +45,6 @@
}
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-02b.cxx
===================================================================
--- trunk/tests/node/test_node-02b.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-02b.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,7 +45,6 @@
}
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
const xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-02c.cxx
===================================================================
--- trunk/tests/node/test_node-02c.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-02c.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,7 +45,6 @@
}
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-02d.cxx
===================================================================
--- trunk/tests/node/test_node-02d.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-02d.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,7 +45,6 @@
}
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
const xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-03a.cxx
===================================================================
--- trunk/tests/node/test_node-03a.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-03a.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -46,7 +46,6 @@
}
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-03b.cxx
===================================================================
--- trunk/tests/node/test_node-03b.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-03b.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -46,7 +46,6 @@
}
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-04a.cxx
===================================================================
--- trunk/tests/node/test_node-04a.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-04a.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -46,7 +46,6 @@
}
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-04b.cxx
===================================================================
--- trunk/tests/node/test_node-04b.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-04b.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -46,7 +46,6 @@
}
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-05a.cxx
===================================================================
--- trunk/tests/node/test_node-05a.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-05a.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -46,7 +46,6 @@
}
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-05b.cxx
===================================================================
--- trunk/tests/node/test_node-05b.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-05b.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -46,7 +46,6 @@
}
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-05c.cxx
===================================================================
--- trunk/tests/node/test_node-05c.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-05c.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,7 +45,6 @@
}
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-05d.cxx
===================================================================
--- trunk/tests/node/test_node-05d.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-05d.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,7 +45,6 @@
}
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-06.cxx
===================================================================
--- trunk/tests/node/test_node-06.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-06.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -47,7 +47,7 @@
}
try {
- xml::init xml; xml.substitute_entities(false);
+ xml::init::substitute_entities(false);
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-07.cxx
===================================================================
--- trunk/tests/node/test_node-07.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-07.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,7 +45,7 @@
}
try {
- xml::init xml; xml.remove_whitespace(true);
+ xml::init::remove_whitespace(true);
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-08.cxx
===================================================================
--- trunk/tests/node/test_node-08.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-08.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -57,7 +57,7 @@
}
try {
- xml::init xml; xml.remove_whitespace(true);
+ xml::init::remove_whitespace(true);
xml::tree_parser parser(argv[1]);
xml::node &root = parser.get_document().get_root_node();
Modified: trunk/tests/node/test_node-09.cxx
===================================================================
--- trunk/tests/node/test_node-09.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-09.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,7 +45,6 @@
}
try {
- xml::init xml;
xml::node n(xml::node::cdata("This is a CDATA section"));
std::cout << n;
} catch (const std::exception &e) {
Modified: trunk/tests/node/test_node-10.cxx
===================================================================
--- trunk/tests/node/test_node-10.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-10.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,7 +45,6 @@
}
try {
- xml::init xml;
xml::node n(xml::node::comment("This is an XML comment"));
std::cout << n;
} catch (const std::exception &e) {
Modified: trunk/tests/node/test_node-11.cxx
===================================================================
--- trunk/tests/node/test_node-11.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-11.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,7 +45,6 @@
}
try {
- xml::init xml;
xml::node n(xml::node::pi("xslt", "stylesheet=\"test.xsl\""));
std::cout << n;
} catch (const std::exception &e) {
Modified: trunk/tests/node/test_node-12.cxx
===================================================================
--- trunk/tests/node/test_node-12.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-12.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,8 +45,6 @@
}
try {
- xml::init xml;
-
xml::node n("root");
std::cout << n.size() << "\n";
Modified: trunk/tests/node/test_node-13.cxx
===================================================================
--- trunk/tests/node/test_node-13.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/node/test_node-13.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -45,8 +45,6 @@
}
try {
- xml::init xml;
-
xml::node n("root");
std::cout << n.empty() << "\n";
Modified: trunk/tests/tree/test_tree-01.cxx
===================================================================
--- trunk/tests/tree/test_tree-01.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/tree/test_tree-01.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -49,7 +49,6 @@
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
dump_node(parser.get_document().get_root_node());
Modified: trunk/tests/tree/test_tree-02.cxx
===================================================================
--- trunk/tests/tree/test_tree-02.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/tree/test_tree-02.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -47,7 +47,6 @@
try {
- xml::init xml;
xml::tree_parser parser(argv[1]);
} catch (std::exception &e) {
Modified: trunk/tests/tree/test_tree-03.cxx
===================================================================
--- trunk/tests/tree/test_tree-03.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/tree/test_tree-03.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -47,7 +47,6 @@
try {
- xml::init xml;
xml::tree_parser parser(argv[1], false);
if (!parser) {
Modified: trunk/tests/tree/test_tree-04.cxx
===================================================================
--- trunk/tests/tree/test_tree-04.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/tree/test_tree-04.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -51,7 +51,6 @@
try {
- xml::init xml;
std::string xmldata = argv[1];
xml::tree_parser parser(xmldata.c_str(), xmldata.size());
dump_node(parser.get_document().get_root_node());
Modified: trunk/tests/tree/test_tree-05.cxx
===================================================================
--- trunk/tests/tree/test_tree-05.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/tree/test_tree-05.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -48,7 +48,6 @@
try {
- xml::init xml;
std::string xmldata = argv[1];
xml::tree_parser parser(xmldata.c_str(), xmldata.size());
Modified: trunk/tests/tree/test_tree-06.cxx
===================================================================
--- trunk/tests/tree/test_tree-06.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/tree/test_tree-06.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -48,7 +48,6 @@
try {
- xml::init xml;
std::string xmldata = argv[1];
xml::tree_parser parser(xmldata.c_str(), xmldata.size(), false);
Modified: trunk/tests/xslt/test_xslt-01.cxx
===================================================================
--- trunk/tests/xslt/test_xslt-01.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/xslt/test_xslt-01.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -46,7 +46,6 @@
try {
- xslt::init init;
xslt::stylesheet style(argv[1]);
} catch (std::exception &e) {
Modified: trunk/tests/xslt/test_xslt-02.cxx
===================================================================
--- trunk/tests/xslt/test_xslt-02.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/xslt/test_xslt-02.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -47,7 +47,6 @@
try {
- xslt::init init;
xslt::stylesheet style(argv[1]);
xml::tree_parser parser(argv[2]);
xml::document result;
Modified: trunk/tests/xslt/test_xslt-03.cxx
===================================================================
--- trunk/tests/xslt/test_xslt-03.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/xslt/test_xslt-03.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -47,7 +47,6 @@
try {
- xslt::init init;
xslt::stylesheet style(argv[1]);
xml::tree_parser parser(argv[2]);
xml::document result;
Modified: trunk/tests/xslt/test_xslt-04.cxx
===================================================================
--- trunk/tests/xslt/test_xslt-04.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/xslt/test_xslt-04.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -47,7 +47,6 @@
try {
- xslt::init init;
xslt::stylesheet style(argv[1]);
xml::tree_parser parser(argv[2]);
Modified: trunk/tests/xslt/test_xslt-05.cxx
===================================================================
--- trunk/tests/xslt/test_xslt-05.cxx 2008-12-12 23:58:44 UTC (rev 106)
+++ trunk/tests/xslt/test_xslt-05.cxx 2008-12-13 13:39:53 UTC (rev 107)
@@ -47,7 +47,6 @@
try {
- xslt::init init;
xslt::stylesheet style(argv[1]);
xml::tree_parser parser(argv[2]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-12 23:58:47
|
Revision: 106
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=106&view=rev
Author: vaclavslavik
Date: 2008-12-12 23:58:44 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
make init classes' dtors non-virtual, there's no reason for them to be virtual
Modified Paths:
--------------
trunk/include/xmlwrapp/init.h
trunk/include/xsltwrapp/init.h
Modified: trunk/include/xmlwrapp/init.h
===================================================================
--- trunk/include/xmlwrapp/init.h 2008-12-01 19:40:58 UTC (rev 105)
+++ trunk/include/xmlwrapp/init.h 2008-12-12 23:58:44 UTC (rev 106)
@@ -68,10 +68,13 @@
* Clean up the XML parser. Don't let the xml::init object go out of
* scope before you are done using the xmlwrapp library!
*
+ * @note The destructor is intentionally not virtual, this class and
+ * derived classes are meant to be used in RAII manner.
+ *
* @author Peter Jones
**/
//####################################################################
- virtual ~init (void);
+ ~init (void);
//####################################################################
/**
Modified: trunk/include/xsltwrapp/init.h
===================================================================
--- trunk/include/xsltwrapp/init.h 2008-12-01 19:40:58 UTC (rev 105)
+++ trunk/include/xsltwrapp/init.h 2008-12-12 23:58:44 UTC (rev 106)
@@ -76,10 +76,13 @@
* Clean up the XSLT engine. Don't let the xslt::init object go out of
* scope before you are done using the xsltwrapp or xmlwrapp libraries!
*
+ * @note The destructor is intentionally not virtual, this class and
+ * derived classes are meant to be used in RAII manner.
+ *
* @author Peter Jones
**/
//####################################################################
- virtual ~init (void);
+ ~init (void);
//####################################################################
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-12-01 19:41:08
|
Revision: 105
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=105&view=rev
Author: vaclavslavik
Date: 2008-12-01 19:40:58 +0000 (Mon, 01 Dec 2008)
Log Message:
-----------
Input document to xslt::stylesheet::apply() is now passed as const reference instead of non-const one.
Modified Paths:
--------------
trunk/ChangeLog
trunk/docs/manual/xslt.texi
trunk/docs/manual_xml/xslt.xml
trunk/include/xmlwrapp/document.h
trunk/include/xsltwrapp/stylesheet.h
trunk/src/Makefile.am
trunk/src/libxml/document.cxx
trunk/src/libxslt/stylesheet.cxx
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-30 22:22:06 UTC (rev 104)
+++ trunk/ChangeLog 2008-12-01 19:40:58 UTC (rev 105)
@@ -9,6 +9,9 @@
xsltwrapp.pc. Applications that use libxsltwrapp need to be
updated to use the latter (too).
+ Input document to xslt::stylesheet::apply() is now passed as
+ const reference instead of non-const one.
+
Version 0.5.1
Various compilation fixes.
Modified: trunk/docs/manual/xslt.texi
===================================================================
--- trunk/docs/manual/xslt.texi 2008-11-30 22:22:06 UTC (rev 104)
+++ trunk/docs/manual/xslt.texi 2008-12-01 19:40:58 UTC (rev 105)
@@ -60,8 +60,8 @@
@example
-bool xslt::stylesheet::apply (xml::document &doc, xml::document &result);
-bool xslt::stylesheet::apply (xml::document &doc, xml::document &result, const param_type &with_params);
+bool xslt::stylesheet::apply (const xml::document &doc, xml::document &result);
+bool xslt::stylesheet::apply (const xml::document &doc, xml::document &result, const param_type &with_params);
@end example
@@ -81,8 +81,8 @@
@example
-xml::document& xslt::stylesheet::apply (xml::document &doc);
-xml::document& xslt::stylesheet::apply (xml::document &doc, const param_type &with_params);
+xml::document& xslt::stylesheet::apply (const xml::document &doc);
+xml::document& xslt::stylesheet::apply (const xml::document &doc, const param_type &with_params);
@end example
Modified: trunk/docs/manual_xml/xslt.xml
===================================================================
--- trunk/docs/manual_xml/xslt.xml 2008-11-30 22:22:06 UTC (rev 104)
+++ trunk/docs/manual_xml/xslt.xml 2008-12-01 19:40:58 UTC (rev 105)
@@ -66,8 +66,8 @@
<screen>
<![CDATA[
-bool xslt::stylesheet::apply (xml::document &doc, xml::document &result);
-bool xslt::stylesheet::apply (xml::document &doc, xml::document &result, const param_type &with_params);
+bool xslt::stylesheet::apply (const xml::document &doc, xml::document &result);
+bool xslt::stylesheet::apply (const xml::document &doc, xml::document &result, const param_type &with_params);
]]>
</screen>
</section>
@@ -87,8 +87,8 @@
</para>
<screen>
<![CDATA[
-xml::document& xslt::stylesheet::apply (xml::document &doc);
-xml::document& xslt::stylesheet::apply (xml::document &doc, const param_type &with_params);
+xml::document& xslt::stylesheet::apply (const xml::document &doc);
+xml::document& xslt::stylesheet::apply (const xml::document &doc, const param_type &with_params);
]]>
</screen>
</section>
Modified: trunk/include/xmlwrapp/document.h
===================================================================
--- trunk/include/xmlwrapp/document.h 2008-11-30 22:22:06 UTC (rev 104)
+++ trunk/include/xmlwrapp/document.h 2008-12-01 19:40:58 UTC (rev 105)
@@ -537,6 +537,7 @@
void set_doc_data (void *data);
void set_doc_data_from_xslt (void *data, xslt::result *xr);
void* get_doc_data (void);
+ void* get_doc_data_read_only (void) const;
void* release_doc_data (void);
friend class tree_parser;
Modified: trunk/include/xsltwrapp/stylesheet.h
===================================================================
--- trunk/include/xsltwrapp/stylesheet.h 2008-11-30 22:22:06 UTC (rev 104)
+++ trunk/include/xsltwrapp/stylesheet.h 2008-12-01 19:40:58 UTC (rev 105)
@@ -101,7 +101,7 @@
* @author Peter Jones
**/
//####################################################################
- bool apply (xml::document &doc, xml::document &result);
+ bool apply (const xml::document &doc, xml::document &result);
//####################################################################
/**
@@ -116,7 +116,7 @@
* @author Peter Jones
**/
//####################################################################
- bool apply (xml::document &doc, xml::document &result, const param_type &with_params);
+ bool apply (const xml::document &doc, xml::document &result, const param_type &with_params);
//####################################################################
/**
@@ -133,7 +133,7 @@
* @author Peter Jones
**/
//####################################################################
- xml::document& apply (xml::document &doc);
+ xml::document& apply (const xml::document &doc);
//####################################################################
/**
@@ -151,7 +151,7 @@
* @author Peter Jones
**/
//####################################################################
- xml::document& apply (xml::document &doc, const param_type &with_params);
+ xml::document& apply (const xml::document &doc, const param_type &with_params);
//####################################################################
/**
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-11-30 22:22:06 UTC (rev 104)
+++ trunk/src/Makefile.am 2008-12-01 19:40:58 UTC (rev 105)
@@ -34,7 +34,7 @@
libxsltwrapp_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBEXSLT_CFLAGS) $(LIBXSLT_CFLAGS)
libxsltwrapp_la_LIBADD = libxmlwrapp.la $(LIBEXSLT_LIBS) $(LIBXSLT_LIBS)
-libxsltwrapp_la_LDFLAGS = -version-info 2:1:0
+libxsltwrapp_la_LDFLAGS = -version-info 3:0:0
libxsltwrapp_la_SOURCES = \
libxslt/init.cxx \
Modified: trunk/src/libxml/document.cxx
===================================================================
--- trunk/src/libxml/document.cxx 2008-11-30 22:22:06 UTC (rev 104)
+++ trunk/src/libxml/document.cxx 2008-12-01 19:40:58 UTC (rev 105)
@@ -340,6 +340,10 @@
return pimpl_->doc_;
}
//####################################################################
+void* xml::document::get_doc_data_read_only (void) const {
+ return pimpl_->doc_;
+}
+//####################################################################
void* xml::document::release_doc_data (void) {
xmlDocPtr xmldoc = pimpl_->doc_;
pimpl_->doc_ = 0;
Modified: trunk/src/libxslt/stylesheet.cxx
===================================================================
--- trunk/src/libxslt/stylesheet.cxx 2008-11-30 22:22:06 UTC (rev 104)
+++ trunk/src/libxslt/stylesheet.cxx 2008-12-01 19:40:58 UTC (rev 105)
@@ -148,8 +148,8 @@
delete pimpl_;
}
//####################################################################
-bool xslt::stylesheet::apply (xml::document &doc, xml::document &result) {
- xmlDocPtr input = static_cast<xmlDocPtr>(doc.get_doc_data());
+bool xslt::stylesheet::apply (const xml::document &doc, xml::document &result) {
+ xmlDocPtr input = static_cast<xmlDocPtr>(doc.get_doc_data_read_only());
xmlDocPtr xmldoc = apply_stylesheet(pimpl_->ss_, input);
if (xmldoc) {
@@ -160,8 +160,8 @@
return false;
}
//####################################################################
-bool xslt::stylesheet::apply (xml::document &doc, xml::document &result, const param_type &with_params) {
- xmlDocPtr input = static_cast<xmlDocPtr>(doc.get_doc_data());
+bool xslt::stylesheet::apply (const xml::document &doc, xml::document &result, const param_type &with_params) {
+ xmlDocPtr input = static_cast<xmlDocPtr>(doc.get_doc_data_read_only());
xmlDocPtr xmldoc = apply_stylesheet(pimpl_->ss_, input, &with_params);
if (xmldoc) {
@@ -172,8 +172,8 @@
return false;
}
//####################################################################
-xml::document& xslt::stylesheet::apply (xml::document &doc) {
- xmlDocPtr input = static_cast<xmlDocPtr>(doc.get_doc_data());
+xml::document& xslt::stylesheet::apply (const xml::document &doc) {
+ xmlDocPtr input = static_cast<xmlDocPtr>(doc.get_doc_data_read_only());
xmlDocPtr xmldoc = apply_stylesheet(pimpl_->ss_, input);
if (xmldoc == 0) {
@@ -185,8 +185,8 @@
return pimpl_->doc_;
}
//####################################################################
-xml::document& xslt::stylesheet::apply (xml::document &doc, const param_type &with_params) {
- xmlDocPtr input = static_cast<xmlDocPtr>(doc.get_doc_data());
+xml::document& xslt::stylesheet::apply (const xml::document &doc, const param_type &with_params) {
+ xmlDocPtr input = static_cast<xmlDocPtr>(doc.get_doc_data_read_only());
xmlDocPtr xmldoc = apply_stylesheet(pimpl_->ss_, input, &with_params);
if (xmldoc == 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-11-30 22:22:08
|
Revision: 104
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=104&view=rev
Author: vaclavslavik
Date: 2008-11-30 22:22:06 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
fixed typo: s/flase/false/
Modified Paths:
--------------
trunk/include/xmlwrapp/init.h
Modified: trunk/include/xmlwrapp/init.h
===================================================================
--- trunk/include/xmlwrapp/init.h 2008-11-26 18:23:44 UTC (rev 103)
+++ trunk/include/xmlwrapp/init.h 2008-11-30 22:22:06 UTC (rev 104)
@@ -116,7 +116,7 @@
* loading of the subsets, it does not cause files to be validated. The
* default, set in the xml::init constructor, is true.
*
- * @param flag True to turn on loading, flase to turn it off.
+ * @param flag True to turn on loading, false to turn it off.
* @author Peter Jones
**/
//####################################################################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-11-26 18:23:48
|
Revision: 103
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=103&view=rev
Author: vaclavslavik
Date: 2008-11-26 18:23:44 +0000 (Wed, 26 Nov 2008)
Log Message:
-----------
fixed some typos in comments
Modified Paths:
--------------
trunk/include/xmlwrapp/init.h
trunk/include/xsltwrapp/init.h
Modified: trunk/include/xmlwrapp/init.h
===================================================================
--- trunk/include/xmlwrapp/init.h 2008-11-26 14:26:37 UTC (rev 102)
+++ trunk/include/xmlwrapp/init.h 2008-11-26 18:23:44 UTC (rev 103)
@@ -40,11 +40,11 @@
namespace xml {
/**
- * The xml::init class is used to initilize the XML parser. For thread
+ * The xml::init class is used to initialize the XML parser. For thread
* safety it should be instantiated one time in the main thread before any
- * other threads use xmlwrapp. Non-threaded programs should instantiante a
+ * other threads use xmlwrapp. Non-threaded programs should instantiate a
* xml::init class before using xmlwrapp as well, at least for
- * consistanticy.
+ * consistency.
*
* If you want to use and of the xml::init member functions, do so before
* you start any threads or use any other part of xmlwrapp. The member
Modified: trunk/include/xsltwrapp/init.h
===================================================================
--- trunk/include/xsltwrapp/init.h 2008-11-26 14:26:37 UTC (rev 102)
+++ trunk/include/xsltwrapp/init.h 2008-11-26 18:23:44 UTC (rev 103)
@@ -43,20 +43,20 @@
namespace xslt {
/**
- * The xslt::init class is used to initilize the XSLT engine. For thread
+ * The xslt::init class is used to initialize the XSLT engine. For thread
* safety it should be instantiated one time in the main thread before any
- * other threads use xsltwrapp. Non-threaded programs should instantiante a
+ * other threads use xsltwrapp. Non-threaded programs should instantiate a
* xslt::init class before using xsltwrapp as well, at least for
- * consistanticy.
+ * consistency.
*
* If you want to use any of the xslt::init member functions, do so before
* you start any threads or use any other part of xsltwrapp. The member
* functions may alter global and/or static variables. In other words, this
* class is not thread safe.
*
- * Since this class is derived from the xml::init it is not neccessary to
+ * Since this class is derived from the xml::init it is not necessary to
* use both classes. If you are going to be using xsltwrapp, you should only
- * use this class to initilize both xmlwrapp and xsltwrapp.
+ * use this class to initialize both xmlwrapp and xsltwrapp.
**/
class init : public xml::init {
public:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-11-26 14:26:40
|
Revision: 102
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=102&view=rev
Author: vaclavslavik
Date: 2008-11-26 14:26:37 +0000 (Wed, 26 Nov 2008)
Log Message:
-----------
xsltInit() is available since libxslt-1.1.6, use it
Modified Paths:
--------------
trunk/configure.ac
trunk/src/libxslt/init.cxx
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-11-26 12:09:18 UTC (rev 101)
+++ trunk/configure.ac 2008-11-26 14:26:37 UTC (rev 102)
@@ -79,7 +79,7 @@
PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.4.28])
if test "x$build_xslt" = "xyes" ; then
- PKG_CHECK_MODULES(LIBXSLT, [libxslt >= 1.0.23])
+ PKG_CHECK_MODULES(LIBXSLT, [libxslt >= 1.1.6])
PKG_CHECK_MODULES(LIBEXSLT, [libexslt])
fi
Modified: trunk/src/libxslt/init.cxx
===================================================================
--- trunk/src/libxslt/init.cxx 2008-11-26 12:09:18 UTC (rev 101)
+++ trunk/src/libxslt/init.cxx 2008-11-26 14:26:37 UTC (rev 102)
@@ -50,12 +50,7 @@
}
//####################################################################
xslt::init::init (void) {
- /*
- * this really sucks, but it is the only way to call xsltInit() right
- * now. This is necessary to make libxslt thread safe.
- */
- xsltStylesheetPtr ss = xsltNewStylesheet();
- xsltFreeStylesheet(ss);
+ xsltInit();
// set some defautls
process_xincludes(true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-11-26 12:09:28
|
Revision: 101
http://xmlwrapp.svn.sourceforge.net/xmlwrapp/?rev=101&view=rev
Author: vaclavslavik
Date: 2008-11-26 12:09:18 +0000 (Wed, 26 Nov 2008)
Log Message:
-----------
split pkg-config file xmlwrapp.pc into xmlwrapp.pc and xsltwrapp.pc, to avoid unnecessary linking against libxslt in apps that only use libxml2 part
Modified Paths:
--------------
trunk/ChangeLog
trunk/Makefile.am
trunk/configure.ac
trunk/xmlwrapp-config.in
trunk/xmlwrapp.pc.in
Added Paths:
-----------
trunk/xsltwrapp.pc.in
Property Changed:
----------------
trunk/xmlwrapp-config.in
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-11-25 16:03:00 UTC (rev 100)
+++ trunk/ChangeLog 2008-11-26 12:09:18 UTC (rev 101)
@@ -5,6 +5,10 @@
Ported Unix build system to Autotools.
+ Split pkg-config file xmlwrapp.pc into xmlwrapp.pc and
+ xsltwrapp.pc. Applications that use libxsltwrapp need to be
+ updated to use the latter (too).
+
Version 0.5.1
Various compilation fixes.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2008-11-25 16:03:00 UTC (rev 100)
+++ trunk/Makefile.am 2008-11-26 12:09:18 UTC (rev 101)
@@ -2,6 +2,11 @@
SUBDIRS = include src examples tests
pkgconfigdir=$(libdir)/pkgconfig
+
+if WITH_XSLT
+pkgconfig_DATA = xmlwrapp.pc xsltwrapp.pc
+else
pkgconfig_DATA = xmlwrapp.pc
+endif
bin_SCRIPTS = xmlwrapp-config
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-11-25 16:03:00 UTC (rev 100)
+++ trunk/configure.ac 2008-11-26 12:09:18 UTC (rev 101)
@@ -94,17 +94,20 @@
dnl === Generate output files ===
-XMLWRAPP_LINK_FLAGS="-lxmlwrapp $LIBXML_LIBS"
+dnl This is support for the legacy xmlwrapp-config script, which has to behave
+dnl as it did in 0.5.x, i.e. output flags for both libxmlwrapp and
+dnl libxsltwrapp and also include dependency libs' flags for static linking
+LEGACY_LINK_FLAGS="-lxmlwrapp $LIBXML_LIBS"
if test "x$build_xslt" = "xyes" ; then
- XMLWRAPP_LINK_FLAGS="-lxsltwrapp $LIBEXSLT_LIBS $LIBXSLT_LIBS $XMLWRAPP_LINK_FLAGS"
+ LEGACY_LINK_FLAGS="-lxsltwrapp $LIBEXSLT_LIBS $LIBXSLT_LIBS $LEGACY_LINK_FLAGS"
fi
+AC_SUBST(LEGACY_LINK_FLAGS)
AM_CONDITIONAL(WITH_XSLT, [ test "x$build_xslt" = "xyes" ])
-AC_SUBST(XMLWRAPP_LINK_FLAGS)
-
AC_CONFIG_FILES([
xmlwrapp.pc
+ xsltwrapp.pc
xmlwrapp-config
Makefile
include/Makefile
Modified: trunk/xmlwrapp-config.in
===================================================================
--- trunk/xmlwrapp-config.in 2008-11-25 16:03:00 UTC (rev 100)
+++ trunk/xmlwrapp-config.in 2008-11-26 12:09:18 UTC (rev 101)
@@ -29,7 +29,7 @@
;;
--libs)
- echo "-L@libdir@ @XMLWRAPP_LINK_FLAGS@"
+ echo "-L@libdir@ @LEGACY_LINK_FLAGS@"
;;
--cflags|--cxxflags)
Property changes on: trunk/xmlwrapp-config.in
___________________________________________________________________
Deleted: svn:executable
- *
Modified: trunk/xmlwrapp.pc.in
===================================================================
--- trunk/xmlwrapp.pc.in 2008-11-25 16:03:00 UTC (rev 100)
+++ trunk/xmlwrapp.pc.in 2008-11-26 12:09:18 UTC (rev 101)
@@ -5,7 +5,8 @@
Name: xmlwrapp
Version: @VERSION@
-Description: A C++ wrapper around libxml2 and libxslt
+Description: A C++ wrapper around libxml2
Requires:
-Libs: -L${libdir} @XMLWRAPP_LINK_FLAGS@
+Libs: -L${libdir} -lxmlwrapp
+Libs.private: @LIBXML_LIBS@
Cflags: -I${includedir}
Added: trunk/xsltwrapp.pc.in
===================================================================
--- trunk/xsltwrapp.pc.in (rev 0)
+++ trunk/xsltwrapp.pc.in 2008-11-26 12:09:18 UTC (rev 101)
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: xsltwrapp
+Version: @VERSION@
+Description: A C++ wrapper around libxslt
+Requires: xmlwrapp = @VERSION@
+Libs: -L${libdir} -lxsltwrapp
+Libs.private: @LIBEXSLT_LIBS@ @LIBXSLT_LIBS@
+Cflags: -I${includedir}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
