Interned string cleanup, phase 2: Create utils/corestrings and use it in css handler.

1 files changed, 150 insertions, 148 deletions

diff --git a/css/select.c b/css/select.c
index a92c47601..5c620b1ed 100644
--- a/css/select.c
+++ b/css/select.c
@@ -28,6 +28,7 @@
 #include "css/utils.h"
 #include "desktop/gui.h"
 #include "desktop/options.h"
+#include "utils/corestrings.h"
 #include "utils/log.h"
 #include "utils/url.h"
 #include "utils/utils.h"
@@ -1515,9 +1516,10 @@ css_error node_is_link(void *pw, void *n, bool *match)
 		return CSS_NOMEM;
 	}
 
-	if (dom_string_caseless_lwc_isequal(node_name, nscss_lwc_string_a)) {
+	if (dom_string_caseless_lwc_isequal(node_name, corestring_lwc_a)) {
 		bool has_href;
-		exc = dom_element_has_attribute(node, nscss_dom_string_href, &has_href); 
+		exc = dom_element_has_attribute(node, corestring_dom_href,
+				&has_href); 
 		if ((exc == DOM_NO_ERR) && (has_href)) {
 			*match = true;
 		} else {
@@ -1751,31 +1753,31 @@ node_presentational_hint_vertical_align(nscss_select_ctx *ctx,
 	if (err != DOM_NO_ERR)
 		return CSS_PROPERTY_NOT_SET;
 
-	if (dom_string_caseless_lwc_isequal(name, nscss_lwc_string_col) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_thead) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_tbody) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_tfoot) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_tr) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_td) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_th)) {
+	if (dom_string_caseless_lwc_isequal(name, corestring_lwc_col) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_thead) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_tbody) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_tfoot) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_tr) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_td) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_th)) {
 		err = dom_element_get_attribute(node, 
-				nscss_dom_string_valign, &valign);
+				corestring_dom_valign, &valign);
 		if (err != DOM_NO_ERR || valign == NULL) {
 			dom_string_unref(name);
 			return CSS_PROPERTY_NOT_SET;
 		}
 
 		if (dom_string_caseless_lwc_isequal(valign,
-				nscss_lwc_string_top)) {
+				corestring_lwc_top)) {
 			hint->status = CSS_VERTICAL_ALIGN_TOP;
 		} else if (dom_string_caseless_lwc_isequal(valign,
-					nscss_lwc_string_middle)) {
+					corestring_lwc_middle)) {
 			hint->status = CSS_VERTICAL_ALIGN_MIDDLE;
 		} else if (dom_string_caseless_lwc_isequal(valign,
-					nscss_lwc_string_bottom)) {
+					corestring_lwc_bottom)) {
 			hint->status = CSS_VERTICAL_ALIGN_BOTTOM;
 		} else if (dom_string_caseless_lwc_isequal(valign,
-					nscss_lwc_string_baseline)) {
+					corestring_lwc_baseline)) {
 			hint->status = CSS_VERTICAL_ALIGN_BASELINE;
 		} else {
 			dom_string_unref(valign);
@@ -1788,38 +1790,38 @@ node_presentational_hint_vertical_align(nscss_select_ctx *ctx,
 
 		return CSS_OK;
 	} else if (dom_string_caseless_lwc_isequal(name,
-				nscss_lwc_string_applet) ||
+				corestring_lwc_applet) ||
 		   dom_string_caseless_lwc_isequal(name,
-		   		nscss_lwc_string_embed) ||
+		   		corestring_lwc_embed) ||
 		   dom_string_caseless_lwc_isequal(name,
-		   		nscss_lwc_string_iframe) ||
+		   		corestring_lwc_iframe) ||
 		   dom_string_caseless_lwc_isequal(name,
-		   		nscss_lwc_string_img) ||
+		   		corestring_lwc_img) ||
 		   dom_string_caseless_lwc_isequal(name,
-		   		nscss_lwc_string_object)) {
+		   		corestring_lwc_object)) {
 		/** \todo input[type=image][align=*] - $11.3.3 */
 		err = dom_element_get_attribute(node, 
-				nscss_dom_string_align, &valign);
+				corestring_dom_align, &valign);
 		if (err != DOM_NO_ERR || valign == NULL) {
 			dom_string_unref(name);
 			return CSS_PROPERTY_NOT_SET;
 		}
 
 		if (dom_string_caseless_lwc_isequal(valign,
-				nscss_lwc_string_top)) {
+				corestring_lwc_top)) {
 			hint->status = CSS_VERTICAL_ALIGN_TOP;
 		} else if (dom_string_caseless_lwc_isequal(valign,
-					nscss_lwc_string_bottom) ||
+					corestring_lwc_bottom) ||
 			   dom_string_caseless_lwc_isequal(valign,
-					nscss_lwc_string_baseline)) {
+					corestring_lwc_baseline)) {
 			hint->status = CSS_VERTICAL_ALIGN_BASELINE;
 		} else if (dom_string_caseless_lwc_isequal(valign,
-					nscss_lwc_string_texttop)) {
+					corestring_lwc_texttop)) {
 			hint->status = CSS_VERTICAL_ALIGN_TEXT_TOP;
 		} else if (dom_string_caseless_lwc_isequal(valign,
-					nscss_lwc_string_absmiddle) ||
+					corestring_lwc_absmiddle) ||
 			   dom_string_caseless_lwc_isequal(valign,
-					nscss_lwc_string_abscenter)) {
+					corestring_lwc_abscenter)) {
 			hint->status = CSS_VERTICAL_ALIGN_MIDDLE;
 		} else {
 			dom_string_unref(valign);
@@ -1850,31 +1852,31 @@ node_presentational_hint_text_align(nscss_select_ctx *ctx,
 	if (err != DOM_NO_ERR)
 		return CSS_PROPERTY_NOT_SET;
 
-	if (dom_string_caseless_lwc_isequal(name, nscss_lwc_string_p) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_h1) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_h2) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_h3) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_h4) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_h5) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_h6)) {
+	if (dom_string_caseless_lwc_isequal(name, corestring_lwc_p) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_h1) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_h2) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_h3) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_h4) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_h5) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_h6)) {
 		err = dom_element_get_attribute(node,
-				nscss_dom_string_align, &align);
+				corestring_dom_align, &align);
 		if (err != DOM_NO_ERR || align == NULL) {
 			dom_string_unref(name);
 			return CSS_PROPERTY_NOT_SET;
 		}
 
 		if (dom_string_caseless_lwc_isequal(align,
-				nscss_lwc_string_left)) {
+				corestring_lwc_left)) {
 			hint->status = CSS_TEXT_ALIGN_LEFT;
 		} else if (dom_string_caseless_lwc_isequal(align,
-					nscss_lwc_string_center)) {
+					corestring_lwc_center)) {
 			hint->status = CSS_TEXT_ALIGN_CENTER;
 		} else if (dom_string_caseless_lwc_isequal(align,
-					nscss_lwc_string_right)) {
+					corestring_lwc_right)) {
 			hint->status = CSS_TEXT_ALIGN_RIGHT;
 		} else if (dom_string_caseless_lwc_isequal(align,
-					nscss_lwc_string_justify)) {
+					corestring_lwc_justify)) {
 			hint->status = CSS_TEXT_ALIGN_JUSTIFY;
 		} else {
 			dom_string_unref(align);
@@ -1887,32 +1889,32 @@ node_presentational_hint_text_align(nscss_select_ctx *ctx,
 
 		return CSS_OK;
 	} else if (dom_string_caseless_lwc_isequal(name,
-				nscss_lwc_string_center)) {
+				corestring_lwc_center)) {
 		hint->status = CSS_TEXT_ALIGN_LIBCSS_CENTER;
 
 		dom_string_unref(name);
 
 		return CSS_OK;
 	} else if (dom_string_caseless_lwc_isequal(name,
-				nscss_lwc_string_caption)) {
+				corestring_lwc_caption)) {
 		err = dom_element_get_attribute(node,
-				nscss_dom_string_align, &align);
+				corestring_dom_align, &align);
 		if (err != DOM_NO_ERR) {
 			dom_string_unref(name);
 			return CSS_PROPERTY_NOT_SET;
 		}
 
 		if (align == NULL || dom_string_caseless_lwc_isequal(align,
-				nscss_lwc_string_center)) {
+				corestring_lwc_center)) {
 			hint->status = CSS_TEXT_ALIGN_LIBCSS_CENTER;
 		} else if (dom_string_caseless_lwc_isequal(align,
-					nscss_lwc_string_left)) {
+					corestring_lwc_left)) {
 			hint->status = CSS_TEXT_ALIGN_LIBCSS_LEFT;
 		} else if (dom_string_caseless_lwc_isequal(align,
-					nscss_lwc_string_right)) {
+					corestring_lwc_right)) {
 			hint->status = CSS_TEXT_ALIGN_LIBCSS_RIGHT;
 		} else if (dom_string_caseless_lwc_isequal(align,
-					nscss_lwc_string_justify)) {
+					corestring_lwc_justify)) {
 			hint->status = CSS_TEXT_ALIGN_JUSTIFY;
 		} else {
 			dom_string_unref(align);
@@ -1926,37 +1928,37 @@ node_presentational_hint_text_align(nscss_select_ctx *ctx,
 
 		return CSS_OK;
 	} else if (dom_string_caseless_lwc_isequal(name,
-				nscss_lwc_string_div) ||
+				corestring_lwc_div) ||
 		   dom_string_caseless_lwc_isequal(name,
-		   		nscss_lwc_string_thead) ||
+		   		corestring_lwc_thead) ||
 		   dom_string_caseless_lwc_isequal(name,
-		   		nscss_lwc_string_tbody) ||
+		   		corestring_lwc_tbody) ||
 		   dom_string_caseless_lwc_isequal(name,
-		   		nscss_lwc_string_tfoot) ||
+		   		corestring_lwc_tfoot) ||
 		   dom_string_caseless_lwc_isequal(name,
-		   		nscss_lwc_string_tr) ||
+		   		corestring_lwc_tr) ||
 		   dom_string_caseless_lwc_isequal(name,
-		   		nscss_lwc_string_td) ||
+		   		corestring_lwc_td) ||
 		   dom_string_caseless_lwc_isequal(name,
-		   		nscss_lwc_string_th)) {
+		   		corestring_lwc_th)) {
 		err = dom_element_get_attribute(node,
-				nscss_dom_string_align, &align);
+				corestring_dom_align, &align);
 		if (err != DOM_NO_ERR || align == NULL) {
 			dom_string_unref(name);
 			return CSS_PROPERTY_NOT_SET;
 		}
 
 		if (dom_string_caseless_lwc_isequal(align,
-					nscss_lwc_string_center)) {
+					corestring_lwc_center)) {
 			hint->status = CSS_TEXT_ALIGN_LIBCSS_CENTER;
 		} else if (dom_string_caseless_lwc_isequal(align,
-					nscss_lwc_string_left)) {
+					corestring_lwc_left)) {
 			hint->status = CSS_TEXT_ALIGN_LIBCSS_LEFT;
 		} else if (dom_string_caseless_lwc_isequal(align,
-					nscss_lwc_string_right)) {
+					corestring_lwc_right)) {
 			hint->status = CSS_TEXT_ALIGN_LIBCSS_RIGHT;
 		} else if (dom_string_caseless_lwc_isequal(align,
-					nscss_lwc_string_justify)) {
+					corestring_lwc_justify)) {
 			hint->status = CSS_TEXT_ALIGN_JUSTIFY;
 		} else {
 			dom_string_unref(align);
@@ -1969,7 +1971,7 @@ node_presentational_hint_text_align(nscss_select_ctx *ctx,
 
 		return CSS_OK;
 	} else if (dom_string_caseless_lwc_isequal(name,
-			nscss_lwc_string_table)) {
+			corestring_lwc_table)) {
 		/* Tables usually reset alignment */
 		hint->status = CSS_TEXT_ALIGN_INHERIT_IF_NON_MAGIC;
 
@@ -1997,12 +1999,12 @@ node_presentational_hint_padding_trbl(nscss_select_ctx *ctx,
 	if (exc != DOM_NO_ERR)
 		return CSS_BADPARM;
 	
-	if (dom_string_caseless_lwc_isequal(name, nscss_lwc_string_td) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_th)) {
+	if (dom_string_caseless_lwc_isequal(name, corestring_lwc_td) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_th)) {
 		css_qname qs;
 		dom_node *tablenode = NULL;
 		qs.ns = NULL;
-		qs.name = lwc_string_ref(nscss_lwc_string_table);
+		qs.name = lwc_string_ref(corestring_lwc_table);
 		if (named_ancestor_node(ctx, node, &qs, 
 					(void *)&tablenode) != CSS_OK) {
 			/* Didn't find, or had error */
@@ -2014,7 +2016,7 @@ node_presentational_hint_padding_trbl(nscss_select_ctx *ctx,
 		
 		if (tablenode != NULL) {
 			exc = dom_element_get_attribute(tablenode,
-					nscss_dom_string_cellpadding,
+					corestring_dom_cellpadding,
 					&cellpadding);
 			if (exc != DOM_NO_ERR) {
 				dom_string_unref(name);
@@ -2056,11 +2058,11 @@ node_presentational_hint_margin_rl(nscss_select_ctx *ctx,
 	if (exc != DOM_NO_ERR)
 		return CSS_BADPARM;
 	
-	if (dom_string_caseless_lwc_isequal(n, nscss_lwc_string_img) ||
-	    dom_string_caseless_lwc_isequal(n, nscss_lwc_string_applet)) {
+	if (dom_string_caseless_lwc_isequal(n, corestring_lwc_img) ||
+	    dom_string_caseless_lwc_isequal(n, corestring_lwc_applet)) {
 		dom_string_unref(n);
 		exc = dom_element_get_attribute(node,
-				nscss_dom_string_hspace, &n);
+				corestring_dom_hspace, &n);
 		if (exc != DOM_NO_ERR) {
 			return CSS_BADPARM;
 		}
@@ -2078,11 +2080,11 @@ node_presentational_hint_margin_rl(nscss_select_ctx *ctx,
 		}
 		dom_string_unref(n);
 		return CSS_OK;
-	} else if (dom_string_caseless_lwc_isequal(n, nscss_lwc_string_table) ||
-		   dom_string_caseless_lwc_isequal(n, nscss_lwc_string_align)) {
+	} else if (dom_string_caseless_lwc_isequal(n, corestring_lwc_table) ||
+		   dom_string_caseless_lwc_isequal(n, corestring_lwc_align)) {
 		dom_string_unref(n);
 		exc = dom_element_get_attribute(node,
-				nscss_dom_string_align, &n);
+				corestring_dom_align, &n);
 		if (exc != DOM_NO_ERR) {
 			return CSS_BADPARM;
 		}
@@ -2091,13 +2093,13 @@ node_presentational_hint_margin_rl(nscss_select_ctx *ctx,
 			return CSS_PROPERTY_NOT_SET;
 		
 		if (dom_string_caseless_lwc_isequal(n,
-				nscss_lwc_string_center) ||
+				corestring_lwc_center) ||
 		    dom_string_caseless_lwc_isequal(n,
-		    		nscss_lwc_string_abscenter) ||
+		    		corestring_lwc_abscenter) ||
 		    dom_string_caseless_lwc_isequal(n,
-		    		nscss_lwc_string_middle) ||
+		    		corestring_lwc_middle) ||
 		    dom_string_caseless_lwc_isequal(n,
-		    		nscss_lwc_string_absmiddle)) {
+		    		corestring_lwc_absmiddle)) {
 			hint->status = CSS_MARGIN_AUTO;
 		} else {
 			dom_string_unref(n);
@@ -2106,10 +2108,10 @@ node_presentational_hint_margin_rl(nscss_select_ctx *ctx,
 		
 		dom_string_unref(n);
 		return CSS_OK;
-	} else if (dom_string_caseless_lwc_isequal(n, nscss_lwc_string_hr)) {
+	} else if (dom_string_caseless_lwc_isequal(n, corestring_lwc_hr)) {
 		dom_string_unref(n);
 		exc = dom_element_get_attribute(node,
-				nscss_dom_string_align, &n);
+				corestring_dom_align, &n);
 		if (exc != DOM_NO_ERR)
 			return CSS_BADPARM;
 		
@@ -2117,7 +2119,7 @@ node_presentational_hint_margin_rl(nscss_select_ctx *ctx,
 			return CSS_PROPERTY_NOT_SET;
 		
 		if (dom_string_caseless_lwc_isequal(n,
-				nscss_lwc_string_left)) {
+				corestring_lwc_left)) {
 			if (property == CSS_PROP_MARGIN_LEFT) {
 				hint->data.length.value = 0;
 				hint->data.length.unit = CSS_UNIT_PX;
@@ -2126,10 +2128,10 @@ node_presentational_hint_margin_rl(nscss_select_ctx *ctx,
 				hint->status = CSS_MARGIN_AUTO;
 			}
 		} else if (dom_string_caseless_lwc_isequal(n,
-				nscss_lwc_string_center)) {
+				corestring_lwc_center)) {
 			hint->status = CSS_MARGIN_AUTO;
 		} else if (dom_string_caseless_lwc_isequal(n,
-				nscss_lwc_string_right)) {
+				corestring_lwc_right)) {
 			if (property == CSS_PROP_MARGIN_RIGHT) {
 				hint->data.length.value = 0;
 				hint->data.length.unit = CSS_UNIT_PX;
@@ -2163,9 +2165,9 @@ node_presentational_hint_margin_tb(nscss_select_ctx *ctx,
 	if (exc != DOM_NO_ERR)
 		return CSS_BADPARM;
 	
-	if (dom_string_caseless_lwc_isequal(name, nscss_lwc_string_img) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_applet)) {
-		exc = dom_element_get_attribute(node, nscss_dom_string_vspace,
+	if (dom_string_caseless_lwc_isequal(name, corestring_lwc_img) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_applet)) {
+		exc = dom_element_get_attribute(node, corestring_dom_vspace,
 				&vspace);
 		if (exc != DOM_NO_ERR) {
 			dom_string_unref(name);
@@ -2206,12 +2208,12 @@ node_presentational_hint_border_trbl_width(nscss_select_ctx *ctx,
 	if (exc != DOM_NO_ERR)
 		return CSS_BADPARM;
 	
-	if (dom_string_caseless_lwc_isequal(name, nscss_lwc_string_td) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_th)) {
+	if (dom_string_caseless_lwc_isequal(name, corestring_lwc_td) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_th)) {
 		css_qname qs;
 		dom_node *tablenode = NULL;
 		qs.ns = NULL;
-		qs.name = lwc_string_ref(nscss_lwc_string_table);
+		qs.name = lwc_string_ref(corestring_lwc_table);
 		if (named_ancestor_node(ctx, node, &qs, 
 					(void *)&tablenode) != CSS_OK) {
 			/* Didn't find, or had error */
@@ -2223,7 +2225,7 @@ node_presentational_hint_border_trbl_width(nscss_select_ctx *ctx,
 		lwc_string_unref(qs.name);
 		if (tablenode != NULL) {
 			exc = dom_element_get_attribute(tablenode,
-					nscss_dom_string_border, &width);
+					corestring_dom_border, &width);
 			if (exc != DOM_NO_ERR) {
 				dom_string_unref(name);
 				return CSS_BADPARM;
@@ -2234,8 +2236,8 @@ node_presentational_hint_border_trbl_width(nscss_select_ctx *ctx,
 		 */
 		is_table_cell = true;
 	} else if (dom_string_caseless_lwc_isequal(name,
-				nscss_lwc_string_table)) {
-		exc = dom_element_get_attribute(node, nscss_dom_string_border,
+				corestring_lwc_table)) {
+		exc = dom_element_get_attribute(node, corestring_dom_border,
 				&width);
 		if (exc != DOM_NO_ERR) {
 			dom_string_unref(name);
@@ -2280,12 +2282,12 @@ node_presentational_hint_border_trbl_style(nscss_select_ctx *ctx,
 	if (exc != DOM_NO_ERR)
 		return CSS_BADPARM;
 
-	if (dom_string_caseless_lwc_isequal(name, nscss_lwc_string_td) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_th)) {
+	if (dom_string_caseless_lwc_isequal(name, corestring_lwc_td) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_th)) {
 		css_qname qs;
 		dom_node *tablenode = NULL;
 		qs.ns = NULL;
-		qs.name = lwc_string_ref(nscss_lwc_string_table);
+		qs.name = lwc_string_ref(corestring_lwc_table);
 
 		if (named_ancestor_node(ctx, node, &qs, 
 					(void *)&tablenode) != CSS_OK) {
@@ -2301,7 +2303,7 @@ node_presentational_hint_border_trbl_style(nscss_select_ctx *ctx,
 			bool has_border = false;
 
 			exc = dom_element_has_attribute(tablenode,
-							nscss_dom_string_border,
+							corestring_dom_border,
 							&has_border);
 			if (exc != DOM_NO_ERR) {
 				dom_string_unref(name);
@@ -2318,11 +2320,11 @@ node_presentational_hint_border_trbl_style(nscss_select_ctx *ctx,
 		 * return a reffed node to the CSS
 		 */
 	} else if (dom_string_caseless_lwc_isequal(name,
-			nscss_lwc_string_table)) {
+			corestring_lwc_table)) {
 		bool has_border = false;
 
 		exc = dom_element_has_attribute(node,
-						nscss_dom_string_border,
+						corestring_dom_border,
 						&has_border);
 		if (exc != DOM_NO_ERR) {
 			dom_string_unref(name);
@@ -2354,12 +2356,12 @@ node_presentational_hint_border_trbl_color(nscss_select_ctx *ctx,
 	if (err != DOM_NO_ERR)
 		return CSS_PROPERTY_NOT_SET;
 
-	if (dom_string_caseless_lwc_isequal(name, nscss_lwc_string_td) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_th)) {
+	if (dom_string_caseless_lwc_isequal(name, corestring_lwc_td) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_th)) {
 		css_qname qs;
 		dom_node *tablenode = NULL;
 		qs.ns = NULL;
-		qs.name = lwc_string_ref(nscss_lwc_string_table);
+		qs.name = lwc_string_ref(corestring_lwc_table);
 
 		if (named_ancestor_node(ctx, node, &qs, 
 					(void *)&tablenode) != CSS_OK) {
@@ -2373,7 +2375,7 @@ node_presentational_hint_border_trbl_color(nscss_select_ctx *ctx,
 
 		if (tablenode != NULL) {
 			err = dom_element_get_attribute(node, 
-					nscss_dom_string_bordercolor, 
+					corestring_dom_bordercolor, 
 					&bordercolor);
 		}
 		/* No need to unref tablenode, named_ancestor_node does not
@@ -2381,9 +2383,9 @@ node_presentational_hint_border_trbl_color(nscss_select_ctx *ctx,
 		 */
 
 	} else if (dom_string_caseless_lwc_isequal(name,
-			nscss_lwc_string_table)) {
+			corestring_lwc_table)) {
 		err = dom_element_get_attribute(node, 
-				nscss_dom_string_bordercolor, 
+				corestring_dom_bordercolor, 
 				&bordercolor);
 	}
 
@@ -2419,7 +2421,7 @@ node_presentational_hint_border_spacing(nscss_select_ctx *ctx,
 	}
 
 	if (!dom_string_caseless_lwc_isequal(node_name,
-			nscss_lwc_string_table)) {
+			corestring_lwc_table)) {
 		dom_string_unref(node_name);
 		return CSS_PROPERTY_NOT_SET;
 	}
@@ -2427,7 +2429,7 @@ node_presentational_hint_border_spacing(nscss_select_ctx *ctx,
 	dom_string_unref(node_name);
 
 	err = dom_element_get_attribute(node,
-			nscss_dom_string_cellspacing, &cellspacing);
+			corestring_dom_cellspacing, &cellspacing);
 	if ((err != DOM_NO_ERR) || (cellspacing == NULL)) {
 		return CSS_PROPERTY_NOT_SET;
 	}
@@ -2464,26 +2466,26 @@ node_presentational_hint_width(nscss_select_ctx *ctx,
 	if (err != DOM_NO_ERR)
 		return CSS_PROPERTY_NOT_SET;
 
-	if (dom_string_caseless_lwc_isequal(name, nscss_lwc_string_hr) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_iframe) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_img) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_object) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_table) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_td) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_th) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_applet)) {
+	if (dom_string_caseless_lwc_isequal(name, corestring_lwc_hr) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_iframe) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_img) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_object) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_table) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_td) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_th) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_applet)) {
 		err = dom_element_get_attribute(node, 
-				nscss_dom_string_width, &width);
+				corestring_dom_width, &width);
 	} else if (dom_string_caseless_lwc_isequal(name,
-				nscss_lwc_string_textarea)) {
+				corestring_lwc_textarea)) {
 		textarea = true;
 		err = dom_element_get_attribute(node, 
-				nscss_dom_string_cols, &width);
+				corestring_dom_cols, &width);
 	} else if (dom_string_caseless_lwc_isequal(name,
-			nscss_lwc_string_input)) {
+			corestring_lwc_input)) {
 		input = true;
 		err = dom_element_get_attribute(node, 
-				nscss_dom_string_size, &width);
+				corestring_dom_size, &width);
 	}
 
 	dom_string_unref(name);
@@ -2505,15 +2507,15 @@ node_presentational_hint_width(nscss_select_ctx *ctx,
 
 		if (input) {
 			err = dom_element_get_attribute(node,
-					nscss_dom_string_type, &width);
+					corestring_dom_type, &width);
 			if ((err != DOM_NO_ERR) || (width == NULL)) {
 				return CSS_PROPERTY_NOT_SET;
 			}
 
 			if (dom_string_lwc_isequal(width,
-					nscss_lwc_string_text) ||
+					corestring_lwc_text) ||
 			    dom_string_lwc_isequal(width,
-			    		nscss_lwc_string_password)) {
+			    		corestring_lwc_password)) {
 				hint->data.length.unit = CSS_UNIT_EX;
 
 			}
@@ -2544,20 +2546,20 @@ node_presentational_hint_height(nscss_select_ctx *ctx,
 	if (err != DOM_NO_ERR)
 		return CSS_PROPERTY_NOT_SET;
 
-	if (dom_string_caseless_lwc_isequal(name, nscss_lwc_string_iframe) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_td) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_th) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_tr) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_img) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_object) ||
-	    dom_string_caseless_lwc_isequal(name, nscss_lwc_string_applet)) {
+	if (dom_string_caseless_lwc_isequal(name, corestring_lwc_iframe) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_td) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_th) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_tr) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_img) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_object) ||
+	    dom_string_caseless_lwc_isequal(name, corestring_lwc_applet)) {
 		err = dom_element_get_attribute(node, 
-				nscss_dom_string_height, &height);
+				corestring_dom_height, &height);
 	} else if (dom_string_caseless_lwc_isequal(name,
-			nscss_lwc_string_textarea)) {
+			corestring_lwc_textarea)) {
 		textarea = true;
 		err = dom_element_get_attribute(node, 
-				nscss_dom_string_rows, &height);
+				corestring_dom_rows, &height);
 	}
 
 	dom_string_unref(name);
@@ -2599,14 +2601,14 @@ node_presentational_hint_font_size(nscss_select_ctx *ctx,
 	}
 
 	if (!dom_string_caseless_lwc_isequal(node_name,
-			nscss_lwc_string_font)) {
+			corestring_lwc_font)) {
 		dom_string_unref(node_name);
 		return CSS_PROPERTY_NOT_SET;
 	}
 
 	dom_string_unref(node_name);
 
-	err = dom_element_get_attribute(node, nscss_dom_string_align, &size);
+	err = dom_element_get_attribute(node, corestring_dom_align, &size);
 	if ((err != DOM_NO_ERR) || (size == NULL)) {
 		return CSS_PROPERTY_NOT_SET;
 	}
@@ -2639,31 +2641,31 @@ node_presentational_hint_float(nscss_select_ctx *ctx,
 
 	/** \todo input[type=image][align=*] - $11.3.3 */
 	if (!dom_string_caseless_lwc_isequal(node_name,
-			nscss_lwc_string_applet) &&
+			corestring_lwc_applet) &&
 	    !dom_string_caseless_lwc_isequal(node_name,
-	    		nscss_lwc_string_embed) &&
+	    		corestring_lwc_embed) &&
 	    !dom_string_caseless_lwc_isequal(node_name,
-	    		nscss_lwc_string_iframe) &&
+	    		corestring_lwc_iframe) &&
 	    !dom_string_caseless_lwc_isequal(node_name,
-	    		nscss_lwc_string_img) &&
+	    		corestring_lwc_img) &&
 	    !dom_string_caseless_lwc_isequal(node_name,
-	    		nscss_lwc_string_object)) {
+	    		corestring_lwc_object)) {
 		dom_string_unref(node_name);
 		return CSS_PROPERTY_NOT_SET;
 	}
 
 	dom_string_unref(node_name);
 
-	err = dom_element_get_attribute(node, nscss_dom_string_align, &align);
+	err = dom_element_get_attribute(node, corestring_dom_align, &align);
 	if ((err != DOM_NO_ERR) || (align == NULL)) {
 		return CSS_PROPERTY_NOT_SET;
 	}
 
-	if (dom_string_lwc_isequal(align, nscss_lwc_string_left)) {
+	if (dom_string_lwc_isequal(align, corestring_lwc_left)) {
 		hint->status = CSS_FLOAT_LEFT;
 		dom_string_unref(align);
 		return CSS_OK;
-	} else if (dom_string_lwc_isequal(align, nscss_lwc_string_right)) {
+	} else if (dom_string_lwc_isequal(align, corestring_lwc_right)) {
 		hint->status = CSS_FLOAT_RIGHT;
 		dom_string_unref(align);
 		return CSS_OK;
@@ -2689,14 +2691,14 @@ node_presentational_hint_color(nscss_select_ctx *ctx,
 		return CSS_NOMEM;
 	}
 
-	if (dom_string_caseless_lwc_isequal(node_name, nscss_lwc_string_a)) {
+	if (dom_string_caseless_lwc_isequal(node_name, corestring_lwc_a)) {
 		/* find body node */
 		css_qname qs;
 		dom_node *bodynode = NULL;
 		bool is_visited;
 
 		qs.ns = NULL;
-		qs.name = lwc_string_ref(nscss_lwc_string_body);
+		qs.name = lwc_string_ref(corestring_lwc_body);
 		if (named_ancestor_node(ctx, node, &qs, 
 					(void *)&bodynode) != CSS_OK) {
 			/* Didn't find, or had error */
@@ -2719,30 +2721,30 @@ node_presentational_hint_color(nscss_select_ctx *ctx,
 
 		if (is_visited) {
 			err = dom_element_get_attribute(node,
-					nscss_dom_string_vlink, &color);
+					corestring_dom_vlink, &color);
 			if ((err != DOM_NO_ERR) || (color == NULL)) {
 				dom_string_unref(node_name);
 				return CSS_PROPERTY_NOT_SET;
 			}
 		} else {
 			err = dom_element_get_attribute(node,
-					nscss_dom_string_link, &color);
+					corestring_dom_link, &color);
 			if ((err != DOM_NO_ERR) || (color == NULL)) {
 				dom_string_unref(node_name);
 				return CSS_PROPERTY_NOT_SET;
 			}
 		}
 	} else if (dom_string_caseless_lwc_isequal(node_name,
-			nscss_lwc_string_body)) {
+			corestring_lwc_body)) {
 		err = dom_element_get_attribute(node,
-				nscss_dom_string_text, &color);
+				corestring_dom_text, &color);
 		if ((err != DOM_NO_ERR) || (color == NULL)) {
 			dom_string_unref(node_name);
 			return CSS_PROPERTY_NOT_SET;
 		}
 	} else {
 		err = dom_element_get_attribute(node,
-				nscss_dom_string_color, &color);
+				corestring_dom_color, &color);
 		if ((err != DOM_NO_ERR) || (color == NULL)) {
 			dom_string_unref(node_name);
 			return CSS_PROPERTY_NOT_SET;
@@ -2777,19 +2779,19 @@ node_presentational_hint_caption_side(nscss_select_ctx *ctx,
 	}
 
 	if (!dom_string_caseless_lwc_isequal(node_name,
-			nscss_lwc_string_caption)) {
+			corestring_lwc_caption)) {
 		dom_string_unref(node_name);
 		return CSS_PROPERTY_NOT_SET;
 	}
 
 	dom_string_unref(node_name);
 
-	err = dom_element_get_attribute(node, nscss_dom_string_align, &align);
+	err = dom_element_get_attribute(node, corestring_dom_align, &align);
 	if ((err != DOM_NO_ERR) || (align == NULL)) {
 		return CSS_PROPERTY_NOT_SET;
 	}
 
-	if (dom_string_caseless_lwc_isequal(align, nscss_lwc_string_bottom)) {
+	if (dom_string_caseless_lwc_isequal(align, corestring_lwc_bottom)) {
 		hint->status = CSS_CAPTION_SIDE_BOTTOM;
 		dom_string_unref(align);
 		return CSS_OK;
@@ -2809,7 +2811,7 @@ node_presentational_hint_background_color(nscss_select_ctx *ctx,
 	dom_string *bgcolor;
 
 	err = dom_element_get_attribute(node,
-			nscss_dom_string_bgcolor, &bgcolor);
+			corestring_dom_bgcolor, &bgcolor);
 	if ((err != DOM_NO_ERR) || (bgcolor == NULL)) {
 		return CSS_PROPERTY_NOT_SET;
 	}
@@ -2839,7 +2841,7 @@ node_presentational_hint_background_image(nscss_select_ctx *ctx,
 	lwc_error lerror;
 
 	err = dom_element_get_attribute(node,
-			nscss_dom_string_background, &atr_val);
+			corestring_dom_background, &atr_val);
 	if ((err != DOM_NO_ERR) || (atr_val == NULL)) {
 		return CSS_PROPERTY_NOT_SET;
 	}