metanorma-iso 2.7.0 → 2.7.2

data/lib/isodoc/iso/metadata.rb

@@ -28,6 +28,9 @@ module IsoDoc
         revdate = isoxml.at(ns("//bibdata/version/revision-date"))
         set(:revdate, revdate&.text)
         docstatus and docstatus1(isoxml, docstatus)
+        docscheme = isoxml.at(ns("//presentation-metadata[name" \
+          "[text() = 'document-scheme']]/value"))
+        docscheme and set(:document_scheme, docscheme.text)
       end
 
       def docstatus1(isoxml, docstatus)
@@ -69,9 +72,8 @@ module IsoDoc
                      ru: "ТЕХНИЧЕСКОЕ ИСПРАВЛЕНИЕ" }.freeze
 
       def part_title(part, titlenums, lang)
-        return "" unless part
-
-        suffix = @c.encode(part.text, :hexadecimal)
+        part or return ""
+        suffix = part.children.to_xml
         p = titlenums[:part]
         titlenums[:part] && titlenums[:subpart] and
           p = "#{titlenums[:part]}–#{titlenums[:subpart]}"
@@ -98,10 +100,9 @@ module IsoDoc
       def compose_title(tparts, tnums, lang)
         main = ""
         tparts[:main].nil? or
-          main = @c.encode(tparts[:main].text, :hexadecimal)
+          main = tparts[:main].children.to_xml
         tparts[:intro] and
-          main = "#{@c.encode(tparts[:intro].text,
-                              :hexadecimal)} — #{main}"
+          main = "#{tparts[:intro].children.to_xml} — #{main}"
         if tparts[:part]
           suffix = part_title(tparts[:part], tnums, lang)
           main = "#{main} — #{suffix}"
@@ -136,18 +137,14 @@ module IsoDoc
         # intro, main, part, amd = title_parts(isoxml, lang)
         tp = title_parts(isoxml, lang)
         tn = title_nums(isoxml)
-
-        set(:doctitlemain,
-            @c.encode(tp[:main] ? tp[:main].text : "", :hexadecimal))
+        set(:doctitlemain, tp[:main] ? tp[:main].children.to_xml : "")
         main = compose_title(tp, tn, lang)
         set(:doctitle, main)
-        tp[:intro] and
-          set(:doctitleintro,
-              @c.encode(tp[:intro] ? tp[:intro].text : "", :hexadecimal))
+        tp[:intro] and set(:doctitleintro, tp[:intro].children.to_xml)
         set(:doctitlepartlabel, part_prefix(tn, lang))
-        set(:doctitlepart, @c.encode(tp[:part].text, :hexadecimal)) if tp[:part]
+        set(:doctitlepart, tp[:part].children.to_xml) if tp[:part]
         set(:doctitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
-        set(:doctitleamd, @c.encode(tp[:amd].text, :hexadecimal)) if tp[:amd]
+        set(:doctitleamd, tp[:amd].children.to_xml) if tp[:amd]
         set(:doctitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
       end
 
@@ -156,19 +153,14 @@ module IsoDoc
         tp = title_parts(isoxml, lang)
         tn = title_nums(isoxml)
 
-        set(:docsubtitlemain,
-            @c.encode(tp[:main] ? tp[:main].text : "", :hexadecimal))
+        set(:docsubtitlemain, tp[:main] ? tp[:main].children.to_xml : "")
         main = compose_title(tp, tn, lang)
         set(:docsubtitle, main)
-        tp[:intro] and
-          set(:docsubtitleintro,
-              @c.encode(tp[:intro] ? tp[:intro].text : "", :hexadecimal))
+        tp[:intro] and set(:docsubtitleintro, tp[:intro].children.to_xml)
         set(:docsubtitlepartlabel, part_prefix(tn, lang))
-        tp[:part] and
-          set(:docsubtitlepart,
-              @c.encode(tp[:part].text, :hexadecimal))
+        tp[:part] and set(:docsubtitlepart, tp[:part].children.to_xml)
         set(:docsubtitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
-        set(:docsubtitleamd, @c.encode(tp[:amd].text, :hexadecimal)) if tp[:amd]
+        set(:docsubtitleamd, tp[:amd].children.to_xml) if tp[:amd]
         set(:docsubtitlecorrlabel, corr_prefix(tn, lang)) if tn[:corr]
       end
 

data/lib/isodoc/iso/presentation_bibdata.rb

@@ -68,9 +68,24 @@ module IsoDoc
         edition_translate(bib)
       end
 
-      def bibdata_i18n_stage(bib, stage, type, lang: @lang, i18n: @i18n)
-        return unless stage
+      def edition_translate(bibdata)
+        super
+        @lang == "fr" and e = bibdata.at(ns("./edition[@language = 'fr']")) and
+          e.children = e.text.sub(/(\d+)(\p{L}+)/, "\\1<sup>\\2</sup>")
+        @docscheme == "1951" and edition_replacement(bibdata)
+      end
 
+      def edition_replacement(bibdata)
+        e = bibdata.at(ns("./edition[not(@language) or @language = '']"))&.text
+        if /^\d+$/.match?(e) && e.to_i > 1
+          h = { "var1" => e.to_i, "var2" => e.to_i - 1 }
+          x = @i18n.populate("edition_replacement", h)
+          bibdata.at(ns("./ext")) << "<edn-replacement>#{x}</edn-replacement>"
+        end
+      end
+
+      def bibdata_i18n_stage(bib, stage, type, lang: @lang, i18n: @i18n)
+        stage or return
         i18n.get.dig("stage_dict", stage.text).is_a?(Hash) or
           return hash_translate(bib, i18n.get["stage_dict"],
                                 "./status/stage", lang)

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -9,6 +9,11 @@ require_relative "../../relaton/render/general"
 module IsoDoc
   module Iso
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def convert_i18n_init(docxml)
+        super
+        update_i18n(docxml)
+      end
+
       def convert1(docxml, filename, dir)
         @iso_class = instance_of?(IsoDoc::Iso::PresentationXMLConvert)
         if amd?(docxml)
@@ -49,8 +54,8 @@ module IsoDoc
       def figure1(node)
         lbl = @xrefs.anchor(node["id"], :label, false) or return
         figname = node.parent.name == "figure" ? "" : "#{@i18n.figure} "
-        connective = node.parent.name == "figure" ? "&#xa0; " : "&#xa0;&#x2014; "
-        prefix_name(node, connective, l10n("#{figname}#{lbl}"), "name")
+        conn = node.parent.name == "figure" ? "&#xa0; " : "&#xa0;&#x2014; "
+        prefix_name(node, conn, l10n("#{figname}#{lbl}"), "name")
       end
 
       def example1(node)
@@ -62,8 +67,7 @@ module IsoDoc
       end
 
       def example_span_label(_node, div, name)
-        return if name.nil?
-
+        name.nil? and return
         div.span class: "example_label" do |_p|
           name.children.each { |n| parse(n, div) }
         end
@@ -172,15 +176,23 @@ module IsoDoc
 
       def middle_title_main
         ret = "<span class='boldtitle'>#{@meta.get[:doctitleintro]}"
-        ret += " &#x2014; " if @meta.get[:doctitleintro] && @meta.get[:doctitlemain]
+        @meta.get[:doctitleintro] && @meta.get[:doctitlemain] and
+          ret += " &#x2014; "
         ret += @meta.get[:doctitlemain]
-        ret += " &#x2014; " if @meta.get[:doctitlemain] && @meta.get[:doctitlepart]
-        ret += "</span>"
+        @meta.get[:doctitlemain] && @meta.get[:doctitlepart] and
+          ret += " &#x2014; "
+        ret += "</span>#{middle_title_part}"
+        "<p class='zzSTDTitle1'>#{ret}</p>"
+      end
+
+      def middle_title_part
+        ret = ""
         if a = @meta.get[:doctitlepart]
-          b = @meta.get[:doctitlepartlabel] and ret += "<span class='nonboldtitle'>#{b}:</span> "
+          b = @meta.get[:doctitlepartlabel] and
+            ret += "<span class='nonboldtitle'>#{b}:</span> "
           ret += "<span class='boldtitle'>#{a}</span>"
         end
-        "<p class='zzSTDTitle1'>#{ret}</p>"
+        ret
       end
 
       def middle_title_amd

data/lib/metanorma/iso/base.rb

@@ -79,6 +79,18 @@ module Metanorma
         name
       end
 
+      def document_scheme(node)
+        node.attr("document-scheme") || "2024"
+      end
+
+      def metadata_attrs(node)
+        ret = super
+        a = document_scheme(node) and
+          ret += "<presentation-metadata><name>document-scheme</name>" \
+            "<value>#{a}</value></presentation-metadata>"
+        ret
+      end
+
       def outputs(node, ret)
         File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
         presentation_xml_converter(node).convert("#{@filename}.xml")

data/lib/metanorma/iso/basicdoc.rng

@@ -244,6 +244,9 @@
         <data type="ID"/>
       </attribute>
       <attribute name="reviewer"/>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="date">
           <data type="dateTime"/>

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

@@ -1,4 +1,24 @@
 == copyright-statement
+{% if document_scheme == "1951" %}
+
+=== REPRODUCTION INTERDITE
+
+[[boilerplate-message]]
+Le droit de reproduction des Recommandations ISO et des Normes
+ISO est la propriété des Comités Membres de l’ISO. En 
+conséquence, dans chaque pays, la reproduction de ces documents ne
+peut être autorisée que par l’organisation nationale de 
+normalisation sation de ce pays, membre de I’ISO.
+
+Seules les normes nationales sont valables dans leurs pays respectifs.
+
+[[boilerplate-place]]
+Imprimé en Suisse
+
+Ce document est également édité en anglais et en russe. Il peut être obtenu auprès des organisations +
+nationales de normalisation.
+
+{% else %}
 === {% if stage_int >= 40 %}DOCUMENT PROTÉGÉ PAR COPYRIGHT{%else%}{blank}{%endif%}
 
 [[boilerplate-year]]
@@ -32,3 +52,4 @@ Ce document n'est pas une Norme internationale de l'ISO. Il est distribué pour
 
 Les destinataires du présent projet sont invités à présenter, avec leurs observations, notification des droits de propriété dont ils auraient éventuellement connaissance et à fournir une documentation explicative.
 {% endif %}
+{% endif %}

data/lib/metanorma/iso/boilerplate.adoc

@@ -1,5 +1,25 @@
 == copyright-statement
 
+{% if document_scheme == "1951" %}
+
+=== COPYRIGHT RESERVED
+
+[[boilerplate-message]]
+The copyright of ISO Recommendations and ISO Standards
+belongs to ISO Member Bodies. Reproduction of these 
+documents, in any country, may be authorized therefore only
+by the national standards organization of that country, being
+a member of ISO.
+
+For each individual country the only valid standard is the national standard of that country.
+
+[[boilerplate-place]]
+Printed in Switzerland
+
+Also issued in French and Russian. Copies to be obtained through the national standards organizations.
+
+{% else %}
+
 === {% if stage_int >= 40 %}COPYRIGHT PROTECTED DOCUMENT{% else %}{blank}{% endif %}
 
 [[boilerplate-year]]
@@ -38,3 +58,4 @@ of this draft are invited to submit, with their comments, notification of any
 relevant patent rights of which they are aware and to provide supporting
 documentation.
 {% endif %}
+{% endif %}

data/lib/metanorma/iso/front.rb

@@ -25,9 +25,12 @@ module Metanorma
 
       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)
+        id.stage or return
+        if abbr = id.typed_stage_abbrev
+          abbr = abbr.to_s.upcase.strip
+        end
+        xml.stagename metadata_stagename(id)&.strip,
+                      **attr_code(abbreviation: abbr)
       rescue *STAGE_ERROR
       end
 
@@ -52,7 +55,7 @@ module Metanorma
       def metadata_status(node, xml)
         stage = get_stage(node)
         substage = get_substage(node)
-        abbrev = iso_id_default(iso_id_params(node)).stage&.abbr
+        abbrev = iso_id_default(iso_id_params(node)).stage&.abbr&.upcase
         xml.status do |s|
           s.stage stage, **attr_code(abbreviation: abbrev)
           s.substage substage

data/lib/metanorma/iso/front_id.rb

@@ -1,9 +1,5 @@
 require "date"
-require "nokogiri"
-require "htmlentities"
-require "json"
 require "pathname"
-require "open-uri"
 require "twitter_cldr"
 require "pubid-iso"
 require "pubid-cen"
@@ -20,21 +16,20 @@ module Metanorma
         node.attr("tc-docnumber")&.split(/,\s*/)&.each do |n|
           xml.docidentifier(n, **attr_code(type: "iso-tc"))
         end
-        xml.docnumber node.attr("docnumber")
       end
 
+      DOCTYPE2HASHID =
+        { directive: :dir, "technical-report": :tr, "guide": :guide,
+          "technical-specification": :ts,
+          "publicly-available-specification": :pas,
+          "committee-document": :tc }.freeze
+
       # @param type [nil, :tr, :ts, :amd, :cor, :guide, :dir, :tc, Type]
       # document's type, eg. :tr, :ts, :amd, :cor, Type.new(:tr)
       def get_typeabbr(node, amd: false)
         node.attr("amendment-number") and return :amd
         node.attr("corrigendum-number") and return :cor
-        case doctype(node)
-        when "directive" then :dir
-        when "technical-report" then :tr
-        when "technical-specification" then :ts
-        when "publicly-available-specification" then :pas
-        when "guide" then :guide
-        end
+        DOCTYPE2HASHID[doctype(node).to_sym]
       end
 
       def iso_id(node, xml)
@@ -80,6 +75,10 @@ module Metanorma
         end
       end
 
+      def compact_blank(hash)
+        hash.compact.reject { |_, v| v.is_a?(String) && v.empty? }
+      end
+
       # unpublished is for internal use
       def iso_id_params_core(node)
         pub = iso_id_pub(node)
@@ -89,9 +88,9 @@ module Metanorma
                 type: get_typeabbr(node),
                 publisher: pub[0],
                 unpublished: /^[0-5]/.match?(get_stage(node)),
-                copublisher: pub[1..-1] }.compact
+                copublisher: pub[1..-1] }
         ret[:copublisher].empty? and ret.delete(:copublisher)
-        ret
+        compact_blank(ret)
       end
 
       def iso_id_pub(node)
@@ -104,7 +103,24 @@ module Metanorma
         ret = { number: node.attr("amendment-number") ||
           node.attr("corrigendum-number"),
                 year: iso_id_year(node),
-                iteration: node.attr("iteration") }.compact
+                iteration: node.attr("iteration") }
+        iso_id_stage_populate(ret, node, stage)
+        tc_number(ret, node)
+        compact_blank(ret)
+      end
+
+      def tc_number(ret, node)
+        doctype(node) == "committee-document" or return ret
+        n = node.attr("subcommittee-number") and
+          ret.merge!({ sctype: node.attr("subcommittee-type") || "SC",
+                       scnumber: n })
+        n = node.attr("technical-committee-number") and
+          ret.merge!({ tctype: node.attr("technical-committee-type") || "TC",
+                       tcnumber: n })
+        ret
+      end
+
+      def iso_id_stage_populate(ret, node, stage)
         if stage && !cen?(node.attr("publisher"))
           ret[:stage] = stage
           ret[:stage] == "60.00" and ret[:stage] = :PRF

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.12 -->
+<!-- VERSION v1.3.0 -->
 <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">
@@ -146,6 +146,9 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style"/>
+        </optional>
         <oneOrMore>
           <ref name="PureTextElement"/>
         </oneOrMore>

data/lib/metanorma/iso/processor.rb

@@ -33,6 +33,7 @@ module Metanorma
           "Source Han Sans" => nil,
           "Source Han Sans Normal" => nil,
           "Courier New" => nil,
+          "Inter" => nil,
         }
       end
 

data/lib/metanorma/iso/relaton-iso.rng

@@ -101,6 +101,7 @@
         <value>amendment</value>
         <value>technical-corrigendum</value>
         <value>directive</value>
+        <value>committee-document</value>
       </choice>
     </define>
     <define name="DocumentSubtype">

data/lib/metanorma/iso/validate.rb

@@ -119,7 +119,8 @@ module Metanorma
       def doctype_validate(_xmldoc)
         %w(international-standard technical-specification technical-report
            publicly-available-specification international-workshop-agreement
-           guide amendment technical-corrigendum).include? @doctype or
+           guide amendment technical-corrigendum committee-document)
+          .include? @doctype or
           @log.add("Document Attributes", nil,
                    "#{@doctype} is not a recognised document type")
       end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.7.0".freeze
+    VERSION = "2.7.2".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -32,14 +32,12 @@ 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.8.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.8.2"
   spec.add_dependency "mnconvert", "~> 1.14"
-  spec.add_dependency "pubid-iso"
   spec.add_dependency "pubid-cen"
   spec.add_dependency "pubid-iec"
-  spec.add_dependency "ruby-jing"
+  spec.add_dependency "pubid-iso"
   spec.add_dependency "tokenizer", "~> 0.3.0"
-  spec.add_dependency "twitter_cldr"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-02-19 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.8.0
+        version: 2.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.8.2
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: pubid-iso
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pubid-cen
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-jing
+  name: pubid-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: twitter_cldr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement