metanorma-ogc 2.4.2 → 2.4.6

data/lib/isodoc/ogc/ogc.release-notes.xsl

@@ -1138,7 +1138,7 @@
 					</fo:list-item-label>
 					<fo:list-item-body start-indent="body-start()">
 						<fo:block>
-							<xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:admitted" mode="term_name"/>
+							<xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:deprecates | ../ogc:admitted" mode="term_name"/>
 						</fo:block>
 					</fo:list-item-body>
 				</fo:list-item>
@@ -1147,7 +1147,7 @@
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" priority="2"/>
+	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" priority="2"/>
 
 	<!-- first preferred displays on the same line as term/name -->
 	<xsl:template match="ogc:preferred[not(preceding-sibling::ogc:preferred)]" mode="term_name" priority="2">
@@ -1155,9 +1155,9 @@
 		<fo:inline padding-right="2mm"> </fo:inline>
 	</xsl:template>
 
-	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" mode="term_name">
+	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" mode="term_name">
 		<xsl:choose>
-			<xsl:when test="preceding-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
+			<xsl:when test="preceding-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::admitted]">
 				<fo:block space-before="6pt"><xsl:call-template name="displayTerm"/></fo:block> <!-- block wrapper -->
 			</xsl:when>
 			<xsl:otherwise><xsl:call-template name="displayTerm"/></xsl:otherwise>
@@ -1166,24 +1166,48 @@
 
 	<xsl:template name="displayTerm">
 		<fo:inline font-size="18pt" padding-right="3mm"><xsl:apply-templates/></fo:inline>
-		<fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
+		<!-- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
 			<xsl:variable name="kind" select="local-name()"/>
 			<xsl:attribute name="background-color">
 				<xsl:choose>
 					<xsl:when test="$kind = 'preferred'">rgb(249, 235, 187)</xsl:when>
 					<xsl:when test="$kind = 'deprecated'">rgb(237, 237, 238)</xsl:when>
-					<xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
+					<xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>							
 				</xsl:choose>
 			</xsl:attribute>
 			<xsl:call-template name="addLetterSpacing">
 				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($kind))"/>
-			</xsl:call-template>
-		</fo:inline>
-		<xsl:if test="following-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
+			</xsl:call-template>			
+		</fo:inline> -->
+		<xsl:if test="following-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::ogc:admitted]">
 			<fo:inline padding-right="2mm"> </fo:inline>
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'span'][@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" mode="update_xml_step1" priority="2">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="ogc:span[@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" priority="3">
+		<fo:inline> </fo:inline>
+		<fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
+			<xsl:variable name="kind" select="@class"/>
+			<xsl:variable name="label" select="text()"/>
+			<xsl:attribute name="background-color">
+				<xsl:choose>
+					<xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'">rgb(249, 235, 187)</xsl:when>
+					<xsl:when test="$kind = 'DeprecatedLabel' or $label = 'DEPRECATED'">rgb(237, 237, 238)</xsl:when>
+					<xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'">rgb(223, 236, 249)</xsl:when>
+				</xsl:choose>
+			</xsl:attribute>
+			<xsl:call-template name="addLetterSpacing">
+				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($label))"/>
+			</xsl:call-template>
+		</fo:inline>
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
 		<xsl:variable name="text">
 			<xsl:call-template name="add-zero-spaces-java"/>
@@ -5919,8 +5943,17 @@
 		<xsl:variable name="styles_">
 			<xsl:for-each select="xalan:nodeset($styles__)/item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
-				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
-				<xsl:if test="$key = 'font-family' or $key = 'color'">
+				<xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
+				<xsl:variable name="value">
+					<xsl:choose>
+						<!-- if font-size is digits only -->
+						<xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="$value_"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
 			</xsl:for-each>

data/lib/isodoc/ogc/ogc.standard.xsl

@@ -1138,7 +1138,7 @@
 					</fo:list-item-label>
 					<fo:list-item-body start-indent="body-start()">
 						<fo:block>
-							<xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:admitted" mode="term_name"/>
+							<xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:deprecates | ../ogc:admitted" mode="term_name"/>
 						</fo:block>
 					</fo:list-item-body>
 				</fo:list-item>
@@ -1147,7 +1147,7 @@
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" priority="2"/>
+	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" priority="2"/>
 
 	<!-- first preferred displays on the same line as term/name -->
 	<xsl:template match="ogc:preferred[not(preceding-sibling::ogc:preferred)]" mode="term_name" priority="2">
@@ -1155,9 +1155,9 @@
 		<fo:inline padding-right="2mm"> </fo:inline>
 	</xsl:template>
 
-	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" mode="term_name">
+	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" mode="term_name">
 		<xsl:choose>
-			<xsl:when test="preceding-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
+			<xsl:when test="preceding-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::admitted]">
 				<fo:block space-before="6pt"><xsl:call-template name="displayTerm"/></fo:block> <!-- block wrapper -->
 			</xsl:when>
 			<xsl:otherwise><xsl:call-template name="displayTerm"/></xsl:otherwise>
@@ -1166,24 +1166,48 @@
 
 	<xsl:template name="displayTerm">
 		<fo:inline font-size="18pt" padding-right="3mm"><xsl:apply-templates/></fo:inline>
-		<fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
+		<!-- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
 			<xsl:variable name="kind" select="local-name()"/>
 			<xsl:attribute name="background-color">
 				<xsl:choose>
 					<xsl:when test="$kind = 'preferred'">rgb(249, 235, 187)</xsl:when>
 					<xsl:when test="$kind = 'deprecated'">rgb(237, 237, 238)</xsl:when>
-					<xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
+					<xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>							
 				</xsl:choose>
 			</xsl:attribute>
 			<xsl:call-template name="addLetterSpacing">
 				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($kind))"/>
-			</xsl:call-template>
-		</fo:inline>
-		<xsl:if test="following-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
+			</xsl:call-template>			
+		</fo:inline> -->
+		<xsl:if test="following-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::ogc:admitted]">
 			<fo:inline padding-right="2mm"> </fo:inline>
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'span'][@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" mode="update_xml_step1" priority="2">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="ogc:span[@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" priority="3">
+		<fo:inline> </fo:inline>
+		<fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
+			<xsl:variable name="kind" select="@class"/>
+			<xsl:variable name="label" select="text()"/>
+			<xsl:attribute name="background-color">
+				<xsl:choose>
+					<xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'">rgb(249, 235, 187)</xsl:when>
+					<xsl:when test="$kind = 'DeprecatedLabel' or $label = 'DEPRECATED'">rgb(237, 237, 238)</xsl:when>
+					<xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'">rgb(223, 236, 249)</xsl:when>
+				</xsl:choose>
+			</xsl:attribute>
+			<xsl:call-template name="addLetterSpacing">
+				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($label))"/>
+			</xsl:call-template>
+		</fo:inline>
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
 		<xsl:variable name="text">
 			<xsl:call-template name="add-zero-spaces-java"/>
@@ -5919,8 +5943,17 @@
 		<xsl:variable name="styles_">
 			<xsl:for-each select="xalan:nodeset($styles__)/item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
-				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
-				<xsl:if test="$key = 'font-family' or $key = 'color'">
+				<xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
+				<xsl:variable name="value">
+					<xsl:choose>
+						<!-- if font-size is digits only -->
+						<xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="$value_"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
 			</xsl:for-each>

data/lib/isodoc/ogc/ogc.test-suite.xsl

@@ -1138,7 +1138,7 @@
 					</fo:list-item-label>
 					<fo:list-item-body start-indent="body-start()">
 						<fo:block>
-							<xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:admitted" mode="term_name"/>
+							<xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:deprecates | ../ogc:admitted" mode="term_name"/>
 						</fo:block>
 					</fo:list-item-body>
 				</fo:list-item>
@@ -1147,7 +1147,7 @@
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" priority="2"/>
+	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" priority="2"/>
 
 	<!-- first preferred displays on the same line as term/name -->
 	<xsl:template match="ogc:preferred[not(preceding-sibling::ogc:preferred)]" mode="term_name" priority="2">
@@ -1155,9 +1155,9 @@
 		<fo:inline padding-right="2mm"> </fo:inline>
 	</xsl:template>
 
-	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" mode="term_name">
+	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" mode="term_name">
 		<xsl:choose>
-			<xsl:when test="preceding-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
+			<xsl:when test="preceding-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::admitted]">
 				<fo:block space-before="6pt"><xsl:call-template name="displayTerm"/></fo:block> <!-- block wrapper -->
 			</xsl:when>
 			<xsl:otherwise><xsl:call-template name="displayTerm"/></xsl:otherwise>
@@ -1166,24 +1166,48 @@
 
 	<xsl:template name="displayTerm">
 		<fo:inline font-size="18pt" padding-right="3mm"><xsl:apply-templates/></fo:inline>
-		<fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
+		<!-- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
 			<xsl:variable name="kind" select="local-name()"/>
 			<xsl:attribute name="background-color">
 				<xsl:choose>
 					<xsl:when test="$kind = 'preferred'">rgb(249, 235, 187)</xsl:when>
 					<xsl:when test="$kind = 'deprecated'">rgb(237, 237, 238)</xsl:when>
-					<xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
+					<xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>							
 				</xsl:choose>
 			</xsl:attribute>
 			<xsl:call-template name="addLetterSpacing">
 				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($kind))"/>
-			</xsl:call-template>
-		</fo:inline>
-		<xsl:if test="following-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
+			</xsl:call-template>			
+		</fo:inline> -->
+		<xsl:if test="following-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::ogc:admitted]">
 			<fo:inline padding-right="2mm"> </fo:inline>
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'span'][@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" mode="update_xml_step1" priority="2">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="ogc:span[@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" priority="3">
+		<fo:inline> </fo:inline>
+		<fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
+			<xsl:variable name="kind" select="@class"/>
+			<xsl:variable name="label" select="text()"/>
+			<xsl:attribute name="background-color">
+				<xsl:choose>
+					<xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'">rgb(249, 235, 187)</xsl:when>
+					<xsl:when test="$kind = 'DeprecatedLabel' or $label = 'DEPRECATED'">rgb(237, 237, 238)</xsl:when>
+					<xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'">rgb(223, 236, 249)</xsl:when>
+				</xsl:choose>
+			</xsl:attribute>
+			<xsl:call-template name="addLetterSpacing">
+				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($label))"/>
+			</xsl:call-template>
+		</fo:inline>
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
 		<xsl:variable name="text">
 			<xsl:call-template name="add-zero-spaces-java"/>
@@ -5919,8 +5943,17 @@
 		<xsl:variable name="styles_">
 			<xsl:for-each select="xalan:nodeset($styles__)/item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
-				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
-				<xsl:if test="$key = 'font-family' or $key = 'color'">
+				<xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
+				<xsl:variable name="value">
+					<xsl:choose>
+						<!-- if font-size is digits only -->
+						<xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="$value_"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
 			</xsl:for-each>

data/lib/isodoc/ogc/ogc.user-guide.xsl

@@ -1138,7 +1138,7 @@
 					</fo:list-item-label>
 					<fo:list-item-body start-indent="body-start()">
 						<fo:block>
-							<xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:admitted" mode="term_name"/>
+							<xsl:apply-templates select="../ogc:preferred | ../ogc:deprecated | ../ogc:deprecates | ../ogc:admitted" mode="term_name"/>
 						</fo:block>
 					</fo:list-item-body>
 				</fo:list-item>
@@ -1147,7 +1147,7 @@
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" priority="2"/>
+	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" priority="2"/>
 
 	<!-- first preferred displays on the same line as term/name -->
 	<xsl:template match="ogc:preferred[not(preceding-sibling::ogc:preferred)]" mode="term_name" priority="2">
@@ -1155,9 +1155,9 @@
 		<fo:inline padding-right="2mm"> </fo:inline>
 	</xsl:template>
 
-	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:admitted" mode="term_name">
+	<xsl:template match="ogc:preferred | ogc:deprecated | ogc:deprecates | ogc:admitted" mode="term_name">
 		<xsl:choose>
-			<xsl:when test="preceding-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
+			<xsl:when test="preceding-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::admitted]">
 				<fo:block space-before="6pt"><xsl:call-template name="displayTerm"/></fo:block> <!-- block wrapper -->
 			</xsl:when>
 			<xsl:otherwise><xsl:call-template name="displayTerm"/></xsl:otherwise>
@@ -1166,24 +1166,48 @@
 
 	<xsl:template name="displayTerm">
 		<fo:inline font-size="18pt" padding-right="3mm"><xsl:apply-templates/></fo:inline>
-		<fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
+		<!-- <fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
 			<xsl:variable name="kind" select="local-name()"/>
 			<xsl:attribute name="background-color">
 				<xsl:choose>
 					<xsl:when test="$kind = 'preferred'">rgb(249, 235, 187)</xsl:when>
 					<xsl:when test="$kind = 'deprecated'">rgb(237, 237, 238)</xsl:when>
-					<xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>
+					<xsl:when test="$kind = 'admitted'">rgb(223, 236, 249)</xsl:when>							
 				</xsl:choose>
 			</xsl:attribute>
 			<xsl:call-template name="addLetterSpacing">
 				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($kind))"/>
-			</xsl:call-template>
-		</fo:inline>
-		<xsl:if test="following-sibling::*[self::ogc:preferred or self::deprecated or self::admitted]">
+			</xsl:call-template>			
+		</fo:inline> -->
+		<xsl:if test="following-sibling::*[self::ogc:preferred or self::ogc:deprecated or self::ogc:deprecates or self::ogc:admitted]">
 			<fo:inline padding-right="2mm"> </fo:inline>
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'span'][@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" mode="update_xml_step1" priority="2">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="ogc:span[@class = 'PreferredLabel' or @class = 'DeprecatedLabel' or @class = 'AdmittedLabel']" priority="3">
+		<fo:inline> </fo:inline>
+		<fo:inline font-size="11pt" padding="1mm" padding-bottom="0.5mm" baseline-shift="25%">
+			<xsl:variable name="kind" select="@class"/>
+			<xsl:variable name="label" select="text()"/>
+			<xsl:attribute name="background-color">
+				<xsl:choose>
+					<xsl:when test="$kind = 'PreferredLabel' or $label = 'PREFERRED'">rgb(249, 235, 187)</xsl:when>
+					<xsl:when test="$kind = 'DeprecatedLabel' or $label = 'DEPRECATED'">rgb(237, 237, 238)</xsl:when>
+					<xsl:when test="$kind = 'AdmittedLabel' or $label = 'ADMITTED'">rgb(223, 236, 249)</xsl:when>
+				</xsl:choose>
+			</xsl:attribute>
+			<xsl:call-template name="addLetterSpacing">
+				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($label))"/>
+			</xsl:call-template>
+		</fo:inline>
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
 		<xsl:variable name="text">
 			<xsl:call-template name="add-zero-spaces-java"/>
@@ -5919,8 +5943,17 @@
 		<xsl:variable name="styles_">
 			<xsl:for-each select="xalan:nodeset($styles__)/item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
-				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
-				<xsl:if test="$key = 'font-family' or $key = 'color'">
+				<xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
+				<xsl:variable name="value">
+					<xsl:choose>
+						<!-- if font-size is digits only -->
+						<xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="$value_"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
 			</xsl:for-each>

data/lib/isodoc/ogc/ogc.white-paper.xsl

@@ -5019,8 +5019,17 @@
 		<xsl:variable name="styles_">
 			<xsl:for-each select="xalan:nodeset($styles__)/item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
-				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
-				<xsl:if test="$key = 'font-family' or $key = 'color'">
+				<xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
+				<xsl:variable name="value">
+					<xsl:choose>
+						<!-- if font-size is digits only -->
+						<xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="$value_"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
 			</xsl:for-each>

data/lib/metanorma/ogc/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -898,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

data/lib/metanorma/ogc/biblio.rng

@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,11 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -942,6 +950,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>
@@ -1283,7 +1292,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</value>