Renamed RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE to

RAPTOR_FEATURE_PREFIX_ELEMENTS (prefixElements) and change meaning;
it always declares prefix: and default namespace but this option
flips whether it core vocab is in the prefixed or default namespace.

9 files changed, 30 insertions, 33 deletions

diff --git a/src/raptor.h b/src/raptor.h
index 5fbc173e..4ae84f82 100644
--- a/src/raptor.h
+++ b/src/raptor.h
@@ -393,7 +393,7 @@ typedef struct {
  * @RAPTOR_FEATURE_JSON_EXTRA_DATA: JSON serializer extra top-level data
  * @RAPTOR_FEATURE_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples it finds (none, rdf-xml, atom-triples)
  * @RAPTOR_FEATURE_ATOM_ENTRY_URI: Atom entry URI.  If given, generate an Atom Entry Document with the item having the given URI, otherwise generate an Atom Feed Document with any items found.
- * @RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE: Integer. If set, generate a prefixed namespace declaration for the default namespace as well as an unprefixed one.
+ * @RAPTOR_FEATURE_PREFIX_ELEMENTS: Integer. If set, generate Atom/RSS1.0 documents with prefixed elements, otherwise unprefixed.
  * @RAPTOR_FEATURE_LAST: Internal
  *
  * Raptor parser, serializer or XML writer features.
@@ -434,8 +434,8 @@ typedef enum {
   RAPTOR_FEATURE_JSON_EXTRA_DATA,
   RAPTOR_FEATURE_RSS_TRIPLES,
   RAPTOR_FEATURE_ATOM_ENTRY_URI,
-  RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE,
-  RAPTOR_FEATURE_LAST = RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE
+  RAPTOR_FEATURE_PREFIX_ELEMENTS,
+  RAPTOR_FEATURE_LAST = RAPTOR_FEATURE_PREFIX_ELEMENTS
 } raptor_feature;
 
 
diff --git a/src/raptor_feature.c b/src/raptor_feature.c
index 8921e748..a1beee76 100644
--- a/src/raptor_feature.c
+++ b/src/raptor_feature.c
@@ -90,7 +90,7 @@ static const struct
   { RAPTOR_FEATURE_JSON_EXTRA_DATA   , 6,  "jsonExtraData", "JSON serializer extra data" },
   { RAPTOR_FEATURE_RSS_TRIPLES       , 6,  "rssTriples", "Atom/RSS serializer writes extra RDF triples" },
   { RAPTOR_FEATURE_ATOM_ENTRY_URI    , 6,  "atomEntryUri", "Atom serializer Entry URI" },
-  { RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE , 2,  "aliasDefaultNamespace", "Atom/RSS1.0 serializers alias default namespace" }
+  { RAPTOR_FEATURE_PREFIX_ELEMENTS   , 2,  "prefixElements", "Atom/RSS serializers write namespace-prefixed elements" }
 };
 
 
diff --git a/src/raptor_internal.h b/src/raptor_internal.h
index fb1aeefc..baff35d5 100644
--- a/src/raptor_internal.h
+++ b/src/raptor_internal.h
@@ -573,9 +573,9 @@ struct raptor_serializer_s {
   unsigned char *feature_atom_entry_uri;
 
   /* FEATURE:
-   * Alias default namespace with a prefixed declaration too.
+   * Namespace-prefix elements OR prefer unprefixed elements.
    */
-  int feature_alias_default_namespace;
+  int feature_prefix_elements;
 };
 
 
diff --git a/src/raptor_parse.c b/src/raptor_parse.c
index cbbae2ba..aa120ef3 100644
--- a/src/raptor_parse.c
+++ b/src/raptor_parse.c
@@ -1467,7 +1467,7 @@ raptor_set_feature(raptor_parser *parser, raptor_feature feature, int value)
     case RAPTOR_FEATURE_JSON_EXTRA_DATA:
     case RAPTOR_FEATURE_RSS_TRIPLES:
     case RAPTOR_FEATURE_ATOM_ENTRY_URI:
-    case RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE:
+    case RAPTOR_FEATURE_PREFIX_ELEMENTS:
       
     case RAPTOR_FEATURE_WWW_HTTP_CACHE_CONTROL:
     case RAPTOR_FEATURE_WWW_HTTP_USER_AGENT:
@@ -1582,7 +1582,7 @@ raptor_get_feature(raptor_parser *parser, raptor_feature feature)
     case RAPTOR_FEATURE_JSON_EXTRA_DATA:
     case RAPTOR_FEATURE_RSS_TRIPLES:
     case RAPTOR_FEATURE_ATOM_ENTRY_URI:
-    case RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE:
+    case RAPTOR_FEATURE_PREFIX_ELEMENTS:
 
     /* XML writer features */
     case RAPTOR_FEATURE_WRITER_AUTO_INDENT:
diff --git a/src/raptor_sax2.c b/src/raptor_sax2.c
index 75ba7aaf..aeb549d5 100644
--- a/src/raptor_sax2.c
+++ b/src/raptor_sax2.c
@@ -736,7 +736,7 @@ raptor_sax2_set_feature(raptor_sax2 *sax2, raptor_feature feature, int value)
     case RAPTOR_FEATURE_JSON_EXTRA_DATA:
     case RAPTOR_FEATURE_RSS_TRIPLES:
     case RAPTOR_FEATURE_ATOM_ENTRY_URI:
-    case RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE:
+    case RAPTOR_FEATURE_PREFIX_ELEMENTS:
     
     /* Turtle serializer feature */
     case RAPTOR_FEATURE_WRITE_BASE_URI:
diff --git a/src/raptor_serialize.c b/src/raptor_serialize.c
index d1c073e8..8e040ae5 100644
--- a/src/raptor_serialize.c
+++ b/src/raptor_serialize.c
@@ -487,8 +487,8 @@ raptor_new_serializer_v2(raptor_world* world, const char *name)
   /* Atom entry URI */
   rdf_serializer->feature_atom_entry_uri= NULL;
 
-  /* Declare default namespace with a prefix too */
-  rdf_serializer->feature_alias_default_namespace = 1;
+  /* Prefix elements with a namespace */
+  rdf_serializer->feature_prefix_elements = 0;
 
   if(factory->init(rdf_serializer, name)) {
     raptor_free_serializer(rdf_serializer);
@@ -952,8 +952,8 @@ raptor_serializer_set_feature(raptor_serializer *serializer,
       serializer->feature_write_xml_declaration = value;
       break;
 
-    case RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE:
-      serializer->feature_alias_default_namespace = value;
+    case RAPTOR_FEATURE_PREFIX_ELEMENTS:
+      serializer->feature_prefix_elements = value;
       break;
 
     /* parser features */
@@ -1058,7 +1058,7 @@ raptor_serializer_set_feature_string(raptor_serializer *serializer,
 
     case RAPTOR_FEATURE_WRITE_BASE_URI:
     case RAPTOR_FEATURE_RELATIVE_URIS:
-    case RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE:
+    case RAPTOR_FEATURE_PREFIX_ELEMENTS:
       /* actually handled above because value_is_string is false */
       return -1;
       break;
@@ -1192,8 +1192,8 @@ raptor_serializer_get_feature(raptor_serializer *serializer,
       result= -1;
       break;
 
-    case RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE:
-      result = serializer->feature_alias_default_namespace;
+    case RAPTOR_FEATURE_PREFIX_ELEMENTS:
+      result = serializer->feature_prefix_elements;
       break;
       
     case RAPTOR_FEATURE_WRITER_XML_VERSION:
@@ -1302,7 +1302,7 @@ raptor_serializer_get_feature_string(raptor_serializer *serializer,
     case RAPTOR_FEATURE_ATOM_ENTRY_URI:
       return (unsigned char *)(serializer->feature_atom_entry_uri);
       break;
-    case RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE:
+    case RAPTOR_FEATURE_PREFIX_ELEMENTS:
       return NULL;
       break;
         
diff --git a/src/raptor_serialize_rss.c b/src/raptor_serialize_rss.c
index 2466509e..8e4c6112 100644
--- a/src/raptor_serialize_rss.c
+++ b/src/raptor_serialize_rss.c
@@ -1003,7 +1003,7 @@ raptor_rss10_build_xml_names(raptor_serializer *serializer, int is_entry)
   }
   item_node_type = &raptor_rss_items_info[item_node_typei];
 
-  if(serializer->feature_alias_default_namespace)
+  if(serializer->feature_prefix_elements)
     /* declare this NS with standard prefix */
     default_prefix = (const unsigned char*)raptor_rss_namespaces_info[default_ns_id].prefix;
   else
@@ -1013,7 +1013,7 @@ raptor_rss10_build_xml_names(raptor_serializer *serializer, int is_entry)
                                                         default_prefix, ns_uri,
                                                         0);
   rss_serializer->free_default_nspace = 1;
-  if(serializer->feature_alias_default_namespace) {
+  if(serializer->feature_prefix_elements) {
     rss_serializer->nspaces[default_ns_id] = rss_serializer->default_nspace;
     rss_serializer->free_default_nspace = 0;
   }
@@ -1034,12 +1034,8 @@ raptor_rss10_build_xml_names(raptor_serializer *serializer, int is_entry)
       continue;
     
     if(i == default_ns_id) {
-      if(!serializer->feature_alias_default_namespace)
-        /* declare this NS with no prefix */
+      if(serializer->feature_prefix_elements)
         prefix = NULL;
-      else
-        /* this namespace was made an alias of the default namespace above */
-        continue;
     }
     
     if(uri) {
@@ -1068,19 +1064,20 @@ raptor_rss10_build_xml_names(raptor_serializer *serializer, int is_entry)
     const unsigned char *prefix;
 
     prefix = (const unsigned char*)raptor_rss_namespaces_info[i].prefix;
-    if(!prefix)
+    if(!prefix && i != default_ns_id)
       continue;
 
-    if(i == default_ns_id &&
-       !serializer->feature_alias_default_namespace)
-      continue;
-    
     if(rss_serializer->nspaces[i])
       raptor_xml_element_declare_namespace(element, rss_serializer->nspaces[i]);
   }
   for(i = 0; i < raptor_sequence_size(rss_serializer->user_namespaces); i++) {
     raptor_namespace* nspace;
     nspace = (raptor_namespace*)raptor_sequence_get_at(rss_serializer->user_namespaces, i);
+
+    /* Ignore user setting default namespace prefix */
+    if(!nspace->prefix)
+      continue;
+    
     raptor_xml_element_declare_namespace(element, nspace);
   }
 
diff --git a/src/raptor_turtle_writer.c b/src/raptor_turtle_writer.c
index d3f6bf7c..c1fbf5b7 100644
--- a/src/raptor_turtle_writer.c
+++ b/src/raptor_turtle_writer.c
@@ -754,7 +754,7 @@ raptor_turtle_writer_set_feature(raptor_turtle_writer *turtle_writer,
     case RAPTOR_FEATURE_JSON_EXTRA_DATA:
     case RAPTOR_FEATURE_RSS_TRIPLES:
     case RAPTOR_FEATURE_ATOM_ENTRY_URI:
-    case RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE:
+    case RAPTOR_FEATURE_PREFIX_ELEMENTS:
     
     /* Turtle serializer feature */
     case RAPTOR_FEATURE_WRITE_BASE_URI:
@@ -868,7 +868,7 @@ raptor_turtle_writer_get_feature(raptor_turtle_writer *turtle_writer,
     case RAPTOR_FEATURE_JSON_EXTRA_DATA:
     case RAPTOR_FEATURE_RSS_TRIPLES:
     case RAPTOR_FEATURE_ATOM_ENTRY_URI:
-    case RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE:
+    case RAPTOR_FEATURE_PREFIX_ELEMENTS:
     
     /* Turtle serializer feature */
     case RAPTOR_FEATURE_WRITE_BASE_URI:
diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
index a03fe4b7..051f3b37 100644
--- a/src/raptor_xml_writer.c
+++ b/src/raptor_xml_writer.c
@@ -991,7 +991,7 @@ raptor_xml_writer_set_feature(raptor_xml_writer *xml_writer,
     case RAPTOR_FEATURE_JSON_EXTRA_DATA:
     case RAPTOR_FEATURE_RSS_TRIPLES:
     case RAPTOR_FEATURE_ATOM_ENTRY_URI:
-    case RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE:
+    case RAPTOR_FEATURE_PREFIX_ELEMENTS:
     
     /* Turtle serializer feature */
     case RAPTOR_FEATURE_WRITE_BASE_URI:
@@ -1112,7 +1112,7 @@ raptor_xml_writer_get_feature(raptor_xml_writer *xml_writer,
     case RAPTOR_FEATURE_JSON_EXTRA_DATA:
     case RAPTOR_FEATURE_RSS_TRIPLES:
     case RAPTOR_FEATURE_ATOM_ENTRY_URI:
-    case RAPTOR_FEATURE_ALIAS_DEFAULT_NAMESPACE:
+    case RAPTOR_FEATURE_PREFIX_ELEMENTS:
     
     /* Turtle serializer feature */
     case RAPTOR_FEATURE_WRITE_BASE_URI: