metanorma-iec 2.5.7 → 2.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2943a0d27f9b2a3dfc6f3075e9f09a5e98e2e3bff208fedecf134a79d8e62d77
-  data.tar.gz: c4d3c17e2d976295a1c43a099db21131d7234c08365145dc653e2d9483a8cee5
+  metadata.gz: 66fba3763fe9014def32480c7a7a3b48b13359ee0d0aa68e32e6fec0895d997c
+  data.tar.gz: a611decb5788c0f8d5cef6a565887f87fad598709b733c709f83b7b4e7edb369
 SHA512:
-  metadata.gz: fdf68ccbd39985b4d01465b82e03a4c3e877ed2287f7b918e4003216d8985f65a0ac1225a453de0b9c28e99e129a4dbb5366c5c2c07d4e639556e6e324fcc440
-  data.tar.gz: 2bad112331aabedd8c60fce2052dd73edcacb707d1c84778d41ba1a735930a825795d77a4aaca9f6721ed8d7723659de3160bae06af4efb9084079f628b2b870
+  metadata.gz: 888379d6efae9178b3b159223d6a7d3d6168784d9e3f3acc9b28b3a9b4f322d79c944df4980b977a91650db96aa7c09a15db8a02d31d8e12908fac61eb852976
+  data.tar.gz: bdcc2276baa7c810f149b3f7e8c6b3df3cdcd41279f5b4adcc2931c43707fd81500b92c650209d919e894f9177ec7ef8aa320b892c698a8057d8c36ae33f5842

data/lib/isodoc/iec/base_convert.rb

@@ -10,9 +10,9 @@ module IsoDoc
 
       def foreword(clause, out)
         out.div **attr_code(id: clause["id"]) do |s|
-          clause_name(nil, clause.at(ns("./title")), s,
+          clause_name(nil, clause.at(ns("./fmt-title")), s,
                       { class: "ForewordTitle" })
-          clause.elements.each { |e| parse(e, s) unless e.name == "title" }
+          clause.elements.each { |e| parse(e, s) unless e.name == "fmt-title" }
         end
       end
 
@@ -23,7 +23,7 @@ module IsoDoc
       def biblio_list(elem, div, biblio)
         @is_iev or return super
         elem.children.each do |b|
-          parse(b, div) unless %w(title bibitem).include? b.name
+          parse(b, div) unless %w(fmt-title bibitem).include? b.name
         end
       end
 
@@ -34,10 +34,10 @@ module IsoDoc
           depth = clause_title_depth(node, nil)
           out.send "h#{depth}", class: "zzSTDTitle2" do |p|
             p.b do |b|
-              node&.at(ns("./title"))&.children&.each { |c2| parse(c2, b) }
+              node&.at(ns("./fmt-title"))&.children&.each { |c2| parse(c2, b) }
             end
           end
-          node.children.reject { |c1| c1.name == "title" }.each do |c1|
+          node.children.reject { |c1| c1.name == "fmt-title" }.each do |c1|
             parse(c1, div)
           end
         end

data/lib/isodoc/iec/iec.international-standard.xsl

@@ -221,6 +221,12 @@
 					<xsl:with-param name="contents" select="$contents"/>
 				</xsl:call-template>
 
+				<xsl:if test="$debug = 'true'">
+					<redirect:write file="contents_.xml"> <!-- {java:getTime(java:java.util.Date.new())} -->
+						<xsl:copy-of select="$contents"/>
+					</redirect:write>
+				</xsl:if>
+
 				<!-- For 'Published' documents insert two cover pages -->
 				<xsl:if test="$stage &gt;= 60">
 
@@ -868,12 +874,6 @@
 					</fo:page-sequence> <!-- END: cover-FDIS -->
 				</xsl:if>
 
-				<!-- <xsl:if test="$debug = 'true'">
-					<redirect:write file="contents_{java:getTime(java:java.util.Date.new())}.xml">
-						<xsl:copy-of select="$contents"/>
-					</redirect:write>
-				</xsl:if> -->
-
 				<xsl:for-each select="//iec:iec-standard">
 					<xsl:variable name="lang" select="*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
 					<xsl:variable name="current_document">
@@ -1591,10 +1591,10 @@
 	<!-- ============================= -->
 
 	<!-- element with title -->
-	<xsl:template match="*[iec:title]" mode="contents">
+	<xsl:template match="*[iec:title or iec:fmt-title]" mode="contents">
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel">
-				<xsl:with-param name="depth" select="iec:title/@depth"/>
+				<xsl:with-param name="depth" select="iec:fmt-title/@depth | iec:title/@depth"/>
 			</xsl:call-template>
 		</xsl:variable>
 
@@ -1649,7 +1649,14 @@
 							<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($title))"/>
 						</xsl:when>
 						<xsl:when test="$type = 'appendix'">
-							<xsl:apply-templates select="iec:title" mode="contents_item"/>
+							<xsl:choose>
+								<xsl:when test="iec:fmt-title">
+									<xsl:apply-templates select="iec:fmt-title" mode="contents_item"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:apply-templates select="iec:title" mode="contents_item"/>
+								</xsl:otherwise>
+							</xsl:choose>
 						</xsl:when>
 						<xsl:otherwise>
 							<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
@@ -2163,7 +2170,7 @@
 		</xsl:copy>
 	</xsl:template> -->
 
-			<xsl:strip-space elements="iec:xref"/>
+			<!-- <xsl:strip-space elements="iec:xref"/> -->
 
 	<xsl:variable name="namespace_full" select="namespace-uri(/*)"/> <!-- example: https://www.metanorma.org/ns/iso -->
 	<xsl:variable name="root_element" select="local-name(/*)"/> <!-- example: iso-standard -->
@@ -3183,6 +3190,10 @@
 
 	<xsl:template name="refine_termnote-name-style">
 
+		<!-- <xsl:if test="$namespace = 'ieee'">
+			<xsl:attribute name="padding-right">0mm</xsl:attribute>
+		</xsl:if> -->
+
 	</xsl:template>
 
 	<xsl:attribute-set name="termnote-p-style">
@@ -3895,9 +3906,21 @@
 	<xsl:template name="processTables_Contents">
 		<tables>
 			<xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
-				<table id="{@id}" alt-text="{*[local-name() = 'name']}">
-					<xsl:copy-of select="*[local-name() = 'name']"/>
-				</table>
+				<xsl:choose>
+					<xsl:when test="*[local-name() = 'fmt-name']">
+						<xsl:variable name="fmt_name">
+							<xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
+						</xsl:variable>
+						<table id="{@id}" alt-text="{normalize-space($fmt_name)}">
+							<xsl:copy-of select="$fmt_name"/>
+						</table>
+					</xsl:when>
+					<xsl:otherwise>
+						<table id="{@id}" alt-text="{*[local-name() = 'name']}">
+							<xsl:copy-of select="*[local-name() = 'name']"/>
+						</table>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:for-each>
 		</tables>
 	</xsl:template>
@@ -3905,9 +3928,21 @@
 	<xsl:template name="processFigures_Contents">
 		<figures>
 			<xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name'] and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(*[local-name() = 'name'], 'Figure ') and normalize-space(@id) != '']">
-				<figure id="{@id}" alt-text="{*[local-name() = 'name']}">
-					<xsl:copy-of select="*[local-name() = 'name']"/>
-				</figure>
+				<xsl:choose>
+					<xsl:when test="*[local-name() = 'fmt-name']">
+						<xsl:variable name="fmt_name">
+							<xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
+						</xsl:variable>
+						<figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
+							<xsl:copy-of select="$fmt_name"/>
+						</figure>
+					</xsl:when>
+					<xsl:otherwise>
+						<figure id="{@id}" alt-text="{*[local-name() = 'name']}">
+							<xsl:copy-of select="*[local-name() = 'name']"/>
+						</figure>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:for-each>
 		</figures>
 	</xsl:template>
@@ -8814,6 +8849,8 @@
 
 									<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
 
+										<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
+
 										<xsl:call-template name="refine_note-name-style"/>
 
 										<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
@@ -8870,10 +8907,6 @@
 
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
 
-				<xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
-					<xsl:attribute name="padding-right">1mm</xsl:attribute>
-				</xsl:if>
-
 				<xsl:call-template name="refine_termnote-name-style"/>
 
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
@@ -9020,17 +9053,29 @@
 			<!-- Example: Dimensions in millimeters -->
 			<xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
 
+			<xsl:variable name="show_figure_key_in_block_container">
+				true
+			</xsl:variable>
+
 			<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
 				<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
 			</fo:block>
-			<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
-				<xsl:call-template name="note"/>
-			</xsl:for-each>
-			<xsl:call-template name="fn_display_figure"/>
+
+			<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
+				<xsl:call-template name="showFigureKey"/>
+			</xsl:if>
 
 					<xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
 
 		</fo:block-container>
+
+	</xsl:template>
+
+	<xsl:template name="showFigureKey">
+		<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
+			<xsl:call-template name="note"/>
+		</xsl:for-each>
+		<xsl:call-template name="fn_display_figure"/>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']">
@@ -9228,6 +9273,22 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="getImageSrc">
+		<xsl:choose>
+			<xsl:when test="not(starts-with(@src, 'data:'))">
+				<xsl:choose>
+					<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
+						<xsl:value-of select="@src"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="concat($basepath, @src)"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template name="getImageScale">
 		<xsl:param name="indent"/>
 		<xsl:variable name="indent_left">
@@ -9237,19 +9298,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="img_src">
-			<xsl:choose>
-				<xsl:when test="not(starts-with(@src, 'data:'))">
-					<xsl:choose>
-						<xsl:when test="@extracted = 'true'"> <!-- added in mn2pdf v1.97 -->
-							<xsl:value-of select="@src"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:value-of select="concat($basepath, @src)"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when>
-				<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-			</xsl:choose>
+			<xsl:call-template name="getImageSrc"/>
 		</xsl:variable>
 
 		<xsl:variable name="image_width_effective">
@@ -9257,10 +9306,15 @@
 					<xsl:value-of select="$width_effective - number($indent_left)"/>
 
 		</xsl:variable>
+		<xsl:variable name="image_height_effective" select="$height_effective - number($indent_left)"/>
 		<!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
 		<xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
 		<xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
-		<xsl:variable name="scale" select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+		<xsl:variable name="scale">
+
+					<xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+
+		</xsl:variable>
 		<xsl:value-of select="$scale"/>
 	</xsl:template>
 
@@ -9813,20 +9867,48 @@
 	<xsl:template match="*[local-name() = 'emf']"/>
 
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
+		<xsl:if test="not(following-sibling::*[1][local-name() = 'fmt-name'])">
+			<xsl:apply-templates mode="contents"/>
+			<xsl:text> </xsl:text>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'title'][following-sibling::*[1][local-name() = 'fmt-title']]" mode="contents"/>
+
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fmt-name'] |                *[local-name() = 'table']/*[local-name() = 'fmt-name'] |               *[local-name() = 'permission']/*[local-name() = 'fmt-name'] |               *[local-name() = 'recommendation']/*[local-name() = 'fmt-name'] |               *[local-name() = 'requirement']/*[local-name() = 'fmt-name']" mode="contents">
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name'] |               *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">
+		<xsl:if test="not(following-sibling::*[1][local-name() = 'fmt-name'])">
+			<xsl:apply-templates mode="bookmarks"/>
+			<xsl:text> </xsl:text>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fmt-name'] |                *[local-name() = 'table']/*[local-name() = 'fmt-name'] |               *[local-name() = 'permission']/*[local-name() = 'fmt-name'] |               *[local-name() = 'recommendation']/*[local-name() = 'fmt-name'] |               *[local-name() = 'requirement']/*[local-name() = 'fmt-name'] |               *[local-name() = 'sourcecode']/*[local-name() = 'fmt-name']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 		<xsl:text> </xsl:text>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
+		<xsl:if test="not(../following-sibling::*[1][local-name() = 'fmt-name'])">
+			<xsl:value-of select="."/>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'fmt-name']/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
+		<xsl:if test="not(../following-sibling::*[1][local-name() = 'fmt-name'])">
+			<xsl:value-of select="."/>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'fmt-name']//text()" mode="bookmarks" priority="2">
 		<xsl:value-of select="."/>
 	</xsl:template>
 
@@ -9847,7 +9929,7 @@
 	</xsl:template>
 
 	<!-- special case: ignore section-title if @depth different than @depth of parent clause, or @depth of parent clause = 1 -->
-	<xsl:template match="*[local-name() = 'clause']/*[local-name() = 'p'][@type = 'section-title' and (@depth != ../*[local-name() = 'title']/@depth or ../*[local-name() = 'title']/@depth = 1)]" priority="3" mode="contents"/>
+	<xsl:template match="*[local-name() = 'clause']/*[local-name() = 'p'][@type = 'section-title' and (@depth != ../*[local-name() = 'title' or local-name() = 'fmt-title']/@depth or ../*[local-name() = 'title' or local-name() = 'fmt-title']/@depth = 1)]" priority="3" mode="contents"/>
 
 	<xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" name="contents_section-title" mode="contents">
 		<xsl:variable name="level">
@@ -9859,6 +9941,9 @@
 		<xsl:variable name="section">
 			<xsl:choose>
 				<xsl:when test="@type = 'section-title'"/>
+				<xsl:when test="*[local-name() = 'span'][@class = 'fmt-caption-delim']">
+					<xsl:value-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/preceding-sibling::node()"/>
+				</xsl:when>
 				<xsl:otherwise>
 					<xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
 				</xsl:otherwise>
@@ -9881,6 +9966,19 @@
 
 			<xsl:variable name="title">
 				<xsl:choose>
+					<!-- https://github.com/metanorma/mn-native-pdf/issues/770 -->
+					<xsl:when test="*[local-name() = 'span'][@class = 'fmt-caption-delim']">
+						<xsl:choose>
+							<xsl:when test="@type = 'section-title'">
+								<xsl:value-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/preceding-sibling::node()"/>
+								<xsl:text>: </xsl:text>
+								<xsl:copy-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/following-sibling::node()[not(local-name = 'fmt-xref-label')]"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:copy-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/following-sibling::node()[not(local-name = 'fmt-xref-label')]"/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:when>
 					<xsl:when test="*[local-name() = 'tab']">
 						<xsl:choose>
 							<xsl:when test="@type = 'section-title'">
@@ -9916,7 +10014,7 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'title' or local-name() = 'name']//*[local-name() = 'stem']" mode="contents">
+	<xsl:template match="*[local-name() = 'title' or local-name() = 'name' or local-name() = 'fmt-title' or local-name() = 'fmt-name']//*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
 	</xsl:template>
 
@@ -9929,6 +10027,10 @@
 		<xsl:apply-templates mode="contents"/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'semx']" mode="contents">
+		<xsl:apply-templates mode="contents"/>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template>
@@ -9938,9 +10040,14 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'semx']" mode="bookmarks">
+		<xsl:apply-templates mode="bookmarks"/>
+	</xsl:template>
+
 	<!-- Bookmarks -->
 	<xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
+		<xsl:param name="contents_addon"/>
 		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
 		<xsl:if test="$contents_nodes//item">
 			<fo:bookmark-tree>
@@ -10038,6 +10145,9 @@
 					</xsl:otherwise>
 				</xsl:choose>
 
+				<!-- for $namespace = 'nist-sp' $namespace = 'ogc' $namespace = 'ogc-white-paper' -->
+				<xsl:copy-of select="$contents_addon"/>
+
 			</fo:bookmark-tree>
 		</xsl:if>
 	</xsl:template>
@@ -10202,6 +10312,16 @@
 	<!-- ====== -->
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'title']" mode="contents_item">
+		<xsl:param name="mode">bookmarks</xsl:param>
+		<xsl:if test="not(following-sibling::*[1][local-name() = 'fmt-title'])">
+			<xsl:apply-templates mode="contents_item">
+				<xsl:with-param name="mode" select="$mode"/>
+			</xsl:apply-templates>
+			<!-- <xsl:text> </xsl:text> -->
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-title']" mode="contents_item">
 		<xsl:param name="mode">bookmarks</xsl:param>
 		<xsl:apply-templates mode="contents_item">
 			<xsl:with-param name="mode" select="$mode"/>
@@ -10209,12 +10329,38 @@
 		<!-- <xsl:text> </xsl:text> -->
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim']" mode="contents_item" priority="3">
+		<xsl:apply-templates mode="contents_item"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'semx']" mode="contents_item">
+		<xsl:apply-templates mode="contents_item"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-xref-label']" mode="contents_item"/>
+
 	<xsl:template name="getSection">
-		<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+		<xsl:choose>
+			<xsl:when test="*[local-name() = 'fmt-title']">
+				<xsl:variable name="fmt_title_section">
+					<xsl:copy-of select="*[local-name() = 'fmt-title']//*[local-name() = 'span'][@class = 'fmt-caption-delim'][*[local-name() = 'tab']][1]/preceding-sibling::node()[not(local-name() = 'review')]"/>
+				</xsl:variable>
+				<xsl:value-of select="normalize-space($fmt_title_section)"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template name="getName">
 		<xsl:choose>
+			<xsl:when test="*[local-name() = 'fmt-title']//*[local-name() = 'span'][@class = 'fmt-caption-delim'][*[local-name() = 'tab']]">
+				<xsl:copy-of select="*[local-name() = 'fmt-title']//*[local-name() = 'span'][@class = 'fmt-caption-delim'][*[local-name() = 'tab']][1]/following-sibling::node()"/>
+			</xsl:when>
+			<xsl:when test="*[local-name() = 'fmt-title']">
+				<xsl:copy-of select="*[local-name() = 'fmt-title']/node()"/>
+			</xsl:when>
 			<xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
 				<xsl:copy-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/following-sibling::node()"/>
 			</xsl:when>
