metanorma-iso 2.1.1 → 2.1.4

data/lib/metanorma/iso/front.rb

@@ -81,11 +81,42 @@ module Metanorma
       end
 
       def metadata_committee(node, xml)
+        metadata_editorial_committee(node, xml)
+        metadata_approval_committee(node, xml)
+      end
+
+      def metadata_editorial_committee(node, xml)
         xml.editorialgroup do |a|
-          committee_component("technical-committee", node, a)
-          committee_component("subcommittee", node, a)
-          committee_component("workgroup", node, a)
-          node.attr("secretariat") && a.secretariat(node.attr("secretariat"))
+          %w(technical-committee subcommittee workgroup).each do |v|
+            node.attr("#{v}-number") and committee_component(v, node, a)
+          end
+          node.attr("secretariat") and a.secretariat(node.attr("secretariat"))
+        end
+      end
+
+      def metadata_approval_committee(node, xml)
+        types = metadata_approval_committee_types(node)
+        xml.approvalgroup do |a|
+          metadata_approval_agency(a, node.attr("approval-agency")
+            &.split(%r{[/,;]}))
+          types.each do |v|
+            node.attr("#{v}-number") and committee_component(v, node, a)
+          end
+        end
+      end
+
+      def metadata_approval_committee_types(node)
+        types = %w(technical-committee subcommittee workgroup)
+        node.attr("approval-technical-committee-number") and
+          types = %w(approval-technical-committee approval-subcommittee
+                     approval-workgroup)
+        types
+      end
+
+      def metadata_approval_agency(xml, list)
+        list = ["ISO"] if list.nil? || list.empty?
+        list.each do |v|
+          xml.agency v
         end
       end
 
@@ -146,7 +177,8 @@ module Metanorma
       end
 
       def relaton_relations
-        super + %w(obsoletes successor-of manifestation-of related annotation-of)
+        super + %w(obsoletes successor-of manifestation-of related
+                   annotation-of)
       end
 
       def relaton_relation_descriptions
@@ -162,7 +194,7 @@ module Metanorma
           "identical-adopted-from" => "adoptedFrom",
           "modified-adopted-from" => "adoptedFrom",
           "related-directive" => "related",
-          "related-mandate" => "related",
+          "related-mandate" => "related"
         )
       end
     end

data/lib/metanorma/iso/front_id.rb

@@ -202,6 +202,8 @@ module Metanorma
         %w(40 50).include?(stage) && i = node.attr("iteration") and
           itersuffix = ".#{i}"
         return docnum if abbr.nil? || abbr.empty? # prefixes added in cleanup
+
+        typeabbr = "" if %w(DTS FDTS).include?(abbr.sub(/\s+$/, ""))
         return "/#{abbr}#{typeabbr} #{docnum}#{itersuffix}" unless @amd
 
         a = docnum.split(%r{/})

data/lib/metanorma/iso/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -116,6 +127,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="suppress_identifier">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <ref name="BibliographicItem"/>
       </element>
     </define>
@@ -282,6 +298,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -324,6 +343,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -360,6 +382,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -694,6 +719,9 @@
       <optional>
         <attribute name="tag"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="multilingual-rendering">
           <ref name="MultilingualRenderingType"/>
@@ -729,6 +757,9 @@
         <optional>
           <attribute name="tag"/>
         </optional>
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <optional>
           <attribute name="multilingual-rendering">
             <ref name="MultilingualRenderingType"/>
@@ -2050,6 +2081,7 @@
       <value>compare</value>
       <value>contrast</value>
       <value>see</value>
+      <value>seealso</value>
     </choice>
   </define>
   <define name="deprecates">

data/lib/metanorma/iso/isostandard.rng

@@ -45,6 +45,9 @@
         <ref name="horizontal"/>
       </optional>
       <ref name="editorialgroup"/>
+      <optional>
+        <ref name="approvalgroup"/>
+      </optional>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
@@ -249,6 +252,7 @@
         <value>warning</value>
         <value>important</value>
         <value>safety precautions</value>
+        <value>editorial</value>
       </choice>
     </define>
     <define name="preface">
@@ -308,18 +312,7 @@
     </define>
     <define name="editorialgroup">
       <element name="editorialgroup">
-        <oneOrMore>
-          <ref name="technical-committee"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="subcommittee"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="workgroup"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="secretariat"/>
-        </optional>
+        <ref name="ISOProjectGroup"/>
       </element>
     </define>
     <define name="Content-Section">
@@ -367,6 +360,33 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="ISOProjectGroup">
+    <zeroOrMore>
+      <ref name="agency"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="technical-committee"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subcommittee"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="workgroup"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="secretariat"/>
+    </optional>
+  </define>
+  <define name="approvalgroup">
+    <element name="approvalgroup">
+      <ref name="ISOProjectGroup"/>
+    </element>
+  </define>
+  <define name="agency">
+    <element name="agency">
+      <text/>
+    </element>
+  </define>
   <!--
     We display the Normative References between scope and terms; but to keep the
     grammar simple, we keep the references together

data/lib/metanorma/iso/validate_section.rb

@@ -202,18 +202,6 @@ module Metanorma
         end
       end
 
-      def asset_style(root)
-        root.xpath("//example | //termexample").each { |e| example_style(e) }
-        root.xpath("//definition/verbal-definition").each do |e|
-          definition_style(e)
-        end
-        root.xpath("//note").each { |e| note_style(e) }
-        root.xpath("//fn").each { |e| footnote_style(e) }
-        root.xpath(ASSETS_TO_STYLE).each { |e| style(e, extract_text(e)) }
-        norm_bibitem_style(root)
-        super
-      end
-
       def subclause_validate(root)
         root.xpath("//clause/clause/clause/clause/clause/clause/clause/clause")
           .each do |c|

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.1.1".freeze
+    VERSION = "2.1.4".freeze
   end
 end

data/spec/isodoc/amd_spec.rb

@@ -745,11 +745,7 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-      {:accesseddate=>"XXX",
-      :agency=>"ISO",
-      :circulateddate=>"XXX",
-      :confirmeddate=>"XXX",
-      :copieddate=>"XXX",
+      {:agency=>"ISO",
       :createddate=>"2016-05-01",
       :docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1",
       :docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
@@ -779,13 +775,8 @@ RSpec.describe IsoDoc do
       :edition=>"2",
       :editorialgroup=>["A 1", "B 2", "C 3"],
       :ics=>"1, 2, 3",
-      :implementeddate=>"XXX",
-      :issueddate=>"XXX",
       :lang=>"en",
-      :obsoleteddate=>"XXX",
-      :publisheddate=>"XXX",
       :publisher=>"International Organization for Standardization",
-      :receiveddate=>"XXX",
       :revdate=>"2000-01-01",
       :revdate_monthyear=>"January 2000",
       :sc=>"B 2",
@@ -795,13 +786,9 @@ RSpec.describe IsoDoc do
       :stage_int=>10,
       :stageabbr=>"NWIP",
       :statusabbr=>"PreNWIP3",
+      :substage_int=>"20",
       :tc=>"A 1",
-      :transmitteddate=>"XXX",
-      :unchangeddate=>"XXX",
       :unpublished=>true,
-      :updateddate=>"XXX",
-      :vote_endeddate=>"XXX",
-      :vote_starteddate=>"XXX",
       :wg=>"C 3"}
     OUTPUT
     expect(metadata(c.info(Nokogiri::XML(input), nil)))
@@ -910,11 +897,7 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-      {:accesseddate=>"XXX",
-      :agency=>"ISO",
-      :circulateddate=>"XXX",
-      :confirmeddate=>"XXX",
-      :copieddate=>"XXX",
+      {:agency=>"ISO",
       :createddate=>"2016-05-01",
       :docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1",
       :docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
@@ -944,13 +927,8 @@ RSpec.describe IsoDoc do
       :edition=>"2",
       :editorialgroup=>["A 1", "B 2", "C 3"],
       :ics=>"1, 2, 3",
-      :implementeddate=>"XXX",
-      :issueddate=>"XXX",
       :lang=>"fr",
-      :obsoleteddate=>"XXX",
-      :publisheddate=>"XXX",
       :publisher=>"International Organization for Standardization",
-      :receiveddate=>"XXX",
       :revdate=>"2000-01-01",
       :revdate_monthyear=>"Janvier 2000",
       :sc=>"B 2",
@@ -960,13 +938,9 @@ RSpec.describe IsoDoc do
       :stage_int=>10,
       :stageabbr=>"NWIP",
       :statusabbr=>"PreNWIP3",
+      :substage_int=>"20",
       :tc=>"A 1",
-      :transmitteddate=>"XXX",
-      :unchangeddate=>"XXX",
       :unpublished=>true,
-      :updateddate=>"XXX",
-      :vote_endeddate=>"XXX",
-      :vote_starteddate=>"XXX",
       :wg=>"C 3"}
     OUTPUT
     expect(metadata(c.info(Nokogiri::XML(input), nil)))