libxml-ruby 0.6.0 → 0.7.0

data/ext/libxml/ruby_xml_dtd.c

@@ -22,8 +22,8 @@ ruby_xml_dtd_mark(ruby_xml_dtd *rxdtd) {
 
 /*
  * call-seq:
- *    XML::Dtd.new("public system") => dtd
- *    XML::Dtd.new("public", "system") => dtd
+ *    XML::Dtd.new("public system") -> dtd
+ *    XML::Dtd.new("public", "system") -> dtd
  * 
  * Create a new Dtd from the specified public and system
  * identifiers.

data/ext/libxml/ruby_xml_dtd.h

@@ -1,17 +1,17 @@
-#ifndef __RUBY_XML_DTD__
-#define __RUBY_XML_DTD__
-
-extern VALUE cXMLDtd;
-
-typedef struct rxp_dtd {
-  xmlDtdPtr dtd;   /* DTD interface */
-  //int data_type;   /* The data type referenced by *data */
-  //void *data;      /* Pointer to an external structure of options */
-  //int is_ptr;      /* Determines if this object owns its data or points to it someplace else */
-  //VALUE xmlver;    /* T_STRING with the xml version */
-} ruby_xml_dtd;
-
-void  ruby_init_xml_dtd(void);
-void  ruby_dtd_free(ruby_xml_dtd *rxdtd);
-
-#endif
+#ifndef __RUBY_XML_DTD__
+#define __RUBY_XML_DTD__
+
+extern VALUE cXMLDtd;
+
+typedef struct rxp_dtd {
+  xmlDtdPtr dtd;   /* DTD interface */
+  //int data_type;   /* The data type referenced by *data */
+  //void *data;      /* Pointer to an external structure of options */
+  //int is_ptr;      /* Determines if this object owns its data or points to it someplace else */
+  //VALUE xmlver;    /* T_STRING with the xml version */
+} ruby_xml_dtd;
+
+void  ruby_init_xml_dtd(void);
+void  ruby_dtd_free(ruby_xml_dtd *rxdtd);
+
+#endif

data/ext/libxml/ruby_xml_html_parser.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_html_parser.c 300 2008-07-01 19:14:15Z cfis $ */
+/* $Id: ruby_xml_html_parser.c 339 2008-07-09 08:36:26Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -14,7 +14,7 @@ VALUE cXMLHTMLParser;
 
 /*
  * call-seq:
- *    parser.filename => "filename"
+ *    parser.filename -> "filename"
  * 
  * Obtain the filename this parser will read from.
  */
@@ -63,7 +63,7 @@ ruby_xml_html_parser_filename_set(VALUE self, VALUE filename) {
     return(Qnil);
   }
 
-  rxp->ctxt = ruby_xml_parser_context_new3();
+  rxp->ctxt = ruby_xml_parser_context_new();
   data = (rx_file_data *)rxp->data;
   data->filename = filename;
 
