6 files changed, 376 insertions, 16 deletions
diff --git a/test/data/parse2/INDEX b/test/data/parse2/INDEX
index 331cf5c..59dc83b 100644
--- a/test/data/parse2/INDEX
+++ b/test/data/parse2/INDEX
@@ -16,6 +16,7 @@ border.dat			Border property tests
 font.dat			Font property tests
 list.dat			List property tests
 margin.dat			Margin property tests
+mq.dat				Media queries
 outline.dat			Outline property tests
 overflow.dat			Overflow property tests
 padding.dat			Padding property tests
@@ -23,3 +24,5 @@ multicol.dat			Multi-column layout property tests
 flexbox.dat			Flexbox properties and shorthands tests
 units.dat			Length unit tests
 dodgy-media-block.dat		Media block with incomplete ruleset
+svg.dat				SVG property tests
+calc.dat			calc() tests
diff --git a/test/data/parse2/calc.dat b/test/data/parse2/calc.dat
new file mode 100644
index 0000000..f743411
--- /dev/null
+++ b/test/data/parse2/calc.dat
@@ -0,0 +1,195 @@
+#data
+* { height: calc(50vh + 10px)}
+#errors
+#expected
+| *
+|  height: /* -> 0px */ calc(50vh 10px + =)
+#reset
+
+#data
+* { line-height: calc(50vh + 10px)}
+#errors
+#expected
+| *
+|  line-height: /* -> 0any */ calc(50vh 10px + =)
+#reset
+
+#data
+* { line-height: calc( / 2)}
+#errors
+#expected
+| *
+#reset
+
+#data
+* { line-height: calc( + 2)}
+#errors
+#expected
+| *
+#reset
+
+#data
+* { line-height: calc(2 / 2px)}
+#errors
+#expected
+| *
+#reset
+
+#data
+* { width: calc(50vh + 10px)}
+#errors
+#expected
+| *
+|  width: /* -> 0px */ calc(50vh 10px + =)
+#reset
+
+#data
+* { z-index: calc(2 * 3)}
+#errors
+#expected
+| *
+|  z-index: /* -> 0number */ calc(2 3 * =)
+#reset
+
+#data
+* { z-index: calc(4 + 5 / 9)}
+#errors
+#expected
+| *
+|  z-index: /* -> 0number */ calc(4 5 9 / + =)
+#reset
+
+#data
+* { z-index: calc(1 + 2 + 3 + 4)}
+#errors
+#expected
+| *
+|  z-index: /* -> 0number */ calc(1 2 + 3 + 4 + =)
+#reset
+
+#data
+* { z-index: calc(1 + 2 * 3 + 4)}
+#errors
+#expected
+| *
+|  z-index: /* -> 0number */ calc(1 2 3 * + 4 + =)
+#reset
+
+#data
+* { z-index: calc((1 + 2) * (3 + 4))}
+#errors
+#expected
+| *
+|  z-index: /* -> 0number */ calc(1 2 + 3 4 + * =)
+#reset
+
+#data
+* { z-index: calc(1 + 2}
+#errors
+#expected
+| *
+#reset
+
+#data
+* { z-index: calc(}
+#errors
+#expected
+| *
+#reset
+
+#data
+* { z-index: calc}
+#errors
+#expected
+| *
+#reset
+
+#data
+* { z-index: calc (1 + 2)}
+#errors
+#expected
+| *
+#reset
+
+#data
+* { z-index: calc(1)}
+#errors
+#expected
+| *
+|  z-index: /* -> 0number */ calc(1 =)
+#reset
+
+#data
+* { z-index: calc()}
+#errors
+#expected
+| *
+#reset
+
+#data
+* { z-index: calc((1 + 2)}
+#errors
+#expected
+| *
+#reset
+
+#data
+* { z-index: calc(((1 + 2)))}
+#errors
+#expected
+| *
+|  z-index: /* -> 0number */ calc(1 2 + =)
+#reset
+
+#data
+* { z-index: calc( ( ( 1 + 2 ) ) )}
+#errors
+#expected
+| *
+|  z-index: /* -> 0number */ calc(1 2 + =)
+#reset
+
+#data
+* { z-index: calc( ( 3 / ( 1 + 2 ) ) )}
+#errors
+#expected
+| *
+#reset
+
+#data
+* { width: calc(50vh + 10hz)}
+#errors
+#expected
+| *
+#reset
+
+#data
+* { width: calc(50% + 10px)}
+#errors
+#expected
+| *
+|  width: /* -> 0px */ calc(50% 10px + =)
+#reset
+
+#data
+* { word-spacing: calc(50% + 10px)}
+#errors
+#expected
+| *
+#reset
+
+#data
+* { word-spacing: calc(0.4em + 10px)}
+#errors
+#expected
+| *
+|  word-spacing: /* -> 0px */ calc(0.400em 10px + =)
+#reset
+
+#data
+* { width: calc(1em + 1px) !important }
+#errors
+#expected
+| *
+|  width: /* -> 0px */ calc(1em 1px + =) !important
+#reset
diff --git a/test/data/parse2/dodgy-media-block.dat b/test/data/parse2/dodgy-media-block.dat
index 61179c3..4b6c220 100644
--- a/test/data/parse2/dodgy-media-block.dat
+++ b/test/data/parse2/dodgy-media-block.dat
@@ -2,7 +2,7 @@
 @media only screen { dodgy } .outer { top: 0px }
 #errors
 #expected
-| @media 
+| @media 040
 |  dodgy
 | .outer
 |  top: 0px
diff --git a/test/data/parse2/eof.dat b/test/data/parse2/eof.dat
index 2f238d7..7fc4ab7 100644
--- a/test/data/parse2/eof.dat
+++ b/test/data/parse2/eof.dat
@@ -180,49 +180,49 @@ f{clear:both}
 @media screen
 #errors
 #expected
-| @media 
+| @media 040
 #reset
 
 #data
 @media screen 
 #errors
 #expected
-| @media 
+| @media 040
 #reset
 
 #data
 @media screen{
 #errors
 #expected
-| @media 
+| @media 040
 #reset
 
 #data
 @media screen{ 
 #errors
 #expected
-| @media 
+| @media 040
 #reset
 
 #data
 @media screen{{
 #errors
 #expected
-| @media 
+| @media 040
 #reset
 
 #data
 @media screen{;
 #errors
 #expected
-| @media 
+| @media 040
 #reset
 
 #data
 @media screen{f
 #errors
 #expected
-| @media 
+| @media 040
 |  f
 #reset
 
@@ -230,7 +230,7 @@ f{clear:both}
 @media screen{f{
 #errors
 #expected
-| @media 
+| @media 040
 |  f
 #reset
 
@@ -238,7 +238,7 @@ f{clear:both}
 @media screen{f{color
 #errors
 #expected
-| @media 
+| @media 040
 |  f
 #reset
 
@@ -246,7 +246,7 @@ f{clear:both}
 @media screen{f{color:
 #errors
 #expected
-| @media 
+| @media 040
 |  f
 #reset
 
@@ -254,7 +254,7 @@ f{clear:both}
 @media screen{f{color:blue
 #errors
 #expected
-| @media 
+| @media 040
 |  f
 |   color: #ff0000ff
 #reset
@@ -263,7 +263,7 @@ f{clear:both}
 @media screen{f{color:blue;
 #errors
 #expected
-| @media 
+| @media 040
 |  f
 |   color: #ff0000ff
 #reset
@@ -272,7 +272,7 @@ f{clear:both}
 @media screen{f{color:blue}
 #errors
 #expected
-| @media 
+| @media 040
 |  f
 |   color: #ff0000ff
 #reset
@@ -281,7 +281,7 @@ f{clear:both}
 @media screen{f{color:blue;}
 #errors
 #expected
-| @media 
+| @media 040
 |  f
 |   color: #ff0000ff
 #reset
@@ -290,7 +290,7 @@ f{clear:both}
 @media screen{f{color:blue;}}
 #errors
 #expected
-| @media 
+| @media 040
 |  f
 |   color: #ff0000ff
 #reset
diff --git a/test/data/parse2/mq.dat b/test/data/parse2/mq.dat
new file mode 100644
index 0000000..5119d35
--- /dev/null
+++ b/test/data/parse2/mq.dat
@@ -0,0 +1,83 @@
+#data
+@media not
+#errors
+#expected
+| @media not 3ff
+#reset
+
+#data
+@media and
+#errors
+#expected
+| @media not 3ff
+#reset
+
+#data
+@media or
+#errors
+#expected
+| @media not 3ff
+#reset
+
+#data
+@media only
+#errors
+#expected
+| @media not 3ff
+#reset
+
+#data
+@media only not
+#errors
+#expected
+| @media not 3ff
+#reset
+
+#data
+@media only only
+#errors
+#expected
+| @media not 3ff
+#reset
+
+#data
+@media not not
+#errors
+#expected
+| @media not 3ff
+#reset
+
+#data
+@media not only
+#errors
+#expected
+| @media not 3ff
+#reset
+
+#data
+@media screen
+#errors
+#expected
+| @media 040
+#reset
+
+#data
+@media unknown
+#errors
+#expected
+| @media 000
+#reset
+
+#data
+@media not unknown
+#errors
+#expected
+| @media not 000
+#reset
+
+#data
+@media (color)
+#errors
+#expected
+| @media 3ff
+#reset
diff --git a/test/data/parse2/svg.dat b/test/data/parse2/svg.dat
new file mode 100644
index 0000000..e5ee2a3
--- /dev/null
+++ b/test/data/parse2/svg.dat
@@ -0,0 +1,79 @@
+#data
+* { fill-opacity: inherit; }
+#errors
+#expected
+| *
+|  fill-opacity: inherit
+#reset
+
+#data
+* { fill-opacity: revert; }
+#errors
+#expected
+| *
+|  fill-opacity: revert
+#reset
+
+#data
+* { fill-opacity: 0.867; }
+#errors
+#expected
+| *
+|  fill-opacity: 0.867
+#reset
+
+#data
+* { fill-opacity: -0.5; }
+#errors
+#expected
+| *
+|  fill-opacity: 0
+#reset
+
+#data
+* { fill-opacity: 5; }
+#errors
+#expected
+| *
+|  fill-opacity: 1
+#reset
+
+#data
+* { stroke-opacity: inherit; }
+#errors
+#expected
+| *
+|  stroke-opacity: inherit
+#reset
+
+#data
+* { stroke-opacity: revert; }
+#errors
+#expected
+| *
+|  stroke-opacity: revert
+#reset
+
+#data
+* { stroke-opacity: 0.00000; }
+#errors
+#expected
+| *
+|  stroke-opacity: 0
+#reset
+
+#data
+* { stroke-opacity: -0.5; }
+#errors
+#expected
+| *
+|  stroke-opacity: 0
+#reset
+
+#data
+* { stroke-opacity: 5; }
+#errors
+#expected
+| *
+|  stroke-opacity: 1
+#reset