css: Add API to handle order when printing calc()

Also, add some tests and update old ones to print calc() statements
correctly.

3 files changed, 33 insertions, 1 deletions

diff --git a/testsuite/css/parser/Makefile.am b/testsuite/css/parser/Makefile.am
index 0cc0cce1b8..fcef07213a 100644
--- a/testsuite/css/parser/Makefile.am
+++ b/testsuite/css/parser/Makefile.am
@@ -227,6 +227,7 @@ test_data = \
         box-shadow.css \
         box-shadow.ref.css \
 	calc.css \
+	calc.ref.css \
 	calc-simple.css \
 	calc-simple.ref.css \
 	close-at-end-of-file.css \
diff --git a/testsuite/css/parser/calc.css b/testsuite/css/parser/calc.css
index 2c22095c7c..6e7bf54700 100644
--- a/testsuite/css/parser/calc.css
+++ b/testsuite/css/parser/calc.css
@@ -2,6 +2,18 @@ a {
   margin-left: calc(3px + 1em);
 }
 
-a {
+b {
   transition-duration: calc(1s - 100ms + -100ms);
 }
+
+c {
+  margin-left: calc(-2px + 1em +    4px);
+}
+
+d {
+  background-size: calc( 100% - 10px );
+}
+
+e {
+  border-left-width: calc(1px + 1px);
+}
diff --git a/testsuite/css/parser/calc.ref.css b/testsuite/css/parser/calc.ref.css
new file mode 100644
index 0000000000..4e858f70c8
--- /dev/null
+++ b/testsuite/css/parser/calc.ref.css
@@ -0,0 +1,19 @@
+a {
+  margin-left: calc(1em + 3px);
+}
+
+b {
+  transition-duration: calc(-200ms + 1s);
+}
+
+c {
+  margin-left: calc(1em + 2px);
+}
+
+d {
+  background-size: calc(-10px + 100%);
+}
+
+e {
+  border-left-width: 2px;
+}