metanorma-iho 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30da89e6d9b659db533ad837527513e9904905288a505c16bc049431f7e385f5
-  data.tar.gz: 4b5292a9cfd07d358be2fe89454cb348255db4b9ceefd641284cf484c8aadac5
+  metadata.gz: 047b8afa4d2bda12e9646e698b9e6438b92d41a58d0642fdb266373f33155beb
+  data.tar.gz: 4954543c60c106353afb7395d878cfc0d4c62c8e7061b0d1fab9fc92a32b72b7
 SHA512:
-  metadata.gz: 7f4565efcbf7454fa2ebb9d6e59d6b2a73da106dcd8c3157dac367d0a3ac18f28568a874ab571c6c2eb9494bfe1ba38466d9a904b237709770488e92eaeeb368
-  data.tar.gz: d618eb6dfc45a401e92f542e030a2bb66aaf920c1b780b421047fd602addc3e6e1678ea6d1e1c530f3f460f57cc4ff3b94570a1a49e2bac9bf4765533a616be1
+  metadata.gz: 0b4d225989bd269accff32f96177a9e7912313e51bf5b6d54a523ecfbbd6c0082102d9bbf7b90f8d28e1047c17d757ca584a2b1d5ca0445f32f623226236e695
+  data.tar.gz: 20e85c84ff5e1f6ecc6bcc4d4da523384516e76d6aaba46620fff1e31cfa8b29e894810e643abb9ec9ddfd6b59bccd14aa1276907393666b5fe4816689136d32

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

@@ -921,25 +921,6 @@
 	<!-- title      -->
 	<!-- ====== -->
 
-	<xsl:template match="mn:annex/mn:fmt-title" name="annex_title">
-		<fo:block xsl:use-attribute-sets="annex-title-style">
-
-			<xsl:call-template name="refine_annex-title-style"/>
-
-			<xsl:apply-templates/>
-			<xsl:apply-templates select="following-sibling::*[1][mn:variant-title][@type = 'sub']" mode="subtitle"/>
-		</fo:block>
-	</xsl:template>
-
-	<xsl:template match="mn:bibliography/mn:references[not(@normative='true')]/mn:fmt-title">
-		<fo:block xsl:use-attribute-sets="references-non-normative-title-style">
-
-			<xsl:call-template name="refine_references-non-normative-title-style"/>
-
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-
 	<xsl:template match="mn:clause" priority="3">
 		<xsl:if test="parent::mn:preface or (parent::mn:page_sequence and local-name(../..) = 'preface')">
 			<fo:block break-after="page"/>
@@ -11316,7 +11297,7 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 		<xsl:attribute name="font-size">16pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
@@ -11326,7 +11307,7 @@
 		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
+	<xsl:template name="refine_bibliography-title-style">
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -13439,11 +13420,12 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-size">12pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="space-before">0</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
@@ -13559,6 +13541,20 @@
 		<xsl:if test="../@id = '_document_history' or . = 'Document History'">
 			<xsl:attribute name="text-align">center</xsl:attribute>
 		</xsl:if>
+
+		<xsl:if test="parent::mn:annex"><!-- Annex title -->
+			<xsl:variable name="annex_title_styles">
+				<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
+		</xsl:if>
+
+		<xsl:if test="parent::mn:references[not(@normative='true')] and ancestor::mn:bibliography">
+			<xsl:variable name="bibliography_title_styles">
+				<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
+		</xsl:if>
 		<!-- $namespace = 'iho' -->
 		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 	</xsl:template> <!-- refine_title-style -->

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

@@ -921,25 +921,6 @@
 	<!-- title      -->
 	<!-- ====== -->
 
-	<xsl:template match="mn:annex/mn:fmt-title" name="annex_title">
-		<fo:block xsl:use-attribute-sets="annex-title-style">
-
-			<xsl:call-template name="refine_annex-title-style"/>
-
-			<xsl:apply-templates/>
-			<xsl:apply-templates select="following-sibling::*[1][mn:variant-title][@type = 'sub']" mode="subtitle"/>
-		</fo:block>
-	</xsl:template>
-
-	<xsl:template match="mn:bibliography/mn:references[not(@normative='true')]/mn:fmt-title">
-		<fo:block xsl:use-attribute-sets="references-non-normative-title-style">
-
-			<xsl:call-template name="refine_references-non-normative-title-style"/>
-
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-
 	<xsl:template match="mn:clause" priority="3">
 		<xsl:if test="parent::mn:preface or (parent::mn:page_sequence and local-name(../..) = 'preface')">
 			<fo:block break-after="page"/>
@@ -11316,7 +11297,7 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
-	<xsl:attribute-set name="references-non-normative-title-style">
+	<xsl:attribute-set name="bibliography-title-style">
 		<xsl:attribute name="font-size">16pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
@@ -11326,7 +11307,7 @@
 		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set>
 
-	<xsl:template name="refine_references-non-normative-title-style">
+	<xsl:template name="refine_bibliography-title-style">
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -13439,11 +13420,12 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-size">12pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="space-before">0</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
@@ -13559,6 +13541,20 @@
 		<xsl:if test="../@id = '_document_history' or . = 'Document History'">
 			<xsl:attribute name="text-align">center</xsl:attribute>
 		</xsl:if>
+
+		<xsl:if test="parent::mn:annex"><!-- Annex title -->
+			<xsl:variable name="annex_title_styles">
+				<styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
+		</xsl:if>
+
+		<xsl:if test="parent::mn:references[not(@normative='true')] and ancestor::mn:bibliography">
+			<xsl:variable name="bibliography_title_styles">
+				<styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
+			</xsl:variable>
+			<xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
+		</xsl:if>
 		<!-- $namespace = 'iho' -->
 		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 	</xsl:template> <!-- refine_title-style -->

data/lib/metanorma/iho/biblio.rng

@@ -690,7 +690,7 @@ Examples include GRID, LEI, CrossRef, and Ringgold</a:documentation>
   <define name="CitationType">
     <attribute name="bibitemid">
       <a:documentation>Bibliographic item that the citation applies to, referenced as the anchor of a bibliographic description</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <choice>
       <zeroOrMore>
@@ -1296,17 +1296,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601Date"/>
+      <ref name="ISO8601DateTime"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/iho/front.rb

@@ -12,8 +12,8 @@ module Metanorma
       def metadata_series(node, xml)
         series = node.attr("series") or return
         xml.series type: "main" do |s|
-          s.title SERIESNAME[series.to_sym] || "N/A"
-          s.abbreviation series
+          add_noko_elem(s, "title", SERIESNAME[series.to_sym] || "N/A")
+          add_noko_elem(s, "abbreviation", series)
         end
       end
 
@@ -27,10 +27,9 @@ module Metanorma
 
       def metadata_commentperiod(node, xml)
         from = node.attr("comment-from") or return
-        to = node.attr("comment-to")
         xml.commentperiod do |c|
-          c.from from
-          c.to to if to
+          add_noko_elem(c, "from", from)
+          add_noko_elem(c, "to", node.attr("comment-to"))
         end
       end
 

data/lib/metanorma/iho/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.1.3 -->
+<!-- VERSION v2.1.4 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -905,15 +905,32 @@ titlecase, or lowercase</a:documentation>
     </element>
   </define>
   <define name="image" combine="choice">
-    <element name="svg">
-      <a:documentation>Add svg mark up to image</a:documentation>
-      <oneOrMore>
-        <choice>
-          <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
-    </element>
+    <choice>
+      <element name="image">
+        <ref name="RequiredId"/>
+        <ref name="ImageAttributes"/>
+        <optional>
+          <element name="svg">
+            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
+            <oneOrMore>
+              <choice>
+                <text/>
+                <ref name="AnyElement"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+      <element name="svg">
+        <a:documentation>Add svg mark up to image</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </choice>
   </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iho
-    VERSION = "1.2.8".freeze
+    VERSION = "1.2.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2025-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic