metanorma-iso 2.4.8 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aaa364a3a007ab13cb425bee0b000154d5d49d394db13f37945b18eb77a7d97
-  data.tar.gz: 54974181bd0d2c29fc00299aaa0da54bc5749c741d4a63503003af1d46038c95
+  metadata.gz: b68e0ac152a02770b1ca677908a34d243a66ba8da955a98aac66391a6e1a73ae
+  data.tar.gz: 4122f534ef647b210a829dc1645240b79bc240a0059dec141ca3eec0f1c64efc
 SHA512:
-  metadata.gz: 85dcbabb3fd13f5020003f4e5c59d8fad34287002f3e9fc03d4cc6c0fe37d0938bcf0ce1e3a3e6a0fc5a1937c756646662cd7d48eea65e3208e1650927ab3133
-  data.tar.gz: 77268460b6cfbeda72397ec169dc82bfdfdd724214d138fe7f6621570cf01b881097baaebc36e0eadac9568e2b842e2fa068c5994f98fb228c9ef1146dfc3430
+  metadata.gz: bb2d619b3e439f33ac96fd63691a288730daed7aa3ed8d478898caca5f755d3aea436469499afd81aa318519be87f5f12e5d8b632d17f40cff1b67e2c20851ad
+  data.tar.gz: 2e37056accf0f22aa7a13702ff79c928c359c0188126a10e165e8c448a9a7f110acf743b29fed45b5b972c54d77f7a8a7610a6da889f8ef9ca43d3b77bbfa501

data/lib/isodoc/iso/base_convert.rb

@@ -130,22 +130,13 @@ module IsoDoc
         end
       end
 
-      def middle(isoxml, out)
-        middle_title(isoxml, out)
-        middle_admonitions(isoxml, out)
-        i = scope isoxml, out, 0
-        i = norm_ref isoxml, out, i
-        clause_etc isoxml, out, i
-        annex isoxml, out
-        bibliography isoxml, out
-      end
-
-      def clause_etc(isoxml, out, num)
-        isoxml.xpath(ns("//sections/clause[not(@type = 'scope')] | " \
-                        "//sections/terms | //sections/definitions"))
-          .each do |f|
-            clause_etc1(f, out, num)
-          end
+      def top_element_render(elem, out)
+        if %w(clause terms definitions).include?(elem.name) &&
+            elem.parent.name == "sections" &&
+            elem["type"] != "scope"
+          clause_etc1(elem, out, 0)
+        else super
+        end
       end
 
       def clause_etc1(clause, out, num)
@@ -161,12 +152,6 @@ module IsoDoc
         end
       end
 
-      def indexsect(isoxml, out)
-        isoxml.xpath(ns("//indexsect")).each do |i|
-          clause_parse(i, out)
-        end
-      end
-
       def ol_attrs(node)
         super.merge(start: node["start"]).compact
       end

data/lib/isodoc/iso/html_convert.rb

@@ -81,18 +81,6 @@ module IsoDoc
         docxml
       end
 
-      def middle(isoxml, out)
-        middle_title(isoxml, out)
-        middle_admonitions(isoxml, out)
-        scope isoxml, out, 0
-        norm_ref isoxml, out, 0
-        clause_etc isoxml, out, 0
-        annex isoxml, out
-        bibliography isoxml, out
-        indexsect isoxml, out
-      end
-
-
       def html_toc1(ulist)
         u2 = nil
         ulist.xpath("./li").each do |l|

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

@@ -1353,38 +1353,35 @@
 						<xsl:call-template name="insertHeaderFooter"/>
 						<fo:flow flow-name="xsl-region-body">
 
-							<fo:block-container>
-								<!-- Information and documentation — Codes for transcription systems -->
-								<!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt">
-									<xsl:value-of select="$title-en"/>
-								</fo:block>
-								 -->
+							<!-- Information and documentation — Codes for transcription systems -->
+							<!-- <fo:block-container>
+								
 								<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="H1">
-
+								
 									<fo:block role="SKIP">
-
+									
 										<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
-
+										
 										<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-main']"/>
-
+										
 										<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']">
 											<xsl:with-param name="isMainLang">true</xsl:with-param>
 											<xsl:with-param name="isMainBody">true</xsl:with-param>
 										</xsl:apply-templates>
-
+										
 									</fo:block>
 									<fo:block role="SKIP">
 										<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']/node()"/>
 									</fo:block>
-
+									
 									<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-amd']">
 										<xsl:with-param name="isMainLang">true</xsl:with-param>
 										<xsl:with-param name="isMainBody">true</xsl:with-param>
 									</xsl:apply-templates>
-
+									
 								</fo:block>
-
-							</fo:block-container>
+							
+							</fo:block-container> -->
 							<!-- Clause(s) -->
 							<fo:block>
 
@@ -1757,6 +1754,31 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="H1">
+			<xsl:if test="following-sibling::*[1][self::iso:p][starts-with(@class, 'zzSTDTitle')]">
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']/iso:span[@class = 'nonboldtitle']" priority="3">
+		<!-- Example: <span class="nonboldtitle">Part 1:</span> -->
+		<fo:block font-weight="normal" margin-top="12pt" line-height="1.1" role="SKIP">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle2']" priority="4">
+		<!-- Example: <p class="zzSTDTitle2" displayorder="3">AMENDMENT 1: Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions</p> -->
+		<xsl:if test="$doctype = 'amendment'">
+			<fo:block font-size="18pt" margin-top="12pt" margin-bottom="20pt" margin-right="0mm" font-weight="normal" line-height="1.1" role="H1">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- ==================== -->
 	<!-- END display titles   -->
 	<!-- ==================== -->
@@ -6429,6 +6451,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -6512,7 +6537,7 @@
 	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
 		<xsl:choose>
-			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
 				 <!-- url -->
 				<xsl:call-template name="add-zero-spaces-link-java"/>
 			</xsl:when>
@@ -7045,10 +7070,13 @@
 			</xsl:choose>
 		</xsl:variable>
 
+		<!-- replace sequence #x200B to one &#x200B -->
+		<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '​')"/>
+
 		<!-- replace sequence #x200B and space TO space -->
-		<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b ', ' ')"/>
+		<xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
 
-		<xsl:value-of select="$text10"/>
+		<xsl:value-of select="$text11"/>
 	</xsl:template>
 
 	<xsl:template name="add-zero-spaces-link-java">
@@ -7058,8 +7086,12 @@
 		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @  -->
 		<xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1​')"/>
+
+		<!-- replace sequence #x200B to one &#x200B -->
+		<xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '​')"/>
+
 		<!-- remove zero-width space at the end -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '​$', '')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '​$', '')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -8590,25 +8622,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-												<xsl:value-of select="$width_effective"/>
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-									</xsl:variable>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+											<xsl:variable name="image_width_effective">
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+														<xsl:value-of select="$width_effective"/>
 
-									</xsl:if>
+											</xsl:variable>
+
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -12266,7 +12318,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" 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

@@ -1353,38 +1353,35 @@
 						<xsl:call-template name="insertHeaderFooter"/>
 						<fo:flow flow-name="xsl-region-body">
 
-							<fo:block-container>
-								<!-- Information and documentation — Codes for transcription systems -->
-								<!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt">
-									<xsl:value-of select="$title-en"/>
-								</fo:block>
-								 -->
+							<!-- Information and documentation — Codes for transcription systems -->
+							<!-- <fo:block-container>
+								
 								<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="H1">
-
+								
 									<fo:block role="SKIP">
-
+									
 										<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
-
+										
 										<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-main']"/>
-
+										
 										<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']">
 											<xsl:with-param name="isMainLang">true</xsl:with-param>
 											<xsl:with-param name="isMainBody">true</xsl:with-param>
 										</xsl:apply-templates>
-
+										
 									</fo:block>
 									<fo:block role="SKIP">
 										<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']/node()"/>
 									</fo:block>
-
+									
 									<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-amd']">
 										<xsl:with-param name="isMainLang">true</xsl:with-param>
 										<xsl:with-param name="isMainBody">true</xsl:with-param>
 									</xsl:apply-templates>
-
+									
 								</fo:block>
-
-							</fo:block-container>
+							
+							</fo:block-container> -->
 							<!-- Clause(s) -->
 							<fo:block>
 
@@ -1757,6 +1754,31 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="H1">
+			<xsl:if test="following-sibling::*[1][self::iso:p][starts-with(@class, 'zzSTDTitle')]">
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']/iso:span[@class = 'nonboldtitle']" priority="3">
+		<!-- Example: <span class="nonboldtitle">Part 1:</span> -->
+		<fo:block font-weight="normal" margin-top="12pt" line-height="1.1" role="SKIP">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle2']" priority="4">
+		<!-- Example: <p class="zzSTDTitle2" displayorder="3">AMENDMENT 1: Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions</p> -->
+		<xsl:if test="$doctype = 'amendment'">
+			<fo:block font-size="18pt" margin-top="12pt" margin-bottom="20pt" margin-right="0mm" font-weight="normal" line-height="1.1" role="H1">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- ==================== -->
 	<!-- END display titles   -->
 	<!-- ==================== -->
@@ -6429,6 +6451,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -6512,7 +6537,7 @@
 	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
 		<xsl:choose>
-			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
 				 <!-- url -->
 				<xsl:call-template name="add-zero-spaces-link-java"/>
 			</xsl:when>
@@ -7045,10 +7070,13 @@
 			</xsl:choose>
 		</xsl:variable>
 
+		<!-- replace sequence #x200B to one &#x200B -->
+		<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '​')"/>
+
 		<!-- replace sequence #x200B and space TO space -->
-		<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b ', ' ')"/>
+		<xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
 
-		<xsl:value-of select="$text10"/>
+		<xsl:value-of select="$text11"/>
 	</xsl:template>
 
 	<xsl:template name="add-zero-spaces-link-java">
@@ -7058,8 +7086,12 @@
 		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @  -->
 		<xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1​')"/>
+
+		<!-- replace sequence #x200B to one &#x200B -->
+		<xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '​')"/>
+
 		<!-- remove zero-width space at the end -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '​$', '')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '​$', '')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -8590,25 +8622,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-												<xsl:value-of select="$width_effective"/>
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-									</xsl:variable>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+											<xsl:variable name="image_width_effective">
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+														<xsl:value-of select="$width_effective"/>
 
-									</xsl:if>
+											</xsl:variable>
+
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -12266,7 +12318,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -95,7 +95,7 @@ module IsoDoc
         i = display_order_at(docxml, "//clause[@type = 'scope']", i)
         i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
         i = display_order_xpath(docxml,
-                                "//sections/clause[not(@type = 'scope')] | " \
+                                "//sections/clause[not(@type = 'scope')][not(.//references)] | " \
                                 "//sections/terms | //sections/definitions", i)
         i = display_order_xpath(docxml, "//annex", i)
         i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
@@ -161,6 +161,39 @@ module IsoDoc
         super
       end
 
+      def middle_title(docxml)
+        @meta.get[:doctitlemain].nil? || @meta.get[:doctitlemain].empty? and
+          return
+        s = docxml.at(ns("//sections")) or return
+        ret = "#{middle_title_main}#{middle_title_amd}"
+        s.children.first.previous = ret
+      end
+
+      def middle_title_main
+        ret = "<span class='boldtitle'>#{@meta.get[:doctitleintro]}"
+        ret += " &#x2014; " if @meta.get[:doctitleintro] && @meta.get[:doctitlemain]
+        ret += @meta.get[:doctitlemain]
+        ret += " &#x2014; " if @meta.get[:doctitlemain] && @meta.get[:doctitlepart]
+        ret += "</span>"
+        if a = @meta.get[:doctitlepart]
+          b = @meta.get[:doctitlepartlabel] and ret += "<span class='nonboldtitle'>#{b}:</span> "
+          ret += "<span class='boldtitle'>#{a}</span>"
+        end
+        "<p class='zzSTDTitle1'>#{ret}</p>"
+      end
+
+      def middle_title_amd
+        ret = ""
+        if a = @meta.get[:doctitleamdlabel]
+          ret += "<p class='zzSTDTitle2'>#{a}"
+          a = @meta.get[:doctitleamd] and ret += ": #{a}"
+          ret += "</p>"
+        end
+        a = @meta.get[:doctitlecorrlabel] and
+          ret += "<p class='zzSTDTitle2'>#{a}</p>"
+        ret
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/sections.rb

@@ -1,52 +1,12 @@
 module IsoDoc
   module Iso
     module BaseConvert
-      def middle_title(_isoxml, out)
-        middle_title_main(out)
-        middle_title_amd(out)
-      end
-
-      def middle_title_main(out)
-        out.p(class: "zzSTDTitle1") do |p|
-          p << @meta.get[:doctitleintro]
-          p << " &#x2014; " if @meta.get[:doctitleintro] && @meta.get[:doctitlemain]
-          p << @meta.get[:doctitlemain]
-          p << " &#x2014; " if @meta.get[:doctitlemain] && @meta.get[:doctitlepart]
-        end
-        a = @meta.get[:doctitlepart] and out.p(class: "zzSTDTitle2") do |p|
-          b = @meta.get[:doctitlepartlabel] and p << "#{b}: "
-          p << "<br/><b>#{a}</b>"
-        end
-      end
-
-      def middle_title_amd(out)
-        a = @meta.get[:doctitleamdlabel] and out.p(class: "zzSTDTitle2") do |p|
-          p << a
-          a = @meta.get[:doctitleamd] and p << ": #{a}"
-        end
-        a = @meta.get[:doctitlecorrlabel] and out.p(class: "zzSTDTitle2") do |p|
-          p << a
-        end
-      end
-
-      def annex(isoxml, out)
-        amd(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
+      def annex(node, out)
+        amd(node.document) and
+          @suppressheadingnumbers = @oldsuppressheadingnumbers
         super
-        amd(isoxml) and @suppressheadingnumbers = true
-      end
-
-=begin
-      def introduction(clause, out)
-        title_attr = { class: "IntroTitle" }
-        page_break(out)
-        out.div class: "Section3", id: clause["id"] do |div|
-          clause_name(clause, clause.at(ns("./title")), div, title_attr)
-          clause.elements.each do |e|
-            parse(e, div) unless e.name == "title"
-          end
-        end
+        amd(node.document) and @suppressheadingnumbers = true
       end
-=end
 
       def foreword(clause, out)
         @foreword = true

data/lib/isodoc/iso/word_convert.rb

@@ -70,8 +70,8 @@ module IsoDoc
           make_body1(body, docxml)
           make_body2(body, docxml)
           make_body3(body, docxml)
-          indexsect(docxml, body)
-          colophon(body, docxml)
+          indexsect_section(docxml, body)
+          colophon_section(docxml, body)
         end
       end
 
@@ -80,23 +80,31 @@ module IsoDoc
                                     "mso-break-type:section-break"
       end
 
-      def colophon(body, _docxml)
+      MAIN_ELEMENTS =
+        "//sections/*[@displayorder] | //annex[@displayorder] | " \
+        "//bibliography/*[@displayorder]".freeze
+
+      def colophon_section(_isoxml, out)
         stage = @meta.get[:stage_int]
         return if !stage.nil? && stage < 60
 
-        br(body, "left")
-        body.div class: "colophon" do |div|
+        br(out, "left")
+        out.div class: "colophon" do |div|
         end
       end
 
-      def indexsect(isoxml, out)
+      def indexsect_section(isoxml, out)
         isoxml.xpath(ns("//indexsect")).each do |i|
-          indexsect_title(i, out)
-          br(out, "auto")
-          out.div class: "index" do |div|
-            i.children.each do |e|
-              parse(e, div) unless e.name == "title"
-            end
+          indexsect(i, out)
+        end
+      end
+
+      def indexsect(elem, out)
+        indexsect_title(elem, out)
+        br(out, "auto")
+        out.div class: "index" do |div|
+          elem.children.each do |e|
+            parse(e, div) unless e.name == "title"
           end
         end
       end
@@ -128,14 +136,14 @@ module IsoDoc
         { class: "BiblioTitle" }
       end
 
-      def bibliography(xml, out)
-        (f = xml.at(ns(bibliography_xpath)) and f["hidden"] != "true") or return
+      def bibliography(node, out)
+        node["hidden"] != "true" or return
         page_break(out)
         out.div do |div|
           div.h1 **bibliography_attrs do |h1|
-            f&.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
+            node&.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
           end
-          biblio_list(f, div, true)
+          biblio_list(node, div, true)
         end
       end
 
@@ -197,7 +205,6 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
-        preceding_floating_titles(name, div)
         return if name.nil?
 
         name&.at(ns("./strong"))&.remove # supplied by CSS list numbering

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -41,6 +41,7 @@ module IsoDoc
 
       def dis_styles1(docxml)
         amd_style(docxml)
+        middle_title_style(docxml)
         code_style(docxml)
         figure_style(docxml)
         formula_style(docxml)
@@ -71,6 +72,14 @@ module IsoDoc
         end
       end
 
+      def middle_title_style(docxml)
+        docxml.xpath("//p[@class = 'zzSTDTitle2']").each do |p|
+          p1 = p.previous_element && p1.name == p &&
+            p1["class"] = "zzSTDTitle2" or next
+          p1 << " #{p.remove.children.to_xml}"
+        end
+      end
+
       def dis_style_interactions(docxml)
         docxml.xpath("//p[@class = 'Code' or @class = 'Code-' or " \
                      "@class = 'Code--']" \

data/lib/isodoc/iso/word_dis_convert.rb

@@ -46,12 +46,6 @@ module IsoDoc
         { class: "TableTitle", style: "text-align:center;" }
       end
 
-      def span_parse(node, out)
-        out.span class: node["class"] do |x|
-          node.children.each { |n| parse(n, x) }
-        end
-      end
-
       def word_toc_preface(level)
         <<~TOC.freeze
           <span lang="EN-GB"><span
@@ -68,7 +62,7 @@ module IsoDoc
 
       def toWord(result, filename, dir, header)
         result = from_xhtml(word_cleanup(to_xhtml(result)))
-          .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
+          .gsub("-DOUBLE_HYPHEN_ESCAPE-", "--")
         @wordstylesheet = wordstylesheet_update
         ::Html2Doc::IsoDIS.new(
           filename: filename,
@@ -86,30 +80,39 @@ module IsoDoc
         middle_title_dis(out)
       end
 
-      def middle_title_dis(out)
+      def middle_title_dis(node, out)
         out.p(class: "zzSTDTitle") do |p|
-          p << @meta.get[:doctitleintro]
-          @meta.get[:doctitleintro] && @meta.get[:doctitlemain] and p << " &#x2014; "
-          p << @meta.get[:doctitlemain]
-          @meta.get[:doctitlemain] && @meta.get[:doctitlepart] and p << " &#x2014; "
-          if @meta.get[:doctitlepart]
-            b = @meta.get[:doctitlepartlabel] and
-              p << "<span style='font-weight:normal'>#{b}:</span> "
-            p << " #{@meta.get[:doctitlepart]}"
+          node.children.each { |n| parse(n, p) }
+        end
+      end
+
+      def middle_title_amd(node, out)
+        out.p(class: "zzSTDTitle2") do |p|
+          p.span(style: "font-weight:normal") do |s|
+            node.children.each { |n| parse(n, s) }
           end
-          @meta.get[:doctitleamdlabel] || @meta.get[:doctitleamd] ||
-            @meta.get[:doctitlecorrlabel] and middle_title_dis_amd(p)
         end
       end
 
-      def middle_title_dis_amd(para)
-        para.span(style: "font-weight:normal") do |p|
-          if a = @meta.get[:doctitleamdlabel]
-            p << " #{a}"
-            a = @meta.get[:doctitleamd] and p << ": #{a}"
+      def para_parse(node, out)
+        case node["class"]
+        when "zzSTDTitle1" then middle_title_dis(node, out)
+        when "zzSTDTitle2" then middle_title_amd(node, out)
+        else super
+        end
+      end
+
+      def span_parse(node, out)
+        case node["class"]
+        when "nonboldtitle"
+          out.span(style: "font-weight:normal") do |s|
+            node.children.each { |n| parse(n, s) }
           end
-          if a = @meta.get[:doctitlecorrlabel]
-            p << " #{a}"
+        when "boldtitle"
+          node.children.each { |n| parse(n, out) }
+        else
+          out.span class: node["class"] do |x|
+            node.children.each { |n| parse(n, x) }
           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')][not(.//references)] | " \
                        "//sections/terms | //sections/definitions")).each do |c|
             n = section_names(c, n, 1)
           end

data/lib/metanorma/iso/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.2 -->
+<!-- VERSION v1.2.3 -->
 <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">
@@ -192,9 +192,11 @@
         </attribute>
       </optional>
       <attribute name="citeas"/>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
+      <optional>
+        <attribute name="type">
+          <ref name="ReferenceFormat"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -836,6 +838,26 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="stem">
+      <element name="stem">
+        <attribute name="type">
+          <choice>
+            <value>MathML</value>
+            <value>AsciiMath</value>
+            <value>LatexMath</value>
+          </choice>
+        </attribute>
+        <attribute name="block">
+          <data type="boolean"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="em">
       <element name="em">
         <zeroOrMore>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.4.8".freeze
+    VERSION = "2.5.0".freeze
   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.4.3"
+  spec.add_dependency "metanorma-standoc", "~> 2.5.0"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid-iso", "~> 0.5.0"
   spec.add_dependency "ruby-jing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.4.8
+  version: 2.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-07 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.4.3
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement