From c745dc42ebecf0e66cc68b02b12b881b0670d619 Mon Sep 17 00:00:00 2001
From: Joeri Exelmans <joeri.exelmans@gmail.com>
Date: Mon, 13 Mar 2023 15:20:04 +0100
Subject: [PATCH] Update OML generator with latest vocabulary version.

---
 src/xopp2oml/README.md    | 2 +-
 src/xopp2oml/template.oml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/xopp2oml/README.md b/src/xopp2oml/README.md
index 34a1eed..114940f 100644
--- a/src/xopp2oml/README.md
+++ b/src/xopp2oml/README.md
@@ -2,4 +2,4 @@
 
 This exporter generates OML descriptions that use the following vocabulary:
 
-https://msdl.uantwerpen.be/git/lucasalbertins/DTDesign/src/d070f9e9e932ad9910eaab92eabc368e7ee96058/examples/oml/CDF/src/oml/flandersmake.be/cdf/vocabulary/xopp.oml
\ No newline at end of file
+https://msdl.uantwerpen.be/git/lucasalbertins/DTDesign/src/15c791c78589f9c064fc402feec5228b5a80f549/examples/oml/CDF/src/oml/flandersmake.be/cdf/vocabulary/xopp.oml
\ No newline at end of file
diff --git a/src/xopp2oml/template.oml b/src/xopp2oml/template.oml
index afd77db..5c6f511 100644
--- a/src/xopp2oml/template.oml
+++ b/src/xopp2oml/template.oml
@@ -1,8 +1,8 @@
 {%- macro attributes(pageindex, page, layerindex, layer, elementindex, element) -%}
 {%- for key,value in element.attributes.items() %}
   ci p{{pageindex}}l{{layerindex}}e{{elementindex}}a{{loop.index}} : xopp:XMLAttribute [
-    xopp:hasKey "{{key}}"
-    xopp:hasValue "{{value}}"
+    dict:hasKey "{{key}}"
+    dict:hasValue "{{value}}"
     xopp:ofLayerElement p{{pageindex}}l{{layerindex}}e{{elementindex}}
     object_diagram:inModel model
   ]
@@ -51,6 +51,7 @@ description <http://flandersmake.be/cdf/description/{{namespace}}#> as {{namespa
 
   uses <http://flandersmake.be/cdf/vocabulary/xopp#> as xopp
   uses <http://flandersmake.be/cdf/vocabulary/object_diagram#> as object_diagram
+  uses <http://flandersmake.be/cdf/vocabulary/dict#> as dict
 
   ci model : xopp:Model []