4 files changed, 17 insertions, 6 deletions
diff --git a/src/core/CSS.cpp b/src/core/CSS.cpp
index c3900e8..d131fec 100644
--- a/src/core/CSS.cpp
+++ b/src/core/CSS.cpp
@@ -20,6 +20,12 @@
 
 namespace ousia {
 
+void RuleSet::merge(Rooted<RuleSet> other){
+	for(auto& o : other->rules){
+		rules[o.first] = o.second;
+	}
+}
+
 /*
  * different versions of "getChildren".
  */
diff --git a/src/core/CSS.hpp b/src/core/CSS.hpp
index 4cf15be..aa701b5 100644
--- a/src/core/CSS.hpp
+++ b/src/core/CSS.hpp
@@ -85,10 +85,11 @@ public:
 		return rules;
 	}
 
-	void merge(Rooted<RuleSet> other)
-	{
-		rules.insert(other->rules.begin(), other->rules.end());
-	}
+	/**
+	 * This implements an overriding "insert all" of all rules in the other
+	 * RuleSet to the rules in this RuleSet.
+	 */
+	void merge(Rooted<RuleSet> other);
 };
 
 /**
diff --git a/src/core/Tokenizer.hpp b/src/core/Tokenizer.hpp
index 4aebf56..8f80150 100644
--- a/src/core/Tokenizer.hpp
+++ b/src/core/Tokenizer.hpp
@@ -225,6 +225,8 @@ public:
 	void consumePeek();
 
 	const BufferedCharReader &getInput() const { return input; }
+	
+	BufferedCharReader &getInput() { return input; }
 };
 }
 
diff --git a/src/plugins/css/CSSParser.cpp b/src/plugins/css/CSSParser.cpp
index 82ed7e1..fc37184 100644
--- a/src/plugins/css/CSSParser.cpp
+++ b/src/plugins/css/CSSParser.cpp
@@ -18,6 +18,8 @@
 
 #include "CSSParser.hpp"
 
+#include <core/variant/Reader.hpp>
+
 namespace ousia {
 namespace parser {
 namespace css {
@@ -330,8 +332,8 @@ bool CSSParser::parseRule(CodeTokenizer &tokenizer, ParserContext &ctx,
 	expect(COLON, tokenizer, t, true, ctx);
 	// then the value
 	// TODO: Resolve key for appropriate parsing function here.
-	expect(STRING, tokenizer, t, true, ctx);
-	value = variant::Variant(t.content.c_str());
+	value = variant::Reader::parseGeneric(tokenizer.getInput(), ctx.logger,
+	                                      {';'}).second;
 	// and a ;
 	expect(SEMICOLON, tokenizer, t, true, ctx);
 	return true;