metanorma-iso 2.0.8.1 → 2.1.2

data/lib/metanorma/iso/base.rb

@@ -5,10 +5,16 @@ require "pathname"
 require "open-uri"
 require "isodoc"
 require "fileutils"
+require_relative "macros"
 
 module Metanorma
   module ISO
     class Converter < Standoc::Converter
+      Asciidoctor::Extensions.register do
+        block Metanorma::ISO::EditorAdmonitionBlock
+        treeprocessor Metanorma::ISO::EditorInlineAdmonitionBlock
+      end
+
       XML_ROOT_TAG = "iso-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/iso".freeze
 
@@ -25,6 +31,10 @@ module Metanorma
         IsoDoc::Iso::WordConvert.new(doc_extract_attributes(node))
       end
 
+      def doc_extract_attributes(node)
+        super.merge(isowordtemplate: node.attr("iso-word-template"))
+      end
+
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
@@ -49,7 +59,16 @@ module Metanorma
 
       def ol_attrs(node)
         attr_code(keep_attrs(node)
-                  .merge(id: ::Metanorma::Utils::anchor_or_uuid(node)))
+                  .merge(id: ::Metanorma::Utils::anchor_or_uuid(node),
+                         start: node.attr("start")))
+      end
+
+      def admonition_name(node)
+        name = super
+        a = node.attr("type") and ["editorial"].each do |t|
+          name = t if a.casecmp(t).zero?
+        end
+        name
       end
 
       def outputs(node, ret)

data/lib/metanorma/iso/biblio.rng

@@ -614,12 +614,12 @@
     <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>
@@ -851,17 +851,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>
@@ -957,36 +986,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">

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

@@ -1,7 +1,10 @@
 <boilerplate>
   <copyright-statement>
     <clause>
-    <p id="boilerplate-year">&#xa9; {{ agency }} {{ docyear }}</p>
+      {% 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">
     Droits de reproduction réservés. Sauf indication contraire, ou requise dans le cadre de sa mise en œuvre,

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

@@ -1,9 +1,10 @@
 <boilerplate>
   <copyright-statement>
     <clause>
-    <p id="boilerplate-year">
-    &#xa9; {{ agency }} {{ docyear }}
-  </p>
+      {% 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">
     Все права защищены. Если иначе не определено или не требуется в контексте его реализации, никакая часть этой публикации не может быть воспроизведена или использована иначе в любой форме или каким-либо образом, электронным или механическим, включая фотокопирование, или публикацию в Интернете или интранете, без предварительного письменного разрешения. Разрешение может быть запрошено ISO по адресу, указанному ниже, или у органа — члена ISO страны запрашивающего.

data/lib/metanorma/iso/boilerplate.xml

@@ -1,9 +1,10 @@
 <boilerplate>
   <copyright-statement>
     <clause>
-    <p id="boilerplate-year">
-    &#xa9; {{ agency }} {{ docyear }}
-  </p>
+      {% 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">
     All rights

data/lib/metanorma/iso/cleanup.rb

@@ -40,7 +40,8 @@ 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
 
@@ -208,6 +209,33 @@ module Metanorma
         @vocab and return
         super
       end
+
+      def bibdata_cleanup(xmldoc)
+        super
+        approval_groups_rename(xmldoc)
+        editorial_groups_agency(xmldoc)
+      end
+
+      def approval_groups_rename(xmldoc)
+        %w(technical-committee subcommittee workgroup).each do |v|
+          xmldoc.xpath("//bibdata//approval-#{v}").each do |a|
+            a.name = v
+          end
+        end
+      end
+
+      def editorial_groups_agency(xmldoc)
+        pubs = 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
+        xmldoc.xpath("//bibdata/ext/editorialgroup").each do |e|
+          pubs.reverse.each do |p|
+            e.children.first.previous = "<agency>#{p}</agency>"
+          end
+        end
+      end
     end
   end
 end

data/lib/metanorma/iso/front.rb

@@ -81,11 +81,35 @@ 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|
+            committee_component(v, node, a)
+          end
+          node.attr("secretariat") and a.secretariat(node.attr("secretariat"))
+        end
+      end
+
+      def metadata_approval_committee(node, xml)
+        types = %w(technical-committee subcommittee workgroup)
+        node.attr("approval-technical-committee-number") and
+          types = %w(approval-technical-committee approval-subcommittee
+                     approval-workgroup)
+        xml.approvalgroup do |a|
+          metadata_approval_agency(a, node.attr("approval-agency")
+            &.split(%r{[/,;]}))
+          types.each { |v| committee_component(v, node, a) }
+        end
+      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 +170,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 +187,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

@@ -32,6 +32,43 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="admonition">
+      <element name="admonition">
+        <attribute name="type">
+          <ref name="AdmonitionType"/>
+        </attribute>
+        <optional>
+          <attribute name="class"/>
+        </optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -245,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -287,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -323,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -851,6 +897,16 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -1178,6 +1234,7 @@
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
+      <ref name="span"/>
     </choice>
   </define>
   <define name="add">
@@ -1204,6 +1261,14 @@
       </choice>
     </element>
   </define>
+  <define name="span">
+    <element name="span">
+      <attribute name="class"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

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

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.0.8.1".freeze
+    VERSION = "2.1.2".freeze
   end
 end

data/lib/metanorma-iso.rb

@@ -7,6 +7,7 @@ require_relative "isodoc/iso/pdf_convert"
 require_relative "isodoc/iso/sts_convert"
 require_relative "isodoc/iso/isosts_convert"
 require_relative "isodoc/iso/presentation_xml_convert"
+require_relative "html2doc/lists"
 require "asciidoctor/extensions"
 
 if defined? Metanorma

data/lib/relaton/render/config.yml

@@ -0,0 +1,4 @@
+template:
+  # skip standardidentifier, it is inserted in front of formattedref within metanorma
+  standard: "<em><span_class='stddocTitle'>{{ title }}</span></em> ,_{{ extent }}." 
+  website: "{{ creatornames }} ({{ role }}) . <em><span_class='stddocTitle'>{{ title }}</span></em> [website]. {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{ place }}: {{ publisher }}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ standardidentifier | first }}. {{ labels['availablefrom'] }}:_<span_class='biburl'>{{ uri }}</span>. [{{ labels['viewed'] }}:_{{date_accessed}}]. "

data/lib/relaton/render/general.rb

@@ -0,0 +1,13 @@
+require "relaton-render"
+
+module Relaton
+  module Render
+    module Iso
+      class General < ::Relaton::Render::IsoDoc::General
+        def config_loc
+          YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
+        end
+      end
+    end
+  end
+end

data/metanorma-iso.gemspec

@@ -29,7 +29,7 @@ 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.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.1.0"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "tokenizer", "~> 0.3.0"