metanorma-iso 2.4.7 → 2.5.0

data/lib/isodoc/iso/word_dis_convert.rb

@@ -46,12 +46,6 @@ module IsoDoc
         { class: "TableTitle", style: "text-align:center;" }
       end
 
-      def span_parse(node, out)
-        out.span class: node["class"] do |x|
-          node.children.each { |n| parse(n, x) }
-        end
-      end
-
       def word_toc_preface(level)
         <<~TOC.freeze
           <span lang="EN-GB"><span
@@ -68,7 +62,7 @@ module IsoDoc
 
       def toWord(result, filename, dir, header)
         result = from_xhtml(word_cleanup(to_xhtml(result)))
-          .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
+          .gsub("-DOUBLE_HYPHEN_ESCAPE-", "--")
         @wordstylesheet = wordstylesheet_update
         ::Html2Doc::IsoDIS.new(
           filename: filename,
@@ -86,30 +80,39 @@ module IsoDoc
         middle_title_dis(out)
       end
 
-      def middle_title_dis(out)
+      def middle_title_dis(node, out)
         out.p(class: "zzSTDTitle") do |p|
-          p << @meta.get[:doctitleintro]
-          @meta.get[:doctitleintro] && @meta.get[:doctitlemain] and p << " &#x2014; "
-          p << @meta.get[:doctitlemain]
-          @meta.get[:doctitlemain] && @meta.get[:doctitlepart] and p << " &#x2014; "
-          if @meta.get[:doctitlepart]
-            b = @meta.get[:doctitlepartlabel] and
-              p << "<span style='font-weight:normal'>#{b}:</span> "
-            p << " #{@meta.get[:doctitlepart]}"
+          node.children.each { |n| parse(n, p) }
+        end
+      end
+
+      def middle_title_amd(node, out)
+        out.p(class: "zzSTDTitle2") do |p|
+          p.span(style: "font-weight:normal") do |s|
+            node.children.each { |n| parse(n, s) }
           end
-          @meta.get[:doctitleamdlabel] || @meta.get[:doctitleamd] ||
-            @meta.get[:doctitlecorrlabel] and middle_title_dis_amd(p)
         end
       end
 
-      def middle_title_dis_amd(para)
-        para.span(style: "font-weight:normal") do |p|
-          if a = @meta.get[:doctitleamdlabel]
-            p << " #{a}"
-            a = @meta.get[:doctitleamd] and p << ": #{a}"
+      def para_parse(node, out)
+        case node["class"]
+        when "zzSTDTitle1" then middle_title_dis(node, out)
+        when "zzSTDTitle2" then middle_title_amd(node, out)
+        else super
+        end
+      end
+
+      def span_parse(node, out)
+        case node["class"]
+        when "nonboldtitle"
+          out.span(style: "font-weight:normal") do |s|
+            node.children.each { |n| parse(n, s) }
           end
-          if a = @meta.get[:doctitlecorrlabel]
-            p << " #{a}"
+        when "boldtitle"
+          node.children.each { |n| parse(n, out) }
+        else
+          out.span class: node["class"] do |x|
+            node.children.each { |n| parse(n, x) }
           end
         end
       end

data/lib/isodoc/iso/xref.rb

@@ -43,7 +43,7 @@ module IsoDoc
           n = Counter.new
           n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
           n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
-          doc.xpath(ns("//sections/clause[not(@type = 'scope')] | " \
+          doc.xpath(ns("//sections/clause[not(@type = 'scope')][not(.//references)] | " \
                        "//sections/terms | //sections/definitions")).each do |c|
             n = section_names(c, n, 1)
           end

data/lib/metanorma/iso/front.rb

@@ -12,15 +12,18 @@ module Metanorma
       def metadata_ext(node, xml)
         super
         structured_id(node, xml)
-        id = iso_id_default(iso_id_params(node))
-        id.stage and metadata_stage(id, xml)
+        metadata_stage(node, xml)
         @amd && a = node.attr("updates-document-type") and
           xml.updates_document_type a
       end
 
-      def metadata_stage(id, xml)
-        xml.stagename metadata_stagename(id)&.strip,
-                      **attr_code(abbreviation: id.typed_stage_abbrev&.strip)
+      def metadata_stage(node, xml)
+        id = iso_id_default(iso_id_params(node))
+        id.stage and
+          xml.stagename metadata_stagename(id)&.strip,
+                        **attr_code(abbreviation: id.typed_stage_abbrev&.strip)
+      rescue Pubid::Core::Errors::HarmonizedStageCodeInvalidError,
+             Pubid::Core::Errors::TypeStageParseError
       end
 
       def metadata_stagename(id)
@@ -95,8 +98,17 @@ module Metanorma
         xml.status do |s|
           s.stage stage, **attr_code(abbreviation: abbrev)
           s.substage substage
-          node.attr("iteration") && (s.iteration node.attr("iteration"))
+          i = node.attr("iteration") and s.iteration i
         end
+      rescue Pubid::Core::Errors::HarmonizedStageCodeInvalidError,
+             Pubid::Core::Errors::TypeStageParseError
+        report_illegal_stage(stage, substage)
+      end
+
+      def report_illegal_stage(stage, substage)
+        err = "Illegal document stage: #{stage}.#{substage}"
+        @log.add("Document Attributes", nil, err)
+        warn err
       end
 
       def metadata_committee(node, xml)

data/lib/metanorma/iso/front_id.rb

@@ -10,41 +10,6 @@ require "pubid-iso"
 module Metanorma
   module ISO
     class Converter < Standoc::Converter
-      STAGE_ABBRS = {
-        "00": "PWI",
-        "10": "NP",
-        "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"
-        ret = nil if stage == "60" && substage != "00"
-        ret = "AWI" if stage == "10" && substage == "99"
-        ret = "AWI" if stage == "20" && substage == "00"
-        ret
-      end
-
       def metadata_id(node, xml)
         if id = node.attr("docidentifier")
           xml.docidentifier id, **attr_code(type: "ISO")
@@ -103,23 +68,19 @@ module Metanorma
 
       def iso_id_params_add(node)
         stage = iso_id_stage(node)
-
         ret = { number: node.attr("amendment-number") ||
           node.attr("corrigendum-number"),
                 year: iso_id_year(node),
                 iteration: node.attr("iteration") }.compact
-        stage and ret[:stage] = stage
-        ret[:stage] == "60.00" and ret[:stage] = :PRF
+        if stage
+          ret[:stage] = stage
+          ret[:stage] == "60.00" and ret[:stage] = :PRF
+        end
         ret
       end
 
       def iso_id_stage(node)
-        stage = stage_abbr(get_stage(node), get_substage(node),
-                           doctype(node))
-        harmonised = "#{get_stage(node)}.#{get_substage(node)}"
-        harmonised = nil unless /^\d\d\.\d\d/.match?(harmonised)
-        { abbr: stage&.to_sym, harmonized_code: harmonised }
-        harmonised || stage&.to_sym
+        "#{get_stage(node)}.#{get_substage(node)}"
       end
 
       def iso_id_year(node)
@@ -195,7 +156,7 @@ module Metanorma
       def structured_id(node, xml)
         return unless node.attr("docnumber")
 
-        part, subpart = node&.attr("partnumber")&.split(/-/)
+        part, subpart = node&.attr("partnumber")&.split("-")
         xml.structuredidentifier do |i|
           i.project_number(node.attr("docnumber"), **attr_code(
             part: part, subpart: subpart,

data/lib/metanorma/iso/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.2 -->
+<!-- VERSION v1.2.3 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -192,9 +192,11 @@
         </attribute>
       </optional>
       <attribute name="citeas"/>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
+      <optional>
+        <attribute name="type">
+          <ref name="ReferenceFormat"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -836,6 +838,26 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="stem">
+      <element name="stem">
+        <attribute name="type">
+          <choice>
+            <value>MathML</value>
+            <value>AsciiMath</value>
+            <value>LatexMath</value>
+          </choice>
+        </attribute>
+        <attribute name="block">
+          <data type="boolean"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="em">
       <element name="em">
         <zeroOrMore>

data/lib/metanorma/iso/validate.rb

@@ -132,20 +132,6 @@ module Metanorma
                    "#{script} is not a recognised script")
       end
 
-      def stage_validate(xmldoc)
-        stage = xmldoc&.at("//bibdata/status/stage")&.text
-        %w(00 10 20 30 40 50 60 90 95).include? stage or
-          @log.add("Document Attributes", nil,
-                   "#{stage} is not a recognised stage")
-      end
-
-      def substage_validate(xmldoc)
-        substage = xmldoc&.at("//bibdata/status/substage")&.text or return
-        %w(00 20 60 90 92 93 98 99).include? substage or
-          @log.add("Document Attributes", nil,
-                   "#{substage} is not a recognised substage")
-      end
-
       def iteration_validate(xmldoc)
         iteration = xmldoc&.at("//bibdata/status/iteration")&.text or return
         /^\d+/.match(iteration) or
@@ -156,8 +142,6 @@ module Metanorma
       def bibdata_validate(doc)
         doctype_validate(doc)
         script_validate(doc)
-        stage_validate(doc)
-        substage_validate(doc)
         iteration_validate(doc)
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.4.7".freeze
+    VERSION = "2.5.0".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.4.3"
+  spec.add_dependency "metanorma-standoc", "~> 2.5.0"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid-iso", "~> 0.5.0"
   spec.add_dependency "ruby-jing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement