metanorma-iec 2.1.12 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa8c3f25aec456954c3d70a6c1b35c887e60e99383c7f119f3ecfb1c5d6c545
-  data.tar.gz: 787ad1b610bec9f60e5559f3cd721a3eadde25d327b5d2848d0905caaf5e0e7e
+  metadata.gz: fe5f071488c1b489abdf32da76363aaa976af39d6bfb84631225a3d08ad630bd
+  data.tar.gz: 94c952903d02e5de6934ed33ec9a45caa1fe930025c6391cc94d857c386e6ce5
 SHA512:
-  metadata.gz: a4b3de46192f7fea611f9a091fdf9d40e6075270ba1422938e3ce60038f33a0828693ae95f98c0eb30b50142c5ed2baad982e5347c41f5722e10b155057fe75e
-  data.tar.gz: 9308306c16d237d36d56ded5719f880df58564f74230e0f57c77d4a49acb8edf349bea24ca7303972a394f7c05e8a75d82ba368d266e8f8e346a6bde0b960e84
+  metadata.gz: b60c7395b02c317a03675b08f70be8b09b75d19b963aebcbf2355caa0f6ed7b832ede96e628aa3203546c0f27daaa75999e629b4cd89ff4473dc8ddcf34588d3
+  data.tar.gz: 0c13485be861d7abef84dadce587fbbc1306c2f2a4a95faefbcdd6029905a7e27534d14f1c9b551a1c950d939abbb56a7ccd67d034c8883dcd29bee25a264877

data/.gitignore

@@ -5,7 +5,6 @@ coverage/
 
 .rubocop-https--*
 
-/Gemfile.devel
 /Gemfile.lock
 /spec/assets/iso.doc
 /spec/assets/iso.html

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

@@ -446,6 +446,12 @@ p.TermNum {
     padding-left: 30px; }
   #toc .h3, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
     padding-left: 50px; }
+  #toc .h4, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h4 {
+    padding-left: 70px; }
+  #toc .h5, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h5 {
+    padding-left: 90px; }
+  #toc .h6, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h6 {
+    padding-left: 110px; }
   #toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
     background: black;
     box-shadow: inset -5px 0px 10px -5px black !important; }

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

@@ -1972,6 +1972,8 @@
 		</xsl:copy>
 	</xsl:template> -->
 
+			<xsl:strip-space elements="iec:xref"/>
+
 	<!-- external parameters -->
 
 	<xsl:param name="svg_images"/> <!-- svg images array -->
@@ -3406,17 +3408,22 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
 	<xsl:template match="text()" name="text">
 
-				<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
-				<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
-				<xsl:call-template name="replace_fo_inline_tags">
-					<xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
-					<xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
-					<xsl:with-param name="text" select="$text"/>
-				</xsl:call-template>
+				<xsl:choose>
+					<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
+					<xsl:otherwise>
+						<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
+						<xsl:call-template name="replace_fo_inline_tags">
+							<xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
+							<xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
+							<xsl:with-param name="text" select="$text"/>
+						</xsl:call-template>
+					</xsl:otherwise>
+				</xsl:choose>
 
 	</xsl:template>
 
@@ -3796,7 +3803,7 @@
 
 				<!-- centered table when table name is centered (see table-name-style) -->
 
-					<fo:table table-layout="fixed" width="100%">
+					<fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style">
 						<fo:table-column column-width="proportional-column-width(1)"/>
 						<fo:table-column column-width="{@width}"/>
 						<fo:table-column column-width="proportional-column-width(1)"/>
@@ -4459,7 +4466,7 @@
 	<xsl:template match="*[local-name()='tr']">
 		<fo:table-row xsl:use-attribute-sets="table-body-row-style">
 
-			<xsl:if test="*[local-name() = 'th']">
+			<xsl:if test="count(*) = count(*[local-name() = 'th'])"> <!-- row contains 'th' only -->
 				<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			</xsl:if>
 
@@ -4630,6 +4637,10 @@
 		<xsl:variable name="footnote_inline">
 			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
+				<xsl:if test="following-sibling::*[1][local-name() = 'fn']">
+					<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
+				</xsl:if>
+
 				<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
 					<xsl:value-of select="$current_fn_number_text"/>
 				</fo:basic-link>
