[isidorus-cvs] r973 - in branches/gdl-frontend/src: anaToMia xml/xtm
lgiessmann at common-lisp.net
lgiessmann at common-lisp.net
Mon Sep 26 09:12:05 UTC 2011
Author: lgiessmann
Date: Mon Sep 26 02:12:04 2011
New Revision: 973
Log:
xtm-exporter: fixed a bug when exporting associations with less or more than two roles; gdl-frontend: fixed the schema files for the gdl-frontend
Modified:
branches/gdl-frontend/src/anaToMia/TextGrid_ServiceRegistry_required_schema.xtm
branches/gdl-frontend/src/xml/xtm/exporter.lisp
Modified: branches/gdl-frontend/src/anaToMia/TextGrid_ServiceRegistry_required_schema.xtm
==============================================================================
--- branches/gdl-frontend/src/anaToMia/TextGrid_ServiceRegistry_required_schema.xtm Mon Sep 26 01:33:09 2011 (r972)
+++ branches/gdl-frontend/src/anaToMia/TextGrid_ServiceRegistry_required_schema.xtm Mon Sep 26 02:12:04 2011 (r973)
@@ -12,19 +12,43 @@
<t:topicMap xmlns:t="http://www.topicmaps.org/xtm/" version="2.0">
<t:association>
<t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t9053" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t9033" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t9048" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
<t:topicRef href="#t2601" />
</t:type>
<t:role>
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t9005" />
+ <t:topicRef href="#t9003" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t9050" />
+ <t:topicRef href="#t9048" />
</t:role>
</t:association>
@@ -36,7 +60,7 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t9045" />
+ <t:topicRef href="#t9043" />
</t:role>
<t:role>
<t:type>
@@ -54,13 +78,37 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t9045" />
+ <t:topicRef href="#t9043" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t9035" />
+ <t:topicRef href="#t9033" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t9038" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t9013" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t9033" />
</t:role>
</t:association>
@@ -72,13 +120,13 @@
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t9005" />
+ <t:topicRef href="#t9003" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t9035" />
+ <t:topicRef href="#t9033" />
</t:role>
</t:association>
@@ -90,13 +138,13 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t9025" />
+ <t:topicRef href="#t9023" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t9015" />
+ <t:topicRef href="#t9013" />
</t:role>
</t:association>
@@ -108,13 +156,37 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t9025" />
+ <t:topicRef href="#t9023" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t9030" />
+ <t:topicRef href="#t9028" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t9018" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t9003" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t9013" />
</t:role>
</t:association>
@@ -126,13 +198,13 @@
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t9005" />
+ <t:topicRef href="#t9003" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t9015" />
+ <t:topicRef href="#t9013" />
</t:role>
</t:association>
@@ -144,13 +216,13 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t9005" />
+ <t:topicRef href="#t9003" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2646" />
</t:type>
- <t:topicRef href="#t9010" />
+ <t:topicRef href="#t9008" />
</t:role>
</t:association>
@@ -162,7 +234,7 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t9010" />
+ <t:topicRef href="#t9008" />
</t:role>
<t:role>
<t:type>
@@ -186,7 +258,31 @@
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t9005" />
+ <t:topicRef href="#t9003" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t8354" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t8334" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t8349" />
</t:role>
</t:association>
@@ -198,13 +294,13 @@
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8304" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t8348" />
+ <t:topicRef href="#t8349" />
</t:role>
</t:association>
@@ -216,7 +312,7 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t8343" />
+ <t:topicRef href="#t8344" />
</t:role>
<t:role>
<t:type>
@@ -234,13 +330,37 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t8343" />
+ <t:topicRef href="#t8344" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8333" />
+ <t:topicRef href="#t8334" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t8339" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t8314" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t8334" />
</t:role>
</t:association>
@@ -252,13 +372,13 @@
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8304" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t8333" />
+ <t:topicRef href="#t8334" />
</t:role>
</t:association>
@@ -270,13 +390,13 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t8323" />
+ <t:topicRef href="#t8324" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8313" />
+ <t:topicRef href="#t8314" />
</t:role>
</t:association>
@@ -288,13 +408,37 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t8323" />
+ <t:topicRef href="#t8324" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t8328" />
+ <t:topicRef href="#t8329" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t8319" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t8304" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t8314" />
</t:role>
</t:association>
@@ -306,13 +450,13 @@
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8304" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t8313" />
+ <t:topicRef href="#t8314" />
</t:role>
</t:association>
@@ -324,13 +468,13 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8304" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2646" />
</t:type>
- <t:topicRef href="#t8308" />
+ <t:topicRef href="#t8309" />
</t:role>
</t:association>
@@ -342,7 +486,7 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t8308" />
+ <t:topicRef href="#t8309" />
</t:role>
<t:role>
<t:type>
@@ -366,7 +510,7 @@
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t8303" />
+ <t:topicRef href="#t8304" />
</t:role>
</t:association>
@@ -408,19 +552,67 @@
<t:association>
<t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t6465" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6450" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t6460" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
<t:topicRef href="#t2601" />
</t:type>
<t:role>
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t6323" />
+ <t:topicRef href="#t6325" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t6458" />
+ <t:topicRef href="#t6460" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t6455" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6435" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t6450" />
</t:role>
</t:association>
@@ -432,13 +624,13 @@
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t6323" />
+ <t:topicRef href="#t6325" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t6448" />
+ <t:topicRef href="#t6450" />
</t:role>
</t:association>
@@ -450,7 +642,7 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t6443" />
+ <t:topicRef href="#t6445" />
</t:role>
<t:role>
<t:type>
@@ -468,13 +660,37 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t6443" />
+ <t:topicRef href="#t6445" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6433" />
+ <t:topicRef href="#t6435" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t6440" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6415" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t6435" />
</t:role>
</t:association>
@@ -486,13 +702,13 @@
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t6323" />
+ <t:topicRef href="#t6325" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t6433" />
+ <t:topicRef href="#t6435" />
</t:role>
</t:association>
@@ -504,13 +720,13 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t6423" />
+ <t:topicRef href="#t6425" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6413" />
+ <t:topicRef href="#t6415" />
</t:role>
</t:association>
@@ -522,13 +738,37 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t6423" />
+ <t:topicRef href="#t6425" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t6428" />
+ <t:topicRef href="#t6430" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t6420" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6400" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t6415" />
</t:role>
</t:association>
@@ -540,13 +780,13 @@
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t6323" />
+ <t:topicRef href="#t6325" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t6413" />
+ <t:topicRef href="#t6415" />
</t:role>
</t:association>
@@ -558,7 +798,7 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t6408" />
+ <t:topicRef href="#t6410" />
</t:role>
<t:role>
<t:type>
@@ -576,13 +816,37 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t6408" />
+ <t:topicRef href="#t6410" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t6400" />
</t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6398" />
+ <t:topicRef href="#t6405" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6380" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t6400" />
</t:role>
</t:association>
@@ -594,13 +858,13 @@
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t6323" />
+ <t:topicRef href="#t6325" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t6398" />
+ <t:topicRef href="#t6400" />
</t:role>
</t:association>
@@ -612,13 +876,13 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t6388" />
+ <t:topicRef href="#t6390" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6378" />
+ <t:topicRef href="#t6380" />
</t:role>
</t:association>
@@ -630,13 +894,37 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t6388" />
+ <t:topicRef href="#t6390" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t6393" />
+ <t:topicRef href="#t6395" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t6385" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6355" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t6380" />
</t:role>
</t:association>
@@ -648,13 +936,13 @@
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t6323" />
+ <t:topicRef href="#t6325" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t6378" />
+ <t:topicRef href="#t6380" />
</t:role>
</t:association>
@@ -666,7 +954,7 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6373" />
+ <t:topicRef href="#t6375" />
</t:role>
<t:role>
<t:type>
@@ -684,7 +972,7 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t6373" />
+ <t:topicRef href="#t6375" />
</t:role>
<t:role>
<t:type>
@@ -702,13 +990,37 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t6373" />
+ <t:topicRef href="#t6375" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t6365" />
</t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6363" />
+ <t:topicRef href="#t6370" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6355" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t6365" />
</t:role>
</t:association>
@@ -720,13 +1032,13 @@
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t6353" />
+ <t:topicRef href="#t6355" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t6363" />
+ <t:topicRef href="#t6365" />
</t:role>
</t:association>
@@ -738,7 +1050,7 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6353" />
+ <t:topicRef href="#t6355" />
</t:role>
<t:role>
<t:type>
@@ -756,7 +1068,7 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6353" />
+ <t:topicRef href="#t6355" />
</t:role>
<t:role>
<t:type>
@@ -774,7 +1086,7 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6353" />
+ <t:topicRef href="#t6355" />
</t:role>
<t:role>
<t:type>
@@ -792,7 +1104,7 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6353" />
+ <t:topicRef href="#t6355" />
</t:role>
<t:role>
<t:type>
@@ -804,19 +1116,43 @@
<t:association>
<t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t6360" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6335" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t6355" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
<t:topicRef href="#t2601" />
</t:type>
<t:role>
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t6323" />
+ <t:topicRef href="#t6325" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t6353" />
+ <t:topicRef href="#t6355" />
</t:role>
</t:association>
@@ -828,13 +1164,13 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t6343" />
+ <t:topicRef href="#t6345" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6333" />
+ <t:topicRef href="#t6335" />
</t:role>
</t:association>
@@ -846,13 +1182,37 @@
<t:type>
<t:topicRef href="#t2661" />
</t:type>
- <t:topicRef href="#t6343" />
+ <t:topicRef href="#t6345" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2666" />
</t:type>
- <t:topicRef href="#t6348" />
+ <t:topicRef href="#t6350" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t6340" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t6325" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t6335" />
</t:role>
</t:association>
@@ -864,13 +1224,13 @@
<t:type>
<t:topicRef href="#t2636" />
</t:type>
- <t:topicRef href="#t6323" />
+ <t:topicRef href="#t6325" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t6333" />
+ <t:topicRef href="#t6335" />
</t:role>
</t:association>
@@ -882,13 +1242,13 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6323" />
+ <t:topicRef href="#t6325" />
</t:role>
<t:role>
<t:type>
<t:topicRef href="#t2646" />
</t:type>
- <t:topicRef href="#t6328" />
+ <t:topicRef href="#t6330" />
</t:role>
</t:association>
@@ -900,7 +1260,7 @@
<t:type>
<t:topicRef href="#t2656" />
</t:type>
- <t:topicRef href="#t6328" />
+ <t:topicRef href="#t6330" />
</t:role>
<t:role>
<t:type>
@@ -924,7 +1284,7 @@
<t:type>
<t:topicRef href="#t2641" />
</t:type>
- <t:topicRef href="#t6323" />
+ <t:topicRef href="#t6325" />
</t:role>
</t:association>
@@ -942,7 +1302,7 @@
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t6318" />
+ <t:topicRef href="#t6320" />
</t:role>
</t:association>
@@ -960,7 +1320,7 @@
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t6313" />
+ <t:topicRef href="#t6315" />
</t:role>
</t:association>
@@ -978,7 +1338,31 @@
<t:type>
<t:topicRef href="#t346" />
</t:type>
- <t:topicRef href="#t6308" />
+ <t:topicRef href="#t6310" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t3086" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t3061" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t3081" />
</t:role>
</t:association>
@@ -1038,6 +1422,30 @@
<t:association>
<t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t3066" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t3046" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t3061" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
<t:topicRef href="#t2601" />
</t:type>
<t:role>
@@ -1092,6 +1500,30 @@
<t:association>
<t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t3051" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t3026" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t3046" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
<t:topicRef href="#t2601" />
</t:type>
<t:role>
@@ -1146,6 +1578,30 @@
<t:association>
<t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t3031" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t3011" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t3026" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
<t:topicRef href="#t2601" />
</t:type>
<t:role>
@@ -1200,6 +1656,30 @@
<t:association>
<t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t3016" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t2991" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t3011" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
<t:topicRef href="#t2601" />
</t:type>
<t:role>
@@ -1254,6 +1734,30 @@
<t:association>
<t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t2996" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t2931" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t2991" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
<t:topicRef href="#t2601" />
</t:type>
<t:role>
@@ -1344,6 +1848,30 @@
<t:association>
<t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t2976" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t2931" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t2971" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
<t:topicRef href="#t2601" />
</t:type>
<t:role>
@@ -1488,6 +2016,30 @@
<t:association>
<t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t2936" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t2951" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t2931" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
<t:topicRef href="#t2601" />
</t:type>
<t:role>
@@ -1542,6 +2094,30 @@
<t:association>
<t:type>
+ <t:topicRef href="#t2631" />
+ </t:type>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2656" />
+ </t:type>
+ <t:topicRef href="#t2956" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2671" />
+ </t:type>
+ <t:topicRef href="#t2911" />
+ </t:role>
+ <t:role>
+ <t:type>
+ <t:topicRef href="#t2676" />
+ </t:type>
+ <t:topicRef href="#t2951" />
+ </t:role>
+ </t:association>
+
+ <t:association>
+ <t:type>
<t:topicRef href="#t2601" />
</t:type>
<t:role>
@@ -3499,6 +4075,7 @@
<t:topic id="t2606">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/topic-view-binding" />
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/topic-view-binding" />
<t:instanceOf>
<t:topicRef href="#t256" />
</t:instanceOf>
@@ -3644,7 +4221,6 @@
<t:topic id="t2716">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/width" />
- <t:subjectIdentifier href="http://psi.isidor.us/gdl/width" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
@@ -3720,7 +4296,6 @@
<t:topic id="t2776">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Creator-Topic-View" />
- <t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Creator-Topic-View" />
</t:topic>
<t:topic id="t2781">
@@ -3797,6 +4372,7 @@
<t:topic id="t2856">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/font-size" />
+ <t:subjectIdentifier href="http://psi.isidor.us/gdl/font-size" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
@@ -4601,29 +5177,29 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6303">
+ <t:topic id="t6305">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/cursor" />
<t:instanceOf>
<t:topicRef href="#t246" />
</t:instanceOf>
</t:topic>
- <t:topic id="t6308">
+ <t:topic id="t6310">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Default-Editor-Topic-View" />
</t:topic>
- <t:topic id="t6313">
+ <t:topic id="t6315">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Editor-Association-View" />
</t:topic>
- <t:topic id="t6318">
+ <t:topic id="t6320">
<t:subjectIdentifier href="http://psi.isidor.us/gdl/types/Delete-Button" />
</t:topic>
- <t:topic id="t6323">
+ <t:topic id="t6325">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-default-editor-topic-view" />
<t:instanceOf>
- <t:topicRef href="#t6308" />
+ <t:topicRef href="#t6310" />
</t:instanceOf>
<t:name>
<t:type>
@@ -4657,14 +5233,14 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6328">
+ <t:topic id="t6330">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-view-binding" />
<t:instanceOf>
<t:topicRef href="#t2806" />
</t:instanceOf>
</t:topic>
- <t:topic id="t6333">
+ <t:topic id="t6335">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-env" />
<t:instanceOf>
<t:topicRef href="#t2846" />
@@ -4707,7 +5283,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6338">
+ <t:topic id="t6340">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-env-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -4732,14 +5308,14 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6343">
+ <t:topic id="t6345">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-env-value-group" />
<t:instanceOf>
<t:topicRef href="#t2886" />
</t:instanceOf>
</t:topic>
- <t:topic id="t6348">
+ <t:topic id="t6350">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-env-value" />
<t:instanceOf>
<t:topicRef href="#t2831" />
@@ -4752,10 +5328,10 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6353">
+ <t:topic id="t6355">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/has-environment-editor-association-view" />
<t:instanceOf>
- <t:topicRef href="#t6313" />
+ <t:topicRef href="#t6315" />
</t:instanceOf>
<t:name>
<t:type>
@@ -4777,7 +5353,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6358">
+ <t:topic id="t6360">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-has-environment-editor-association-view-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -4802,7 +5378,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6363">
+ <t:topic id="t6365">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-env" />
<t:instanceOf>
<t:topicRef href="#t2846" />
@@ -4833,7 +5409,7 @@
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t6303" />
+ <t:topicRef href="#t6305" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">default</t:resourceData>
</t:occurrence>
@@ -4851,7 +5427,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6368">
+ <t:topic id="t6370">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-env-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -4876,14 +5452,14 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6373">
+ <t:topic id="t6375">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-env-value-group" />
<t:instanceOf>
<t:topicRef href="#t2886" />
</t:instanceOf>
</t:topic>
- <t:topic id="t6378">
+ <t:topic id="t6380">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-key" />
<t:instanceOf>
<t:topicRef href="#t2846" />
@@ -4926,7 +5502,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6383">
+ <t:topic id="t6385">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-key-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -4951,14 +5527,14 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6388">
+ <t:topic id="t6390">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-key-value-group" />
<t:instanceOf>
<t:topicRef href="#t2886" />
</t:instanceOf>
</t:topic>
- <t:topic id="t6393">
+ <t:topic id="t6395">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-key-value" />
<t:instanceOf>
<t:topicRef href="#t2831" />
@@ -4971,7 +5547,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6398">
+ <t:topic id="t6400">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-key" />
<t:instanceOf>
<t:topicRef href="#t2846" />
@@ -5008,7 +5584,7 @@
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t6303" />
+ <t:topicRef href="#t6305" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">default</t:resourceData>
</t:occurrence>
@@ -5020,7 +5596,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6403">
+ <t:topic id="t6405">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-key-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -5045,14 +5621,14 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6408">
+ <t:topic id="t6410">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-key-value-group" />
<t:instanceOf>
<t:topicRef href="#t2886" />
</t:instanceOf>
</t:topic>
- <t:topic id="t6413">
+ <t:topic id="t6415">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-value" />
<t:instanceOf>
<t:topicRef href="#t2846" />
@@ -5095,7 +5671,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6418">
+ <t:topic id="t6420">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-value-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -5120,14 +5696,14 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6423">
+ <t:topic id="t6425">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-value-value-group" />
<t:instanceOf>
<t:topicRef href="#t2886" />
</t:instanceOf>
</t:topic>
- <t:topic id="t6428">
+ <t:topic id="t6430">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-label-value-value" />
<t:instanceOf>
<t:topicRef href="#t2831" />
@@ -5140,7 +5716,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6433">
+ <t:topic id="t6435">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-value" />
<t:instanceOf>
<t:topicRef href="#t2846" />
@@ -5165,7 +5741,7 @@
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t6303" />
+ <t:topicRef href="#t6305" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
@@ -5183,7 +5759,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6438">
+ <t:topic id="t6440">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-value-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -5208,17 +5784,17 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6443">
+ <t:topic id="t6445">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-text-value-value-group" />
<t:instanceOf>
<t:topicRef href="#t2886" />
</t:instanceOf>
</t:topic>
- <t:topic id="t6448">
+ <t:topic id="t6450">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-delete-button" />
<t:instanceOf>
- <t:topicRef href="#t6318" />
+ <t:topicRef href="#t6320" />
</t:instanceOf>
<t:occurrence>
<t:type>
@@ -5246,7 +5822,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6453">
+ <t:topic id="t6455">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-delete-button-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -5271,7 +5847,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6458">
+ <t:topic id="t6460">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-commit-button" />
<t:instanceOf>
<t:topicRef href="#t2901" />
@@ -5302,7 +5878,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t6463">
+ <t:topic id="t6465">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/hash-object-editor-commit-button-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -5327,7 +5903,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t8303">
+ <t:topic id="t8304">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-default-creator-topic-view" />
<t:instanceOf>
<t:topicRef href="#t2776" />
@@ -5364,14 +5940,14 @@
</t:occurrence>
</t:topic>
- <t:topic id="t8308">
+ <t:topic id="t8309">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-view-binding" />
<t:instanceOf>
<t:topicRef href="#t2806" />
</t:instanceOf>
</t:topic>
- <t:topic id="t8313">
+ <t:topic id="t8314">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-text-label" />
<t:instanceOf>
<t:topicRef href="#t2846" />
@@ -5414,7 +5990,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t8318">
+ <t:topic id="t8319">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-text-label-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -5439,14 +6015,14 @@
</t:occurrence>
</t:topic>
- <t:topic id="t8323">
+ <t:topic id="t8324">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-text-label-value-group" />
<t:instanceOf>
<t:topicRef href="#t2886" />
</t:instanceOf>
</t:topic>
- <t:topic id="t8328">
+ <t:topic id="t8329">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-text-label-value" />
<t:instanceOf>
<t:topicRef href="#t2831" />
@@ -5459,7 +6035,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t8333">
+ <t:topic id="t8334">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-name-text" />
<t:instanceOf>
<t:topicRef href="#t2846" />
@@ -5484,7 +6060,7 @@
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t6303" />
+ <t:topicRef href="#t6305" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">text</t:resourceData>
</t:occurrence>
@@ -5496,7 +6072,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t8338">
+ <t:topic id="t8339">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-name-text-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -5521,14 +6097,14 @@
</t:occurrence>
</t:topic>
- <t:topic id="t8343">
+ <t:topic id="t8344">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-name-text-value-group" />
<t:instanceOf>
<t:topicRef href="#t2886" />
</t:instanceOf>
</t:topic>
- <t:topic id="t8348">
+ <t:topic id="t8349">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-commit-button" />
<t:instanceOf>
<t:topicRef href="#t2901" />
@@ -5559,7 +6135,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t8353">
+ <t:topic id="t8354">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-creator-commit-button-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -5584,10 +6160,10 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9005">
+ <t:topic id="t9003">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-default-editor-topic-view" />
<t:instanceOf>
- <t:topicRef href="#t6308" />
+ <t:topicRef href="#t6310" />
</t:instanceOf>
<t:name>
<t:type>
@@ -5621,14 +6197,14 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9010">
+ <t:topic id="t9008">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-view-binding" />
<t:instanceOf>
<t:topicRef href="#t2806" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9015">
+ <t:topic id="t9013">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-text-label" />
<t:instanceOf>
<t:topicRef href="#t2846" />
@@ -5671,7 +6247,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9020">
+ <t:topic id="t9018">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-text-label-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -5696,14 +6272,14 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9025">
+ <t:topic id="t9023">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-text-label-value-group" />
<t:instanceOf>
<t:topicRef href="#t2886" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9030">
+ <t:topic id="t9028">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-text-label-value" />
<t:instanceOf>
<t:topicRef href="#t2831" />
@@ -5716,7 +6292,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9035">
+ <t:topic id="t9033">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-name-text" />
<t:instanceOf>
<t:topicRef href="#t2846" />
@@ -5741,7 +6317,7 @@
</t:occurrence>
<t:occurrence>
<t:type>
- <t:topicRef href="#t6303" />
+ <t:topicRef href="#t6305" />
</t:type>
<t:resourceData datatype="http://www.w3.org/2001/XMLSchema#string">default</t:resourceData>
</t:occurrence>
@@ -5765,7 +6341,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9040">
+ <t:topic id="t9038">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-name-text-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
@@ -5790,17 +6366,17 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9045">
+ <t:topic id="t9043">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-name-text-value-group" />
<t:instanceOf>
<t:topicRef href="#t2886" />
</t:instanceOf>
</t:topic>
- <t:topic id="t9050">
+ <t:topic id="t9048">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-delete-button" />
<t:instanceOf>
- <t:topicRef href="#t6318" />
+ <t:topicRef href="#t6320" />
</t:instanceOf>
<t:occurrence>
<t:type>
@@ -5828,7 +6404,7 @@
</t:occurrence>
</t:topic>
- <t:topic id="t9055">
+ <t:topic id="t9053">
<t:subjectIdentifier href="http://textgrid.org/serviceregistry/gdl/environment-editor-delete-button-position" />
<t:instanceOf>
<t:topicRef href="#t2861" />
Modified: branches/gdl-frontend/src/xml/xtm/exporter.lisp
==============================================================================
--- branches/gdl-frontend/src/xml/xtm/exporter.lisp Mon Sep 26 01:33:09 2011 (r972)
+++ branches/gdl-frontend/src/xml/xtm/exporter.lisp Mon Sep 26 02:12:04 2011 (r973)
@@ -20,23 +20,29 @@
(identified-construct
(elephant:get-instance-by-value 'PersistentIdC 'uri *type-psi*))))
(loop for item in (d:get-all-associations revision)
- when (and (= (length (roles item :revision revision)) 2)
- (not (and (or (eq instance-topic
- (instance-of (first (roles item
- :revision revision))
- :revision revision))
- (eq instance-topic
- (instance-of (second (roles item
- :revision revision))
- :revision revision)))
- (or (eq type-topic
- (instance-of (first (roles item
- :revision revision))
- :revision revision))
- (eq type-topic
- (instance-of (second (roles item
- :revision revision))
- :revision revision))))))
+ when (let ((assoc-roles (length (roles item :revision revision))))
+ (or (/= assoc-roles 2)
+ (and (= assoc-roles 2)
+ (not (and (or (eq instance-topic
+ (instance-of
+ (first (roles item
+ :revision revision))
+ :revision revision))
+ (eq instance-topic
+ (instance-of
+ (second (roles item
+ :revision revision))
+ :revision revision)))
+ (or (eq type-topic
+ (instance-of
+ (first (roles item
+ :revision revision))
+ :revision revision))
+ (eq type-topic
+ (instance-of
+ (second (roles item
+ :revision revision))
+ :revision revision))))))))
collect item)))
More information about the Isidorus-cvs
mailing list