metanorma-ieee 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e141e8fa5f21cbec9c932fae41061730d61b1b29c08d45d5ac018522dc70803
-  data.tar.gz: 3cae4c285bae6a5208cdd6c81a45b392dc1ad40112315e87d7166b09c58f5ee6
+  metadata.gz: 981de660026400309643f712f0472336c1d318c07bff099eb3f79919359d41ae
+  data.tar.gz: bb78f47367fec5a7862ef9a3a56cbf21d5e18110c4115e470552e3066d1e0be0
 SHA512:
-  metadata.gz: e0fc62dd8dfafed36619f9c8ba7a7112a0fab974ceab07f224a1fd128a84ccecdd6e2bd0f6fba33e7fdc3401acdb2a2ca45ea7c3fa9c31b5f79863cf64f7ca8d
-  data.tar.gz: c720bfdbe17b2d729d69acd64cf08f7d941018dc07597ae253a91aea3b42ad63095c3adf33fa2f879fb3e846dcc4dc4fec877a11777c312bdebc392a7cda96a1
+  metadata.gz: ec4df0967a7721bca9e26755e5a9d43719a14f02e48abb2fd0a4065bfca35f1d1cba1382048b76c5ceca03d805651edfeab250de49b33b57b4fd691bf0669020
+  data.tar.gz: f534d6ec8797629482c4bde760a08eb7c58505c3408d64ce20b924f31208fd6a24ec8294812344ff5fc0f7511aabd840e0ad7a4853900d8543b692b74daec572

data/lib/isodoc/ieee/ieee.amendment.xsl

@@ -2272,22 +2272,6 @@
 	<!-- title      -->
 	<!-- ====== -->
 
-	<!-- <xsl:template match="mn:annex/mn:title">
-		<fo:block font-size="16pt" text-align="center" margin-bottom="48pt" keep-with-next="always">
-			<xsl:apply-templates />
-		</fo:block>
-	</xsl:template> -->
-
-	<!-- Bibliography -->
-	<xsl:template match="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:fmt-title[@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3"> -->
 	<xsl:template match="mn:fmt-title[../@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3">
 		<fo:block>
@@ -2358,7 +2342,7 @@
 		</xsl:variable>
 
 		<xsl:choose>
-			<xsl:when test="string-length($section) != 0 and $element-name = 'fo:block' and ($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report')">
+			<xsl:when test="string-length($section) != 0 and $element-name = 'fo:block' and ($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and    not(parent::mn:references[not(@normative='true')])">
 				<fo:list-block>
 					<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*"/>
 
@@ -13937,16 +13921,17 @@
 	<!-- 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="margin-top">6pt</xsl:attribute>
+		<xsl:attribute name="space-before">0pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">36pt</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<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") -->
@@ -16027,6 +16012,9 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
@@ -16162,9 +16150,6 @@
 					<xsl:if test="ancestor::mn:acknowledgements">
 						<xsl:attribute name="font-size">11pt</xsl:attribute>
 					</xsl:if>
-					<xsl:if test="ancestor::mn:annex">
-						<xsl:attribute name="font-weight">normal</xsl:attribute>
-					</xsl:if>
 					<xsl:if test="not(following-sibling::*[1][self::mn:clause])">
 						<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 					</xsl:if>
@@ -16172,6 +16157,12 @@
 						<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 					</xsl:if>
 				</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="$level &gt;= 2">
 					<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 				</xsl:if>
@@ -16190,6 +16181,13 @@
 		<xsl:attribute name="space-before"><xsl:value-of select="$space_before"/></xsl:attribute>
 		<xsl:if test="ancestor::mn:introduction"><xsl:attribute name="margin-top"><xsl:value-of select="$space_before"/></xsl:attribute></xsl:if>
 
+		<xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
+			<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>
+
 		<xsl:if test="@type = 'floating-title' or @type = 'section-title'">
 			<xsl:copy-of select="@id"/>
 		</xsl:if>

data/lib/isodoc/ieee/ieee.standard.xsl

@@ -2272,22 +2272,6 @@
 	<!-- title      -->
 	<!-- ====== -->
 
-	<!-- <xsl:template match="mn:annex/mn:title">
-		<fo:block font-size="16pt" text-align="center" margin-bottom="48pt" keep-with-next="always">
-			<xsl:apply-templates />
-		</fo:block>
-	</xsl:template> -->
-
-	<!-- Bibliography -->
-	<xsl:template match="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:fmt-title[@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3"> -->
 	<xsl:template match="mn:fmt-title[../@inline-header = 'true'][following-sibling::*[1][self::mn:p] or following-sibling::*[1][self::mn:clause] or not(following-sibling::*)]" priority="3">
 		<fo:block>
@@ -2358,7 +2342,7 @@
 		</xsl:variable>
 
 		<xsl:choose>
-			<xsl:when test="string-length($section) != 0 and $element-name = 'fo:block' and ($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report')">
+			<xsl:when test="string-length($section) != 0 and $element-name = 'fo:block' and ($current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report') and    not(parent::mn:references[not(@normative='true')])">
 				<fo:list-block>
 					<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*"/>
 
@@ -13937,16 +13921,17 @@
 	<!-- 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="margin-top">6pt</xsl:attribute>
+		<xsl:attribute name="space-before">0pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">36pt</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<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") -->
@@ -16027,6 +16012,9 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
 	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
@@ -16162,9 +16150,6 @@
 					<xsl:if test="ancestor::mn:acknowledgements">
 						<xsl:attribute name="font-size">11pt</xsl:attribute>
 					</xsl:if>
-					<xsl:if test="ancestor::mn:annex">
-						<xsl:attribute name="font-weight">normal</xsl:attribute>
-					</xsl:if>
 					<xsl:if test="not(following-sibling::*[1][self::mn:clause])">
 						<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 					</xsl:if>
@@ -16172,6 +16157,12 @@
 						<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 					</xsl:if>
 				</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="$level &gt;= 2">
 					<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 				</xsl:if>
@@ -16190,6 +16181,13 @@
 		<xsl:attribute name="space-before"><xsl:value-of select="$space_before"/></xsl:attribute>
 		<xsl:if test="ancestor::mn:introduction"><xsl:attribute name="margin-top"><xsl:value-of select="$space_before"/></xsl:attribute></xsl:if>
 
+		<xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
+			<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>
+
 		<xsl:if test="@type = 'floating-title' or @type = 'section-title'">
 			<xsl:copy-of select="@id"/>
 		</xsl:if>

data/lib/metanorma/ieee/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/ieee/front.rb

@@ -52,22 +52,32 @@ module Metanorma
       end
 
       def metadata_other_id(node, xml)
-        a = node.attr("isbn-pdf") and
-          xml.docidentifier a, type: "ISBN", scope: "PDF"
-        a = node.attr("isbn-print") and
-          xml.docidentifier a, type: "ISBN", scope: "print"
-        xml.docnumber node.attr("docnumber")
+        # a = node.attr("isbn-pdf") and
+        add_noko_elem(xml, "docidentifier", node.attr("isbn-pdf"),
+                      type: "ISBN", scope: "PDF")
+        # xml.docidentifier a, type: "ISBN", scope: "PDF"
+        # a = node.attr("isbn-print") and
+        #  xml.docidentifier a, type: "ISBN", scope: "print"
+        add_noko_elem(xml, "docidentifier", node.attr("isbn-print"),
+                      type: "ISBN", scope: "print")
+        add_noko_elem(xml, "docnumber", node.attr("docnumber"))
+        # xml.docnumber node.attr("docnumber")
       end
 
       def metadata_id(node, xml)
         if id = node.attr("docidentifier")
-          xml.docidentifier id, **attr_code(type: "IEEE", primary: "true")
+          # xml.docidentifier id, **attr_code(type: "IEEE", primary: "true")
+          add_noko_elem(xml, "docidentifier", id, type: "IEEE", primary: "true")
         else ieee_id(node, xml)
         end
-        id = node.attr("stdid-pdf") and
-          xml.docidentifier id, type: "IEEE", scope: "PDF"
-        id = node.attr("stdid-print") and
-          xml.docidentifier id, type: "IEEE", scope: "print"
+        # id = node.attr("stdid-pdf") and
+        # xml.docidentifier id, type: "IEEE", scope: "PDF"
+        add_noko_elem(xml, "docidentifier", node.attr("stdid-pdf"),
+                      type: "IEEE", scope: "PDF")
+        # id = node.attr("stdid-print") and
+        # xml.docidentifier id, type: "IEEE", scope: "print"
+        add_noko_elem(xml, "docidentifier", node.attr("stdid-print"),
+                      type: "IEEE", scope: "print")
       end
 
       def ieee_id(node, xml)
@@ -128,8 +138,11 @@ module Metanorma
       end
 
       def ieee_id_out(xml, params)
-        id = pubid_select(params).create(**params)
-        xml.docidentifier id.to_s, type: "IEEE", primary: "true"
+        # id = pubid_select(params).create(**params)
+        # xml.docidentifier id.to_s, type: "IEEE", primary: "true"
+        add_noko_elem(xml, "docidentifier",
+                      pubid_select(params).create(**params).to_s,
+                      type: "IEEE", primary: "true")
       end
 
       def pubid_select(_params)
@@ -148,7 +161,8 @@ module Metanorma
         status = node.attr("status") || node.attr("docstage") ||
           (node.attr("version") || node.attr("draft") ? "draft" : "approved")
         xml.status do |s|
-          s.stage status
+          add_noko_elem(s, "stage", status)
+          # s.stage status
         end
       end
 
@@ -157,7 +171,8 @@ module Metanorma
       end
 
       def metadata_subdoctype(node, xml)
-        xml.subdoctype (node.attr("docsubtype") || "document")
+        # xml.subdoctype (node.attr("docsubtype") || "document")
+        add_noko_elem(xml, "subdoctype", node.attr("docsubtype") || "document")
       end
 
       def org_abbrev
@@ -172,25 +187,32 @@ module Metanorma
 
       def metadata_ext(node, xml)
         super
-        s = node.attr("trial-use") and xml.trial_use s
+        add_noko_elem(xml, "trial_use", node.attr("trial-use"))
         program(node, xml)
       end
 
       def program(node, xml)
-        p = node.attr("program") and xml.program p
+        add_noko_elem(xml, "program", node.attr("program"))
       end
 
       def structured_id(node, xml)
         node.attr("docnumber") or return
         xml.structuredidentifier do |i|
-          i.docnumber node.attr("docnumber")
-          i.agency "IEEE"
+          add_noko_elem(i, "docnumber", node.attr("docnumber"))
+          # i.docnumber node.attr("docnumber")
+          add_noko_elem(i, "agency", "IEEE")
+          # i.agency "IEEE"
           i.class_ doctype(node)
-          a = node.attr("edition") and i.edition a
-          a = metadata_version_value(node) and i.version a
-          a = node.attr("amendment-number") and i.amendment a
-          a = node.attr("corrigendum-number") and i.corrigendum a
-          a = node.attr("copyright-year") and i.year a
+          add_noko_elem(i, "edition", node.attr("edition"))
+          # a = node.attr("edition") and i.edition a
+          add_noko_elem(i, "version", metadata_version_value(node))
+          # a = metadata_version_value(node) and i.version a
+          add_noko_elem(i, "amendment", node.attr("amendment-number"))
+          # a = node.attr("amendment-number") and i.amendment a
+          add_noko_elem(i, "corrigendum", node.attr("corrigendum-number"))
+          # a = node.attr("corrigendum-number") and i.corrigendum a
+          add_noko_elem(i, "year", node.attr("copyright-year"))
+          # a = node.attr("copyright-year") and i.year a
         end
       end
 

data/lib/metanorma/ieee/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/ieee/validate_section.rb

@@ -50,10 +50,10 @@ module Metanorma
       ].freeze
 
       SECTIONS_XPATH =
-        "//preface/abstract | //sections/terms | .//annex | "\
+        "//preface/abstract | //sections/terms | //annex | "\
         "//sections/definitions | //sections/clause | "\
-        "//references[not(parent::clause)] | "\
-        "//clause[descendant::references][not(parent::clause)]".freeze
+        "//references[not(parent::clause)][not(ancestor::boilerplate)] | "\
+        "//clause[descendant::references][not(parent::clause)][not(ancestor::boilerplate)]".freeze
 
       def sections_sequence_validate(root)
         names, n = sections_sequence_validate_start(root)

data/lib/metanorma/ieee/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ieee
-    VERSION = "1.6.0".freeze
+    VERSION = "1.6.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ieee
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 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-standoc