metanorma-iho 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d16b87b4a799b1e68df60702e316b4c58c34512d3a6c4e91c28f56c8c01b324a
-  data.tar.gz: c029dbfaae5fc3ee697f7a8bddee327c47eb2b843cd16b4961d9e654a9cf691c
+  metadata.gz: 10e7fda9671060c0bff15d92399bb2eb91951998baef2f6a96c09aa1b3e3618b
+  data.tar.gz: 9f8650fbf420bfdd70cf749afac75383d73f07671f8e0bb064682e2d8dcc61ec
 SHA512:
-  metadata.gz: ed12033c667766938f7d5045bb804ad8c1beed4528e8e920142b061fbb28b7fab33cefcd2da904f7e0e6442b089d0d5df3e082d29e094ec55ed23e25c97e17ef
-  data.tar.gz: f413dca0ddf19e59d6e9e0fedb20a94627e6803548ec56005c72d2d9d9d7bd7b4f328628202918a07cd9e4a9e997affac7fe5b135758e587f94f26bd248ed513
+  metadata.gz: 197d5801f77e89ff9f9fca0844d343dffb8466e8b99c23dbd028a3991351b1110b929ac624420909d7fc4c3cc12f3244dcc21ac0afdd4a287fc83ca98c7de37e
+  data.tar.gz: 925f2686aa860ce400f13a27da02b55a4b79e2719c2a0713a3b55dced7fee03d225fc387ad52fcf580749113c80084a94ed6f0a274797a3b2c865691bf50b9cd

data/lib/isodoc/iho/iho.specification.xsl

@@ -8631,8 +8631,11 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'strong']" mode="contents_item">
+		<xsl:param name="element"/>
 		<xsl:copy>
-			<xsl:apply-templates mode="contents_item"/>
+			<xsl:apply-templates mode="contents_item">
+				<xsl:with-param name="element" select="$element"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 	</xsl:template>
 
@@ -8699,7 +8702,10 @@
 
 	<!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output -->
 	<xsl:template match="*[local-name() = 'span']" mode="contents_item">
-		<xsl:apply-templates mode="contents_item"/>
+		<xsl:param name="element"/>
+		<xsl:apply-templates mode="contents_item">
+			<xsl:with-param name="element" select="$element"/>
+		</xsl:apply-templates>
 	</xsl:template>
 
 	<!-- =============== -->

data/lib/isodoc/iho/iho.standard.xsl

@@ -8631,8 +8631,11 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'strong']" mode="contents_item">
+		<xsl:param name="element"/>
 		<xsl:copy>
-			<xsl:apply-templates mode="contents_item"/>
+			<xsl:apply-templates mode="contents_item">
+				<xsl:with-param name="element" select="$element"/>
+			</xsl:apply-templates>
 		</xsl:copy>
 	</xsl:template>
 
@@ -8699,7 +8702,10 @@
 
 	<!-- Note: to enable the addition of character span markup with semantic styling for DIS Word output -->
 	<xsl:template match="*[local-name() = 'span']" mode="contents_item">
-		<xsl:apply-templates mode="contents_item"/>
+		<xsl:param name="element"/>
+		<xsl:apply-templates mode="contents_item">
+			<xsl:with-param name="element" select="$element"/>
+		</xsl:apply-templates>
 	</xsl:template>
 
 	<!-- =============== -->

data/lib/isodoc/iho/xref.rb

@@ -36,19 +36,21 @@ module IsoDoc
       end
 
       def clause_order_main(docxml)
-        if docxml.at(ns("//sections/clause//references"))
+        if docxml.at(ns("//bibliography//references[@normative = 'true']")) ||
+            docxml.at(ns("//sections/references[@normative = 'true']"))
           [
             { path: "//sections/clause[@type = 'scope']" },
+            { path: "#{@klass.norm_ref_xpath} | //sections/references" },
             { path: "//sections/terms | //sections/definitions | " \
-              "//sections/references | " \
               "//sections/clause[not(@type = 'scope')]", multi: true },
           ]
         else
           [
-            { path: "//sections/clause[@type = 'scope']" },
-            { path: @klass.norm_ref_xpath },
             { path: "//sections/terms | //sections/definitions | " \
-              "//sections/clause[not(@type = 'scope')]", multi: true },
+              "//sections/references | " \
+              "//bibliography/references[@normative = 'true'] | " \
+              "//bibliography/clause[.//references[@normative = 'true']] | " \
+              "//sections/clause", multi: true },
           ]
         end
       end

data/lib/metanorma/iho/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.2 -->
+<!-- VERSION v1.3.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">
@@ -331,9 +331,9 @@
       <zeroOrMore>
         <ref name="table-note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="FigureAttr">
       <optional>
@@ -380,9 +380,9 @@
       <zeroOrMore>
         <ref name="note"/>
       </zeroOrMore>
-      <optional>
+      <zeroOrMore>
         <ref name="source"/>
-      </optional>
+      </zeroOrMore>
     </define>
     <define name="source">
       <element name="source">

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IHO
-    VERSION = "0.9.11".freeze
+    VERSION = "0.9.12".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-08 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic