metanorma-itu 2.7.7 → 2.8.1

data/lib/isodoc/itu/itu.technical-report.xsl

@@ -703,7 +703,7 @@
 							<xsl:when test="$cover_header_hide = 'false'">
 								<fo:block-container margin-left="13mm">
 									<xsl:call-template name="setWritingMode"/>
-									<fo:block-container margin-left="0mm">
+									<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 
 										<fo:table width="185.5mm" table-layout="fixed" margin-top="11.5mm">
 											<fo:table-column column-width="proportional-column-width(1)"/>
@@ -1244,7 +1244,7 @@
 									</fo:block>
 								</fo:block>
 								<fo:block-container margin-left="10mm">
-									<fo:block-container margin-left="0mm">
+									<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 
 										<fo:block font-size="20pt" font-weight="bold" space-before="30mm">
 											<xsl:value-of select="$i18n_tsb"/>
@@ -2116,29 +2116,6 @@
 		</xsl:if>
 		<xsl:apply-templates/>
 	</xsl:template>
-
-	<xsl:template match="mn:preface//mn:fmt-title" priority="3">
-		<!-- <xsl:if test="$doctype = 'service-publication'">
-			<fo:block>&#xa0;</fo:block>
-			<fo:block>&#xa0;</fo:block>
-		</xsl:if> -->
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
-		<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
-		<fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt" keep-with-next="always" role="H{$level}">
-			<xsl:if test="$doctype = 'service-publication'">
-				<xsl:attribute name="margin-top">24pt</xsl:attribute>
-				<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-				<xsl:attribute name="font-size">12pt</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates/>
-			<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
-		</fo:block>
-		<!-- <xsl:if test="$doctype = 'service-publication'">
-			<fo:block keep-with-next="always">&#xa0;</fo:block>
-		</xsl:if> -->
-	</xsl:template>
 	<!-- ============================= -->
 	<!-- ============================= -->
 
@@ -2155,38 +2132,15 @@
 				<xsl:otherwise>fo:block</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:element name="{$element-name}">
-			<xsl:attribute name="margin-top">6pt</xsl:attribute>
 
-			<xsl:call-template name="setKeepAttributes"/>
-
-			<xsl:if test="@class='supertitle'">
-				<xsl:attribute name="space-before">36pt</xsl:attribute>
-				<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
-				<xsl:attribute name="margin-top">0pt</xsl:attribute>
-				<xsl:attribute name="font-size">14pt</xsl:attribute>
+		<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>
-			<xsl:attribute name="text-align">
-				<xsl:choose>
-					<xsl:when test="@class='supertitle'">center</xsl:when>
-					<!-- <xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when> -->
-					<xsl:when test="@align"><xsl:call-template name="setAlignment"/></xsl:when>
-					<xsl:when test="ancestor::*[1][self::mn:td]/@align">
-						<!-- <xsl:value-of select="ancestor::*[1][local-name() = 'td']/@align"/> -->
-						<xsl:call-template name="setAlignment">
-							<xsl:with-param name="align" select="ancestor::*[1][self::mn:td]/@align"/>
-						</xsl:call-template>
-					</xsl:when>
-					<xsl:when test="ancestor::*[1][self::mn:th]/@align">
-						<!-- <xsl:value-of select="ancestor::*[1][local-name() = 'th']/@align"/> -->
-						<xsl:call-template name="setAlignment">
-							<xsl:with-param name="align" select="ancestor::*[1][self::mn:th]/@align"/>
-						</xsl:call-template>
-					</xsl:when>
-					<xsl:otherwise>justify</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
+		<xsl:element name="{$element-name}">
+			<xsl:copy-of select="xalan:nodeset($p_styles)/styles/@*"/>
 
 			<xsl:if test="not(preceding-sibling::*) and parent::mn:li and $doctype = 'service-publication'">
 				<fo:inline padding-right="9mm">
@@ -2232,66 +2186,13 @@
 	<!-- ====== -->
 	<!-- title      -->
 	<!-- ====== -->
-	<xsl:template match="mn:annex/mn:fmt-title">
-		<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
-		<fo:block font-size="14pt" font-weight="bold" text-align="center" margin-bottom="18pt" role="H1">
-			<fo:block>
-				<xsl:apply-templates/>
-				<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
-			</fo:block>
-			<xsl:if test="$doctype != 'resolution'">
-				<fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
-					<!-- <xsl:choose>
-						<xsl:when test="parent::*[@obligation = 'informative']">
-							<xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
-						</xsl:otherwise>
-					</xsl:choose> -->
-					<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
-					<xsl:apply-templates select="following-sibling::mn:p[not(preceding-sibling::mn:clause)][starts-with(normalize-space(), '(')]/node()"/>
-				</fo:block>
-			</xsl:if>
-		</fo:block>
-	</xsl:template>
 
 	<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
 	<!-- renders in the annex/title template -->
 	<xsl:template match="mn:annex/mn:p[preceding-sibling::*[1][self::mn:fmt-title or self::mn:variant-title]][starts-with(normalize-space(), '(')]" priority="3"/>
 
-	<!-- Bibliography -->
-	<xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
-		<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
-		<fo:block font-size="14pt" font-weight="bold" text-align="center" margin-bottom="18pt" role="H1">
-			<xsl:if test="$doctype = 'implementers-guide'">
-				<xsl:attribute name="text-align">left</xsl:attribute>
-				<xsl:attribute name="font-size">12pt</xsl:attribute>
-				<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-
 	<xsl:template match="mn:fmt-title" name="title">
 
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
-
-		<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
-
-		<xsl:variable name="font-size">
-			<xsl:choose>
-				<xsl:when test="$level = 1 and $doctype = 'resolution'">14pt</xsl:when>
-				<xsl:when test="$doctype = 'service-publication'">11pt</xsl:when>
-				<xsl:when test="$level &gt;= 2 and $doctype = 'resolution' and ../@inline-header = 'true'">11pt</xsl:when>
-				<xsl:when test="$level = 2">12pt</xsl:when>
-				<xsl:when test="$level &gt;= 3">12pt</xsl:when>
-				<xsl:otherwise>12pt</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
 		<xsl:variable name="element-name">
 			<xsl:choose>
 				<xsl:when test="../@inline-header = 'true'">fo:inline</xsl:when>
@@ -2299,51 +2200,33 @@
 			</xsl:choose>
 		</xsl:variable>
 
-		<xsl:variable name="space-before">
-			<xsl:choose>
-					<xsl:when test="$level = 1 and $doctype = 'service-publication'">12pt</xsl:when>
-					<xsl:when test="$level = '' or $level = 1">18pt</xsl:when>
-					<xsl:when test="$level = 2">12pt</xsl:when>
-					<xsl:otherwise>6pt</xsl:otherwise>
-				</xsl:choose>
-		</xsl:variable>
-
-		<xsl:variable name="space-after">
-			<xsl:choose>
-				<xsl:when test="$level = 1 and $doctype = 'resolution'">24pt</xsl:when>
-				<xsl:when test="$level = 1 and $doctype = 'service-publication'">12pt</xsl:when>
-				<xsl:when test="$level = 2">6pt</xsl:when>
-				<xsl:otherwise>6pt</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
-		<xsl:variable name="text-align">
-			<xsl:choose>
-				<xsl:when test="$level = 1 and $doctype = 'resolution'">center</xsl:when>
-				<xsl:when test="$lang = 'ar'">start</xsl:when>
-				<xsl:otherwise>left</xsl:otherwise>
-			</xsl:choose>
+		<xsl:variable name="title_styles">
+			<styles xsl:use-attribute-sets="title-style"><xsl:call-template name="refine_title-style"><xsl:with-param name="element-name" select="$element-name"/></xsl:call-template></styles>
 		</xsl:variable>
 
 		<xsl:element name="{$element-name}">
-			<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
-			<xsl:attribute name="font-weight">bold</xsl:attribute>
-			<xsl:attribute name="text-align"><xsl:value-of select="$text-align"/></xsl:attribute>
-			<xsl:attribute name="space-before"><xsl:value-of select="$space-before"/></xsl:attribute>
-			<xsl:attribute name="space-after"><xsl:value-of select="$space-after"/></xsl:attribute>
-			<xsl:attribute name="keep-with-next">always</xsl:attribute>
-			<xsl:if test="$element-name = 'fo:inline'">
-				<xsl:attribute name="padding-right">
-					<xsl:choose>
-						<xsl:when test="$level = 2">9mm</xsl:when>
-						<xsl:when test="$level = 3">6.5mm</xsl:when>
-						<xsl:otherwise>4mm</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-			</xsl:if>
-			<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:if test="parent::mn:annex"><!-- Annex title -->
+        <xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
+        <xsl:if test="$doctype != 'resolution'">
+          <fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
+            <!-- <xsl:choose>
+              <xsl:when test="parent::*[@obligation = 'informative']">
+                <xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose> -->
+            <!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
+            <xsl:apply-templates select="following-sibling::mn:p[not(preceding-sibling::mn:clause)][starts-with(normalize-space(), '(')]/node()"/>
+          </fo:block>
+        </xsl:if>
+      </xsl:if>
 		</xsl:element>
 
 		<xsl:if test="$element-name = 'fo:inline' and not(following-sibling::mn:p)">
@@ -2601,7 +2484,7 @@
 								</xsl:if>
 							</xsl:if>
 
-							<fo:block-container margin-left="0mm" margin-right="0mm">
+							<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 								<fo:block>
 
 									<xsl:apply-templates select="node()[not(self::mn:note)]"/>
@@ -5069,6 +4952,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">
@@ -5092,7 +4979,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>
 
 						<fo:block xsl:use-attribute-sets="sourcecode-style">
 
@@ -5114,7 +5006,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>
 
 					</fo:block-container>
 				</fo:block-container>
@@ -10995,6 +10896,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"/>
@@ -11007,6 +10912,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']"/>
 
@@ -11027,7 +10936,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>
@@ -13112,11 +13030,22 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
+		<xsl:attribute name="font-size">14pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="space-before">0pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
+		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
-
+	<xsl:template name="refine_bibliography-title-style">
+		<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
+		<xsl:if test="$doctype = 'implementers-guide'">
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:attribute name="font-size">12pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -15232,7 +15161,14 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
-	</xsl:attribute-set>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="font-size">14pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="space-before">0pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
+		<xsl:attribute name="role">H1</xsl:attribute>
+	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
 	</xsl:template>
@@ -15243,6 +15179,137 @@
 	<xsl:template name="refine_p-zzSTDTitle1-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="p-style">
+		<xsl:attribute name="margin-top">6pt</xsl:attribute>
+	</xsl:attribute-set> <!-- p-style -->
+
+	<xsl:template name="refine_p-style">
+		<xsl:param name="element-name"/>
+		<xsl:param name="margin"/>
+		<xsl:call-template name="setKeepAttributes"/>
+
+		<xsl:if test="@class='supertitle'">
+			<xsl:attribute name="space-before">36pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
+			<xsl:attribute name="margin-top">0pt</xsl:attribute>
+			<xsl:attribute name="font-size">14pt</xsl:attribute>
+		</xsl:if>
+		<xsl:attribute name="text-align">
+			<xsl:choose>
+				<xsl:when test="@class='supertitle'">center</xsl:when>
+				<!-- <xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when> -->
+				<xsl:when test="@align"><xsl:call-template name="setAlignment"/></xsl:when>
+				<xsl:when test="ancestor::*[1][self::mn:td]/@align">
+					<!-- <xsl:value-of select="ancestor::*[1][local-name() = 'td']/@align"/> -->
+					<xsl:call-template name="setAlignment">
+						<xsl:with-param name="align" select="ancestor::*[1][self::mn:td]/@align"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:when test="ancestor::*[1][self::mn:th]/@align">
+					<!-- <xsl:value-of select="ancestor::*[1][local-name() = 'th']/@align"/> -->
+					<xsl:call-template name="setAlignment">
+						<xsl:with-param name="align" select="ancestor::*[1][self::mn:th]/@align"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>justify</xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+		<!-- $namespace = 'itu' -->
+
+	</xsl:template> <!-- refine_p-style -->
+
+	<xsl:attribute-set name="title-style">
+		<!-- Note: font-size for level 1 title -->
+		<xsl:attribute name="font-size">12pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="text-align">left</xsl:attribute>
+		<xsl:attribute name="space-before">18pt</xsl:attribute>
+		<xsl:attribute name="space-after">6pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</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:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
+
+		<xsl:if test="$level = 1">
+			<xsl:if test="$doctype = 'resolution'">
+				<xsl:attribute name="font-size">14pt</xsl:attribute>
+				<xsl:attribute name="text-align">center</xsl:attribute>
+				<xsl:attribute name="space-after">24pt</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="$doctype = 'service-publication'">
+				<xsl:attribute name="space-before">12pt</xsl:attribute>
+				<xsl:attribute name="space-after">12pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="$level = 2">
+			<xsl:attribute name="space-before">12pt</xsl:attribute>
+			<xsl:attribute name="space-after">6pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$level &gt;= 2">
+			<xsl:if test="$doctype = 'resolution' and ../@inline-header = 'true'">
+				<xsl:attribute name="font-size">11pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="$level &gt;= 3">
+			<xsl:attribute name="space-before">6pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$doctype = 'service-publication'">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$lang = 'ar'">
+			<xsl:attribute name="text-align">start</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="ancestor::mn:preface">
+			<xsl:attribute name="font-size">inherit</xsl:attribute>
+			<xsl:attribute name="margin-top">18pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
+			<xsl:attribute name="space-before">0pt</xsl:attribute>
+			<xsl:attribute name="space-after">0pt</xsl:attribute>
+			<xsl:if test="$doctype = 'service-publication'">
+				<xsl:attribute name="margin-top">24pt</xsl:attribute>
+				<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+				<xsl:attribute name="font-size">12pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+
+		<xsl:if test="parent::mn:annex"><!-- Annex title -->
+			<xsl:variable name="annex_title_styles">
+				<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
+		</xsl:if>
+
+		<xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
+			<xsl:variable name="bibliography_title_styles">
+				<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
+		</xsl:if>
+
+		<xsl:if test="$element-name = 'fo:inline'">
+			<xsl:attribute name="padding-right">
+				<xsl:choose>
+					<xsl:when test="$level = 2">9mm</xsl:when>
+					<xsl:when test="$level = 3">6.5mm</xsl:when>
+					<xsl:otherwise>4mm</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+		</xsl:if>
+		<!-- $namespace = 'itu' -->
+		<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"/>
@@ -15581,6 +15648,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>
@@ -16601,8 +16674,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>
@@ -16610,9 +16684,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>
@@ -16620,8 +16698,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')]">

data/lib/isodoc/itu/presentation_ref.rb

@@ -84,15 +84,17 @@ module IsoDoc
 
       def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, _bib)
         ret = (idents[:metanorma] || idents[:ordinal] || idents[:sdo]).to_s
-        ret.empty? and return ret
-        /^\[.+\]$/.match?(ret) or ret = "[#{ret}]"
+        ret.empty? and return ""
+        ret = ret.sub(/^\[(.+)\]$/, "\\1")
+        ret = "[#{esc ret}]"
         ret += datefn
         ret.gsub("-", "‑").gsub(/ /, " ")
       end
 
       def biblio_ref_entry_code(_ordinal, idents, _id, _standard, datefn, _bib)
         ret = (idents[:metanorma] || idents[:ordinal] || idents[:sdo]).to_s
-        /^\[.+\]$/.match?(ret) or ret = "[#{ret}]"
+        ret = ret.sub(/^\[(.+)\]$/, "\\1")
+        ret = "[#{esc ret}]"
         ret += datefn
         ret.empty? and return ret
         ret.gsub("-", "‑").gsub(/ /, " ")

data/lib/metanorma/itu/biblio.rng

@@ -690,7 +690,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -1296,17 +1296,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/itu/converter.rb

@@ -96,7 +96,8 @@ module Metanorma
         node.attr("keywords") or return
         node.attr("keywords").split(/, */).sort.each_with_index do |kw, i|
           kw_out = i.zero? ? Metanorma::Utils.strict_capitalize_first(kw) : kw
-          xml.keyword kw_out
+          add_noko_elem(xml, "keyword", kw_out)
+          # xml.keyword kw_out
         end
       end
 
@@ -112,7 +113,8 @@ module Metanorma
 
       def abstract_parse(attrs, xml, node)
         xml.abstract **attr_code(attrs) do |xml_section|
-          xml_section.title { |name| name << node.title }
+          # xml_section.title { |name| name << node.title }
+          add_noko_elem(xml_section, "title", node.title)
           xml_section << node.content
         end
       end
@@ -152,3 +154,5 @@ module Metanorma
     end
   end
 end
+
+require_relative "log"