From 416f15ba10aa942acc19fa0ea5ea0509b6741ee3 Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Wed, 15 Apr 2015 15:20:15 +0200
Subject: added variable definition struct to math ontology.

---
 data/ontology/math.osml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/data/ontology/math.osml b/data/ontology/math.osml
index 83d852b..34e3128 100644
--- a/data/ontology/math.osml
+++ b/data/ontology/math.osml
@@ -40,8 +40,17 @@
 	%{
 		Variables and functions
 	}%
+	\struct#def[isa=primitive]
+		\field#representation[subtree=true, optional=true]
+			\childRef[ref=primitive]
+			% this should rather be a field incorporating text elements
+		\primitive#shortDescription[subtree=true, type=string, optional=true]
+		\primitive#description[type=string, optional=true]
+
 	\struct#var[isa=primitive]
-		\primitive#name[type=string]
+		\syntax
+			\short[greedy=false]{$}
+		\primitive#ref[type=@def]
 	\struct#fun[isa=primitive]
 		\primitive#name[subtree=true,type=string,optional=false]
 		\field#arguments[subtree=true,optional=true]
@@ -79,12 +88,12 @@
 	% TODO: Differentiate between lower and upper index vs. power operator?
 	\struct#power[isa=primitive]
 		\syntax
-			\short{^}
+			\short[greedy=false]{^}
 		\field
 			\childRef[ref=primitive]
 	\struct#index[isa=primitive]
 		\syntax
-			\short{_}
+			\short[greedy=false]{_}
 		\field
 			\childRef[ref=primitive]
 
@@ -214,12 +223,12 @@
 			\childRef[ref=upperLimit]
 	\struct#lowerLimit[cardinality={0,1}]
 		\syntax
-			\short{_}
+			\short[greedy=false]{_}
 		\field
 			\childRef[ref=primitive]
 	\struct#upperLimit[cardinality={0,1}]
 		\syntax
-			\short{^}
+			\short[greedy=false]{^}
 		\field
 			\childRef[ref=primitive]
 
-- 
cgit v1.2.3