metanorma-itu 2.8.4 → 2.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63567364155d68f66099200d1d3568d0c1bfd0a17b74a72c0c7b64342798f1f4
-  data.tar.gz: 562a0859cd6616cc92fa6fde1d078cd421ba625d34519ccac73fcedcc3559c87
+  metadata.gz: 6c90902604bc7595629aab447f819c8aa365b2d88bcfdd916c75f249f29b0a8c
+  data.tar.gz: b0c8ce84b486a5edb5a3ffff29b9289c25caebaf49cd258faeef98a42ca8f689
 SHA512:
-  metadata.gz: 67da2c8835fc974209329ae279bb78db56404d2667f96ddad682a63d7889b94e418f470a34912ae85a0634b478d3fbc64940a5e8057ef19686f727927439b8ed
-  data.tar.gz: 2ed17169f6e2402d2a76b1d9572883c9b113160ac1a9f86e9be1744cfb289ad4c0c4ae79108bffb9a219a6ba72f0c93ddce85247d4098e5afa3d65241a8c0c37
+  metadata.gz: ebed4f7693b075eb8121005178f2be913bbda87ac321b6d7d1f78cb3611fd017e21c137e7e3d9e718afdde5f4144b34bd8bb3f4a049be4c127c01ab7dc893886
+  data.tar.gz: b19909608492c4ec559bbfe5a9cb8933f954110455a22a885bf0b4dbdfdc0718e64f3a7e1e75e98b7e35e5982edcae7609878795a09807f3c82d3a4c6281b84a

data/lib/isodoc/itu/html/_coverpage.css

@@ -312,6 +312,11 @@ svg {
   display: block; /* ← removes unwanted inline spacing */
 }
 
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}
+
 #standard-band {
   background-color: #0AC442;
 }

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

@@ -312,6 +312,11 @@ svg {
   display: block; /* ← removes unwanted inline spacing */
 }
 
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}
+
 #standard-band {
   background-color: #0AC442;
 }

data/lib/isodoc/itu/itu.implementers-guide.xsl

@@ -371,32 +371,12 @@
 
 						<xsl:for-each select=".//mn:page_sequence[parent::mn:preface][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
 
-							<fo:page-sequence master-reference="preface" format="i" force-page-count="no-force">
+							<!-- <debug><xsl:copy-of select="."/></debug> -->
 
-								<xsl:if test="$doctype = 'resolution'">
-									<xsl:attribute name="font-size">11pt</xsl:attribute>
-								</xsl:if>
-								<xsl:if test="$doctype = 'service-publication'">
-									<xsl:attribute name="font-size">11pt</xsl:attribute>
-									<xsl:attribute name="font-family">Arial, STIX Two Math</xsl:attribute>
-								</xsl:if>
-
-								<xsl:attribute name="master-reference">
-									<xsl:text>preface</xsl:text>
-									<xsl:call-template name="getPageSequenceOrientation"/>
-								</xsl:attribute>
-
-								<xsl:if test="$doctype = 'service-publication'">
-									<xsl:attribute name="master-reference">
-										<xsl:text>document</xsl:text>
-										<xsl:call-template name="getPageSequenceOrientation"/>
-									</xsl:attribute>
-									<xsl:attribute name="format">1</xsl:attribute>
-								</xsl:if>
-
-								<xsl:if test="position() = 1">
-									<xsl:attribute name="initial-page-number">1</xsl:attribute>
-								</xsl:if>
+							<fo:page-sequence xsl:use-attribute-sets="page-sequence-preface">
+								<xsl:call-template name="refine_page-sequence-preface">
+									<xsl:with-param name="doctype" select="$doctype"/>
+								</xsl:call-template>
 
 								<xsl:call-template name="insertHeaderFooter">
 									<xsl:with-param name="doctype" select="$doctype"/>
@@ -506,28 +486,10 @@
 						<xsl:for-each select=".//mn:page_sequence[not(parent::mn:preface)][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
 
 							<!-- BODY -->
-							<fo:page-sequence master-reference="document" force-page-count="no-force">
-
-								<xsl:if test="$doctype = 'resolution'">
-									<xsl:attribute name="font-size">11pt</xsl:attribute>
-								</xsl:if>
-								<xsl:if test="$doctype = 'service-publication'">
-									<xsl:attribute name="font-size">11pt</xsl:attribute>
-									<xsl:attribute name="font-family">Arial, STIX Two Math</xsl:attribute>
-								</xsl:if>
-
-								<xsl:attribute name="master-reference">
-									<xsl:text>document</xsl:text>
-									<xsl:call-template name="getPageSequenceOrientation"/>
-								</xsl:attribute>
-
-								<xsl:if test="position() = 1">
-									<xsl:attribute name="initial-page-number">1</xsl:attribute>
-								</xsl:if>
-
-								<xsl:if test="$doctype = 'service-publication'">
-									<xsl:attribute name="initial-page-number">auto</xsl:attribute>
-								</xsl:if>
+							<fo:page-sequence xsl:use-attribute-sets="page-sequence-main">
+								<xsl:call-template name="refine_page-sequence-main">
+									<xsl:with-param name="doctype" select="$doctype"/>
+								</xsl:call-template>
 
 								<xsl:call-template name="insertFootnoteSeparatorCommon"/>
 
@@ -1881,7 +1843,7 @@
 				</xsl:call-template>
 				<xsl:apply-templates select="." mode="contents"/>
 				<fo:inline keep-together.within-line="always">
-					<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
+					<fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
 					<fo:page-number-citation ref-id="{@id}"/>
 				</fo:inline>
 			</fo:basic-link>
@@ -1943,7 +1905,7 @@
 														<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
 															<xsl:apply-templates select="mnx:title"/>
 															<fo:inline keep-together.within-line="always">
-																<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
+																<fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
 																<fo:page-number-citation ref-id="{@id}"/>
 															</fo:inline>
 														</fo:basic-link>
@@ -2080,6 +2042,9 @@
 			<xsl:variable name="title">
 				<xsl:call-template name="getName"/>
 			</xsl:variable>
+			<xsl:variable name="variant_title">
+				<xsl:copy-of select="mn:variant-title[@type = 'toc']/node()"/>
+			</xsl:variable>
 
 			<mnx:item level="{$level}" section="{$section}" type="{$type}" display="{$display}">
 				<xsl:call-template name="setId"/>
@@ -2087,7 +2052,14 @@
 					<xsl:attribute name="level">1</xsl:attribute>
 				</xsl:if>
 				<mnx:title>
-					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+					<xsl:choose>
+						<xsl:when test="normalize-space($variant_title) != ''">
+							<xsl:apply-templates select="xalan:nodeset($variant_title)" mode="contents_item"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</mnx:title>
 				<xsl:if test="$type != 'indexsect'">
 					<xsl:apply-templates mode="contents"/>
@@ -3257,20 +3229,71 @@
 	</xsl:variable>
 
 	<xsl:attribute-set name="page-sequence-preface">
+		<xsl:attribute name="master-reference">preface</xsl:attribute>
 		<xsl:attribute name="format">i</xsl:attribute>
-	</xsl:attribute-set>
+		<xsl:attribute name="force-page-count">no-force</xsl:attribute>
+	</xsl:attribute-set> <!-- page-sequence-preface -->
 
 	<xsl:template name="refine_page-sequence-preface">
 		<xsl:param name="layoutVersion"/>
-	</xsl:template>
+		<xsl:param name="doctype"/>
+		<xsl:param name="num"/>
+		<xsl:param name="skip_force_page_count">false</xsl:param>
+		<xsl:if test="$doctype = 'resolution'">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$doctype = 'service-publication'">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+			<xsl:attribute name="font-family">Arial, STIX Two Math</xsl:attribute>
+		</xsl:if>
 
-	<xsl:attribute-set name="page-sequence-main">
+		<xsl:attribute name="master-reference">
+			<xsl:text>preface</xsl:text>
+			<xsl:call-template name="getPageSequenceOrientation"/>
+		</xsl:attribute>
 
-	</xsl:attribute-set>
+		<xsl:if test="$doctype = 'service-publication'">
+			<xsl:attribute name="master-reference">
+				<xsl:text>document</xsl:text>
+				<xsl:call-template name="getPageSequenceOrientation"/>
+			</xsl:attribute>
+			<xsl:attribute name="format">1</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="position() = 1">
+			<xsl:attribute name="initial-page-number">1</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_page-sequence-preface -->
+
+	<xsl:attribute-set name="page-sequence-main">
+		<xsl:attribute name="master-reference">document</xsl:attribute>
+		<xsl:attribute name="force-page-count">no-force</xsl:attribute>
+	</xsl:attribute-set> <!-- page-sequence-main -->
 
 	<xsl:template name="refine_page-sequence-main">
 		<xsl:param name="layoutVersion"/>
-	</xsl:template>
+		<xsl:param name="doctype"/>
+		<xsl:if test="$doctype = 'resolution'">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$doctype = 'service-publication'">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+			<xsl:attribute name="font-family">Arial, STIX Two Math</xsl:attribute>
+		</xsl:if>
+
+		<xsl:attribute name="master-reference">
+			<xsl:text>document</xsl:text>
+			<xsl:call-template name="getPageSequenceOrientation"/>
+		</xsl:attribute>
+
+		<xsl:if test="position() = 1">
+			<xsl:attribute name="initial-page-number">1</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="$doctype = 'service-publication'">
+			<xsl:attribute name="initial-page-number">auto</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_page-sequence-main -->
 
 	<xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable>
 	<xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable>
@@ -3574,7 +3597,24 @@
 	<xsl:template match="mn:metanorma-extension/*[local-name() = 'UnitsML']" mode="update_xml_step1"/>
 
 	<!-- remove image/emf -->
-	<xsl:template match="mn:image/mn:emf" mode="update_xml_step1"/>
+	<xsl:template match="mn:image//mn:emf" mode="update_xml_step1"/>
+
+	<!-- https://github.com/metanorma/metanorma/issues/540 -->
+	<xsl:template match="mn:image[mn:altsource]" priority="3" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
+			<xsl:choose>
+				<xsl:when test="mn:altsource[contains(@tag, 'pdf')]">
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/@*" mode="update_xml_step1"/>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'pdf')]/node()" mode="update_xml_step1"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/@*" mode="update_xml_step1"/>
+					<xsl:apply-templates select="mn:altsource[contains(@tag, 'default')]/node()" mode="update_xml_step1"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:copy>
+	</xsl:template>
 
 	<!-- remove preprocess-xslt -->
 	<xsl:template match="mn:preprocess-xslt" mode="update_xml_step1"/>
@@ -3802,6 +3842,15 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<!-- https://github.com/metanorma/metanorma-iso/issues/1535 -->
+	<xsl:template match="mn:ol[mn:fmt-ol]" mode="update_xml_step1">
+		<xsl:apply-templates select="mn:fmt-ol" mode="update_xml_step1"/>
+	</xsl:template>
+
+	<xsl:template match="mn:ul[mn:fmt-ul]" mode="update_xml_step1">
+		<xsl:apply-templates select="mn:fmt-ul" mode="update_xml_step1"/>
+	</xsl:template>
+
 	<!-- li/fmt-name -->
 	<xsl:template match="mn:li/mn:fmt-name" priority="2" mode="update_xml_step1">
 		<xsl:attribute name="label"><xsl:value-of select="."/></xsl:attribute>
@@ -7101,6 +7150,8 @@
 		<xsl:if test="$doctype = 'service-publication'">
 			<xsl:attribute name="border">1pt solid rgb(211,211,211)</xsl:attribute>
 		</xsl:if>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-style -->
 
 	<xsl:attribute-set name="table-number-style">
@@ -7139,12 +7190,16 @@
 		<xsl:if test="$doctype = 'service-publication'">
 			<xsl:attribute name="border-bottom">1.1pt solid black</xsl:attribute>
 		</xsl:if>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-header-row-style -->
 
 	<xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_table-footer-row-style">
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-row-style -->
 
 	<xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -7154,6 +7209,8 @@
 	<xsl:template name="refine_table-body-row-style">
 
 		<xsl:call-template name="setBordersTableArray"/>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-body-row-style -->
 
 	<xsl:attribute-set name="table-header-cell-style">
@@ -7183,6 +7240,16 @@
 		</xsl:if>
 
 		<xsl:call-template name="setTableCellAttributes"/>
+
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="display-align">before</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:if test="following-sibling::*">
+				<xsl:attribute name="padding-right">4mm</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="setNoBordersForTableList"/>
+		</xsl:if>
+
 	</xsl:template> <!-- refine_table-header-cell-style -->
 
 	<xsl:attribute-set name="table-cell-style">
@@ -7209,6 +7276,15 @@
 			<xsl:attribute name="padding-top">1mm</xsl:attribute>
 		</xsl:if>
 
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="display-align">before</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:if test="following-sibling::*">
+				<xsl:attribute name="padding-right">4mm</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="setNoBordersForTableList"/>
+		</xsl:if>
+
 	</xsl:template> <!-- refine_table-cell-style -->
 
 	<xsl:attribute-set name="table-footer-cell-style">
@@ -7228,6 +7304,8 @@
 		<xsl:if test="$doctype = 'service-publication'">
 			<xsl:attribute name="border">none</xsl:attribute>
 		</xsl:if>
+
+		<xsl:call-template name="setNoBordersForTableList"/>
 	</xsl:template> <!-- refine_table-footer-cell-style -->
 
 	<xsl:attribute-set name="table-note-style">
@@ -7272,6 +7350,16 @@
 	<xsl:template name="refine_table-fn-body-style">
 	</xsl:template>
 
+	<xsl:template name="setNoBordersForTableList">
+		<xsl:if test="ancestor::mn:fmt-ol or ancestor::mn:fmt-ul">
+			<xsl:attribute name="border">none</xsl:attribute>
+			<xsl:attribute name="border-top">none</xsl:attribute>
+			<xsl:attribute name="border-bottom">none</xsl:attribute>
+			<xsl:attribute name="border-left">none</xsl:attribute>
+			<xsl:attribute name="border-right">none</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- ========================== -->
 	<!-- END Table styles -->
 	<!-- ========================== -->
@@ -12886,6 +12974,10 @@
 		</fo:list-item>
 	</xsl:template>
 
+	<xsl:template match="mn:fmt-ol | mn:fmt-ul">
+		<xsl:apply-templates/>
+	</xsl:template>
+
 	<!-- ===================================== -->
 	<!-- END Lists processing -->
 	<!-- ===================================== -->
@@ -14250,6 +14342,7 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
+		<xsl:copy-of select="@id"/>
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-title-style">
@@ -14334,13 +14427,13 @@
 
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
-			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
+			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]"> <!--  or @type = 'toc' -->
 				<node id="{@id}"/>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
 
-		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
+		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]"> <!--  or @type = 'toc' -->
 			<xsl:sort select="@displayorder" data-type="number"/>
 
 			<!-- process Section's title -->
@@ -14353,6 +14446,23 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template match="*[@type = 'toc'][mn:title or mn:fmt-title]" mode="contents" priority="2">
+		<xsl:variable name="title">
+			<xsl:call-template name="getName"/>
+		</xsl:variable>
+		<xsl:variable name="root">
+			<xsl:if test="ancestor-or-self::mn:preface">preface</xsl:if>
+			<xsl:if test="ancestor-or-self::mn:annex">annex</xsl:if>
+		</xsl:variable>
+		<mnx:item id="{@id}" level="1" section="" type="toc" root="{$root}" display="false">
+			<mnx:title>
+				<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item">
+					<xsl:with-param name="element" select="$root"/>
+				</xsl:apply-templates>
+			</mnx:title>
+		</mnx:item>
+	</xsl:template>
+
 	<xsl:template name="processMainSectionsDefault_Contents">
 
 		<xsl:variable name="nodes_sections_">
@@ -16213,16 +16323,17 @@
 	<!-- 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"/>
+		<xsl:param name="wrapper">true</xsl:param>
 		<xsl:variable name="element_node" select="xalan:nodeset($element)"/>
 		<xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/>
 		<xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/>
 		<xsl:choose>
-			<xsl:when test="$internal-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true' and $wrapper = 'true'">
 				<fo:wrapper role="Reference">
 					<xsl:copy-of select="$element_node"/>
 				</fo:wrapper>
 			</xsl:when>
-			<xsl:when test="$external-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true' or $external-destination = 'true'">
 				<xsl:copy-of select="$element_node"/>
 			</xsl:when>
 			<xsl:otherwise>