metanorma-ogc 2.8.7 → 2.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 278505b52fd039c50361919e19a3a65779c97a827c2d6abc5c4723357bb29676
-  data.tar.gz: 64bddb5288f536ba0b0b406f0da70938dd675cc3fbbc2f0031576da916b348f7
+  metadata.gz: 329d53d7eebb925fa310162c7934f469c633e15960b614932c8137005f59528b
+  data.tar.gz: 49b5a035108197c19e38ed797a9b141686892451a66580abe1a0b122e10af307
 SHA512:
-  metadata.gz: b6e9336680bc48b269f44a616617591c3dd3d2e90bd773552cb5b322035bf3652e3f2d39b9f43ae7ecab652e06e884fef086a90d9f017a08be97314e8b092eed
-  data.tar.gz: a00c70cbbf8c4a8ade5d90a130ed73b41cd4e379f5897e4fbd6aa13922170991a19a62143b38c3670b9fdc954a8377f748414451e07f2c9292784c1efad9d499
+  metadata.gz: a3204db665fcf5d3ca0cc30d2063ac1e7bb816286558dd8617263779ec7fdd873d74d759966d91ea7adb3c30f72de63bd4b080acee72cf61844a764969e52c24
+  data.tar.gz: 3caa57b3f66c1419ac1b56a9e1563ae80b6ef3c58cc33ed174e35186d5e79d6a36cc46431d36490c731de897e31bf42db9c1b59bc0e3de2eea5252acbfa6cf7d

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

@@ -652,7 +652,7 @@
 										<xsl:when test="$isLegacy = 'true'">
 											<fo:block-container font-size="17pt" background-color="{$color_background_blue}" margin-left="-2.5mm" height="11.5mm" width="56mm" display-align="center" margin-top="0.5mm">
 												<fo:block-container margin-left="2.5mm">
-													<fo:block-container margin-left="0mm">
+													<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 														<fo:block margin-top="1mm">
 															<xsl:call-template name="addLetterSpacing">
 																<xsl:with-param name="text" select="$stage_uc"/>
@@ -766,7 +766,7 @@
 								<xsl:when test="$isLegacy = 'true'">
 									<fo:block-container margin-left="-7mm" color="{$color_design}" background-color="{$color_background_blue}" width="202mm">
 										<fo:block-container margin-left="2.5mm" margin-right="1mm" padding-top="0.5mm" padding-bottom="0.5mm">
-											<fo:block-container margin-left="0mm" margin-right="0mm">
+											<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 												<fo:block>
 													<xsl:variable name="legal_statement">
 														<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement" mode="update_xml_step1"/>
@@ -859,7 +859,7 @@
 	<xsl:template name="insertListOf_Title">
 		<xsl:param name="title"/>
 		<fo:block-container xsl:use-attribute-sets="toc-listof-title-style">
-			<fo:block-container margin-left="0mm" role="H2">
+			<fo:block-container xsl:use-attribute-sets="reset-margins-style" role="H2">
 				<xsl:call-template name="insertSectionTitle">
 					<xsl:with-param name="title" select="$title"/>
 				</xsl:call-template>
@@ -1022,7 +1022,7 @@
 		</xsl:variable>
 
 		<fo:block-container margin-left="-18mm" margin-bottom="40pt">
-			<fo:block-container margin-left="0mm">
+			<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 				<fo:block xsl:use-attribute-sets="toc-title-style">
 					<xsl:call-template name="addLetterSpacing">
 						<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($title-toc))"/>
@@ -1332,24 +1332,6 @@
 			<xsl:call-template name="getLevel"/>
 		</xsl:variable>
 
-		<xsl:variable name="font-size">
-			<xsl:choose>
-				<xsl:when test="$level = 3">14pt</xsl:when>
-				<xsl:when test="$level = 4">12pt</xsl:when>
-				<xsl:when test="$level &gt;= 5">11pt</xsl:when>
-				<xsl:otherwise>18pt</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
-		<xsl:variable name="font-weight">
-			<xsl:choose>
-				<xsl:when test="$level = 3">bold</xsl:when>
-				<xsl:when test="$level = 4">bold</xsl:when>
-				<xsl:when test="$level = 5">bold</xsl:when>
-				<xsl:otherwise>normal</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
 		<xsl:variable name="element-name">
 			<xsl:choose>
 				<xsl:when test="../@inline-header = 'true'">fo:inline</xsl:when>
@@ -1357,11 +1339,14 @@
 			</xsl:choose>
 		</xsl:variable>
 
+		<xsl:variable name="title_styles"><styles xsl:use-attribute-sets="title-style"><xsl:call-template name="refine_title-style"/></styles></xsl:variable>
+
 		<xsl:choose>
 			<xsl:when test="$level = 1">
 				<fo:block-container margin-left="-22mm" role="SKIP">
-					<fo:block-container margin-left="0mm" role="SKIP">
-						<fo:block margin-bottom="10pt" space-before="36pt" keep-with-next="always" role="H{$level}">
+					<fo:block-container xsl:use-attribute-sets="reset-margins-style">
+						<fo:block>
+							<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*[local-name() = 'space-before' or local-name() = 'margin-bottom' or          local-name() = 'keep-with-next' or local-name() = 'role']"/>
 							<fo:table table-layout="fixed" width="100%">
 								<fo:table-column column-width="22mm"/>
 								<fo:table-column column-width="158mm"/>
@@ -1377,7 +1362,8 @@
 											</fo:block>
 										</fo:table-cell>
 										<fo:table-cell>
-											<fo:block space-before="36pt">
+											<fo:block>
+												<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*[local-name() = 'space-before']"/>
 												<xsl:variable name="title">
 													<xsl:choose>
 														<xsl:when test="mn:tab">
@@ -1401,8 +1387,8 @@
 				</fo:block-container>
 			</xsl:when>
 			<xsl:when test="$level = 2">
-				<fo:block space-before="24pt" margin-bottom="10pt" role="H{$level}">
-					<xsl:attribute name="keep-with-next">always</xsl:attribute>
+				<fo:block>
+					<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*[local-name() = 'space-before' or local-name() = 'margin-bottom' or        local-name() = 'keep-with-next' or local-name() = 'role']"/>
 					<xsl:variable name="title">
 						<xsl:choose>
 							<xsl:when test="mn:tab">
@@ -1423,13 +1409,8 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:element name="{$element-name}">
-					<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
-					<xsl:attribute name="font-weight"><xsl:value-of select="$font-weight"/></xsl:attribute>
-					<xsl:attribute name="keep-with-next">always</xsl:attribute>
-					<xsl:attribute name="margin-top">30pt</xsl:attribute>
-					<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-					<xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
-					<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
+					<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*"/>
+
 					<xsl:apply-templates/>
 					<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
 				</xsl:element>
@@ -1454,21 +1435,15 @@
 				<xsl:otherwise>fo:block</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:element name="{$element-name}">
-			<xsl:copy-of select="@id"/>
 
-			<xsl:call-template name="setBlockAttributes"/>
+		<xsl:variable name="p_styles">
+			<styles xsl:use-attribute-sets="p-style">
+				<xsl:call-template name="refine_p-style"><xsl:with-param name="element-name" select="$element-name"/></xsl:call-template>
+			</styles>
+		</xsl:variable>
 
-			<xsl:if test="not(ancestor::mn:table)">
-				<xsl:attribute name="line-height">124%</xsl:attribute>
-				<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="ancestor::mn:dd and not(ancestor::mn:table)">
-				<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
-				<xsl:if test="not(ancestor::mn:dd[1]/following-sibling::mn:dt)">
-					<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-				</xsl:if>
-			</xsl:if>
+		<xsl:element name="{$element-name}">
+			<xsl:copy-of select="xalan:nodeset($p_styles)/styles/@*"/>
 
 			<xsl:apply-templates>
 				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -1507,7 +1482,7 @@
 					<xsl:attribute name="margin-top">1mm</xsl:attribute>
 				</xsl:if>
 			</xsl:if>
-			<fo:block-container margin-left="0mm">
+			<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 				<fo:list-block xsl:use-attribute-sets="list-style">
 					<xsl:call-template name="refine_list-style"/>
 
@@ -3979,6 +3954,10 @@
 		</xsl:element>
 	</xsl:template>
 
+	<!-- show sourcecode's name 'before' or 'after' source code -->
+	<xsl:variable name="sourcecode-name-position"><xsl:text>after</xsl:text>
+	</xsl:variable>
+
 	<xsl:template match="mn:sourcecode" name="sourcecode">
 
 		<xsl:variable name="sourcecode_attributes">
@@ -4002,7 +3981,12 @@
 
 					<xsl:call-template name="refine_sourcecode-container-style"/>
 
-					<fo:block-container margin-left="0mm" role="SKIP">
+					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+
+						<!-- <xsl:if test="$namespace = 'rsd'"> -->
+						<xsl:if test="$sourcecode-name-position = 'before'">
+							<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name BEFORE content -->
+						</xsl:if>
 						<xsl:if test="parent::mn:example">
 							<fo:block font-size="1pt" line-height="10%" space-after="4pt"> </fo:block>
 						</xsl:if>
@@ -4027,7 +4011,16 @@
 						</fo:block>
 
 						<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
-						<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
+
+						<!-- <xsl:choose>
+							<xsl:when test="$namespace = 'rsd'"></xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates select="mn:fmt-name" />  --><!-- show sourcecode's name AFTER content -->
+							<!-- </xsl:otherwise>
+						</xsl:choose> -->
+						<xsl:if test="$sourcecode-name-position = 'after'">
+							<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
+						</xsl:if>
 						<xsl:if test="parent::mn:example">
 							<fo:block font-size="1pt" line-height="10%" space-before="6pt"> </fo:block>
 						</xsl:if>
@@ -9915,6 +9908,10 @@
 	<!-- image    -->
 	<!-- ====== -->
 
+	<!-- show figure's name 'before' or 'after' image -->
+	<xsl:variable name="figure-name-position"><xsl:text>after</xsl:text>
+	</xsl:variable>
+
 	<xsl:template match="mn:figure" name="figure">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -9927,6 +9924,10 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 
+			<xsl:if test="$figure-name-position = 'before'"> <!-- show figure's name BEFORE image -->
+				<xsl:apply-templates select="mn:fmt-name"/>
+			</xsl:if>
+
 			<!-- Example: Dimensions in millimeters -->
 			<xsl:apply-templates select="mn:note[@type = 'units']"/>
 
@@ -9947,7 +9948,16 @@
 			<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
 				<xsl:call-template name="showFigureKey"/>
 			</xsl:if>
-			<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
+
+			<!-- <xsl:choose>
+				<xsl:when test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'rsd'"></xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="mn:fmt-name" /> --> <!-- show figure's name AFTER image -->
+				<!-- </xsl:otherwise>
+			</xsl:choose> -->
+			<xsl:if test="$figure-name-position = 'after'">
+				<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
+			</xsl:if>
 
 		</fo:block-container>
 	</xsl:template>
@@ -12065,7 +12075,6 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_references-non-normative-title-style">
-
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -14106,7 +14115,7 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
 	</xsl:template>
@@ -14117,6 +14126,78 @@
 	<xsl:template name="refine_p-zzSTDTitle1-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="p-style">
+	</xsl:attribute-set> <!-- p-style -->
+
+	<xsl:template name="refine_p-style">
+		<xsl:param name="element-name"/>
+		<xsl:param name="margin"/>
+		<xsl:copy-of select="@id"/>
+
+		<xsl:call-template name="setBlockAttributes"/>
+
+		<xsl:if test="not(ancestor::mn:table)">
+			<xsl:attribute name="line-height">124%</xsl:attribute>
+			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="ancestor::mn:dd and not(ancestor::mn:table)">
+			<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
+			<xsl:if test="not(ancestor::mn:dd[1]/following-sibling::mn:dt)">
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+		<!-- $namespace = 'ogc' -->
+
+	</xsl:template> <!-- refine_p-style -->
+
+	<xsl:attribute-set name="title-style">
+		<!-- Note: font-size for level 1 title -->
+		<xsl:attribute name="font-size">18pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
+	</xsl:attribute-set> <!-- title-style -->
+
+	<xsl:template name="refine_title-style">
+		<xsl:param name="element-name"/>
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+
+		<xsl:if test="$level = 1">
+			<xsl:attribute name="space-before">36pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$level = 2">
+			<xsl:attribute name="space-before">24pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$level = 3">
+			<xsl:attribute name="font-size">14pt</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$level &gt;= 3">
+			<xsl:attribute name="margin-top">30pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$level = 4">
+			<xsl:attribute name="font-size">12pt</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$level = 5">
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$level &gt;= 5">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+		</xsl:if>
+		<!-- $namespace = 'ogc' -->
+		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
+	</xsl:template> <!-- refine_title-style -->
+
 	<xsl:template name="processPrefaceSectionsDefault">
 		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -14455,6 +14536,12 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="reset-margins-style">
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="clause-style">
 
 	</xsl:attribute-set>
@@ -15470,8 +15557,9 @@
 
 	<xsl:template name="setTextAlignment">
 		<xsl:param name="default">left</xsl:param>
+		<xsl:param name="skip_default">false</xsl:param>
 		<xsl:variable name="align" select="normalize-space(@align)"/>
-		<xsl:attribute name="text-align">
+		<xsl:variable name="text_align">
 			<xsl:choose>
 				<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
 				<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
@@ -15479,9 +15567,13 @@
 				<xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
 				<xsl:when test="ancestor::mn:td/@align"><xsl:value-of select="ancestor::mn:td/@align"/></xsl:when>
 				<xsl:when test="ancestor::mn:th/@align"><xsl:value-of select="ancestor::mn:th/@align"/></xsl:when>
+				<xsl:when test="$skip_default = 'true'"/>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
-		</xsl:attribute>
+		</xsl:variable>
+		<xsl:if test="normalize-space($text_align) != ''">
+			<xsl:attribute name="text-align"><xsl:value-of select="$text_align"/></xsl:attribute>
+		</xsl:if>
 		<xsl:if test="$align = 'indent'">
 			<xsl:attribute name="margin-left">7mm</xsl:attribute>
 		</xsl:if>
@@ -15489,8 +15581,10 @@
 
 	<xsl:template name="setBlockAttributes">
 		<xsl:param name="text_align_default">left</xsl:param>
+		<xsl:param name="skip_text_align_default">false</xsl:param>
 		<xsl:call-template name="setTextAlignment">
 			<xsl:with-param name="default" select="$text_align_default"/>
+			<xsl:with-param name="skip_default" select="$skip_text_align_default"/>
 		</xsl:call-template>
 		<xsl:call-template name="setKeepAttributes"/>
 		<xsl:if test="node()[1][self::mn:span][contains(@style, 'line-height')]">