metanorma-iso 2.2.4 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a0563d9fa5bd34ed390701df2a0fc01e009d510059ddbfc859e6fa72505297b
-  data.tar.gz: 0be48505ccf77b173cce715b7934f13eb169fdb5bdff34c136db5ea5992c1b28
+  metadata.gz: 100cc8d4acfdb9e4d94e485f58f09928173b43c096ce7c1fdce04633ee0082a7
+  data.tar.gz: 9c8870908553dd7103dc094e5b0f9ceebb9f43f31d417d4c8d01e5d3884c3e6e
 SHA512:
-  metadata.gz: 047442e860fd1d6e8f067882db28c6724cd8d3b8b405a3227fef5213fe3aaa8602775418d439a93d5a29a3fc3a0ea7c628eb57ceae02ebe234b52494a75b35b3
-  data.tar.gz: 867aa6a944da537296b117daa82e5622972b5609e03a90fde3aa32741de953f71b1ab063fd1a8ab70a466cf9abe03fffdd633b81c7ddedbd67760da5ba34f0b3
+  metadata.gz: 98580eb700d970913763622d7b5325c58a825a98bbe350b9cac0bdcb1f1d5891eac42d9e473deadbe289f90eb1f189c11684b53e1db48e79f94bc210d0c61171
+  data.tar.gz: 5c52e15664a2b8edb7590f85c73bc7b13d248c70f039970a7426f654be3f0ba8165bcfbed6ab71d46be075c34db8b9213a2508ae8a48f633ccf32eed409f2c5f

data/.gitignore

@@ -12,7 +12,6 @@ spec/examples/rice_files/
 
 .rubocop-https--*
 
-/Gemfile.devel
 /Gemfile.lock
 /spec/assets/iso.doc
 /spec/assets/iso.html

data/lib/isodoc/iso/base_convert.rb

@@ -88,9 +88,9 @@ module IsoDoc
 
       def formula_where(dlist, out)
         return if dlist.nil?
-        return super unless dlist&.xpath(ns("./dt"))&.size == 1 &&
-          dlist&.at(ns("./dd"))&.elements&.size == 1 &&
-          dlist&.at(ns("./dd/p"))
+        return super unless dlist.xpath(ns("./dt"))&.size == 1 &&
+          dlist.at(ns("./dd"))&.elements&.size == 1 &&
+          dlist.at(ns("./dd/p"))
 
         out.span **{ class: "zzMoveToFollowing" } do |s|
           s << "#{@i18n.where} "

data/lib/isodoc/iso/html/isodoc-dis.css

@@ -222,7 +222,7 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle {
   line-height: 12.0pt;
   page-break-before: always;
   mso-pagination: widow-orphan;
-  page-break-after: avoid;
+  /*page-break-after:avoid;*/
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};
@@ -248,7 +248,7 @@ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSp
   line-height: 12.0pt;
   page-break-before: always;
   mso-pagination: widow-orphan;
-  page-break-after: avoid;
+  /*page-break-after:avoid;*/
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};
@@ -274,7 +274,7 @@ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCx
   line-height: 12.0pt;
   page-break-before: always;
   mso-pagination: widow-orphan;
-  page-break-after: avoid;
+  /*page-break-after:avoid;*/
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};
@@ -303,7 +303,7 @@ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLa
   line-height: 12.0pt;
   page-break-before: always;
   mso-pagination: widow-orphan;
-  page-break-after: avoid;
+  /*page-break-after:avoid;*/
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};

data/lib/isodoc/iso/html/isodoc-dis.scss

@@ -211,7 +211,7 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle
 	line-height:12.0pt;
 	page-break-before:always;
 	mso-pagination:widow-orphan;
-	page-break-after:avoid;
+	/*page-break-after:avoid;*/
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;
@@ -236,7 +236,7 @@ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSp
 	line-height:12.0pt;
 	page-break-before:always;
 	mso-pagination:widow-orphan;
-	page-break-after:avoid;
+	/*page-break-after:avoid;*/
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;
@@ -261,7 +261,7 @@ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCx
 	line-height:12.0pt;
 	page-break-before:always;
 	mso-pagination:widow-orphan;
-	page-break-after:avoid;
+	/*page-break-after:avoid;*/
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;
@@ -289,7 +289,7 @@ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLa
 	line-height:12.0pt;
 	page-break-before:always;
 	mso-pagination:widow-orphan;
-	page-break-after:avoid;
+	/*page-break-after:avoid;*/
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;

data/lib/isodoc/iso/html/isodoc.css

@@ -219,7 +219,7 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle {
   line-height: 12.0pt;
   page-break-before: always;
   mso-pagination: widow-orphan;
-  page-break-after: avoid;
+  /*page-break-after:avoid;*/
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};
@@ -245,7 +245,7 @@ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSp
   line-height: 12.0pt;
   page-break-before: always;
   mso-pagination: widow-orphan;
-  page-break-after: avoid;
+  /*page-break-after:avoid;*/
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};
@@ -271,7 +271,7 @@ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCx
   line-height: 12.0pt;
   page-break-before: always;
   mso-pagination: widow-orphan;
-  page-break-after: avoid;
+  /*page-break-after:avoid;*/
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};
@@ -300,7 +300,7 @@ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLa
   line-height: 12.0pt;
   page-break-before: always;
   mso-pagination: widow-orphan;
-  page-break-after: avoid;
+  /*page-break-after:avoid;*/
   /* mso-list:l4 level1 lfo15; */
   tab-stops: list 0cm left 20.15pt;
   font-size: {{normalfontsize}};

data/lib/isodoc/iso/html/isodoc.scss

@@ -209,7 +209,7 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle
 	line-height:12.0pt;
 	page-break-before:always;
 	mso-pagination:widow-orphan;
-	page-break-after:avoid;
+	/*page-break-after:avoid;*/
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;
@@ -234,7 +234,7 @@ p.AnnexTableTitleCxSpFirst, li.AnnexTableTitleCxSpFirst, div.AnnexTableTitleCxSp
 	line-height:12.0pt;
 	page-break-before:always;
 	mso-pagination:widow-orphan;
-	page-break-after:avoid;
+	/*page-break-after:avoid;*/
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;
@@ -259,7 +259,7 @@ p.AnnexTableTitleCxSpMiddle, li.AnnexTableTitleCxSpMiddle, div.AnnexTableTitleCx
 	line-height:12.0pt;
 	page-break-before:always;
 	mso-pagination:widow-orphan;
-	page-break-after:avoid;
+	/*page-break-after:avoid;*/
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;
@@ -287,7 +287,7 @@ p.AnnexTableTitleCxSpLast, li.AnnexTableTitleCxSpLast, div.AnnexTableTitleCxSpLa
 	line-height:12.0pt;
 	page-break-before:always;
 	mso-pagination:widow-orphan;
-	page-break-after:avoid;
+	/*page-break-after:avoid;*/
 	/* mso-list:l4 level1 lfo15; */
 	tab-stops:list 0cm left 20.15pt;
 	font-size:$normalfontsize;

data/lib/isodoc/iso/html_convert.rb

@@ -58,7 +58,7 @@ module IsoDoc
       end
 
       def html_toc_entry(level, header)
-        content = header.at("./following-sibling::p"\
+        content = header.at("./following-sibling::p" \
                             "[@class = 'variant-title-toc']") || header
         if level == "h1" &&
             header.parent.at(".//h2#{toc_exclude_class}")

data/lib/isodoc/iso/index.rb

@@ -127,7 +127,7 @@ module IsoDoc
         terms.each_with_object(val) do |t, v|
           term, term2, term3 = extract_indexterms_init(t)
           term_hash_init(v, term, term2, term3, label)
-          v[term][term2][term3][label] << t&.at(ns("./target"))&.children&.to_xml
+          v[term][term2][term3][label] << to_xml(t.at(ns("./target"))&.children)
           t.remove
         end
       end
@@ -154,7 +154,7 @@ module IsoDoc
 
       def extract_indexterms_init(term)
         %w(primary secondary tertiary).each_with_object([]) do |x, m|
-          m << term&.at(ns("./#{x}"))&.children&.to_xml
+          m << to_xml(term.at(ns("./#{x}"))&.children)
         end
       end
 

data/lib/isodoc/iso/iso.amendment.xsl

@@ -5011,6 +5011,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>
@@ -6251,6 +6255,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 -->
 	<!-- ========================= -->
@@ -6646,7 +6667,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>
@@ -6661,7 +6682,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>
@@ -6728,7 +6749,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>
@@ -6740,7 +6761,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>
@@ -7421,12 +7442,6 @@
 
 			<fo:block-container margin-left="0mm">
 
-				<!-- <xsl:if test="$namespace = 'iho'">
-					<xsl:if test="ancestor::iho:td">
-						<xsl:attribute name="font-size">12pt</xsl:attribute>
-					</xsl:if>
-				</xsl:if> -->
-
 						<fo:block>
 
 							<fo:inline xsl:use-attribute-sets="note-name-style">
@@ -7936,6 +7951,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 -->
 	<!-- ============== -->
@@ -10886,7 +10926,9 @@
 	<!-- 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>
@@ -10969,7 +11011,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"/>

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

@@ -5011,6 +5011,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>
@@ -6251,6 +6255,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 -->
 	<!-- ========================= -->
@@ -6646,7 +6667,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>
@@ -6661,7 +6682,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>
@@ -6728,7 +6749,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>
@@ -6740,7 +6761,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>
@@ -7421,12 +7442,6 @@
 
 			<fo:block-container margin-left="0mm">
 
-				<!-- <xsl:if test="$namespace = 'iho'">
-					<xsl:if test="ancestor::iho:td">
-						<xsl:attribute name="font-size">12pt</xsl:attribute>
-					</xsl:if>
-				</xsl:if> -->
-
 						<fo:block>
 
 							<fo:inline xsl:use-attribute-sets="note-name-style">
@@ -7936,6 +7951,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 -->
 	<!-- ============== -->
@@ -10886,7 +10926,9 @@
 	<!-- 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>
@@ -10969,7 +11011,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"/>

data/lib/isodoc/iso/isosts_convert.rb

@@ -13,14 +13,19 @@ module IsoDoc
         @suffix = "isosts.xml"
       end
 
-      def convert(input_fname, file = nil, debug = false, output_fname = nil)
-        file = File.read(input_fname, encoding: "utf-8") if file.nil?
-        _, fname, dir = convert_init(file, input_fname, debug)
+      def get_input_fname(input_fname)
         /\.xml$/.match(input_fname) or
           input_fname = Tempfile.open([fname, ".xml"], encoding: "utf-8") do |f|
             f.write file
             f.path
           end
+        input_fname
+      end
+
+      def convert(input_fname, file = nil, debug = false, output_fname = nil)
+        file = File.read(input_fname, encoding: "utf-8") if file.nil?
+        _, fname, dir = convert_init(file, input_fname, debug)
+        input_fname = get_input_fname(input_fname)
         FileUtils.rm_rf dir
         MnConvert.convert(input_fname,
                           {

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -101,7 +101,7 @@ module IsoDoc
       end
 
       def concept_term1(node, seen)
-        term = node&.at(ns("./refterm"))&.to_xml
+        term = to_xml(node.at(ns("./refterm")))
         if term && seen[term]
           concept_render(node, ital: "false", ref: "false",
                                linkref: "true", linkmention: "false")
@@ -114,8 +114,8 @@ module IsoDoc
 
       def concept1_ref_content(ref)
         repl = if ref.name == "termref"
-                 @i18n.term_defined_in.sub(/%/, ref.to_xml)
-               else "(#{ref.to_xml})"
+                 @i18n.term_defined_in.sub(/%/, to_xml(ref))
+               else "(#{to_xml(ref)})"
                end
         ref.replace(repl)
       end
@@ -152,7 +152,7 @@ module IsoDoc
           (v = elem.at(ns("./definition/verbal-definition"))) &&
           v.elements.first.name == "p") or return
         v.elements.first.children.first.previous =
-          "<#{d.remove.children.to_xml}> "
+          "<#{to_xml(d.remove.children)}> "
       end
 
       def insertall_after_here(node, insert, name)
@@ -186,7 +186,7 @@ module IsoDoc
         p = n.next_element
         return unless p.name == "p"
 
-        p.children.first.previous = admonition_name(n.remove.children.to_xml)
+        p.children.first.previous = admonition_name(to_xml(n.remove.children))
       end
 
       def admonition_name(xml)

data/lib/isodoc/iso/presentation_xref.rb

@@ -33,9 +33,10 @@ module IsoDoc
         ret = resolve_eref_connectives(eref_locality_stacks(refs, target,
                                                             node))
         node["droploc"] = droploc
-        eref_localities1(target,
-                         prefix_clause(target, refs.first.at(ns("./locality"))),
-                         l10n(ret[1..-1].join), nil, node, @lang)
+        eref_localities1({ target: target, number: "pl",
+                           type: prefix_clause(target, refs.first.at(ns("./locality"))),
+                           from: l10n(ret[1..-1].join),
+                           node: node, lang: @lang })
       end
 
       def prefix_clause(target, loc)
@@ -79,29 +80,30 @@ module IsoDoc
         ret.join
       end
 
-      def eref_localities1_zh(target, type, from, upto, node)
-        ret = " 第#{from}" if from
-        ret += "–#{upto}" if upto
-        node["droploc"] != "true" && !subclause?(target, type, from) and
-          ret += eref_locality_populate(type, node)
-        ret += ")" if type == "list"
-        locality_span_wrap(ret, type)
+      def eref_localities1_zh(opt)
+        ret = " 第#{opt[:from]}" if opt[:from]
+        ret += "–#{opt[:upto]}" if opt[:upto]
+        opt[:node]["droploc"] != "true" &&
+          !subclause?(opt[:target], opt[:type], opt[:from]) and
+          ret += eref_locality_populate(opt[:type], opt[:node], "sg")
+        ret += ")" if opt[:type] == "list"
+        locality_span_wrap(ret, opt[:type])
       end
 
-      def eref_localities1(target, type, from, upto, node, lang = "en")
-        return nil if type == "anchor"
+      def eref_localities1(opt)
+        return nil if opt[:type] == "anchor"
 
-        type = type.downcase
-        lang == "zh" and
-          return l10n(eref_localities1_zh(target, type, from, upto, node))
+        opt[:type] = opt[:type].downcase
+        opt[:lang] == "zh" and return l10n(eref_localities1_zh(opt))
         ret = ""
-        node["droploc"] != "true" && !subclause?(target, type, from) and
-          ret = eref_locality_populate(type, node)
-        ret += " #{from}" if from
-        ret += "–#{upto}" if upto
-        ret += ")" if type == "list"
+        opt[:node]["droploc"] != "true" &&
+          !subclause?(opt[:target], opt[:type], opt[:from]) and
+          ret = eref_locality_populate(opt[:type], opt[:node], opt[:number])
+        ret += " #{opt[:from]}" if opt[:from]
+        ret += "–#{opt[:upto]}" if opt[:upto]
+        ret += ")" if opt[:type] == "list"
         ret = l10n(ret)
-        locality_span_wrap(ret, type)
+        locality_span_wrap(ret, opt[:type])
       end
 
       def prefix_container(container, linkend, node, target)

data/lib/isodoc/iso/word_convert.rb

@@ -101,7 +101,7 @@ module IsoDoc
 
       def footnote_reference_format(link)
         link.children =
-          "<span class='MsoFootnoteReference'>#{link.children.to_xml}</span>)"
+          "<span class='MsoFootnoteReference'>#{to_xml(link.children)}</span>)"
       end
 
       def bibliography_attrs

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -205,7 +205,7 @@ module IsoDoc
         docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
           p["class"] = "zzCopyright"
           p["style"] = "text-indent:20.15pt;"
-          p.replace(p.to_xml.gsub(%r{<br/>}, "</p>\n<p class='zzCopyright' " \
+          p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright' " \
                                              "style='text-indent:20.15pt;'>"))
         end
         docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each do |p|
@@ -217,7 +217,7 @@ module IsoDoc
       def copyright_dis(docxml)
         docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
           p["class"] = "zzCopyright"
-          p.replace(p.to_xml.gsub(%r{<br/>}, "</p>\n<p class='zzCopyright'>"))
+          p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright'>"))
         end
         docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each do |p|
           p.remove
@@ -235,7 +235,7 @@ module IsoDoc
           if t.at("./p |./div")
             t.xpath("./p | ./div").each { |p| p["class"] = s }
           else
-            t.children = "<div class='#{s}'>#{t.children.to_xml}</div>"
+            t.children = "<div class='#{s}'>#{to_xml(t.children)}</div>"
           end
         end
       end

data/lib/isodoc/iso/xref.rb

@@ -43,7 +43,7 @@ module IsoDoc
           n = Counter.new
           n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
           n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
-          doc.xpath(ns("//sections/clause[not(@type = 'scope')] | "\
+          doc.xpath(ns("//sections/clause[not(@type = 'scope')] | " \
                        "//sections/terms | //sections/definitions")).each do |c|
             n = section_names(c, n, 1)
           end
@@ -169,25 +169,28 @@ module IsoDoc
 
       def modspec_table_xrefs(clause)
         clause.xpath(ns(".//table[@class = 'modspec']")).noblank.each do |t|
-          (@anchors[t["id"]] && !@anchors[t["id"]][:modspec]) or next
           n = @anchors[t["id"]][:xref]
-          @anchors[t["id"]][:modspec] = true
-          @anchors[t["id"]][:xref] =
-            l10n("#{n}, #{@anchors_previous[t['id']][:xref_bare]}")
+          xref_to_modspec(t["id"], n) or next
           modspec_table_components_xrefs(t, n)
         end
       end
 
       def modspec_table_components_xrefs(table, table_label)
         table.xpath(ns(".//tr[@id]")).each do |tr|
-          (@anchors[tr["id"]] && !@anchors[tr["id"]][:modspec]) or next
-          @anchors[tr["id"]][:modspec] = true
-          @anchors[tr["id"]][:xref] =
-            l10n("#{table_label}, #{@anchors_previous[tr['id']][:xref]}")
+          xref_to_modspec(tr["id"], table_label) or next
           @anchors[tr["id"]].delete(:container)
         end
       end
 
+      def xref_to_modspec(id, table_label)
+        (@anchors[id] && !@anchors[id][:has_modspec]) or return
+        @anchors[id][:has_modspec] = true
+        x = @anchors_previous[id][:xref_bare] || @anchors_previous[id][:xref]
+        @anchors[id][:xref] = l10n("#{table_label}, #{x}")
+        @anchors[id][:modspec] = @anchors_previous[id][:modspec]
+        true
+      end
+
       def hierarchical_table_names(clause, _num)
         super
         modspec_table_xrefs(clause) if @anchors_previous

data/lib/metanorma/iso/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/iso/biblio-standoc.rng

@@ -47,7 +47,7 @@
     </element>
   </define>
   <define name="DocumentType">
-    <value>document</value>
+    <text/>
   </define>
   <define name="docsubtype">
     <element name="subdoctype">

data/lib/metanorma/iso/isodoc.rng

@@ -2653,6 +2653,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
+      <value>modspec</value>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.2.4".freeze
+    VERSION = "2.3.0".freeze
   end
 end

data/lib/metanorma/requirements/modspec.rb

@@ -3,15 +3,6 @@ module Metanorma
     class Modspec
       # Don't want to inherit from Metanorma::Requirements::Modspec
       class Iso < ::Metanorma::Requirements::Modspec
-        def recommendation_label_xref(elem, label, xrefs, _type)
-          id = @reqtlabels[label]
-          number = xrefs.anchor(id, :xref_reqt2reqt, false)
-          number.nil? and return type
-          elem.ancestors("requirement, recommendation, permission").empty? and
-            return number
-          "<xref target='#{id}'>#{number}</xref>"
-        end
-
         def recommendation_label(elem, type, xrefs)
           lbl = super
           title = elem.at(ns("./title"))
@@ -55,55 +46,13 @@ module Metanorma
 
         def postprocess_anchor_struct(block, anchor)
           super
-          anchor[:xref_reqt2reqt] = anchor[:xref_bare]
+          anchor[:modspec] = anchor[:xref_bare]
           if l = block.at(ns("./title"))
-            anchor[:xref_reqt2reqt] =
-              l10n("#{anchor[:xref_reqt2reqt]}: #{l.children.to_xml.strip}")
+            anchor[:modspec] =
+              l10n("#{anchor[:modspec]}: #{l.children.to_xml.strip}")
           end
           anchor
         end
-
-        def reqt_ids(docxml)
-          docxml.xpath(ns("//requirement | //recommendation | //permission"))
-            .each_with_object({}) do |r, m|
-              id = r.at(ns("./identifier")) or next
-              m[id.text] =
-                { id: r["id"],
-                  lbl: @xrefs.anchor(r["id"], :xref_reqt2reqt, false) }
-            end
-        end
-
-        def reqt_links_test1(reqt, acc)
-          return unless %w(conformanceclass
-                           verification).include?(reqt["type"])
-
-          subj = reqt_extract_target(reqt)
-          id = reqt.at(ns("./identifier")) or return
-          lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref_reqt2reqt,
-                              false)
-          return unless subj
-
-          acc[subj.text] = { lbl: lbl, id: reqt["id"] }
-        end
-
-        def reqt_links_class(docxml)
-          docxml.xpath(ns("//requirement | //recommendation | //permission"))
-            .each_with_object({}) do |r, m|
-              next unless %w(class
-                             conformanceclass).include?(r["type"])
-
-              id = r.at(ns("./identifier")) or next
-              r.xpath(ns("./requirement | ./recommendation | ./permission"))
-                .each do |r1|
-                id1 = r1.at(ns("./identifier")) or next
-                lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id],
-                                    :xref_reqt2reqt, false)
-                next unless lbl
-
-                m[id1.text] = { lbl: lbl, id: r["id"] }
-              end
-            end
-        end
       end
     end
   end

data/metanorma-iso.gemspec

@@ -32,7 +32,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-standoc", "~> 2.2.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.3.0"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid-iso"
   spec.add_dependency "ruby-jing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -415,7 +415,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-iso lets you write ISO standards in AsciiDoc.