@@ -10321,6 +10467,15 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'name']" mode="contents_item">
+		<xsl:param name="mode">bookmarks</xsl:param>
+		<xsl:if test="not(following-sibling::*[1][local-name() = 'fmt-name'])">
+			<xsl:apply-templates mode="contents_item">
+				<xsl:with-param name="mode" select="$mode"/>
+			</xsl:apply-templates>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-name']" mode="contents_item">
 		<xsl:param name="mode">bookmarks</xsl:param>
 		<xsl:apply-templates mode="contents_item">
 			<xsl:with-param name="mode" select="$mode"/>
@@ -11159,113 +11314,114 @@
 	-->
 	<xsl:template match="*[local-name() = 'example']">
 
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
+				<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
 
-			<xsl:call-template name="setBlockSpanAll"/>
-
-			<xsl:call-template name="refine_example-style"/>
+					<xsl:call-template name="setBlockSpanAll"/>
 
-			<xsl:variable name="fo_element">
-				<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
+					<xsl:call-template name="refine_example-style"/>
 
-						<xsl:choose>
-							<!-- if example contains only one (except 'name') element (paragraph for example), then display it on the same line as EXAMPLE title -->
-							<xsl:when test="count(*[not(local-name() = 'name')]) = 1">inline</xsl:when>
-							<xsl:otherwise>block</xsl:otherwise>
-						</xsl:choose>
+					<xsl:variable name="fo_element">
+						<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
 
-			</xsl:variable>
+								<xsl:choose>
+									<!-- if example contains only one (except 'name') element (paragraph for example), then display it on the same line as EXAMPLE title -->
+									<xsl:when test="count(*[not(local-name() = 'name')]) = 1">inline</xsl:when>
+									<xsl:otherwise>block</xsl:otherwise>
+								</xsl:choose>
 
-			<fo:block-container margin-left="0mm" role="SKIP">
+					</xsl:variable>
 
-				<xsl:choose>
+					<fo:block-container margin-left="0mm" role="SKIP">
 
-					<xsl:when test="contains(normalize-space($fo_element), 'block')">
+						<xsl:choose>
 
-						<!-- display name 'EXAMPLE' in a separate block  -->
-						<fo:block>
-							<xsl:apply-templates select="*[local-name()='name']">
-								<xsl:with-param name="fo_element" select="$fo_element"/>
-							</xsl:apply-templates>
-						</fo:block>
+							<xsl:when test="contains(normalize-space($fo_element), 'block')">
 
-						<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
-							<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
-								<xsl:variable name="example_body">
-									<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+								<!-- display name 'EXAMPLE' in a separate block  -->
+								<fo:block>
+									<xsl:apply-templates select="*[local-name()='name']">
 										<xsl:with-param name="fo_element" select="$fo_element"/>
 									</xsl:apply-templates>
+								</fo:block>
+
+								<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
+									<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+										<xsl:variable name="example_body">
+											<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+												<xsl:with-param name="fo_element" select="$fo_element"/>
+											</xsl:apply-templates>
+										</xsl:variable>
+										<xsl:choose>
+											<xsl:when test="xalan:nodeset($example_body)/*">
+												<xsl:copy-of select="$example_body"/>
+											</xsl:when>
+											<xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
+										</xsl:choose>
+									</fo:block-container>
+								</fo:block-container>
+							</xsl:when> <!-- end block -->
+
+							<xsl:when test="contains(normalize-space($fo_element), 'list')">
+
+								<xsl:variable name="provisional_distance_between_starts_">
+									7
 								</xsl:variable>
-								<xsl:choose>
-									<xsl:when test="xalan:nodeset($example_body)/*">
-										<xsl:copy-of select="$example_body"/>
-									</xsl:when>
-									<xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
-								</xsl:choose>
-							</fo:block-container>
-						</fo:block-container>
-					</xsl:when> <!-- end block -->
+								<xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
+								<xsl:variable name="indent_">
+									0
+								</xsl:variable>
+								<xsl:variable name="indent" select="normalize-space($indent_)"/>
 
-					<xsl:when test="contains(normalize-space($fo_element), 'list')">
+								<fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
+									<fo:list-item>
+										<fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
+											<fo:block>
+												<xsl:apply-templates select="*[local-name()='name']">
+													<xsl:with-param name="fo_element">block</xsl:with-param>
+												</xsl:apply-templates>
+											</fo:block>
+										</fo:list-item-label>
+										<fo:list-item-body start-indent="body-start()">
+											<fo:block>
+												<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+													<xsl:with-param name="fo_element" select="$fo_element"/>
+												</xsl:apply-templates>
+											</fo:block>
+										</fo:list-item-body>
+									</fo:list-item>
+								</fo:list-block>
+							</xsl:when> <!-- end list -->
 
-						<xsl:variable name="provisional_distance_between_starts_">
-							7
-						</xsl:variable>
-						<xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
-						<xsl:variable name="indent_">
-							0
-						</xsl:variable>
-						<xsl:variable name="indent" select="normalize-space($indent_)"/>
+							<xsl:otherwise> <!-- inline -->
 
-						<fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
-							<fo:list-item>
-								<fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
-									<fo:block>
-										<xsl:apply-templates select="*[local-name()='name']">
-											<xsl:with-param name="fo_element">block</xsl:with-param>
-										</xsl:apply-templates>
-									</fo:block>
-								</fo:list-item-label>
-								<fo:list-item-body start-indent="body-start()">
-									<fo:block>
-										<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+								<!-- display 'EXAMPLE' and first element in the same line -->
+								<fo:block>
+									<xsl:apply-templates select="*[local-name()='name']">
+										<xsl:with-param name="fo_element" select="$fo_element"/>
+									</xsl:apply-templates>
+									<fo:inline>
+										<xsl:apply-templates select="*[not(local-name() = 'name')][1]">
 											<xsl:with-param name="fo_element" select="$fo_element"/>
 										</xsl:apply-templates>
-									</fo:block>
-								</fo:list-item-body>
-							</fo:list-item>
-						</fo:list-block>
-					</xsl:when> <!-- end list -->
-
-					<xsl:otherwise> <!-- inline -->
+									</fo:inline>
+								</fo:block>
 
