2 files changed, 49 insertions, 37 deletions
diff --git a/server/NOTES b/server/NOTES
index 17f8eb0..9f72b34 100644
--- a/server/NOTES
+++ b/server/NOTES
@@ -1,3 +1,10 @@
+############
+# Ordliste #
+############
+ forløb:   course
+ makro:    macro
+ skabelon: template
+
 #######################################
 # Navngivning af markoerne i requests #
 #######################################
diff --git a/server/xml/example2.xml b/server/xml/example2.xml
index 075fdbd..42f4755 100644
--- a/server/xml/example2.xml
+++ b/server/xml/example2.xml
@@ -1,38 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<macro name="example2" version="1.0"
-       resume="${linse1}\n${linse2}">
-  <queries>
-    <query class="lensmeter" ttl="10000"/>
-    <query class="autophoropter" ttl="10000" automap="true"/>
-  </queries>
-  <maps>
-    <map name="axis">
-      -- LUA program
-      return right.axis
-    </map>
-    <map name="dioptri">
-      -- LUA program
-      return right.dioptri
-    </map>
-  </maps>
-  <window name="mainwindow"
-          caption="Fundus"
-          width="500"
-          height="560"
-          layout="vbox">
-    <frame name="linse_frame" caption="Linser:" layout="vbox">
-      <frame name="linse_framea" layout="hbox">
-        <label name="a" width="300" caption="Akse rotation:"/>
-        <lineedit name="linse1" regexp="[0-9]{1,3}D" map="axis" value="90K"/>
-      </frame>
-      <frame name="linse_frameb" layout="hbox">
-        <label name="b" width="300" caption="Diotri:"/>
-        <lineedit name="linse2" regexp="[0-9]{1,3}D" map="dioptri" value="90K"/>
-      </frame>
-    </frame>
-    <frame name="buttons" layout="hbox">
-      <button name="cancel" caption="Annuller" action="cancel"/>
-      <button name="commit" caption="Godkend" action="commit"/>
-    </frame>
-  </window>
-</macro>
+<template name="testcourse">
+  <course>
+    <macro name="example2" version="1.0"
+           resume="${linse1}
+${linse2}">
+      <queries>
+        <query class="lensmeter" ttl="10000"/>
+        <query class="autophoropter" ttl="10000" automap="true"/>
+      </queries>
+      <maps>
+        <map name="axis">
+          -- LUA program
+          return right.axis
+        </map>
+        <map name="dioptri">
+          -- LUA program
+          return right.dioptri
+        </map>
+      </maps>
+      <window name="mainwindow"
+              caption="Fundus"
+              width="500"
+              height="560"
+              layout="vbox">
+        <frame name="linse_frame" caption="Linser:" layout="vbox">
+          <frame name="linse_framea" layout="hbox">
+            <label name="a" width="300" caption="Akse rotation:"/>
+            <lineedit name="linse1" regexp="[0-9]{1,3}D" map="axis" value="90K"/>
+          </frame>
+          <frame name="linse_frameb" layout="hbox">
+            <label name="b" width="300" caption="Diotri:"/>
+            <lineedit name="linse2" regexp="[0-9]{1,3}D" map="dioptri" value="90K"/>
+          </frame>
+        </frame>
+        <frame name="buttons" layout="hbox">
+          <button name="cancel" caption="Annuller" action="cancel"/>
+          <button name="commit" caption="Godkend" action="commit"/>
+        </frame>
+      </window>
+    </macro>
+  </course>
+</template>