metanorma-iso 1.5.9 → 1.5.14

data/lib/isodoc/iso/metadata.rb

@@ -5,15 +5,13 @@ module IsoDoc
     class  Metadata < IsoDoc::Metadata
       def initialize(lang, script, i18n)
         super
-        @metadata = {
-          tc: "XXXX",
-          sc: "XXXX",
-          wg: "XXXX",
-          editorialgroup: [],
-          secretariat: "XXXX",
-          obsoletes: nil,
-          obsoletes_part: nil
-        }
+        set(:tc, "XXXX")
+        set(:sc, "XXXX")
+        set(:wg, "XXXX")
+        set(:editorialgroup, [])
+        set(:secretariat, "XXX")
+        set(:obsoletes, nil)
+        set(:obsoletes_part, nil)
       end
 
       def status_abbrev(stage, substage, iter, draft, doctype)
@@ -133,33 +131,35 @@ module IsoDoc
       end
 
       def title(isoxml, _out)
-        intro, main, part, amd = title_parts(isoxml, "en")
+        lang = @lang == "fr" ? "fr" : "en"
+        intro, main, part, amd = title_parts(isoxml, lang)
         partnumber, subpartnumber, amdnumber, corrnumber = title_nums(isoxml)
 
         set(:doctitlemain, @c.encode(main ? main.text : "", :hexadecimal))
-        main = compose_title(main, intro, part, partnumber, subpartnumber, "en")
+        main = compose_title(main, intro, part, partnumber, subpartnumber, lang)
         set(:doctitle, main)
         set(:doctitleintro, @c.encode(intro ? intro.text : "", :hexadecimal)) if intro
-        set(:doctitlepartlabel, part_prefix(partnumber, subpartnumber, "en"))
+        set(:doctitlepartlabel, part_prefix(partnumber, subpartnumber, lang))
         set(:doctitlepart, @c.encode(part.text, :hexadecimal)) if part
-        set(:doctitleamdlabel, amd_prefix(amdnumber, "en")) if amdnumber
+        set(:doctitleamdlabel, amd_prefix(amdnumber, lang)) if amdnumber
         set(:doctitleamd, @c.encode(amd.text, :hexadecimal)) if amd
-        set(:doctitlecorrlabel, corr_prefix(corrnumber, "en")) if corrnumber
+        set(:doctitlecorrlabel, corr_prefix(corrnumber, lang)) if corrnumber
       end
 
       def subtitle(isoxml, _out)
-        intro, main, part, amd = title_parts(isoxml, "fr")
+        lang = @lang == "fr" ? "en" : "fr"
+        intro, main, part, amd = title_parts(isoxml, lang)
         partnumber, subpartnumber, amdnumber, corrnumber = title_nums(isoxml)
 
         set(:docsubtitlemain, @c.encode(main ? main.text : "", :hexadecimal))
-        main = compose_title(main, intro, part, partnumber, subpartnumber, "fr")
+        main = compose_title(main, intro, part, partnumber, subpartnumber, lang)
         set(:docsubtitle, main)
         set(:docsubtitleintro, @c.encode(intro ? intro.text : "", :hexadecimal)) if intro
-        set(:docsubtitlepartlabel, part_prefix(partnumber, subpartnumber, "fr"))
+        set(:docsubtitlepartlabel, part_prefix(partnumber, subpartnumber, lang))
         set(:docsubtitlepart, @c.encode(part.text, :hexadecimal)) if part
-        set(:docsubtitleamdlabel, amd_prefix(amdnumber, "fr")) if amdnumber
+        set(:docsubtitleamdlabel, amd_prefix(amdnumber, lang)) if amdnumber
         set(:docsubtitleamd, @c.encode(amd.text, :hexadecimal)) if amd
-        set(:docsubtitlecorrlabel, corr_prefix(corrnumber, "fr")) if corrnumber
+        set(:docsubtitlecorrlabel, corr_prefix(corrnumber, lang)) if corrnumber
       end
 
       def author(xml, _out)
@@ -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/word_convert.rb

@@ -21,6 +21,10 @@ module IsoDoc
                      headerfont: (options[:script] == "Hans" ? '"SimHei",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

@@ -34,6 +34,9 @@ module IsoDoc
           @anchors[c["id"]] = anchor_struct(i + 1, nil, @labels["appendix"], "clause")
           @anchors[c["id"]][:level] = 2
           @anchors[c["id"]][:container] = clause["id"]
+          c.xpath(ns("./clause | ./references")).each_with_index do |c, j|
+            appendix_names1(c, l10n("#{@labels["appendix"]} #{i + 1}.#{j + 1}"), 3, clause["id"])
+          end
         end
       end
 
@@ -55,6 +58,13 @@ module IsoDoc
         end
       end
 
+      def appendix_names1(clause, num, level, container)
+        @anchors[clause["id"]] = { label: num, xref: num, level: level, container: container }
+        clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
+          appendix_names1(c, "#{num}.#{i + 1}", level + 1, container)
+        end
+      end
+
       def hierarchical_formula_names(clause, num)
         c = IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//formula")).each do |t|

data/lib/metanorma/iso/fonts_manifest.yaml

@@ -0,0 +1,6 @@
+---
+Cambria:
+Cambria Math:
+Times New Roman:
+Source Han Sans:
+Courier New:

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

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.5.9".freeze
+    VERSION = "1.5.14".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -30,7 +30,7 @@ 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 "isodoc", "~> 1.3.0"
   spec.add_dependency "metanorma-standoc", "~> 1.6.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"

data/spec/asciidoctor-iso/base_spec.rb

@@ -6,17 +6,6 @@ RSpec.describe Asciidoctor::ISO do
     expect(Metanorma::ISO::VERSION).not_to be nil
   end
 
-  #it "generates output for the Rice document" do
-    #FileUtils.rm_f %w(spec/examples/rice.xml spec/examples/rice.doc spec/examples/rice.html spec/examples/rice_alt.html)
-    #FileUtils.cd "spec/examples"
-    #Asciidoctor.convert_file "rice.adoc", {:attributes=>{"backend"=>"iso"}, :safe=>0, :header_footer=>true, :requires=>["metanorma-iso"], :failure_level=>4, :mkdirs=>true, :to_file=>nil}
-    #FileUtils.cd "../.."
-    #expect(File.exist?("spec/examples/rice.xml"))).to be true
-    #expect(File.exist?("spec/examples/rice.doc"))).to be true
-    #expect(File.exist?("spec/examples/rice.html"))).to be true
-    #expect(File.exist?("spec/examples/rice_alt.html"))).to be true
-  #end
-
   it "processes a blank document" do
     expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     #{ASCIIDOC_BLANK_HDR}
@@ -29,22 +18,43 @@ RSpec.describe Asciidoctor::ISO do
 
   it "converts a blank document" do
     FileUtils.rm_f "test.doc"
+    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")
       = Document title
       Author
       :docfile: test.adoc
       :novalid:
       :no-isobib:
-      :no-pdf:
     INPUT
     #{BLANK_HDR}
 <sections/>
 </iso-standard>
     OUTPUT
+    expect(File.exist?("test_alt.html")).to be true
+    expect(File.exist?("test.html")).to be true
     expect(File.exist?("test.doc")).to be true
+    expect(File.exist?("test.pdf")).to be true
     expect(File.exist?("htmlstyle.css")).to be false
   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")
+      = Document title
+      Author
+      :docfile: test.adoc
+      :novalid:
+      :no-isobib:
+      :no-pdf:
+      :language: fr
+    INPUT
+    #{BLANK_HDR_FR}
+<sections/>
+</iso-standard>
+    OUTPUT
+  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")
       = Document title
@@ -89,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}">
@@ -142,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>
@@ -189,6 +201,12 @@ RSpec.describe Asciidoctor::ISO do
       :copyright-holder: ISO,IETF
       :copyright-year: 2001
       :doctype: technical-report
+      :pub-address: 1 Infinity Loop + \
+      California
+      :pub-phone: 3333333
+      :pub-fax: 4444444
+      :pub-email: x@example.com
+      :pub-uri: http://www.example.com
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
@@ -280,6 +298,116 @@ RSpec.describe Asciidoctor::ISO do
     OUTPUT
   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")
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :revdate: 2000-01
+      :published-date: 1000-01
+      :docnumber: 1000
+      :partnumber: 1-1
+      :tc-docnumber: 2000
+      :language: el
+      :script: Grek
+      :subdivision: Subdivision
+      :subdivision-abbr: SD
+      :doctype: This is a DocType
+      :pub-address: 1 Infinity Loop + \\
+      California
+      :pub-phone: 3333333
+      :pub-fax: 4444444
+      :pub-email: x@example.com
+      :pub-uri: http://www.example.com
+
+    INPUT
+    <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
+  <bibdata type='standard'>
+    <docidentifier type='ISO'>SD 1000-1-1</docidentifier>
+    <docidentifier type='iso-with-lang'>SD 1000-1-1(X)</docidentifier>
+    <docidentifier type='iso-reference'>SD 1000-1-1(X)</docidentifier>
+    <docidentifier type='iso-tc'>2000</docidentifier>
+    <docnumber>1000</docnumber>
+    <date type='published'>
+      <on>1000-01</on>
+    </date>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>International Organization for Standardization</name>
+        <subdivision>Subdivision</subdivision>
+        <abbreviation>SD</abbreviation>
+        <address>
+          <formattedAddress>1 Infinity Loop <br/>California</formattedAddress>
+        </address>
+        <phone>3333333</phone>
+        <phone type='fax'>4444444</phone>
+        <email>x@example.com</email>
+        <uri>http://www.example.com</uri>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>International Organization for Standardization</name>
+        <subdivision>Subdivision</subdivision>
+        <abbreviation>SD</abbreviation>
+        <address>
+          <formattedAddress>1 Infinity Loop <br/>California</formattedAddress>
+        </address>
+        <phone>3333333</phone>
+        <phone type='fax'>4444444</phone>
+        <email>x@example.com</email>
+        <uri>http://www.example.com</uri>
+      </organization>
+    </contributor>
+    <version>
+      <revision-date>2000-01</revision-date>
+    </version>
+    <language>el</language>
+    <script>Grek</script>
+    <status>
+      <stage abbreviation='IS'>60</stage>
+      <substage>60</substage>
+    </status>
+    <copyright>
+      <from>2020</from>
+      <owner>
+        <organization>
+          <name>International Organization for Standardization</name>
+          <subdivision>Subdivision</subdivision>
+          <abbreviation>SD</abbreviation>
+          <address>
+            <formattedAddress>1 Infinity Loop <br/>California</formattedAddress>
+          </address>
+          <phone>3333333</phone>
+          <phone type='fax'>4444444</phone>
+          <email>x@example.com</email>
+          <uri>http://www.example.com</uri>
+        </organization>
+      </owner>
+    </copyright>
+    <ext>
+      <doctype>this-is-a-doctype</doctype>
+      <editorialgroup>
+        <technical-committee/>
+        <subcommittee/>
+        <workgroup/>
+      </editorialgroup>
+      <structuredidentifier>
+        <project-number part='1' subpart='1'>SD 1000</project-number>
+      </structuredidentifier>
+      <stagename>International standard</stagename>
+    </ext>
+  </bibdata>
+  <sections> </sections>
+</iso-standard>
+
+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")
       = Document title

data/spec/asciidoctor-iso/blocks_spec.rb

@@ -191,7 +191,7 @@ RSpec.describe Asciidoctor::ISO do
       #{BLANK_HDR}
       <sections>
          <admonition id="_" type="safety precautions"><name>Safety Precautions</name><p id="_">While werewolves are hardy community members, keep in mind the following dietary concerns:</p>
-       <ol id="_" type="arabic">
+       <ol id="_">
          <li>
            <p id="_">They are allergic to cinnamon.</p>
          </li>

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -430,7 +430,7 @@ RSpec.describe Asciidoctor::ISO do
              <td valign="top" align="left">c</td>
            </tr>
          </tbody>
-       <dl id="_">
+       <dl id="_" key="true">
          <dt>a</dt>
          <dd>
            <p id="_">b</p>
@@ -572,7 +572,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
        <sections><formula id="_">
           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>F</mi><mi>or</mi><mi>μ</mi><mi>l</mi><mi>a</mi></math></stem>
-       <dl id="_">
+       <dl id="_" key="true">
          <dt>a</dt>
          <dd>
            <p id="_">b</p>
@@ -620,7 +620,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
        <sections><figure id="_">
          <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-       <dl id="_">
+       <dl id="_" key="true">
          <dt>a</dt>
          <dd>
            <p id="_">b</p>
@@ -678,7 +678,7 @@ RSpec.describe Asciidoctor::ISO do
              <abbreviation>ISO</abbreviation>
            </organization>
          </contributor>
-         <note format="text/plain" type="ISO DATE">The standard is in press</note>
+         <note format="text/plain" type="Unpublished-Status">The standard is in press</note>
        </bibitem>
       </references>
       </bibliography>

data/spec/asciidoctor-iso/lists_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Asciidoctor::ISO do
          </li>
          <li>
            <p id="_">List 3</p>
-           <ol id="_" type="arabic">
+           <ol id="_">
          <li>
            <p id="_">List A</p>
          </li>
@@ -107,13 +107,13 @@ RSpec.describe Asciidoctor::ISO do
          <li><p id="_">Second</p><p id="_">entry1</p>
        <p id="_">entry2</p></li>
        </ul>
-       <ol id="id1" type="alphabet">
+       <ol id="id1">
          <li>
            <p id="_">First</p>
          </li>
          <li>
            <p id="_">Second</p>
-           <ol id="_" type="alphabet_upper">
+           <ol id="_">
          <li>
            <p id="_">Third</p>
          </li>
@@ -129,19 +129,19 @@ RSpec.describe Asciidoctor::ISO do
            <p id="_">Sixth</p>
          </li>
        </ol>
-       <ol id="_" type="roman">
+       <ol id="_">
          <li>
            <p id="_">A</p>
          </li>
          <li>
            <p id="_">B</p>
-           <ol id="_" type="roman_upper">
+           <ol id="_">
          <li>
            <p id="_">C</p>
          </li>
          <li>
            <p id="_">D</p>
-           <ol id="_" type="arabic">
+           <ol id="_">
          <li>
            <p id="_">E</p>
          </li>