Merge pull request #8 from mpsonntag/style

[1.1] Stylesheet update

v1.1/analysis/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/blackrock/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/carmenMini/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/cell/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/collection/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/dataset/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/electrode/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/environment/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/event/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/experiment/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/hardware/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/license/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/model/odmlTerms.xsl

@@ -128,18 +128,15 @@
                <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
             </p>
 
-            <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
             <!--  Check if there are any properties  -->
             <xsl:if test="property">
                <table border="1" rules="rows" width="100%"><font size="-1">
-                  <tr bgcolor="#336699">
+                  <tr bgcolor="#336699" align="left" valign="middle">
                      <th><font size="+1" color="white"><b>Name</b></font></th>
                      <th><font size="+1" color="white"><b>Value</b></font></th>
                      <th><font size="+1" color="white"><b>Unit</b></font></th>
                      <th><font size="+1" color="white"><b>Type</b></font></th>
                      <th><font size="+1" color="white"><b>Definition</b></font></th>
-                     <th><font size="+1" color="white"><b>Mapping</b></font></th>
                      <th><font size="+1" color="white"><b>Dependency</b></font></th>
                      <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
                   </tr>
@@ -151,30 +148,10 @@
                         <td width="15%"><a name="{$anchor}"/>
                            <p><xsl:value-of select="name"/></p>
                         </td>
-                        <td width="10%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="text()"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="unit"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="type"/><br/></p>
-                           </xsl:for-each>
-                        </td>
+                        <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                        <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                        <td width="5%"><p><xsl:value-of select="type"/></p></td>
                         <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                        <td width="10%">
-                           <p>
-                              <xsl:for-each select="mapping">
-                                 <xsl:variable name="mapping" select="."/>
-                                 <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                              </xsl:for-each>
-                           </p>
-                        </td>
                         <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                         <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
                      </tr>

v1.1/odML.xsd

@@ -5,31 +5,19 @@
   <!-- THE PROPERTY TYPE IS THE BUILDING BLOCK OF ALL odML METADATA. -->
   <!-- PROPERTIES BASICALLY CONSIST OF name/value PAIRS. -->
   <!-- -->
-  <!-- A: Value Subtype -->
-  <xs:element name ="value" type="xs:string">
-    <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="uncertainty" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="unit" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="reference" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="definition" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="filename" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="encoder" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="checksum" minOccurs="0" maxOccurs="1"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <!-- B: Property -->
   <xs:element name ="property">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <!-- if there is a NAME there must also be a VALUE -->
         <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
-        <xs:element ref="value" minOccurs="1" maxOccurs="unbounded"/>
+        <xs:element name="value" minOccurs="1" maxOccurs="unbounded"/>
         <!-- all other elements are optional -->
+        <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="uncertainty" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="unit" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="reference" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="value_origin" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="definition" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="mapping" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="dependency" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="dependencyValue" type="xs:string" minOccurs="0" maxOccurs="1"/>
       </xs:choice>
@@ -48,7 +36,6 @@
         <xs:element name="link" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="include" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="repository" type="xs:string" minOccurs="0" maxOccurs="1"/>
-        <xs:element name="mapping" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element ref="property" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element ref="section" minOccurs="0" maxOccurs="unbounded"/>
       </xs:choice>

v1.1/odml.xsl

@@ -117,25 +117,24 @@
                <b>Link: </b><xsl:if test="link"><xsl:value-of select="link"/></xsl:if><br/>
                <b>Include:</b> <xsl:if test="include"><font color="red"><xsl:value-of select="include"/></font></xsl:if><br/>
                <b>Definition:</b> <xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
-               <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
             </p>
 
             <!--  Check if there are any properties  -->
             <xsl:if test="property">
                <table border="1" rules="rows" width="100%"><font size ="-1">
-                  <tr bgcolor="#336699">
+                  <tr bgcolor="#336699" valign="middle" align="left">
                      <th><font size="+1" color="white"><b>Name</b></font></th>
                      <th><font size="+1" color="white"><b>Value</b></font></th>
                      <th><font size="+1" color="white"><b>Uncertainty</b></font></th>
                      <th><font size="+1" color="white"><b>Unit</b></font></th>
-                     <th><font size="+1" color="white"><b>value reference</b></font></th>
                      <th><font size="+1" color="white"><b>Type</b></font></th>
