Merge branch 'Development' into FB-Documentor

Imvertor · Nov 26, 2024 · 354c7e4 · 354c7e4
2 parents 34a409d + 9f632e0
commit 354c7e4
Show file tree

Hide file tree

Showing 16 changed files with 95 additions and 181 deletions.
diff --git a/src/main/java/nl/imvertor/MIMCompiler/MIMCompiler.java b/src/main/java/nl/imvertor/MIMCompiler/MIMCompiler.java
@@ -119,9 +119,10 @@ public boolean generateDefault() throws Exception {
 		}
 
 		if (isRDFType) {
-			transformer.setXslParm("generate-readable-ids", "false");
+			transformer.setXslParm("generate-readable-ids", "true");
 			transformer.setXslParm("generate-all-ids", "true");
-		}
+			transformer.setXslParm("add-generated-id", "true");
+				}
 
 		succeeds = succeeds && transformer.transformStep("properties/WORK_EMBELLISH_FILE", "properties/WORK_MIMFORMAT_XMLPATH", xslFileParam); //TODO must relocate generation of WORK_LISTS_FILE to a EMBELLISH step.
 

diff --git a/src/main/resources/cfg/OfficeCompiler/parms.xml b/src/main/resources/cfg/OfficeCompiler/parms.xml
@@ -210,7 +210,11 @@
       <IMVERTOR_METAMODEL_IHW-MIM-11-CONCEPTUAL_MODELDOC_XSLPATH alias="ITO">Imvert2modeldoc-IHW-MIM-11-CONCEPTUAL.xsl</IMVERTOR_METAMODEL_IHW-MIM-11-CONCEPTUAL_MODELDOC_XSLPATH>
       <IMVERTOR_METAMODEL_IHW-MIM-11-CONCEPTUAL_MODELDOC_XSLPATH_2 alias="ITO">Imvert2modeldoc-IHW-MIM-11-CONCEPTUAL-POSTPROC.xsl</IMVERTOR_METAMODEL_IHW-MIM-11-CONCEPTUAL_MODELDOC_XSLPATH_2>
       <IMVERTOR_METAMODEL_IHW-MIM-11-CONCEPTUAL_MODELDOC_RESPEC_XSLPATH alias="ITO">Imvert2modeldoc-IHW-MIM-11-CONCEPTUAL-html-respec.xsl</IMVERTOR_METAMODEL_IHW-MIM-11-CONCEPTUAL_MODELDOC_RESPEC_XSLPATH>
-
+
+      <IMVERTOR_METAMODEL_IHW-MIM-12-CONCEPTUAL_MODELDOC_XSLPATH alias="ITO">Imvert2modeldoc-IHW-MIM-11-CONCEPTUAL.xsl</IMVERTOR_METAMODEL_IHW-MIM-12-CONCEPTUAL_MODELDOC_XSLPATH>
+      <IMVERTOR_METAMODEL_IHW-MIM-12-CONCEPTUAL_MODELDOC_XSLPATH_2 alias="ITO">Imvert2modeldoc-IHW-MIM-11-CONCEPTUAL-POSTPROC.xsl</IMVERTOR_METAMODEL_IHW-MIM-12-CONCEPTUAL_MODELDOC_XSLPATH_2>
+      <IMVERTOR_METAMODEL_IHW-MIM-12-CONCEPTUAL_MODELDOC_RESPEC_XSLPATH alias="ITO">Imvert2modeldoc-IHW-MIM-11-CONCEPTUAL-html-respec.xsl</IMVERTOR_METAMODEL_IHW-MIM-12-CONCEPTUAL_MODELDOC_RESPEC_XSLPATH>
+
       <!-- Waarderingskamer -->
       <IMVERTOR_METAMODEL_Waarderingskamer-MIM-11-SIM_MODELDOC_XSLPATH alias="ITO">Imvert2modeldoc-Waarderingskamer-MIM-11-SIM.xsl</IMVERTOR_METAMODEL_Waarderingskamer-MIM-11-SIM_MODELDOC_XSLPATH>
       <IMVERTOR_METAMODEL_Waarderingskamer-MIM-11-SIM_MODELDOC_RESPEC_XSLPATH alias="ITO">Imvert2modeldoc-Waarderingskamer-MIM-11-SIM-html-respec.xsl</IMVERTOR_METAMODEL_Waarderingskamer-MIM-11-SIM_MODELDOC_RESPEC_XSLPATH>

