metanorma-iso 3.1.4 → 3.1.6

data/lib/isodoc/iso/presentation_xref.rb

@@ -56,7 +56,7 @@ module IsoDoc
           target&.gsub(/<[^<>]+>/, "")&.match(/^IEV$|^IEC 60050-/)
       end
 
-      # ISO has not bothered to communicate to us what most of these 
+      # ISO has not bothered to communicate to us what most of these
       # span classes mean
       LOCALITY2SPAN = {
         annex: "citeapp",
@@ -147,6 +147,77 @@ module IsoDoc
         locality_span_wrap(super, @xrefs.anchor(node["target"], :subtype) ||
                            @xrefs.anchor(node["target"], :type))
       end
+
+      def origin(docxml)
+        super
+        bracketed_refs_processing(docxml)
+      end
+
+      # style [1] references as [Reference 1], eref or origin
+      def bracketed_refs_processing(docxml)
+        (docxml.xpath(ns("//semx[@element = 'eref']")) -
+        docxml.xpath(ns("//semx[@element = 'erefstack']//semx[@element = 'eref']")))
+          .each { |n| bracket_eref_style(n) }
+        docxml.xpath(ns("//semx[@element = 'erefstack']")).each do |n|
+          bracket_erefstack_style(n)
+        end
+        docxml.xpath(ns("//semx[@element = 'origin']")).each do |n|
+          bracket_origin_style(n)
+        end
+      end
+
+      def bracket_eref_style(elem)
+        semx = bracket_eref_original(elem) or return
+        if semx["style"] == "superscript"
+          elem.children.wrap("<sup></sup>")
+          remove_preceding_space(elem)
+        else
+          r = @i18n.reference
+          elem.add_first_child l10n("#{r} ")
+        end
+      end
+
+      # is the eref corresponding to this semx a simple [n] reference?
+      def bracket_eref_original(elem)
+        semx = elem.document.at("//*[@id = '#{elem['source']}']") or return
+        non_locality_elems(semx).empty? or return
+        /^\[\d+\]$/.match?(semx["citeas"]) or return
+        semx
+      end
+
+      def bracket_erefstack_style(elem)
+        semx, erefstack_orig = bracket_erefstack_style_prep(elem)
+        semx.empty? and return
+        if erefstack_orig && erefstack_orig["style"]
+          elem.children.each do |e|
+            e.name == "span" and e.remove
+            e.text.strip.empty? and e.remove
+          end
+          elem.children.wrap("<sup></sup>")
+          remove_preceding_space(elem)
+        else
+          r = @i18n.inflect(@i18n.reference, number: "pl")
+          elem.add_first_child l10n("#{r} ")
+        end
+      end
+
+      def bracket_erefstack_style_prep(elem)
+        semx = elem.xpath(ns(".//semx[@element = 'eref']"))
+          .map { |e| bracket_eref_original(e) }.compact
+        erefstack_orig = elem.document.at("//*[@id = '#{elem['source']}']")
+        [semx, erefstack_orig]
+      end
+
+      def bracket_origin_style(elem)
+        bracket_eref_style(elem)
+      end
+
+      def remove_preceding_space(elem)
+        # Find the preceding text node that has actual content
+        prec = elem.at("./preceding-sibling::text()" \
+          "[normalize-space(.) != ''][1]") or return
+        prec.content.end_with?(" ") and prec.content = prec.content.rstrip
+      end
     end
   end
 end

data/lib/isodoc/iso/word_convert.rb

@@ -169,7 +169,7 @@ module IsoDoc
 
       def termref_parse(node, out)
         out.p **termref_attrs do |p|
-          node.children.each { |n| parse(n, p) }
+          children_parse(node, p)
         end
       end
 
@@ -181,7 +181,7 @@ module IsoDoc
       def figure_name_parse(node, div, name)
         name.nil? and return
         div.p **figure_name_attrs(node) do |p|
-          name.children.each { |n| parse(n, p) }
+          children_parse(name, p)
         end
       end
 
@@ -193,7 +193,7 @@ module IsoDoc
       def table_title_parse(node, out)
         name = node.at(ns("./fmt-name")) or return
         out.p **table_title_attrs(node) do |p|
-          name&.children&.each { |n| parse(n, p) }
+          children_parse(name, p)
         end
       end
 

data/lib/isodoc/iso/xref.rb

@@ -158,7 +158,6 @@ module IsoDoc
             s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
           c = Counter.new
           notes.noblank.each do |n|
-            # n["id"] ||= "_#{UUIDTools::UUID.random_create}"
             @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
                                               @labels["list"], "list",
                                               { unnumb: false, container: true })
@@ -203,7 +202,6 @@ module IsoDoc
       end
 
       def xref_to_modspec(id, table_label)
-        # (@anchors[id] && !@anchors[id][:has_modspec]) or return
         (@anchors[id] && !@anchors[id][:has_table_prefix]) or return
         @anchors[id][:has_table_prefix] = true
         x = @anchors_previous[id][:xref_bare] || @anchors_previous[id][:xref]

data/lib/isodoc/iso/xref_section.rb

@@ -23,7 +23,6 @@ module IsoDoc
             { label:, xref:, elem: @labels["section"],
               title: clause_title(clause), level: level, type: "clause" }
         elsif level > 1
-          #num = semx(clause, num)
           @anchors[clause["id"]] =
             { label: num, level: level, xref: num, subtype: "clause" }
         else super end

data/lib/metanorma/iso/front.rb

@@ -71,56 +71,18 @@ module Metanorma
         @log.add("Document Attributes", nil, err)
       end
 
-      def title_component(node, xml, lang, attr, comp)
+      def title_component(node, xml, lang, comp)
         t = node.attr("title-#{comp[:name]}-#{lang}") or return
-        xml.title(**attr_code(attr.merge(type: "title-#{comp[:abbr]}"))) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(t)
-        end
+        add_title_xml(xml, t, lang, "title-#{comp[:abbr]}")
       end
 
-      def title_intro(node, xml, lang, at)
-        t = node.attr("title-intro-#{lang}") or return
-        xml.title(**attr_code(at.merge(type: "title-intro"))) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(t)
-        end
-      end
-
-      def title_main(node, xml, lang, at)
-        xml.title **attr_code(at.merge(type: "title-main")) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(node.attr("title-main-#{lang}"))
-        end
-      end
-
-      def title_part(node, xml, lang, at)
-        t = node.attr("title-part-#{lang}") or return
-        xml.title(**attr_code(at.merge(type: "title-part"))) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(t)
-        end
-      end
-
-      def title_amd(node, xml, lang, at)
-        t = node.attr("title-amendment-#{lang}") or return
-        xml.title(**attr_code(at.merge(type: "title-amd"))) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(t)
-        end
-      end
-
-      def title_add(node, xml, lang, at)
-        t = node.attr("title-addendum-#{lang}") or return
-        xml.title(**attr_code(at.merge(type: "title-add"))) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(t)
-        end
-      end
-
-      def title_full(node, xml, lang, at)
+      def title_full(node, xml, lang)
         title, intro, part, amd, add = title_full_prep(node, lang)
         title = "#{intro} -- #{title}" if intro
         title = "#{title} -- #{part}" if part
         title = "#{title} -- #{amd}" if amd
         title = "#{title} -- #{add}" if add
-        xml.title **attr_code(at.merge(type: "main")) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(title)
-        end
+        add_title_xml(xml, title, lang, "main")
       end
 
       def title_full_prep(node, lang)
@@ -136,20 +98,19 @@ module Metanorma
 
       def title(node, xml)
         %w(en ru fr).each do |lang|
-          at = { language: lang, format: "text/plain" }
-          title1(node, xml, lang, at)
+          title1(node, xml, lang)
         end
       end
 
-      def title1(node, xml, lang, at)
-        title_full(node, xml, lang, at)
+      def title1(node, xml, lang)
+        title_full(node, xml, lang)
         %w(intro main part complementary).each do |w|
-          title_component(node, xml, lang, at, { name: w, abbr: w })
+          title_component(node, xml, lang, { name: w, abbr: w })
         end
-        @amd and title_component(node, xml, lang, at,
+        @amd and title_component(node, xml, lang,
                                  { name: "amendment", abbr: "amd" })
         node.attr("addendum-number") and
-          title_component(node, xml, lang, at,
+          title_component(node, xml, lang,
                           { name: "addendum", abbr: "add" })
       end
 

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.1.2 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -455,14 +455,7 @@ normative or informative references, some split references into sections organiz
           </ref>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="doc_bibitem">
-            <a:documentation>Bibliographic item cited in the document</a:documentation>
-          </ref>
-          <zeroOrMore>
-            <ref name="note">
-              <a:documentation>Annotation of the bibliographic item</a:documentation>
-            </ref>
-          </zeroOrMore>
+          <ref name="ReferenceEntry"/>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references">
@@ -604,18 +597,21 @@ gives an explicit page orientation</a:documentation>
         </element>
       </optional>
     </define>
-  </include>
-  <!-- end overrides -->
-  <define name="FnAttributes" combine="interleave">
-    <ref name="RequiredId"/>
-    <optional>
-      <attribute name="hiddenref">
-        <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+    <define name="FnAttributes">
+      <ref name="RequiredId"/>
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
 This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
-        <data type="boolean"/>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="reference">
+        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
-    </optional>
-  </define>
+    </define>
+  </include>
+  <!-- end overrides -->
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -853,6 +849,17 @@ titlecase, or lowercase</a:documentation>
       <value>informative</value>
     </choice>
   </define>
+  <define name="ReferenceEntry">
+    <a:documentation>Entry in bibliography</a:documentation>
+    <ref name="doc_bibitem">
+      <a:documentation>Bibliographic item cited in the document</a:documentation>
+    </ref>
+    <zeroOrMore>
+      <ref name="note">
+        <a:documentation>Annotation of the bibliographic item</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="doc_bibitem">
     <a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
     <element name="bibitem">

data/lib/metanorma/iso/validate_style.rb

@@ -119,11 +119,6 @@ module Metanorma
                     "language-specific abbreviation", node, text)
       end
 
-      # leaving out as problematic: N J K C S T H h d B o E
-      SI_UNIT = "(m|cm|mm|km|μm|nm|g|kg|mgmol|cd|rad|sr|Hz|Hz|MHz|Pa|hPa|kJ|" \
-                "V|kV|W|MW|kW|F|μF|Ω|Wb|°C|lm|lx|Bq|Gy|Sv|kat|l|t|eV|u|Np|Bd|" \
-                "bit|kB|MB|Hart|nat|Sh|var)".freeze
-
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-p-and
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-p-andor
       def style_punct(node, text)

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.1.4".freeze
+    VERSION = "3.1.6".freeze
   end
 end

metadata

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