@@ -5447,7 +5458,8 @@
 				<xsl:copy-of select="node()"/>
 			</td>
 			<td>
-				<xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/>
+				<!-- <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/> -->
+				<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]" mode="dl_if"/>
 				<!-- get paragraphs from nested 'dl' -->
 				<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/>
 			</td>
@@ -5455,6 +5467,53 @@
 	</xsl:template>
 	<xsl:template match="*[local-name()='dd']" mode="dl_if"/>
 
+	<xsl:template match="*" mode="dl_if">
+		<xsl:copy-of select="."/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'p']" mode="dl_if">
+		<xsl:param name="indent"/>
+		<p>
+			<xsl:copy-of select="@*"/>
+			<xsl:value-of select="$indent"/>
+			<xsl:copy-of select="node()"/>
+		</p>
+
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'ul' or local-name() = 'ol']" mode="dl_if">
+		<xsl:variable name="list_rendered_">
+			<xsl:apply-templates select="."/>
+		</xsl:variable>
+		<xsl:variable name="list_rendered" select="xalan:nodeset($list_rendered_)"/>
+
+		<xsl:variable name="indent">
+			<xsl:for-each select="($list_rendered//fo:block[not(.//fo:block)])[1]">
+				<xsl:apply-templates select="ancestor::*[@provisional-distance-between-starts]/@provisional-distance-between-starts" mode="dl_if"/>
+			</xsl:for-each>
+		</xsl:variable>
+
+		<xsl:apply-templates mode="dl_if">
+			<xsl:with-param name="indent" select="$indent"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'li']" mode="dl_if">
+		<xsl:param name="indent"/>
+		<xsl:apply-templates mode="dl_if">
+			<xsl:with-param name="indent" select="$indent"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="@provisional-distance-between-starts" mode="dl_if">
+		<xsl:variable name="value" select="round(substring-before(.,'mm'))"/>
+		<!-- emulate left indent for list item -->
+		<xsl:call-template name="repeat">
+			<xsl:with-param name="char" select="'x'"/>
+			<xsl:with-param name="count" select="$value"/>
+		</xsl:call-template>
+	</xsl:template>
+
 	<xsl:template match="*[local-name()='dl']" mode="dl_if_nested">
 		<xsl:for-each select="*[local-name() = 'dt']">
 			<p>
@@ -5752,6 +5811,23 @@
 		<xsl:apply-templates/>
 	</xsl:template>
 
+	<!-- Don't break standard's numbers -->
+	<!-- Example : <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'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']" priority="2">
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:apply-templates/></xsl:when>
+			<xsl:when test="following-sibling::*[2][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']">
+				<fo:inline keep-with-next.within-line="always"><xsl:apply-templates/></fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'table']) and preceding-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear'] and   following-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']]" priority="2">
+		<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
+	</xsl:template>
+
 	<!-- ========================= -->
 	<!-- END Rich text formatting -->
 	<!-- ========================= -->
@@ -5850,6 +5926,7 @@
 				</word>
 				<xsl:call-template name="tokenize_with_tags">
 					<xsl:with-param name="text" select="substring-after($text, $separator)"/>
+					<xsl:with-param name="tags" select="$tags"/>
 				</xsl:call-template>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -5889,8 +5966,18 @@
 
 	<xsl:template name="add-zero-spaces-java">
 		<xsl:param name="text" select="."/>
-		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| )','$1​')"/>
+		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, arrow right   -->
+		<xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |→)','$1​')"/>
+		<!-- add zero-width space (#x200B) after characters: 'great than' -->
+		<xsl:variable name="text2" select="java:replaceAll(java:java.lang.String.new($text1), '(\u003e)(?!\u003e)', '$1​')"/><!-- negative lookahead: 'great than' not followed by 'great than' -->
+		<!-- add zero-width space (#x200B) before characters: 'less than' -->
+		<xsl:variable name="text3" select="java:replaceAll(java:java.lang.String.new($text2), '(?&lt;!\u003c)(\u003c)', '​$1')"/> <!-- (?<!\u003c)(\u003c) --> <!-- negative lookbehind: 'less than' not preceeded by 'less than' -->
+		<!-- add zero-width space (#x200B) before character: { -->
+		<xsl:variable name="text4" select="java:replaceAll(java:java.lang.String.new($text3), '(?&lt;!\W)(\{)', '​$1')"/> <!-- negative lookbehind: '{' not preceeded by 'punctuation char' -->
+		<!-- add zero-width space (#x200B) after character: , -->
+		<xsl:variable name="text5" select="java:replaceAll(java:java.lang.String.new($text4), '(\,)(?!\d)', '$1​')"/> <!-- negative lookahead: ',' not followed by digit -->
+
+		<xsl:value-of select="$text5"/>
 	</xsl:template>
 
 	<xsl:template name="add-zero-spaces-link-java">
@@ -6036,7 +6123,7 @@
 		</xsl:copy>
 	</xsl:template>
 
-	<xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p'])]" mode="table-without-br">
+	<xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode'])]" mode="table-without-br">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<p>
@@ -6084,6 +6171,28 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']" mode="table-without-br">
+		<xsl:apply-templates mode="table-without-br"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']/text()[contains(., '&#13;') or contains(., '&#10;')]" mode="table-without-br">
+
+		<xsl:variable name="sep">###SOURCECODE_NEWLINE###</xsl:variable>
+		<xsl:variable name="sourcecode_text" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', $sep)"/>
+		<xsl:variable name="items">
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="$sourcecode_text"/>
+				<xsl:with-param name="sep" select="$sep"/>
+				<xsl:with-param name="normalize-space">false</xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:for-each select="xalan:nodeset($items)/*">
+			<p>
+				<sourcecode><xsl:copy-of select="node()"/></sourcecode>
+			</p>
+		</xsl:for-each>
+	</xsl:template>
+
 	<!-- remove redundant white spaces -->
 	<xsl:template match="text()[not(ancestor::*[local-name() = 'sourcecode'])]" mode="table-without-br">
 		<xsl:variable name="text" select="translate(.,'&#9;&#10;&#13;','')"/>
@@ -6114,7 +6223,7 @@
 		<xsl:choose>
 			<xsl:when test="@colspan">
 				<xsl:variable name="td">
-					<xsl:element name="td">
+					<xsl:element name="{local-name()}">
 						<xsl:attribute name="divide"><xsl:value-of select="@colspan"/></xsl:attribute>
 						<xsl:if test="local-name()='th'">
 							<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -6129,7 +6238,7 @@
 				</xsl:call-template>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:element name="td">
+				<xsl:element name="{local-name()}">
 					<xsl:apply-templates select="@*" mode="simple-table-colspan"/>
 					<xsl:if test="local-name()='th'">
 						<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -6196,7 +6305,7 @@
 		<xsl:variable name="currentRow" select="."/>
 
 		<xsl:variable name="normalizedTDs">
-				<xsl:for-each select="xalan:nodeset($previousRow)//td">
+				<xsl:for-each select="xalan:nodeset($previousRow)//*[self::td or self::th]">
 						<xsl:choose>
 								<xsl:when test="@rowspan &gt; 1">
 										<xsl:copy>
@@ -6208,7 +6317,7 @@
 										</xsl:copy>
 								</xsl:when>
 								<xsl:otherwise>
-										<xsl:copy-of select="$currentRow/td[1 + count(current()/preceding-sibling::td[not(@rowspan) or (@rowspan = 1)])]"/>
+										<xsl:copy-of select="$currentRow/*[self::td or self::th][1 + count(current()/preceding-sibling::*[self::td or self::th][not(@rowspan) or (@rowspan = 1)])]"/>
 								</xsl:otherwise>
 						</xsl:choose>
 				</xsl:for-each>
@@ -6394,6 +6503,7 @@
 			<xsl:if test="ancestor::*[local-name() = 'sub']"><tag>sub</tag></xsl:if>
 			<xsl:if test="ancestor::*[local-name() = 'sup']"><tag>sup</tag></xsl:if>
 			<xsl:if test="ancestor::*[local-name() = 'tt']"><tag>tt</tag></xsl:if>
+			<xsl:if test="ancestor::*[local-name() = 'sourcecode']"><tag>sourcecode</tag></xsl:if>
 			<xsl:if test="ancestor::*[local-name() = 'keep-together_within-line']"><tag>keep-together_within-line</tag></xsl:if>
 		</tags>
 	</xsl:template>
@@ -7384,6 +7494,31 @@
 			<xsl:apply-templates mode="svg_update"/>
 		</xsl:copy>
 	</xsl:template>
+
+	<!-- regex for 'display: inline-block;' -->
+	<xsl:variable name="regex_svg_style_notsupported">display(\s|\h)*:(\s|\h)*inline-block(\s|\h)*;</xsl:variable>
+	<xsl:template match="*[local-name() = 'svg']//*[local-name() = 'style']/text()" mode="svg_update">
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), $regex_svg_style_notsupported, '')"/>
+	</xsl:template>
+
+	<!-- replace
+			stroke="rgba(r, g, b, alpha)" to 
+			stroke="rgb(r,g,b)" stroke-opacity="alpha", and
+			fill="rgba(r, g, b, alpha)" to 
+			fill="rgb(r,g,b)" fill-opacity="alpha" -->
+	<xsl:template match="@*[local-name() = 'stroke' or local-name() = 'fill'][starts-with(normalize-space(.), 'rgba')]" mode="svg_update">
+		<xsl:variable name="components_">
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="substring-before(substring-after(., '('), ')')"/>
+				<xsl:with-param name="sep" select="','"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="components" select="xalan:nodeset($components_)"/>
+		<xsl:variable name="att_name" select="local-name()"/>
+		<xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/item[1], ',', $components/item[2], ',', $components/item[3], ')')"/></xsl:attribute>
+		<xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/item[4]"/></xsl:attribute>
+	</xsl:template>
+
 	<!-- ============== -->
 	<!-- END: svg_update -->
 	<!-- ============== -->
@@ -8033,39 +8168,17 @@
 	<!-- =============== -->
 	<xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
 
-		<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
-
-			<xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
-				<xsl:attribute name="margin-left">0mm</xsl:attribute>
-			</xsl:if>
-
-			<xsl:if test="ancestor::*[local-name() = 'example']">
-				<xsl:attribute name="margin-right">0mm</xsl:attribute>
-			</xsl:if>
-
-			<xsl:copy-of select="@id"/>
-
-			<xsl:if test="parent::*[local-name() = 'note']">
-				<xsl:attribute name="margin-left">
-					<xsl:choose>
-						<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
-						<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-
-			</xsl:if>
-			<fo:block-container margin-left="0mm">
-
-				<fo:block xsl:use-attribute-sets="sourcecode-style">
-					<xsl:variable name="_font-size">
+		<xsl:variable name="sourcecode_attributes">
+			<xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
+				<xsl:variable name="_font-size">
 
-						9
+					9
 
-						<!-- 9 -->
+					<!-- 9 -->
 
-						<!-- <xsl:if test="$namespace = 'ieee'">							
-							<xsl:if test="$current_template = 'standard'">8</xsl:if>
-						</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'ieee'">							
+						<xsl:if test="$current_template = 'standard'">8</xsl:if>
+					</xsl:if> -->
 
 				</xsl:variable>
 
@@ -8080,14 +8193,60 @@
 						</xsl:choose>
 					</xsl:attribute>
 				</xsl:if>
+			</xsl:element>
+		</xsl:variable>
 
+		<xsl:choose>
+			<xsl:when test="$isGenerateTableIF = 'true' and (ancestor::*[local-name() = 'td'] or ancestor::*[local-name() = 'th'])">
+				<xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*">
+					<xsl:attribute name="{local-name()}">
+						<xsl:value-of select="."/>
+					</xsl:attribute>
+				</xsl:for-each>
 				<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-			</fo:block>
+			</xsl:when>
 
-					<xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
+			<xsl:otherwise>
+				<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
 
-			</fo:block-container>
-		</fo:block-container>
+					<xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
+						<xsl:attribute name="margin-left">0mm</xsl:attribute>
+					</xsl:if>
+
+					<xsl:if test="ancestor::*[local-name() = 'example']">
+						<xsl:attribute name="margin-right">0mm</xsl:attribute>
+					</xsl:if>
+
+					<xsl:copy-of select="@id"/>
+
+					<xsl:if test="parent::*[local-name() = 'note']">
+						<xsl:attribute name="margin-left">
+							<xsl:choose>
+								<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
+								<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+							</xsl:choose>
+						</xsl:attribute>
+
+					</xsl:if>
+					<fo:block-container margin-left="0mm">
+
+						<fo:block xsl:use-attribute-sets="sourcecode-style">
+
+							<xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*">
+								<xsl:attribute name="{local-name()}">
+									<xsl:value-of select="."/>
+								</xsl:attribute>
+							</xsl:for-each>
+
+							<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+						</fo:block>
+
+								<xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
+
+					</fo:block-container>
+				</fo:block-container>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
@@ -10320,7 +10479,11 @@
 	<!-- ===================================== -->
 	<!-- Update xml -->
 	<!-- ===================================== -->
-	<!-- STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
+	<!-- =========================================================================== -->
+	<!-- STEP1:  -->
+	<!--   - Re-order elements in 'preface', 'sections' based on @displayorder -->
+	<!--   - Ignore 'span' without style -->
+	<!-- =========================================================================== -->
 	<xsl:template match="@*|node()" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
@@ -10402,7 +10565,8 @@
 		</xsl:copy>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'span'][@style]" mode="update_xml_step1" priority="2">
+	<!-- 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:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>
@@ -10412,10 +10576,15 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-
+	<!-- =========================================================================== -->
 	<!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
+	<!-- =========================================================================== -->
 
+	<!-- =========================================================================== -->
 	<!-- XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line'  -->
+	<!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
+	<!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b  in table's cell ONLY  -->
+	<!-- =========================================================================== -->
 	<!-- Example: <keep-together_within-line>ISO 10303-51</keep-together_within-line> -->
 	<xsl:template match="@*|node()" mode="update_xml_enclose_keep-together_within-line">
 		<xsl:copy>
@@ -10431,10 +10600,15 @@
 	<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     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<!-- enclose standard's number into tag 'keep-together_within-line' -->
-		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
 		<xsl:variable name="tag_keep-together_within-line_open">###<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable>
 		<xsl:variable name="tag_keep-together_within-line_close">###/<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable>
-		<xsl:variable name="text_" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
+		<xsl:variable name="text__" select="java:replaceAll(java:java.lang.String.new(.), $regex_standard_reference, concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
+		<xsl:variable name="text_">
+			<xsl:choose>
+				<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells -->
+				<xsl:otherwise><xsl:value-of select="$text__"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<xsl:variable name="text"><text><xsl:call-template name="replace_text_tags">
 				<xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/>
 				<xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/>
@@ -10450,7 +10624,11 @@
 		</xsl:variable>
 
 		<!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
-		<xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable>
+		<!-- \S matches any non-whitespace character (equivalent to [^\r\n\t\f\v ]) -->
+		<!-- <xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable> -->
+		<!-- add &lt; and &gt; to \S -->
+		<xsl:variable name="regex_S">[^\r\n\t\f\v \&lt;&gt;]</xsl:variable>
+		<xsl:variable name="regex_solidus_units">((\b((<xsl:value-of select="$regex_S"/>{1,3}\/<xsl:value-of select="$regex_S"/>+)|(<xsl:value-of select="$regex_S"/>+\/<xsl:value-of select="$regex_S"/>{1,3}))\b)|(\/<xsl:value-of select="$regex_S"/>{1,3})\b)</xsl:variable>
 		<xsl:variable name="text3">
 			<text><xsl:for-each select="xalan:nodeset($text2)/text/node()">
 				<xsl:choose>
@@ -10514,9 +10692,8 @@
 			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
-
 	<!-- ===================================== -->
-	<!-- End Update xml -->
+	<!-- END XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line'  -->
 	<!-- ===================================== -->
 
 	<!-- for correct rendering combining chars -->

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -124,7 +124,7 @@ module IsoDoc
           p = d.parent
           designation_annotate(p, d.at(ns("./name")))
           m << { lang: lg, script: Metanorma::Utils.default_script(lg),
-                 designation: l10n_recursive(p.remove, lg).to_xml.strip }
+                 designation: to_xml(l10n_recursive(p.remove, lg)).strip }
         end
       end
 
@@ -183,7 +183,7 @@ module IsoDoc
         ref = node.at(ns("./xref | ./eref | ./termref"))
         label = @i18n.relatedterms[node["type"]].upcase
         node.replace(l10n("<p>#{label}: " \
-                          "#{p.children.to_xml} (#{ref.to_xml})</p>"))
+                          "#{to_xml(p.children)} (#{to_xml(ref)})</p>"))
         @i18n = @i18n_lg["default"]
       end
 
@@ -205,9 +205,9 @@ module IsoDoc
 
       def termsource1_iev(elem)
         while elem&.next_element&.name == "termsource"
-          elem << "; #{elem.next_element.remove.children.to_xml}"
+          elem << "; #{to_xml(elem.next_element.remove.children)}"
         end
-        elem.children = l10n("#{@i18n.source}: #{elem.children.to_xml.strip}")
+        elem.children = l10n("#{@i18n.source}: #{to_xml(elem.children).strip}")
       end
 
       def termexample(docxml)

data/lib/isodoc/iec/word_convert.rb

@@ -42,50 +42,24 @@ module IsoDoc
         }
       end
 
-      def insert_toc(intro, docxml, level)
+      def make_table_word_toc(docxml)
+        docxml.at(table_toc_xpath) or return ""
         toc = ""
-        toc += make_WordToC(docxml, level)
-        if docxml.at("//p[@class = 'TableTitle']")
-          toc += make_TableWordToC(docxml)
-        end
-        if docxml.at("//p[@class = 'FigureTitle']")
-          toc += make_FigureWordToC(docxml)
-        end
-        intro.sub(/WORDTOC/, toc)
-      end
-
-      WORD_TOC_TABLE_PREFACE1 = <<~TOC.freeze
-                          <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t "TableTitle,tabletitle" <span
-        style='mso-element:field-separator'></span></span>
-      TOC
-
-      WORD_TOC_FIGURE_PREFACE1 = <<~TOC.freeze
-                                      <span lang="EN-GB"><span
-        style='mso-element:field-begin'></span><span
-        style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t "FigureTitle,figuretitle" <span
-        style='mso-element:field-separator'></span></span>
-      TOC
-
-      def make_TableWordToC(docxml)
-        toc = ""
-        docxml.xpath("//p[@class = 'TableTitle']").each do |h|
+        docxml.xpath(table_toc_xpath).each do |h|
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) + WORD_TOC_SUFFIX1
+                %{\\1#{word_toc_table_preface1}}) + WORD_TOC_SUFFIX1
       end
 
-      def make_FigureWordToC(docxml)
+      def make_figure_word_toc(docxml)
+        docxml.at(figure_toc_xpath) or return ""
         toc = ""
-        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
+        docxml.xpath(figure_toc_xpath).each do |h|
           toc += word_toc_entry(1, header_strip(h))
         end
         toc.sub(/(<p class="MsoToc1">)/,
-                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) + WORD_TOC_SUFFIX1
+                %{\\1#{word_toc_figure_preface1}}) + WORD_TOC_SUFFIX1
       end
 
       def word_toc_preface(level)
@@ -185,7 +159,7 @@ module IsoDoc
       end
 
       def authority_cleanup(docxml)
-        auth = docxml.at("//div[@id = 'boilerplate-feedback' or "\
+        auth = docxml.at("//div[@id = 'boilerplate-feedback' or " \
                          "@class = 'boilerplate-feedback']")
         auth&.remove
         super

data/lib/metanorma/iec/basicdoc.rng

@@ -683,6 +683,9 @@
   </define>
   <define name="underline">
     <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <zeroOrMore>
         <ref name="PureTextElement"/>
       </zeroOrMore>

data/lib/metanorma/iec/isodoc.rng

@@ -1152,7 +1152,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <ref name="BibliographicItem"/>
+      <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
   <define name="image" combine="choice">
@@ -2653,6 +2653,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
+      <value>modspec</value>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.1.12".freeze
+    VERSION = "2.2.0".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(">= 2.7.0")
 
-  spec.add_dependency "metanorma-iso", "~> 2.2.0"
+  spec.add_dependency "metanorma-iso", "~> 2.3.0"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2022-12-05 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.2.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: metanorma-iec lets you write IEC standards in AsciiDoc.