diff --git a/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd b/src/main/resources/etc/xsd/MIMformat/v2/1.2/MIMFORMAT_Mim.xsd
@@ -327,7 +327,8 @@
       <xs:element name="gegevensgroeptype">
         <xs:complexType>
           <xs:sequence>
-            <xs:element ref="mim-ref:GegevensgroeptypeRef"/>
+            <xs:element ref="mim-ref:GegevensgroeptypeRef" minOccurs="0"/>
+            <xs:element ref="mim-ext:ConstructieRef" minOccurs="0"/>
           </xs:sequence>
         </xs:complexType>
       </xs:element>

diff --git a/src/main/resources/input/IHW/cfg/docrules/IHW-MIM-11-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/docrules/IHW-MIM-11-CONCEPTUAL.xml
@@ -8,164 +8,8 @@
 
     <xi:include href="IHW.xml"/>
 
-    <name>IHW-MIM-1-CONCEPTUAL</name>
+    <name>IHW-MIM-11-CONCEPTUAL</name>
 
     <desc>IHW specific requirements on documentation.</desc>
-
-    <image-purpose id="CFG-IMG-OVERVIEW">
-        <name lang="nl">Overzichtsdiagram</name>
-        <name lang="en">Overview diagram</name>
-        <!-- markers are placed after the name of the diagram, as in "Sample simple constructs - overzicht" -->
-        <marker lang="nl">overzicht</marker>
-        <marker lang="en">overview</marker>
-        <show-caption>yes</show-caption>
-    </image-purpose>
-
-    <image-purpose id="CFG-IMG-DETAIL">
-        <name lang="nl">Detaildiagram</name>
-        <name lang="en">Detail diagram</name>
-        <marker lang="nl">detail</marker>
-        <marker lang="en">detail</marker>
-        <show-caption>yes</show-caption>
-    </image-purpose>
-
-    <doc-rule id="CFG-DOC-NORMNAAM" order="000">
-        <name lang="nl">Naam (genormaliseerd)</name>
-        <name lang="en">Name (normalized)</name>
-        <levels>
-             <!-- none here -->
-        </levels>
-    </doc-rule>
-
-    <doc-rule id="CFG-DOC-NAAM" order="005">
-        <!-- 
-            you may specify @lang on the name; in that case, that name will appear in documentation for that language.
-        -->
-        <name lang="nl">Naam</name>
-        <name lang="en">Name</name>
-        <levels>
-            <!-- 
-                This rule specifies: global info on classes must show the name of the class 
-                
-                You may specify @lang on the level; in that case, for the specified language the documentation construct will be added 
-                
-                @show should be force, implied or none
-                @compile should be single or full (full is: complete derivation info)
-                @format should be plain (for future improvements).
-            -->
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-OBJECTTYPE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-ASSOCIATIONCLASS</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-REFERENCELIST</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-CODELIST</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-UNION</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-PRIMITIVEDATATYPE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-STRUCTUREDDATATYPE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-COMPOSITE</level>
-
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-ATTRIBUTE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-REFERENCEELEMENT</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-UNIONELEMENT</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-DATAELEMENT</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-ASSOCIATION</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE-ASSOCIATION</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-ENUMERATION</level>
-        </levels>
-    </doc-rule>
-    <doc-rule id="CFG-DOC-DEFINITIE" order="050">
-        <name lang="nl">Definitie</name>
-        <name lang="en">Definition</name>
-        <levels>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-OBJECTTYPE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-ASSOCIATIONCLASS</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-REFERENCELIST</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-CODELIST</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-UNION</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-PRIMITIVEDATATYPE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-STRUCTUREDDATATYPE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-COMPOSITE</level>
-
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-ATTRIBUTE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-REFERENCEELEMENT</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-UNIONELEMENT</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-DATAELEMENT</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-ASSOCIATION</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE-ASSOCIATION</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-ENUMERATION</level>
-        </levels>
-    </doc-rule>
-    <doc-rule id="CFG-DOC-TOELICHTING" order="055">
-        <name lang="nl">Toelichting</name>
-        <name lang="en">Explanation</name>
-        <levels>
-            <level show="implied" compile="single" format="plain">DISPLAY-GLOBAL-OBJECTTYPE</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-GLOBAL-ASSOCIATIONCLASS</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-GLOBAL-REFERENCELIST</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-GLOBAL-CODELIST</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-GLOBAL-UNION</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-GLOBAL-STRUCTUREDDATATYPE</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-GLOBAL-PRIMITIVEDATATYPE</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-GLOBAL-COMPOSITE</level>
-
-            <level show="implied" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-DETAIL-ATTRIBUTE</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-DETAIL-REFERENCEELEMENT</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-DETAIL-UNIONELEMENT</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-DETAIL-DATAELEMENT</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-DETAIL-ASSOCIATION</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE-ASSOCIATION</level>
-            <level show="implied" compile="single" format="plain">DISPLAY-DETAIL-ENUMERATION</level>
-        </levels>
-    </doc-rule>
-    <doc-rule id="CFG-DOC-HERKOMSTDEFINITIE" order="060">
-        <name lang="nl">Herkomst definitie</name>
-        <name lang="en">Origin of definition</name>
-        <levels>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-OBJECTTYPE</level>
-         <!--  <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-ASSOCIATIONCLASS</level> -->
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-REFERENCELIST</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-CODELIST</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-UNION</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-PRIMITIVEDATATYPE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-STRUCTUREDDATATYPE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-COMPOSITE</level>
-
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-ATTRIBUTE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-REFERENCEELEMENT</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-UNIONELEMENT</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-DATAELEMENT</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-ASSOCIATION</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE-ASSOCIATION</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-ENUMERATION</level>
-        </levels>
-    </doc-rule>
-    <doc-rule id="CFG-DOC-HERKOMST" order="062">
-        <name lang="nl">Herkomst</name>
-        <name lang="en">Origin</name>
-        <levels>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-OBJECTTYPE</level>
-            <!--  <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-ASSOCIATIONCLASS</level> -->
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-REFERENCELIST</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-CODELIST</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-UNION</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-PRIMITIVEDATATYPE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-STRUCTUREDDATATYPE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-GLOBAL-COMPOSITE</level>
-
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-ATTRIBUTE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE-ATTRIBUTE</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-REFERENCEELEMENT</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-DATAELEMENT</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-ASSOCIATION</level>
-            <level show="force" compile="single" format="plain">DISPLAY-DETAIL-COMPOSITE-ASSOCIATION</level>
-        </levels>
-    </doc-rule>
 
 </doc-rules>
diff --git a/src/main/resources/input/IHW/cfg/docrules/IHW-MIM-12-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/docrules/IHW-MIM-12-CONCEPTUAL.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Copyright (C) 
+-->
+<doc-rules type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+    <xi:include href="../../../MIM/cfg/docrules/MIM12.xml"/>
+
+    <xi:include href="IHW.xml"/>
+
+    <name>IHW-MIM-12-CONCEPTUAL</name>
+
+    <desc>IHW specific requirements on documentation.</desc>
+
+</doc-rules>
diff --git a/src/main/resources/input/IHW/cfg/docrules/IHW.xml b/src/main/resources/input/IHW/cfg/docrules/IHW.xml
@@ -49,5 +49,5 @@
         Wanneer ReSpec wordt samengesteld, welke config kan worden gebruikt? 
     -->
     <respec-config>respec-nlgov</respec-config> <!-- gecachte versie van https://gitdocumentatie.logius.nl/publicatie/respec/builds/respec-nlgov.js -->
-            
+
 </doc-rules>
diff --git a/src/main/resources/input/IHW/cfg/metamodels/IHW-MIM-1-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/metamodels/IHW-MIM-1-CONCEPTUAL.xml
@@ -4,9 +4,9 @@
 -->
 <metamodel type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-    <xi:include href="../../../MIM/cfg/metamodels/MIM11.xml"/>
+    <xi:include href="../../../MIM/cfg/metamodels/MIM12.xml"/>
 
-    <xi:include href="../../../Imvertor/cfg/metamodels/Grouping-MIM11.xml"/>
+    <xi:include href="../../../Imvertor/cfg/metamodels/Grouping-MIM12.xml"/>
 
     <name>IHW-MIM-1-CONCEPTUAL</name>
 

diff --git a/src/main/resources/input/IHW/cfg/notesrules/IHW-MIM-11-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/notesrules/IHW-MIM-11-CONCEPTUAL.xml
@@ -6,6 +6,6 @@
 
     <xi:include href="../../../MIM/cfg/notesrules/MIM11.xml"/>
 
-    <name>IHW-MIM-1-CONCEPTUAL</name>
+    <name>IHW-MIM-11-CONCEPTUAL</name>
 
 </notes-rules>
diff --git a/src/main/resources/input/IHW/cfg/notesrules/IHW-MIM-12-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/notesrules/IHW-MIM-12-CONCEPTUAL.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Copyright (C) 
+-->
+<notes-rules type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+    <xi:include href="../../../MIM/cfg/notesrules/MIM12.xml"/>
+
+    <name>IHW-MIM-12-CONCEPTUAL</name>
+
+</notes-rules>
diff --git a/src/main/resources/input/IHW/cfg/tvsets/IHW-MIM-1-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/tvsets/IHW-MIM-1-CONCEPTUAL.xml
@@ -20,11 +20,11 @@
 <tagset type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
 
     <!-- IHW follows VNGR requirements -->
-    <xi:include href="../../../MIM/cfg/tvsets/MIM11.xml"/>
+    <xi:include href="../../../MIM/cfg/tvsets/MIM12.xml"/>
 
-    <xi:include href="../../../MIM/cfg/tvsets/MIM11-extension.xml"/>
+    <xi:include href="../../../MIM/cfg/tvsets/MIM12-extension.xml"/>
 
-    <xi:include href="../../../Imvertor/cfg/tvsets/Grouping-MIM11.xml"/>
+    <xi:include href="../../../Imvertor/cfg/tvsets/Grouping-MIM12.xml"/>
 
     <name>IHW-MIM-1-CONCEPTUAL</name>
 

diff --git a/src/main/resources/input/IHW/cfg/visuals/IHW-MIM-12-CONCEPTUAL.xml b/src/main/resources/input/IHW/cfg/visuals/IHW-MIM-12-CONCEPTUAL.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Copyright (C) 2016 
+-->
+<visuals type="config" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+    <xi:include href="../../../MIM/cfg/visuals/MIM12.xml"/>
+
+    <!-- 
+        these visuals specify the basic visual aspects of the UML profile  
+    -->
+    <name>IHW MIM 1.2</name>
+
+    <desc lang="en">Visuals for IHW MIM 1.2 models</desc>
+    <desc lang="nl">Visuele aspecten van IHW MIM 1.2 modellen</desc>
+
+    <measures>
+        <!-- geen aanpassingen -->
+    </measures>
+
+    <categories>
+        <!-- geen aanpassingen -->
+    </categories>
+
+    <stereos>
+        <!-- geen aanpassingen -->
+    </stereos>
+
+</visuals>
diff --git a/src/main/resources/input/IHW/props/IHW.xlsx b/src/main/resources/input/IHW/props/IHW.xlsx
diff --git a/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl b/src/main/resources/xsl/ConfigCompiler/Imvert2configuration.xsl
@@ -145,7 +145,7 @@
         <xsl:variable name="crx" select="imf:get-config-string('run','version')"/>
         <xsl:variable name="lrx" select="imf:get-config-string('system','latest-imvertor-release')"/>
         <xsl:choose>
-            <xsl:when test="matches($crx, '^\d+\.\d+\.\d+$')"> <!-- regular major-minor version? -->
+            <xsl:when test="matches($crx, '^\d+\.\d+\.\d+.*$')"> <!-- (starts with) a regular major-minor version? -->
                 <xsl:variable name="cr" select="string-join(for $m in subsequence(tokenize($crx,'\.'),1,2) return functx:pad-integer-to-length($m,5),'')"/>
                 <xsl:variable name="lr" select="string-join(for $m in subsequence(tokenize($lrx,'\.'),1,2) return functx:pad-integer-to-length($m,5),'')"/>
                 <xsl:sequence select="imf:report-warning(.,$cr lt $lr,'You are using Imvertor version [1], however a more recent version [2] is available.',($crx,$lrx))"/>

diff --git a/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler-RDF.xsl b/src/main/resources/xsl/MIMCompiler/v2/MIM1.2/MIMCompiler-RDF.xsl
@@ -70,13 +70,13 @@ Zie: https://docs.geostandaarden.nl/mim/mim/ voor de laatste versie van de stand
 
   <xsl:template match="mim-in:Informatiemodel|mim-in:Domein|mim-in:View|mim-in:Extern|mim-in:Attribuutsoort|mim-in:Objecttype|mim-in:Gegevensgroep|mim-in:Gegevensgroeptype|
     mim-in:PrimitiefDatatype|mim-in:GestructureerdDatatype|mim-in:Enumeratie|mim-in:Referentielijst|mim-in:Codelijst|mim-in:DataElement|mim-in:Enumeratiewaarde|
-    mim-in:ReferentieElement|mim-in:Constraint|mim-in:Keuze|mim-in:ExterneKoppeling|mim-in:Interface|mim-in:Relatiesoort|mim-in:Bron|mim-in:Doel|mim-in:Relatieklasse">
+    mim-in:ReferentieElement|mim-in:Constraint|mim-in:Keuze|mim-in:ExterneKoppeling|mim-in:Interface|mim-in:Relatiesoort|mim-in:Bron|mim-in:Doel|mim-in:Relatieklasse|mim-in:GeneralisatieObjecttypen|mim-in:GeneralisatieDatatypen">
     <xsl:element name="mim:{local-name()}">
       <xsl:attribute name="rdf:about" select="local:get-id(.)"/>  
       <xsl:apply-templates select="mim-in:*[xhtml:* or (not(*) and normalize-space())]" mode="metagegeven"/>
       <xsl:apply-templates select="(mim-in:packages|mim-in:datatypen|mim-in:objecttypen|mim-in:gegevensgroeptypen|mim-in:keuzen|mim-in:interfaces|mim-in:attribuutsoorten|mim-in:relatiesoorten|mim-in:relatierollen|mim-in:relatieklasse|
         mim-in:gegevensgroepen|mim-in:externeKoppelingen|mim-in:constraints|mim-in:dataElementen|mim-in:enumeratiewaarden|mim-in:referentieElementen|mim-in:bron|mim-in:doel|
-        mim-in:type|mim-in:gegevensgroepType)/*" mode="metagegeven"/>
+        mim-in:type|mim-in:gegevensgroepType|mim-in:supertype)/*" mode="metagegeven"/>
     </xsl:element>
     <xsl:apply-templates/>
   </xsl:template>
@@ -186,7 +186,7 @@ Zie: https://docs.geostandaarden.nl/mim/mim/ voor de laatste versie van de stand
     <mim:relatieklasse rdf:resource="{local:get-id(.)}"/>
   </xsl:template>
 
-  <xsl:template match="(mim-in:GeneralisatieObjecttypes|mim-in:GeneralisatieDatatypes)[mim-in:supertype/mim-ref:*]">
+  <xsl:template match="(mim-in:GeneralisatieObjecttypen|mim-in:GeneralisatieDatatypen)[mim-in:supertype/mim-ref:*]">
     <mim:Generalisatie rdf:about="{local:get-id(.)}">
       <xsl:apply-templates select="mim-in:*[xhtml:* or (not(*) and normalize-space())]" mode="metagegeven"/>
       <mim:subtype rdf:resource="{local:get-id(ancestor::mim-in:*[@id][1])}"/>