metanorma-iso 2.1.0 → 2.1.3

data/lib/metanorma/iso/biblio.rng

@@ -614,12 +614,103 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="bsource"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="docidentifier"/>
+    </oneOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bdate"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="edition"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="version"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="biblionote"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="language"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="script"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bibabstract"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="status"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="copyright"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="docrelation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="series"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="medium"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="bplace"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bprice"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="extent"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="accesslocation"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="license"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bclassification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="bkeyword"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="validity"/>
+    </optional>
+  </define>
+  <define name="ReducedBibliographicItem">
+    <optional>
+      <attribute name="type">
+        <ref name="BibItemType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <ref name="fetched"/>
+    </optional>
+    <optional>
+      <ref name="formattedref"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="btitle"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -638,9 +729,9 @@
     <optional>
       <ref name="edition"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="version"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="biblionote"/>
     </zeroOrMore>
@@ -833,6 +924,12 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -986,36 +1083,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">
@@ -1174,7 +1269,7 @@
         </element>
       </optional>
       <element name="bibitem">
-        <ref name="BibliographicItem"/>
+        <ref name="ReducedBibliographicItem"/>
       </element>
       <choice>
         <zeroOrMore>
@@ -1199,9 +1294,9 @@
       <optional>
         <ref name="revision-date"/>
       </optional>
-      <zeroOrMore>
+      <optional>
         <ref name="draft"/>
-      </zeroOrMore>
+      </optional>
     </element>
   </define>
   <define name="vedition">

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

@@ -1,6 +1,9 @@
 <boilerplate>
   <copyright-statement>
     <clause>
+      {% if stage_int >= 40 %}
+      <title>DOCUMENT PROTÉGÉ PAR COPYRIGHT</title>
+      {% endif %}
       <p id="boilerplate-year">&#xa9; <span class="std_publisher">{{ agency }}</span> <span class="std_docNumber">{{ docyear }}</span></p>
 
   <p id="boilerplate-message">

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

@@ -1,6 +1,9 @@
 <boilerplate>
   <copyright-statement>
     <clause>
+      {% if stage_int >= 40 %}
+      <title>ДОКУМЕНТ, ОХРАНЯЕМЫЙ АВТОРСКИМ ПРАВОМ</title>
+      {% endif %}
       <p id="boilerplate-year">&#xa9; <span class="std_publisher">{{ agency }}</span> <span class="std_docNumber">{{ docyear }}</span></p>
 
   <p id="boilerplate-message">

data/lib/metanorma/iso/boilerplate.xml

@@ -1,6 +1,9 @@
 <boilerplate>
   <copyright-statement>
     <clause>
+      {% if stage_int >= 40 %}
+      <title>COPYRIGHT PROTECTED DOCUMENT</title>
+      {% endif %}
       <p id="boilerplate-year">&#xa9; <span class="std_publisher">{{ agency }}</span> <span class="std_docNumber">{{ docyear }}</span></p>
 
   <p id="boilerplate-message">

data/lib/metanorma/iso/cleanup.rb

@@ -1,8 +1,5 @@
 require "date"
-require "nokogiri"
 require "htmlentities"
-require "json"
-require "pathname"
 
 module Metanorma
   module ISO
@@ -15,8 +12,7 @@ module Metanorma
 
       POST_NORMREF_FOOTNOTES =
         "//sections//clause[not(@type = 'scope')]//fn | "\
-        "//annex//fn | "\
-        "//references[@normative = 'false']//fn".freeze
+        "//annex//fn | //references[@normative = 'false']//fn".freeze
 
       def other_footnote_renumber(xmldoc)
         seen = {}
@@ -40,7 +36,7 @@ module Metanorma
         xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']"\
                      "/organization").each_with_object([]) do |x, prefix|
           x1 = x.at("abbreviation")&.text || x.at("name")&.text
-          #(x1 == "ISO" and prefix.unshift("ISO")) or prefix << x1
+          # (x1 == "ISO" and prefix.unshift("ISO")) or prefix << x1
           prefix << x1
         end
       end
@@ -118,9 +114,7 @@ module Metanorma
         super
         return unless @amd
 
-        xml.xpath("//*[@inline-header]").each do |h|
-          h.delete("inline-header")
-        end
+        xml.xpath("//*[@inline-header]").each { |h| h.delete("inline-header") }
       end
 
       def boilerplate_file(_xmldoc)
@@ -170,8 +164,7 @@ module Metanorma
 
             if id = replacement_standard(b)
               insert_unpub_note(b, @i18n.cancelled_and_replaced.sub(/%/, id))
-            else
-              insert_unpub_note(b, @i18n.withdrawn)
+            else insert_unpub_note(b, @i18n.withdrawn)
             end
           end
       end
@@ -209,6 +202,51 @@ module Metanorma
         @vocab and return
         super
       end
+
+      def bibdata_cleanup(xmldoc)
+        super
+        approval_groups_rename(xmldoc)
+        editorial_groups_agency(xmldoc)
+        editorial_group_types(xmldoc)
+      end
+
+      def approval_groups_rename(xmldoc)
+        %w(technical-committee subcommittee workgroup).each do |v|
+          xmldoc.xpath("//bibdata//approval-#{v}").each { |a| a.name = v }
+        end
+      end
+
+      def editorial_groups_agency(xmldoc)
+        pubs = extract_publishers(xmldoc)
+        xmldoc.xpath("//bibdata/ext/editorialgroup").each do |e|
+          pubs.reverse.each do |p|
+            if e.children.empty? then e << "<agency>#{p}</agency>"
+            else e.children.first.previous = "<agency>#{p}</agency>"
+            end
+          end
+        end
+      end
+
+      def extract_publishers(xmldoc)
+        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']/"\
+                     "organization").each_with_object([]) do |p, m|
+          x = p.at("./abbreviation") || p.at("./name") or next
+          m << x.text
+        end
+      end
+
+      DEFAULT_EDGROUP_TYPE = { "technical-committee": "TC",
+                               subcommittee: "SC", workgroup: "WG" }.freeze
+
+      def editorial_group_types(xmldoc)
+        %w(technical-committee subcommittee workgroup).each do |v|
+          xmldoc.xpath("//bibdata//#{v} | //bibdata//approval-#{v}").each do |g|
+            next if g["type"]
+
+            g["type"] = DEFAULT_EDGROUP_TYPE[v.to_sym]
+          end
+        end
+      end
     end
   end
 end

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

@@ -282,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -324,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -360,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -694,6 +703,9 @@
       <optional>
         <attribute name="tag"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="multilingual-rendering">
           <ref name="MultilingualRenderingType"/>
@@ -729,6 +741,9 @@
         <optional>
           <attribute name="tag"/>
         </optional>
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <optional>
           <attribute name="multilingual-rendering">
             <ref name="MultilingualRenderingType"/>
@@ -2050,6 +2065,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,7 @@
         <ref name="horizontal"/>
       </optional>
       <ref name="editorialgroup"/>
+      <ref name="approvalgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
@@ -249,6 +250,7 @@
         <value>warning</value>
         <value>important</value>
         <value>safety precautions</value>
+        <value>editorial</value>
       </choice>
     </define>
     <define name="preface">
@@ -308,18 +310,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 +358,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/macros.rb

@@ -0,0 +1,29 @@
+module Metanorma
+  module ISO
+    class EditorAdmonitionBlock < Asciidoctor::Extensions::BlockProcessor
+      use_dsl
+      named :EDITOR
+      on_contexts :example, :paragraph
+
+      def process(parent, reader, attrs)
+        attrs["name"] = "editorial"
+        attrs["caption"] = "EDITOR"
+        create_block(parent, :admonition, reader.lines, attrs,
+                     content_model: :compound)
+      end
+    end
+
+    class EditorInlineAdmonitionBlock < Asciidoctor::Extensions::Treeprocessor
+      def process(document)
+        (document.find_by context: :paragraph).each do |para|
+          next unless /^EDITOR: /.match? para.lines[0]
+
+          para.set_attr("name", "editorial")
+          para.set_attr("caption", "EDITOR")
+          para.lines[0].sub!(/^EDITOR: /, "")
+          para.context = :admonition
+        end
+      end
+    end
+  end
+end

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.0".freeze
+    VERSION = "2.1.3".freeze
   end
 end