metanorma-iso 1.3.25 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 766cfd076caf6c78f48542cc22353664f2ee4667be97659e201643418b4990ad
-  data.tar.gz: 667d8b7ed3ac77f49a88cd74cae0eaa3f097c2d65c3ed4269806351fdc87e07e
+  metadata.gz: d1cf4345d777fb37031e719c6121a5f27fd23dc56ebacab1a099aa2c108a82d2
+  data.tar.gz: d571ce7dcd5a38ebc7e19460b7ab65e2f77499ab46a836d74857d7f6eb78f88d
 SHA512:
-  metadata.gz: 35ab4b8f52d75727d867920d7de2bd8696e37e38715dcc3895fe67f821311b6a13ac71e5d3a65096694ce800972e81fce5a881d861b534d911cdfcdf17d6f73f
-  data.tar.gz: 3d11aecb223c66aa9b2cc1c68bd9b6c227b6ea4710b3afa11556ba0351d969efcf8b39911899670aeab7af43ea6b1aeee8ba56196c575fd802fcb250cfb0a622
+  metadata.gz: 8ed62ccec92b596bb8063267750c04e1df0ffc6376d2339b5771b1780400c526041793d37a1cb115117dafb35e45d1f680244d1ce1bd975a010703ec9bbaff25
+  data.tar.gz: 97a5255d0a7ee3992dde8b88b005aa3aab743ed03f2b0983cb7c02bea1b010c988f28ad1f1bbf9086356ff32f2a6eb8fed164b65b20887a83fa58da2e49500d9

data/.github/workflows/macos.yml

@@ -29,7 +29,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         run: |
           sudo gem install bundler --force

data/.github/workflows/ubuntu.yml

@@ -29,14 +29,17 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         run: |
           gem install bundler
           bundle install --jobs 4 --retry 3
       - name: Install PlantUML
-        run: |
-          sudo bash -c "curl -L https://github.com/riboseinc/plantuml-install/raw/master/ubuntu.sh | bash"
+        uses: nick-invision/retry@v1
+        with:
+          polling_interval_seconds: 5
+          timeout_minutes: 5
+          max_attempts: 3
+          command: sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/windows.yml

@@ -29,7 +29,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         shell: pwsh
         run: |

data/Gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 #gem "asciimath", git: "https://github.com/asciidoctor/asciimath"
+
 gemspec
 
 if File.exist? 'Gemfile.devel'

data/Rakefile

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'isodoc/gem_tasks'
 
+IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec

data/lib/asciidoctor/iso/base.rb

@@ -36,25 +36,28 @@ module Asciidoctor
         IsoDoc::Iso::PdfConvert.new(doc_extract_attributes(node))
       end
 
+      def sts_converter(node)
+        return nil if node.attr("no-pdf")
+        IsoDoc::Iso::StsConvert.new(html_extract_attributes(node))
+      end
+
+      def presentation_xml_converter(node)
+        IsoDoc::Iso::PresentationXMLConvert.new(html_extract_attributes(node))
+      end
+
       def init(node)
         super
         @amd = %w(amendment technical-corrigendum).include? node.attr("doctype")
       end
 
-      def document(node)
-        init(node)
-        ret = makexml(node).to_xml(indent: 2)
-        unless node.attr("nodoc") || !node.attr("docfile")
+      def outputs(node, ret)
           File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
-          html_converter_alt(node).convert(@filename + ".xml")
-          FileUtils.mv "#{@filename}.html", "#{@filename}_alt.html"
-          html_converter(node).convert(@filename + ".xml")
-          doc_converter(node).convert(@filename + ".xml")
-          pdf_converter(node)&.convert(@filename + ".xml")
-        end
-        @log.write(@localdir + @filename + ".err") unless @novalid
-        @files_to_delete.each { |f| FileUtils.rm f }
-        ret
+          presentation_xml_converter(node).convert(@filename + ".xml")
+          html_converter_alt(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}_alt.html")
+          html_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.html")
+          doc_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.doc")
+          pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
+          #sts_converter(node)&.convert(@filename + ".xml")
       end
 
       def load_yaml(lang, script)

data/lib/asciidoctor/iso/biblio.rng

@@ -532,7 +532,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -661,9 +661,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -1021,7 +1021,17 @@
       <optional>
         <ref name="to"/>
       </optional>
-      <ref name="owner"/>
+      <oneOrMore>
+        <ref name="owner"/>
+      </oneOrMore>
+      <optional>
+        <ref name="copyright_scope"/>
+      </optional>
+    </element>
+  </define>
+  <define name="copyright_scope">
+    <element name="scope">
+      <text/>
     </element>
   </define>
   <define name="from">

data/lib/asciidoctor/iso/cleanup.rb

@@ -53,7 +53,7 @@ module Asciidoctor
       # ISO as a prefix goes first
       def docidentifier_cleanup(xmldoc)
         prefix = get_id_prefix(xmldoc)
-        id = xmldoc.at("//bibdata/docidentifier[@type = 'iso']") or return
+        id = xmldoc.at("//bibdata/docidentifier[@type = 'ISO']") or return
         id.content = id_prefix(prefix, id)
         id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
           id.content = id_prefix(prefix, id)

data/lib/asciidoctor/iso/front.rb

@@ -5,154 +5,20 @@ require "json"
 require "pathname"
 require "open-uri"
 require "pp"
+require_relative "front_id"
 
 module Asciidoctor
   module ISO
     class Converter < Standoc::Converter
-       STAGE_ABBRS = {
-        "00": "PWI",
-        "10": "NWIP",
-        "20": "WD",
-        "30": "CD",
-        "40": "DIS",
-        "50": "FDIS",
-        "60": "IS",
-        "90": "(Review)",
-        "95": "(Withdrawal)",
-      }.freeze
-
-       STAGE_NAMES = {
-        "00": "Preliminary work item",
-        "10": "New work item proposal",
-        "20": "Working draft",
-        "30": "Committee draft",
-        "40": "Draft international standard",
-        "50": "Final draft international standard",
-        "60": "International standard",
-        "90": "Review",
-        "95": "Withdrawal",
-      }.freeze
-
-      def stage_abbr(stage, substage, doctype)
-        return nil if stage.to_i > 60
-        return "PRF" if stage == "60" && substage == "00"
-        ret = STAGE_ABBRS[stage.to_sym]
-        ret = "DTS" if ret == "DIS" && %w(technical-report technical-specification).include?(doctype)
-        ret = "FDTS" if ret == "FDIS" && %w(technical-report technical-specification).include?(doctype)
-        ret
-      end
-
-      def stage_name(stage, substage, doctype)
-        return "Proof" if stage == "60" && substage == "00"
-        ret = STAGE_NAMES[stage.to_sym]
-        if %w(technical-report technical-specification).include? doctype
-        ret = "Draft technical standard" if ret == "Draft international standard"
-        ret = "Final draft technical standard" if ret == "Final draft international standard"
-        end
-        ret
-      end
-
-      def metadata_id(node, xml)
-        iso_id(node, xml)
-        node&.attr("tc-docnumber")&.split(/,\s*/)&.each do |n|
-          xml.docidentifier(n, **attr_code(type: "iso-tc"))
-        end
-        xml.docnumber node&.attr("docnumber")
-      end
-
-      def iso_id(node, xml)
-        return unless !@amd && node.attr("docnumber") || @amd && node.attr("updates")
-        dn = iso_id1(node)
-        dn1 = id_stage_prefix(dn, node, false)
-        dn2 = id_stage_prefix(dn, node, true)
-        xml.docidentifier dn1, **attr_code(type: "iso")
-        xml.docidentifier id_langsuffix(dn1, node), **attr_code(type: "iso-with-lang")
-        xml.docidentifier id_langsuffix(dn2, node), **attr_code(type: "iso-reference")
-      end
-
-      def iso_id1(node)
-        if @amd
-          dn = node.attr("updates")
-          return add_amd_parts(dn, node)
-        else
-          part, subpart = node&.attr("partnumber")&.split(/-/)
-          dn = add_id_parts(node.attr("docnumber"), part, subpart)
-        end
-      end
-
-      def add_amd_parts(dn, node)
-        a = node.attr("amendment-number")
-        c = node.attr("corrigendum-number")
-        case node.attr("doctype")
-        when "amendment"
-          "#{dn}/Amd.#{node.attr('amendment-number')}"
-        when "technical corrigendum"
-          "#{dn}/Cor.#{node.attr('corrigendum-number')}"
-        end
-      end
-
-      def id_langsuffix(dn, node)
-        lang = node.attr("language") || "en"
-        suffix = case lang
-                 when "en" then "(E)"
-                 when "fr" then "(F)"
-                 else
-                   "(X)"
-                 end
-        "#{dn}#{suffix}"
-      end
-
       def metadata_ext(node, xml)
         super
         structured_id(node, xml)
-        xml.stagename stage_name(get_stage(node), get_substage(node), node.attr("doctype"))
+        xml.stagename stage_name(get_stage(node), get_substage(node),
+                                 node.attr("doctype"), node.attr("iteration"))
         @amd && a = node.attr("updates-document-type") and
           xml.updates_document_type a
       end
 
-      def structured_id(node, xml)
-        return unless node.attr("docnumber")
-        part, subpart = node&.attr("partnumber")&.split(/-/)
-        xml.structuredidentifier do |i|
-          i.project_number node.attr("docnumber"),
-            **attr_code(part: part, subpart: subpart, amendment: node.attr("amendment-number"),
-                        corrigendum: node.attr("corrigendum-number"), origyr: node.attr("created-date"))
-        end
-      end
-
-      def add_id_parts(dn, part, subpart)
-        dn += "-#{part}" if part
-        dn += "-#{subpart}" if subpart
-        dn
-      end
-
-      def id_stage_abbr(stage, substage, node)
-        IsoDoc::Iso::Metadata.new("en", "Latn", {}).
-          status_abbrev(stage_abbr(stage, substage, node.attr("doctype")),
-          substage, node.attr("iteration"),
-          node.attr("draft"), node.attr("doctype"))
-      end
-
-      def id_stage_prefix(dn, node, force_year)
-        stage = get_stage(node)
-        substage = get_substage(node)
-        typeabbr = get_typeabbr(node)
-        if stage && (stage.to_i < 60)
-          abbr = id_stage_abbr(stage, substage, node)
-          unless abbr.nil? || abbr.empty? # prefixes added in cleanup
-            dn = @amd ? dn.sub(/ /, "/#{abbr} ") : "/#{abbr} #{typeabbr}#{dn}"
-          end
-        elsif typeabbr && !@amd
-          dn = "/#{typeabbr}#{dn}"
-        end
-        if force_year || !(stage && (stage.to_i < 60))
-          year = @amd ? (node.attr("copyright-year") || node.attr("updated-date").sub(/-.*$/, "")) :
-            node.attr("copyright-year")
-          dn += ":#{year}" if year
-        end
-        dn
-      end
-
       def organization(org, orgname)
         if ["ISO",
             "International Organization for Standardization"].include? orgname
@@ -199,24 +65,6 @@ module Asciidoctor
         end
       end
 
-      def get_stage(node)
-        stage = node.attr("status") || node.attr("docstage") || "60"
-      end
-
-      def get_substage(node)
-        stage = get_stage(node)
-        node.attr("docsubstage") || ( stage == "60" ? "60" : "00" )
-      end
-
-      def get_typeabbr(node)
-        case node.attr("doctype")
-        when "technical-report" then "TR "
-        when "technical-specification" then "TS "
-        else
-          nil
-        end
-      end
-
       def metadata_status(node, xml)
         stage = get_stage(node)
         substage = get_substage(node)

data/lib/asciidoctor/iso/front_id.rb

@@ -0,0 +1,196 @@
+require "date"
+require "nokogiri"
+require "htmlentities"
+require "json"
+require "pathname"
+require "open-uri"
+require "twitter_cldr"
+
+module Asciidoctor
+  module ISO
+    class Converter < Standoc::Converter
+      STAGE_ABBRS = {
+        "00": "PWI",
+        "10": "NWIP",
+        "20": "WD",
+        "30": "CD",
+        "40": "DIS",
+        "50": "FDIS",
+        "60": "IS",
+        "90": "(Review)",
+        "95": "(Withdrawal)",
+      }.freeze
+
+      STAGE_NAMES = {
+        "00": "Preliminary work item",
+        "10": "New work item proposal",
+        "20": "Working draft",
+        "30": "Committee draft",
+        "40": "Draft",
+        "50": "Final draft",
+        "60": "International standard",
+        "90": "Review",
+        "95": "Withdrawal",
+      }.freeze
+
+      def stage_abbr(stage, substage, doctype)
+        return nil if stage.to_i > 60
+        ret = STAGE_ABBRS[stage.to_sym]
+        ret = "PRF" if stage == "60" && substage == "00"
+        if %w(amendment technical-corrigendum technical-report 
+          technical-specification).include?(doctype)
+          ret = "NP" if stage == "10"
+          ret = "AWI" if stage == "10" && substage == "99"
+          ret = "D" if stage == "40" and doctype == "amendment"
+          ret = "FD" if stage == "50" and
+            %w(amendment technical-corrigendum).include?(doctype)
+          ret = "D" if stage == "50" and
+            %w(technical-report technical-specification).include?(doctype)
+        end
+        ret
+      end
+
+      def stage_name(stage, substage, doctype, iteration = nil)
+        return "Proof" if stage == "60" && substage == "00"
+        ret = STAGE_NAMES[stage.to_sym]
+        if iteration && %w(20 30).include?(stage)
+          prefix  = iteration.to_i.localize(@lang.to_sym).
+            to_rbnf_s("SpelloutRules", "spellout-ordinal")
+          ret = "#{prefix.capitalize} #{ret.downcase}"
+        end
+        ret
+      end
+
+      def metadata_id(node, xml)
+        iso_id(node, xml)
+        node&.attr("tc-docnumber")&.split(/,\s*/)&.each do |n|
+          xml.docidentifier(n, **attr_code(type: "iso-tc"))
+        end
+        xml.docnumber node&.attr("docnumber")
+      end
+
+      def iso_id(node, xml)
+        return unless !@amd && node.attr("docnumber") ||
+          @amd && node.attr("updates")
+        dn = iso_id1(node)
+        dn1 = id_stage_prefix(dn, node, false)
+        dn2 = id_stage_prefix(dn, node, true)
+        xml.docidentifier dn1, **attr_code(type: "ISO")
+        xml.docidentifier id_langsuffix(dn1, node),
+          **attr_code(type: "iso-with-lang")
+        xml.docidentifier id_langsuffix(dn2, node),
+          **attr_code(type: "iso-reference")
+      end
+
+      def iso_id1(node)
+        if @amd
+          dn = node.attr("updates")
+          return add_amd_parts(dn, node)
+        else
+          part, subpart = node&.attr("partnumber")&.split(/-/)
+          return add_id_parts(node.attr("docnumber"), part, subpart)
+        end
+      end
+
+      def add_amd_parts(dn, node)
+        a = node.attr("amendment-number")
+        c = node.attr("corrigendum-number")
+        case node.attr("doctype")
+        when "amendment"
+          "#{dn}/Amd #{node.attr('amendment-number')}"
+        when "technical-corrigendum"
+          "#{dn}/Cor.#{node.attr('corrigendum-number')}"
+        end
+      end
+
+      def id_langsuffix(dn, node)
+        lang = node.attr("language") || "en"
+        suffix = case lang
+                 when "en" then "(E)"
+                 when "fr" then "(F)"
+                 else
+                   "(X)"
+                 end
+        "#{dn}#{suffix}"
+      end
+
+      def structured_id(node, xml)
+        return unless node.attr("docnumber")
+        part, subpart = node&.attr("partnumber")&.split(/-/)
+        xml.structuredidentifier do |i|
+          i.project_number node.attr("docnumber"),
+            **attr_code(part: part, subpart: subpart,
+                        amendment: node.attr("amendment-number"),
+                        corrigendum: node.attr("corrigendum-number"),
+                        origyr: node.attr("created-date"))
+        end
+      end
+
+      def add_id_parts(dn, part, subpart)
+        dn += "-#{part}" if part
+        dn += "-#{subpart}" if subpart
+        dn
+      end
+
+      def id_stage_abbr(stage, substage, node)
+        ret = IsoDoc::Iso::Metadata.new("en", "Latn", {}).
+          status_abbrev(stage_abbr(stage, substage, node.attr("doctype")),
+                        substage, node.attr("iteration"),
+                        node.attr("draft"), node.attr("doctype"))
+        if %w(amendment technical-corrigendum amendment
+          technical-corrigendum).include?(node.attr("doctype"))
+          ret = ret + " " unless %w(40 50).include?(stage)
+        end
+        ret
+      end
+
+      def id_stage_prefix(dn, node, force_year)
+        stage = get_stage(node)
+        typeabbr = get_typeabbr(node)
+        if stage && (stage.to_i < 60)
+          dn = unpub_stage_prefix(dn, stage, typeabbr, node)
+        elsif typeabbr && !@amd then dn = "/#{typeabbr}#{dn}"
+        end
+        (force_year || !(stage && (stage.to_i < 60))) and
+          dn = id_add_year(dn, node)
+        dn
+      end
+
+      def unpub_stage_prefix(dn, stage, typeabbr, node)
+        abbr = id_stage_abbr(stage, get_substage(node), node)
+        %w(40 50).include?(stage) && i = node.attr("iteration") and
+          itersuffix = ".#{i}"
+        return dn if abbr.nil? || abbr.empty? # prefixes added in cleanup
+        return "/#{abbr}#{typeabbr} #{dn}#{itersuffix}" unless @amd
+        a = dn.split(%r{/})
+        a[-1] = "#{abbr}#{a[-1]}#{itersuffix}"
+        a.join("/")
+      end
+
+      def id_add_year(dn, node)
+        year = node.attr("copyright-year")
+        @amd and year ||= node.attr("updated-date")&.sub(/-.*$/, "")
+        dn += ":#{year}" if year
+        dn
+      end
+
+      def get_stage(node)
+        stage = node.attr("status") || node.attr("docstage") || "60"
+      end
+
+      def get_substage(node)
+        stage = get_stage(node)
+        node.attr("docsubstage") || ( stage == "60" ? "60" : "00" )
+      end
+
+      def get_typeabbr(node)
+        case node.attr("doctype")
+        when "technical-report" then "TR "
+        when "technical-specification" then "TS "
+        else
+          nil
+        end
+      end
+    end
+  end
+end