Got impressum working, after a multi-hour struggle

1 files changed, 40 insertions, 7 deletions

diff --git a/ontology/webpage.osml b/ontology/webpage.osml
index d92d652..e413b91 100644
--- a/ontology/webpage.osml
+++ b/ontology/webpage.osml
@@ -17,6 +17,7 @@
 		\childRef[ref=section]
 
 % Primitve text
+\struct#block
 \struct#primitive
 \struct#text[isa=primitive,transparent=true]
 	\primitive[type=string]
@@ -28,18 +29,20 @@
 	\field#subtitle[subtree=true,optional=true]
 		\childRef[ref=primitive]
 	\field
-		\childRef[ref=paragraph]
+		\childRef[ref=block]
 		\childRef[ref=subsection]
 
-% Paragraph
-\struct#paragraph[transparent=true]
-	\field
-		\childRef[ref=primitive]
-
 % Subsection
 \struct#subsection
+	\field#subtitle[subtree=true,optional=false]
+		\childRef[ref=primitive]
 	\field
-		\childRef[ref=paragraph]
+		\childRef[ref=block]
+
+% Paragraph
+\struct#paragraph[isa=block,transparent=true]
+	\field
+		\childRef[ref=primitive]
 
 % Masthead, Pitch
 \struct#masthead[isa=section]
@@ -67,5 +70,35 @@
 	\field
 		\childRef[ref=primitive]
 
+% addresses
+
+\struct#contact[isa=block,transparent=true]
+	\field
+		\childRef[ref=address]
+		\childRef[ref=phone]
+		\childRef[ref=mail]
+
+\struct#address
+	\primitive#name[type=string,subtree=true]
+	\primitive#street[type=string,subtree=true]
+	\primitive#number[type=int,subtree=true]
+	\primitive#plz[type=string,subtree=true]
+	\primitive#city[type=string,subtree=true]
+
+\typesystem#phone{
+	\enum#phone-type
+		\entry{office}
+		\entry{home}
+		\entry{mobile}
+}
+
+\struct#phone
+	\attributes
+		\attribute#type[type=phone-type]
+	\primitive#number[type=string]
+
+\struct#mail
+	\primitive[type=string]
+
 \end{ontology}