@@ -105,7 +105,7 @@ ruby_xml_html_parser_free(ruby_xml_html_parser *rxp) {
 
 /*
  * call-seq:
- *    parser.io => IO
+ *    parser.io -> IO
  * 
  * Obtain the IO instance this parser works with.
  */
@@ -159,7 +159,7 @@ ruby_xml_html_parser_io_set(VALUE self, VALUE io) {
     return(Qnil);
   }
 
-  rxp->ctxt = ruby_xml_parser_context_new3();
+  rxp->ctxt = ruby_xml_parser_context_new();
   data = (rx_io_data *)rxp->data;
   data->io = io;
 
@@ -181,9 +181,10 @@ ruby_xml_html_parser_io_set(VALUE self, VALUE io) {
 void
 ruby_xml_html_parser_mark(ruby_xml_html_parser *rxp) {
   if (rxp == NULL) return;
-  if (!NIL_P(rxp->ctxt)) rb_gc_mark(rxp->ctxt);
+  if (!NIL_P(rxp->ctxt))
+    rb_gc_mark(rxp->ctxt);
 
-  ruby_xml_state_marker();
+  rb_gc_mark(LIBXML_STATE);
 
   switch(rxp->data_type) {
   case RUBY_LIBXML_SRC_TYPE_NULL:
@@ -208,7 +209,7 @@ ruby_xml_html_parser_mark(ruby_xml_html_parser *rxp) {
 
 /*
  * call-seq:
- *    XML::HTMLParser.new => parser
+ *    XML::HTMLParser.new -> parser
  * 
  * Create a new parser instance with no pre-determined source.
  */
@@ -229,7 +230,7 @@ ruby_xml_html_parser_new(VALUE class) {
 
 /*
  * call-seq:
- *    XML::HTMLParser.file => parser
+ *    XML::HTMLParser.file -> parser
  * 
  * Create a new parser instance that will read the specified file.
  */
@@ -255,7 +256,7 @@ ruby_xml_html_parser_new_file(VALUE class, VALUE filename) {
 
 /*
  * call-seq:
- *    XML::HTMLParser.io => parser
+ *    XML::HTMLParser.io -> parser
  * 
  * Create a new parser instance that will read from the
  * specified IO object.
@@ -282,7 +283,7 @@ ruby_xml_html_parser_new_io(VALUE class, VALUE io) {
 
 /*
  * call-seq:
- *    XML::HTMLParser.string => parser
+ *    XML::HTMLParser.string -> parser
  * 
  * Create a new parser instance that will parse the given
  * string.
@@ -308,7 +309,7 @@ ruby_xml_html_parser_new_string(VALUE class, VALUE str) {
 
 /*
  * call-seq:
- *    parser.parse => document
+ *    parser.parse -> document
  * 
  * Parse the input XML and create an XML::Document with
  * it's content. If an error occurs, XML::Parser::ParseError
@@ -350,7 +351,7 @@ ruby_xml_html_parser_parse(VALUE self) {
 
 /*
  * call-seq:
- *    parser.context => context
+ *    parser.context -> context
  * 
  * Obtain the XML::Parser::Context associated with this
  * parser.
@@ -369,7 +370,7 @@ ruby_xml_html_parser_context_get(VALUE self) {
 
 /*
  * call-seq:
- *    parser.string => "string"
+ *    parser.string -> "string"
  * 
  * Obtain the string this parser works with.
  */
@@ -410,7 +411,7 @@ ruby_xml_html_parser_str_set(VALUE self, VALUE str) {
     return(Qnil);
   }
 
-  rxp->ctxt = ruby_xml_parser_context_new3();
+  rxp->ctxt = ruby_xml_parser_context_new();
   data = (rx_string_data *)rxp->data;
   data->str = str;
 
@@ -430,13 +431,11 @@ void
 ruby_init_html_parser(void) {	
   cXMLHTMLParser = rb_define_class_under(mXML, "HTMLParser", rb_cObject);
 
+  rb_define_singleton_method(cXMLHTMLParser, "new", ruby_xml_html_parser_new, 0);
+  rb_define_singleton_method(cXMLHTMLParser, "string", ruby_xml_html_parser_new_string, 1);
   /*                
   rb_define_singleton_method(cXMLHTMLParser, "file", ruby_xml_html_parser_new_file, 1);
   rb_define_singleton_method(cXMLHTMLParser, "io", ruby_xml_html_parser_new_io, 1);
-  */
-  rb_define_singleton_method(cXMLHTMLParser, "new", ruby_xml_html_parser_new, 0);
-  rb_define_singleton_method(cXMLHTMLParser, "string", ruby_xml_html_parser_new_string, 1);
-  /*
   rb_define_method(cXMLHTMLParser, "filename", ruby_xml_html_parser_filename_get, 0);
   rb_define_method(cXMLHTMLParser, "filename=", ruby_xml_html_parser_filename_set, 1);
   rb_define_method(cXMLHTMLParser, "io", ruby_xml_html_parser_io_get, 0);

data/ext/libxml/ruby_xml_html_parser.h

@@ -1,29 +1,29 @@
-/* $Id: ruby_xml_html_parser.h 111 2006-11-20 01:39:14Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_HTML_PARSER__
-#define __RUBY_XML_HTML_PARSER__
-
-extern int ruby_xml_html_parser_count;
-extern VALUE cXMLHTMLParser;
-
-typedef struct ruby_xml_html_parser {
-  VALUE ctxt;
-  int parsed;
-  void *data;
-  int data_type;
-} ruby_xml_html_parser;
-
-/*
- * VALUE ruby_xml_html_parser_filename_get(VALUE self);
-VALUE ruby_xml_html_parser_filename_set(VALUE self, VALUE filename);
-VALUE ruby_xml_html_parser_new(VALUE class);
-*/
-VALUE ruby_xml_html_parser_parse(VALUE self);
-VALUE ruby_xml_html_parser_str_get(VALUE self);
-VALUE ruby_xml_html_parser_str_set(VALUE self, VALUE str);
-
-void ruby_init_html_parser(void);
-
-#endif
+/* $Id: ruby_xml_html_parser.h 111 2006-11-20 01:39:14Z roscopeco $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_HTML_PARSER__
+#define __RUBY_XML_HTML_PARSER__
+
+extern int ruby_xml_html_parser_count;
+extern VALUE cXMLHTMLParser;
+
+typedef struct ruby_xml_html_parser {
+  VALUE ctxt;
+  int parsed;
+  void *data;
+  int data_type;
+} ruby_xml_html_parser;
+
+/*
+ * VALUE ruby_xml_html_parser_filename_get(VALUE self);
+VALUE ruby_xml_html_parser_filename_set(VALUE self, VALUE filename);
+VALUE ruby_xml_html_parser_new(VALUE class);
+*/
+VALUE ruby_xml_html_parser_parse(VALUE self);
+VALUE ruby_xml_html_parser_str_get(VALUE self);
+VALUE ruby_xml_html_parser_str_set(VALUE self, VALUE str);
+
+void ruby_init_html_parser(void);
+
+#endif

data/ext/libxml/ruby_xml_input_cbg.c

@@ -71,6 +71,12 @@ int ic_close (void *context) {
     return 1;
 }
 
+/*
+ * call-seq:
+ *    register
+ * 
+ * Register a new set of I/O callback for handling parser input.
+ */
 VALUE input_callbacks_register_input_callbacks() {
     xmlRegisterInputCallbacks( ic_match, ic_open, ic_read, ic_close );
     return(Qtrue);

data/ext/libxml/ruby_xml_input_cbg.h

@@ -1,20 +1,20 @@
-#ifndef _INPUT_CBG_
-#define _INPUT_CBG_
-
-void ruby_init_input_callbacks(void);
-
-typedef struct ic_doc_context {
-    char *buffer;
-    char *bpos;
-    int remaining;
-} ic_doc_context;
-
-typedef struct ic_scheme {
-    char *scheme_name;
-    VALUE class;
-    int name_len;
-
-    struct ic_scheme *next_scheme;
-} ic_scheme;
-
-#endif
+#ifndef _INPUT_CBG_
+#define _INPUT_CBG_
+
+void ruby_init_input_callbacks(void);
+
+typedef struct ic_doc_context {
+    char *buffer;
+    char *bpos;
+    int remaining;
+} ic_doc_context;
+
+typedef struct ic_scheme {
+    char *scheme_name;
+    VALUE class;
+    int name_len;
+
+    struct ic_scheme *next_scheme;
+} ic_scheme;
+
+#endif

data/ext/libxml/ruby_xml_node.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.c 300 2008-07-01 19:14:15Z cfis $ */
+/* $Id: ruby_xml_node.c 351 2008-07-09 19:55:21Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -10,7 +10,7 @@ VALUE eXMLNodeSetNamespace;
 VALUE eXMLNodeFailedModify;
 VALUE eXMLNodeUnknownType;
 
-static VALUE
+VALUE
 check_string_or_symbol( VALUE val ) {
   if( TYPE(val) != T_STRING && TYPE(val) != T_SYMBOL ) {
     rb_raise(rb_eTypeError, "wrong argument type %s (expected String or Symbol)", 
@@ -21,15 +21,15 @@ check_string_or_symbol( VALUE val ) {
 
 /*
  * call-seq:
- *    node.attribute? => (true|false)
+ *    node.attribute? -> (true|false)
  * 
  * Determine whether this is an attribute node,
  */
 VALUE
 ruby_xml_node_attribute_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_ATTRIBUTE_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_ATTRIBUTE_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -38,15 +38,15 @@ ruby_xml_node_attribute_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.attribute_decl? => (true|false)
+ *    node.attribute_decl? -> (true|false)
  * 
  * Determine whether this is an attribute declaration node,
  */
 VALUE
 ruby_xml_node_attribute_decl_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_ATTRIBUTE_DECL)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_ATTRIBUTE_DECL)
     return(Qtrue);
   else
     return(Qfalse);
@@ -55,22 +55,22 @@ ruby_xml_node_attribute_decl_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.base => "uri"
+ *    node.base -> "uri"
  * 
  * Obtain this node's base URI.
  */
 VALUE
 ruby_xml_node_base_get(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlChar* base_uri;            
   VALUE result = Qnil;
   
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
   
-  if (rxn->node->doc == NULL)
+  if (xnode->doc == NULL)
     return(result);
   
-  base_uri = xmlNodeGetBase(rxn->node->doc, rxn->node);
+  base_uri = xmlNodeGetBase(xnode->doc, xnode);
   if (base_uri) {
     result = rb_str_new2((const char*)base_uri);
     xmlFree(base_uri);
@@ -90,29 +90,29 @@ ruby_xml_node_base_get(VALUE self) {
  */
 VALUE
 ruby_xml_node_base_set(VALUE self, VALUE uri) {
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
 
   Check_Type(uri, T_STRING);
-  Data_Get_Struct(self, ruby_xml_node, node);
-  if (node->node->doc == NULL)
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->doc == NULL)
     return(Qnil);
 
-  xmlNodeSetBase(node->node, (xmlChar*)StringValuePtr(uri));
+  xmlNodeSetBase(xnode, (xmlChar*)StringValuePtr(uri));
   return(Qtrue);
 }
 
 
 /*
  * call-seq:
- *    node.cdata? => (true|false)
+ *    node.cdata? -> (true|false)
  * 
  * Determine whether this is a #CDATA node
  */
 VALUE
 ruby_xml_node_cdata_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_CDATA_SECTION_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_CDATA_SECTION_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -121,15 +121,15 @@ ruby_xml_node_cdata_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.comment? => (true|false)
+ *    node.comment? -> (true|false)
  * 
  * Determine whether this is a comment node
  */
 VALUE
 ruby_xml_node_comment_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_COMMENT_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_COMMENT_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -138,52 +138,18 @@ ruby_xml_node_comment_q(VALUE self) {
 
 /*
  * call-seq:
- *    node << ("string" | node) => node
- * 
- * Add the specified string or XML::Node to this node's
- * content.
- */
-VALUE
-ruby_xml_node_content_add(VALUE self, VALUE obj) {
-  ruby_xml_node *node;
-  VALUE str;
-
-  Data_Get_Struct(self, ruby_xml_node, node);
-  /* XXX This should only be legal for a CDATA type node, I think,
-   * resulting in a merge of content, as if a string were passed
-   * danj 070827
-   */
-  if (rb_obj_is_kind_of(obj, cXMLNode)) {
-    ruby_xml_node_child_set(self, obj);
-    return(self);
-  } else if (TYPE(obj) == T_STRING) {
-    xmlNodeAddContent(node->node, (xmlChar*)StringValuePtr(obj));
-    return(self);
-  } else {
-    str = rb_obj_as_string(obj);
-    if (NIL_P(str) || TYPE(str) != T_STRING)
-      rb_raise(rb_eTypeError, "invalid argument: must be string or XML::Node");
-
-    xmlNodeAddContent(node->node, (xmlChar*)StringValuePtr(str));
-    return(self);
-  }
-}
-
-
-/*
- * call-seq:
- *    node.content => "string"
+ *    node.content -> "string"
  * 
  * Obtain this node's content as a string.
  */
 VALUE
 ruby_xml_node_content_get(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlChar *content;
-  VALUE result;
+  VALUE result = Qnil;
   
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  content = xmlNodeGetContent(rxn->node);
+  Data_Get_Struct(self, xmlNode, xnode);
+  content = xmlNodeGetContent(xnode);
   if (content) {
     result = rb_str_new2((const char *) content);
     xmlFree(content);
@@ -200,19 +166,19 @@ ruby_xml_node_content_get(VALUE self) {
  */ 
 VALUE
 ruby_xml_node_content_set(VALUE self, VALUE content) {
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
 
   Check_Type(content, T_STRING);
-  Data_Get_Struct(self, ruby_xml_node, node);
+  Data_Get_Struct(self, xmlNode, xnode);
   // XXX docs indicate need for escaping entites, need to be done? danj
-  xmlNodeSetContent(node->node, (xmlChar*)StringValuePtr(content));
+  xmlNodeSetContent(xnode, (xmlChar*)StringValuePtr(content));
   return(Qtrue);
 }
 
 
 /*
  * call-seq:
- *    node.content_stripped => "string"
+ *    node.content_stripped -> "string"
  * 
  * Obtain this node's stripped content.
  * 
@@ -221,16 +187,16 @@ ruby_xml_node_content_set(VALUE self, VALUE content) {
  */
 VALUE
 ruby_xml_node_content_stripped_get(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlChar* content;
   VALUE result = Qnil;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
   
-  if (!rxn->node->content) 
+  if (!xnode->content) 
     return result;
   
-  content = xmlNodeGetContent(rxn->node);
+  content = xmlNodeGetContent(xnode);
   if (content) { 
     result = rb_str_new2((const char*)content);
     xmlFree(content);
@@ -240,18 +206,18 @@ ruby_xml_node_content_stripped_get(VALUE self) {
 
 /*
  * call-seq:
- *    node.child => node
+ *    node.child -> node
  * 
  * Obtain this node's first child node, if any.
  */
 VALUE
 ruby_xml_node_child_get(VALUE self) {
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
   xmlNodePtr tmp;
 
-  Data_Get_Struct(self, ruby_xml_node, node);
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (node->node->type) {
+  switch (xnode->type) {
   case XML_ELEMENT_NODE:
   case XML_ENTITY_REF_NODE:
   case XML_ENTITY_NODE:
@@ -263,11 +229,11 @@ ruby_xml_node_child_get(VALUE self) {
 #endif
   case XML_HTML_DOCUMENT_NODE:
   case XML_DTD_NODE:
-    tmp = node->node->children;
+    tmp = xnode->children;
     break;
   case XML_ATTRIBUTE_NODE:
     {
-      xmlAttrPtr attr = (xmlAttrPtr) node->node;
+      xmlAttrPtr attr = (xmlAttrPtr) xnode;
       tmp = attr->children;
       break;
     }
@@ -285,18 +251,18 @@ ruby_xml_node_child_get(VALUE self) {
 
 /*
  * call-seq:
- *    node.child? => (true|false)
+ *    node.child? -> (true|false)
  * 
  * Determine whether this node has at least one child.
  */
 VALUE
 ruby_xml_node_child_q(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlNodePtr node;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
 
   node = NULL;
-  switch (rxn->node->type) {
+  switch (xnode->type) {
   case XML_ELEMENT_NODE:
   case XML_ENTITY_REF_NODE:
   case XML_ENTITY_NODE:
@@ -308,11 +274,11 @@ ruby_xml_node_child_q(VALUE self) {
 #endif
   case XML_HTML_DOCUMENT_NODE:
   case XML_DTD_NODE:
-    node = rxn->node->children;
+    node = xnode->children;
     break;
   case XML_ATTRIBUTE_NODE:
     {
-      xmlAttrPtr attr = (xmlAttrPtr) rxn->node;
+      xmlAttrPtr attr = (xmlAttrPtr) xnode;
       node = attr->children;
       break;
     }
@@ -331,38 +297,20 @@ ruby_xml_node_child_q(VALUE self) {
  * former raises on implicit copy, latter does not.
  */
 VALUE
-ruby_xml_node_child_set_aux(VALUE self, VALUE rnode, int do_raise) {
-  ruby_xml_node *cnode, *pnode;
-  xmlNodePtr chld, ret;
-  int copied=0;
+ruby_xml_node_child_set_aux(VALUE self, VALUE rnode) {
+  xmlNodePtr pnode, chld, ret;
 
   if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
     rb_raise(rb_eTypeError, "Must pass an XML::Node object");
 
-  Data_Get_Struct(self,  ruby_xml_node, pnode);
-  Data_Get_Struct(rnode, ruby_xml_node, cnode);
+  Data_Get_Struct(self,  xmlNode, pnode);
+  Data_Get_Struct(rnode, xmlNode, chld);
   
-  chld = cnode->node;
-  /* Since an add operation may destroy a textnode by merging, we need to work
-   * with a copy, so that the ruby instance is not left with a dangling reference
-   */
-  if ( chld->type == XML_TEXT_NODE ) {
-    chld = xmlCopyNode(chld,1);
-    copied=1;
-  }
-
-  if ( chld->parent != NULL || chld->doc != NULL ) {
-    /* raise before copying if applicable */
-    if ( do_raise == 1 )
-      rb_raise(rb_eRuntimeError, "implicit copy not legal for child= or <<");
-    chld=xmlCopyNode(chld,1);
-    copied=1;
-  }
+  if ( chld->parent != NULL || chld->doc != NULL )
+    rb_raise(rb_eRuntimeError, "Cannot move a node from one document to another with child= or <<.  First copy the node before moving it.");
 
-  ret = xmlAddChild(pnode->node, chld);
+  ret = xmlAddChild(pnode, chld);
   if (ret == NULL) {
-    if ( copied == 1 )
-      xmlFreeNode(chld);
     rb_raise(eXMLNodeFailedModify, "unable to add a child to the document");
   } else if ( ret==chld ) {
     /* child was added whole to parent and we need to return it as a new object */
@@ -381,7 +329,41 @@ ruby_xml_node_child_set_aux(VALUE self, VALUE rnode, int do_raise) {
  */
 VALUE
 ruby_xml_node_child_set(VALUE self, VALUE rnode) {
-  return ruby_xml_node_child_set_aux(self,rnode,1);
+  return ruby_xml_node_child_set_aux(self, rnode);
+}
+
+
+/*
+ * call-seq:
+ *    node << ("string" | node) -> node
+ * 
+ * Add the specified string or XML::Node to this node's
+ * content.
+ */
+VALUE
+ruby_xml_node_content_add(VALUE self, VALUE obj) {
+  xmlNodePtr xnode;
+  VALUE str;
+
+  Data_Get_Struct(self, xmlNode, xnode);
+  /* XXX This should only be legal for a CDATA type node, I think,
+   * resulting in a merge of content, as if a string were passed
+   * danj 070827
+   */
+  if (rb_obj_is_kind_of(obj, cXMLNode)) {
+    ruby_xml_node_child_set(self, obj);
+    return(self);
+  } else if (TYPE(obj) == T_STRING) {
+    xmlNodeAddContent(xnode, (xmlChar*)StringValuePtr(obj));
+    return(self);
+  } else {
+    str = rb_obj_as_string(obj);
+    if (NIL_P(str) || TYPE(str) != T_STRING)
+      rb_raise(rb_eTypeError, "invalid argument: must be string or XML::Node");
+
+    xmlNodeAddContent(xnode, (xmlChar*)StringValuePtr(str));
+    return(self);
+  }
 }
 
 /*
@@ -392,23 +374,23 @@ ruby_xml_node_child_set(VALUE self, VALUE rnode) {
  */
 VALUE
 ruby_xml_node_child_add(VALUE self, VALUE rnode) {
-  return ruby_xml_node_child_set_aux(self,rnode,0);
+  return ruby_xml_node_child_set_aux(self, rnode);
 }
 
 /*
  * call-seq:
- *    node.doc => document
+ *    node.doc -> document
  * 
  * Obtain the XML::Document this node belongs to.
  */
 VALUE
 ruby_xml_node_doc(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlDocPtr doc=NULL;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
   
-  switch (rxn->node->type) {
+  switch (xnode->type) {
   case XML_DOCUMENT_NODE:
 #ifdef LIBXML_DOCB_ENABLED
   case XML_DOCB_DOCUMENT_NODE:
@@ -418,7 +400,7 @@ ruby_xml_node_doc(VALUE self) {
     break;
   case XML_ATTRIBUTE_NODE:
     {
-      xmlAttrPtr attr = (xmlAttrPtr) rxn->node;
+      xmlAttrPtr attr = (xmlAttrPtr) xnode;
       doc = attr->doc;
       break;
     }
@@ -426,7 +408,7 @@ ruby_xml_node_doc(VALUE self) {
     doc = NULL;
     break;
   default:
-    doc = rxn->node->doc;
+    doc = xnode->doc;
     break;
   }
 
@@ -442,16 +424,16 @@ ruby_xml_node_doc(VALUE self) {
 
 /*
  * call-seq:
- *    node.docbook? => (true|false)
+ *    node.docbook? -> (true|false)
  * 
  * Determine whether this is a docbook node.
  */
 VALUE
 ruby_xml_node_docbook_doc_q(VALUE self) {
 #ifdef LIBXML_DOCB_ENABLED
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_DOCB_DOCUMENT_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_DOCB_DOCUMENT_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -464,15 +446,15 @@ ruby_xml_node_docbook_doc_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.doctype? => (true|false)
+ *    node.doctype? -> (true|false)
  * 
  * Determine whether this is a DOCTYPE node.
  */
 VALUE
 ruby_xml_node_doctype_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_DOCUMENT_TYPE_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_DOCUMENT_TYPE_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -481,15 +463,15 @@ ruby_xml_node_doctype_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.document? => (true|false)
+ *    node.document? -> (true|false)
  * 
  * Determine whether this is a document node.
  */
 VALUE
 ruby_xml_node_document_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_DOCUMENT_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_DOCUMENT_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -498,15 +480,15 @@ ruby_xml_node_document_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.dtd? => (true|false)
+ *    node.dtd? -> (true|false)
  * 
  * Determine whether this is a DTD node.
  */
 VALUE
 ruby_xml_node_dtd_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_DTD_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_DTD_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -515,22 +497,22 @@ ruby_xml_node_dtd_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.dump => (true|nil)
+ *    node.dump -> (true|nil)
  * 
  * Dump this node to stdout.
  */
 VALUE
 ruby_xml_node_dump(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlBufferPtr buf;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  if (rxn->node->doc == NULL)
+  if (xnode->doc == NULL)
     return(Qnil);
 
   buf = xmlBufferCreate();
-  xmlNodeDump(buf, rxn->node->doc, rxn->node, 0, 1);
+  xmlNodeDump(buf, xnode->doc, xnode, 0, 1);
   xmlBufferDump(stdout, buf);
   xmlBufferFree(buf);
   return(Qtrue);
@@ -539,35 +521,35 @@ ruby_xml_node_dump(VALUE self) {
 
 /*
  * call-seq:
- *    node.debug_dump => (true|nil)
+ *    node.debug_dump -> (true|nil)
  * 
  * Dump this node to stdout, including any debugging
  * information.
  */
 VALUE
 ruby_xml_node_debug_dump(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  if (rxn->node->doc == NULL)
+  if (xnode->doc == NULL)
     return(Qnil);
 
-  xmlElemDump(stdout, rxn->node->doc, rxn->node);
+  xmlElemDump(stdout, xnode->doc, xnode);
   return(Qtrue);
 }
 
 
 /*
  * call-seq:
- *    node.element? => (true|false)
+ *    node.element? -> (true|false)
  * 
  * Determine whether this is an element node.
  */
 VALUE
 ruby_xml_node_element_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_ELEMENT_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_ELEMENT_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -576,15 +558,15 @@ ruby_xml_node_element_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.element_decl? => (true|false)
+ *    node.element_decl? -> (true|false)
  * 
  * Determine whether this is an element declaration node.
  */
 VALUE
 ruby_xml_node_element_decl_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_ELEMENT_DECL)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_ELEMENT_DECL)
     return(Qtrue);
   else
     return(Qfalse);
@@ -593,32 +575,32 @@ ruby_xml_node_element_decl_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.empty? => (true|false)
+ *    node.empty? -> (true|false)
  * 
  * Determine whether this node is empty.
  */
 VALUE
 ruby_xml_node_empty_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node == NULL)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode == NULL)
     return(Qnil);
 
-  return((xmlIsBlankNode(rxn->node) == 1) ? Qtrue : Qfalse);
+  return((xmlIsBlankNode(xnode) == 1) ? Qtrue : Qfalse);
 }
 
 
 /*
  * call-seq:
- *    node.entity? => (true|false)
+ *    node.entity? -> (true|false)
  * 
  * Determine whether this is an entity node.
  */
 VALUE
 ruby_xml_node_entity_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_ENTITY_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_ENTITY_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -627,15 +609,15 @@ ruby_xml_node_entity_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.entity_ref? => (true|false)
+ *    node.entity_ref? -> (true|false)
  * 
  * Determine whether this is an entity reference node.
  */
 VALUE
 ruby_xml_node_entity_ref_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_ENTITY_REF_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_ENTITY_REF_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -647,26 +629,26 @@ VALUE ruby_xml_node_to_s(VALUE self);
  * call-seq:
  *    node.eql?(other_node) => (true|false)
  * 
- * Test equality between the two nodes. Equality is determined based
- * on the XML representation of the nodes.
- */
+ * Test equality between the two nodes. Two nodes are equal
+ * if they are the same node or have the same XML representation.*/
 VALUE
 ruby_xml_node_eql_q(VALUE self, VALUE other) {
-  // TODO this isn't the best way to handle this
-  ruby_xml_node *rxn, *orxn;  
-  VALUE thisxml, otherxml;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  Data_Get_Struct(other, ruby_xml_node, orxn);
-  thisxml = ruby_xml_node_to_s(self);
-  otherxml = ruby_xml_node_to_s(other);
-  
-  return(rb_funcall(thisxml, rb_intern("=="), 1, otherxml));
+  if (self == other)
+  {
+    return Qtrue;
+  }
+  else      
+  {
+    VALUE self_xml = ruby_xml_node_to_s(self);
+    VALUE other_xml = ruby_xml_node_to_s(other);
+    return(rb_funcall(self_xml, rb_intern("=="), 1, other_xml));
+  }    
 }
 
 
 /*
  * call-seq:
- *    node.find(xpath_expr, namespace = [any]) => nodeset
+ *    node.find(xpath_expr, namespace = [any]) -> nodeset
  * 
  * Find nodes matching the specified xpath expression, optionally
  * using the specified namespaces. Returns an XML::Node::Set.
@@ -681,7 +663,7 @@ ruby_xml_node_find(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *    node.find_first(xpath_expr, namespace = [any]) => nodeset
+ *    node.find_first(xpath_expr, namespace = [any]) -> nodeset
  *
  * Find the first node matching the specified xpath expression, optionally
  * using the specified namespaces. Returns an XML::Node.
@@ -694,49 +676,32 @@ ruby_xml_node_find_first(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *    node.fragment? => (true|false)
+ *    node.fragment? -> (true|false)
  * 
  * Determine whether this node is a fragment.
  */
 VALUE
 ruby_xml_node_fragment_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_DOCUMENT_FRAG_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_DOCUMENT_FRAG_NODE)
     return(Qtrue);
   else
     return(Qfalse);
 }
 
-/*
- * call-seq:
- *    node.hash => fixnum
- * 
- * Returns the hash-code for this node. This is the hash of the XML
- * representation in order to be consistent with eql.
- */
-VALUE
-ruby_xml_node_hash(VALUE self) {
-  ruby_xml_node *rxn;
-  VALUE thisxml;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  thisxml = ruby_xml_node_to_s(self);
-  
-  return(rb_funcall(thisxml, rb_intern("hash"), 0));
-}
-
 
 /*
  * call-seq:
- *    node.html_doc? => (true|false)
+ *    node.html_doc? -> (true|false)
  * 
  * Determine whether this node is an html document node.
  */
 VALUE
 ruby_xml_node_html_doc_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_HTML_DOCUMENT_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_HTML_DOCUMENT_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -744,7 +709,7 @@ ruby_xml_node_html_doc_q(VALUE self) {
 
 /*
  * call-seq:
- *    XML::Node.new_cdata(content = nil) => node
+ *    XML::Node.new_cdata(content = nil) -> node
  * 
  * Create a new #CDATA node, optionally setting
  * the node's content.
@@ -780,7 +745,7 @@ ruby_xml_node_new_cdata(int argc, VALUE *argv, VALUE class) {
 
 /*
  * call-seq:
- *    XML::Node.new_comment(content = nil) => node
+ *    XML::Node.new_comment(content = nil) -> node
  * 
  * Create a new comment node, optionally setting
  * the node's content.
@@ -818,19 +783,19 @@ ruby_xml_node_new_comment(int argc, VALUE *argv, VALUE class) {
  
 /*
  * call-seq:
- *    node.lang => "string"
+ *    node.lang -> "string"
  * 
  * Obtain the language set for this node, if any.
  * This is set in XML via the xml:lang attribute.
  */
 VALUE
 ruby_xml_node_lang_get(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlChar *lang;
   VALUE result = Qnil;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  lang = xmlNodeGetLang(rxn->node);
+  Data_Get_Struct(self, xmlNode, xnode);
+  lang = xmlNodeGetLang(xnode);
 
   if (lang) {
     result = rb_str_new2((const char*)lang);
@@ -852,11 +817,11 @@ ruby_xml_node_lang_get(VALUE self) {
  */
 VALUE
 ruby_xml_node_lang_set(VALUE self, VALUE lang) {
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
 
   Check_Type(lang, T_STRING);
-  Data_Get_Struct(self, ruby_xml_node, node);
-  xmlNodeSetLang(node->node, (xmlChar*)StringValuePtr(lang));
+  Data_Get_Struct(self, xmlNode, xnode);
+  xmlNodeSetLang(xnode, (xmlChar*)StringValuePtr(lang));
 
   return(Qtrue);
 }
@@ -864,18 +829,18 @@ ruby_xml_node_lang_set(VALUE self, VALUE lang) {
 
 /*
  * call-seq:
- *    node.last => node
+ *    node.last -> node
  * 
  * Obtain the last child node of this node, if any.
  */
 VALUE
 ruby_xml_node_last_get(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlNodePtr node;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (rxn->node->type) {
+  switch (xnode->type) {
   case XML_ELEMENT_NODE:
   case XML_ENTITY_REF_NODE:
   case XML_ENTITY_NODE:
@@ -887,11 +852,11 @@ ruby_xml_node_last_get(VALUE self) {
 #endif
   case XML_HTML_DOCUMENT_NODE:
   case XML_DTD_NODE:
-    node = rxn->node->last;
+    node = xnode->last;
     break;
   case XML_ATTRIBUTE_NODE:
     {
-      xmlAttrPtr attr = (xmlAttrPtr) rxn->node;
+      xmlAttrPtr attr = (xmlAttrPtr) xnode;
       node = attr->last;
     }
   default:
@@ -908,18 +873,18 @@ ruby_xml_node_last_get(VALUE self) {
 
 /*
  * call-seq:
- *    node.last? => (true|false)
+ *    node.last? -> (true|false)
  * 
  * Determine whether this node has a last child node.
  */
 VALUE
 ruby_xml_node_last_q(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlNodePtr node;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (rxn->node->type) {
+  switch (xnode->type) {
   case XML_ELEMENT_NODE:
   case XML_ENTITY_REF_NODE:
   case XML_ENTITY_NODE:
@@ -931,11 +896,11 @@ ruby_xml_node_last_q(VALUE self) {
 #endif
   case XML_HTML_DOCUMENT_NODE:
   case XML_DTD_NODE:
-    node = rxn->node->last;
+    node = xnode->last;
     break;
   case XML_ATTRIBUTE_NODE:
     {
-      xmlAttrPtr attr = (xmlAttrPtr) rxn->node;
+      xmlAttrPtr attr = (xmlAttrPtr) xnode;
       node = attr->last;
     }
   default:
@@ -952,7 +917,7 @@ ruby_xml_node_last_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.line_num => num
+ *    node.line_num -> num
  * 
  * Obtain the line number (in the XML document) that this
  * node was read from. If +default_line_numbers+ is set
@@ -960,14 +925,14 @@ ruby_xml_node_last_q(VALUE self) {
  */
 VALUE
 ruby_xml_node_line_num(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   long line_num;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
 
   if (!xmlLineNumbersDefaultValue)
     rb_warn("Line numbers were not retained: use XML::Parser::default_line_numbers=true");
 
-  line_num = xmlGetLineNo(rxn->node);
+  line_num = xmlGetLineNo(xnode);
   if (line_num == -1)
     return(Qnil);
   else
@@ -977,17 +942,17 @@ ruby_xml_node_line_num(VALUE self) {
 
 /*
  * call-seq:
- *    node.xlink? => (true|false)
+ *    node.xlink? -> (true|false)
  * 
  * Determine whether this node is an xlink node.
  */
 VALUE
 ruby_xml_node_xlink_q(VALUE self) {
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
   xlinkType xlt;
 
-  Data_Get_Struct(self, ruby_xml_node, node);
-  xlt = xlinkIsLink(node->node->doc, node->node);
+  Data_Get_Struct(self, xmlNode, xnode);
+  xlt = xlinkIsLink(xnode->doc, xnode);
 
   if (xlt == XLINK_TYPE_NONE)
     return(Qfalse);
@@ -998,7 +963,7 @@ ruby_xml_node_xlink_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.xlink_type => num
+ *    node.xlink_type -> num
  * 
  * Obtain the type identifier for this xlink, if applicable.
  * If this is not an xlink node (see +xlink?+), will return
@@ -1006,11 +971,11 @@ ruby_xml_node_xlink_q(VALUE self) {
  */
 VALUE
 ruby_xml_node_xlink_type(VALUE self) {
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
   xlinkType xlt;
 
-  Data_Get_Struct(self, ruby_xml_node, node);
-  xlt = xlinkIsLink(node->node->doc, node->node);
+  Data_Get_Struct(self, xmlNode, xnode);
+  xlt = xlinkIsLink(xnode->doc, xnode);
 
   if (xlt == XLINK_TYPE_NONE)
     return(Qnil);
@@ -1021,7 +986,7 @@ ruby_xml_node_xlink_type(VALUE self) {
 
 /*
  * call-seq:
- *    node.xlink_type_name => "string"
+ *    node.xlink_type_name -> "string"
  * 
  * Obtain the type name for this xlink, if applicable.
  * If this is not an xlink node (see +xlink?+), will return
@@ -1029,11 +994,11 @@ ruby_xml_node_xlink_type(VALUE self) {
  */
 VALUE
 ruby_xml_node_xlink_type_name(VALUE self) {
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
   xlinkType xlt;
 
-  Data_Get_Struct(self, ruby_xml_node, node);
-  xlt = xlinkIsLink(node->node->doc, node->node);
+  Data_Get_Struct(self, xmlNode, xnode);
+  xlt = xlinkIsLink(xnode->doc, xnode);
 
   switch(xlt) {
   case XLINK_TYPE_NONE:
@@ -1051,46 +1016,46 @@ ruby_xml_node_xlink_type_name(VALUE self) {
 
 /*
  * call-seq:
- *    node.name => "string"
+ *    node.name -> "string"
  * 
  * Obtain this node's name.
  */
 VALUE
 ruby_xml_node_name_get(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   const xmlChar *name;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (rxn->node->type) {
+  switch (xnode->type) {
   case XML_DOCUMENT_NODE:
 #ifdef LIBXML_DOCB_ENABLED
   case XML_DOCB_DOCUMENT_NODE:
 #endif
   case XML_HTML_DOCUMENT_NODE:
     {
-      xmlDocPtr doc = (xmlDocPtr) rxn->node;
+      xmlDocPtr doc = (xmlDocPtr) xnode;
       name = doc->URL;
       break;
     }
   case XML_ATTRIBUTE_NODE:
     {
-      xmlAttrPtr attr = (xmlAttrPtr) rxn->node;
+      xmlAttrPtr attr = (xmlAttrPtr) xnode;
       name = attr->name;
       break;
     }
   case XML_NAMESPACE_DECL:
     {
-      xmlNsPtr ns = (xmlNsPtr) rxn->node;
+      xmlNsPtr ns = (xmlNsPtr) xnode;
       name = ns->prefix;
       break;
     }
   default:
-    name = rxn->node->name;
+    name = xnode->name;
     break;
   }
 
-  if (rxn->node->name == NULL)
+  if (xnode->name == NULL)
     return(Qnil);
   else
     return(rb_str_new2((const char*)name));
@@ -1105,40 +1070,40 @@ ruby_xml_node_name_get(VALUE self) {
  */
 VALUE
 ruby_xml_node_name_set(VALUE self, VALUE name) {
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
 
   Check_Type(name, T_STRING);
-  Data_Get_Struct(self, ruby_xml_node, node);
-  xmlNodeSetName(node->node, (xmlChar*)StringValuePtr(name));
+  Data_Get_Struct(self, xmlNode, xnode);
+  xmlNodeSetName(xnode, (xmlChar*)StringValuePtr(name));
   return(Qtrue);
 }
 
 
 /*
  * call-seq:
- *    node.namespace => [namespace, ..., namespace]
+ *    node.namespace -> [namespace, ..., namespace]
  * 
  * Obtain an array of +XML::NS+ objects representing
  * this node's xmlns attributes
  */
 VALUE
 ruby_xml_node_namespace_get(VALUE self) {
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
   xmlNsPtr *nsList, *cur;
   VALUE arr, ns;
 
-  Data_Get_Struct(self, ruby_xml_node, node);
-  if (node->node == NULL)
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode == NULL)
     return(Qnil);
 
-  nsList = xmlGetNsList(node->node->doc, node->node);
+  nsList = xmlGetNsList(xnode->doc, xnode);
 
   if (nsList == NULL)
     return(Qnil);
 
   arr = rb_ary_new();
   for (cur = nsList; *cur != NULL; cur++) {
-    ns = ruby_xml_ns_new2(cXMLNS, ruby_xml_document_wrap(node->node->doc), *cur);
+    ns = ruby_xml_ns_wrap(*cur);
     if (ns == Qnil)
       continue;
     else
@@ -1152,21 +1117,19 @@ ruby_xml_node_namespace_get(VALUE self) {
 
 /*
  * call-seq:
- *    node.namespace_node => namespace.
+ *    node.namespace_node -> namespace.
  * 
  * Obtain this node's namespace node.
  */
 VALUE
 ruby_xml_node_namespace_get_node(VALUE self) {
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
 
-  Data_Get_Struct(self, ruby_xml_node, node);
-  if (node->node->ns == NULL)
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->ns == NULL)
     return(Qnil);
   else
-    return ruby_xml_ns_new2(cXMLNS,
-			    ruby_xml_document_wrap(node->node->doc),
-			    node->node->ns);
+    return ruby_xml_ns_wrap(xnode->ns);
 }
 
 // TODO namespace_set can take varargs (in fact, must if used
@@ -1185,12 +1148,11 @@ ruby_xml_node_namespace_get_node(VALUE self) {
 VALUE
 ruby_xml_node_namespace_set(int argc, VALUE *argv, VALUE self) {
   VALUE rns, rprefix;
-  ruby_xml_node *rxn;
-  ruby_xml_ns *rxns;
-  xmlNsPtr ns;
+  xmlNodePtr xnode;
+  xmlNsPtr xns;
   char *cp, *href;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
   switch (argc) {
   case 1:
     rns = argv[0];
@@ -1204,8 +1166,8 @@ ruby_xml_node_namespace_set(int argc, VALUE *argv, VALUE self) {
 	href = &cp[1]; /* skip the : */
       }
     } else if (rb_obj_is_kind_of(rns, cXMLNS) == Qtrue) {
-      Data_Get_Struct(self, ruby_xml_ns, rxns);
-      xmlSetNs(rxn->node, rxns->ns);
+      Data_Get_Struct(self, xmlNs, xns);
+      xmlSetNs(xnode, xns);
       return(rns);
     } else
       rb_raise(rb_eTypeError, "must pass a string or an XML::Ns object");
@@ -1220,11 +1182,11 @@ ruby_xml_node_namespace_set(int argc, VALUE *argv, VALUE self) {
       href = StringValuePtr(argv[1]);
     }
 
-    ns = xmlNewNs(rxn->node, (xmlChar*)href, (xmlChar*)StringValuePtr(rprefix));
-    if (ns == NULL)
+    xns = xmlNewNs(xnode, (xmlChar*)href, (xmlChar*)StringValuePtr(rprefix));
+    if (xns == NULL)
       rb_raise(eXMLNodeSetNamespace, "unable to set the namespace");
     else
-      return ruby_xml_ns_new2(cXMLNS, ruby_xml_document_wrap(rxn->node->doc), ns);
+      return ruby_xml_ns_wrap(xns);
     break;
 
   default:
@@ -1238,16 +1200,16 @@ ruby_xml_node_namespace_set(int argc, VALUE *argv, VALUE self) {
 
 /*
  * call-seq:
- *    node.namespace? => (true|false)
+ *    node.namespace? -> (true|false)
  * 
  * Determine whether this node *is* (not has) a namespace
  * node.
  */
 VALUE
 ruby_xml_node_namespace_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_NAMESPACE_DECL)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_NAMESPACE_DECL)
     return(Qtrue);
   else
     return(Qfalse);
@@ -1265,71 +1227,64 @@ ruby_xml_node_namespace_q(VALUE self) {
  * If the xmlNode has no parent or document, then call xmlFree.
  */
 void
-ruby_xml_node2_free(ruby_xml_node *rxn) {
-
-  if (rxn == NULL ) return;
+ruby_xml_node2_free(xmlNodePtr xnode) {
 
-  if (rxn->node != NULL ) {
-    rxn->node->_private=NULL;
+  if (xnode != NULL) {
+    xnode->_private=NULL;
 
-    if ( rxn->node->doc==NULL || rxn->node->parent==NULL ) {
+    if (xnode->doc==NULL && xnode->parent==NULL) {
 #ifdef NODE_DEBUG
-      fprintf(stderr,"ruby_xml_node2_free ruby_xfree rxn=0x%x xn=0x%x o=0x%x\n",(long)rxn,(long)rxn->node,(long)rxn->node->_private);
+      fprintf(stderr,"ruby_xml_node2_free ruby_xfree rxn=0x%x xn=0x%x o=0x%x\n",(long)rxn,(long)xnode,(long)xnode->_private);
 #endif
-      xmlFreeNode(rxn->node);
+      xmlFreeNode(xnode);
     }
-    
-    rxn->node=NULL;
   }
-
-  ruby_xfree(rxn);
 }
 
 void
-ruby_xml_node_mark_common(xmlNodePtr node) {
-  if (node->parent == NULL ) {
+ruby_xml_node_mark_common(xmlNodePtr xnode) {
+  if (xnode->parent == NULL ) {
 #ifdef NODE_DEBUG
     fprintf(stderr,"mark no parent r=0x%x *n=0x%x\n",rxn,node);
 #endif
-  } else if ( node->doc != NULL ) {
-    if (node->doc->_private == NULL) {
+  } else if (xnode->doc != NULL ) {
+    if (xnode->doc->_private == NULL) {
       rb_bug("XmlNode Doc is not bound! (%s:%d)",
 	     __FILE__,__LINE__);
     }
-    rb_gc_mark((VALUE)node->doc->_private);
+    rb_gc_mark((VALUE)xnode->doc->_private);
   } else {
-    while (node->parent != NULL )
-      node=node->parent;
-    if (node->_private == NULL )
+    while (xnode->parent != NULL )
+      xnode = xnode->parent;
+    if (xnode->_private == NULL )
       rb_warning("XmlNode Root Parent is not bound! (%s:%d)",
 		 __FILE__,__LINE__);
     else {
 #ifdef NODE_DEBUG
       fprintf(stderr,"mark rxn=0x%x xn=0x%x o=0x%x doc=0x%x\n",(long)rxn,(long)node,(long)node->_private,node->doc);
 #endif
-      rb_gc_mark((VALUE)node->_private);
+      rb_gc_mark((VALUE)xnode->_private);
     }
   }
 }
 
 void
-ruby_xml_node2_mark(ruby_xml_node *rxn) {
-  if (rxn->node == NULL ) return;
+ruby_xml_node2_mark(xmlNodePtr xnode) {
+  if (xnode == NULL ) return;
 
-  if (rxn->node->_private == NULL ) {
+  if (xnode->_private == NULL ) {
     rb_warning("XmlNode is not bound! (%s:%d)",
 	       __FILE__,__LINE__);
     return;
   }
 
-  ruby_xml_node_mark_common(rxn->node);
+  ruby_xml_node_mark_common(xnode);
 }
 
 VALUE
 ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode)
 {
   VALUE obj;
-  ruby_xml_node *rxn;
 
   // This node is already wrapped
   if (xnode->_private != NULL) {
@@ -1340,10 +1295,10 @@ ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode)
     return (VALUE)xnode->_private;
   }
 
-  obj=Data_Make_Struct(class,ruby_xml_node,ruby_xml_node2_mark,
-		       ruby_xml_node2_free,rxn);
+  obj=Data_Wrap_Struct(class,
+                       ruby_xml_node2_mark, ruby_xml_node2_free,
+                       xnode);
 
-  rxn->node=xnode;
   xnode->_private=(void*)obj;
 #ifdef NODE_DEBUG
   fprintf(stderr,"wrap rn=0x%x n*=0x%x d*=0x%x\n",
@@ -1365,8 +1320,7 @@ ruby_xml_node2_new_native(VALUE class, VALUE ns, VALUE name)
   xnode=xmlNewNode(xns,(xmlChar*)StringValuePtr(name));
   xnode->_private=NULL;
 
-  obj=
-    ruby_xml_node2_wrap(class,xnode);
+  obj= ruby_xml_node2_wrap(class,xnode);
   
   rb_obj_call_init(obj,0,NULL);
   return obj;
@@ -1386,8 +1340,8 @@ ruby_xml_node2_new_string(VALUE class, VALUE ns, VALUE name, VALUE val)
 }
 /*
  * call-seq:
- *    XML::Node.new(name, content = nil) => node
- *    XML::Node.new_element(name, content = nil) => node
+ *    XML::Node.new(name, content = nil) -> node
+ *    XML::Node.new_element(name, content = nil) -> node
  * 
  * Create a new element node with the specified name, optionally setting
  * the node's content.
@@ -1415,17 +1369,17 @@ ruby_xml_node2_new_string_bc(int argc, VALUE *argv, VALUE class)
 
 /*
  * call-seq:
- *    node.next => node
+ *    node.next -> node
  * 
  * Obtain the next sibling node, if any.
  */
 VALUE
 ruby_xml_node_next_get(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlNodePtr node;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (rxn->node->type) {
+  switch (xnode->type) {
   case XML_DOCUMENT_NODE:
 #ifdef LIBXML_DOCB_ENABLED
   case XML_DOCB_DOCUMENT_NODE:
@@ -1435,18 +1389,18 @@ ruby_xml_node_next_get(VALUE self) {
     break;
   case XML_ATTRIBUTE_NODE:
     {
-      xmlAttrPtr attr = (xmlAttrPtr) rxn->node;
+      xmlAttrPtr attr = (xmlAttrPtr) xnode;
       node = (xmlNodePtr) attr->next;
       break;
     }
   case XML_NAMESPACE_DECL:
     {
-      xmlNsPtr ns = (xmlNsPtr) rxn->node;
+      xmlNsPtr ns = (xmlNsPtr) xnode;
       node = (xmlNodePtr) ns->next;
       break;
     }
   default:
-    node = rxn->node->next;
+    node = xnode->next;
     break;
   }
 
@@ -1460,17 +1414,17 @@ ruby_xml_node_next_get(VALUE self) {
 
 /*
  * call-seq:
- *    node.next? => (true|false)
+ *    node.next? -> (true|false)
  * 
  * Determine whether this node has a next sibling.
  */
 VALUE
 ruby_xml_node_next_q(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlNodePtr node;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (rxn->node->type) {
+  switch (xnode->type) {
   case XML_DOCUMENT_NODE:
 #ifdef LIBXML_DOCB_ENABLED
   case XML_DOCB_DOCUMENT_NODE:
@@ -1480,18 +1434,18 @@ ruby_xml_node_next_q(VALUE self) {
     break;
   case XML_ATTRIBUTE_NODE:
     {
-      xmlAttrPtr attr = (xmlAttrPtr) rxn->node;
+      xmlAttrPtr attr = (xmlAttrPtr) xnode;
       node = (xmlNodePtr) attr->next;
       break;
     }
   case XML_NAMESPACE_DECL:
     {
-      xmlNsPtr ns = (xmlNsPtr) rxn->node;
+      xmlNsPtr ns = (xmlNsPtr) xnode;
       node = (xmlNodePtr) ns->next;
       break;
     }
   default:
-    node = rxn->node->next;
+    node = xnode->next;
     break;
   }
 
@@ -1510,16 +1464,15 @@ ruby_xml_node_next_q(VALUE self) {
  */
 VALUE
 ruby_xml_node_next_set(VALUE self, VALUE rnode) {
-  ruby_xml_node *cnode, *pnode;
-  xmlNodePtr ret;
+  xmlNodePtr cnode, pnode, ret;
 
   if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
     rb_raise(rb_eTypeError, "Must pass an XML::Node object");
 
-  Data_Get_Struct(self,  ruby_xml_node, pnode);
-  Data_Get_Struct(rnode, ruby_xml_node, cnode);
+  Data_Get_Struct(self,  xmlNode, pnode);
+  Data_Get_Struct(rnode, xmlNode, cnode);
 
-  ret = xmlAddNextSibling(pnode->node, cnode->node);
+  ret = xmlAddNextSibling(pnode, cnode);
   if (ret == NULL)
     rb_raise(eXMLNodeFailedModify, "unable to add a sibling to the document");
 
@@ -1529,15 +1482,15 @@ ruby_xml_node_next_set(VALUE self, VALUE rnode) {
 
 /*
  * call-seq:
- *    node.notation? => (true|false)
+ *    node.notation? -> (true|false)
  * 
  * Determine whether this is a notation node
  */
 VALUE
 ruby_xml_node_notation_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_NOTATION_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_NOTATION_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -1546,15 +1499,15 @@ ruby_xml_node_notation_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.ns? => (true|false)
+ *    node.ns? -> (true|false)
  * 
  * Determine whether this node is a namespace node.
  */
 VALUE
 ruby_xml_node_ns_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->ns == NULL)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->ns == NULL)
     return(Qfalse);
   else
     return(Qtrue);
@@ -1563,33 +1516,33 @@ ruby_xml_node_ns_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.ns_def => namespace
+ *    node.ns_def -> namespace
  * 
  * Obtain this node's default namespace.
  */
 VALUE
 ruby_xml_node_ns_def_get(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->nsDef == NULL)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->nsDef == NULL)
     return(Qnil);
   else
-    return(ruby_xml_ns_new2(cXMLNS, ruby_xml_document_wrap(rxn->node->doc), rxn->node->nsDef));
+    return(ruby_xml_ns_wrap(xnode->nsDef));
 }
 
 
 /*
  * call-seq:
- *    node.ns_def? => (true|false)
+ *    node.ns_def? -> (true|false)
  * 
  * Obtain an array of +XML::NS+ objects representing
  * this node's xmlns attributes
  */
 VALUE
 ruby_xml_node_ns_def_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->nsDef == NULL)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->nsDef == NULL)
     return(Qfalse);
   else
     return(Qtrue);
@@ -1598,18 +1551,18 @@ ruby_xml_node_ns_def_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.parent => node
+ *    node.parent -> node
  * 
  * Obtain this node's parent node, if any.
  */
 VALUE
 ruby_xml_node_parent_get(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlNodePtr node;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (rxn->node->type) {
+  switch (xnode->type) {
   case XML_DOCUMENT_NODE:
   case XML_HTML_DOCUMENT_NODE:
 #ifdef LIBXML_DOCB_ENABLED
@@ -1619,7 +1572,7 @@ ruby_xml_node_parent_get(VALUE self) {
     break;
   case XML_ATTRIBUTE_NODE:
     {
-      xmlAttrPtr attr = (xmlAttrPtr) rxn->node;
+      xmlAttrPtr attr = (xmlAttrPtr) xnode;
       node = attr->parent;
     }
   case XML_ENTITY_DECL:
@@ -1629,7 +1582,7 @@ ruby_xml_node_parent_get(VALUE self) {
     node = NULL;
     break;
   default:
-    node = rxn->node->parent;
+    node = xnode->parent;
     break;
   }
 
@@ -1642,18 +1595,18 @@ ruby_xml_node_parent_get(VALUE self) {
 
 /*
  * call-seq:
- *    node.parent? => (true|false)
+ *    node.parent? -> (true|false)
  * 
  * Determine whether this node has a parent node.
  */
 VALUE
 ruby_xml_node_parent_q(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlNodePtr node;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (rxn->node->type) {
+  switch (xnode->type) {
   case XML_DOCUMENT_NODE:
   case XML_HTML_DOCUMENT_NODE:
 #ifdef LIBXML_DOCB_ENABLED
@@ -1663,7 +1616,7 @@ ruby_xml_node_parent_q(VALUE self) {
     break;
   case XML_ATTRIBUTE_NODE:
     {
-      xmlAttrPtr attr = (xmlAttrPtr) rxn->node;
+      xmlAttrPtr attr = (xmlAttrPtr) xnode;
       node = attr->parent;
     }
   case XML_ENTITY_DECL:
@@ -1673,7 +1626,7 @@ ruby_xml_node_parent_q(VALUE self) {
     node = NULL;
     break;
   default:
-    node = rxn->node->parent;
+    node = xnode->parent;
     break;
   }
 
@@ -1686,17 +1639,17 @@ ruby_xml_node_parent_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.path => path
+ *    node.path -> path
  * 
  * Obtain this node's path.
  */
 VALUE
 ruby_xml_node_path(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlChar *path;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  path = xmlGetNodePath(rxn->node);
+  Data_Get_Struct(self, xmlNode, xnode);
+  path = xmlGetNodePath(xnode);
 
   if (path == NULL)
     return(Qnil);
@@ -1707,15 +1660,15 @@ ruby_xml_node_path(VALUE self) {
 
 /*
  * call-seq:
- *    node.pi? => (true|false)
+ *    node.pi? -> (true|false)
  * 
  * Determine whether this is a processing instruction node.
  */
 VALUE
 ruby_xml_node_pi_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_PI_NODE)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_PI_NODE)
     return(Qtrue);
   else
     return(Qfalse);
@@ -1724,7 +1677,7 @@ ruby_xml_node_pi_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.pointer => node_set
+ *    node.pointer -> node_set
  * 
  * Evaluates an XPointer expression relative to this node.
  */
@@ -1736,17 +1689,17 @@ ruby_xml_node_pointer(VALUE self, VALUE xptr_str) {
 
 /*
  * call-seq:
- *    node.prev => node
+ *    node.prev -> node
  * 
  * Obtain the previous sibling, if any.
  */
 VALUE
 ruby_xml_node_prev_get(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlNodePtr node;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (rxn->node->type) {
+  switch (xnode->type) {
   case XML_DOCUMENT_NODE:
 #ifdef LIBXML_DOCB_ENABLED
   case XML_DOCB_DOCUMENT_NODE:
@@ -1757,12 +1710,12 @@ ruby_xml_node_prev_get(VALUE self) {
     break;
   case XML_ATTRIBUTE_NODE:
     {
-      xmlAttrPtr attr = (xmlAttrPtr) rxn->node;
+      xmlAttrPtr attr = (xmlAttrPtr) xnode;
       node = (xmlNodePtr) attr->prev;
     }
     break;
   default:
-    node = rxn->node->prev;
+    node = xnode->prev;
     break;
   }
 
@@ -1775,18 +1728,18 @@ ruby_xml_node_prev_get(VALUE self) {
 
 /*
  * call-seq:
- *    node.prev? => (true|false)
+ *    node.prev? -> (true|false)
  * 
  * Determines whether this node has a previous sibling node.
  */
 VALUE
 ruby_xml_node_prev_q(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlNodePtr node;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (rxn->node->type) {
+  switch (xnode->type) {
   case XML_DOCUMENT_NODE:
 #ifdef LIBXML_DOCB_ENABLED
   case XML_DOCB_DOCUMENT_NODE:
@@ -1797,12 +1750,12 @@ ruby_xml_node_prev_q(VALUE self) {
     break;
   case XML_ATTRIBUTE_NODE:
     {
-      xmlAttrPtr attr = (xmlAttrPtr) rxn->node;
+      xmlAttrPtr attr = (xmlAttrPtr) xnode;
       node = (xmlNodePtr) attr->prev;
     }
     break;
   default:
-    node = rxn->node->prev;
+    node = xnode->prev;
     break;
   }
 
@@ -1821,16 +1774,15 @@ ruby_xml_node_prev_q(VALUE self) {
  */
 VALUE
 ruby_xml_node_prev_set(VALUE self, VALUE rnode) {
-  ruby_xml_node *cnode, *pnode;
-  xmlNodePtr ret;
+  xmlNodePtr cnode, pnode, ret;
 
   if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
     rb_raise(rb_eTypeError, "Must pass an XML::Node object");
 
-  Data_Get_Struct(self,  ruby_xml_node, pnode);
-  Data_Get_Struct(rnode, ruby_xml_node, cnode);
+  Data_Get_Struct(self,  xmlNode, pnode);
+  Data_Get_Struct(rnode, xmlNode, cnode);
 
-  ret = xmlAddPrevSibling(pnode->node, cnode->node);
+  ret = xmlAddPrevSibling(pnode, cnode);
   if (ret == NULL)
     rb_raise(eXMLNodeFailedModify, "unable to add a sibling to the document");
 
@@ -1840,105 +1792,61 @@ ruby_xml_node_prev_set(VALUE self, VALUE rnode) {
 
 /*
  * call-seq:
- *    node.property("name") => "string"
- *    node["name"]          => "string"
+ *    node.attributes -> attributes
  * 
- * Obtain the named property.
+ * Returns the XML::Attributes for this node. 
  */
 VALUE
-ruby_xml_node_property_get(VALUE self, VALUE prop) {
-  ruby_xml_node *rxn;
-  xmlChar *p;
-  VALUE result = Qnil;
-  
-  prop = check_string_or_symbol( prop );
-  
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  p = xmlGetProp(rxn->node, (xmlChar*)StringValuePtr(prop));
+ruby_xml_node_attributes_get(VALUE self) {
+  xmlNodePtr xnode;
 
-  if (p) {
-    result = rb_str_new2((const char*)p);
-    xmlFree(p);
+  Data_Get_Struct(self, xmlNode, xnode);
+
+  if (xnode->type == XML_ELEMENT_NODE) {
+    return ruby_xml_attributes_new(xnode);
+  } else {
+    return(Qnil);
   }
-  
-  return result;
 }
 
-
 /*
  * call-seq:
- *    node["name"] = "string"
+ *    node.property("name") -> "string"
+ *    node["name"]          -> "string"
  * 
- * Set the named property.
+ * Obtain the named property.
  */
 VALUE
-ruby_xml_node_property_set(VALUE self, VALUE key, VALUE val) {
-  ruby_xml_node *node;
-  xmlAttrPtr attr;
-
-  key = check_string_or_symbol( key );
-  Data_Get_Struct(self, ruby_xml_node, node); 
-  
-  if( val == Qnil ) {
-    attr = xmlSetProp(node->node, (xmlChar*)StringValuePtr(key), NULL);
-    if (attr->_private == NULL)
-      xmlRemoveProp( attr );
-    else
-      xmlUnlinkNode( attr );
-    return Qnil;
-  } else {
-    Check_Type(val, T_STRING);
-  }
-  
-  attr = xmlSetProp(node->node, (xmlChar*)StringValuePtr(key), (xmlChar*)StringValuePtr(val));
-  if (attr == NULL) {
-    attr = xmlNewProp(node->node, (xmlChar*)StringValuePtr(key), (xmlChar*)StringValuePtr(val));
-    if (attr == NULL)
-      return(Qnil);
-  }
-  return(ruby_xml_attr_new(cXMLAttr, attr));
+ruby_xml_node_property_get(VALUE self, VALUE name) {
+  VALUE attributes = ruby_xml_node_attributes_get(self);
+  return ruby_xml_attributes_attribute_get(attributes, name);
 }
 
-
 /*
  * call-seq:
- *    node.properties => attributes
+ *    node["name"] = "string"
  * 
- * Returns the +XML::Attr+ for this node. 
+ * Set the named property.
  */
 VALUE
-ruby_xml_node_properties_get(VALUE self) {
-  ruby_xml_node *node;
-  xmlAttrPtr attr;
-
-  Data_Get_Struct(self, ruby_xml_node, node);
-
-  if (node->node->type == XML_ELEMENT_NODE) {
-    attr = node->node->properties;
-    
-    if (attr == NULL) {
-      return(Qnil);
-    } else {
-      return(ruby_xml_attr_wrap(cXMLAttr, attr));
-    }
-  } else {
-    return(Qnil);
-  }
+ruby_xml_node_property_set(VALUE self, VALUE name, VALUE value) {
+  VALUE attributes = ruby_xml_node_attributes_get(self);
+  return ruby_xml_attributes_attribute_set(attributes, name, value);
 }
 
 
 /*
  * call-seq:
- *    node.properties? => (true|false)
+ *    node.attributes? -> (true|false)
  * 
  * Determine whether this node has properties
  * (attributes).
  */
 VALUE
-ruby_xml_node_properties_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_ELEMENT_NODE && rxn->node->properties != NULL)
+ruby_xml_node_attributes_q(VALUE self) {
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_ELEMENT_NODE && xnode->properties != NULL)
     return(Qtrue);
   else
     return(Qfalse);
@@ -1947,75 +1855,71 @@ ruby_xml_node_properties_q(VALUE self) {
 
 /*
  * call-seq:
-*    node.remove! => nil
+*    node.remove! -> nil
 *
 * Removes this node from it's parent.
 */
 VALUE
 ruby_xml_node_remove_ex(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  xmlUnlinkNode(rxn->node);
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  xmlUnlinkNode(xnode);
   return(Qnil);
 }
 
 
 /*
  * call-seq:
- *    node.search_href => namespace
+ *    node.search_href -> namespace
  * 
  * Search for a namespace by href.
  */
 VALUE
 ruby_xml_node_search_href(VALUE self, VALUE href) {
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
 
   Check_Type(href, T_STRING);
-  Data_Get_Struct(self, ruby_xml_node, node);
-  return(ruby_xml_ns_new2(cXMLNS, ruby_xml_document_wrap(node->node->doc),
-			  xmlSearchNsByHref(node->node->doc, node->node,
+  Data_Get_Struct(self, xmlNode, xnode);
+  return(ruby_xml_ns_wrap(xmlSearchNsByHref(xnode->doc, xnode,
 					    (xmlChar*)StringValuePtr(href))));
 }
 
 
 /*
  * call-seq:
- *    node.search_ns => namespace
+ *    node.search_ns -> namespace
  * 
  * Search for a namespace by namespace.
  */
 VALUE
 ruby_xml_node_search_ns(VALUE self, VALUE ns) {
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
 
   Check_Type(ns, T_STRING);
-  Data_Get_Struct(self, ruby_xml_node, node);
-  return(ruby_xml_ns_new2(cXMLNS,
-			  ruby_xml_document_wrap(node->node->doc),
-			  xmlSearchNs(node->node->doc, node->node,
-				      (xmlChar*)StringValuePtr(ns))));
+  Data_Get_Struct(self, xmlNode, xnode);
+  return(ruby_xml_ns_wrap(xmlSearchNs(xnode->doc, xnode,
+			              (xmlChar*)StringValuePtr(ns))));
 }
 
 
 /*
  * call-seq:
- *    node.sibling(node) => node
+ *    node.sibling(node) -> node
  * 
  * Add the specified node as a sibling of this node.
  */
 VALUE
 ruby_xml_node_sibling_set(VALUE self, VALUE rnode) {
-  ruby_xml_node *cnode, *pnode;
-  xmlNodePtr ret;
+  xmlNodePtr cnode, pnode, ret;
   VALUE obj;
 
   if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
     rb_raise(rb_eTypeError, "Must pass an XML::Node object");
 
-  Data_Get_Struct(self,  ruby_xml_node, pnode);
-  Data_Get_Struct(rnode, ruby_xml_node, cnode);
+  Data_Get_Struct(self,  xmlNode, pnode);
+  Data_Get_Struct(rnode, xmlNode, cnode);
 
-  ret = xmlAddSibling(pnode->node, cnode->node);
+  ret = xmlAddSibling(pnode, cnode);
   if (ret == NULL)
     rb_raise(eXMLNodeFailedModify, "unable to add a sibling to the document");
   if (ret->_private==NULL)
@@ -2029,16 +1933,16 @@ ruby_xml_node_sibling_set(VALUE self, VALUE rnode) {
 
 /*
  * call-seq:
- *    node.space_preserve => (true|false)
+ *    node.space_preserve -> (true|false)
  * 
  * Determine whether this node preserves whitespace.
  */
 VALUE
 ruby_xml_node_space_preserve_get(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  return(INT2NUM(xmlNodeGetSpacePreserve(rxn->node)));
+  Data_Get_Struct(self, xmlNode, xnode);
+  return(INT2NUM(xmlNodeGetSpacePreserve(xnode)));
 }
 
 
@@ -2050,13 +1954,13 @@ ruby_xml_node_space_preserve_get(VALUE self) {
  */
 VALUE
 ruby_xml_node_space_preserve_set(VALUE self, VALUE bool) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
 
   if (TYPE(bool) == T_FALSE)
-    xmlNodeSetSpacePreserve(rxn->node, 1);
+    xmlNodeSetSpacePreserve(xnode, 1);
   else
-    xmlNodeSetSpacePreserve(rxn->node, 0);
+    xmlNodeSetSpacePreserve(xnode, 0);
 
   return(Qnil);
 }
@@ -2064,37 +1968,37 @@ ruby_xml_node_space_preserve_set(VALUE self, VALUE bool) {
 
 /*
  * call-seq:
- *    node.text? => (true|false)
+ *    node.text? -> (true|false)
  * 
  * Determine whether this node has text.
  */
 VALUE
 ruby_xml_node_text_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node == NULL)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode == NULL)
     return(Qnil);
 
-  return((xmlNodeIsText(rxn->node) == 1) ? Qtrue : Qfalse);
+  return((xmlNodeIsText(xnode) == 1) ? Qtrue : Qfalse);
 }
 
 
 /*
  * call-seq:
- *    node.to_s => "string"
+ *    node.to_s -> "string"
  * 
  * Coerce this node to a string representation of
  * it's XML.
  */
 VALUE
 ruby_xml_node_to_s(VALUE self) {
-  ruby_xml_node *rxn;
+  xmlNodePtr xnode;
   xmlBufferPtr buf;
   VALUE result;
 
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(self, xmlNode, xnode);
   buf = xmlBufferCreate();
-  xmlNodeDump(buf, rxn->node->doc, rxn->node, 0, 1);
+  xmlNodeDump(buf, xnode->doc, xnode, 0, 1);
   result = rb_str_new2((const char*)buf->content);
   
   xmlBufferFree(buf);
@@ -2104,30 +2008,30 @@ ruby_xml_node_to_s(VALUE self) {
 
 /*
  * call-seq:
- *    node.type => num
+ *    node.type -> num
  * 
  * Obtain this node's type identifier.
  */
 VALUE
 ruby_xml_node_type(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  return(INT2NUM(rxn->node->type));
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  return(INT2NUM(xnode->type));
 }
 
 
 /*
  * call-seq:
- *    node.type_name => num
+ *    node.type_name -> num
  * 
  * Obtain this node's type name.
  */
 VALUE
 ruby_xml_node_type_name(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
 
-  switch(rxn->node->type) {
+  switch(xnode->type) {
   case XML_ELEMENT_NODE:
     return(rb_str_new2("element"));
   case XML_ATTRIBUTE_NODE:
@@ -2173,7 +2077,7 @@ ruby_xml_node_type_name(VALUE self) {
     return(rb_str_new2("document_docbook"));
 #endif
   default:
-    rb_raise(eXMLNodeUnknownType, "Unknown node type: %n", rxn->node->type);
+    rb_raise(eXMLNodeUnknownType, "Unknown node type: %n", xnode->type);
     return(Qfalse);
   }
 }
@@ -2181,15 +2085,15 @@ ruby_xml_node_type_name(VALUE self) {
 
 /*
  * call-seq:
- *    node.xinclude_end? => num
+ *    node.xinclude_end? -> num
  * 
  * Determine whether this node is an xinclude end node.
  */
 VALUE
 ruby_xml_node_xinclude_end_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_XINCLUDE_END)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_XINCLUDE_END)
     return(Qtrue);
   else
     return(Qfalse);
@@ -2198,15 +2102,15 @@ ruby_xml_node_xinclude_end_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.xinclude_start? => num
+ *    node.xinclude_start? -> num
  * 
  * Determine whether this node is an xinclude start node.
  */
 VALUE
 ruby_xml_node_xinclude_start_q(VALUE self) {
-  ruby_xml_node *rxn;
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_XINCLUDE_START)
+  xmlNodePtr xnode;
+  Data_Get_Struct(self, xmlNode, xnode);
+  if (xnode->type == XML_XINCLUDE_START)
     return(Qtrue);
   else
     return(Qfalse);
@@ -2215,30 +2119,28 @@ ruby_xml_node_xinclude_start_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.copy => node
+ *    node.copy -> node
  * 
  * Create a copy of this node.
  */
 VALUE
 ruby_xml_node_copy(VALUE self, VALUE deep) {
-  ruby_xml_node *rxn;
-  xmlNode *copy;
-  VALUE obj;
-
-  Data_Get_Struct(self, ruby_xml_node, rxn);
-  copy = xmlCopyNode( rxn->node, ((deep==Qnil)||(deep==Qfalse))?0:1 );
+  xmlNodePtr xnode;
+  xmlNodePtr xcopy;
+  int recursive = (deep==Qnil || deep==Qfalse) ? 0 : 1;
+  Data_Get_Struct(self, xmlNode, xnode);
+  
+  xcopy = xmlCopyNode(xnode, recursive);
 
-  if (copy == NULL)
+  if (xcopy)
+    return ruby_xml_node2_wrap(cXMLNode, xcopy);
+  else
     return Qnil;
-
-  obj=ruby_xml_node2_wrap(cXMLNode,copy);
-  copy->_private = (void*) obj;
-  return obj;
 }
 
  /*
  * call-seq: 
- *    XML::Node.new_text(content = nil) => node
+ *    XML::Node.new_text(content = nil) -> node
  * 
  * Create a new text node, optionally setting
  * the node's content.
@@ -2272,12 +2174,13 @@ ruby_xml_node_registerNode(xmlNodePtr node)
 }
 
 void
-ruby_xml_node_deregisterNode(xmlNodePtr node)
+ruby_xml_node_deregisterNode(xmlNodePtr xnode)
 {
-  ruby_xml_node *rxn;
-  if ( node->_private==NULL ) return;
-  Data_Get_Struct(node->_private, ruby_xml_node, rxn);
-  rxn->node=NULL;
+  VALUE node;
+  
+  if (xnode->_private==NULL ) return;
+  node = (VALUE)xnode->_private;
+  DATA_PTR(node) = NULL;
 }
 
 // Rdoc needs to know 
@@ -2327,6 +2230,8 @@ ruby_init_xml_node(void) {
   rb_define_method(cXMLNode, "[]=", ruby_xml_node_property_set, 2);
   rb_define_method(cXMLNode, "attribute?", ruby_xml_node_attribute_q, 0);
   rb_define_method(cXMLNode, "attribute_decl?", ruby_xml_node_attribute_decl_q, 0);
+  rb_define_method(cXMLNode, "attributes", ruby_xml_node_attributes_get, 0);
+  rb_define_method(cXMLNode, "attributes?", ruby_xml_node_attributes_q, 0);
   rb_define_method(cXMLNode, "base", ruby_xml_node_base_get, 0);
   rb_define_method(cXMLNode, "base=", ruby_xml_node_base_set, 1);
   rb_define_method(cXMLNode, "blank?", ruby_xml_node_empty_q, 0);
@@ -2358,7 +2263,6 @@ ruby_init_xml_node(void) {
   rb_define_method(cXMLNode, "find", ruby_xml_node_find, -1);
   rb_define_method(cXMLNode, "find_first", ruby_xml_node_find_first, -1);
   rb_define_method(cXMLNode, "fragment?", ruby_xml_node_fragment_q, 0);
-  rb_define_method(cXMLNode, "hash", ruby_xml_node_hash, 0);
   rb_define_method(cXMLNode, "html_doc?", ruby_xml_node_html_doc_q, 0);
   rb_define_method(cXMLNode, "lang", ruby_xml_node_lang_get, 0);
   rb_define_method(cXMLNode, "lang=", ruby_xml_node_lang_set, 1);
@@ -2389,9 +2293,6 @@ ruby_init_xml_node(void) {
   rb_define_method(cXMLNode, "prev", ruby_xml_node_prev_get, 0);
   rb_define_method(cXMLNode, "prev?", ruby_xml_node_prev_q, 0);
   rb_define_method(cXMLNode, "prev=", ruby_xml_node_prev_set, 1);
-  rb_define_method(cXMLNode, "property", ruby_xml_node_property_get, 1);
-  rb_define_method(cXMLNode, "properties", ruby_xml_node_properties_get, 0);
-  rb_define_method(cXMLNode, "properties?", ruby_xml_node_properties_q, 0);
   rb_define_method(cXMLNode, "remove!", ruby_xml_node_remove_ex, 0);
   rb_define_method(cXMLNode, "search_ns", ruby_xml_node_search_ns, 1);
   rb_define_method(cXMLNode, "search_href", ruby_xml_node_search_href, 1);
@@ -2405,6 +2306,7 @@ ruby_init_xml_node(void) {
   rb_define_method(cXMLNode, "xlink?", ruby_xml_node_xlink_q, 0);
   rb_define_method(cXMLNode, "xlink_type", ruby_xml_node_xlink_type, 0);
   rb_define_method(cXMLNode, "xlink_type_name", ruby_xml_node_xlink_type_name, 0);
-
+  
   rb_define_alias(cXMLNode, "==", "eql?");
+  rb_define_alias(cXMLNode, "properties?", "attributes?");
 }