metanorma-ogc 2.8.3 → 2.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea093927e84e5a18c74db7fff71c9c838244289fffeeb417bd6ecb0995f05c1c
-  data.tar.gz: e0d62e8f3bd652a3db1b610ed0b932305abf5109650783a97d49a264580e8b48
+  metadata.gz: b2aad826f9661d5781bd1e872196cd554ec20130e9eac612fef253761e883618
+  data.tar.gz: 79a6aab4493044a5ca744e0c369bc0f1db8e68989f9a4377c64319f8259d216b
 SHA512:
-  metadata.gz: 34164ffb97dd59028ac42002d9534899735e350c048a3819fc82cf16b02532de7b67ca6fb01ef0a725fc8dbab077655f98e22a560ddc2568329f8b947a94c926
-  data.tar.gz: 020134e9ad9cf9ef3d810a4e0c8dc2e78884cbcf0d5e0ee3ccdf4ed8f78d49a31cd46420319ce871542c6a53e9fd97831369696aa694f6c876413bcc0cffb4df
+  metadata.gz: 876c893712449f502f934d6e39bb874655636fb3bdf25c91cb8c6af4ef94e60ae8534744ab1127dba79f7c51791ed779e30d905b98d82ff79f95eabffddfac8c
+  data.tar.gz: 7c0310ad8f9d78c95e3189a19c35d0f3bf41e543b503331d3e5bec0bbd3590105a575b49861bfdd44aa25c954fd5f263fc9dd0cba5af2bc212eca626ce216db8

data/lib/isodoc/ogc/html/htmlstyle.css

@@ -138,16 +138,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;
@@ -906,12 +896,6 @@ dl pre {
   list-style-type: none;
 }
 
-.figure {
-  line-height: 1.6em;
-  padding: 1.5em;
-  margin: 2em 0 1em 0;
-  overflow: auto;
-}
 .figure .FigureTitle, .figure .figure-title {
   font-weight: 700;
   font-size: 1em;
@@ -924,6 +908,12 @@ dl pre {
   max-width: 100%;
   height: auto;
 }
+.figure {
+  line-height: 1.6em;
+  padding: 1.5em;
+  margin: 2em 0 1em 0;
+  overflow: auto;
+}
 
 table div.figure {
   padding: 0;
@@ -1065,6 +1055,14 @@ h4, .h4 {
   font-size: 1.4em;
 }
 
+.contact-info a:hover {
+  text-decoration: underline;
+  background: none;
+  box-shadow: 0 0 0 0;
+}
+.contact-info a, .contact-info a:hover {
+  color: #00335b;
+}
 .contact-info {
   padding: 2em;
   margin-top: 5em;
@@ -1074,14 +1072,6 @@ h4, .h4 {
   color: #00335b !important;
   border-radius: 25px;
 }
-.contact-info a:hover {
-  text-decoration: underline;
-  background: none;
-  box-shadow: 0 0 0 0;
-}
-.contact-info a, .contact-info a:hover {
-  color: #00335b;
-}
 .contact-info p, .contact-info a {
   font-family: {{monospacefont}};
   font-variant-ligatures: none;
@@ -1138,7 +1128,6 @@ table {
   margin-left: auto;
   margin-right: auto;
   padding-right: 2em;
-  /*color: #010d16;*/
 }
 table, table th, table td {
   border: 1px solid black;
@@ -1150,6 +1139,9 @@ table th, table td {
 table td.header {
   font-weight: 400;
 }
+table {
+  /*color: #010d16;*/
+}
 table thead tr th {
   background-color: #5d99d6;
 }
@@ -1173,7 +1165,6 @@ table.modspec {
   margin-left: auto;
   margin-right: auto;
   padding-right: 2em;
-  color: #010d16;
 }
 table.modspec, table.modspec th, table.modspec td {
   border: none !important;
@@ -1185,6 +1176,9 @@ table.modspec th, table.modspec td {
 table.modspec td.header {
   font-weight: 400;
 }
+table.modspec {
+  color: #010d16;
+}
 table.modspec tr:nth-child(even) {
   background: #ffffff;
 }
@@ -1297,6 +1291,11 @@ pre, .sourcecode {
   font-variant-ligatures: none;
 }
 
+.Admonition .AdmonitionTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+}
 .Admonition {
   padding: 1em 1.2em 1.2em 1.2em;
   margin: 1em 0 1em 0;
@@ -1304,11 +1303,6 @@ pre, .sourcecode {
   border-top: 10px solid #eb5a06;
   color: #290404;
 }
-.Admonition .AdmonitionTitle {
-  font-weight: 700;
-  font-size: 1em;
-  text-align: center;
-}
 .Admonition.Important {
   background-color: #f58cff;
   color: #5d1364;

data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl

@@ -870,7 +870,8 @@
 
 			<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
 
-				<fo:block-container line-height="130%">
+				<fo:block-container xsl:use-attribute-sets="toc-style">
+					<xsl:call-template name="refine_toc-style"/>
 					<fo:block role="TOC">
 						<xsl:for-each select="$contents//mnx:item[@display = 'true' and normalize-space(@id) != '']">
 
@@ -1263,11 +1264,9 @@
 	</xsl:template>
 
 	<xsl:template match="mn:legal-statement//mn:fmt-title" priority="2">
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
 		<!-- inline title -->
-		<fo:inline font-weight="bold" role="H{$level}">
+		<fo:inline xsl:use-attribute-sets="legal-statement-title-style">
+			<xsl:call-template name="refine_legal-statement-title-style"/>
 			<xsl:apply-templates/><xsl:text>: </xsl:text>
 		</fo:inline>
 	</xsl:template>
@@ -1279,7 +1278,8 @@
 	</xsl:template>
 
 	<xsl:template match="mn:legal-statement//mn:p" priority="2">
-		<fo:inline>
+		<fo:inline xsl:use-attribute-sets="legal-statement-p-style">
+			<xsl:call-template name="refine_legal-statement-p-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 		<xsl:if test="following-sibling::mn:p">
@@ -1435,11 +1435,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:element name="{$element-name}">
-			<xsl:if test="@id">
-				<xsl:attribute name="id">
-					<xsl:value-of select="@id"/>
-				</xsl:attribute>
-			</xsl:if>
+			<xsl:copy-of select="@id"/>
 
 			<xsl:call-template name="setBlockAttributes"/>
 
@@ -1493,21 +1489,8 @@
 			</xsl:if>
 			<fo:block-container margin-left="0mm">
 				<fo:list-block xsl:use-attribute-sets="list-style">
-					<xsl:if test="self::mn:ul">
-						<xsl:attribute name="provisional-distance-between-starts"><xsl:value-of select="$ul_indent"/>mm</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="ancestor::mn:table">
-						<xsl:attribute name="provisional-distance-between-starts">5mm</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="ancestor::mn:ul | ancestor::mn:ol">
-						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-						<xsl:if test="ancestor::mn:table[not(@class)]">
-							<xsl:attribute name="space-after">1mm</xsl:attribute>
-						</xsl:if>
-					</xsl:if>
-					<xsl:if test="following-sibling::*[1][self::mn:ul or self::mn:ol]">
-						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-					</xsl:if>
+					<xsl:call-template name="refine_list-style"/>
+
 					<xsl:apply-templates>
 						<xsl:with-param name="indent" select="$indent + $ul_indent"/>
 					</xsl:apply-templates>
@@ -1529,10 +1512,8 @@
 	</xsl:template>
 
 	<xsl:template match="mn:term/mn:fmt-name" priority="2">
-		<xsl:variable name="levelTerm">
-			<xsl:call-template name="getLevelTermName"/>
-		</xsl:variable>
-		<fo:block space-before="36pt" margin-bottom="10pt" keep-with-next="always" role="H{$levelTerm}">
+		<fo:block xsl:use-attribute-sets="term-name-style">
+			<xsl:call-template name="refine_term-name-style"/>
 			<fo:list-block color="{$color_text_title}" keep-with-next="always" provisional-distance-between-starts="{string-length()*3.25}mm">
 				<fo:list-item>
 					<fo:list-item-label end-indent="label-end()">
@@ -1553,7 +1534,7 @@
 
 	<!-- first preferred displays on the same line as term/name -->
 	<xsl:template match="mn:fmt-preferred[not(preceding-sibling::mn:fmt-preferred)]" mode="term_name" priority="2">
-		<fo:inline font-size="18pt" padding-right="3mm"><xsl:call-template name="refine_preferred-term-style"/><xsl:apply-templates/></fo:inline>
+		<fo:inline xsl:use-attribute-sets="preferred-term-style"><xsl:call-template name="refine_preferred-term-style"/><xsl:apply-templates/></fo:inline>
 		<fo:inline padding-right="2mm"> </fo:inline>
 	</xsl:template>
 
@@ -2177,6 +2158,7 @@
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
 	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -2720,6 +2702,7 @@
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
 	<xsl:template match="mn:preferred" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
@@ -2734,10 +2717,10 @@
 
 	<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
 
-	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
+	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
-			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
 			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
@@ -3564,9 +3547,14 @@
 
 	<xsl:attribute-set name="legal-statement-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- legal-statement-title-style -->
 
 	<xsl:template name="refine_legal-statement-title-style">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 	</xsl:template>
 
 	<xsl:attribute-set name="legal-statement-p-style">
@@ -3874,6 +3862,12 @@
 		</xsl:if>
 	</xsl:template> <!-- refine_sourcecode-style -->
 
+	<xsl:attribute-set name="sourcecode-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sourcecode-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -5319,9 +5313,23 @@
 	<xsl:attribute-set name="term-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="space-before">36pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- term-name-style -->
 
 	<xsl:template name="refine_term-name-style">
+		<xsl:variable name="levelTerm">
+			<xsl:call-template name="getLevelTermName"/>
+		</xsl:variable>
+		<xsl:attribute name="role">H<xsl:value-of select="$levelTerm"/></xsl:attribute>
+	</xsl:template>
+
+	<xsl:attribute-set name="preferred-style">
+	</xsl:attribute-set> <!-- preferred-style -->
+
+	<xsl:template name="refine_preferred-style">
 	</xsl:template>
 
 	<xsl:attribute-set name="preferred-block-style">
@@ -5333,6 +5341,8 @@
 	<xsl:attribute-set name="preferred-term-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="font-size">18pt</xsl:attribute>
+		<xsl:attribute name="padding-right">3mm</xsl:attribute>
 	</xsl:attribute-set> <!-- preferred-term-style -->
 
 	<xsl:template name="refine_preferred-term-style">
@@ -5958,6 +5968,12 @@
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-style -->
 
+	<xsl:attribute-set name="table-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_table-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -6425,7 +6441,7 @@
 
 			</fo:block>
 
-			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
 			<xsl:if test="$continued = 'true'">
 
 				<!-- to prevent the error 'THead element may contain only TR elements' -->
@@ -9591,6 +9607,12 @@
 	<xsl:template name="refine_figure-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="figure-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
@@ -11244,6 +11266,22 @@
 	</xsl:attribute-set> <!-- list-style -->
 
 	<xsl:template name="refine_list-style">
+		<xsl:variable name="ul_indent">6</xsl:variable>
+		<xsl:if test="self::mn:ul">
+			<xsl:attribute name="provisional-distance-between-starts"><xsl:value-of select="$ul_indent"/>mm</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="ancestor::mn:table">
+			<xsl:attribute name="provisional-distance-between-starts">5mm</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="ancestor::mn:ul | ancestor::mn:ol">
+			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			<xsl:if test="ancestor::mn:table[not(@class)]">
+				<xsl:attribute name="space-after">1mm</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+		<xsl:if test="following-sibling::*[1][self::mn:ul or self::mn:ol]">
+			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- refine_list-style -->
 
 	<xsl:attribute-set name="list-name-style">
@@ -12175,7 +12213,7 @@
 
 			<fo:list-item>
 				<fo:list-item-label end-indent="label-end()">
-					<fo:block role="SKIP">
+					<fo:block role="SKIP" id="__internal_layout__bibitem_{@id}_{generate-id()}">
 						<fo:inline role="SKIP">
 							<xsl:apply-templates select="mn:biblio-tag">
 								<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
@@ -12828,6 +12866,7 @@
 	<!-- =================== -->
 
 	<xsl:attribute-set name="toc-style">
+		<xsl:attribute name="line-height">130%</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
@@ -14423,10 +14462,17 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="clause-style">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_clause-style">
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
 			<xsl:call-template name="setId"/>
 
 			<xsl:call-template name="sections_element_style"/>
@@ -14554,6 +14600,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template>
 
+	<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
+	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>