-                     <th><font size="+1" color="white"><b>Comment</b></font></th>
+                     <th><font size="+1" color="white"><b>Reference</b></font></th>
+                     <th><font size="+1" color="white"><b>Definition</b></font></th>
+                     <th><font size="+1" color="white"><b>Value origin</b></font></th>
                      <!--
                        <th><font size="+1" color="white"><b>Dependency</b></font></th>
                        <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
                      -->
-                     <th><font size="+1" color="white"><b>Definition</b></font></th>
                   </tr>
                   <xsl:for-each select="property">
                      <xsl:variable name="anchor">
@@ -145,41 +144,17 @@
                         <td width="15%"><a name="{$anchor}"/>
                            <p><xsl:value-of select="name"/></p>
                         </td>
-                        <td width="10%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="text()"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="uncertainty"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="unit"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="reference"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="type"/><br/></p>
-                           </xsl:for-each>
-                        </td>
-                        <td width="22.5%">
-                           <xsl:for-each select="value">
-                              <p><xsl:value-of select="comment"/><br/></p>
-                           </xsl:for-each>
-                        </td>
+                        <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                        <td width="5%"><p><xsl:value-of select="uncertainty"/></p></td>
+                        <td width="5%"><p><xsl:value-of select="unit"/></p></td>
+                        <td width="5%"><p><xsl:value-of select="type"/></p></td>
+                        <td width="5%"><p><xsl:value-of select="reference"/></p></td>
+                        <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
+                        <td width="7.5%%"><p><xsl:value-of select="value_origin"/></p></td>
                         <!--
                           <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                           <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
                         -->
-                        <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
                      </tr>
                   </xsl:for-each></font>
                </table>

v1.1/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/person/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/preparation/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/project/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/protocol/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/questionnaire/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/recording/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/response/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/setup/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/software/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/stimulus/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>

v1.1/subject/odmlTerms.xsl

@@ -128,18 +128,15 @@
           <b>Definition: </b><xsl:if test="definition"><xsl:value-of select="definition"/></xsl:if><br/>
         </p>
 
-        <b>Mapping: </b>   <xsl:if test="mapping"><xsl:value-of select="mapping"/></xsl:if><br/>
-
         <!--  Check if there are any properties  -->
         <xsl:if test="property">
           <table border="1" rules="rows" width="100%"><font size="-1">
-            <tr bgcolor="#336699">
+            <tr bgcolor="#336699" align="left" valign="middle">
               <th><font size="+1" color="white"><b>Name</b></font></th>
               <th><font size="+1" color="white"><b>Value</b></font></th>
               <th><font size="+1" color="white"><b>Unit</b></font></th>
               <th><font size="+1" color="white"><b>Type</b></font></th>
               <th><font size="+1" color="white"><b>Definition</b></font></th>
-              <th><font size="+1" color="white"><b>Mapping</b></font></th>
               <th><font size="+1" color="white"><b>Dependency</b></font></th>
               <th><font size="+1" color="white"><b>Dependency Value</b></font></th>
             </tr>
@@ -151,30 +148,10 @@
                 <td width="15%"><a name="{$anchor}"/>
                   <p><xsl:value-of select="name"/></p>
                 </td>
-                <td width="10%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="text()"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="unit"/><br/></p>
-                  </xsl:for-each>
-                </td>
-                <td width="5%">
-                  <xsl:for-each select="value">
-                    <p><xsl:value-of select="type"/><br/></p>
-                  </xsl:for-each>
-                </td>
+                <td width="10%"><p><xsl:value-of select="value"/></p></td>
+                <td width="5%"><p><xsl:value-of select="unit"/><br/></p></td>
+                <td width="5%"><p><xsl:value-of select="type"/></p></td>
                 <td width="22.5%"><p><xsl:value-of select="definition"/></p></td>
-                <td width="10%">
-                  <p>
-                    <xsl:for-each select="mapping">
-                      <xsl:variable name="mapping" select="."/>
-                      <p><a href="{$mapping}"><small><xsl:value-of select="."/></small></a></p>
-                    </xsl:for-each>
-                  </p>
-                </td>
                 <td width="5%"><p><xsl:value-of select="dependency"/></p></td>
                 <td width="5%"><p><xsl:value-of select="dependencyValue"/></p></td>
               </tr>