metanorma-standoc 1.5.3 → 1.6.0

data/lib/asciidoctor/standoc/yaml2_text_preprocessor.rb

@@ -36,7 +36,10 @@ module Asciidoctor
       protected
 
       def content_from_file(document, file_path)
-        YAML.safe_load(File.read(relative_file_path(document, file_path)))
+        YAML.safe_load(
+          File.read(relative_file_path(document, file_path),
+            encoding: "UTF-8"),
+          [Date, Time])
       end
     end
   end

data/lib/metanorma/standoc.rb

@@ -1,11 +1,6 @@
 require_relative "./standoc/processor"
-require_relative "./standoc/requirement"
-require_relative "./standoc/latexml_requirement"
 
 module Metanorma
   module Standoc
-    Requirements = {
-      latexml: LatexmlRequirement.new
-    }
   end
 end

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,24 @@
 module Metanorma
+  class << self
+    # https://stackoverflow.com/a/53399471
+    def parent_of(mod)
+      parent_name = mod.name =~ /::[^:]+\Z/ ? $`.freeze : nil
+      Object.const_get(parent_name) if parent_name
+    end
+
+    def all_modules(mod)
+      [mod] + mod.constants.map { |c| mod.const_get(c) }
+        .select {|c| c.is_a?(Module) && parent_of(c) == mod }
+        .flat_map {|m| all_modules(m) }
+    end
+
+    def versioned(mod, flavour)
+      all_modules(mod).select {|c| defined? c::VERSION}.
+        select {|c| c.name =~ /::#{flavour}$/ }
+    end
+  end
+
   module Standoc
-   VERSION = "1.5.3".freeze
+    VERSION = "1.6.0".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -30,7 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", "~> 1.2.0"
   spec.add_dependency "iev", "~> 0.2.1"
-  spec.add_dependency "relaton", "~> 1.3.0"
+  # relaton-cli not just relaton, to avoid circular reference in metanorma
+  spec.add_dependency "relaton-cli", "~> 1.4.0"
   spec.add_dependency "relaton-iev", "~> 1.0.0"
   spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "concurrent-ruby"

data/spec/asciidoctor-standoc/base_spec.rb

@@ -32,8 +32,101 @@ RSpec.describe Asciidoctor::Standoc do
     expect(File.exist?("htmlstyle.css")).to be false
   end
 
-  it "processes default metadata" do
+    it "processes publisher abbreviations" do
+    mock_org_abbrevs
     expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to xmlpp(<<~'OUTPUT')
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :publisher: International Electrotechnical Commission,IETF,ISO
+INPUT
+<standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='1.5.3'>
+  <bibdata type='standard'>
+    <title language='en' format='text/plain'>Document title</title>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>International Electrotechnical Commission</name>
+        <abbreviation>IEC</abbreviation>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>IETF</name>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>International Standards Organization</name>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>International Electrotechnical Commission</name>
+        <abbreviation>IEC</abbreviation>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>IETF</name>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>International Standards Organization</name>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </contributor>
+    <language>en</language>
+    <script>Latn</script>
+    <status>
+      <stage>published</stage>
+    </status>
+    <copyright>
+      <from>2020</from>
+      <owner>
+        <organization>
+          <name>International Electrotechnical Commission</name>
+          <abbreviation>IEC</abbreviation>
+        </organization>
+      </owner>
+    </copyright>
+    <copyright>
+      <from>2020</from>
+      <owner>
+        <organization>
+          <name>IETF</name>
+        </organization>
+      </owner>
+    </copyright>
+    <copyright>
+      <from>2020</from>
+      <owner>
+        <organization>
+          <name>International Standards Organization</name>
+          <abbreviation>ISO</abbreviation>
+        </organization>
+      </owner>
+    </copyright>
+    <ext>
+      <doctype>article</doctype>
+    </ext>
+  </bibdata>
+  <sections> </sections>
+</standard-document>
+OUTPUT
+  end
+
+  it "processes default metadata" do
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -109,7 +202,7 @@ RSpec.describe Asciidoctor::Standoc do
       :keywords: a, b, c
     INPUT
     <?xml version="1.0" encoding="UTF-8"?>
-<standard-document xmlns="https://www.metanorma.org/ns/standoc">
+<standard-document xmlns="https://www.metanorma.org/ns/standoc" type="semantic" version="#{Metanorma::Standoc::VERSION}">
 <bibdata type="standard">
 <title language="en" format="text/plain">Main Title — Title</title>
   <docidentifier>1000-1</docidentifier>
@@ -339,7 +432,7 @@ RSpec.describe Asciidoctor::Standoc do
       == Clause 1
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
-       <standard-document xmlns="https://www.metanorma.org/ns/standoc">
+       <standard-document xmlns="https://www.metanorma.org/ns/standoc"  type="semantic" version="#{Metanorma::Standoc::VERSION}">
        <bibdata type="standard">
          <title language="en" format="text/plain">Document title</title>
          <title language="eo" format="text/plain">Dokumenttitolo</title>
@@ -526,6 +619,31 @@ QU1FOiB0ZXN0Cgo=
 ])
   end
 
+  it "test submitting-organizations with delimiter in end" do
+    FileUtils.rm_f "test.doc"
+    Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :doctype: standard
+      :encoding: utf-8
+      :lang: en
+      :submitting-organizations: Organization One; Organization Two;
+      :publisher: "Hanna Barbera", "Cartoon Network", "Ribose, Inc.",
+    INPUT
+    expect(File.exist?("test.doc")).to be true
+  end
+
+  private
+
+  def mock_org_abbrevs
+    allow_any_instance_of(::Asciidoctor::Standoc::Front).to receive(:org_abbrev).and_return(
+      { "International Standards Organization" => "ISO",
+        "International Electrotechnical Commission" => "IEC" }
+    )
+  end
+
+ 
 
 end
 

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -273,7 +273,7 @@ RSpec.describe Asciidoctor::Standoc do
       For further information on the Foreword, see *ISO/IEC Directives, Part 2, 2016, Clause 12.*
       ****
       INPUT
-      <standard-document xmlns="https://www.metanorma.org/ns/standoc">
+      <standard-document xmlns="https://www.metanorma.org/ns/standoc"  type="semantic" version="#{Metanorma::Standoc::VERSION}">
        <bibdata type="standard">
          <title language="en" format="text/plain">Document title</title>
 

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -1167,7 +1167,7 @@ end
     # mock_iecbib_get_iec60050_102_01
     # mock_iecbib_get_iec60050_103_01
     # mock_iev
-    VCR.use_cassette "separates_iev_citations_by_top_level_clause" do
+    VCR.use_cassette "separates_iev_citations_by_top_level_clause", :re_record_interval => 25200 do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{CACHED_ISOBIB_BLANK_HDR}
 
@@ -1236,6 +1236,7 @@ end
           <uri type="src">https://webstore.iec.ch/publication/160</uri>
           <uri type="obp">/preview/info_iec60050-102%7Bed1.0%7Db.pdf</uri>
           <docidentifier type="IEC">IEC 60050-102:2007</docidentifier>
+          <docidentifier type='URN'>urn:iec:std:iec:60050-102:2007:::en</docidentifier>
           <date type="published">
             <on>2007</on>
           </date>
@@ -1274,6 +1275,7 @@ end
           <uri type="src">https://webstore.iec.ch/publication/161</uri>
           <uri type="obp">/preview/info_iec60050-103%7Bed1.0%7Db.pdf</uri>
           <docidentifier type="IEC">IEC 60050-103:2009</docidentifier>
+          <docidentifier type='URN'>urn:iec:std:iec:60050-103:2009:::en</docidentifier>
           <date type="published">
             <on>2009</on>
           </date>
@@ -1619,7 +1621,7 @@ it "removes bibdata bibitem IDs" do
 
     INPUT
     <?xml version='1.0' encoding='UTF-8'?>
-<standard-document xmlns='https://www.metanorma.org/ns/standoc'>
+<standard-document xmlns='https://www.metanorma.org/ns/standoc'  type="semantic" version="#{Metanorma::Standoc::VERSION}">
   <bibdata type='standard'>
     <title language='en' format='text/plain'>Document title</title>
     <language>en</language>
@@ -1665,7 +1667,7 @@ it "imports boilerplate file" do
     == Clause 1
 
     INPUT
-    <standard-document xmlns='https://www.metanorma.org/ns/standoc'>
+    <standard-document xmlns='https://www.metanorma.org/ns/standoc'  type="semantic" version="#{Metanorma::Standoc::VERSION}">
   <bibdata type='standard'>
     <title language='en' format='text/plain'>Document title</title>
     <language>en</language>
@@ -2054,7 +2056,7 @@ expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, heade
       === Bibliography Subsection
 
 INPUT
- <standard-document xmlns='https://www.metanorma.org/ns/standoc'>
+ <standard-document xmlns='https://www.metanorma.org/ns/standoc'  type="semantic" version="#{Metanorma::Standoc::VERSION}">
          <bibdata type='standard'>
            <title language='en' format='text/plain'>Document title</title>
            <language>en</language>
@@ -2330,7 +2332,7 @@ expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, heade
       === Bibliography Subsection
 
 INPUT
-<standard-document xmlns='https://www.metanorma.org/ns/standoc'>
+<standard-document xmlns='https://www.metanorma.org/ns/standoc'  type="semantic" version="#{Metanorma::Standoc::VERSION}">
           <bibdata type='standard'>
             <title language='en' format='text/plain'>Document title</title>
             <language>tlh</language>
@@ -2561,7 +2563,7 @@ expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, heade
       === Bibliography Subsection
 
 INPUT
-<standard-document xmlns='https://www.metanorma.org/ns/standoc'>
+<standard-document xmlns='https://www.metanorma.org/ns/standoc'  type="semantic" version="#{Metanorma::Standoc::VERSION}">
           <bibdata type='standard'>
             <title language='en' format='text/plain'>Document title</title>
             <language>fr</language>
@@ -2795,7 +2797,7 @@ expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, heade
       === Bibliography Subsection
 
 INPUT
-<standard-document xmlns='https://www.metanorma.org/ns/standoc'>
+<standard-document xmlns='https://www.metanorma.org/ns/standoc'  type="semantic" version="#{Metanorma::Standoc::VERSION}">
           <bibdata type='standard'>
             <title language='en' format='text/plain'>Document title</title>
             <language>zh</language>
@@ -3026,7 +3028,7 @@ expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, heade
       === Bibliography Subsection
 
 INPUT
-<standard-document xmlns='https://www.metanorma.org/ns/standoc'>
+<standard-document xmlns='https://www.metanorma.org/ns/standoc'  type="semantic" version="#{Metanorma::Standoc::VERSION}">
           <bibdata type='standard'>
             <title language='en' format='text/plain'>Document title</title>
             <language>en</language>
@@ -3176,7 +3178,7 @@ input = <<~INPUT
 
 INPUT
 expect(xmlpp(Asciidoctor.convert(input, backend: :standoc, header_footer: true).gsub(/<p id="_[^"]+">/, "").gsub('</p>', ""))).to be_equivalent_to (<<~"OUTPUT")
-<standard-document xmlns='https://www.metanorma.org/ns/standoc'>
+<standard-document xmlns='https://www.metanorma.org/ns/standoc'  type="semantic" version="#{Metanorma::Standoc::VERSION}">
   <bibdata type='standard'>
     <title language='en' format='text/plain'>Document title</title>
     <language>en</language>

data/spec/asciidoctor-standoc/inline_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Asciidoctor::Standoc do
       text, including **__nest__**ed markup.
       INPUT
       <?xml version="1.0" encoding="UTF-8"?>
-<standard-document xmlns="https://www.metanorma.org/ns/standoc">
+<standard-document xmlns="https://www.metanorma.org/ns/standoc"  type="semantic" version="#{Metanorma::Standoc::VERSION}">
 <bibdata type="standard">
 <title language="en" format="text/plain">Document title</title>
 <language>en</language>
@@ -77,42 +77,147 @@ text, including <strong><em>nest</em></strong>ed markup.</p>
     OUTPUT
   end
 
+  it "process mtext spaces" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{DUMBQUOTE_BLANK_HDR}
+
+      stem:[n < 1 " for all text "]
+INPUT
+            #{BLANK_HDR}
+  <sections>
+    <p id='_'>
+      <stem type='MathML'>
+        <math xmlns='http://www.w3.org/1998/Math/MathML'>
+          <mi>n</mi>
+          <mo/>
+          <mn>1</mn>
+          <mtext> for all text </mtext>
+        </math>
+      </stem>
+    </p>
+  </sections>
+</standard-document>
+OUTPUT
+  end
+
   it "properly handles inline substitution" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{DUMBQUOTE_BLANK_HDR}
 
       stem:[n < 1] +
       latexmath:[n < 1]
+      stem:["&#x200c;"^199 "Hg"^+]
       INPUT
             #{BLANK_HDR}
       <sections>
       <p id="_">
           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>n</mi><mo>&lt;</mo><mn>1</mn></math></stem><br/>
           <stem type="MathML"> <math xmlns="http://www.w3.org/1998/Math/MathML">   <mrow>     <mi>n</mi>     <mo>&lt;</mo>     <mn>1</mn>   </mrow> </math></stem>
+          <stem type='MathML'>
+  <math xmlns='http://www.w3.org/1998/Math/MathML'>
+    <msup>
+      <mrow>
+        <mtext>‌</mtext>
+      </mrow>
+      <mrow>
+        <mn>199</mn>
+      </mrow>
+    </msup>
+    <msup>
+      <mrow>
+        <mtext>Hg</mtext>
+      </mrow>
+      <mrow>
+        <mo>+</mo>
+      </mrow>
+    </msup>
+  </math>
+</stem>
         </p>
       </sections>
        </standard-document>
       OUTPUT
   end
 
-  it "normalises inline stem" do
+  it "normalises inline stem, straight quotes" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{DUMBQUOTE_BLANK_HDR}
 
       stem:[n < 1]
       latexmath:[n < 1]
+      stem:["&#x200c;"^199 "Hg"^+]
+      INPUT
+            #{BLANK_HDR}
+      <sections>
+      <p id="_">
+          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>n</mi><mo>&lt;</mo><mn>1</mn></math></stem>
+          <stem type="MathML"> <math xmlns="http://www.w3.org/1998/Math/MathML">   <mrow>     <mi>n</mi>     <mo>&lt;</mo>     <mn>1</mn>   </mrow> </math></stem>
+          <stem type='MathML'>
+  <math xmlns='http://www.w3.org/1998/Math/MathML'>
+    <msup>
+      <mrow>
+        <mtext>‌</mtext>
+      </mrow>
+      <mrow>
+        <mn>199</mn>
+      </mrow>
+    </msup>
+    <msup>
+      <mrow>
+        <mtext>Hg</mtext>
+      </mrow>
+      <mrow>
+        <mo>+</mo>
+      </mrow>
+    </msup>
+  </math>
+  </stem>
+        </p>
+      </sections>
+       </standard-document>
+      OUTPUT
+  end
+
+  it "normalises inline stem, smart quotes" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+
+      stem:[n < 1]
+      latexmath:[n < 1]
+      stem:["&#x200c;"^199 "Hg"^+]
       INPUT
             #{BLANK_HDR}
       <sections>
       <p id="_">
           <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>n</mi><mo>&lt;</mo><mn>1</mn></math></stem>
           <stem type="MathML"> <math xmlns="http://www.w3.org/1998/Math/MathML">   <mrow>     <mi>n</mi>     <mo>&lt;</mo>     <mn>1</mn>   </mrow> </math></stem>
+          <stem type='MathML'>
+  <math xmlns='http://www.w3.org/1998/Math/MathML'>
+    <msup>
+      <mrow> 
+        <mtext>‌</mtext>
+      </mrow>
+      <mrow>
+        <mn>199</mn>
+      </mrow>
+    </msup>
+    <msup>
+      <mrow>
+        <mtext>Hg</mtext>
+      </mrow>
+      <mrow>
+        <mo>+</mo>
+      </mrow>
+    </msup>
+  </math>
+  </stem>
         </p>
       </sections>
        </standard-document>
       OUTPUT
   end
 
+
   it "generates desired smart quotes for 'dd'" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
@@ -201,8 +306,14 @@ text, including <strong><em>nest</em></strong>ed markup.</p>
       Inline Reference with Text to <<reference,text>>
       Footnoted Reference with Text to <<reference,fn: text>>
       Anchored Crossreference to other document <<a.adoc#b>>
+      Capitalised Reference to <<reference,droploc%capital%>>
+      Lowercase Footnoted Reference to <<reference,capital%droploc%fn>>
       Capitalised Reference to <<reference,capital%>>
       Lowercase Footnoted Reference to <<reference,capital%fn>>
+      Capitalised Reference to <<reference,droploc%>>
+      Lowercase Footnoted Reference to <<reference,droploc%fn>>
+      Capitalised Reference to <<reference,droploc%capital%>>
+      Lowercase Footnoted Reference to <<reference,droploc%capital%fn>>
     INPUT
        #{BLANK_HDR}
         <sections>
@@ -213,8 +324,21 @@ text, including <strong><em>nest</em></strong>ed markup.</p>
        Inline Reference with Text to <xref target="reference">text</xref>
        Footnoted Reference with Text to <xref target="reference">text</xref>
        Anchored Crossreference to other document <xref target="a#b"/>
-       Capitalised Reference to <xref target='reference' case='capital'></xref>
-       Lowercase Footnoted Reference to <xref target='reference' case='capital'></xref></p>
+       Capitalised Reference to <xref target='reference' case='capital' droploc="true"></xref>
+       Lowercase Footnoted Reference to <xref target='reference' case='capital' droploc="true"></xref>
+        Capitalised Reference to
+<xref target='reference' case='capital'/>
+ Lowercase Footnoted Reference to
+<xref target='reference' case='capital'/>
+ Capitalised Reference to
+<xref target='reference' droploc='true'/>
+ Lowercase Footnoted Reference to
+<xref target='reference' droploc='true'/>
+ Capitalised Reference to
+<xref target='reference' case='capital' droploc='true'/>
+ Lowercase Footnoted Reference to
+<xref target='reference' case='capital' droploc='true'/>
+</p>
        </clause>
        </sections>
        </standard-document>