metanorma-iso 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd0358f94bbae1d6d9701a3fc7e65a4e13023aa367d7b790816361544c44f4a4
-  data.tar.gz: f79b87d35cdebb5111e9d97b8ca8af7e4d7334c1aaaa3b13813f2b3813c373c3
+  metadata.gz: 0c7bab3dbfa462338c0831dc29e08bd0ea7c167a47821c35e95b4cfe5c7bda66
+  data.tar.gz: 37021d7613f8c97e75d5b5e47f915c5854d0cd89d789ab5e86b41418887afe8c
 SHA512:
-  metadata.gz: b8c623bbbf2c8238d3cf712a21d8f7941968464cfa979947db054331d54b9185db422154f318efb3b339e7cabdc37824de0e2b1014a3b97267663b791fd2559c
-  data.tar.gz: d98155a8922bafdac24a604144b3f6436dc426aea949a4142425fc1df2e699aae57a58f29228af36a2699f72fb003e5640c2732508a352a103b42418119354a2
+  metadata.gz: 8e36f66e9ed5341fc0a32aa16898faae89c5e195a86175d8b626a2ed3c8912ada63f20e161fd21bd42f792f5fe84078cc903abf1ae289cb8981a6e2ea0eb84af
+  data.tar.gz: cf388a36ab160cc3e4b5ece2d6e10d25a7508167f7f101a1ffebf0537d0d5b0747106db346625ce13f17554baf6ec8f1e362ae289320e3bd889c6b841da822f8

data/lib/isodoc/iso/base_convert.rb

@@ -117,7 +117,7 @@ module IsoDoc
           num = num + 1
           clause_name(clause, clause&.at(ns("./fmt-title")), div, nil)
           clause.elements.each do |e|
-            parse(e, div) unless %w{fmt-title source}.include? e.name
+            parse(e, div) unless %w{fmt-title fmt-source}.include? e.name
           end
         end
       end
@@ -139,7 +139,7 @@ module IsoDoc
 
       def table_parse_tail(node, out)
         (dl = node.at(ns("./dl"))) && parse(dl, out)
-        node.xpath(ns("./source")).each { |n| parse(n, out) }
+        node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
         node.xpath(ns("./note[not(@type = 'units')]")).each do |n|
           parse(n, out)
         end

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

@@ -3497,61 +3497,69 @@
 	<xsl:template match="iso:bibdata/iso:title[@type = 'title-part']">
 		<xsl:param name="curr_lang" select="$lang"/>
 		<xsl:param name="isMainLang">false</xsl:param>
-		<xsl:if test="$part != ''">
-			<!-- <xsl:text> — </xsl:text> -->
-			<xsl:choose>
-				<xsl:when test="$layoutVersion = '1951'"/>
-				<xsl:otherwise><xsl:text> — </xsl:text></xsl:otherwise>
-			</xsl:choose>
-			<xsl:variable name="part-word">
+		<xsl:choose>
+			<xsl:when test="$part != ''">
+				<!-- <xsl:text> — </xsl:text> -->
 				<xsl:choose>
-					<xsl:when test="$isMainLang = 'true'">
-						<xsl:value-of select="concat($i18n_locality_part, ' ', $part, ':')"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$curr_lang]),'#',$part)"/>
-					</xsl:otherwise>
+					<xsl:when test="$layoutVersion = '1951'"/>
+					<xsl:otherwise><xsl:text> — </xsl:text></xsl:otherwise>
 				</xsl:choose>
-			</xsl:variable>
-			<xsl:choose>
-				<xsl:when test="$isMainLang = 'true'">
+				<xsl:variable name="part-word">
 					<xsl:choose>
-						<xsl:when test="$layoutVersion = '1951'">
-							<xsl:value-of select="$part-word"/>
-							<xsl:apply-templates/>
+						<xsl:when test="$isMainLang = 'true'">
+							<xsl:value-of select="concat($i18n_locality_part, ' ', $part, ':')"/>
 						</xsl:when>
-						<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'">
-							<fo:block font-weight="bold" role="SKIP">
+						<xsl:otherwise>
+							<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$curr_lang]),'#',$part)"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:choose>
+					<xsl:when test="$isMainLang = 'true'">
+						<xsl:choose>
+							<xsl:when test="$layoutVersion = '1951'">
 								<xsl:value-of select="$part-word"/>
-								<xsl:text> </xsl:text>
 								<xsl:apply-templates/>
-							</fo:block>
-						</xsl:when>
-						<xsl:when test="$layoutVersion = '1987'">
-							<fo:block font-weight="bold" margin-top="12pt" role="SKIP">
+							</xsl:when>
+							<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'">
+								<fo:block font-weight="bold" role="SKIP">
+									<xsl:value-of select="$part-word"/>
+									<xsl:text> </xsl:text>
+									<xsl:apply-templates/>
+								</fo:block>
+							</xsl:when>
+							<xsl:when test="$layoutVersion = '1987'">
+								<fo:block font-weight="bold" margin-top="12pt" role="SKIP">
+									<xsl:value-of select="$part-word"/>
+								</fo:block>
+							</xsl:when>
+							<xsl:otherwise>
+							<fo:block font-weight="normal" margin-top="6pt" role="SKIP">
 								<xsl:value-of select="$part-word"/>
 							</fo:block>
-						</xsl:when>
-						<xsl:otherwise>
-						<fo:block font-weight="normal" margin-top="6pt" role="SKIP">
-							<xsl:value-of select="$part-word"/>
-						</fo:block>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when>
-				<xsl:otherwise>
-					<!-- <xsl:value-of select="$linebreak"/> -->
-					<xsl:choose>
-						<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'"/>
-						<xsl:otherwise>
-							<fo:block font-size="1pt" margin-top="5pt" role="SKIP"> </fo:block>
-						</xsl:otherwise>
-					</xsl:choose>
-					<xsl:value-of select="$part-word"/>
-					<xsl:text> </xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:if>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:when>
+					<xsl:otherwise>
+						<!-- <xsl:value-of select="$linebreak"/> -->
+						<xsl:choose>
+							<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'"/>
+							<xsl:otherwise>
+								<fo:block font-size="1pt" margin-top="5pt" role="SKIP"> </fo:block>
+							</xsl:otherwise>
+						</xsl:choose>
+						<xsl:value-of select="$part-word"/>
+						<xsl:text> </xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise> <!-- $part = '' -->
+				<xsl:choose>
+					<xsl:when test="$layoutVersion = '1951'"/>
+					<xsl:otherwise><xsl:text> — </xsl:text></xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
+		</xsl:choose>
 		<xsl:choose>
 			<xsl:when test="$layoutVersion = '1951'"><fo:inline font-weight="normal"><xsl:apply-templates/></fo:inline></xsl:when>
 			<xsl:when test="($layoutVersion = '1972' or $layoutVersion = '1979') and $isMainLang = 'true'"/>
@@ -14502,11 +14510,11 @@
 	</xsl:template>
 
 	<!-- figure/fn -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
 	<!-- figure/note -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
 	<!-- figure/example -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
 
 	<!-- figure/note[@type = 'units'] -->
 	<!-- image/note[@type = 'units'] -->
@@ -18077,6 +18085,9 @@
 	<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
+	<!-- https://github.com/metanorma/isodoc/issues/687 -->
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
@@ -18394,6 +18405,20 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-source']"/>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>

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

@@ -3497,61 +3497,69 @@
 	<xsl:template match="iso:bibdata/iso:title[@type = 'title-part']">
 		<xsl:param name="curr_lang" select="$lang"/>
 		<xsl:param name="isMainLang">false</xsl:param>
-		<xsl:if test="$part != ''">
-			<!-- <xsl:text> — </xsl:text> -->
-			<xsl:choose>
-				<xsl:when test="$layoutVersion = '1951'"/>
-				<xsl:otherwise><xsl:text> — </xsl:text></xsl:otherwise>
-			</xsl:choose>
-			<xsl:variable name="part-word">
+		<xsl:choose>
+			<xsl:when test="$part != ''">
+				<!-- <xsl:text> — </xsl:text> -->
 				<xsl:choose>
-					<xsl:when test="$isMainLang = 'true'">
-						<xsl:value-of select="concat($i18n_locality_part, ' ', $part, ':')"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$curr_lang]),'#',$part)"/>
-					</xsl:otherwise>
+					<xsl:when test="$layoutVersion = '1951'"/>
+					<xsl:otherwise><xsl:text> — </xsl:text></xsl:otherwise>
 				</xsl:choose>
-			</xsl:variable>
-			<xsl:choose>
-				<xsl:when test="$isMainLang = 'true'">
+				<xsl:variable name="part-word">
 					<xsl:choose>
-						<xsl:when test="$layoutVersion = '1951'">
-							<xsl:value-of select="$part-word"/>
-							<xsl:apply-templates/>
+						<xsl:when test="$isMainLang = 'true'">
+							<xsl:value-of select="concat($i18n_locality_part, ' ', $part, ':')"/>
 						</xsl:when>
-						<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'">
-							<fo:block font-weight="bold" role="SKIP">
+						<xsl:otherwise>
+							<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$curr_lang]),'#',$part)"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:choose>
+					<xsl:when test="$isMainLang = 'true'">
+						<xsl:choose>
+							<xsl:when test="$layoutVersion = '1951'">
 								<xsl:value-of select="$part-word"/>
-								<xsl:text> </xsl:text>
 								<xsl:apply-templates/>
-							</fo:block>
-						</xsl:when>
-						<xsl:when test="$layoutVersion = '1987'">
-							<fo:block font-weight="bold" margin-top="12pt" role="SKIP">
+							</xsl:when>
+							<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'">
+								<fo:block font-weight="bold" role="SKIP">
+									<xsl:value-of select="$part-word"/>
+									<xsl:text> </xsl:text>
+									<xsl:apply-templates/>
+								</fo:block>
+							</xsl:when>
+							<xsl:when test="$layoutVersion = '1987'">
+								<fo:block font-weight="bold" margin-top="12pt" role="SKIP">
+									<xsl:value-of select="$part-word"/>
+								</fo:block>
+							</xsl:when>
+							<xsl:otherwise>
+							<fo:block font-weight="normal" margin-top="6pt" role="SKIP">
 								<xsl:value-of select="$part-word"/>
 							</fo:block>
-						</xsl:when>
-						<xsl:otherwise>
-						<fo:block font-weight="normal" margin-top="6pt" role="SKIP">
-							<xsl:value-of select="$part-word"/>
-						</fo:block>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when>
-				<xsl:otherwise>
-					<!-- <xsl:value-of select="$linebreak"/> -->
-					<xsl:choose>
-						<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'"/>
-						<xsl:otherwise>
-							<fo:block font-size="1pt" margin-top="5pt" role="SKIP"> </fo:block>
-						</xsl:otherwise>
-					</xsl:choose>
-					<xsl:value-of select="$part-word"/>
-					<xsl:text> </xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:if>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:when>
+					<xsl:otherwise>
+						<!-- <xsl:value-of select="$linebreak"/> -->
+						<xsl:choose>
+							<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'"/>
+							<xsl:otherwise>
+								<fo:block font-size="1pt" margin-top="5pt" role="SKIP"> </fo:block>
+							</xsl:otherwise>
+						</xsl:choose>
+						<xsl:value-of select="$part-word"/>
+						<xsl:text> </xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise> <!-- $part = '' -->
+				<xsl:choose>
+					<xsl:when test="$layoutVersion = '1951'"/>
+					<xsl:otherwise><xsl:text> — </xsl:text></xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
+		</xsl:choose>
 		<xsl:choose>
 			<xsl:when test="$layoutVersion = '1951'"><fo:inline font-weight="normal"><xsl:apply-templates/></fo:inline></xsl:when>
 			<xsl:when test="($layoutVersion = '1972' or $layoutVersion = '1979') and $isMainLang = 'true'"/>
@@ -14502,11 +14510,11 @@
 	</xsl:template>
 
 	<!-- figure/fn -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
 	<!-- figure/note -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
 	<!-- figure/example -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
 
 	<!-- figure/note[@type = 'units'] -->
 	<!-- image/note[@type = 'units'] -->
@@ -18077,6 +18085,9 @@
 	<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
+	<!-- https://github.com/metanorma/isodoc/issues/687 -->
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
@@ -18394,6 +18405,20 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-source']"/>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>

data/lib/isodoc/iso/presentation_terms.rb

@@ -11,7 +11,7 @@ module IsoDoc
         concept_term(docxml)
         (docxml.xpath(ns("//concept")) - docxml.xpath(ns("//term//concept")))
           .each do |node|
-          node.ancestors("definition, termsource, related").empty? and
+          node.ancestors("definition, source, related").empty? and
             concept_render(node, ital: "false", ref: "false",
                                  linkref: "true", linkmention: "false")
         end
@@ -22,7 +22,7 @@ module IsoDoc
           m = {}
           (f.xpath(ns(".//concept")) - f.xpath(ns(".//term//concept")))
             .each do |c|
-              c.ancestors("definition, termsource, related").empty? and
+              c.ancestors("definition, source, related").empty? and
                 concept_term1(c, m)
             end
         end

data/lib/isodoc/iso/word_convert.rb

@@ -236,7 +236,7 @@ module IsoDoc
 
       def table_parse_tail(node, out)
         (dl = node.at(ns("./dl"))) && parse(dl, out)
-        node.xpath(ns("./source")).each { |n| parse(n, out) }
+        node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
         node.xpath(ns("./note[not(@type = 'units')]"))
           .each { |n| parse(n, out) }
         node.xpath(ns("./fmt-footnote-container/fmt-fn-body"))

data/lib/metanorma/iso/base.rb

@@ -65,9 +65,8 @@ module Metanorma
       end
 
       def ol_attrs(node)
-        attr_code(keep_attrs(node)
-                  .merge(id: ::Metanorma::Utils::anchor_or_uuid(node),
-                         "explicit-type": olist_style(node.attributes[1]),
+        attr_code(keep_attrs(node).merge(id_attr(node))
+                  .merge("explicit-type": olist_style(node.attributes[1]),
                          start: node.attr("start")))
       end
 

data/lib/metanorma/iso/basicdoc.rng

@@ -267,6 +267,10 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <value>justified</value>
     </choice>
   </define>
+  <define name="IdRefType">
+    <a:documentation>Type of cross-references to elements. In BasicDoc, these always point to id { xsd:ID } </a:documentation>
+    <data type="IDREF"/>
+  </define>
   <define name="RequiredId">
     <a:documentation>Mandatory anchor of element, to be used for cross-references within the document</a:documentation>
     <attribute name="id">
@@ -409,13 +413,13 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <attribute name="from">
         <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
 If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
     </optional>
     <optional>
       <attribute name="to">
         <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
     </optional>
   </define>
@@ -1504,7 +1508,7 @@ Restricted recursively to contain only other such inline elements with no identi
         <attribute name="to">
           <a:documentation>A reference to an anchor element (typically a bookmark), 
 to indicate that the index range covers a range of locations between the current index element and the `to` anchor</a:documentation>
-          <data type="IDREF"/>
+          <ref name="IdRefType"/>
         </attribute>
       </optional>
       <ref name="index-primary">
@@ -1662,7 +1666,7 @@ which can be bookmarks as well as block or section references</a:documentation>
   <define name="XrefAttributes">
     <attribute name="target">
       <a:documentation>The identifier of a section, block or inlined element being referenced</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <optional>
       <attribute name="type">
@@ -1723,7 +1727,7 @@ The target of a footnote is the location it is embedded in within the text</a:do
       <attribute name="target">
         <a:documentation>The target of the callout is understood to be the location of the callout within the source code; 
 the extent of the target is not expressed overtly</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
       <text>
         <a:documentation>The label of the callout, used to identify its target within the source code</a:documentation>

data/lib/metanorma/iso/cleanup.rb

@@ -69,7 +69,7 @@ module Metanorma
 
       def unpub_footnotes(xmldoc)
         xmldoc.xpath("//bibitem/note[@type = 'Unpublished-Status']").each do |n|
-          e = xmldoc.at("//eref[@bibitemid = '#{n.parent['id']}']") or next
+          e = xmldoc.at("//eref[@bibitemid = '#{n.parent['anchor']}']") or next
           fn = n.children.to_xml
           n.elements&.first&.name == "p" or fn = "<p>#{fn}</p>"
           e.next = "<fn>#{fn}</fn>"

data/lib/metanorma/iso/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.0.4 -->
+<!-- VERSION v2.0.5 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -36,6 +36,12 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="IdRefType">
+      <a:documentation>Cross-references are not normalised to xsd:IDREF in Semantic XML: that is deferred to Presentation XML.
+All IdRefType instances point not to `@id` in Semantic XML, which is the Content GUID for an element,
+but to `@anchor`, the user-supplied cross-reference</a:documentation>
+      <text/>
+    </define>
     <define name="index-primary">
       <element name="primary">
         <oneOrMore>
@@ -238,7 +244,7 @@
           <a:documentation>Notes specific to this block</a:documentation>
         </ref>
       </zeroOrMore>
-      <ref name="TermSource">
+      <ref name="BlockSource">
         <a:documentation>A source for the table</a:documentation>
       </ref>
     </define>
@@ -262,10 +268,112 @@ and is intended to be referenced by a callout within the source code</a:document
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
-      <ref name="TermSource">
+      <ref name="BlockSource">
+        <a:documentation>A source for the block</a:documentation>
+      </ref>
+    </define>
+    <define name="FigureBody">
+      <optional>
+        <ref name="tname">
+          <a:documentation>The caption of the block</a:documentation>
+        </ref>
+      </optional>
+      <choice>
+        <a:documentation>Content of the figure</a:documentation>
+        <ref name="image"/>
+        <ref name="video"/>
+        <ref name="audio"/>
+        <ref name="pre"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="figure"/>
+        </zeroOrMore>
+      </choice>
+      <zeroOrMore>
+        <ref name="fn">
+          <a:documentation>Footnotes specific to the figure</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <optional>
+        <ref name="dl">
+          <a:documentation>An optional definitions list defining any symbols used in the figure</a:documentation>
+        </ref>
+      </optional>
+      <zeroOrMore>
+        <ref name="note">
+          <a:documentation>Notes whose scope is the current block</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <ref name="BlockSource">
         <a:documentation>A source for the block</a:documentation>
       </ref>
     </define>
+    <define name="FigureNoIdBody">
+      <optional>
+        <ref name="source">
+          <a:documentation>A URI or other reference intended to link to an externally hosted image (or equivalent)</a:documentation>
+        </ref>
+      </optional>
+      <optional>
+        <ref name="tname">
+          <a:documentation>The caption of the block</a:documentation>
+        </ref>
+      </optional>
+      <choice>
+        <a:documentation>Content of the figure</a:documentation>
+        <ref name="image-no-id"/>
+        <ref name="video-no-id"/>
+        <ref name="audio-no-id"/>
+        <ref name="pre-no-id"/>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote-no-id"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="figure-no-id"/>
+        </zeroOrMore>
+      </choice>
+      <zeroOrMore>
+        <ref name="fn">
+          <a:documentation>Footnotes specific to the figure</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <optional>
+        <ref name="dl-no-id">
+          <a:documentation>An optional definitions list defining any symbols used in the figure</a:documentation>
+        </ref>
+      </optional>
+      <zeroOrMore>
+        <ref name="note-no-id">
+          <a:documentation>Notes whose scope is the current block</a:documentation>
+        </ref>
+      </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>A source for the block</a:documentation>
+      </ref>
+    </define>
+    <define name="source">
+      <element name="source">
+        <attribute name="status">
+          <a:documentation>The status of the term as it is used in this document, relative to its definition in the original document</a:documentation>
+          <ref name="SourceStatusType"/>
+        </attribute>
+        <attribute name="type">
+          <a:documentation>The type of the managed term in the present context</a:documentation>
+          <ref name="SourceTypeType"/>
+        </attribute>
+        <ref name="origin">
+          <a:documentation>The original document and location where the term definition has been obtained from</a:documentation>
+        </ref>
+        <optional>
+          <ref name="modification">
+            <a:documentation>Any changes that the definition of the term has undergone relative to the original document,
+in order to be applicable in this standardisation document</a:documentation>
+          </ref>
+        </optional>
+      </element>
+    </define>
     <define name="sourcecodebody">
       <a:documentation>The computer code or other such text presented in the block, as a single unformatted string. 
 (The string should be treated as pre-formatted text, with whitespace treated as significant)</a:documentation>
@@ -687,6 +795,20 @@ titlecase, or lowercase</a:documentation>
       </attribute>
     </optional>
   </define>
+  <define name="RequiredId" combine="interleave">
+    <optional>
+      <attribute name="anchor">
+        <a:documentation>User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
+      </attribute>
+    </optional>
+  </define>
+  <define name="OptionalId" combine="interleave">
+    <optional>
+      <attribute name="anchor">
+        <a:documentation> User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
+      </attribute>
+    </optional>
+  </define>
   <define name="ObligationType">
     <a:documentation>The force of a clause in a standard document: whether it has normative or informative effect</a:documentation>
     <choice>
@@ -1081,7 +1203,7 @@ That concept may be defined as a term within the current document, or it may be
     <element name="label">
       <!-- Identifier of form input element that this element is a label of -->
       <attribute name="for">
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
       <zeroOrMore>
         <ref name="PureTextElement"/>
@@ -2121,7 +2243,7 @@ used in document amendments</a:documentation>
   </define>
   <define name="termsource">
     <a:documentation>The bibliographic source where a term is defined in the sense applicable in this standardisation document</a:documentation>
-    <element name="termsource">
+    <element name="source">
       <attribute name="status">
         <a:documentation>The status of the term as it is used in this document, relative to its definition in the original document</a:documentation>
         <ref name="SourceStatusType"/>
@@ -2503,6 +2625,11 @@ Normative References contents contain normative references, but as a clause in t
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="BlockSource">
+    <zeroOrMore>
+      <ref name="source"/>
+    </zeroOrMore>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/iso/validate.rb

@@ -25,16 +25,15 @@ module Metanorma
         end
       end
 
-      # ISO/IEC DIR 2, 15.5.3, 20.2
-      # does not deal with preceding text marked up
-      def see_xrefs_validate(root)
+      # KILL
+      def see_xrefs_validatex(root)
         @lang == "en" or return
         root.xpath("//xref").each do |t|
           preceding = t.at("./preceding-sibling::text()[last()]")
-          next unless !preceding.nil? &&
-            /\b(see| refer to)\p{Zs}*\Z/mi.match(preceding)
+          !preceding.nil? &&
+            /\b(see| refer to)\p{Zs}*\Z/mi.match(preceding) or next
 
-          (target = root.at("//*[@id = '#{t['target']}']")) || next
+          (target = root.at("//*[@anchor = '#{t['target']}']")) || next
           target.at("./ancestor-or-self::*[@obligation = 'normative']") &&
             !target.at("./ancestor::sections") and
             @log.add("Style", t,
@@ -42,23 +41,65 @@ module Metanorma
         end
       end
 
+      # ISO/IEC DIR 2, 15.5.3, 20.2
+      # does not deal with preceding text marked up
+      def see_xrefs_validate(root)
+        @lang == "en" or return
+        anchors = extract_anchor_norm(root)
+        root.xpath("//xref").each do |t|
+          preceding = t.at("./preceding-sibling::text()[last()]")
+          !preceding.nil? &&
+            /\b(see| refer to)\p{Zs}*\Z/mi.match(preceding) or next
+          anchors[t["target"]] and
+            @log.add("Style", t,
+                     "'see #{t['target']}' is pointing to a normative section")
+        end
+      end
+
+      def extract_anchor_norm(root)
+        nodes = root.xpath("//annex[@obligation = 'normative'] | " \
+          "//references[@obligation = 'normative']")
+        ret = nodes.each_with_object({}) do |n, m|
+          n["anchor"] and m[n["anchor"]] = true
+        end
+        nodes.each do |n|
+          n.xpath(".//*[@anchor]").each { |n1| ret[n1["anchor"]] = true }
+        end
+        ret
+      end
+
       # ISO/IEC DIR 2, 15.5.3
       def see_erefs_validate(root)
         @lang == "en" or return
+        bibitemids = extract_bibitem_anchors(root)
         root.xpath("//eref").each do |t|
           prec = t.at("./preceding-sibling::text()[last()]")
           !prec.nil? && /\b(see|refer to)\p{Zs}*\Z/mi.match(prec) or next
-          unless target = root.at("//*[@id = '#{t['bibitemid']}']")
+          unless target = bibitemids[t["bibitemid"]]
+            #unless target = root.at("//bibitem[@anchor = '#{t['bibitemid']}']")
             @log.add("Bibliography", t,
                      "'#{t} is not pointing to a real reference")
             next
           end
-          target.at("./ancestor::references[@normative = 'true']") and
+          #target.at("./ancestor::references[@normative = 'true']") and
+          target[:norm] and
             @log.add("Style", t,
                      "'see #{t}' is pointing to a normative reference")
         end
       end
 
+      def extract_bibitem_anchors(root)
+        ret = root.xpath("//references[@normative = 'true']//bibitem")
+          .each_with_object({}) do |b, m|
+          m[b["anchor"]] = { bib: b, norm: true }
+        end
+        root.xpath("//references[not(@normative = 'true')]//bibitem")
+          .each do |b|
+          ret[b["anchor"]] = { bib: b, norm: false }
+        end
+        ret
+      end
+
       # ISO/IEC DIR 2, 10.4
       def locality_erefs_validate(root)
         root.xpath("//eref[descendant::locality]").each do |t|
@@ -80,8 +121,8 @@ module Metanorma
         termids = xmldoc
           .xpath("//sections/terms | //sections/clause[.//terms] | " \
                  "//annex[.//terms]").each_with_object({}) do |t, m|
-          t.xpath(".//*/@id").each { |a| m[a.text] = true }
-          t.name == "terms" and m[t["id"]] = true
+          t.xpath(".//*/@anchor").each { |a| m[a.text] = true }
+          t.name == "terms" and m[t["anchor"]] = true
         end
         xmldoc.xpath(".//xref").each do |x|
           term_xrefs_validate1(x, termids)
@@ -89,12 +130,12 @@ module Metanorma
       end
 
       def term_xrefs_validate1(xref, termids)
-        closest_id = xref.xpath("./ancestor::*[@id]")&.last or return
-        termids[xref["target"]] && !termids[closest_id["id"]] and
+        closest_id = xref.xpath("./ancestor::*[@anchor]")&.last or return
+        termids[xref["target"]] && !termids[closest_id["anchor"]] and
           @log.add("Style", xref,
                    "only terms clauses can cross-reference terms clause " \
                    "(#{xref['target']})")
-        !termids[xref["target"]] && termids[closest_id["id"]] and
+        !termids[xref["target"]] && termids[closest_id["anchor"]] and
           @log.add("Style", xref,
                    "non-terms clauses cannot cross-reference terms clause " \
                    "(#{xref['target']})")
@@ -114,8 +155,8 @@ module Metanorma
           .join(" | ")
         (xmldoc.xpath(xpath) - xmldoc.xpath(exc)).each do |x|
           x["unnumbered"] == "true" and next
-          @doc_xrefs[x["id"]] or
-            @log.add("Style", x, "#{name} #{x['id']} has not been " \
+          @doc_xrefs[x["anchor"]] or
+            @log.add("Style", x, "#{name} #{x['anchor']} has not been " \
                                  "cross-referenced within document",
                      severity: xpath == "//formula" ? 2 : 1)
         end
@@ -186,7 +227,7 @@ module Metanorma
         xmldoc.xpath("//bibitem[date/on = '–']").each do |b|
           b.at("./note[@type = 'Unpublished-Status']") or
             @log.add("Style", b,
-                     "Reference #{b&.at('./@id')&.text} does not have an " \
+                     "Reference does not have an " \
                      "associated footnote indicating unpublished status")
         end
       end

data/lib/metanorma/iso/validate_section.rb

@@ -216,12 +216,8 @@ module Metanorma
       # ISO/IEC DIR 2, 22.3.2
       def onlychild_clause_validate(root)
         root.xpath(Standoc::Utils::SUBCLAUSE_XPATH).each do |c|
-          next unless c.xpath("../clause").size == 1
-
-          title = c.at("./title")
-          location = c["id"] || "#{c.text[0..60]}..."
-          location += ":#{title.text}" if c["id"] && !title.nil?
-          @log.add("Style", nil, "#{location}: subclause is only child")
+          c.xpath("../clause").size == 1 or next
+          @log.add("Style", c, "subclause is only child")
         end
       end
 

data/lib/metanorma/iso/validate_style.rb

@@ -218,7 +218,7 @@ module Metanorma
       end
 
       ASSETS_TO_STYLE =
-        "//termsource | //formula | //termnote | " \
+        "//term//source | //formula | //termnote | " \
         "//p[not(ancestor::boilerplate)] | //li[not(p)] | //dt | " \
         "//dd[not(p)] | //td[not(p)] | //th[not(p)]".freeze
 

data/lib/metanorma/iso/validate_title.rb

@@ -82,7 +82,7 @@ module Metanorma
         withtitle = false
         xpath.each do |s|
           title_all_siblings(s.xpath("./clause | ./terms | ./references"),
-                             s&.at("./title")&.text || s["id"])
+                             s&.at("./title")&.text || s["anchor"])
           subtitle = s.at("./title")
           notitle = notitle || (!subtitle || subtitle.text.empty?)
           withtitle = withtitle || (subtitle && !subtitle.text.empty?)

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.0.6".freeze
+    VERSION = "3.0.7".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc