metanorma-iso 2.1.5 → 2.1.8

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -17,6 +17,24 @@ module IsoDoc
         super
       end
 
+      def block(docxml)
+        amend docxml
+        figure docxml
+        sourcecode docxml
+        formula docxml
+        admonition docxml
+        ol docxml
+        permission docxml
+        requirement docxml
+        recommendation docxml
+        requirement_render docxml
+        @xrefs.anchors_previous = @xrefs.anchors.dup # store old xrefs of reqts
+        @xrefs.parse docxml
+        table docxml # have table include requirements newly converted to tables
+        example docxml
+        note docxml
+      end
+
       def annex(isoxml)
         amd(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
         super
@@ -178,12 +196,10 @@ module IsoDoc
                                             i18nhash: @i18n.get)
       end
 
-      def bibrender(xml)
-        unless xml.at(ns("./formattedref"))
-          xml.children =
-            "#{bibrenderer.render(xml.to_xml)}"\
-            "#{xml.xpath(ns('./docidentifier | ./uri | ./note')).to_xml}"
-        end
+      def bibrender_formattedref(formattedref, xml)
+        return if %w(techreport standard).include? xml["type"]
+
+        super
       end
 
       def ol_depth(node)

data/lib/isodoc/iso/word_cleanup.rb

@@ -84,27 +84,24 @@ module IsoDoc
       end
 
       def authority_hdr_cleanup(docxml)
-        docxml&.xpath("//div[@class = 'boilerplate-license']")&.each do |d|
-          d.xpath(".//h1").each do |p|
-            p.name = "p"
-            p["class"] = "zzWarningHdr"
+        { "boilerplate-license": "zzWarningHdr",
+          "boilerplate-copyright": "zzCopyrightHdr" }.each do |k, v|
+            docxml.xpath("//div[@class = '#{k}']").each do |d|
+              d.xpath(".//h1").each do |p|
+                p.name = "p"
+                p["class"] = v
+              end
+            end
           end
-        end
-        docxml&.xpath("//div[@class = 'boilerplate-copyright']")&.each do |d|
-          d.xpath(".//h1").each do |p|
-            p.name = "p"
-            p["class"] = "zzCopyrightHdr"
-          end
-        end
       end
 
       def authority_cleanup(docxml)
         insert = docxml.at("//div[@id = 'boilerplate-license-destination']")
-        auth = docxml&.at("//div[@class = 'boilerplate-license']")&.remove
+        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 = docxml.at("//div[@class = 'boilerplate-copyright']")&.remove
         auth&.xpath(".//p[not(@class)]")&.each do |p|
           p["class"] = "zzCopyright"
         end

data/lib/isodoc/iso/word_dis_convert.rb

@@ -98,7 +98,7 @@ module IsoDoc
           @meta.get[:doctitlemain] && @meta.get[:doctitlepart] and p << " &#x2014; "
           if @meta.get[:doctitlepart]
             b = @meta.get[:doctitlepartlabel] and
-              p << "<span style='font-weight:normal'>#{b}</span> "
+              p << "<span style='font-weight:normal'>#{b}:</span> "
             p << " #{@meta.get[:doctitlepart]}"
           end
           @meta.get[:doctitleamdlabel] || @meta.get[:doctitleamd] ||

data/lib/isodoc/iso/xref.rb

@@ -4,11 +4,11 @@ module IsoDoc
     end
 
     class Xref < IsoDoc::Xref
+      attr_accessor :anchors_previous, :anchors
+
       def initial_anchor_names(doc)
-        if @klass.amd(doc)
-          initial_anchor_names_amd(doc)
-        else
-          initial_anchor_names1(doc)
+        if @klass.amd(doc) then initial_anchor_names_amd(doc)
+        else initial_anchor_names1(doc)
         end
         if @parse_settings.empty? || @parse_settings[:clauses]
           introduction_names(doc.at(ns("//introduction")))
@@ -217,6 +217,37 @@ module IsoDoc
         end
         true
       end
+
+      def sequential_table_names(clause)
+        super
+        modspec_table_xrefs(clause) if @anchors_previous
+      end
+
+      def modspec_table_xrefs(clause)
+        clause.xpath(ns(".//table[@class = 'modspec']")).noblank.each do |t|
+          (@anchors[t["id"]] && !@anchors[t["id"]][:modspec]) or next
+          n = @anchors[t["id"]][:xref]
+          @anchors[t["id"]][:modspec] = true
+          @anchors[t["id"]][:xref] =
+            l10n("#{n}, #{@anchors_previous[t['id']][:xref_bare]}")
+          modspec_table_components_xrefs(t, n)
+        end
+      end
+
+      def modspec_table_components_xrefs(table, table_label)
+        table.xpath(ns(".//tr[@id]")).each do |tr|
+          (@anchors[tr["id"]] && !@anchors[tr["id"]][:modspec]) or next
+          @anchors[tr["id"]][:modspec] = true
+          @anchors[tr["id"]][:xref] =
+            l10n("#{table_label}, #{@anchors_previous[tr['id']][:xref]}")
+          @anchors[tr["id"]].delete(:container)
+        end
+      end
+
+      def hierarchical_table_names(clause, _num)
+        super
+        modspec_table_xrefs(clause) if @anchors_previous
+      end
     end
   end
 end

data/lib/metanorma/iso/base.rb

@@ -12,6 +12,10 @@ module Metanorma
       XML_ROOT_TAG = "iso-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/iso".freeze
 
+      def requirements_processor
+        ::Metanorma::Requirements::Iso
+      end
+
       def html_converter(node)
         IsoDoc::Iso::HtmlConvert.new(html_extract_attributes(node))
       end

data/lib/metanorma/iso/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

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

@@ -19,7 +19,7 @@ l’adresse ci-après ou au comité membre de l’ISO dans le pays du demandeur.
     ISO copyright office<br/>
     CP 401 &#x2022; Ch. de Blandonnet 8<br/>
     CH-1214 Vernier, Geneva<br/>
-    Tél.&#xa0;&#xa0;+ 41 22 749 01 11<br/>
+    Tél: +41 22 749 01 11<br/>
     Email: copyright@iso.org<br/>
     Website: www.iso.org
   </p>

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

@@ -14,7 +14,7 @@
     Бюро ISO по охране авторских прав<br/>
     CP 401 &#x2022; Ch. de Blandonnet 8<br/>
     CH-1214 Vernier, Geneva<br/>
-    Тел.&#xa0;&#xa0;+ 41 22 749 01 11<br/>
+    Тел: +41 22 749 01 11<br/>
     Электронная почта: copyright@iso.org<br/>
     Сайт: www.iso.org
   </p>

data/lib/metanorma/iso/boilerplate.xml

@@ -20,7 +20,7 @@ at the address below or ISO's member body in the country of the requester.
     ISO copyright office<br/>
     CP 401 &#x2022; Ch. de Blandonnet 8<br/>
     CH-1214 Vernier, Geneva<br/>
-    Phone:&#xa0;&#xa0;+ 41 22 749 01 11<br/>
+    Phone: +41 22 749 01 11<br/>
     Email: copyright@iso.org<br/>
     Website: www.iso.org
   </p>

data/lib/metanorma/iso/cleanup.rb

@@ -88,7 +88,6 @@ module Metanorma
         end
       end
 
-      # TODO sort by authors
       # sort by: doc class (ISO, IEC, other standard (not DOI &c), other
       # then standard class (docid class other than DOI &c)
       # then docnumber if present, numeric sort
@@ -205,6 +204,11 @@ module Metanorma
         super
       end
 
+      def term_children_cleanup(xmldoc)
+        @vocab and return
+        super
+      end
+
       def bibdata_cleanup(xmldoc)
         super
         approval_groups_rename(xmldoc)

data/lib/metanorma/iso/front_id.rb

@@ -5,6 +5,7 @@ require "json"
 require "pathname"
 require "open-uri"
 require "twitter_cldr"
+require "pubid-iso"
 
 module Metanorma
   module ISO
@@ -72,7 +73,6 @@ module Metanorma
       def iso_id(node, xml)
         (!@amd && node.attr("docnumber")) || (@amd && node.attr("updates")) or
           return
-
         dn = id_stage_prefix(iso_id1(node), node)
         dns = [id_year(dn, node, mode: :default),
                id_year(dn, node, mode: :force),
@@ -89,6 +89,69 @@ module Metanorma
                           **attr_code(type: "iso-reference"))
       end
 
+            def get_typeabbr(node, amd: false)
+        case doctype(node)
+        when "directive" then "DIR "
+        when "technical-report" then "TR "
+        when "technical-specification" then "TS "
+        when "amendment" then (amd ? "Amd " : "")
+        when "technical-corrigendum" then (amd ? "Cor " : "")
+        end
+      end
+
+=begin
+def get_typeabbr(node, amd: false)
+        case doctype(node)
+        when "directive" then "DIR"
+        when "technical-report" then "TR"
+        when "technical-specification" then "TS"
+        else nil
+        end
+      end
+
+      def iso_id(node, xml)
+        (!@amd && node.attr("docnumber")) || (@amd && node.attr("updates")) or
+          return
+        stage = id_stage_abbr(get_stage(node), get_substage(node), node, true)&.strip
+        stage = nil if %w{IS (Review) (Withdrwal)}.include?(stage.strip)
+          urn_stage = "#{get_stage(node)}.#{get_substage(node)}"
+pub =  (node.attr("publisher") || "ISO").split(/[;,]/)
+        params = {
+          number: node.attr("docnumber"), # (@amd ? node.attr("updates") : node.attr("docnumber")),
+          part: node.attr("partnumber"),
+          language: node.attr("language") || "en",
+          type: get_typeabbr(node),
+          year: node.attr("copyright-year") || node.attr("updated-date")&.sub(/-.*$/, ""),
+          publisher: pub[0],
+          copublisher: pub[1..-1],
+        }.compact
+        if a = node.attr("amendment-number")
+          params[:amendments] = { number: a, stage: stage }
+          elsif a = node.attr("corrigendum-number")
+          params[:corrigendums] = { number: a, stage: stage }
+          else
+            params.merge!( { stage: stage, urn_stage: urn_stage }.compact )
+          end
+        iso_id_out(xml, params)
+      end
+
+      def iso_id_out(xml, params)
+        params_nolang = params.dup.tap { |hs| hs.delete(:language) }
+        unpub = /^[0-5]/.match?(params[:urn_stage])
+        params1 = unpub ? params_nolang.dup.tap { |hs| hs.delete(:year) } : params_nolang
+        xml.docidentifier Pubid::Iso::Identifier.new(**params1), **attr_code(type: "ISO")
+        params2 = params_nolang.dup.tap { |hs| hs.delete(:year) }
+        xml.docidentifier Pubid::Iso::Identifier.new(**params2), **attr_code(type: "iso-undated")
+        params1 = unpub ? params.dup.tap { |hs| hs.delete(:year) } : params
+        xml.docidentifier(Pubid::Iso::Identifier.new(**params1),
+                          **attr_code(type: "iso-with-lang"))
+        warn params
+        warn "Generated: #{Pubid::Iso::Identifier.new(**params).to_s}"
+        xml.docidentifier(Pubid::Iso::Identifier.new(**params),
+                          **attr_code(type: "iso-reference"))
+      end
+=end
+
       def iso_id1(node)
         if @amd
           dn = node.attr("updates")
@@ -231,16 +294,6 @@ module Metanorma
         ret = (stage == "60" ? "60" : "00") if ret.nil? || ret.empty?
         ret
       end
-
-      def get_typeabbr(node, amd: false)
-        case doctype(node)
-        when "directive" then "DIR "
-        when "technical-report" then "TR "
-        when "technical-specification" then "TS "
-        when "amendment" then (amd ? "Amd " : "")
-        when "technical-corrigendum" then (amd ? "Cor " : "")
-        end
-      end
     end
   end
 end

data/lib/metanorma/iso/isodoc.rng

@@ -1285,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/iso/reqt.rng

@@ -108,7 +108,7 @@
     </element>
   </define>
   <define name="label">
-    <element name="label">
+    <element name="identifier">
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/iso/section.rb

@@ -44,6 +44,11 @@ module Metanorma
           return term_def_subclause_parse1(attrs, xml, node)
         super
       end
+
+      def term_contains_subclauses(node)
+        @vocab and return false # treat this as a term
+        super
+      end
     end
   end
 end

data/lib/metanorma/iso/validate.rb

@@ -90,11 +90,12 @@ module Metanorma
       end
 
       def term_xrefs_validate1(xref, termids)
-        (termids[xref["target"]] && !termids[xref.parent["id"]]) and
+        closest_id = xref.xpath("./ancestor::*[@id]")&.last or return
+        (termids[xref["target"]] && !termids[closest_id["id"]]) and
           @log.add("Style", xref,
                    "only terms clauses can cross-reference terms clause "\
                    "(#{xref['target']})")
-        (!termids[xref["target"]] && termids[xref.parent["id"]]) and
+        (!termids[xref["target"]] && termids[closest_id["id"]]) and
           @log.add("Style", xref,
                    "non-terms clauses cannot cross-reference terms clause "\
                    "(#{xref['target']})")

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.1.5".freeze
+    VERSION = "2.1.8".freeze
   end
 end

data/lib/metanorma/requirements/modspec.rb

@@ -0,0 +1,60 @@
+module Metanorma
+  class Requirements
+    class Modspec
+      # Don't want to inherit from Metanorma::Requirements::Modspec
+      class Iso < ::Metanorma::Requirements::Modspec
+        def recommendation_label(elem, type, xrefs)
+          lbl = super
+          title = elem.at(ns("./title"))
+          return lbl unless title # &&
+
+          #  elem.ancestors("requirement, recommendation, permission").empty?
+
+          lbl += l10n(": ") if lbl
+          lbl += title.children.to_xml
+          lbl
+        end
+
+        # ISO labels modspec reqt as table, with reqt label as title
+        def recommendation_header(reqt, out)
+          n = reqt.at(ns("./name")) and out << n
+          out
+        end
+
+        def recommend_title(node, out)
+          label = node.at(ns("./identifier")) or return
+          out.add_child("<tr><td>#{@labels['modspec']['identifier']}</td>"\
+                        "<td><tt>#{label.children.to_xml}</tt></td>")
+        end
+
+        def requirement_component_parse(node, out)
+          if node["exclude"] != "true" && node.name == "description"
+            lbl = "statement"
+            lbl = "declaration" if recommend_class(node) == "recommendclass"
+            out << "<tr><td>#{@labels['modspec'][lbl]}</td>"\
+                   "<td>#{node.children.to_xml}</td></tr>"
+          else
+            super
+          end
+        end
+
+        def requirement_table_cleanup(table)
+          return table unless table["type"] == "recommendclass"
+
+          ins = table.at(ns("./tbody/tr[td/table]")) or return table
+          ins.replace("<tr><td>#{@labels['modspec']['provisions']}</td>" +
+                      "<td>#{nested_tables_names(table)}</td></tr>")
+          table.xpath(ns("./tbody/tr[td/table]")).each(&:remove)
+          table
+        end
+
+        def nested_tables_names(table)
+          table.xpath(ns("./tbody/tr/td/table"))
+            .each_with_object([]) do |t, m|
+              m << t.at(ns("./name")).children.to_xml
+            end.join("<br/>")
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/requirements/requirements.rb

@@ -0,0 +1,16 @@
+require "mn-requirements"
+require_relative "modspec"
+
+module Metanorma
+  class Requirements
+    class Iso < ::Metanorma::Requirements
+      def create(type)
+        case type
+        when :modspec, :ogc
+          ::Metanorma::Requirements::Modspec::Iso.new(parent: self)
+        else ::Metanorma::Requirements::Default.new(parent: self)
+        end
+      end
+    end
+  end
+end

data/lib/metanorma-iso.rb

@@ -1,6 +1,7 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "metanorma/iso/converter"
 require_relative "metanorma/iso/version"
+require_relative "metanorma/requirements/requirements"
 require_relative "isodoc/iso/html_convert"
 require_relative "isodoc/iso/word_convert"
 require_relative "isodoc/iso/pdf_convert"
@@ -10,7 +11,7 @@ require_relative "isodoc/iso/presentation_xml_convert"
 require_relative "html2doc/lists"
 require "asciidoctor/extensions"
 
-if defined? Metanorma
+if defined? Metanorma::Registry
   require_relative "metanorma/iso"
   Metanorma::Registry.instance.register(Metanorma::Iso::Processor)
 end

data/metanorma-iso.gemspec

@@ -29,8 +29,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.0"
   spec.add_dependency "mnconvert", "~> 1.14"
+  spec.add_dependency "pubid-iso"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"

data/spec/assets/iso.adoc

@@ -0,0 +1,10 @@
+= X
+A
+:mn-document-class: iso
+:title-main-en: Medical devices — Quality management systems — Requirements for regulatory purposes
+:title-main-fr: Dispositifs médicaux — Systèmes de management de la qualité — Exigences à des fins réglementaires
+
+== Clause 1
+
+X
+

data/spec/isodoc/postproc_spec.rb

@@ -844,11 +844,9 @@ RSpec.describe IsoDoc do
                 <br/>
                 CH-1214 Vernier, Geneva, Switzerland
                 <br/>
-                Tel. + 41 22 749 01 11
+                Phone: +41 22 749 01 11
                 <br/>
-                Fax + 41 22 749 09 47
-                <br/>
-                copyright@iso.org
+                Email: copyright@iso.org
                 <br/>
                 www.iso.org</p>
             </clause>
@@ -891,11 +889,9 @@ RSpec.describe IsoDoc do
                 <br/>
                 CH-1214 Vernier, Geneva, Switzerland
                 <br/>
-                Tel. + 41 22 749 01 11
-                <br/>
-                Fax + 41 22 749 09 47
+                Phone: +41 22 749 01 11
                 <br/>
-                copyright@iso.org
+                Email: copyright@iso.org
                 <br/>
                 www.iso.org</p>
             </clause>
@@ -955,13 +951,10 @@ RSpec.describe IsoDoc do
               CH-1214 Vernier, Geneva, Switzerland
 
               <br/>
-              Tel. + 41 22 749 01 11
-
-              <br/>
-              Fax + 41 22 749 09 47
+              Phone: +41 22 749 01 11
 
               <br/>
-              copyright@iso.org
+              Email: copyright@iso.org
 
               <br/>
               www.iso.org#{' '}</p>