metanorma-iso 1.5.5 → 1.5.10

data/lib/isodoc/iso/isosts_convert.rb

@@ -0,0 +1,31 @@
+require "isodoc"
+require "mn2sts"
+
+module IsoDoc
+  module Iso
+
+    # A {Converter} implementation that generates HTML output, and a document
+    # schema encapsulation of the document for validation
+    #
+    class IsoStsConvert < IsoDoc::XslfoPdfConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        @format = :isosts
+        @suffix = "isosts.xml"
+      end
+
+      def convert(input_filename, file = nil, debug = false, output_filename = nil)
+        file = File.read(input_filename, encoding: "utf-8") if file.nil?
+        docxml, filename, dir = convert_init(file, input_filename, debug)
+        /\.xml$/.match(input_filename) or
+          input_filename = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
+          f.write file
+          f.path
+        end
+        FileUtils.rm_rf dir
+        Mn2sts.convert(input_filename, output_filename || "#{filename}.#{@suffix}", iso: true)
+      end
+    end
+  end
+end
+

data/lib/isodoc/iso/xref.rb

@@ -1,20 +1,16 @@
 module IsoDoc
   module Iso
     class Xref < IsoDoc::Xref
-      def parse(docxml)
-        if @klass.amd(docxml)
-          back_anchor_names(docxml)
-          note_anchor_names(docxml.xpath(ns("//annex//table | //annex//figure")))
-          note_anchor_names(docxml.xpath(ns("//annex")))
-          example_anchor_names(docxml.xpath(ns("//annex")))
-          list_anchor_names(docxml.xpath(ns("//annex")))
+      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/*")))
+          middle_section_asset_names(d)
+          termnote_anchor_names(d)
+          termexample_anchor_names(d)
         else
           super
         end
-      end
-
-      def initial_anchor_names(d)
-        super
         introduction_names(d.at(ns("//introduction")))
       end
 

data/lib/metanorma-iso.rb

@@ -5,6 +5,7 @@ require_relative "isodoc/iso/html_convert"
 require_relative "isodoc/iso/word_convert"
 require_relative "isodoc/iso/pdf_convert"
 require_relative "isodoc/iso/sts_convert"
+require_relative "isodoc/iso/isosts_convert"
 require_relative "isodoc/iso/presentation_xml_convert"
 require "asciidoctor/extensions"
 

data/lib/metanorma/iso/processor.rb

@@ -25,7 +25,8 @@ module Metanorma
           html_alt: "alt.html",
           doc: "doc",
           pdf: "pdf",
-          sts: "sts.xml"
+          sts: "sts.xml",
+          isosts: "iso.sts.xml"
         )
       end
 
@@ -50,6 +51,8 @@ module Metanorma
           IsoDoc::Iso::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :sts
           IsoDoc::Iso::StsConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :isosts
+          IsoDoc::Iso::IsoStsConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :presentation
           IsoDoc::Iso::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.5.5".freeze
+    VERSION = "1.5.10".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -31,10 +31,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", "~> 1.2.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.5.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"
-  spec.add_dependency "mn2sts", "~> 1.2.0"
+  spec.add_dependency "mn2sts", "~> 1.5.0"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "sassc", "2.4.0"

data/spec/asciidoctor-iso/amd_spec.rb

@@ -2,22 +2,6 @@ require "spec_helper"
 require "fileutils"
 
 RSpec.describe Asciidoctor::ISO do
-  it "validates amendment document against distinct ISO XML schema" do
-    FileUtils.rm_f "test.err"
-  Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)
-  = Document title
-  Author
-  :docfile: test.adoc
-  :nodoc:
-  :no-isobib:
-  :doctype: amendment
-
-  [change=mid-air]
-  == Para
-  INPUT
-    expect(File.read("test.err")).to include 'value of attribute "change" is invalid; must be equal to'
-end
-
     it "processes amendment sections" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{AMD_BLANK_HDR}
@@ -147,22 +131,6 @@ end
 OUTPUT
     end
 
-      it "processes section attributes" do
-     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{AMD_BLANK_HDR}
-      [change=delete,locality="clause=introduction,paragraph=4-7",inline-header="true"]
-      == Clause 1
-
-     INPUT
-             #{BLANK_HDR.sub(%r{<doctype>article</doctype>}, "<doctype>amendment</doctype>")}
-       <sections><clause id="_" obligation="normative"  change="delete" locality="clause=introduction,paragraph=4-7">
-         <title>Clause 1</title>
-       </clause>
-       </sections>
-       </iso-standard>
-     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")
       = Document title
@@ -215,7 +183,7 @@ OUTPUT
       :doctype: amendment
       :updates-document-type: international-standard
     INPUT
-    <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+    <iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
   <bibdata type='standard'>
     <title language='en' format='text/plain' type='main'>Introduction — Main Title — Title — Title Part — Mass fraction of
        extraneous matter, milled rice (nonglutinous), sample dividers and
@@ -330,7 +298,7 @@ Author
 :updates: ISO 17301-1:2030
 :amendment-number: 1
 INPUT
- <iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+ <iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
    <bibdata type='standard'>
      <docidentifier type='ISO'>ISO 17301-1:2030/CD Amd 1</docidentifier>
      <docidentifier type='iso-with-lang'>ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
@@ -398,7 +366,7 @@ Author
 :updates: ISO 17301-1:2030
 :amendment-number: 1
 INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
          <bibdata type='standard'>
            <docidentifier type='ISO'>ISO 17301-1:2030/DAmd 1</docidentifier>
            <docidentifier type='iso-with-lang'>ISO 17301-1:2030/DAmd 1(E)</docidentifier>
@@ -465,7 +433,7 @@ Author
 :updates: ISO 17301-1:2030
 :amendment-number: 1
 INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
          <bibdata type='standard'>
            <docidentifier type='ISO'>ISO 17301-1:2030/Amd 1</docidentifier>
            <docidentifier type='iso-with-lang'>ISO 17301-1:2030/Amd 1(E)</docidentifier>
@@ -533,7 +501,7 @@ Author
 :updates: ISO 17301-1:2030
 :corrigendum-number: 3
 INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
   <bibdata type='standard'>
     <docidentifier type='ISO'>ISO 17301-1:2030/CD Cor.3</docidentifier>
     <docidentifier type='iso-with-lang'>ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
@@ -601,7 +569,7 @@ Author
 :updates: ISO 17301-1:2030
 :corrigendum-number: 3
 INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
   <bibdata type='standard'>
     <docidentifier type='ISO'>ISO 17301-1:2030/FDCor.3</docidentifier>
     <docidentifier type='iso-with-lang'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
@@ -668,7 +636,7 @@ Author
 :updates: ISO 17301-1:2030
 :corrigendum-number: 3
 INPUT
-<iso-standard xmlns='https://www.metanorma.org/ns/iso'>
+<iso-standard xmlns='https://www.metanorma.org/ns/iso'  type="semantic" version="#{Metanorma::ISO::VERSION}">
          <bibdata type='standard'>
            <docidentifier type='ISO'>ISO 17301-1:2030/Cor.3</docidentifier>
            <docidentifier type='iso-with-lang'>ISO 17301-1:2030/Cor.3(E)</docidentifier>

data/spec/asciidoctor-iso/base_spec.rb

@@ -91,7 +91,7 @@ RSpec.describe Asciidoctor::ISO do
       :copyright-year: 2000
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
-       <iso-standard xmlns="https://www.metanorma.org/ns/iso">
+       <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
        <bibdata type="standard">
    <title language="en" format="text/plain" type="main">Introduction — Main Title — Title — Title Part</title>
    <title language="en" format="text/plain" type="title-intro">Introduction</title>
@@ -173,7 +173,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).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -189,9 +189,15 @@ 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">
+       <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
        <bibdata type="standard">
          <docidentifier type="ISO">ISO/IEC/IETF/TR 1000-1-1:2001</docidentifier>
          <docidentifier type='iso-with-lang'>ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
@@ -280,6 +286,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
@@ -294,7 +410,7 @@ RSpec.describe Asciidoctor::ISO do
       :doctype: technical-specification
       :iteration: 2
     INPUT
-    <iso-standard xmlns="https://www.metanorma.org/ns/iso">
+    <iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
 <bibdata type="standard">
   <docidentifier type="ISO">ISO/DTS 1000.2</docidentifier>
   <docidentifier type='iso-with-lang'>ISO/DTS 1000.2(F)</docidentifier>
@@ -360,7 +476,7 @@ OUTPUT
       :docnumber: 1000
       :docstage: 60
     INPUT
-<iso-standard xmlns="https://www.metanorma.org/ns/iso">
+<iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
 <bibdata type="standard">
   <docidentifier type="ISO">ISO 1000</docidentifier>
   <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
@@ -426,7 +542,7 @@ OUTPUT
       :docstage: 60
       :docsubstage: 00
     INPUT
-<iso-standard xmlns="https://www.metanorma.org/ns/iso">
+<iso-standard xmlns="https://www.metanorma.org/ns/iso"  type="semantic" version="#{Metanorma::ISO::VERSION}">
 <bibdata type="standard">
   <docidentifier type="ISO">ISO 1000</docidentifier>
   <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -425,9 +425,9 @@ RSpec.describe Asciidoctor::ISO do
        <sections><table id="_">
          <tbody>
            <tr>
-             <td align="left">a</td>
-             <td align="left">b</td>
-             <td align="left">c</td>
+             <td valign="top" align="left">a</td>
+             <td valign="top" align="left">b</td>
+             <td valign="top" align="left">c</td>
            </tr>
          </tbody>
        <dl id="_">
@@ -456,23 +456,23 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
        <sections>
              <table id="_"><thead><tr>
-             <th align="left">a</th>
-             <th align="left">b</th>
-             <th align="left">c</th>
+             <th valign="top" align="left">a</th>
+             <th valign="top" align="left">b</th>
+             <th valign="top" align="left">c</th>
            </tr><tr>
-             <th align="left">a</th>
-             <th align="left">b</th>
-             <th align="left">c</th>
+             <th valign="top" align="left">a</th>
+             <th valign="top" align="left">b</th>
+             <th valign="top" align="left">c</th>
            </tr><tr>
-             <th align="left">a</th>
-             <th align="left">b</th>
-             <th align="left">c</th>
+             <th valign="top" align="left">a</th>
+             <th valign="top" align="left">b</th>
+             <th valign="top" align="left">c</th>
            </tr></thead>
          <tbody>
            <tr>
-             <td align="left">a</td>
-             <td align="left">b</td>
-             <td align="left">c</td>
+             <td valign="top" align="left">a</td>
+             <td valign="top" align="left">b</td>
+             <td valign="top" align="left">c</td>
            </tr>
          </tbody>
        </table>
@@ -498,26 +498,26 @@ RSpec.describe Asciidoctor::ISO do
          <table id="_">
          <thead>
            <tr>
-             <th align="left">a</th>
-             <th align="left">b</th>
-             <th align="left">c</th>
+             <th valign="top" align="left">a</th>
+             <th valign="top" align="left">b</th>
+             <th valign="top" align="left">c</th>
            </tr>
          <tr>
-             <th align="left">a</th>
-             <th align="left">b</th>
-             <th align="left">c</th>
+             <th valign="top" align="left">a</th>
+             <th valign="top" align="left">b</th>
+             <th valign="top" align="left">c</th>
            </tr><tr>
-             <th align="left">a</th>
-             <th align="left">b</th>
-             <th align="left">c</th>
+             <th valign="top" align="left">a</th>
+             <th valign="top" align="left">b</th>
+             <th valign="top" align="left">c</th>
            </tr></thead>
          <tbody>
 
 
            <tr>
-             <td align="left">a</td>
-             <td align="left">b</td>
-             <td align="left">c</td>
+             <td valign="top" align="left">a</td>
+             <td valign="top" align="left">b</td>
+             <td valign="top" align="left">c</td>
            </tr>
          </tbody>
        </table>
@@ -541,9 +541,9 @@ RSpec.describe Asciidoctor::ISO do
               <sections><table id="_">
          <tbody>
            <tr>
-             <td align="left">a</td>
-             <td align="left">b</td>
-             <td align="left">c</td>
+             <td valign="top" align="left">a</td>
+             <td valign="top" align="left">b</td>
+             <td valign="top" align="left">c</td>
            </tr>
          </tbody>
        <note id="_">