metanorma-iso 1.5.12 → 1.7.0

data/lib/isodoc/iso/metadata.rb

@@ -211,6 +211,7 @@ 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)
       end
     end
   end

data/lib/isodoc/iso/sections.rb

@@ -1,7 +1,7 @@
 module IsoDoc
   module Iso
     module BaseConvert
-      def middle_title(out)
+      def middle_title(isoxml, out)
         middle_title_main(out)
         middle_title_amd(out)
       end

data/lib/isodoc/iso/word_convert.rb

@@ -16,11 +16,15 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
+          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' :
                      '"Cambria",serif'),
-                     headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                     headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
                                   '"Cambria",serif'),
                                   monospacefont: '"Courier New",monospace',
+                                  normalfontsize: "11.0pt",
+                                  monospacefontsize: "9.0pt",
+                                  smallerfontsize: "10.0pt",
+                                  footnotefontsize: "10.0pt",
         }
       end
 

data/lib/isodoc/iso/xref.rb

@@ -1,10 +1,14 @@
 module IsoDoc
   module Iso
+    class Counter < IsoDoc::XrefGen::Counter
+    end
+
     class Xref < IsoDoc::Xref
       def initial_anchor_names(d)
         if @klass.amd(d)
           d.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
           sequential_asset_names(d.xpath(ns("//preface/*")))
+          d.xpath(ns("//sections/clause")).each { |c| c.element? and preface_names(c) }
           middle_section_asset_names(d)
           termnote_anchor_names(d)
           termexample_anchor_names(d)
@@ -19,8 +23,10 @@ module IsoDoc
         return if clause.nil?
         clause.at(ns("./clause")) and @anchors[clause["id"]] = 
           { label: "0", level: 1, xref: clause.at(ns("./title"))&.text, type: "clause" }
-        clause.xpath(ns("./clause")).each_with_index do |c, i|
-          section_names1(c, "0.#{i + 1}", 2)
+        i = Counter.new
+        clause.xpath(ns("./clause")).each do |c|
+          i.increment(c)
+          section_names1(c, "0.#{i.print}", 2)
         end
       end
 
@@ -30,10 +36,17 @@ module IsoDoc
       end
 
       def appendix_names(clause, num)
-        clause.xpath(ns("./appendix")).each_with_index do |c, i|
-          @anchors[c["id"]] = anchor_struct(i + 1, nil, @labels["appendix"], "clause")
+        i = Counter.new
+        clause.xpath(ns("./appendix")).each do |c|
+          i.increment(c)
+          @anchors[c["id"]] = anchor_struct(i.print, nil, @labels["appendix"], "clause")
           @anchors[c["id"]][:level] = 2
           @anchors[c["id"]][:container] = clause["id"]
+          j = Counter.new
+          c.xpath(ns("./clause | ./references")).each do |c1|
+            j.increment(c1)
+            appendix_names1(c1, l10n("#{@labels["appendix"]} #{i.print}.#{j.print}"), 3, clause["id"])
+          end
         end
       end
 
@@ -41,17 +54,30 @@ module IsoDoc
         @anchors[clause["id"]] =
           { label: num, level: level, xref: num }
         # subclauses are not prefixed with "Clause"
+        i = Counter.new
         clause.xpath(ns("./clause | ./terms | ./term | ./definitions | "\
                         "./references")).
-                       each_with_index do |c, i|
-          section_names1(c, "#{num}.#{i + 1}", level + 1)
+                       each do |c|
+          i.increment(c)
+          section_names1(c, "#{num}.#{i.print}", level + 1)
         end
       end
 
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] = { label: num, xref: num, level: level }
-        clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", level + 1)
+        i = Counter.new
+        clause.xpath(ns("./clause | ./references")).each do |c|
+          i.increment(c)
+          annex_names1(c, "#{num}.#{i.print}", level + 1)
+        end
+      end
+
+      def appendix_names1(clause, num, level, container)
+        @anchors[clause["id"]] = { label: num, xref: num, level: level, container: container }
+        i = Counter.new
+        clause.xpath(ns("./clause | ./references")).each do |c|
+          i.increment(c)
+          appendix_names1(c, "#{num}.#{i.print}", level + 1, container)
         end
       end
 

data/lib/metanorma/iso/processor.rb

@@ -2,15 +2,6 @@ require "metanorma/processor"
 
 module Metanorma
   module Iso
-    def self.fonts_used
-      {
-        html: ["Cambria", "Times New Roman", "Cambria Math", "HanSans", "Courier New"],
-        html_alt: ["Cambria", "Times New Roman", "Cambria Math", "HanSans", "Courier New"],
-        doc: ["Cambria", "Times New Roman", "Cambria Math", "HanSans", "Courier New"],
-        pdf: ["Cambria", "Times New Roman", "Cambria Math", "HanSans", "Courier New"],
-      }
-    end
-
     class Processor < Metanorma::Processor
 
       def initialize
@@ -34,6 +25,17 @@ module Metanorma
         "Metanorma::ISO #{Metanorma::ISO::VERSION}"
       end
 
+      def fonts_manifest
+        {
+          "Cambria" => nil,
+          "Cambria Math" => nil,
+          "Times New Roman" => nil,
+          "Source Han Sans" => nil,
+          "Courier" => nil,
+          "Courier New" => nil,
+        }
+      end
+
       def use_presentation_xml(ext)
         return true if ext == :html_alt
         super

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.5.12".freeze
+    VERSION = "1.7.0".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.2.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
+  spec.add_dependency "isodoc", "~> 1.5.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.8.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "mn2sts", "~> 1.5.0"

data/spec/asciidoctor-iso/amd_spec.rb

@@ -3,7 +3,7 @@ require "fileutils"
 
 RSpec.describe Asciidoctor::ISO do
     it "processes amendment sections" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{AMD_BLANK_HDR}
       == Foreword
 
@@ -132,7 +132,7 @@ OUTPUT
     end
 
   it "processes default metadata, amendment" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -284,7 +284,7 @@ OUTPUT
   end
 
     it "processes metadata, amendment" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
 = Document title
 Author
 :docfile: test.adoc
@@ -325,7 +325,7 @@ INPUT
        <substage>00</substage>
      </status>
      <copyright>
-       <from>2020</from>
+       <from>#{Time.now.year}</from>
        <owner>
          <organization>
            <name>International Organization for Standardization</name>
@@ -352,7 +352,7 @@ OUTPUT
   end
 
     it "processes metadata, amendment" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
 = Document title
 Author
 :docfile: test.adoc
@@ -393,7 +393,7 @@ INPUT
              <substage>00</substage>
            </status>
            <copyright>
-             <from>2020</from>
+             <from>#{Time.now.year}</from>
              <owner>
                <organization>
                  <name>International Organization for Standardization</name>
@@ -420,7 +420,7 @@ OUTPUT
   end
 
       it "processes metadata, amendment" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
 = Document title
 Author
 :docfile: test.adoc
@@ -460,7 +460,7 @@ INPUT
              <substage>60</substage>
            </status>
            <copyright>
-             <from>2020</from>
+             <from>#{Time.now.year}</from>
              <owner>
                <organization>
                  <name>International Organization for Standardization</name>
@@ -487,7 +487,7 @@ OUTPUT
   end
 
   it "processes metadata, corrigendum" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
 = Document title
 Author
 :docfile: test.adoc
@@ -528,7 +528,7 @@ INPUT
       <substage>00</substage>
     </status>
     <copyright>
-      <from>2020</from>
+      <from>#{Time.now.year}</from>
       <owner>
         <organization>
           <name>International Organization for Standardization</name>
@@ -555,7 +555,7 @@ OUTPUT
   end
 
     it "processes metadata, corrigendum" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
 = Document title
 Author
 :docfile: test.adoc
@@ -596,7 +596,7 @@ INPUT
       <substage>00</substage>
     </status>
     <copyright>
-      <from>2020</from>
+      <from>#{Time.now.year}</from>
       <owner>
         <organization>
           <name>International Organization for Standardization</name>
@@ -623,7 +623,7 @@ OUTPUT
   end
 
       it "processes metadata, corrigendum" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
 = Document title
 Author
 :docfile: test.adoc
@@ -663,7 +663,7 @@ INPUT
              <substage>60</substage>
            </status>
            <copyright>
-             <from>2020</from>
+             <from>#{Time.now.year}</from>
              <owner>
                <organization>
                  <name>International Organization for Standardization</name>

data/spec/asciidoctor-iso/base_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes a blank document" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     #{ASCIIDOC_BLANK_HDR}
     INPUT
     #{BLANK_HDR}
@@ -21,7 +21,7 @@ RSpec.describe Asciidoctor::ISO do
     FileUtils.rm_f "test.html"
     FileUtils.rm_f "test.pdf"
     FileUtils.rm_f "test_alt.html"
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -40,7 +40,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
     it "converts a blank document in French" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -56,7 +56,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
   it "processes default metadata" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -99,6 +99,7 @@ RSpec.describe Asciidoctor::ISO do
       :title-part-fr: Part du Titre
       :library-ics: 1,2,3
       :copyright-year: 2000
+      :horizontal: true
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
@@ -152,6 +153,7 @@ RSpec.describe Asciidoctor::ISO do
          </copyright>
          <ext>
          <doctype>article</doctype>
+         <horizontal>true</horizontal>
          <editorialgroup>
            <technical-committee number="1" type="A">TC</technical-committee>
            <technical-committee number="11" type="A1">TC1</technical-committee>
@@ -183,7 +185,7 @@ RSpec.describe Asciidoctor::ISO do
 
 
   it "processes complex metadata" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -195,8 +197,8 @@ RSpec.describe Asciidoctor::ISO do
       :tc-docnumber: 2000, 2003
       :language: el
       :script: Grek
-      :publisher: IEC,IETF,ISO
-      :copyright-holder: ISO,IETF
+      :publisher: IEC;IETF;ISO
+      :copyright-holder: ISO;IETF
       :copyright-year: 2001
       :doctype: technical-report
       :pub-address: 1 Infinity Loop + \
@@ -297,7 +299,7 @@ RSpec.describe Asciidoctor::ISO do
   end
 
      it "processes subdivisions" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, "")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, "")))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -371,7 +373,7 @@ RSpec.describe Asciidoctor::ISO do
       <substage>60</substage>
     </status>
     <copyright>
-      <from>2020</from>
+      <from>#{Time.now.year}</from>
       <owner>
         <organization>
           <name>International Organization for Standardization</name>
@@ -407,7 +409,7 @@ OUTPUT
      end
 
     it "defaults substage, defines iteration on stage 50, gives stage 50 on technical specification" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -476,7 +478,7 @@ OUTPUT
     end
 
         it "defaults substage for stage 60" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -541,7 +543,7 @@ OUTPUT
     end
 
   it "populates metadata for PRF" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -609,7 +611,7 @@ OUTPUT
 
   it "reads scripts into blank HTML document" do
     FileUtils.rm_f "test.html"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
       = Document title
       Author
       :docfile: test.adoc
@@ -623,7 +625,7 @@ OUTPUT
 
   it "uses default fonts" do
     FileUtils.rm_f "test.html"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
       = Document title
       Author
       :docfile: test.adoc
@@ -639,7 +641,7 @@ OUTPUT
 
   it "uses default fonts for alt doc" do
     FileUtils.rm_f "test_alt.html"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
       = Document title
       Author
       :docfile: test.adoc
@@ -655,7 +657,7 @@ OUTPUT
 
   it "uses Chinese fonts" do
     FileUtils.rm_f "test.html"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
       = Document title
       Author
       :docfile: test.adoc
@@ -666,13 +668,13 @@ OUTPUT
     INPUT
     html = File.read("test.html", encoding: "utf-8")
     expect(html).to match(%r[\bpre[^{]+\{[^{]+font-family: "Courier New", monospace;]m)
-    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "SimSun", serif;]m)
-    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "SimHei", sans-serif;]m)
+    expect(html).to match(%r[blockquote[^{]+\{[^{]+font-family: "Source Han Sans", serif;]m)
+    expect(html).to match(%r[\.h2Annex[^{]+\{[^{]+font-family: "Source Han Sans", sans-serif;]m)
   end
 
   it "uses specified fonts" do
     FileUtils.rm_f "test.html"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
       = Document title
       Author
       :docfile: test.adoc
@@ -693,7 +695,7 @@ OUTPUT
   it "strips MS-specific CSS" do
     FileUtils.rm_f "test.html"
     FileUtils.rm_f "test.doc"
-    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
+    Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true, agree_to_terms: true)
       = Document title
       Author
       :docfile: test.adoc