-						<!-- display 'EXAMPLE' and first element in the same line -->
-						<fo:block>
-							<xsl:apply-templates select="*[local-name()='name']">
-								<xsl:with-param name="fo_element" select="$fo_element"/>
-							</xsl:apply-templates>
-							<fo:inline>
-								<xsl:apply-templates select="*[not(local-name() = 'name')][1]">
-									<xsl:with-param name="fo_element" select="$fo_element"/>
-								</xsl:apply-templates>
-							</fo:inline>
-						</fo:block>
+								<xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
+									<!-- display further elements in blocks -->
+									<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
+										<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+											<xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
+												<xsl:with-param name="fo_element" select="'block'"/>
+											</xsl:apply-templates>
+										</fo:block-container>
+									</fo:block-container>
+								</xsl:if>
+							</xsl:otherwise> <!-- end inline -->
 
-						<xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
-							<!-- display further elements in blocks -->
-							<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
-								<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
-									<xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
-										<xsl:with-param name="fo_element" select="'block'"/>
-									</xsl:apply-templates>
-								</fo:block-container>
-							</fo:block-container>
-						</xsl:if>
-					</xsl:otherwise> <!-- end inline -->
+						</xsl:choose>
+					</fo:block-container>
+				</fo:block-container>
 
-				</xsl:choose>
-			</fo:block-container>
-		</fo:block-container>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']">
@@ -11647,6 +11803,15 @@
 
 	</xsl:template> <!-- tab -->
 
+	<xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']/*[local-name() = 'tab']" priority="2"/>
+	<xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']/*[local-name() = 'tab']" priority="2"/>
+
+	<xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab">
+
+			<xsl:attribute name="padding-right">6mm</xsl:attribute>
+
+	</xsl:template>
+
 	<xsl:template name="insertNonBreakSpaces">
 		<xsl:param name="count"/>
 		<xsl:if test="$count &gt; 0">
@@ -13193,6 +13358,10 @@
 	<!--   - Remove semantic xml part -->
 	<!--   - Remove image/emf (EMF vector image for Word) -->
 	<!--   - add @id, redundant for table auto-layout algorithm -->
+	<!--   - process 'passthrough' element -->
+	<!--   - split math by element with @linebreak into maths -->
+	<!--   - rename fmt-title to title, fmt-name to name and another changes to convert new presentation XML to  -->
+	<!--   - old XML without significant changes in XSLT -->
 	<!-- =========================================================================== -->
 	<xsl:template match="@*|node()" mode="update_xml_step1">
 		<xsl:copy>
@@ -13200,6 +13369,12 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="@*|node()" mode="update_xml_pres">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="update_xml_pres"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- change section's order based on @displayorder value -->
 	<xsl:template match="*[local-name() = 'preface']" mode="update_xml_step1">
 		<xsl:copy>
@@ -13276,7 +13451,7 @@
 	</xsl:template>
 
 	<!-- Example with 'class': <span class="stdpublisher">ISO</span> <span class="stddocNumber">10303</span>-<span class="stddocPartNumber">1</span>:<span class="stdyear">1994</span> -->
-	<xsl:template match="*[local-name() = 'span'][@style or @class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'span'][@style or @class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear' or @class = 'horizontal' or @class = 'norotate' or @class = 'halffontsize']" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>
@@ -13295,14 +13470,17 @@
 
 	<!-- remove semantic xml -->
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'metanorma']/*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'metanorma']/*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<!-- remove image/emf -->
 	<xsl:template match="*[local-name() = 'image']/*[local-name() = 'emf']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'image']/*[local-name() = 'emf']" mode="update_xml_pres"/>
 
 	<!-- remove preprocess-xslt -->
 	<xsl:template match="*[local-name() = 'preprocess-xslt']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'preprocess-xslt']" mode="update_xml_pres"/>
 
-	<xsl:template match="*[local-name() = 'stem'][not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])] |        *[local-name() = 'image'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'sourcecode'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'bibdata'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'localized-strings']" mode="update_xml_step1">
+	<xsl:template match="*[local-name() = 'stem'][not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])] |        *[local-name() = 'image'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'sourcecode'][not(.//*[local-name() = 'passthrough']) and not(.//*[local-name() = 'fmt-name'])] |        *[local-name() = 'bibdata'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'localized-strings']" mode="update_xml_step1">
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
@@ -13384,6 +13562,77 @@
 		<xsl:copy-of select="$maths"/>
 	</xsl:template>
 
+	<!-- update new Presentation XML -->
+	<xsl:template match="*[local-name() = 'title'][following-sibling::*[1][local-name() = 'fmt-title']]" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'title'][following-sibling::*[1][local-name() = 'fmt-title']]" mode="update_xml_pres"/>
+	<xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
+	<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
+
+	<xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
+			<xsl:copy-of select="preceding-sibling::*[1][local-name() = 'section-title']/@depth"/>
+			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_pres">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="update_xml_pres"/>
+			<xsl:copy-of select="preceding-sibling::*[1][local-name() = 'section-title']/@depth"/>
+			<xsl:apply-templates select="node()" mode="update_xml_pres"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-title']"/>
+	<xsl:template match="*[local-name() = 'fmt-title']" mode="update_xml_step1">
+		<xsl:element name="title" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-title']" mode="update_xml_pres">
+		<xsl:element name="title" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-name']"/>
+	<xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_step1">
+		<xsl:element name="name" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_pres">
+		<xsl:element name="name" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_pres" priority="3">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'semx']" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'semx']" mode="update_xml_pres">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-xref-label']"/>
+	<xsl:template match="*[local-name() = 'fmt-xref-label']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'fmt-xref-label']" mode="update_xml_pres"/>
+
+	<!-- END: update new Presentation XML -->
+
 	<!-- =========================================================================== -->
 	<!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
 	<!-- =========================================================================== -->
@@ -13576,7 +13825,7 @@
 	<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
 	<xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     ancestor::*[local-name() = 'name'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<xsl:variable name="parent" select="local-name(..)"/>
 
@@ -14155,6 +14404,7 @@
 		</pdf:catalog>
 		<x:xmpmeta xmlns:x="adobe:ns:meta/">
 			<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+				<!-- Commented after upgrade to Apache FOP 2.10
 				<rdf:Description xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/" xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#" xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#" rdf:about="">
 					<pdfaExtension:schemas>
 						<rdf:Bag>
@@ -14187,7 +14437,7 @@
 							</rdf:li>
 						</rdf:Bag>
 					</pdfaExtension:schemas>
-				</rdf:Description>
+				</rdf:Description> -->
 				<rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
 				<!-- Dublin Core properties go here -->
 					<dc:title>
@@ -14234,7 +14484,7 @@
 					<xsl:variable name="dc_description">
 						<xsl:variable name="abstract">
 
-									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
+									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'fmt-title']) and not(ancestor::*[local-name() = 'title']) and not(ancestor::*[local-name() = 'fmt-xref-label'])]"/>
 
 						</xsl:variable>
 						<rdf:Alt>
@@ -14779,31 +15029,123 @@
 
 	<!-- END: insert cover page image -->
 
-	<xsl:variable name="regex_ja_spec">[\uFF08\uFF09]</xsl:variable>
+	<!-- https://github.com/metanorma/docs/blob/main/109.adoc -->
+	<xsl:variable name="regex_ja_spec_">[
+		<!-- Rotate 90° clockwise -->
+		\u0028  <!-- U+0028 LEFT PARENTHESIS (() -->
+		\uFF08 <!-- U+FF08 FULLWIDTH LEFT PARENTHESIS (（) -->
+		\u0029 <!-- U+0029 RIGHT PARENTHESIS ()) -->
+		\uFF09 <!-- U+FF09 FULLWIDTH RIGHT PARENTHESIS (）) -->
+		\u007B <!-- U+007B LEFT CURLY BRACKET ({) -->
+		\uFF5B <!-- U+FF5B FULLWIDTH LEFT CURLY BRACKET (｛) -->
+		\u007D <!-- U+007D RIGHT CURLY BRACKET (}) -->
+		\uFF5D <!-- U+FF5D FULLWIDTH RIGHT CURLY BRACKET (｝) -->
+		\u3014 <!-- U+3014 LEFT TORTOISE SHELL BRACKET (〔) -->
+		\u3015 <!-- U+3015 RIGHT TORTOISE SHELL BRACKET (〕) -->
+		\u3010 <!-- U+3010 LEFT BLACK LENTICULAR BRACKET (【) -->
+		\u3011 <!-- U+3011 RIGHT BLACK LENTICULAR BRACKET (】) -->
+		\u300A <!-- U+300A LEFT DOUBLE ANGLE BRACKET (《) -->
+		\u300B <!-- U+300B RIGHT DOUBLE ANGLE BRACKET (》) -->
+		\uFF62 <!-- U+FF62 HALFWIDTH LEFT CORNER BRACKET (｢) -->
+		\u300C <!-- U+300C LEFT CORNER BRACKET (「) -->
+		\uFF63 <!-- U+FF63 HALFWIDTH RIGHT CORNER BRACKET (｣) -->
+		\u300D <!-- U+300D RIGHT CORNER BRACKET (」) -->
+		\u300E <!-- U+300E LEFT WHITE CORNER BRACKET (『) -->
+		\u300F <!-- U+300F RIGHT WHITE CORNER BRACKET (』) -->
+		\u005B <!-- U+005B LEFT SQUARE BRACKET ([) -->
+		\uFF3B <!-- U+FF3B FULLWIDTH LEFT SQUARE BRACKET (［) -->
+		\u005D <!-- U+005D RIGHT SQUARE BRACKET (]) -->
+		\uFF3D <!-- U+FF3D FULLWIDTH RIGHT SQUARE BRACKET (］) -->
+		\u3008 <!-- U+3008 LEFT ANGLE BRACKET (〈) -->
+		\u3009 <!-- U+3009 RIGHT ANGLE BRACKET (〉) -->
+		\u3016 <!-- U+3016 LEFT WHITE LENTICULAR BRACKET (〖) -->
+		\u3017 <!-- U+3017 RIGHT WHITE LENTICULAR BRACKET (〗) -->
+
+		\u301A <!-- U+301A LEFT WHITE SQUARE BRACKET (〚) -->
+		\u301B <!-- U+301B RIGHT WHITE SQUARE BRACKET (〛) -->
+		\u301C <!-- U+301C WAVE DASH (〜) -->
+		\u3030 <!-- U+3030 WAVY DASH (〰 )-->
+		\u30FC <!-- U+30FC KATAKANA-HIRAGANA PROLONGED SOUND MARK (ー) -->
+		\u2329 <!-- U+2329 LEFT-POINTING ANGLE BRACKET (〈) -->
+		\u232A <!-- U+232A RIGHT-POINTING ANGLE BRACKET (〉) -->
+		\u3018 <!-- U+3018 LEFT WHITE TORTOISE SHELL BRACKET (〘) -->
+		\u3019 <!-- U+3019 RIGHT WHITE TORTOISE SHELL BRACKET (〙) -->
+		\u30A0 <!-- U+30A0 KATAKANA-HIRAGANA DOUBLE HYPHEN (゠) -->
+		\uFE59 <!-- U+FE59 SMALL LEFT PARENTHESIS (﹙) -->
+		\uFE5A <!-- U+FE5A SMALL RIGHT PARENTHESIS (﹚) -->
+		\uFE5B <!-- U+FE5B SMALL LEFT CURLY BRACKET (﹛) -->
+		\uFE5C <!-- U+FE5C SMALL RIGHT CURLY BRACKET (﹜) -->
+		\uFE5D <!-- U+FE5D SMALL LEFT TORTOISE SHELL BRACKET (﹝) -->
+		\uFE5E <!-- U+FE5E SMALL RIGHT TORTOISE SHELL BRACKET (﹞) -->
+		\uFF5C <!-- U+FF5C FULLWIDTH VERTICAL LINE (｜) -->
+		\uFF5F <!-- U+FF5F FULLWIDTH LEFT WHITE PARENTHESIS (｟) -->
+		\uFF60 <!-- U+FF60 FULLWIDTH RIGHT WHITE PARENTHESIS (｠) -->
+		\uFFE3 <!-- U+FFE3 FULLWIDTH MACRON (￣) -->
+		\uFF3F <!-- U+FF3F FULLWIDTH LOW LINE (＿) -->
+		\uFF5E <!-- U+FF5E FULLWIDTH TILDE (～) -->
+		<!-- Rotate 180° -->
+		\u309C <!-- U+309C KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK (゜) -->
+		\u3002 <!-- U+3002 IDEOGRAPHIC FULL STOP (。) -->
+		\uFE52 <!-- U+FE52 SMALL FULL STOP (﹒) -->
+		\uFF0E <!-- U+FF0E FULLWIDTH FULL STOP (．) -->
+		]</xsl:variable>
+	<xsl:variable name="regex_ja_spec"><xsl:value-of select="translate(normalize-space($regex_ja_spec_), ' ', '')"/></xsl:variable>
 	<xsl:template name="insertVerticalChar">
 		<xsl:param name="str"/>
 		<xsl:param name="writing-mode">lr-tb</xsl:param>
 		<xsl:param name="reference-orientation">90</xsl:param>
-		<xsl:if test="string-length($str) &gt; 0">
-			<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
-				<xsl:if test="normalize-space($writing-mode) != ''">
-					<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
-					<xsl:attribute name="reference-orientation">90</xsl:attribute>
-				</xsl:if>
-				<xsl:variable name="char" select="substring($str,1,1)"/>
-				<xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
-					<xsl:attribute name="reference-orientation">0</xsl:attribute>
+		<xsl:param name="add_zero_width_space">false</xsl:param>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'span'][@class = 'norotate']">
+				<xsl:value-of select="$str"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:if test="string-length($str) &gt; 0">
+					<xsl:variable name="horizontal_mode" select="normalize-space(ancestor::*[local-name() = 'span'][@class = 'horizontal'] and 1 = 1)"/>
+					<xsl:variable name="char" select="substring($str,1,1)"/>
+					<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
+						<xsl:if test="normalize-space($writing-mode) != ''">
+							<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
+							<xsl:attribute name="reference-orientation">90</xsl:attribute>
+						</xsl:if>
+						<xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
+							<xsl:attribute name="reference-orientation">0</xsl:attribute>
+						</xsl:if>
+						<xsl:if test="$char = '゜' or $char = '。' or $char = '﹒' or $char = '．'">
+							<!-- Rotate 180°: 
+								U+309C KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK (゜)
+								U+3002 IDEOGRAPHIC FULL STOP (。)
+								U+FE52 SMALL FULL STOP (﹒)
+								U+FF0E FULLWIDTH FULL STOP (．)
+							-->
+							<xsl:attribute name="reference-orientation">-90</xsl:attribute>
+						</xsl:if>
+						<fo:block-container width="1em">
+							<fo:block line-height="1em">
+								<xsl:choose>
+									<xsl:when test="$horizontal_mode = 'true'">
+										<xsl:value-of select="$str"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$char"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</fo:block>
+						</fo:block-container>
+					</fo:inline-container>
+					<xsl:if test="$add_zero_width_space = 'true' and ($char = ',' or $char = '.' or $char = ' ' or $char = '·' or $char = ')' or $char = ']' or $char = '}')"><xsl:value-of select="$zero_width_space"/></xsl:if>
+
+					<xsl:if test="$horizontal_mode = 'false'">
+						<xsl:call-template name="insertVerticalChar">
+							<xsl:with-param name="str" select="substring($str, 2)"/>
+							<xsl:with-param name="writing-mode" select="$writing-mode"/>
+							<xsl:with-param name="reference-orientation" select="$reference-orientation"/>
+							<xsl:with-param name="add_zero_width_space" select="$add_zero_width_space"/>
+						</xsl:call-template>
+					</xsl:if>
 				</xsl:if>
-				<fo:block-container width="1em">
-						<fo:block line-height="1em"><xsl:value-of select="$char"/></fo:block>
-				</fo:block-container>
-			</fo:inline-container>
-			<xsl:call-template name="insertVerticalChar">
-				<xsl:with-param name="str" select="substring($str, 2)"/>
-				<xsl:with-param name="writing-mode" select="$writing-mode"/>
-				<xsl:with-param name="reference-orientation" select="$reference-orientation"/>
-			</xsl:call-template>
-		</xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template name="number-to-words">

data/lib/isodoc/iec/presentation_terms.rb

@@ -3,9 +3,13 @@ module IsoDoc
     class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
       def termclause1(elem)
         @is_iev or return clause1(elem)
-        @suppressheadingnumbers || elem["unnumbered"] and return
-        lbl = @xrefs.anchor(elem["id"], :label, true) or return
-        prefix_name(elem, " ", "#{lbl}#{clausedelim}", "title")
+        @suppressheadingnumbers || elem["unnumbered"] or
+        lbl = @xrefs.anchor(elem["id"], :label, true)
+        if lbl
+        prefix_name(elem, { caption: " " }, "#{lbl}#{clausedelim}", "title")
+        else
+        prefix_name(elem, {}, nil, "title")
+        end
       end
 
       def concept(docxml)
@@ -15,9 +19,9 @@ module IsoDoc
 
       def concept_iev(docxml)
         labels = @xrefs.get_anchors.each_with_object({}) do |(k, v), m|
-          m[v[:label]] = k
+          v[:label] and m[v[:label].gsub(%r{</?[^>]+>}, "")] = k
         end
-        docpart = docxml&.at(ns("//bibdata/ext/structuredidentifier/" \
+        docpart = docxml.at(ns("//bibdata/ext/structuredidentifier/" \
                                 "project-number/@part"))&.text or return
         docxml.xpath(ns("//termref[@base = 'IEV']")).each do |t|
           concept_iev1(t, docpart, labels)
@@ -51,10 +55,12 @@ module IsoDoc
         docxml.xpath(ns("//term[@language = 'en'][@tag]")).each do |en|
           fr = docxml.at(ns("//term[@language = 'fr'][@tag = '#{en['tag']}']"))
           merge_fr_into_en_term1(en, fr) if fr
+          en.xpath(ns("./fmt-name | ./fmt-xref-label")).each(&:remove)
+          term1(en)
         end
         @xrefs.parse_inclusions(clauses: true).parse docxml
-        docxml.xpath(ns("//term/name")).each(&:remove)
-        term(docxml)
+        #docxml.xpath(ns("//term/fmt-name | //term/fmt-xref")).each(&:remove)
+        #term(docxml)
       end
 
       def merge_fr_into_en_term1(en_term, fr_term)
@@ -77,8 +83,7 @@ module IsoDoc
           .each_with_object([]) do |d, m|
           lg = d["language"]
           d.delete("language")
-          next if lgs.include?(lg)
-
+          lgs.include?(lg) and next
           p = d.parent
           designation_annotate(p, d.at(ns("./name")))
           m << { lang: lg, script: Metanorma::Utils.default_script(lg),
@@ -174,6 +179,7 @@ module IsoDoc
 
       def termexample1(elem)
         lg = elem&.at("./ancestor::xmlns:term/@language")&.text
+        #require "debug"; binding.b
         @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
         example1(elem)
         @i18n = @i18n_lg["default"]
@@ -185,10 +191,15 @@ module IsoDoc
 
         val = @xrefs.anchor(elem["id"], :value) || "???"
         lbl = @i18n.termnote.gsub("%", val)
-        ret = @i18n.l10n "#{lbl}#{termnote_delim(elem)}"
+        ret = @i18n.l10n lbl
         @i18n = @i18n_lg["default"]
         ret
       end
+
+      def term1(elem)
+        #require 'debug'; binding.b
+        super
+      end
     end
   end
 end

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -15,17 +15,15 @@ module IsoDoc
       end
 
       def clause(docxml)
-        docxml.xpath(ns("//clause[not(ancestor::annex)] | " \
-                        "//definitions | //references | " \
-                        "//preface/introduction[clause]"))
+        docxml.xpath(ns("//clause | //definitions | //references | //appendix | " \
+                        "//introduction | //foreword | //preface/abstract | " \
+                      "//acknowledgements | //colophon | //indexsect "))
           .each do |f|
           f.parent.name == "annex" &&
             @xrefs.klass.single_term_clause?(f.parent) and next
           clause1(f)
         end
-        docxml.xpath(ns("//terms")).each do |f|
-          termclause1(f)
-        end
+        docxml.xpath(ns("//terms")).each { |f| termclause1(f) }
       end
 
       def clause1(elem)
@@ -65,10 +63,15 @@ module IsoDoc
             <foreword id='_#{UUIDTools::UUID.random_create}'> </foreword>
           CLAUSE
         end
-        f.children.empty? and f.children = " "
-        ins = f.at(ns("./title")) || f.children.first.before(" ").previous
-        ins.next =
-          "<clause type='boilerplate_legal'>#{to_xml(b.children)}</clause>"
+        insert_foreword_boilerplate(f, b)
+      end
+
+      def insert_foreword_boilerplate(elem, boilerplate)
+        elem.children.empty? and elem.children = " "
+        ins = elem.at(ns("./title")) || elem.children.first.before(" ").previous
+        ins.next = <<~CLAUSE
+          <clause type='boilerplate_legal'>#{to_xml(boilerplate.children)}</clause>
+          CLAUSE
       end
 
       def insert_middle_title(docxml)

data/lib/isodoc/iec/word_convert.rb

@@ -203,8 +203,7 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
-        return if name.nil?
-
+        name.nil? and return
         div.h1 class: "Annex" do |t|
           name.children.each { |c2| parse(c2, t) }
           clause_parse_subtitle(name, t)
@@ -216,7 +215,7 @@ module IsoDoc
           div.p **attr_code(class: "formula") do |_p|
             insert_tab(div, 1)
             parse(node.at(ns("./stem")), div)
-            if lbl = node&.at(ns("./name"))&.text
+            if lbl = node&.at(ns("./fmt-name"))&.text
               insert_tab(div, 1)
               div << lbl
             end

data/lib/isodoc/iec/xref.rb

@@ -18,28 +18,41 @@ module IsoDoc
         return unless @is_iev
 
         if @parse_settings.empty? || @parse_settings[:clauses]
+          @terms_iev_names = true
           terms_iev_names(docxml)
+          @terms_iev_names = false
         end
       end
 
       def terms_iev_names(docxml)
         docxml.xpath(ns("//sections/clause/terms")).each_with_index do |t, i|
-          num = "#{@iev_part}-%02d" % [i + 1]
+          num = semx(t, "#{@iev_part}-%02d" % [i + 1])
           @anchors[t["id"]] =
-            { label: num, xref: l10n("#{@labels['section_iev']} #{num}"),
+            { label: num, 
+              #xref: l10n("#{@labels['section_iev']} #{num}"),
+              xref: labelled_autonum(@labels['section_iev'], num),
               level: 2, type: "clause", elem: @labels["section_iev"] }
           t.xpath(ns("./term")).each_with_index do |c, j|
-            num2 = "%02d" % [j + 1]
-            section_names1(c, "#{num}-#{num2}", 3)
+            num2 = semx(c, "%02d" % [j + 1])
+            #section_names1(c, "#{num}#{delim_wrap("-")}#{num2}", 3)
+            section_names1(c, num, num2, 3)
           end
         end
       end
 
+      def clausesep
+        if @terms_iev_names then "-"
+        else super
+        end
+      end
+
       def annex_name_lbl(clause, num)
         obl = l10n("(#{@labels['inform_annex']})")
         clause["obligation"] == "normative" and
           obl = l10n("(#{@labels['norm_annex']})")
-        l10n("<strong>#{@labels['annex']} #{num}</strong><br/>#{obl}")
+        obl = "<span class='fmt-obligation'>#{l10n obl}</fmt>"
+        s = labelled_autonum(@labels['annex'], num)
+        l10n("<strong><span class='fmt-caption-label'>#{s}</span></strong><br/>#{obl}")
       end
     end
   end

data/lib/metanorma/iec/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.4.0 -->
+<!-- VERSION v1.4.1 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.5.7".freeze
+    VERSION = "2.5.8".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-iso", "~> 2.9.0"
+  spec.add_dependency "metanorma-iso", "~> 2.9.1"
   spec.add_dependency "pubid"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.5.7
+  version: 2.5.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.9.1
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement