metanorma-iso 2.1.7 → 2.1.8

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/cleanup.rb

@@ -204,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

@@ -80,33 +80,77 @@ module Metanorma
         iso_id_out(node, xml, dns)
       end
 
+      def iso_id_out(node, xml, dns)
+        xml.docidentifier dns[0], **attr_code(type: "ISO")
+        xml.docidentifier dns[2], **attr_code(type: "iso-undated")
+        xml.docidentifier(id_langsuffix(dns[0], node),
+                          **attr_code(type: "iso-with-lang"))
+        xml.docidentifier(id_langsuffix(dns[1], node),
+                          **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 iso_id(node, _xml)
+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: (@amd ? node.attr("updates") : node.attr("docnumber")),
+          number: node.attr("docnumber"), # (@amd ? node.attr("updates") : node.attr("docnumber")),
           part: node.attr("partnumber"),
-          amendment_number: node.attr("amendment-number"),
-          corrigendum_number: node.attr("corrigendum-number"),
           language: node.attr("language") || "en",
-          urn_stage: "#{get_stage(node)}.#{get_substage(node)}",
-          stage: id_stage_abbr(get_stage(node), get_substage(node), node, true),
-          type: doctype(node),
+          type: get_typeabbr(node),
           year: node.attr("copyright-year") || node.attr("updated-date")&.sub(/-.*$/, ""),
-          copublisher: node.attr("agency"),
-        }
+          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
-=end
 
-      def iso_id_out(node, xml, dns)
-        xml.docidentifier dns[0], **attr_code(type: "ISO")
-        xml.docidentifier dns[2], **attr_code(type: "iso-undated")
-        xml.docidentifier(id_langsuffix(dns[0], node),
+      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"))
-        xml.docidentifier(id_langsuffix(dns[1], node),
+        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
@@ -250,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/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.7".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

@@ -31,10 +31,10 @@ Gem::Specification.new do |spec|
 
   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"
-  spec.add_dependency "pubid-iso"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

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/ref_spec.rb

@@ -162,7 +162,7 @@ RSpec.describe IsoDoc do
               <eref bibitemid="ISSN">[2]</eref>
               <eref bibitemid="ISO16634">ISO 16634:--</eref>
               <eref bibitemid="ref1">ICC 167</eref>
-              <eref bibitemid="ref10">[10]</eref>
+              <eref bibitemid="ref10">[4]</eref>
               <eref bibitemid="ref12">Citn</eref>
             </p>
           </foreword>
@@ -210,13 +210,13 @@ RSpec.describe IsoDoc do
             <title depth="1">Bibliography</title>
             <bibitem id="ISBN" type="book">
               <formattedref><em>Chemicals for analytical laboratory use</em>. n.p.: n.d. ISBN.</formattedref>
+              <docidentifier type="metanorma-ordinal">[1]</docidentifier>
               <docidentifier type="ISBN">ISBN</docidentifier>
-              <docidentifier type="metanorma">[1]</docidentifier>
             </bibitem>
             <bibitem id="ISSN" type="journal">
               <formattedref><em>Instruments for analytical laboratory use</em>. n.d. ISSN.</formattedref>
+              <docidentifier type="metanorma-ordinal">[2]</docidentifier>
               <docidentifier type="ISSN">ISSN</docidentifier>
-              <docidentifier type="metanorma">[2]</docidentifier>
             </bibitem>
             <note>
               <name>NOTE</name>
@@ -241,11 +241,11 @@ RSpec.describe IsoDoc do
 
                 <link target="http://www.icc.or.at"/>
                 )</formattedref>
-              <docidentifier type="metanorma">[10]</docidentifier>
+              <docidentifier type="metanorma-ordinal">[4]</docidentifier>
             </bibitem>
             <bibitem id="ref11">
                <formattedref><em><span class="stddocTitle">Internet Calendaring and Scheduling Core Object Specification (iCalendar)</span></em></formattedref>
-              <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
+              <docidentifier type='metanorma-ordinal'>[5]</docidentifier>
               <docidentifier type="IETF">IETF RFC 10</docidentifier>
             </bibitem>
             <bibitem id="ref12">
@@ -270,7 +270,7 @@ RSpec.describe IsoDoc do
                  <a href='#ISSN'>[2]</a>
                  <a href='#ISO16634'>ISO 16634:--</a>
                  <a href='#ref1'>ICC 167</a>
-                 <a href='#ref10'>[10]</a>
+                 <a href='#ref10'>[4]</a>
                  <a href='#ref12'>Citn</a>
                </p>
              </div>
@@ -350,7 +350,7 @@ RSpec.describe IsoDoc do
                  <i>Water for analytical laboratory use</i>
                </p>
                <p id='ref10' class='Biblio'>
-                 [10]  
+                 [4]  
                  <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
                   . 
                  <i>
@@ -363,7 +363,7 @@ RSpec.describe IsoDoc do
                   )
                </p>
                <p id='ref11' class='Biblio'>
-                 [4]  IETF RFC 10, 
+                 [5]  IETF RFC 10, 
                  <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
                </p>
                <p id='ref12' class='Biblio'>
@@ -426,7 +426,7 @@ RSpec.describe IsoDoc do
                .
              </formattedref>
              <uri>https://registre.ign.fr/ign/IGNF/</uri>
-             <docidentifier type='metanorma'>2</docidentifier>
+             <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
            </bibitem>
          </references>
        </iso-standard>

data/spec/metanorma/amd_spec.rb

@@ -174,7 +174,6 @@ RSpec.describe Metanorma::ISO do
       :title-intro-fr: Introduction Française
       :title-main-fr: Titre Principal
       :title-part-fr: Part du Titre
-      :library-ics: 1,2,3
       :copyright-year: 2017
       :updates: ISO 17301-1:2016
       :created-date: 2016-05-01
@@ -273,15 +272,6 @@ RSpec.describe Metanorma::ISO do
               <workgroup number="3" type="C">WG</workgroup>
               <workgroup number="31" type="C1">WG1</workgroup>
             </approvalgroup>
-            <ics>
-              <code>1</code>
-            </ics>
-            <ics>
-              <code>2</code>
-            </ics>
-            <ics>
-              <code>3</code>
-            </ics>
             <structuredidentifier>
               <project-number amendment="1" origyr="2016-05-01" part="1">17301</project-number>
             </structuredidentifier>

data/spec/metanorma/base_spec.rb

@@ -66,7 +66,6 @@ RSpec.describe Metanorma::ISO do
       :title-intro-fr: Introduction Française
       :title-main-fr: Titre Principal
       :title-part-fr: Part du Titre
-      :library-ics: 1,2,3
       :copyright-year: 2000
       :horizontal: true
     INPUT
@@ -146,15 +145,6 @@ RSpec.describe Metanorma::ISO do
                 <workgroup number="3a" type="Ca">WGa</workgroup>
                 <workgroup number="31a" type="C1a">WG1a</workgroup>
               </approvalgroup>
-              <ics>
-                <code>1</code>
-              </ics>
-              <ics>
-                <code>2</code>
-              </ics>
-              <ics>
-                <code>3</code>
-              </ics>
               <structuredidentifier>
                 <project-number part="1">ISO 1000</project-number>
               </structuredidentifier>