1 files changed, 28 insertions, 29 deletions

diff --git a/testdata/integration/user_defined_syntax/math.osml b/testdata/integration/user_defined_syntax/math.osml
index 664aa84..c864d2b 100644
--- a/testdata/integration/user_defined_syntax/math.osml
+++ b/testdata/integration/user_defined_syntax/math.osml
@@ -50,18 +50,13 @@
 	%{
 		Basic mathematical commands, sum, product, fraction, square root
 	}%
-	\struct#sum[isa=primitive]
-		\field
-			\childRef[ref=limits]
-	\struct#prod[isa=primitive]
-		\field
-			\childRef[ref=limits]
-	\struct#int[isa=primitive]
-		\field
-			\childRef[ref=limits]
-	\struct#iint[isa=primitive]
+	\struct#mathop[isa=primitive]
 		\field
 			\childRef[ref=limits]
+	\struct#sum[isa=mathop]
+	\struct#prod[isa=mathop]
+	\struct#int[isa=mathop]
+	\struct#iint[isa=mathop]
 	\struct#frac[isa=primitive]
 		\field#denominator[subtree=true,optional=false]
 			\childRef[ref=primitive]
@@ -157,50 +152,54 @@
 	%{
 		Arrows
 	}%
-	\struct#to[isa=primitive]
+	\struct#arrow[isa=primitive]
+	\struct#to[isa=arrow]
 		\syntax
 			\short{->}
-	\struct#mapsto[isa=primitive]
+	\struct#mapsto[isa=arrow]
 		\syntax
 			\short{|->}
 
-	\struct#leftarrow[isa=primitive]
+	\struct#leftarrow[isa=arrow]
 		\syntax
 			\short{<--}
-	\struct#Leftarrow[isa=primitive]
+	\struct#Leftarrow[isa=arrow]
 		\syntax
 			\short{<==}
-	\struct#rightarrow[isa=primitive]
+	\struct#rightarrow[isa=arrow]
 		\syntax
 			\short{-->}
-	\struct#Leftrightarrow[isa=primitive]
+	\struct#Leftrightarrow[isa=arrow]
 		\syntax
 			\short{<=>}
-	\struct#leftrightarrow[isa=primitive]
+	\struct#leftrightarrow[isa=arrow]
 		\syntax
 			\short{<->}
-	\struct#uparrow[isa=primitive]
-	\struct#Uparrow[isa=primitive]
-	\struct#downarrow[isa=primitive]
-	\struct#Downarrow[isa=primitive]
-	\struct#updownarrow[isa=primitive]
-	\struct#Updownarrow[isa=primitive]
+	\struct#uparrow[isa=arrow]
+	\struct#Uparrow[isa=arrow]
+	\struct#downarrow[isa=arrow]
+	\struct#Downarrow[isa=arrow]
+	\struct#updownarrow[isa=arrow]
+	\struct#Updownarrow[isa=arrow]
 
-	\struct#longleftarrow[isa=primitive]
+	\struct#longleftarrow[isa=arrow]
 		\syntax
 			\short{<---}
-	\struct#Longleftarrow[isa=primitive]
+	\struct#Longleftarrow[isa=arrow]
 		\syntax
 			\short{<===}
-	\struct#longrightarrow[isa=primitive]
+	\struct#longrightarrow[isa=arrow]
 		\syntax
 			\short{--->}
-	\struct#longleftrightarrow[isa=primitive]
+	\struct#Longrightarrow[isa=arrow]
 		\syntax
-			\short{<==>}
-	\struct#Longleftrightarrow[isa=primitive]
+			\short{===>}
+	\struct#longleftrightarrow[isa=arrow]
 		\syntax
 			\short{<-->}
+	\struct#Longleftrightarrow[isa=arrow]
+		\syntax
+			\short{<==>}
 
 	\struct#number[isa=primitive,transparent=true]
 		\primitive[type=int]