metanorma-iso 1.9.0 → 1.9.3

data/lib/isodoc/iso/metadata.rb

@@ -2,7 +2,7 @@ require "isodoc"
 
 module IsoDoc
   module Iso
-    class  Metadata < IsoDoc::Metadata
+    class Metadata < IsoDoc::Metadata
       def initialize(lang, script, i18n)
         super
         set(:tc, "XXXX")
@@ -14,17 +14,17 @@ module IsoDoc
         set(:obsoletes_part, nil)
       end
 
-      def status_abbrev(stage, substage, iter, draft, doctype)
+      def status_abbrev(stage, _substage, iter, draft, doctype)
         return "" unless stage
 
         if %w(technical-report technical-specification).include?(doctype)
           stage = "DTS" if stage == "DIS"
           stage = "FDTS" if stage == "FDIS"
         end
-        if %w(PWI NWIP WD CD).include?(stage)
-          stage += iter if iter
+        if %w(PWI NWIP WD CD).include?(stage) && iter
+          stage += iter
         end
-        stage = "Pre" + stage if draft =~ /^0\./
+        stage = "Pre#{stage}" if /^0\./.match?(draft)
         stage
       end
 
@@ -48,14 +48,14 @@ module IsoDoc
       end
 
       def unpublished(status)
-        status.to_i > 0 && status.to_i < 60
+        status.to_i.positive? && status.to_i < 60
       end
 
       def docid(isoxml, _out)
         dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'ISO']"))
         set(:docnumber, dn&.text)
         tcdn = isoxml.xpath(ns("//bibdata/docidentifier[@type = 'iso-tc']"))
-        set(:tc_docnumber, tcdn.map { |n| n.text })
+        set(:tc_docnumber, tcdn.map(&:text))
         dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso-with-lang']"))
         set(:docnumber_lang, dn&.text)
         dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso-reference']"))
@@ -87,6 +87,7 @@ module IsoDoc
 
       def part_title(part, partnum, subpartnum, lang)
         return "" unless part
+
         suffix = @c.encode(part.text, :hexadecimal)
         partnum = "#{partnum}&ndash;#{subpartnum}" if partnum && subpartnum
         suffix = "#{part_label(lang)}&nbsp;#{partnum}: " + suffix if partnum
@@ -125,10 +126,14 @@ module IsoDoc
       end
 
       def title_parts(isoxml, lang)
-        [isoxml.at(ns("//bibdata//title[@type='title-intro' and @language='#{lang}']")),
-         isoxml.at(ns("//bibdata//title[@type='title-main' and @language='#{lang}']")),
-         isoxml.at(ns("//bibdata//title[@type='title-part' and @language='#{lang}']")),
-         isoxml.at(ns("//bibdata//title[@type='title-amd' and @language='#{lang}']"))]
+        [isoxml.at(ns("//bibdata//title[@type='title-intro' and "\
+                      "@language='#{lang}']")),
+         isoxml.at(ns("//bibdata//title[@type='title-main' and "\
+                      "@language='#{lang}']")),
+         isoxml.at(ns("//bibdata//title[@type='title-part' and "\
+                      "@language='#{lang}']")),
+         isoxml.at(ns("//bibdata//title[@type='title-amd' and "\
+                      "@language='#{lang}']"))]
       end
 
       def title(isoxml, _out)
@@ -139,7 +144,10 @@ module IsoDoc
         set(:doctitlemain, @c.encode(main ? main.text : "", :hexadecimal))
         main = compose_title(main, intro, part, partnumber, subpartnumber, lang)
         set(:doctitle, main)
-        set(:doctitleintro, @c.encode(intro ? intro.text : "", :hexadecimal)) if intro
+        if intro
+          set(:doctitleintro,
+              @c.encode(intro ? intro.text : "", :hexadecimal))
+        end
         set(:doctitlepartlabel, part_prefix(partnumber, subpartnumber, lang))
         set(:doctitlepart, @c.encode(part.text, :hexadecimal)) if part
         set(:doctitleamdlabel, amd_prefix(amdnumber, lang)) if amdnumber
@@ -155,7 +163,10 @@ module IsoDoc
         set(:docsubtitlemain, @c.encode(main ? main.text : "", :hexadecimal))
         main = compose_title(main, intro, part, partnumber, subpartnumber, lang)
         set(:docsubtitle, main)
-        set(:docsubtitleintro, @c.encode(intro ? intro.text : "", :hexadecimal)) if intro
+        if intro
+          set(:docsubtitleintro,
+              @c.encode(intro ? intro.text : "", :hexadecimal))
+        end
         set(:docsubtitlepartlabel, part_prefix(partnumber, subpartnumber, lang))
         set(:docsubtitlepart, @c.encode(part.text, :hexadecimal)) if part
         set(:docsubtitleamdlabel, amd_prefix(amdnumber, lang)) if amdnumber
@@ -173,8 +184,8 @@ module IsoDoc
 
       def tc(xml)
         tc_num = xml.at(ns("//bibdata/ext/editorialgroup/technical-committee/@number"))
-        tc_type = xml.at(ns("//bibdata/ext/editorialgroup/technical-committee/@type"))&.
-          text || "TC"
+        tc_type = xml.at(ns("//bibdata/ext/editorialgroup/technical-committee/@type"))
+          &.text || "TC"
         if tc_num
           tcid = "#{tc_type} #{tc_num.text}"
           set(:tc,  tcid)
@@ -212,7 +223,8 @@ module IsoDoc
         ics = []
         isoxml.xpath(ns("//bibdata/ext/ics/code")).each { |i| ics << i.text }
         set(:ics, ics.empty? ? nil : ics.join(", "))
-        a = isoxml.at(ns("//bibdata/ext/horizontal")) and set(:horizontal, a.text)
+        a = isoxml.at(ns("//bibdata/ext/horizontal")) and set(:horizontal,
+                                                              a.text)
       end
     end
   end

data/lib/isodoc/iso/sts_convert.rb

@@ -19,7 +19,7 @@ module IsoDoc
             f.path
           end
         FileUtils.rm_rf dir
-        Mnconvert.convert(in_fname, out_fname || "#{filename}.#{@suffix}",
+        MnConvert.convert(in_fname, out_fname || "#{filename}.#{@suffix}",
                           MnConvert::InputFormat::MN)
       end
     end

data/lib/metanorma/iso/processor.rb

@@ -31,7 +31,7 @@ module Metanorma
           "Cambria Math" => nil,
           "Times New Roman" => nil,
           "Source Han Sans" => nil,
-          "Courier" => nil,
+          "Source Han Sans Normal" => nil,
           "Courier New" => nil,
         }
       end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.9.0".freeze
+    VERSION = "1.9.3".freeze
   end
 end

data/spec/asciidoctor/base_spec.rb

@@ -212,6 +212,8 @@ RSpec.describe Asciidoctor::ISO do
       :pub-fax: 4444444
       :pub-email: x@example.com
       :pub-uri: http://www.example.com
+      :docstage: 
+      :docsubstage: 
     INPUT
     expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
@@ -304,7 +306,6 @@ RSpec.describe Asciidoctor::ISO do
                 <phone type='fax'>4444444</phone>
                 <email>x@example.com</email>
                 <uri>http://www.example.com</uri>
-        #{'        '}
                               </organization>
                             </owner>
                           </copyright>

data/spec/asciidoctor/blocks_spec.rb

@@ -48,11 +48,11 @@ RSpec.describe Asciidoctor::ISO do
                 <mi>r</mi>
                 <mo>=</mo>
                 <mn>1</mn>
-                <mi>%</mi>
+                <mo>%</mo>
                 <mi>r</mi>
                 <mo>=</mo>
                 <mn>1</mn>
-                <mi>%</mi>
+                <mo>%</mo>
               </math>
             </stem>
           </formula>
@@ -586,4 +586,43 @@ RSpec.describe Asciidoctor::ISO do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
+
+  it "processes nested terms" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Terms and Definitions
+
+      [.term]
+      === Term1
+
+      definition
+
+      ==== Term11
+      definition2
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+      <sections>
+           <terms id='_' obligation='normative'>
+             <title>Terms and definitions</title>
+             #{TERM_BOILERPLATE}
+             <term id='term-term1'>
+               <preferred>Term1</preferred>
+               <definition>
+                 <p id='_'>definition</p>
+               </definition>
+               <term id='term-term11'>
+                 <preferred>Term11</preferred>
+                 <definition>
+                   <p id='_'>definition2</p>
+                 </definition>
+               </term>
+             </term>
+           </terms>
+         </sections>
+       </iso-standard>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
 end

data/spec/asciidoctor/cleanup_spec.rb

@@ -230,11 +230,11 @@ RSpec.describe Asciidoctor::ISO do
                 <mi>r</mi>
                 <mo>=</mo>
                 <mn>1</mn>
-                <mi>%</mi>
+                <mo>%</mo>
                 <mi>r</mi>
                 <mo>=</mo>
                 <mn>1</mn>
-                <mi>%</mi>
+                <mo>%</mo>
               </math>
             </stem>
             <note id="_">

data/spec/asciidoctor/refs_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe Asciidoctor::ISO do
             <title>Clause</title>
             <p id="_">
               <eref bibitemid="iso123" citeas="ISO 123:--" type="inline"/>
-              <fn reference="1">The standard is in press</fn>
+              <fn reference="1"><p id="_">The standard is in press</p></fn>
               <eref bibitemid="iso123" citeas="ISO 123:--" type="inline"/>A.
               <fn reference="2">
                 <p id="_">a footnote</p></fn>

data/spec/isodoc/section_spec.rb

@@ -542,7 +542,7 @@ RSpec.describe IsoDoc do
        </iso-standard>
     INPUT
     presxml = <<~OUTPUT
-    <iso-standard xmlns='https://www.metanorma.org/ns/iso' type='presentation' version='1.8.6'>
+    <iso-standard xmlns='https://www.metanorma.org/ns/iso' type='presentation' version="#{Metanorma::ISO::VERSION}">
          <bibdata type='standard'>
            <contributor>
              <role type='author'/>

data/spec/isodoc/terms_spec.rb

@@ -52,6 +52,14 @@ RSpec.describe IsoDoc do
                 <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
               </termsource>
             </term>
+            <term id="A">
+              <preferred>term1</preferred>
+              <definition>term1 definition</definition>
+              <term id="B">
+              <preferred>term2</preferred>
+              <definition>term2 definition</definition>
+              </term>
+            </term>
           </terms>
         </sections>
       </iso-standard>
@@ -119,6 +127,16 @@ RSpec.describe IsoDoc do
                 <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'><locality type='clause'><referenceFrom>3.1</referenceFrom></locality>ISO 7301:2011, 3.1</origin>
               </termsource>
             </term>
+            <term id='A'>
+              <name>1.3</name>
+              <preferred>term1</preferred>
+              <definition>term1 definition</definition>
+              <term id='B'>
+                <name>1.3.1</name>
+                <preferred>term2</preferred>
+                <definition>term2 definition</definition>
+              </term>
+            </term>
           </terms>
         </sections>
       </iso-standard>
@@ -175,6 +193,12 @@ RSpec.describe IsoDoc do
               </div>
               <p>[TERMREF]<a href="#ISO7301">ISO 7301:2011, 3.1</a>
               [/TERMREF]</p>
+              <p class='TermNum' id='A'>1.3</p>
+              <p class='Terms' style='text-align:left;'>term1</p>
+               term1 definition
+              <p class='TermNum' id='B'>1.3.1</p>
+              <p class='Terms' style='text-align:left;'>term2</p>
+               term2 definition
             </div>
           </div>
         </body>
@@ -212,6 +236,12 @@ RSpec.describe IsoDoc do
         <div id='_671a1994-4783-40d0-bc81-987d06ffb74f' class="Note"><p class="Note">Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
         <p class="Source">[TERMREF]<a href="#ISO7301">ISO 7301:2011, 3.1</a>
         [/TERMREF]</p>
+        <p class='TermNum' id='A'>1.3</p>
+        <p class='Terms' style='text-align:left;'>term1</p>
+         term1 definition
+        <p class='TermNum' id='B'>1.3.1</p>
+        <p class='Terms' style='text-align:left;'>term2</p>
+         term2 definition
       </div>
     OUTPUT
     expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc