From c32d2b8ed84545947cc09e9b40b14817276b0b8e Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Sat, 20 Jul 2024 21:18:24 +0200
Subject: [PATCH 1/5] style: formatting todos

---
 utils/compare_versions/comparison.xsl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/compare_versions/comparison.xsl b/utils/compare_versions/comparison.xsl
index ac573275c..446668efe 100644
--- a/utils/compare_versions/comparison.xsl
+++ b/utils/compare_versions/comparison.xsl
@@ -18,9 +18,9 @@
         </xd:desc>
     </xd:doc>
     
-    <!-- TODO content link to text has no target -->
-    <!-- TODO content link to empty has no target -->
-    <!-- TODO linking v4 element-names are lowercase while v5 are uppercase, this might change in the future, so maybe checking availability or switching between version instead of making a general decision would be beneficial. -->
+    <!-- TODO: content link to text has no target -->
+    <!-- TODO: content link to empty has no target -->
+    <!-- TODO: linking v4 element-names are lowercase while v5 are uppercase, this might change in the future, so maybe checking availability or switching between version instead of making a general decision would be beneficial. -->
     
     <xsl:output method="html" indent="yes"/>
     
@@ -313,7 +313,7 @@
                                     <xsl:choose>
                                         <xsl:when test="$current.att = $added.atts/@ident">
                                             <li class="added" title="added attribute"><span class="attribute"><a href="{$new.guidelines}/elements/{$current.element}.html" target="_blank"><xsl:value-of select="$current.att"/></a></span></li>
-                                            <!-- TODO linking does not work here since there is no target to point to -->
+                                            <!-- TODO: linking does not work here since there is no target to point to -->
                                         </xsl:when>
                                         <xsl:when test="$current.att = $changed.atts/@ident">
                                             <li class="changed" title="changed attribute"><span class="attribute"><a href="{$new.guidelines}/elements/{$current.element}.html" target="_blank"><xsl:value-of select="$current.att"/></a></span></li>

From e36979a4e5f827ba9cbf822092b785f68f80fd51 Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Sat, 20 Jul 2024 21:20:16 +0200
Subject: [PATCH 2/5] fix: consider all namespaces for empty

---
 utils/compare_versions/comparison.xsl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/utils/compare_versions/comparison.xsl b/utils/compare_versions/comparison.xsl
index 446668efe..9bad8cbad 100644
--- a/utils/compare_versions/comparison.xsl
+++ b/utils/compare_versions/comparison.xsl
@@ -170,22 +170,22 @@
                 
                 <xsl:variable name="new.content" as="xs:string*">
                     <xsl:if test="$new.element/tei:content//rng:text"><xsl:value-of select="'text'"/></xsl:if>
-                    <xsl:if test="$new.element/tei:content//rng:empty"><xsl:value-of select="'empty'"/></xsl:if>
+                    <xsl:if test="$new.element/tei:content//(tei:empty|rng:empty)"><xsl:value-of select="'empty'"/></xsl:if>
                     <xsl:sequence select="$new.element/tei:content//rng:ref/@name"/>
                 </xsl:variable>
                 <xsl:variable name="old.content" as="xs:string*">
                     <xsl:if test="$old.element/tei:content//rng:text"><xsl:value-of select="'text'"/></xsl:if>
-                    <xsl:if test="$old.element/tei:content//rng:empty"><xsl:value-of select="'empty'"/></xsl:if>
+                    <xsl:if test="$old.element/tei:content//(tei:empty|rng:empty)"><xsl:value-of select="'empty'"/></xsl:if>
                     <xsl:sequence select="$old.element/tei:content//rng:ref/@name"/>
                 </xsl:variable>
                 <xsl:variable name="lowercased.new.content" as="xs:string*">
                     <xsl:if test="$new.element/tei:content//rng:text"><xsl:value-of select="'text'"/></xsl:if>
-                    <xsl:if test="$new.element/tei:content//rng:empty"><xsl:value-of select="'empty'"/></xsl:if>
+                    <xsl:if test="$new.element/tei:content//(tei:empty|rng:empty)"><xsl:value-of select="'empty'"/></xsl:if>
                     <xsl:sequence select="$new.element/tei:content//rng:ref/lower-case(@name)"/>
                 </xsl:variable>
                 <xsl:variable name="lowercased.old.content" as="xs:string*">
                     <xsl:if test="$old.element/tei:content//rng:text"><xsl:value-of select="'text'"/></xsl:if>
-                    <xsl:if test="$old.element/tei:content//rng:empty"><xsl:value-of select="'empty'"/></xsl:if>
+                    <xsl:if test="$old.element/tei:content//(tei:empty|rng:empty)"><xsl:value-of select="'empty'"/></xsl:if>
                     <xsl:sequence select="$old.element/tei:content//rng:ref/lower-case(@name)"/>
                 </xsl:variable>
                 
@@ -666,7 +666,7 @@
                     <xsl:if test="$new.model//rng:element[rng:anyName]">
                         <xsl:value-of select="'any XML content'"/>
                     </xsl:if>
-                    <xsl:if test="$new.model//rng:empty">
+                    <xsl:if test="$new.model//(tei:empty|rng:empty)">
                         <xsl:value-of select="'no content'"/>
                     </xsl:if>
                 </xsl:variable>
@@ -675,7 +675,7 @@
                     <xsl:if test="$old.model//rng:element[rng:anyName]">
                         <xsl:value-of select="'any XML content'"/>
                     </xsl:if>
-                    <xsl:if test="$old.model//rng:empty">
+                    <xsl:if test="$old.model//(tei:empty|rng:empty)">
                         <xsl:value-of select="'no content'"/>
                     </xsl:if>
                 </xsl:variable>

From 03182874d5c27e22e749970a9092073a94911f1e Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Sat, 20 Jul 2024 21:27:28 +0200
Subject: [PATCH 3/5] fix: differentiate between macroSpec and dataSpec

---
 utils/compare_versions/comparison.xsl | 157 +++++++++++++++++---------
 1 file changed, 102 insertions(+), 55 deletions(-)

diff --git a/utils/compare_versions/comparison.xsl b/utils/compare_versions/comparison.xsl
index 9bad8cbad..161c2006d 100644
--- a/utils/compare_versions/comparison.xsl
+++ b/utils/compare_versions/comparison.xsl
@@ -72,8 +72,8 @@
                         <div id="elementsChart" class="chartBox"><label>Elements</label></div>
                         <div id="attClassesChart" class="chartBox"><label>Attribute Classes</label></div>
                         <div id="modelClassesChart" class="chartBox"><label>Model Classes</label></div>
-                        <div id="macroPeChart" class="chartBox"><label>Macro Groups</label></div>
-                        <div id="macroDtChart" class="chartBox"><label>Data Types</label></div>
+                        <div id="macroChart" class="chartBox"><label>Macro Groups</label></div>
+                        <div id="dataChart" class="chartBox"><label>Data Types</label></div>
                         <div style="margin-top: -.5rem;">
                             <span class="added sample">added content</span>
                             <span class="changed sample">changed content</span>
@@ -87,14 +87,14 @@
                 <xsl:variable name="elements" select="mei:compareElements($new.file,$old.file)" as="node()*"/>
                 <xsl:variable name="attClasses" select="mei:compareAttributeClasses($new.file,$old.file)"/>
                 <xsl:variable name="modelClasses" select="mei:compareModelClasses($new.file,$old.file)"/>
-                <xsl:variable name="macroPe" select="mei:compareMacroSpecPe($new.file,$old.file)"/>
-                <xsl:variable name="macroDt" select="mei:compareMacroSpecDt($new.file,$old.file)"/>
+                <xsl:variable name="macro" select="mei:compareMacroSpec($new.file,$old.file)"/>
+                <xsl:variable name="data" select="mei:compareDataSpec($new.file,$old.file)"/>
                 
                 <xsl:sequence select="$elements"/>
                 <xsl:sequence select="$attClasses"/>
                 <xsl:sequence select="$modelClasses"/>
-                <xsl:sequence select="$macroPe"/>
-                <xsl:sequence select="$macroDt"/>
+                <xsl:sequence select="$macro"/>
+                <xsl:sequence select="$data"/>
                 <script src="resources/js/d3.min.js"></script>
                 <script>
                     var elements = [
@@ -115,17 +115,17 @@
                     {type:'removed', count: <xsl:value-of select="count($modelClasses//tr[@class='r'])"/>, ref:'#modelClassesRemoved'},
                     {type:'unchanged', count: <xsl:value-of select="count($modelClasses//tr[@class='u'])"/>, ref:'#modelClassesUnchanged'}
                     ];
-                    var macroPe = [
-                    {type:'added', count: <xsl:value-of select="count($macroPe//tr[@class='a'])"/>, ref:'#macroPeAdded'},
-                    {type:'changed', count: <xsl:value-of select="count($macroPe//tr[@class='c'])"/>, ref:'#macroPeChanged'},
-                    {type:'removed', count: <xsl:value-of select="count($macroPe//tr[@class='r'])"/>, ref:'#macroPeRemoved'},
-                    {type:'unchanged', count: <xsl:value-of select="count($macroPe//tr[@class='u'])"/>, ref:'#macroPeUnchanged'}
+                    var macro = [
+                    {type:'added', count: <xsl:value-of select="count($macro//tr[@class='a'])"/>, ref:'#macroAdded'},
+                    {type:'changed', count: <xsl:value-of select="count($macro//tr[@class='c'])"/>, ref:'#macroChanged'},
+                    {type:'removed', count: <xsl:value-of select="count($macro//tr[@class='r'])"/>, ref:'#macroRemoved'},
+                    {type:'unchanged', count: <xsl:value-of select="count($macro//tr[@class='u'])"/>, ref:'#macroUnchanged'}
                     ];
-                    var macroDt = [
-                    {type:'added', count: <xsl:value-of select="count($macroDt//tr[@class='a'])"/>, ref:'#macroDtAdded'},
-                    {type:'changed', count: <xsl:value-of select="count($macroDt//tr[@class='c'])"/>, ref:'#macroDtChanged'},
-                    {type:'removed', count: <xsl:value-of select="count($macroDt//tr[@class='r'])"/>, ref:'#macroDtRemoved'},
-                    {type:'unchanged', count: <xsl:value-of select="count($macroDt//tr[@class='u'])"/>, ref:'#macroDtUnchanged'}
+                    var data = [
+                    {type:'added', count: <xsl:value-of select="count($data//tr[@class='a'])"/>, ref:'#dataSpecAdded'},
+                    {type:'changed', count: <xsl:value-of select="count($data//tr[@class='c'])"/>, ref:'#dataSpecChanged'},
+                    {type:'removed', count: <xsl:value-of select="count($data//tr[@class='r'])"/>, ref:'#dataSpecRemoved'},
+                    {type:'unchanged', count: <xsl:value-of select="count($data//tr[@class='u'])"/>, ref:'#dataSpecUnchanged'}
                     ];
                 </script>
                 <script src="resources/js/main.js"></script>
@@ -645,12 +645,12 @@
         </table>
     </xsl:function>
     
-    <xsl:function name="mei:compareMacroSpecPe" as="node()*">
+    <xsl:function name="mei:compareMacroSpec" as="node()*">
         <xsl:param name="new.file" as="node()"/>
         <xsl:param name="old.file" as="node()"/>
         
-        <xsl:variable name="new.macros" select="distinct-values($new.file//tei:macroSpec[@type = 'pe']/@ident)" as="xs:string*"/>
-        <xsl:variable name="old.macros" select="distinct-values($old.file//tei:macroSpec[@type = 'pe']/@ident)" as="xs:string*"/>
+        <xsl:variable name="new.macros" select="distinct-values($new.file//tei:macroSpec[@type = 'pe' or not(@type)]/@ident)" as="xs:string*"/>
+        <xsl:variable name="old.macros" select="distinct-values($old.file//tei:macroSpec[@type = 'pe' or not(@type)]/@ident)" as="xs:string*"/>
         
         <xsl:variable name="added.macros" select="$new.macros[not(. = $old.macros)]" as="xs:string*"/>
         <xsl:variable name="removed.macros" select="$old.macros[not(. = $new.macros)]" as="xs:string*"/>
@@ -658,8 +658,26 @@
         <xsl:variable name="modified.macros" as="node()*">
             <xsl:for-each select="$kept.macros">
                 <xsl:variable name="current.macro" select="." as="xs:string"/>
-                <xsl:variable name="new.model" select="$new.file//tei:macroSpec[@type = 'pe' and @ident = $current.macro]" as="node()"/>
-                <xsl:variable name="old.model" select="$old.file//tei:macroSpec[@type = 'pe' and @ident = $current.macro]" as="node()"/>
+                <xsl:variable name="new.model" as="node()">
+                    <xsl:choose>
+                        <xsl:when test="$new.file//tei:macroSpec[@type = 'pe']">
+                            <xsl:value-of select="$new.file//tei:macroSpec[@type = 'pe' and @ident = $current.macro]"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="$new.file//tei:macroSpec[@ident = $current.macro]"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:variable>
+                <xsl:variable name="old.model" as="node()">
+                    <xsl:choose>
+                        <xsl:when test="$old.file//tei:macroSpec[@type = 'pe']">
+                            <xsl:value-of select="$old.file//tei:macroSpec[@type = 'pe' and @ident = $current.macro]"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="$old.file//tei:macroSpec[@ident = $current.macro]"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:variable>
                 
                 <xsl:variable name="new.content" as="xs:string*">
                     <xsl:sequence select="$new.model//rng:ref[@name != 'macro.anyXML']/@name"/>
@@ -736,11 +754,20 @@
         <xsl:variable name="unchanged.macros" select="$kept.macros[not(. = $modified.macros//td[@class='macroClass ident']/text())]" as="xs:string*"/>
         
         <h2>MacroSpec Comparison (Parameter Entities)</h2>
-        <h3 id="macroPeAdded"><xsl:value-of select="count($added.macros)"/> new macroSpec classes:</h3>
+        <h3 id="macroAdded"><xsl:value-of select="count($added.macros)"/> new macroSpec classes:</h3>
         <table class="added">
             <xsl:for-each select="$added.macros">
                 <xsl:variable name="current.element" select="." as="xs:string"/>
-                <xsl:variable name="elementSpec" select="$new.file//tei:macroSpec[@type = 'pe' and @ident = $current.element]" as="node()"/>
+                <xsl:variable name="elementSpec" as="node()">
+                    <xsl:choose>
+                        <xsl:when test="$new.file//tei:macroSpec[@type = 'pe']">
+                            <xsl:value-of select="$new.file//tei:macroSpec[@type = 'pe' and @ident = $current.element]"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="$new.file//tei:macroSpec[@ident = $current.element]"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:variable>
                 <tr class="a" id="${$current.element}">
                     <td class="macroClass ident"><xsl:value-of select="$current.element"/></td>
                     <td class="module"><xsl:value-of select="$elementSpec/@module"/></td>
@@ -748,27 +775,47 @@
                 </tr>
             </xsl:for-each>
         </table>
-        <h3 id="macroPeRemoved"><xsl:value-of select="count($removed.macros)"/> removed macroSpec classes:</h3>
+        <h3 id="macroRemoved"><xsl:value-of select="count($removed.macros)"/> removed macroSpec classes:</h3>
         <table class="removed">
             <xsl:for-each select="$removed.macros">
                 <xsl:variable name="current.element" select="." as="xs:string"/>
-                <xsl:variable name="elementSpec" select="$old.file//tei:macroSpec[@type = 'pe' and @ident = $current.element]" as="node()"/>
-                <tr class="r" id="{$current.element}">
-                    <td class="macroClass ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module"><xsl:value-of select="$elementSpec/@module"/></td>
-                    <td><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
-                </tr>
+                <xsl:variable name="elementSpec" as="node()">
+                    <xsl:choose>
+                        <xsl:when test="$old.file//tei:macroSpec[@type = 'pe']">
+                            <xsl:value-of select="$old.file//tei:macroSpec[@type = 'pe' and @ident = $current.element]"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="$old.file//tei:macroSpec[not(@type) and @ident = $current.element]"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:variable>
+                <if test="not starts-with(current.element, 'data')">
+                    <tr class="r" id="{$current.element}">
+                        <td class="macroClass ident"><xsl:value-of select="$current.element"/></td>
+                        <td class="module"><xsl:value-of select="$elementSpec/@module"/></td>
+                        <td><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
+                    </tr>
+                </if>
             </xsl:for-each>
         </table>
-        <h3 id="macroPeChanged"><xsl:value-of select="count($modified.macros)"/> modified macroSpec classes:</h3>
+        <h3 id="macroChanged"><xsl:value-of select="count($modified.macros)"/> modified macroSpec classes:</h3>
         <table>
             <xsl:sequence select="$modified.macros"/>
         </table>
-        <h3 id="macroPeUnchanged"><xsl:value-of select="count($unchanged.macros)"/> unchanged macroSpec classes:</h3>
+        <h3 id="macroUnchanged"><xsl:value-of select="count($unchanged.macros)"/> unchanged macroSpec classes:</h3>
         <table>
             <xsl:for-each select="$unchanged.macros">
                 <xsl:variable name="current.element" select="." as="xs:string"/>
-                <xsl:variable name="elementSpec" select="$new.file//tei:macroSpec[@type = 'pe' and @ident = $current.element]" as="node()"/>
+                <xsl:variable name="elementSpec" as="node()">
+                    <xsl:choose>
+                        <xsl:when test="$new.file//tei:macroSpec[@type = 'pe']">
+                            <xsl:value-of select="$new.file//tei:macroSpec[@type = 'pe' and @ident = $current.element]"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="$new.file//tei:macroSpec[@ident = $current.element]"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:variable>
                 <tr class="u" id="{$current.element}">
                     <td class="macroClass ident"><xsl:value-of select="$current.element"/></td>
                     <td class="module unchanged"><xsl:value-of select="$elementSpec/@module"/></td>
@@ -778,12 +825,12 @@
         </table>
     </xsl:function>
     
-    <xsl:function name="mei:compareMacroSpecDt" as="node()*">
+    <xsl:function name="mei:compareDataSpec" as="node()*">
         <xsl:param name="new.file" as="node()"/>
         <xsl:param name="old.file" as="node()"/>
         
-        <xsl:variable name="new.models" select="distinct-values($new.file//tei:macroSpec[@type = 'dt']/@ident)" as="xs:string*"/>
-        <xsl:variable name="old.models" select="distinct-values($old.file//tei:macroSpec[@type = 'dt']/@ident)" as="xs:string*"/>
+        <xsl:variable name="new.models" select="distinct-values($new.file//(tei:dataSpec|tei:macroSpec[@type = 'dt'])/@ident)" as="xs:string*"/>
+        <xsl:variable name="old.models" select="distinct-values($old.file//(tei:dataSpec|tei:macroSpec[@type = 'dt'])/@ident)" as="xs:string*"/>
         
         <xsl:variable name="added.models" select="$new.models[not(. = $old.models)]" as="xs:string*"/>
         <xsl:variable name="removed.models" select="$old.models[not(. = $new.models)]" as="xs:string*"/>
@@ -791,8 +838,8 @@
         <xsl:variable name="modified.models" as="node()*">
             <xsl:for-each select="$kept.models">
                 <xsl:variable name="current.macro" select="." as="xs:string"/>
-                <xsl:variable name="new.macro" select="$new.file//tei:macroSpec[@type = 'dt' and @ident = $current.macro]" as="node()"/>
-                <xsl:variable name="old.macro" select="$old.file//tei:macroSpec[@type = 'dt' and @ident = $current.macro]" as="node()"/>
+                <xsl:variable name="new.macro" select="$new.file//(tei:dataSpec[@ident = $current.macro]|tei:macroSpec[@type = 'dt' and @ident = $current.macro])" as="node()"/>
+                <xsl:variable name="old.macro" select="$old.file//(tei:dataSpec[@ident = $current.macro]|tei:macroSpec[@type = 'dt' and @ident = $current.macro])" as="node()"/>
                 
                 <xsl:variable name="new.references" select="$new.macro//rng:ref/@name | $new.macro//tei:macroRef/@key" as="xs:string*"/>
                 <xsl:variable name="old.references" select="$old.macro//rng:ref/@name | $new.macro//tei:macroRef/@key" as="xs:string*"/>
@@ -884,44 +931,44 @@
         </xsl:variable>
         <xsl:variable name="unchanged.models" select="$kept.models[not(. = $modified.models//td[@class='macroSpec datatype ident']/text())]" as="xs:string*"/>
         
-        <h2>MacroSpec Comparison (datatypes)</h2>
-        <h3 id="macroDtAdded"><xsl:value-of select="count($added.models)"/> new macroSpecs:</h3>
+        <h2>DataSpec Comparison (datatypes)</h2>
+        <h3 id="dataSpecAdded"><xsl:value-of select="count($added.models)"/> new dataSpecs:</h3>
         <table class="added">
             <xsl:for-each select="$added.models">
                 <xsl:variable name="current.element" select="." as="xs:string"/>
-                <xsl:variable name="macroSpec" select="$new.file//tei:macroSpec[@type = 'dt' and @ident = $current.element]" as="node()"/>
+                <xsl:variable name="dataSpec" select="$new.file//(tei:dataSpec[@ident = $current.element]|tei:macroSpec[@type = 'dt' and @ident = $current.element])" as="node()"/>
                 <tr class="a" id="{$current.element}">
-                    <td class="macroSpec datatype ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module"><xsl:value-of select="$macroSpec/@module"/></td>
-                    <td><xsl:value-of select="string-join($macroSpec/tei:desc//text(),' ')"/></td>
+                    <td class="dataSpec datatype ident"><xsl:value-of select="$current.element"/></td>
+                    <td class="module"><xsl:value-of select="$dataSpec/@module"/></td>
+                    <td><xsl:value-of select="string-join($dataSpec/tei:desc//text(),' ')"/></td>
                 </tr>
             </xsl:for-each>
         </table>
-        <h3 id="macroDtRemoved"><xsl:value-of select="count($removed.models)"/> removed macroSpecs:</h3>
+        <h3 id="dataSpecRemoved"><xsl:value-of select="count($removed.models)"/> removed dataSpecs:</h3>
         <table class="removed">
             <xsl:for-each select="$removed.models">
                 <xsl:variable name="current.element" select="." as="xs:string"/>
-                <xsl:variable name="macroSpec" select="$old.file//tei:macroSpec[@type = 'dt' and @ident = $current.element]" as="node()"/>
+                <xsl:variable name="dataSpec" select="$old.file//(tei:dataSpec[@ident = $current.element]|tei:macroSpec[@type = 'dt' and @ident = $current.element])" as="node()"/>
                 <tr class="r" id="{$current.element}">
-                    <td class="macroSpec datatype ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module"><xsl:value-of select="$macroSpec/@module"/></td>
-                    <td><xsl:value-of select="string-join($macroSpec/tei:desc//text(),' ')"/></td>
+                    <td class="dataSpec datatype ident"><xsl:value-of select="$current.element"/></td>
+                    <td class="module"><xsl:value-of select="$dataSpec/@module"/></td>
+                    <td><xsl:value-of select="string-join($dataSpec/tei:desc//text(),' ')"/></td>
                 </tr>
             </xsl:for-each>
         </table>
-        <h3 id="macroDtChanged"><xsl:value-of select="count($modified.models)"/> modified macroSpecs:</h3>
+        <h3 id="dataSpecChanged"><xsl:value-of select="count($modified.models)"/> modified dataSpecs:</h3>
         <table>
             <xsl:sequence select="$modified.models"/>
         </table>
-        <h3 id="macroDtUnchanged"><xsl:value-of select="count($unchanged.models)"/> unchanged macroSpecs:</h3>
+        <h3 id="dataSpecUnchanged"><xsl:value-of select="count($unchanged.models)"/> unchanged dataSpecs:</h3>
         <table>
             <xsl:for-each select="$unchanged.models">
                 <xsl:variable name="current.element" select="." as="xs:string"/>
-                <xsl:variable name="macroSpec" select="$new.file//tei:macroSpec[@type = 'dt' and @ident = $current.element]" as="node()"/>
+                <xsl:variable name="dataSpec" select="$new.file//(tei:dataSpec[@ident = $current.element]|tei:macroSpec[@type = 'dt' and @ident = $current.element])" as="node()"/>
                 <tr class="u" id="{$current.element}">
-                    <td class="macroSpec datatype ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module unchanged"><xsl:value-of select="$macroSpec/@module"/></td>
-                    <td class="unchanged"><xsl:value-of select="string-join($macroSpec/tei:desc//text(),' ')"/></td>
+                    <td class="dataSpec datatype ident"><xsl:value-of select="$current.element"/></td>
+                    <td class="module unchanged"><xsl:value-of select="$dataSpec/@module"/></td>
+                    <td class="unchanged"><xsl:value-of select="string-join($dataSpec/tei:desc//text(),' ')"/></td>
                 </tr>
             </xsl:for-each>
         </table>

From 5e9d701d08a61759cb32fde9884e88c3e495899a Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Sat, 20 Jul 2024 21:37:48 +0200
Subject: [PATCH 4/5] fix: adjust javascript

---
 utils/compare_versions/resources/js/main.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/compare_versions/resources/js/main.js b/utils/compare_versions/resources/js/main.js
index 60cc29176..021a1d30e 100644
--- a/utils/compare_versions/resources/js/main.js
+++ b/utils/compare_versions/resources/js/main.js
@@ -23,14 +23,14 @@ const svg3 = d3.select("#modelClassesChart")
     .append("g")
         .attr("transform", `translate(${width / 2}, ${height / 2})`);
         
-const svg4 = d3.select("#macroPeChart")
+const svg4 = d3.select("#macroChart")
     .append("svg")
         .attr("width", width)
         .attr("height", height)
     .append("g")
         .attr("transform", `translate(${width / 2}, ${height / 2})`);
         
-const svg5 = d3.select("#macroDtChart")
+const svg5 = d3.select("#dataChart")
     .append("svg")
         .attr("width", width)
         .attr("height", height)
@@ -97,7 +97,7 @@ function getCharts() {
         
         // Join new data
     const path4 = svg4.selectAll("path")
-        .data(pie(macroPe));
+        .data(pie(macro));
     
     // Enter new arcs
     path4.enter().append("path")
@@ -111,7 +111,7 @@ function getCharts() {
         
         // Join new data
     const path5 = svg5.selectAll("path")
-        .data(pie(macroDt));
+        .data(pie(data));
     
     // Enter new arcs
     path5.enter().append("path")

From 928c5d78715d372d7c851ac6a279bf5421b80bcf Mon Sep 17 00:00:00 2001
From: Klaus Rettinghaus <klaus.rettinghaus@gmail.com>
Date: Sun, 21 Jul 2024 09:06:35 +0200
Subject: [PATCH 5/5] style: simplification and formatting

---
 utils/compare_versions/comparison.xsl | 725 +++++++++++++++++---------
 1 file changed, 473 insertions(+), 252 deletions(-)

diff --git a/utils/compare_versions/comparison.xsl b/utils/compare_versions/comparison.xsl
index 161c2006d..0a1fe3220 100644
--- a/utils/compare_versions/comparison.xsl
+++ b/utils/compare_versions/comparison.xsl
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:math="http://www.w3.org/2005/xpath-functions/math"
-    xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
-    xmlns:mei="http://www.music-encoding.org/ns/mei"
-    xmlns:tei="http://www.tei-c.org/ns/1.0"
-    xmlns:rng="http://relaxng.org/ns/structure/1.0" 
-    xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    exclude-result-prefixes="xs math xd mei tei rng sch xi"
-    version="3.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:math="http://www.w3.org/2005/xpath-functions/math" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" exclude-result-prefixes="xs math xd mei tei rng sch xi" version="3.0">
     <xd:doc scope="stylesheet">
         <xd:desc>
             <xd:p><xd:b>Created on:</xd:b> Oct 29, 2018</xd:p>
@@ -17,13 +7,13 @@
             <xd:p></xd:p>
         </xd:desc>
     </xd:doc>
-    
+
     <!-- TODO: content link to text has no target -->
     <!-- TODO: content link to empty has no target -->
     <!-- TODO: linking v4 element-names are lowercase while v5 are uppercase, this might change in the future, so maybe checking availability or switching between version instead of making a general decision would be beneficial. -->
-    
+
     <xsl:output method="html" indent="yes"/>
-    
+
     <xsl:variable name="new.file" select="//tei:back" as="node()"/>
     <xsl:variable name="new.version" select="//tei:attDef[@ident='meiversion']//tei:defaultVal" as="xs:string"/>
     <xsl:variable name="new.version.major" as="xs:string*">
@@ -38,7 +28,7 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:variable>
-    
+
     <xsl:param name="old.version.filename" select="''" as="xs:string"/>
     <xsl:variable name="old.file" select="doc($old.version.filename)//tei:back" as="node()"/>
     <xsl:variable name="old.version" select="doc($old.version.filename)//tei:attDef[@ident='meiversion']//tei:defaultVal" as="xs:string"/>
@@ -49,8 +39,8 @@
     <xsl:variable name="old.guidelines" select="concat($html.guidelines,$old.version.major)"/>
 
     <xsl:param name="output.folder" select="''" as="xs:string"/>
-    <xsl:variable name="output" select="concat($output.folder,'comparison_',$new.version.major,'_vs_',$old.version.major, '.html')" />
-    
+    <xsl:variable name="output" select="concat($output.folder,'comparison_',$new.version.major,'_vs_',$old.version.major, '.html')"/>
+
     <xsl:template match="/">
         <xsl:result-document href="{$output}">
             ---
@@ -58,22 +48,33 @@
             title: "Comparison of MEI v<xsl:value-of select="$new.version"/> and v<xsl:value-of select="$old.version"/>"
             ---
             <div>
-                <link rel="stylesheet" href="resources/css/main.css" />
+                <link rel="stylesheet" href="resources/css/main.css"/>
                 <div id="headingArea">
                     <h1>MEI Comparison <br/>
                         <small>
-                            <span class="">Version <xsl:value-of select="$new.version"/></span> <span class=""> vs </span>
+                            <span class="">Version <xsl:value-of select="$new.version"/></span>
+                            <span class=""> vs </span>
                             <span class="">Version <xsl:value-of select="$old.version"/></span>
                         </small>
-                </h1>
+                    </h1>
                 </div>
                 <div id="chartArea">
                     <div id="chartsBox">
-                        <div id="elementsChart" class="chartBox"><label>Elements</label></div>
-                        <div id="attClassesChart" class="chartBox"><label>Attribute Classes</label></div>
-                        <div id="modelClassesChart" class="chartBox"><label>Model Classes</label></div>
-                        <div id="macroChart" class="chartBox"><label>Macro Groups</label></div>
-                        <div id="dataChart" class="chartBox"><label>Data Types</label></div>
+                        <div id="elementsChart" class="chartBox">
+                            <label>Elements</label>
+                        </div>
+                        <div id="attClassesChart" class="chartBox">
+                            <label>Attribute Classes</label>
+                        </div>
+                        <div id="modelClassesChart" class="chartBox">
+                            <label>Model Classes</label>
+                        </div>
+                        <div id="macroChart" class="chartBox">
+                            <label>Macro Groups</label>
+                        </div>
+                        <div id="dataChart" class="chartBox">
+                            <label>Data Types</label>
+                        </div>
                         <div style="margin-top: -.5rem;">
                             <span class="added sample">added content</span>
                             <span class="changed sample">changed content</span>
@@ -89,7 +90,7 @@
                 <xsl:variable name="modelClasses" select="mei:compareModelClasses($new.file,$old.file)"/>
                 <xsl:variable name="macro" select="mei:compareMacroSpec($new.file,$old.file)"/>
                 <xsl:variable name="data" select="mei:compareDataSpec($new.file,$old.file)"/>
-                
+
                 <xsl:sequence select="$elements"/>
                 <xsl:sequence select="$attClasses"/>
                 <xsl:sequence select="$modelClasses"/>
@@ -132,21 +133,21 @@
             </div>
         </xsl:result-document>
     </xsl:template>
-    
+
     <xsl:function name="mei:getDesc" as="xs:string">
         <xsl:param name="spec" as="element()"/>
         <xsl:variable name="gloss" select="if($spec/tei:gloss/text()) then('(' || $spec/tei:gloss/text() || ') – ') else()" as="xs:string?"/>
         <xsl:variable name="desc" select="string-join($spec/tei:desc//text(),' ')" as="xs:string"/>
         <xsl:value-of select="normalize-space($gloss || $desc)"/>
     </xsl:function>
-    
+
     <xsl:function name="mei:compareElements" as="node()*">
         <xsl:param name="new.file" as="node()"/>
         <xsl:param name="old.file" as="node()"/>
-        
+
         <xsl:variable name="new.elements" select="distinct-values($new.file//tei:elementSpec/@ident)" as="xs:string*"/>
         <xsl:variable name="old.elements" select="distinct-values($old.file//tei:elementSpec/@ident)" as="xs:string*"/>
-        
+
         <xsl:variable name="added.elements" select="$new.elements[not(. = $old.elements)]" as="xs:string*"/>
         <xsl:variable name="removed.elements" select="$old.elements[not(. = $new.elements)]" as="xs:string*"/>
         <xsl:variable name="kept.elements" select="$new.elements[. = $old.elements]" as="xs:string*"/>
@@ -155,44 +156,60 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="new.element" select="$new.file//tei:elementSpec[@ident = $current.element]" as="node()"/>
                 <xsl:variable name="old.element" select="$old.file//tei:elementSpec[@ident = $current.element]" as="node()"/>
-                
+
                 <xsl:variable name="new.memberships" select="$new.element//tei:memberOf/@key" as="xs:string*"/>
                 <xsl:variable name="old.memberships" select="$old.element//tei:memberOf/@key" as="xs:string*"/>
                 <xsl:variable name="lowercased.new.memberships" select="$new.element//tei:memberOf/lower-case(@key)" as="xs:string*"/>
                 <xsl:variable name="lowercased.old.memberships" select="$old.element//tei:memberOf/lower-case(@key)" as="xs:string*"/>
-                
+
                 <xsl:variable name="added.memberships" select="$new.memberships[not(. = $old.memberships) and not(lower-case(.) = $lowercased.old.memberships)]" as="xs:string*"/>
                 <xsl:variable name="removed.memberships" select="$old.memberships[not(. = $new.memberships) and not(lower-case(.) = $lowercased.new.memberships)]" as="xs:string*"/>
                 <xsl:variable name="casechanged.memberships" select="$new.memberships[not(. = $old.memberships) and lower-case(.) = $lowercased.old.memberships]" as="xs:string*"/>
-                
+
                 <xsl:variable name="new.desc" select="mei:getDesc($new.element)" as="xs:string"/>
                 <xsl:variable name="old.desc" select="mei:getDesc($old.element)" as="xs:string"/>
-                
+
                 <xsl:variable name="new.content" as="xs:string*">
-                    <xsl:if test="$new.element/tei:content//rng:text"><xsl:value-of select="'text'"/></xsl:if>
-                    <xsl:if test="$new.element/tei:content//(tei:empty|rng:empty)"><xsl:value-of select="'empty'"/></xsl:if>
+                    <xsl:if test="$new.element/tei:content//rng:text">
+                        <xsl:value-of select="'text'"/>
+                    </xsl:if>
+                    <xsl:if test="$new.element/tei:content//(tei:empty|rng:empty)">
+                        <xsl:value-of select="'empty'"/>
+                    </xsl:if>
                     <xsl:sequence select="$new.element/tei:content//rng:ref/@name"/>
                 </xsl:variable>
                 <xsl:variable name="old.content" as="xs:string*">
-                    <xsl:if test="$old.element/tei:content//rng:text"><xsl:value-of select="'text'"/></xsl:if>
-                    <xsl:if test="$old.element/tei:content//(tei:empty|rng:empty)"><xsl:value-of select="'empty'"/></xsl:if>
+                    <xsl:if test="$old.element/tei:content//rng:text">
+                        <xsl:value-of select="'text'"/>
+                    </xsl:if>
+                    <xsl:if test="$old.element/tei:content//(tei:empty|rng:empty)">
+                        <xsl:value-of select="'empty'"/>
+                    </xsl:if>
                     <xsl:sequence select="$old.element/tei:content//rng:ref/@name"/>
                 </xsl:variable>
                 <xsl:variable name="lowercased.new.content" as="xs:string*">
-                    <xsl:if test="$new.element/tei:content//rng:text"><xsl:value-of select="'text'"/></xsl:if>
-                    <xsl:if test="$new.element/tei:content//(tei:empty|rng:empty)"><xsl:value-of select="'empty'"/></xsl:if>
+                    <xsl:if test="$new.element/tei:content//rng:text">
+                        <xsl:value-of select="'text'"/>
+                    </xsl:if>
+                    <xsl:if test="$new.element/tei:content//(tei:empty|rng:empty)">
+                        <xsl:value-of select="'empty'"/>
+                    </xsl:if>
                     <xsl:sequence select="$new.element/tei:content//rng:ref/lower-case(@name)"/>
                 </xsl:variable>
                 <xsl:variable name="lowercased.old.content" as="xs:string*">
-                    <xsl:if test="$old.element/tei:content//rng:text"><xsl:value-of select="'text'"/></xsl:if>
-                    <xsl:if test="$old.element/tei:content//(tei:empty|rng:empty)"><xsl:value-of select="'empty'"/></xsl:if>
+                    <xsl:if test="$old.element/tei:content//rng:text">
+                        <xsl:value-of select="'text'"/>
+                    </xsl:if>
+                    <xsl:if test="$old.element/tei:content//(tei:empty|rng:empty)">
+                        <xsl:value-of select="'empty'"/>
+                    </xsl:if>
                     <xsl:sequence select="$old.element/tei:content//rng:ref/lower-case(@name)"/>
                 </xsl:variable>
-                
+
                 <xsl:variable name="added.content" select="$new.content[not(. = $old.content) and not(lower-case(.) = $lowercased.old.content)]" as="xs:string*"/>
                 <xsl:variable name="removed.content" select="$old.content[not(. = $new.content) and not(lower-case(.) = $lowercased.new.content)]" as="xs:string*"/>
                 <xsl:variable name="casechanged.content" select="$new.content[not(. = $old.content) and lower-case(.) = $lowercased.old.content]" as="xs:string*"/>
-                
+
                 <xsl:variable name="new.atts" as="node()*">
                     <xsl:sequence select="$new.element//tei:attDef"/>
                     <xsl:sequence select="for $attClass in $new.element//tei:memberOf[starts-with(@key,'att.')]/@key return mei:resolveAttClass($attClass,$new.file)"/>
@@ -201,7 +218,7 @@
                     <xsl:sequence select="$old.element//tei:attDef"/>
                     <xsl:sequence select="for $attClass in $old.element//tei:memberOf[starts-with(@key,'att.')]/@key return mei:resolveAttClass($attClass,$old.file)"/>
                 </xsl:variable>
-                
+
                 <xsl:variable name="added.atts" select="$new.atts[not(@ident = $old.atts/@ident) and not(lower-case(@ident) = $old.atts/lower-case(@ident))]" as="node()*"/>
                 <xsl:variable name="removed.atts" select="$old.atts[not(@ident = $new.atts/@ident) and not(lower-case(@ident) = $new.atts/lower-case(@ident))]" as="node()*"/>
                 <xsl:variable name="changed.atts" as="node()*">
@@ -236,11 +253,11 @@
                                 <xsl:sequence select="."/>
                             </xsl:when>
                         </xsl:choose>
-                        
+
                     </xsl:for-each>
                 </xsl:variable>
                 <xsl:variable name="unchanged.atts" select="$new.atts[not(@ident = $changed.atts/@ident)]" as="node()*"/>
-                
+
                 <xsl:if test="count($added.memberships) gt 0 
                     or count($removed.memberships) gt 0 
                     or count($casechanged.memberships) gt 0
@@ -251,13 +268,21 @@
                     or count($removed.atts) gt 0
                     or count($changed.atts) gt 0">
                     <tr class="c" id="{$current.element}">
-                        <td class="element ident"><xsl:value-of select="$current.element"/></td>
-                        <td class="module"><xsl:value-of select="$new.element/@module"/></td>
+                        <td class="element ident">
+                            <xsl:value-of select="$current.element"/>
+                        </td>
+                        <td class="module">
+                            <xsl:value-of select="$new.element/@module"/>
+                        </td>
                         <td class="desc">
                             <xsl:choose>
                                 <xsl:when test="$new.desc != $old.desc">
-                                    <span class="removed block"><xsl:value-of select="$old.desc"/></span>
-                                    <span class="added block"><xsl:value-of select="$new.desc"/></span>
+                                    <span class="removed block">
+                                        <xsl:value-of select="$old.desc"/>
+                                    </span>
+                                    <span class="added block">
+                                        <xsl:value-of select="$new.desc"/>
+                                    </span>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="$new.desc"/>
@@ -270,18 +295,32 @@
                                     <xsl:variable name="current.class" select="." as="xs:string"/>
                                     <xsl:choose>
                                         <xsl:when test="$current.class = $added.memberships">
-                                            <li class="added" title="added class"><a href="#{$current.class}"><xsl:value-of select="$current.class"/></a></li>
+                                            <li class="added" title="added class">
+                                                <a href="#{$current.class}">
+                                                    <xsl:value-of select="$current.class"/>
+                                                </a>
+                                            </li>
                                         </xsl:when>
                                         <xsl:when test="$current.class = $casechanged.memberships">
-                                            <li class="casechanged" title="was: {$old.memberships[lower-case(.) = lower-case($current.class)]}"><a href="#{$current.class}"><xsl:value-of select="$current.class"/></a></li>
+                                            <li class="casechanged" title="was: {$old.memberships[lower-case(.) = lower-case($current.class)]}">
+                                                <a href="#{$current.class}">
+                                                    <xsl:value-of select="$current.class"/>
+                                                </a>
+                                            </li>
                                         </xsl:when>
                                         <xsl:otherwise>
-                                            <li class="unchanged"><xsl:value-of select="$current.class"/></li>
+                                            <li class="unchanged">
+                                                <xsl:value-of select="$current.class"/>
+                                            </li>
                                         </xsl:otherwise>
                                     </xsl:choose>
                                 </xsl:for-each>
                                 <xsl:for-each select="$removed.memberships">
-                                    <li class="removed" title="removed class"><a href="#{.}"><xsl:value-of select="."/></a></li>
+                                    <li class="removed" title="removed class">
+                                        <a href="#{.}">
+                                            <xsl:value-of select="."/>
+                                        </a>
+                                    </li>
                                 </xsl:for-each>
                             </ul>
                         </td>
@@ -291,18 +330,32 @@
                                     <xsl:variable name="current.content" select="." as="xs:string"/>
                                     <xsl:choose>
                                         <xsl:when test="$current.content= $added.content">
-                                            <li class="added" title="added content"><a href="#{$current.content}"><xsl:value-of select="$current.content"/></a></li>
+                                            <li class="added" title="added content">
+                                                <a href="#{$current.content}">
+                                                    <xsl:value-of select="$current.content"/>
+                                                </a>
+                                            </li>
                                         </xsl:when>
                                         <xsl:when test="$current.content = $casechanged.content">
-                                            <li class="casechanged" title="was: {$old.content[lower-case(.) = lower-case($current.content)]}"><a href="#{$current.content}"><xsl:value-of select="$current.content"/></a></li>
+                                            <li class="casechanged" title="was: {$old.content[lower-case(.) = lower-case($current.content)]}">
+                                                <a href="#{$current.content}">
+                                                    <xsl:value-of select="$current.content"/>
+                                                </a>
+                                            </li>
                                         </xsl:when>
                                         <xsl:otherwise>
-                                            <li class="unchanged"><xsl:value-of select="$current.content"/></li>
+                                            <li class="unchanged">
+                                                <xsl:value-of select="$current.content"/>
+                                            </li>
                                         </xsl:otherwise>
                                     </xsl:choose>
                                 </xsl:for-each>
                                 <xsl:for-each select="$removed.content">
-                                    <li class="removed" title="removed content"><a href="#{.}"><xsl:value-of select="."/></a></li>
+                                    <li class="removed" title="removed content">
+                                        <a href="#{.}">
+                                            <xsl:value-of select="."/>
+                                        </a>
+                                    </li>
                                 </xsl:for-each>
                             </ul>
                         </td>
@@ -312,30 +365,50 @@
                                     <xsl:variable name="current.att" select="." as="xs:string"/>
                                     <xsl:choose>
                                         <xsl:when test="$current.att = $added.atts/@ident">
-                                            <li class="added" title="added attribute"><span class="attribute"><a href="{$new.guidelines}/elements/{$current.element}.html" target="_blank"><xsl:value-of select="$current.att"/></a></span></li>
+                                            <li class="added" title="added attribute">
+                                                <span class="attribute">
+                                                    <a href="{$new.guidelines}/elements/{$current.element}.html" target="_blank">
+                                                        <xsl:value-of select="$current.att"/>
+                                                    </a>
+                                                </span>
+                                            </li>
                                             <!-- TODO: linking does not work here since there is no target to point to -->
                                         </xsl:when>
                                         <xsl:when test="$current.att = $changed.atts/@ident">
-                                            <li class="changed" title="changed attribute"><span class="attribute"><a href="{$new.guidelines}/elements/{$current.element}.html" target="_blank"><xsl:value-of select="$current.att"/></a></span></li>
+                                            <li class="changed" title="changed attribute">
+                                                <span class="attribute">
+                                                    <a href="{$new.guidelines}/elements/{$current.element}.html" target="_blank">
+                                                        <xsl:value-of select="$current.att"/>
+                                                    </a>
+                                                </span>
+                                            </li>
                                         </xsl:when>
                                         <xsl:otherwise>
-                                            <li class="unchanged"><span class="attribute"><xsl:value-of select="$current.att"/></span></li>
+                                            <li class="unchanged">
+                                                <span class="attribute">
+                                                    <xsl:value-of select="$current.att"/>
+                                                </span>
+                                            </li>
                                         </xsl:otherwise>
                                     </xsl:choose>
                                 </xsl:for-each>
                                 <xsl:for-each select="$removed.atts/@ident">
-                                    <li class="removed" title="removed attribute"><span class="attribute"><a href="{$old.guidelines}/elements/{lower-case($current.element)}.html" target="_blank"><xsl:value-of select="."/></a></span></li>
+                                    <li class="removed" title="removed attribute">
+                                        <span class="attribute">
+                                            <a href="{$old.guidelines}/elements/{lower-case($current.element)}.html" target="_blank">
+                                                <xsl:value-of select="."/>
+                                            </a>
+                                        </span>
+                                    </li>
                                 </xsl:for-each>
                             </ul>
                         </td>
                     </tr>
                 </xsl:if>
-                
-                
             </xsl:for-each>
         </xsl:variable>
         <xsl:variable name="unchanged.elements" select="$kept.elements[not(. = $modified.elements//td[@class='element ident']/text())]" as="xs:string*"/>
-        
+
         <h2>Element Comparison</h2>
         <h3 id="elementsAdded"><xsl:value-of select="count($added.elements)"/> new elements:</h3>
         <table class="added">
@@ -343,10 +416,20 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="elementSpec" select="$new.file//tei:elementSpec[@ident = $current.element]" as="node()"/>
                 <tr class="a" id="{$current.element}">
-                    <td class="element ident"><a href="{$new.guidelines}/elements/{$current.element}.html" target="_blank"><xsl:value-of select="$current.element"/></a></td>
-                    <td class="module"><xsl:value-of select="$elementSpec/@module"/></td>
-                    <td><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
-                    <td><a href="{$new.guidelines}/elements/{$current.element}.html" target="_blank">visit guidelines</a></td>
+                    <td class="element ident">
+                        <a href="{$new.guidelines}/elements/{$current.element}.html" target="_blank">
+                            <xsl:value-of select="$current.element"/>
+                        </a>
+                    </td>
+                    <td class="module">
+                        <xsl:value-of select="$elementSpec/@module"/>
+                    </td>
+                    <td>
+                        <xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/>
+                    </td>
+                    <td>
+                        <a href="{$new.guidelines}/elements/{$current.element}.html" target="_blank">visit guidelines</a>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
@@ -356,10 +439,18 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="elementSpec" select="$old.file//tei:elementSpec[@ident = $current.element]" as="node()"/>
                 <tr class="r" id="{$current.element}">
-                    <td class="element ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module"><xsl:value-of select="$elementSpec/@module"/></td>
-                    <td><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
-                    <td><a href="{$old.guidelines}/elements/{lower-case($current.element)}.html" target="_blank">visit guidelines</a></td>
+                    <td class="element ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module">
+                        <xsl:value-of select="$elementSpec/@module"/>
+                    </td>
+                    <td>
+                        <xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/>
+                    </td>
+                    <td>
+                        <a href="{$old.guidelines}/elements/{lower-case($current.element)}.html" target="_blank">visit guidelines</a>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
@@ -373,21 +464,27 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="elementSpec" select="$new.file//tei:elementSpec[@ident = $current.element]" as="node()"/>
                 <tr class="u">
-                    <td class="element ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module unchanged"><xsl:value-of select="$elementSpec/@module"/></td>
-                    <td class="unchanged"><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
+                    <td class="element ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module unchanged">
+                        <xsl:value-of select="$elementSpec/@module"/>
+                    </td>
+                    <td class="unchanged">
+                        <xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
     </xsl:function>
-    
+
     <xsl:function name="mei:compareAttributeClasses" as="node()*">
         <xsl:param name="new.file" as="node()"/>
         <xsl:param name="old.file" as="node()"/>
-        
+
         <xsl:variable name="new.attributes" select="distinct-values($new.file//tei:classSpec[@type = 'atts']/@ident)" as="xs:string*"/>
         <xsl:variable name="old.attributes" select="distinct-values($old.file//tei:classSpec[@type = 'atts']/@ident)" as="xs:string*"/>
-        
+
         <xsl:variable name="added.attributes" select="$new.attributes[not(. = $old.attributes)]" as="xs:string*"/>
         <xsl:variable name="removed.attributes" select="$old.attributes[not(. = $new.attributes)]" as="xs:string*"/>
         <xsl:variable name="kept.attributes" select="$new.attributes[. = $old.attributes]" as="xs:string*"/>
@@ -396,42 +493,50 @@
                 <xsl:variable name="current.attribute" select="." as="xs:string"/>
                 <xsl:variable name="new.attribute" select="$new.file//tei:classSpec[@type = 'atts' and @ident = $current.attribute]" as="node()"/>
                 <xsl:variable name="old.attribute" select="$old.file//tei:classSpec[@type = 'atts' and @ident = $current.attribute]" as="node()"/>
-                
+
                 <xsl:variable name="new.memberships" select="$new.attribute//tei:memberOf/@key" as="xs:string*"/>
                 <xsl:variable name="old.memberships" select="$old.attribute//tei:memberOf/@key" as="xs:string*"/>
                 <xsl:variable name="lowercased.new.memberships" select="$new.attribute//tei:memberOf/lower-case(@key)" as="xs:string*"/>
                 <xsl:variable name="lowercased.old.memberships" select="$old.attribute//tei:memberOf/lower-case(@key)" as="xs:string*"/>
-                
+
                 <xsl:variable name="added.memberships" select="$new.memberships[not(. = $old.memberships) and not(lower-case(.) = $lowercased.old.memberships)]" as="xs:string*"/>
                 <xsl:variable name="removed.memberships" select="$old.memberships[not(. = $new.memberships) and not(lower-case(.) = $lowercased.new.memberships)]" as="xs:string*"/>
                 <xsl:variable name="casechanged.memberships" select="$new.memberships[not(. = $old.memberships) and lower-case(.) = $lowercased.old.memberships]" as="xs:string*"/>
-                
+
                 <xsl:variable name="new.desc" select="string-join($new.attribute/tei:desc//text(),' ')" as="xs:string"/>
                 <xsl:variable name="old.desc" select="string-join($old.attribute/tei:desc//text(),' ')" as="xs:string"/>
-                
+
                 <xsl:variable name="new.content" as="xs:string*">
                     <xsl:sequence select="$new.attribute//tei:attDef/@ident"/>
                 </xsl:variable>
                 <xsl:variable name="old.content" as="xs:string*">
                     <xsl:sequence select="$old.attribute//tei:attDef/@ident"/>
                 </xsl:variable>
-                
+
                 <xsl:variable name="added.content" select="$new.content[not(. = $old.content)]" as="xs:string*"/>
                 <xsl:variable name="removed.content" select="$old.content[not(. = $new.content)]" as="xs:string*"/>
-                
+
                 <xsl:if test="count($added.memberships) gt 0 
                     or count($removed.memberships) gt 0 
                     or count($casechanged.memberships) gt 0
                     or count($added.content) gt 0
                     or count($removed.content) gt 0">
                     <tr class="c" id="{$current.attribute}">
-                        <td class="attClass ident"><xsl:value-of select="$current.attribute"/></td>
-                        <td class="module"><xsl:value-of select="$new.attribute/@module"/></td>
+                        <td class="attClass ident">
+                            <xsl:value-of select="$current.attribute"/>
+                        </td>
+                        <td class="module">
+                            <xsl:value-of select="$new.attribute/@module"/>
+                        </td>
                         <td class="desc">
                             <xsl:choose>
                                 <xsl:when test="$new.desc != $old.desc">
-                                    <span class="removed block"><xsl:value-of select="$old.desc"/></span>
-                                    <span class="added block"><xsl:value-of select="$new.desc"/></span>
+                                    <span class="removed block">
+                                        <xsl:value-of select="$old.desc"/>
+                                    </span>
+                                    <span class="added block">
+                                        <xsl:value-of select="$new.desc"/>
+                                    </span>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="$new.desc"/>
@@ -444,18 +549,30 @@
                                     <xsl:variable name="current.class" select="." as="xs:string"/>
                                     <xsl:choose>
                                         <xsl:when test="$current.class = $added.memberships">
-                                            <li class="added" title="added class"><a href="#{$current.class}"><xsl:value-of select="$current.class"/></a></li>
+                                            <li class="added" title="added class">
+                                                <a href="#{$current.class}">
+                                                    <xsl:value-of select="$current.class"/>
+                                                </a>
+                                            </li>
                                         </xsl:when>
                                         <xsl:when test="$current.class = $casechanged.memberships">
-                                            <li class="casechanged" title="was: {$old.memberships[lower-case(.) = lower-case($current.class)]}"><xsl:value-of select="$current.class"/></li>
+                                            <li class="casechanged" title="was: {$old.memberships[lower-case(.) = lower-case($current.class)]}">
+                                                <xsl:value-of select="$current.class"/>
+                                            </li>
                                         </xsl:when>
                                         <xsl:otherwise>
-                                            <li class="unchanged"><xsl:value-of select="$current.class"/></li>
+                                            <li class="unchanged">
+                                                <xsl:value-of select="$current.class"/>
+                                            </li>
                                         </xsl:otherwise>
                                     </xsl:choose>
                                 </xsl:for-each>
                                 <xsl:for-each select="$removed.memberships">
-                                    <li class="removed" title="removed class"><a href="#{.}"><xsl:value-of select="."/></a></li>
+                                    <li class="removed" title="removed class">
+                                        <a href="#{.}">
+                                            <xsl:value-of select="."/>
+                                        </a>
+                                    </li>
                                 </xsl:for-each>
                             </ul>
                         </td>
@@ -465,26 +582,42 @@
                                     <xsl:variable name="current.content" select="." as="xs:string"/>
                                     <xsl:choose>
                                         <xsl:when test="$current.content= $added.content">
-                                            <li class="added" title="added attribute"><span class="attribute"><a href="{$new.guidelines}/attribute-classes/{$current.attribute}.html" target="_blank"><xsl:value-of select="$current.content"/></a></span></li>
+                                            <li class="added" title="added attribute">
+                                                <span class="attribute">
+                                                    <a href="{$new.guidelines}/attribute-classes/{$current.attribute}.html" target="_blank">
+                                                        <xsl:value-of select="$current.content"/>
+                                                    </a>
+                                                </span>
+                                            </li>
                                         </xsl:when>
                                         <xsl:otherwise>
-                                            <li class="unchanged"><span class="attribute"><xsl:value-of select="$current.content"/></span></li>
+                                            <li class="unchanged">
+                                                <span class="attribute">
+                                                    <xsl:value-of select="$current.content"/>
+                                                </span>
+                                            </li>
                                         </xsl:otherwise>
                                     </xsl:choose>
                                 </xsl:for-each>
                                 <xsl:for-each select="$removed.content">
-                                    <li class="removed" title="removed attribute"><span class="attribute"><a href="{$old.guidelines}/attribute-classes/{lower-case($current.attribute)}.html" target="_blank"><xsl:value-of select="."/></a></span></li>
+                                    <li class="removed" title="removed attribute">
+                                        <span class="attribute">
+                                            <a href="{$old.guidelines}/attribute-classes/{lower-case($current.attribute)}.html" target="_blank">
+                                                <xsl:value-of select="."/>
+                                            </a>
+                                        </span>
+                                    </li>
                                 </xsl:for-each>
                             </ul>
                         </td>
                     </tr>
                 </xsl:if>
-                
-                
+
+
             </xsl:for-each>
         </xsl:variable>
         <xsl:variable name="unchanged.attributes" select="$kept.attributes[not(. = $modified.attributes//td[@class='attClass ident']/text())]" as="xs:string*"/>
-        
+
         <h2>Attribute Class Comparison</h2>
         <h3 id="attClassesAdded"><xsl:value-of select="count($added.attributes)"/> new attribute classes:</h3>
         <table class="added">
@@ -492,9 +625,15 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="elementSpec" select="$new.file//tei:classSpec[@type = 'atts' and @ident = $current.element]" as="node()"/>
                 <tr class="a" id="{$current.element}">
-                    <td class="attClass ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module"><xsl:value-of select="$elementSpec/@module"/></td>
-                    <td><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
+                    <td class="attClass ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module">
+                        <xsl:value-of select="$elementSpec/@module"/>
+                    </td>
+                    <td>
+                        <xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
@@ -504,9 +643,15 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="elementSpec" select="$old.file//tei:classSpec[@type = 'atts' and @ident = $current.element]" as="node()"/>
                 <tr class="r" id="{$current.element}">
-                    <td class="attClass ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module"><xsl:value-of select="$elementSpec/@module"/></td>
-                    <td><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
+                    <td class="attClass ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module">
+                        <xsl:value-of select="$elementSpec/@module"/>
+                    </td>
+                    <td>
+                        <xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
@@ -520,21 +665,27 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="elementSpec" select="$new.file//tei:classSpec[@type = 'atts' and @ident = $current.element]" as="node()"/>
                 <tr class="u" id="{$current.element}">
-                    <td class="attClass ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module unchanged"><xsl:value-of select="$elementSpec/@module"/></td>
-                    <td class="unchanged"><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
+                    <td class="attClass ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module unchanged">
+                        <xsl:value-of select="$elementSpec/@module"/>
+                    </td>
+                    <td class="unchanged">
+                        <xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
     </xsl:function>
-    
+
     <xsl:function name="mei:compareModelClasses" as="node()*">
         <xsl:param name="new.file" as="node()"/>
         <xsl:param name="old.file" as="node()"/>
-        
+
         <xsl:variable name="new.models" select="distinct-values($new.file//tei:classSpec[@type = 'model']/@ident)" as="xs:string*"/>
         <xsl:variable name="old.models" select="distinct-values($old.file//tei:classSpec[@type = 'model']/@ident)" as="xs:string*"/>
-        
+
         <xsl:variable name="added.models" select="$new.models[not(. = $old.models)]" as="xs:string*"/>
         <xsl:variable name="removed.models" select="$old.models[not(. = $new.models)]" as="xs:string*"/>
         <xsl:variable name="kept.models" select="$new.models[. = $old.models]" as="xs:string*"/>
@@ -543,30 +694,38 @@
                 <xsl:variable name="current.model" select="." as="xs:string"/>
                 <xsl:variable name="new.model" select="$new.file//tei:classSpec[@type = 'model' and @ident = $current.model]" as="node()"/>
                 <xsl:variable name="old.model" select="$old.file//tei:classSpec[@type = 'model' and @ident = $current.model]" as="node()"/>
-                
+
                 <xsl:variable name="new.memberships" select="$new.model//tei:memberOf/@key" as="xs:string*"/>
                 <xsl:variable name="old.memberships" select="$old.model//tei:memberOf/@key" as="xs:string*"/>
                 <xsl:variable name="lowercased.new.memberships" select="$new.model//tei:memberOf/lower-case(@key)" as="xs:string*"/>
                 <xsl:variable name="lowercased.old.memberships" select="$old.model//tei:memberOf/lower-case(@key)" as="xs:string*"/>
-                
+
                 <xsl:variable name="added.memberships" select="$new.memberships[not(. = $old.memberships) and not(lower-case(.) = $lowercased.old.memberships)]" as="xs:string*"/>
                 <xsl:variable name="removed.memberships" select="$old.memberships[not(. = $new.memberships) and not(lower-case(.) = $lowercased.new.memberships)]" as="xs:string*"/>
                 <xsl:variable name="casechanged.memberships" select="$new.memberships[not(. = $old.memberships) and lower-case(.) = $lowercased.old.memberships]" as="xs:string*"/>
-                
+
                 <xsl:variable name="new.desc" select="string-join($new.model/tei:desc//text(),' ')" as="xs:string"/>
                 <xsl:variable name="old.desc" select="string-join($old.model/tei:desc//text(),' ')" as="xs:string"/>
-                
+
                 <xsl:if test="count($added.memberships) gt 0 
                     or count($removed.memberships) gt 0 
                     or count($casechanged.memberships) gt 0">
                     <tr class="c" id="{$current.model}">
-                        <td class="modelClass ident"><xsl:value-of select="$current.model"/></td>
-                        <td class="module"><xsl:value-of select="$new.model/@module"/></td>
+                        <td class="modelClass ident">
+                            <xsl:value-of select="$current.model"/>
+                        </td>
+                        <td class="module">
+                            <xsl:value-of select="$new.model/@module"/>
+                        </td>
                         <td class="desc">
                             <xsl:choose>
                                 <xsl:when test="$new.desc != $old.desc">
-                                    <span class="removed block"><xsl:value-of select="$old.desc"/></span>
-                                    <span class="added block"><xsl:value-of select="$new.desc"/></span>
+                                    <span class="removed block">
+                                        <xsl:value-of select="$old.desc"/>
+                                    </span>
+                                    <span class="added block">
+                                        <xsl:value-of select="$new.desc"/>
+                                    </span>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="$new.desc"/>
@@ -579,29 +738,37 @@
                                     <xsl:variable name="current.class" select="." as="xs:string"/>
                                     <xsl:choose>
                                         <xsl:when test="$current.class= $added.memberships">
-                                            <li class="added model" title="added model"><xsl:value-of select="$current.class"/></li>
+                                            <li class="added model" title="added model">
+                                                <xsl:value-of select="$current.class"/>
+                                            </li>
                                         </xsl:when>
                                         <xsl:when test="$current.class = $casechanged.memberships">
-                                            <li class="casechanged model" title="was: {$old.memberships[lower-case(.) = lower-case($current.class)]}"><xsl:value-of select="$current.class"/></li>
+                                            <li class="casechanged model" title="was: {$old.memberships[lower-case(.) = lower-case($current.class)]}">
+                                                <xsl:value-of select="$current.class"/>
+                                            </li>
                                         </xsl:when>
                                         <xsl:otherwise>
-                                            <li class="unchanged model"><xsl:value-of select="$current.class"/></li>
+                                            <li class="unchanged model">
+                                                <xsl:value-of select="$current.class"/>
+                                            </li>
                                         </xsl:otherwise>
                                     </xsl:choose>
                                 </xsl:for-each>
                                 <xsl:for-each select="$removed.memberships">
-                                    <li class="removed model" title="removed model"><xsl:value-of select="."/></li>
+                                    <li class="removed model" title="removed model">
+                                        <xsl:value-of select="."/>
+                                    </li>
                                 </xsl:for-each>
                             </ul>
                         </td>
                     </tr>
                 </xsl:if>
-                
-                
+
+
             </xsl:for-each>
         </xsl:variable>
         <xsl:variable name="unchanged.models" select="$kept.models[not(. = $modified.models//td[@class='modelClass ident']/text())]" as="xs:string*"/>
-        
+
         <h2>Model Class Comparison</h2>
         <h3 id="modelClassesAdded"><xsl:value-of select="count($added.models)"/> new model classes:</h3>
         <table class="added">
@@ -609,9 +776,15 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="elementSpec" select="$new.file//tei:classSpec[@type = 'model' and @ident = $current.element]" as="node()"/>
                 <tr class="a" id="${$current.element}">
-                    <td class="modelClass ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module"><xsl:value-of select="$elementSpec/@module"/></td>
-                    <td><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
+                    <td class="modelClass ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module">
+                        <xsl:value-of select="$elementSpec/@module"/>
+                    </td>
+                    <td>
+                        <xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
@@ -621,9 +794,15 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="elementSpec" select="$old.file//tei:classSpec[@type = 'model' and @ident = $current.element]" as="node()"/>
                 <tr class="r" id="{$current.element}">
-                    <td class="modelClass ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module"><xsl:value-of select="$elementSpec/@module"/></td>
-                    <td><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
+                    <td class="modelClass ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module">
+                        <xsl:value-of select="$elementSpec/@module"/>
+                    </td>
+                    <td>
+                        <xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
@@ -637,48 +816,36 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="elementSpec" select="$new.file//tei:classSpec[@type = 'model' and @ident = $current.element]" as="node()"/>
                 <tr class="u" id="{$current.element}">
-                    <td class="modelClass ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module unchanged"><xsl:value-of select="$elementSpec/@module"/></td>
-                    <td class="unchanged"><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
+                    <td class="modelClass ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module unchanged">
+                        <xsl:value-of select="$elementSpec/@module"/>
+                    </td>
+                    <td class="unchanged">
+                        <xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
     </xsl:function>
-    
+
     <xsl:function name="mei:compareMacroSpec" as="node()*">
         <xsl:param name="new.file" as="node()"/>
         <xsl:param name="old.file" as="node()"/>
-        
-        <xsl:variable name="new.macros" select="distinct-values($new.file//tei:macroSpec[@type = 'pe' or not(@type)]/@ident)" as="xs:string*"/>
-        <xsl:variable name="old.macros" select="distinct-values($old.file//tei:macroSpec[@type = 'pe' or not(@type)]/@ident)" as="xs:string*"/>
-        
+
+        <xsl:variable name="new.macros" select="distinct-values($new.file//tei:macroSpec[not(@type = 'dt')]/@ident)" as="xs:string*"/>
+        <xsl:variable name="old.macros" select="distinct-values($old.file//tei:macroSpec[not(@type = 'dt')]/@ident)" as="xs:string*"/>
+
         <xsl:variable name="added.macros" select="$new.macros[not(. = $old.macros)]" as="xs:string*"/>
         <xsl:variable name="removed.macros" select="$old.macros[not(. = $new.macros)]" as="xs:string*"/>
         <xsl:variable name="kept.macros" select="$new.macros[. = $old.macros]" as="xs:string*"/>
         <xsl:variable name="modified.macros" as="node()*">
             <xsl:for-each select="$kept.macros">
                 <xsl:variable name="current.macro" select="." as="xs:string"/>
-                <xsl:variable name="new.model" as="node()">
-                    <xsl:choose>
-                        <xsl:when test="$new.file//tei:macroSpec[@type = 'pe']">
-                            <xsl:value-of select="$new.file//tei:macroSpec[@type = 'pe' and @ident = $current.macro]"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="$new.file//tei:macroSpec[@ident = $current.macro]"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:variable>
-                <xsl:variable name="old.model" as="node()">
-                    <xsl:choose>
-                        <xsl:when test="$old.file//tei:macroSpec[@type = 'pe']">
-                            <xsl:value-of select="$old.file//tei:macroSpec[@type = 'pe' and @ident = $current.macro]"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="$old.file//tei:macroSpec[@ident = $current.macro]"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:variable>
-                
+                <xsl:variable name="new.model" select="$new.file//tei:macroSpec[not(@type = 'dt') and @ident = $current.macro]" as="node()"/>
+                <xsl:variable name="old.model" select="$old.file//tei:macroSpec[not(@type = 'dt') and @ident = $current.macro]" as="node()"/>
+
                 <xsl:variable name="new.content" as="xs:string*">
                     <xsl:sequence select="$new.model//rng:ref[@name != 'macro.anyXML']/@name"/>
                     <xsl:if test="$new.model//rng:element[rng:anyName]">
@@ -699,25 +866,33 @@
                 </xsl:variable>
                 <xsl:variable name="lowercased.new.content" select="for $content in $new.content return lower-case($content)" as="xs:string*"/>
                 <xsl:variable name="lowercased.old.content" select="for $content in $old.content return lower-case($content)" as="xs:string*"/>
-                
+
                 <xsl:variable name="added.content" select="$new.content[not(. = $old.content) and not(lower-case(.) = $lowercased.old.content)]" as="xs:string*"/>
                 <xsl:variable name="removed.content" select="$old.content[not(. = $new.content) and not(lower-case(.) = $lowercased.new.content)]" as="xs:string*"/>
                 <xsl:variable name="casechanged.content" select="$new.content[not(. = $old.content) and lower-case(.) = $lowercased.old.content]" as="xs:string*"/>
-                
+
                 <xsl:variable name="new.desc" select="string-join($new.model/tei:desc//text(),' ')" as="xs:string"/>
                 <xsl:variable name="old.desc" select="string-join($old.model/tei:desc//text(),' ')" as="xs:string"/>
-                
+
                 <xsl:if test="count($added.content) gt 0 
                     or count($removed.content) gt 0 
                     or count($casechanged.content) gt 0">
                     <tr class="c" id="{$current.macro}">
-                        <td class="macroClass ident"><xsl:value-of select="$current.macro"/></td>
-                        <td class="module"><xsl:value-of select="$new.model/@module"/></td>
+                        <td class="macroClass ident">
+                            <xsl:value-of select="$current.macro"/>
+                        </td>
+                        <td class="module">
+                            <xsl:value-of select="$new.model/@module"/>
+                        </td>
                         <td class="desc">
                             <xsl:choose>
                                 <xsl:when test="$new.desc != $old.desc">
-                                    <span class="removed block"><xsl:value-of select="$old.desc"/></span>
-                                    <span class="added block"><xsl:value-of select="$new.desc"/></span>
+                                    <span class="removed block">
+                                        <xsl:value-of select="$old.desc"/>
+                                    </span>
+                                    <span class="added block">
+                                        <xsl:value-of select="$new.desc"/>
+                                    </span>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="$new.desc"/>
@@ -730,29 +905,37 @@
                                     <xsl:variable name="current.content" select="." as="xs:string"/>
                                     <xsl:choose>
                                         <xsl:when test="$current.content= $added.content">
-                                            <li class="added macro pe" title="added macro"><xsl:value-of select="$current.content"/></li>
+                                            <li class="added macro pe" title="added macro">
+                                                <xsl:value-of select="$current.content"/>
+                                            </li>
                                         </xsl:when>
                                         <xsl:when test="$current.content = $casechanged.content">
-                                            <li class="casechanged macro pe" title="was: {$old.content[lower-case(.) = lower-case($current.content)]}"><xsl:value-of select="$current.content"/></li>
+                                            <li class="casechanged macro pe" title="was: {$old.content[lower-case(.) = lower-case($current.content)]}">
+                                                <xsl:value-of select="$current.content"/>
+                                            </li>
                                         </xsl:when>
                                         <xsl:otherwise>
-                                            <li class="unchanged macro pe"><xsl:value-of select="$current.content"/></li>
+                                            <li class="unchanged macro pe">
+                                                <xsl:value-of select="$current.content"/>
+                                            </li>
                                         </xsl:otherwise>
                                     </xsl:choose>
                                 </xsl:for-each>
                                 <xsl:for-each select="$removed.content">
-                                    <li class="removed macro pe" title="removed macro"><xsl:value-of select="."/></li>
+                                    <li class="removed macro pe" title="removed macro">
+                                        <xsl:value-of select="."/>
+                                    </li>
                                 </xsl:for-each>
                             </ul>
                         </td>
                     </tr>
                 </xsl:if>
-                
-                
+
+
             </xsl:for-each>
         </xsl:variable>
         <xsl:variable name="unchanged.macros" select="$kept.macros[not(. = $modified.macros//td[@class='macroClass ident']/text())]" as="xs:string*"/>
-        
+
         <h2>MacroSpec Comparison (Parameter Entities)</h2>
         <h3 id="macroAdded"><xsl:value-of select="count($added.macros)"/> new macroSpec classes:</h3>
         <table class="added">
@@ -769,9 +952,15 @@
                     </xsl:choose>
                 </xsl:variable>
                 <tr class="a" id="${$current.element}">
-                    <td class="macroClass ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module"><xsl:value-of select="$elementSpec/@module"/></td>
-                    <td><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
+                    <td class="macroClass ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module">
+                        <xsl:value-of select="$elementSpec/@module"/>
+                    </td>
+                    <td>
+                        <xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
@@ -779,23 +968,18 @@
         <table class="removed">
             <xsl:for-each select="$removed.macros">
                 <xsl:variable name="current.element" select="." as="xs:string"/>
-                <xsl:variable name="elementSpec" as="node()">
-                    <xsl:choose>
-                        <xsl:when test="$old.file//tei:macroSpec[@type = 'pe']">
-                            <xsl:value-of select="$old.file//tei:macroSpec[@type = 'pe' and @ident = $current.element]"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="$old.file//tei:macroSpec[not(@type) and @ident = $current.element]"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:variable>
-                <if test="not starts-with(current.element, 'data')">
-                    <tr class="r" id="{$current.element}">
-                        <td class="macroClass ident"><xsl:value-of select="$current.element"/></td>
-                        <td class="module"><xsl:value-of select="$elementSpec/@module"/></td>
-                        <td><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
-                    </tr>
-                </if>
+                <xsl:variable name="elementSpec" select="$old.file//tei:macroSpec[not(@type = 'dt') and @ident = $current.element]" as="node()"/>
+                <tr class="r" id="{$current.element}">
+                    <td class="macroClass ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module">
+                        <xsl:value-of select="$elementSpec/@module"/>
+                    </td>
+                    <td>
+                        <xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/>
+                    </td>
+                </tr>
             </xsl:for-each>
         </table>
         <h3 id="macroChanged"><xsl:value-of select="count($modified.macros)"/> modified macroSpec classes:</h3>
@@ -806,32 +990,29 @@
         <table>
             <xsl:for-each select="$unchanged.macros">
                 <xsl:variable name="current.element" select="." as="xs:string"/>
-                <xsl:variable name="elementSpec" as="node()">
-                    <xsl:choose>
-                        <xsl:when test="$new.file//tei:macroSpec[@type = 'pe']">
-                            <xsl:value-of select="$new.file//tei:macroSpec[@type = 'pe' and @ident = $current.element]"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:value-of select="$new.file//tei:macroSpec[@ident = $current.element]"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:variable>
+                <xsl:variable name="elementSpec" select="$new.file//tei:macroSpec[not(@type = 'dt') and @ident = $current.element]" as="node()"/>
                 <tr class="u" id="{$current.element}">
-                    <td class="macroClass ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module unchanged"><xsl:value-of select="$elementSpec/@module"/></td>
-                    <td class="unchanged"><xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/></td>
+                    <td class="macroClass ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module unchanged">
+                        <xsl:value-of select="$elementSpec/@module"/>
+                    </td>
+                    <td class="unchanged">
+                        <xsl:value-of select="string-join($elementSpec/tei:desc//text(),' ')"/>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
     </xsl:function>
-    
+
     <xsl:function name="mei:compareDataSpec" as="node()*">
         <xsl:param name="new.file" as="node()"/>
         <xsl:param name="old.file" as="node()"/>
-        
+
         <xsl:variable name="new.models" select="distinct-values($new.file//(tei:dataSpec|tei:macroSpec[@type = 'dt'])/@ident)" as="xs:string*"/>
         <xsl:variable name="old.models" select="distinct-values($old.file//(tei:dataSpec|tei:macroSpec[@type = 'dt'])/@ident)" as="xs:string*"/>
-        
+
         <xsl:variable name="added.models" select="$new.models[not(. = $old.models)]" as="xs:string*"/>
         <xsl:variable name="removed.models" select="$old.models[not(. = $new.models)]" as="xs:string*"/>
         <xsl:variable name="kept.models" select="$new.models[. = $old.models]" as="xs:string*"/>
@@ -840,19 +1021,19 @@
                 <xsl:variable name="current.macro" select="." as="xs:string"/>
                 <xsl:variable name="new.macro" select="$new.file//(tei:dataSpec[@ident = $current.macro]|tei:macroSpec[@type = 'dt' and @ident = $current.macro])" as="node()"/>
                 <xsl:variable name="old.macro" select="$old.file//(tei:dataSpec[@ident = $current.macro]|tei:macroSpec[@type = 'dt' and @ident = $current.macro])" as="node()"/>
-                
+
                 <xsl:variable name="new.references" select="$new.macro//rng:ref/@name | $new.macro//tei:macroRef/@key" as="xs:string*"/>
                 <xsl:variable name="old.references" select="$old.macro//rng:ref/@name | $new.macro//tei:macroRef/@key" as="xs:string*"/>
                 <xsl:variable name="lowercased.new.references" select="for $ref in $new.references return lower-case($ref)" as="xs:string*"/>
                 <xsl:variable name="lowercased.old.references" select="for $ref in $old.references return lower-case($ref)" as="xs:string*"/>
-                
+
                 <xsl:variable name="added.references" select="$new.references[not(. = $old.references) and not(lower-case(.) = $lowercased.old.references)]" as="xs:string*"/>
                 <xsl:variable name="removed.references" select="$old.references[not(. = $new.references) and not(lower-case(.) = $lowercased.new.references)]" as="xs:string*"/>
                 <xsl:variable name="casechanged.references" select="$new.references[not(. = $old.references) and lower-case(.) = $lowercased.old.references]" as="xs:string*"/>
-                
+
                 <xsl:variable name="new.desc" select="string-join($new.macro/tei:desc//text(),' ')" as="xs:string"/>
                 <xsl:variable name="old.desc" select="string-join($old.macro/tei:desc//text(),' ')" as="xs:string"/>
-                
+
                 <xsl:variable name="new.values" as="xs:string*">
                     <xsl:sequence select="$new.macro//tei:valItem/@ident"/>
                     <xsl:sequence select="$new.macro//rng:data[not(ancestor::rng:except)]/mei:resolveDataType(.)"/>
@@ -861,23 +1042,31 @@
                     <xsl:sequence select="$old.macro//tei:valItem/@ident"/>
                     <xsl:sequence select="$old.macro//rng:data[not(ancestor::rng:except)]/mei:resolveDataType(.)"/>
                 </xsl:variable>
-                
+
                 <xsl:variable name="added.values" select="$new.values[not(. = $old.values)]" as="xs:string*"/>
                 <xsl:variable name="removed.values" select="$old.values[not(. = $new.values)]" as="xs:string*"/>
-                
+
                 <xsl:if test="count($added.references) gt 0 
                     or count($removed.references) gt 0 
                     or count($casechanged.references) gt 0
                     or count($added.values) gt 0
                     or count($removed.values) gt 0">
                     <tr class="c" id="{$current.macro}">
-                        <td class="macroSpec datatype ident"><xsl:value-of select="$current.macro"/></td>
-                        <td class="module"><xsl:value-of select="$new.macro/@module"/></td>
+                        <td class="macroSpec datatype ident">
+                            <xsl:value-of select="$current.macro"/>
+                        </td>
+                        <td class="module">
+                            <xsl:value-of select="$new.macro/@module"/>
+                        </td>
                         <td class="desc">
                             <xsl:choose>
                                 <xsl:when test="$new.desc != $old.desc">
-                                    <span class="removed block"><xsl:value-of select="$old.desc"/></span>
-                                    <span class="added block"><xsl:value-of select="$new.desc"/></span>
+                                    <span class="removed block">
+                                        <xsl:value-of select="$old.desc"/>
+                                    </span>
+                                    <span class="added block">
+                                        <xsl:value-of select="$new.desc"/>
+                                    </span>
                                 </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:value-of select="$new.desc"/>
@@ -890,18 +1079,26 @@
                                     <xsl:variable name="current.ref" select="." as="xs:string"/>
                                     <xsl:choose>
                                         <xsl:when test="$current.ref= $added.references">
-                                            <li class="added macro datatype" title="added macroSpec"><xsl:value-of select="$current.ref"/></li>
+                                            <li class="added macro datatype" title="added macroSpec">
+                                                <xsl:value-of select="$current.ref"/>
+                                            </li>
                                         </xsl:when>
                                         <xsl:when test="$current.ref = $casechanged.references">
-                                            <li class="casechanged macro datatype" title="was: {$old.references[lower-case(.) = lower-case($current.ref)]}"><xsl:value-of select="$current.ref"/></li>
+                                            <li class="casechanged macro datatype" title="was: {$old.references[lower-case(.) = lower-case($current.ref)]}">
+                                                <xsl:value-of select="$current.ref"/>
+                                            </li>
                                         </xsl:when>
                                         <xsl:otherwise>
-                                            <li class="unchanged macro datatype"><xsl:value-of select="$current.ref"/></li>
+                                            <li class="unchanged macro datatype">
+                                                <xsl:value-of select="$current.ref"/>
+                                            </li>
                                         </xsl:otherwise>
                                     </xsl:choose>
                                 </xsl:for-each>
                                 <xsl:for-each select="$removed.references">
-                                    <li class="removed macro datatype" title="removed macroSpec"><xsl:value-of select="."/></li>
+                                    <li class="removed macro datatype" title="removed macroSpec">
+                                        <xsl:value-of select="."/>
+                                    </li>
                                 </xsl:for-each>
                             </ul>
                         </td>
@@ -911,26 +1108,32 @@
                                     <xsl:variable name="current.value" select="." as="xs:string"/>
                                     <xsl:choose>
                                         <xsl:when test="$current.value= $added.values">
-                                            <li class="added datatype value" title="added value"><xsl:value-of select="$current.value"/></li>
+                                            <li class="added datatype value" title="added value">
+                                                <xsl:value-of select="$current.value"/>
+                                            </li>
                                         </xsl:when>
                                         <xsl:otherwise>
-                                            <li class="unchanged datatype value"><xsl:value-of select="$current.value"/></li>
+                                            <li class="unchanged datatype value">
+                                                <xsl:value-of select="$current.value"/>
+                                            </li>
                                         </xsl:otherwise>
                                     </xsl:choose>
                                 </xsl:for-each>
                                 <xsl:for-each select="$removed.values">
-                                    <li class="removed datatype value" title="removed value"><xsl:value-of select="."/></li>
+                                    <li class="removed datatype value" title="removed value">
+                                        <xsl:value-of select="."/>
+                                    </li>
                                 </xsl:for-each>
                             </ul>
                         </td>
                     </tr>
                 </xsl:if>
-                
-                
+
+
             </xsl:for-each>
         </xsl:variable>
         <xsl:variable name="unchanged.models" select="$kept.models[not(. = $modified.models//td[@class='macroSpec datatype ident']/text())]" as="xs:string*"/>
-        
+
         <h2>DataSpec Comparison (datatypes)</h2>
         <h3 id="dataSpecAdded"><xsl:value-of select="count($added.models)"/> new dataSpecs:</h3>
         <table class="added">
@@ -938,9 +1141,15 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="dataSpec" select="$new.file//(tei:dataSpec[@ident = $current.element]|tei:macroSpec[@type = 'dt' and @ident = $current.element])" as="node()"/>
                 <tr class="a" id="{$current.element}">
-                    <td class="dataSpec datatype ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module"><xsl:value-of select="$dataSpec/@module"/></td>
-                    <td><xsl:value-of select="string-join($dataSpec/tei:desc//text(),' ')"/></td>
+                    <td class="dataSpec datatype ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module">
+                        <xsl:value-of select="$dataSpec/@module"/>
+                    </td>
+                    <td>
+                        <xsl:value-of select="string-join($dataSpec/tei:desc//text(),' ')"/>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
@@ -950,9 +1159,15 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="dataSpec" select="$old.file//(tei:dataSpec[@ident = $current.element]|tei:macroSpec[@type = 'dt' and @ident = $current.element])" as="node()"/>
                 <tr class="r" id="{$current.element}">
-                    <td class="dataSpec datatype ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module"><xsl:value-of select="$dataSpec/@module"/></td>
-                    <td><xsl:value-of select="string-join($dataSpec/tei:desc//text(),' ')"/></td>
+                    <td class="dataSpec datatype ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module">
+                        <xsl:value-of select="$dataSpec/@module"/>
+                    </td>
+                    <td>
+                        <xsl:value-of select="string-join($dataSpec/tei:desc//text(),' ')"/>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
@@ -966,9 +1181,15 @@
                 <xsl:variable name="current.element" select="." as="xs:string"/>
                 <xsl:variable name="dataSpec" select="$new.file//(tei:dataSpec[@ident = $current.element]|tei:macroSpec[@type = 'dt' and @ident = $current.element])" as="node()"/>
                 <tr class="u" id="{$current.element}">
-                    <td class="dataSpec datatype ident"><xsl:value-of select="$current.element"/></td>
-                    <td class="module unchanged"><xsl:value-of select="$dataSpec/@module"/></td>
-                    <td class="unchanged"><xsl:value-of select="string-join($dataSpec/tei:desc//text(),' ')"/></td>
+                    <td class="dataSpec datatype ident">
+                        <xsl:value-of select="$current.element"/>
+                    </td>
+                    <td class="module unchanged">
+                        <xsl:value-of select="$dataSpec/@module"/>
+                    </td>
+                    <td class="unchanged">
+                        <xsl:value-of select="string-join($dataSpec/tei:desc//text(),' ')"/>
+                    </td>
                 </tr>
             </xsl:for-each>
         </table>
@@ -986,7 +1207,7 @@
                         <xsl:value-of select="string($data/@type)"/>
                     </xsl:otherwise>
                 </xsl:choose>
-                
+
             </xsl:when>
             <xsl:when test="ends-with(lower-case($data/@type),'integer') or $data/@type = 'decimal'">
                 <xsl:choose>
@@ -1051,7 +1272,7 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:function>
-    
+
     <xsl:function name="mei:resolveAttClass" as="node()*">
         <xsl:param name="class.name" as="xs:string"/>
         <xsl:param name="file" as="node()"/>
@@ -1059,37 +1280,37 @@
         <xsl:sequence select="$att.class//tei:attDef"/>
         <xsl:sequence select="for $inherited.class in $att.class//tei:memberOf[starts-with(@key,'att.')]/@key return mei:resolveAttClass($inherited.class,$file)"/>
     </xsl:function>
-    
+
     <!-- older versions of MEI did not have xml:lang attributes on desc -->
     <xsl:template match="@xml:lang" mode="simplify-space" priority="1"/>
-    
+
     <xsl:template match="tei:abbr" mode="prep">
         <xsl:apply-templates select="node()" mode="#current"/>
     </xsl:template>
-    
+
     <xsl:template match="tei:*" mode="prep simplify-space">
         <xsl:element name="{local-name()}" namespace="http://www.tei-c.org/ns/1.0">
             <xsl:apply-templates select="node()" mode="#current"/>
         </xsl:element>
     </xsl:template>
-    
+
     <xsl:template match="rng:*" mode="prep simplify-space">
         <xsl:element name="{local-name()}" namespace="http://relaxng.org/ns/structure/1.0">
             <xsl:apply-templates select="node()" mode="#current"/>
         </xsl:element>
     </xsl:template>
-    
+
     <xsl:template match="sch:*" mode="prep simplify-space">
         <xsl:element name="{local-name()}" namespace="http://purl.oclc.org/dsdl/schematron">
             <xsl:apply-templates select="node()" mode="#current"/>
         </xsl:element>
     </xsl:template>
-    
+
     <xsl:template match="text()" mode="simplify-space" priority="1">
         <xsl:variable name="ticks">['’]</xsl:variable>
         <xsl:value-of select="normalize-space(replace(.,$ticks, ''))"/>
     </xsl:template>
-    
+
     <xd:doc>
         <xd:desc>
             <xd:p>This is a generic copy template which will copy all content in all modes</xd:p>
@@ -1100,6 +1321,6 @@
             <xsl:apply-templates select="node() | @*" mode="#current"/>
         </xsl:copy>
     </xsl:template>
-    
-    
+
+
 </xsl:stylesheet>
\ No newline at end of file