metanorma-iso 2.5.1 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ab1010b198fb64456b71a06834ab3c1207417c16c765f6c5905cd18ff5a0dc8
-  data.tar.gz: c92bdd8228ce983eed939cb2b38b60b7ec631d37b64ea390e26e870700f7065b
+  metadata.gz: 30229a0ddab3a83837d4f79b713bd7fa693798e810afeeb1fcdd85169aef9921
+  data.tar.gz: e09fbd0e70fbbe624ab4a82fb741715842e18f9a01d9e24fea986507a6b1710a
 SHA512:
-  metadata.gz: de58d8b4fa0e039e153cd5a9d9637adaedf45e674cb59c113e2feb4eaa1444ca7d98badd5ac080687ec66ee19305e8b8677ea855c24b1df91ddae0c12464180a
-  data.tar.gz: 48d297855239fec0dd80dbb6db404bf4b8c2a79ba49051d275f56f3dff579bda479f30ba71ba1931170088c7e3c0014878b92af7d91177151f625cdf359e7ef9
+  metadata.gz: d34635dae39c8970d56bd3fb09c8366875c48ab705a3848ba52f3d61fb7b465788aa357ee5a31efd3a4088936fc1d46cfc3272892a8b1737ee7f0dcbbe0e2f9e
+  data.tar.gz: 1c72a98e61841ba18ec4f63f48edf6d1f8554ebd8d88b3d5f1a7d96c907c2c87fe5e576a81ae6b3ea589cbe76ab383abe76b3e5a74052d18ef5307f7bc36693a

data/lib/isodoc/iso/base_convert.rb

@@ -125,8 +125,9 @@ module IsoDoc
       end
 
       def figure_name_parse(_node, div, name)
+        name.nil? and return
         div.p class: "FigureTitle", style: "text-align:center;" do |p|
-          name&.children&.each { |n| parse(n, p) }
+          name.children.each { |n| parse(n, p) }
         end
       end
 

data/lib/isodoc/iso/index.rb

@@ -8,7 +8,7 @@ module IsoDoc
       def index(xml)
         if xml.at(ns("//index"))
           i = xml.at(ns("//indexsect")) ||
-            xml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}"\
+            xml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}" \
                                "</title></indexsect>").first
           index = sort_indexterms(xml.xpath(ns("//index")),
                                   xml.xpath(ns("//index-xref[@also = 'false']")),
@@ -147,7 +147,7 @@ module IsoDoc
           index2bookmark(t)
           term_hash_init(v, term, term2, term3, :xref)
           to = t["to"] ? "to='#{t['to']}' " : ""
-          v[term][term2][term3][:xref] << "<xref target='#{t['id']}' "\
+          v[term][term2][term3][:xref] << "<xref target='#{t['id']}' " \
                                           "#{to}pagenumber='true'/>"
         end
       end

data/lib/isodoc/iso/init.rb

@@ -21,8 +21,7 @@ module IsoDoc
       end
 
       def amd?(docxml)
-        doctype = docxml.at(ns("//bibdata/ext/doctype"))&.text
-        %w(amendment technical-corrigendum).include? doctype
+        %w(amendment technical-corrigendum).include? @doctype
       end
 
       def clausedelim

data/lib/isodoc/iso/pdf_convert.rb

@@ -14,7 +14,7 @@ module IsoDoc
       end
 
       def pdf_stylesheet(docxml)
-        case doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        case @doctype
         when "amendment", "technical-corrigendum" then "iso.amendment.xsl"
         else
           "iso.international-standard.xsl"

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -158,8 +158,7 @@ module IsoDoc
       end
 
       def toc_title(docxml)
-        doctype = docxml.at(ns("//bibdata/ext/doctype"))&.text
-        %w(amendment technical-corrigendum).include?(doctype) and return
+        %w(amendment technical-corrigendum).include?(@doctype) and return
         super
       end
 

data/lib/isodoc/iso/word_convert.rb

@@ -185,8 +185,7 @@ module IsoDoc
       end
 
       def figure_name_parse(node, div, name)
-        return if name.nil?
-
+        name.nil? and return
         div.p **figure_name_attrs(node) do |p|
           name.children.each { |n| parse(n, p) }
         end
@@ -205,8 +204,7 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
-        return if name.nil?
-
+        name.nil? and return
         name&.at(ns("./strong"))&.remove # supplied by CSS list numbering
         div.h1 class: "Annex" do |t|
           annex_name1(name, t)

data/lib/metanorma/iso/base.rb

@@ -5,6 +5,7 @@ require "pathname"
 require "open-uri"
 require "isodoc"
 require "fileutils"
+require_relative "processor"
 
 module Metanorma
   module ISO
@@ -47,7 +48,9 @@ module Metanorma
       end
 
       def presentation_xml_converter(node)
-        IsoDoc::Iso::PresentationXMLConvert.new(html_extract_attributes(node))
+        IsoDoc::Iso::PresentationXMLConvert
+          .new(html_extract_attributes(node)
+          .merge(output_formats: ::Metanorma::Iso::Processor.new.output_formats))
       end
 
       def init(node)

data/lib/metanorma/iso/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

data/lib/metanorma/iso/biblio.rng

@@ -1283,7 +1283,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</value>

data/lib/metanorma/iso/cleanup.rb

@@ -1,6 +1,3 @@
-require "date"
-require "htmlentities"
-
 module Metanorma
   module ISO
     class Converter < Standoc::Converter
@@ -37,7 +34,6 @@ 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
           prefix << x1
         end
       end
@@ -76,9 +72,7 @@ module Metanorma
       end
 
       def sort_biblio(bib)
-        bib.sort do |a, b|
-          sort_biblio_key(a) <=> sort_biblio_key(b)
-        end
+        bib.sort { |a, b| sort_biblio_key(a) <=> sort_biblio_key(b) }
       end
 
       # sort by: doc class (ISO, IEC, other standard (not DOI &c), other
@@ -90,15 +84,15 @@ module Metanorma
       # then title
       def sort_biblio_key(bib)
         pubclass = pub_class(bib)
-        num = bib&.at("./docnumber")&.text
-        id = bib&.at("./docidentifier[@primary]") ||
-          bib&.at("./docidentifier[not(#{skip_docid} or @type = 'metanorma')]")
-        metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text
+        num = bib.at("./docnumber")&.text
+        id = bib.at("./docidentifier[@primary]") ||
+          bib.at("./docidentifier[not(#{skip_docid} or @type = 'metanorma')]")
+        metaid = bib.at("./docidentifier[@type = 'metanorma']")&.text
         abbrid = metaid unless /^\[\d+\]$/.match?(metaid)
         /\d-(?<partid>\d+)/ =~ id&.text
         type = id["type"] if id
-        title = bib&.at("./title[@type = 'main']")&.text ||
-          bib&.at("./title")&.text || bib&.at("./formattedref")&.text
+        title = bib.at("./title[@type = 'main']")&.text ||
+          bib.at("./title")&.text || bib&.at("./formattedref")&.text
         "#{pubclass} :: #{type} :: " \
           "#{num.nil? ? abbrid : sprintf('%09d', num.to_i)} :: " \
           "#{sprintf('%09d', partid.to_i)} :: #{id&.text} :: #{title}"
@@ -241,6 +235,14 @@ module Metanorma
           end
         end
       end
+
+      def termdef_boilerplate_insert_location(xmldoc)
+        f = xmldoc.at(self.class::TERM_CLAUSE)
+        root = xmldoc.at("//sections/terms | //sections/clause[.//terms]")
+        !f || !root and return f || root
+        f.at("./preceding-sibling::clause") and return root
+        f
+      end
     end
   end
 end

data/lib/metanorma/iso/front_id.rb

@@ -84,7 +84,8 @@ module Metanorma
       end
 
       def iso_id_year(node)
-        node.attr("copyright-year") || node.attr("updated-date")
+        (node.attr("copyright-year") || node.attr("updated-date") ||
+         node.attr("published-date"))
           &.sub(/-.*$/, "") || Date.today.year
       end
 

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.4 -->
+<!-- VERSION v1.2.6 -->
 <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">
@@ -485,6 +485,8 @@
           <choice>
             <text/>
             <ref name="callout"/>
+            <ref name="xref"/>
+            <ref name="eref"/>
           </choice>
         </oneOrMore>
         <zeroOrMore>
@@ -865,6 +867,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -880,6 +883,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -894,6 +898,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -908,6 +913,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -918,6 +924,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -928,6 +935,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -938,6 +946,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -1004,6 +1013,14 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="BasicBlock" combine="choice">
+    <ref name="columnbreak"/>
+  </define>
+  <define name="columnbreak">
+    <element name="columnbreak">
+      <empty/>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -1047,6 +1064,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1060,6 +1079,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1126,6 +1147,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>
@@ -1136,6 +1159,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>

data/lib/metanorma/iso/processor.rb

@@ -43,6 +43,7 @@ module Metanorma
       end
 
       def output(isodoc_node, inname, outname, format, options={})
+        options_preprocess(options)
         case format
         when :html
           IsoDoc::Iso::HtmlConvert.new(options)

data/lib/metanorma/iso/validate.rb

@@ -1,10 +1,10 @@
 require "metanorma-standoc"
-require_relative "./validate_style"
-require_relative "./validate_requirements"
-require_relative "./validate_section"
-require_relative "./validate_title"
-require_relative "./validate_image"
-require_relative "./validate_list"
+require_relative "validate_style"
+require_relative "validate_requirements"
+require_relative "validate_section"
+require_relative "validate_title"
+require_relative "validate_image"
+require_relative "validate_list"
 require "nokogiri"
 require "jing"
 require "iev"
@@ -116,13 +116,12 @@ module Metanorma
         end
       end
 
-      def doctype_validate(xmldoc)
-        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
+      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).include? @doctype or
           @log.add("Document Attributes", nil,
-                   "#{doctype} is not a recognised document type")
+                   "#{@doctype} is not a recognised document type")
       end
 
       def script_validate(xmldoc)
@@ -173,8 +172,7 @@ module Metanorma
 
       def validate(doc)
         content_validate(doc)
-        doctype = doc&.at("//bibdata/ext/doctype")&.text
-        schema = case doctype
+        schema = case @doctype
                  when "amendment", "technical-corrigendum" # @amd
                    "isostandard-amd.rng"
                  else

data/lib/metanorma/iso/validate_section.rb

@@ -4,8 +4,7 @@ module Metanorma
   module ISO
     class Converter < Standoc::Converter
       def section_validate(doc)
-        doctype = doc.at("//bibdata/ext/doctype")&.text
-        unless %w(amendment technical-corrigendum).include? doctype
+        unless %w(amendment technical-corrigendum).include? @doctype
           foreword_validate(doc.root)
           normref_validate(doc.root)
           symbols_validate(doc.root)
@@ -181,7 +180,7 @@ module Metanorma
       end
 
       def tech_report_style(root)
-        root.at("//bibdata/ext/doctype")&.text == "technical-report" or return
+        @doctype == "technical-report" or return
         root.xpath("//sections/clause[not(@type = 'scope')] | //annex")
           .each do |s|
           r = requirement_check(extract_text(s)) and

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.5.1".freeze
+    VERSION = "2.5.3".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -32,9 +32,9 @@ 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.5.1"
+  spec.add_dependency "metanorma-standoc", "~> 2.6.0"
   spec.add_dependency "mnconvert", "~> 1.14"
-  spec.add_dependency "pubid-iso", "~> 0.5.0"
+  spec.add_dependency "pubid-iso", "~> 0.6.0"
   spec.add_dependency "ruby-jing"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-10-23 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.5.1
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement