metanorma-ogc 2.4.2 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c36eb2eb19714efe36a2bddd955d89702cbabb9a3206b636f39d89cdddb9b196
-  data.tar.gz: 5fa6aaadc06ada3a8f856b33cdd95b8fc3407df9c25f7b43f30d6cac045ab565
+  metadata.gz: 2a8edafd9da436d2118d264222ff13e771e35bff107a7758a2c27c1f346b12fb
+  data.tar.gz: 4f970b93ca56712cc41ea2bdb9a3cfbddea6b8471acf9ceb9e80546ea8a5ffe9
 SHA512:
-  metadata.gz: c45ff6fe107ed9e9e34b63925a01c4244943e261224d969412183a81baa0ee67fe3ca5ed870ef1cf485cb6c6e9be747e90307c46d3207ae6341e7388db43c4d9
-  data.tar.gz: 0fbc5ca07fda92e07ed344beb8aa9d359eccfad72b0ba4514af0880a43db1dc3c74909551592c561ba55ec0d82c9ae68ce8568dc594f187f875549f7d10095ee
+  metadata.gz: 8bb73f9338de4466d6706ddf15aaf951155726cee950430b1d79abfb4fe306a77ff18fada9cc5fa71920518cf06f386fddc2d38151ce9d3ae1fdc924ce78c3f0
+  data.tar.gz: 4099c50a591583455df3be7f8bc4906fd7309022fbcd36e28922f96e12f1c066e1d2a75b8965335313745a40fc1d0f2f7118c0f3d7a74e87dd2699fde750393c

data/Gemfile

@@ -4,9 +4,12 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-gemspec
+group :development, :test do
+  gem "rspec"
+end
 
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
 
+gemspec

data/lib/isodoc/ogc/html_convert.rb

@@ -69,9 +69,9 @@ module IsoDoc
 
       def html_head
         ret = super
-        k = @meta.get[:keywords].join(", ")
+        k = @meta.get[:keywords].join(", ") and k = @c.encode(k).gsub("'", "'")
         k.empty? or ret += "<meta name='keywords' content='#{k}'/>"
-        k = @meta.get[:abstract]
+        k = @meta.get[:abstract] and k = @c.encode(k)&.gsub("'", "&#x27;")
         (k.nil? || k.empty?) or
           ret += "<meta name='description' content='#{k}'/>"
         ret

data/lib/isodoc/ogc/i18n-en.yaml

@@ -1,4 +1,4 @@
-admitted: ADMITTED
+admitted: ALTERNATIVE
 foreword: Preface
 submitters: Submitters
 contributors_clause: Contributors

data/lib/isodoc/ogc/metadata.rb

@@ -128,7 +128,7 @@ module IsoDoc
       end
 
       def docsubtype_abbr(subtype, _type)
-        IsoDoc::Ogc::DOCSUBTYPE_ABBR[subtype] || st
+        IsoDoc::Ogc::DOCSUBTYPE_ABBR[subtype] || subtype
       end
 
       def status_print(status)

data/lib/isodoc/ogc/ogc.abstract-specification-topic.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.best-practice.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.change-request-supporting-document.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.community-practice.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.community-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>