metanorma-iso 2.8.8 → 2.9.0

data/lib/isodoc/iso/presentation_terms.rb

@@ -52,19 +52,6 @@ module IsoDoc
                      node.children)
       end
 
-      def termdefinition1(elem)
-        prefix_domain_to_definition(elem)
-        super
-      end
-
-      def prefix_domain_to_definition(elem)
-        ((d = elem.at(ns("./domain"))) &&
-          (v = elem.at(ns("./definition/verbal-definition"))) &&
-          v.elements.first.name == "p") or return
-        v.elements.first.children.first.previous =
-          "<#{to_xml(d.remove.children)}> "
-      end
-
       def insertall_after_here(node, insert, name)
         node.children.each do |n|
           n.name == name or next

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -31,6 +31,7 @@ module IsoDoc
         admonition docxml
         source docxml
         ol docxml
+        quote docxml
         permission docxml
         requirement docxml
         recommendation docxml
@@ -38,6 +39,8 @@ module IsoDoc
         @xrefs.anchors_previous = @xrefs.anchors.dup # store old xrefs of reqts
         @xrefs.parse docxml
         table docxml # have table include requirements newly converted to tables
+        # table feeds dl
+        dl docxml
         example docxml
         note docxml
       end
@@ -52,6 +55,8 @@ module IsoDoc
       end
 
       def figure1(node)
+        figure_fn(node)
+        figure_key(node.at(ns("./dl")))
         lbl = @xrefs.anchor(node["id"], :label, false) or return
         figname = node.parent.name == "figure" ? "" : "#{@i18n.figure} "
         conn = node.parent.name == "figure" ? "  " : " — "
@@ -97,7 +102,6 @@ module IsoDoc
 
       def admonition1(elem)
         super
-        admonition_inline_name(elem)
         admonition_outside_clauses(elem)
       end
 
@@ -113,17 +117,6 @@ module IsoDoc
         cell.children.each { |p| wrap_in_bold(p) }
       end
 
-      def admonition_inline_name(elem)
-        n = elem.at(ns("./name")) or return
-        if (p = n.next_element) && p&.name == "p"
-          p.children.first.previous = admonition_name(to_xml(n.remove.children))
-        end
-      end
-
-      def admonition_name(xml)
-        "#{xml} — "
-      end
-
       def bibrender_formattedref(formattedref, xml)
         %w(techreport standard).include? xml["type"] and return
         super
@@ -146,10 +139,9 @@ module IsoDoc
 
       def formula_where(dlist)
         dlist.nil? and return
-        return super unless dlist.xpath(ns("./dt")).size == 1 &&
+        dlist.xpath(ns("./dt")).size == 1 &&
           dlist.at(ns("./dd"))&.elements&.size == 1 &&
-          dlist.at(ns("./dd/p"))
-
+          dlist.at(ns("./dd/p")) or return super
         formula_where_one(dlist)
       end
 
@@ -162,7 +154,7 @@ module IsoDoc
 
       def table1(elem)
         elem.xpath(ns(".//dl[@key = 'true'][not(./name)]")).each do |dl|
-          dl.children.first.previous = "<name>#{@i18n.key}</name>"
+          dl.add_first_child "<name>#{@i18n.key}</name>"
         end
         super
       end
@@ -177,7 +169,7 @@ module IsoDoc
           return
         s = docxml.at(ns("//sections")) or return
         ret = "#{middle_title_main}#{middle_title_amd}"
-        s.children.first.previous = ret
+        s.add_first_child ret
       end
 
       def middle_title_main
@@ -214,9 +206,7 @@ module IsoDoc
       end
 
       def move_norm_ref_to_sections(docxml)
-        if amd?(docxml)
-        else super
-        end
+        amd?(docxml) or super
       end
 
       def twitter_cldr_localiser_symbols
@@ -224,6 +214,25 @@ module IsoDoc
           fraction_group_digits: 3 }
       end
 
+      def implicit_reference(bib)
+        bib.at(ns("./docidentifier"))&.text == "IEV" and return true
+        super
+      end
+
+      def render_identifier(ident)
+        ret = super
+        ret[:sdo] = std_docid_semantic(ret[:sdo])
+        ret
+      end
+
+      def admonition_delim(elem)
+        if elem.at("./*[not(self::xmlns:name)]")&.name == "p"
+          " &#x2014; "
+        else
+          ""
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/presentation_xref.rb

@@ -130,6 +130,8 @@ module IsoDoc
       end
 
       def expand_citeas(text)
+        ret = super or return
+        ret.include?("<span") and return ret
         std_docid_semantic(super)
       end
 

data/lib/isodoc/iso/sections.rb

@@ -12,7 +12,7 @@ module IsoDoc
         @foreword = true
         page_break(out)
         out.div **attr_code(id: clause["id"]) do |s|
-          clause_name(nil, clause.at(ns("./title")) || @i18n.foreword, s,
+          clause_name(nil, clause.at(ns("./title")), s,
                       { class: "ForewordTitle" })
           clause.elements.each { |e| parse(e, s) unless e.name == "title" }
         end

data/lib/isodoc/iso/word_cleanup.rb

@@ -110,26 +110,44 @@ module IsoDoc
       end
 
       def authority_cleanup(docxml)
-        insert = docxml.at("//div[@id = 'boilerplate-license-destination']")
-        auth = docxml.at("//div[@class = 'boilerplate-license']")&.remove
-        auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzWarning" }
-        auth and insert and insert.children = auth
-        insert = docxml.at("//div[@id = 'boilerplate-copyright-destination']")
-        auth = docxml.at("//div[@class = 'boilerplate-copyright']")&.remove
-        auth&.xpath(".//p[not(@class)]")&.each do |p|
-          p["class"] = "zzCopyright"
-        end
-        auth&.xpath(".//p[@id = 'boilerplate-message']")&.each do |p|
+        authority_license_cleanup(docxml)
+        authority_copyright_cleanup(docxml)
+        coverpage_note_cleanup(docxml)
+      end
+
+      def authority_copyright_cleanup(docxml)
+        auth = docxml.at("//div[@class = 'boilerplate-copyright']") or return
+        authority_copyright_style(auth)
+        authority_copyright_populate(docxml, auth)
+      end
+
+      def authority_copyright_style(auth)
+        auth.xpath(".//p[not(@class)]").each { |p| p["class"] = "zzCopyright" }
+        auth.xpath(".//p[@id = 'boilerplate-message']").each do |p|
           p["class"] = "zzCopyright1"
         end
-        auth&.xpath(".//p[@id = 'boilerplate-address']")&.each do |p|
+        auth.xpath(".//p[@id = 'boilerplate-address']").each do |p|
           p["class"] = "zzAddress"
         end
-        auth&.xpath(".//p[@id = 'boilerplate-place']")&.each do |p|
+        auth.xpath(".//p[@id = 'boilerplate-place']").each do |p|
           p["class"] = "zzCopyright1"
         end
-        auth and insert and insert.children = auth
-        coverpage_note_cleanup(docxml)
+      end
+
+      def authority_copyright_populate(doc, auth)
+        i = doc.at("//div[@id = 'boilerplate-copyright-default-destination']")
+        j = doc.at("//div[@id = 'boilerplate-copyright-append-destination']")
+        default = auth.at(".//div[@id = 'boilerplate-copyright-default']")
+        default and i and i.children = default.remove
+        j and j.children = auth.remove
+      end
+
+      def authority_license_cleanup(docxml)
+        dest = docxml.at("//div[@id = 'boilerplate-license-destination']") or
+          return
+        auth = docxml.at("//div[@class = 'boilerplate-license']") or return
+        auth.xpath(".//p[not(@class)]").each { |p| p["class"] = "zzWarning" }
+        dest.children = auth.remove
       end
 
       def word_cleanup(docxml)
@@ -142,9 +160,7 @@ module IsoDoc
       # supply missing annex title
       def make_WordToC(docxml, level)
         toc = ""
-        if source = docxml.at("//div[@class = 'TOC']")
-          toc = to_xml(source.children)
-        end
+        s = docxml.at("//div[@class = 'TOC']") and toc = to_xml(s.children)
         xpath = (1..level).each.map { |i| "//h#{i}" }.join (" | ")
         docxml.xpath(xpath).each do |h|
           x = ""

data/lib/isodoc/iso/xref_section.rb

@@ -7,7 +7,7 @@ module IsoDoc
         clause.at(ns("./clause")) and
           @anchors[clause["id"]] = { label: nil, level: 1, type: "clause",
                                      xref: clause.at(ns("./title"))&.text }
-        i = Counter.new(0, prefix: "0.")
+        i = Counter.new(0, prefix: "0")
         clause.xpath(ns("./clause")).each do |c|
           section_names1(c, i.increment(c).print, 2)
         end
@@ -26,7 +26,7 @@ module IsoDoc
             anchor_struct(i.print, nil, @labels["appendix"],
                           "clause").merge(level: 2, subtype: "annex",
                                           container: clause["id"])
-          j = Counter.new(0, prefix: "#{i.print}.")
+          j = Counter.new(0, prefix: i.print)
           c.xpath(ns("./clause | ./references")).each do |c1|
             lbl = "#{@labels['appendix']} #{j.increment(c1).print}"
             appendix_names1(c1, l10n(lbl), 3, clause["id"])
@@ -62,7 +62,7 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         annex_name_anchors1(clause, num, level)
-        i = Counter.new(0, prefix: "#{num}.")
+        i = Counter.new(0, prefix: num)
         clause.xpath(ns("./clause | ./references")).each do |c|
           annex_names1(c, i.increment(c).print, level + 1)
         end
@@ -71,7 +71,7 @@ module IsoDoc
       def appendix_names1(clause, num, level, container)
         @anchors[clause["id"]] = { label: num, xref: num, level: level,
                                    container: container }
-        i = Counter.new(0, prefix: "#{num}.")
+        i = Counter.new(0, prefix: num)
         clause.xpath(ns("./clause | ./references")).each do |c|
           appendix_names1(c, i.increment(c).print, level + 1, container)
         end

data/lib/metanorma/iso/boilerplate-fr.adoc

@@ -1,6 +1,7 @@
 == copyright-statement
 {% if document_scheme == "1951" %}
 
+[[boilerplate-copyright-default]]
 === REPRODUCTION INTERDITE
 
 [[boilerplate-message]]
@@ -20,6 +21,7 @@ nationales de normalisation.
 
 {% elsif document_scheme == "1972" or document_scheme == "1987" %}
 
+[[boilerplate-copyright-default]]
 === {blank}
 
 [[boilerplate-year]]
@@ -31,6 +33,7 @@ Publié en Suisse
 
 {% elsif document_scheme == "1989" %}
 
+[[boilerplate-copyright-default]]
 === {blank}
 
 [[boilerplate-year]]
@@ -53,6 +56,7 @@ Imprimé en Suisse
 
 
 {% else %}
+[[boilerplate-copyright-default]]
 === {% if stage_int >= 40 %}DOCUMENT PROTÉGÉ PAR COPYRIGHT{%else%}{blank}{%endif%}
 
 [[boilerplate-year]]

data/lib/metanorma/iso/boilerplate-ru.adoc

@@ -2,6 +2,7 @@
 
 {% if document_scheme == "1972" or document_scheme == "1987" %}
 
+[[boilerplate-copyright-default]]
 === {blank}
 
 [[boilerplate-year]]
@@ -12,6 +13,7 @@
 
 {% elsif document_scheme == "1989" %}
 
+[[boilerplate-copyright-default]]
 === {blank}
 
 [[boilerplate-year]]
@@ -34,6 +36,7 @@ X.400          c=ch; a=400net;
 
 {% else %}
 
+[[boilerplate-copyright-default]]
 === {% if stage_int >= 40 %}ДОКУМЕНТ, ОХРАНЯЕМЫЙ АВТОРСКИМ ПРАВОМ{% else %}{blank}{% endif %}
 
 [[boilerplate-year]]

data/lib/metanorma/iso/boilerplate.adoc

@@ -2,6 +2,7 @@
 
 {% if document_scheme == "1951" %}
 
+[[boilerplate-copyright-default]]
 === COPYRIGHT RESERVED
 
 [[boilerplate-message]]
@@ -20,6 +21,7 @@ Also issued in French and Russian. Copies to be obtained through the national st
 
 {% elsif document_scheme == "1972" or document_scheme == "1987" %}
 
+[[boilerplate-copyright-default]]
 === {blank}
 
 [[boilerplate-year]]
@@ -31,6 +33,7 @@ Printed in Switzerland
 
 {% elsif document_scheme == "1989" %}
 
+[[boilerplate-copyright-default]]
 === {blank}
 
 [[boilerplate-year]]
@@ -53,6 +56,7 @@ Printed in Switzerland
 
 {% else %}
 
+[[boilerplate-copyright-default]]
 === {% if stage_int >= 40 %}COPYRIGHT PROTECTED DOCUMENT{% else %}{blank}{% endif %}
 
 [[boilerplate-year]]

data/lib/metanorma/iso/front.rb

@@ -12,11 +12,16 @@ module Metanorma
     class Converter < Standoc::Converter
       def metadata_ext(node, xml)
         super
+        metadata_ext_iso(node, xml)
+      end
+
+      def metadata_ext_iso(node, xml)
         structured_id(node, xml)
         metadata_stage(node, xml)
         @amd && a = node.attr("updates-document-type") and
           xml.updates_document_type a
         a = node.attr("fast-track") and xml.send "fast-track", a != "false"
+        a = node.attr("price-code") and xml.price_code a
       end
 
       STAGE_ERROR = [Pubid::Core::Errors::HarmonizedStageCodeInvalidError,

data/lib/metanorma/iso/front_contributor.rb

@@ -54,12 +54,10 @@ module Metanorma
       def contrib_committee_build(xml, agency, committee)
         name = org_abbrev.invert[agency] and agency = name
         xml.name agency
-        xml.subdivision do |s|
-          s.organization do |o|
+        xml.subdivision do |o|
             o.name committee[:name]
             committee[:abbr] and o.abbreviation committee[:abbr]
             committee[:ident] and o.identifier committee[:ident]
-          end
         end
       end
 

data/lib/metanorma/iso/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.4 -->
+<!-- VERSION v1.4.0 -->
 <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">

data/lib/metanorma/iso/relaton-iso.rng

@@ -30,6 +30,9 @@
       <optional>
         <ref name="fast_track"/>
       </optional>
+      <optional>
+        <ref name="price-code"/>
+      </optional>
     </define>
     <define name="bdate">
       <element name="date">
@@ -234,4 +237,9 @@
       <data type="boolean"/>
     </element>
   </define>
+  <define name="price-code">
+    <element name="price-code">
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "2.8.8".freeze
+    VERSION = "2.9.0".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.test_files = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.9.3"
+  spec.add_dependency "metanorma-standoc", "~> 2.10.0"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid"
   spec.add_dependency "tokenizer", "~> 0.3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.8.8
+  version: 2.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement