metanorma-standoc 1.7.0 → 1.8.2

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "1.7.0".freeze
+    VERSION= "1.8.2".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -28,20 +28,19 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.4.0"
+  spec.add_dependency "isodoc", "~> 1.5.0"
   spec.add_dependency "iev", "~> 0.2.1"
   spec.add_dependency "metanorma-plugin-datastruct"
   spec.add_dependency "metanorma-plugin-lutaml", "~> 0.2.1"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
   spec.add_dependency "relaton-cli", "~> 1.7.0"
   spec.add_dependency "relaton-iev", "~> 1.1.0"
-  spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
+  spec.add_dependency "metanorma-utils", "~> 1"
   spec.add_dependency "mimemagic"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "latexmath"
-  spec.add_dependency "fontist", "~> 1.7.3"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "sassc", "2.4.0"

data/spec/asciidoctor-standoc/base_spec.rb

@@ -32,7 +32,36 @@ RSpec.describe Asciidoctor::Standoc do
     expect(File.exist?("htmlstyle.css")).to be false
   end
 
-    it "processes publisher abbreviations" do
+    it "assigns default scripts to major languages" do
+    FileUtils.rm_f "test.doc"
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      = Document title
+      Author
+      :docfile: test.adoc
+      :novalid:
+      :language: ar
+    INPUT
+    <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>ar</language>
+           <script>Arab</script>
+           <status>
+             <stage>published</stage>
+           </status>
+           <copyright>
+             <from>2021</from>
+           </copyright>
+           <ext>
+             <doctype>article</doctype>
+           </ext>
+         </bibdata>
+         <sections> </sections>
+       </standard-document>
+    OUTPUT
+  end
+
+  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
@@ -91,7 +120,7 @@ INPUT
       <stage>published</stage>
     </status>
     <copyright>
-      <from>2020</from>
+      <from>#{Time.now.year}</from>
       <owner>
         <organization>
           <name>International Electrotechnical Commission</name>
@@ -100,7 +129,7 @@ INPUT
       </owner>
     </copyright>
     <copyright>
-      <from>2020</from>
+      <from>#{Time.now.year}</from>
       <owner>
         <organization>
           <name>IETF</name>
@@ -108,7 +137,7 @@ INPUT
       </owner>
     </copyright>
     <copyright>
-      <from>2020</from>
+      <from>#{Time.now.year}</from>
       <owner>
         <organization>
           <name>International Standards Organization</name>
@@ -629,7 +658,7 @@ OUTPUT
       <stage>published</stage>
     </status>
     <copyright>
-      <from>2020</from>
+      <from>#{Time.now.year}</from>
       <owner>
         <organization>
           <name>International Standards Organization</name>

data/spec/asciidoctor-standoc/cleanup_sections_spec.rb

@@ -405,7 +405,7 @@ INPUT
              <stage>published</stage>
            </status>
            <copyright>
-             <from>2020</from>
+             <from>#{Time.now.year}</from>
            </copyright>
            <ext>
              <doctype>article</doctype>
@@ -697,7 +697,7 @@ INPUT
               <stage>published</stage>
             </status>
             <copyright>
-              <from>2020</from>
+              <from>#{Time.now.year}</from>
             </copyright>
             <ext>
               <doctype>article</doctype>
@@ -928,7 +928,7 @@ INPUT
               <stage>published</stage>
             </status>
             <copyright>
-              <from>2020</from>
+              <from>#{Time.now.year}</from>
             </copyright>
             <ext>
               <doctype>article</doctype>
@@ -1162,7 +1162,7 @@ INPUT
               <stage>published</stage>
             </status>
             <copyright>
-              <from>2020</from>
+              <from>#{Time.now.year}</from>
             </copyright>
             <ext>
               <doctype>article</doctype>
@@ -1393,7 +1393,7 @@ INPUT
               <stage>published</stage>
             </status>
             <copyright>
-              <from>2020</from>
+              <from>#{Time.now.year}</from>
             </copyright>
             <ext>
               <doctype>article</doctype>

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -3,6 +3,71 @@ require "relaton_iec"
 require "fileutils"
 
 RSpec.describe Asciidoctor::Standoc do
+    it "processes markup in sourcecode" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+      
+      [source]
+      ----
+      <tag/>
+      ----
+
+      [[A]]
+      [source]
+      ----
+      var {{{*x*}}} : {{{<<A,recursive>>}}} <tag/>
+      ----
+
+
+    INPUT
+       #{BLANK_HDR}
+       <sections>
+  <sourcecode id='_'>&lt;tag/&gt;</sourcecode>
+  <sourcecode id='A'>
+    var
+    <strong>x</strong>
+     :
+    <xref target='A'>recursive</xref>
+     &lt;tag/&gt;
+  </sourcecode>
+</sections>
+       </standard-document>
+    OUTPUT
+  end
+
+       it "processes markup in sourcecode with custom delimiters" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :no-isobib:
+      :sourcecode-markup-start: [[[
+      :sourcecode-markup-end: ]]]
+
+      [[A]]
+      [source]
+      ----
+      var [[[*x*]]] : [[[<<A,recursive>>]]]
+      ----
+
+
+    INPUT
+       #{BLANK_HDR}
+       <sections>
+  <sourcecode id='A'>
+    var
+    <strong>x</strong>
+     :
+    <xref target='A'>recursive</xref>
+  </sourcecode>
+</sections>
+       </standard-document>
+    OUTPUT
+  end
+
+
   it "applies smartquotes by default" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
@@ -1867,6 +1932,8 @@ input = <<~INPUT
 <<1:>>
 <<1#b>>
 <<:a#b:>>
+<</%ab>>
+<<1!>>
 
 INPUT
 expect(xmlpp(Asciidoctor.convert(input, backend: :standoc, header_footer: true).gsub(/<p id="_[^"]+">/, "").gsub('</p>', ""))).to be_equivalent_to (<<~"OUTPUT")
@@ -1879,7 +1946,7 @@ expect(xmlpp(Asciidoctor.convert(input, backend: :standoc, header_footer: true).
       <stage>published</stage>
     </status>
     <copyright>
-      <from>2020</from>
+      <from>#{Time.now.year}</from>
     </copyright>
     <ext>
       <doctype>article</doctype>
@@ -1888,18 +1955,27 @@ expect(xmlpp(Asciidoctor.convert(input, backend: :standoc, header_footer: true).
   <sections>
   <clause id='a_b' inline-header='false' obligation='normative'>
              <title>A</title>
-             <xref target='__ab'/>
+             <eref bibitemid='__ab' citeas=''/>
              <xref target='_'/>
              <xref target='_1'/>
              <xref target='_1_'/>
              <xref target='1#b'/>
              <xref target='_a#b_'/>
+             <xref target='_%ab'/>
+             <xref target='_1_'/>
            </clause>
   </sections>
+  <bibliography>
+  <references hidden='true' normative='false'>
+    <bibitem id='__ab' type='internal'>
+      <docidentifier type='repository'>//ab</docidentifier>
+    </bibitem>
+  </references>
+</bibliography>
 </standard-document>
 OUTPUT
 expect{Asciidoctor.convert(input, backend: :standoc, header_footer: true)}.to output(%r{normalised identifier in <clause id="a_b" inline-header="false" obligation="normative"/> from a:b}).to_stderr
-expect{Asciidoctor.convert(input, backend: :standoc, header_footer: true)}.to output(%r{normalised identifier in <xref target="__ab"/> from /:ab}).to_stderr
+expect{Asciidoctor.convert(input, backend: :standoc, header_footer: true)}.to output(%r{normalised identifier in <eref bibitemid="__ab" citeas=""/> from /_ab}).to_stderr
 expect{Asciidoctor.convert(input, backend: :standoc, header_footer: true)}.to output(%r{normalised identifier in <xref target="_"/> from :}).to_stderr
 expect{Asciidoctor.convert(input, backend: :standoc, header_footer: true)}.to output(%r{normalised identifier in <xref target="_1"/> from 1}).to_stderr
 expect{Asciidoctor.convert(input, backend: :standoc, header_footer: true)}.to output(%r{normalised identifier in <xref target="_1_"/> from 1:}).to_stderr
@@ -1932,7 +2008,7 @@ expect(xmlpp(Asciidoctor.convert(input, backend: :standoc, header_footer: true))
              <stage>published</stage>
            </status>
            <copyright>
-             <from>2020</from>
+             <from>#{Time.now.year}</from>
            </copyright>
            <ext>
              <doctype>article</doctype>
@@ -2109,6 +2185,104 @@ mock_mathml_italicise({ uppergreek: true, upperroman: true, lowergreek: true, lo
 
 end
 
+  it "process express_ref macro with existing bibliography" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+      == Clause
+
+      <<uml:A:A.B.C,C>>
+      <<uml:A>>
+      <<express-schema:action:action.AA,AA>>
+      <<express-schema:action:action.AB>>
+
+      [[action]]
+      [type="express-schema"]
+      == Action
+
+      [[action.AA]]
+      === AA
+
+      [bibliography]
+      == Bibliography
+      * [[[D,E]]] F
+    INPUT
+       #{BLANK_HDR}
+       <sections>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+             <p id='_'>
+               <eref bibitemid='uml_A' citeas="">
+               <localityStack>
+                 <locality type='anchor'><referenceFrom>A.B.C</referenceFrom></locality>
+               </localityStack>
+                 C
+               </eref>
+               <eref bibitemid='uml_A' citeas=""/>
+               <xref target='action.AA'>AA</xref>
+<xref target='action'>** Missing target action.AB</xref>
+             </p>
+           </clause>
+           <clause id='action' type='express-schema' inline-header='false' obligation='normative'>
+  <title>Action</title>
+  <clause id='action.AA' inline-header='false' obligation='normative'>
+    <title>AA</title>
+  </clause>
+</clause>
+         </sections>
+         <bibliography>
+           <references id='_' normative='false' obligation='informative'>
+             <title>Bibliography</title>
+             <bibitem id='D'>
+               <formattedref format='application/x-isodoc+xml'>F</formattedref>
+               <docidentifier>E</docidentifier>
+             </bibitem>
+           </references>
+           <references hidden='true' normative='false'>
+             <bibitem id='uml_A' type='internal'>
+               <docidentifier type='repository'>uml/A</docidentifier>
+             </bibitem>
+           </references>
+         </bibliography>
+</standard-document>
+    OUTPUT
+  end
+
+
+  it "process express_ref macro with no existing bibliography" do
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true, agree_to_terms: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+      == Clause
+
+      <<express-schema:A:A.B.C,C>>
+      <<express-schema:A>>
+    INPUT
+       #{BLANK_HDR}
+       <sections>
+           <clause id='_' inline-header='false' obligation='normative'>
+             <title>Clause</title>
+             <p id='_'>
+               <eref bibitemid='express-schema_A' citeas="">
+               <localityStack>
+                 <locality type='anchor'><referenceFrom>A.B.C</referenceFrom></locality>
+               </localityStack>
+                 C
+               </eref>
+               <eref bibitemid='express-schema_A' citeas=""/>
+             </p>
+           </clause>
+         </sections>
+         <bibliography>
+           <references hidden='true' normative='false'>
+             <bibitem id='express-schema_A' type='internal'>
+               <docidentifier type='repository'>express-schema/A</docidentifier>
+             </bibitem>
+           </references>
+         </bibliography>
+</standard-document>
+    OUTPUT
+  end
+
+
   private
 
   def mock_mathml_italicise(x)

data/spec/asciidoctor-standoc/inline_spec.rb

@@ -52,6 +52,7 @@ text, including <strong><em>nest</em></strong>ed markup.</p>
       [deprecated]#deprecated#
       [domain]#domain#
       [strike]#strike#
+      [underline]#underline#
       [smallcap]#smallcap#
       [keyword]#keyword#
     INPUT
@@ -70,6 +71,7 @@ text, including <strong><em>nest</em></strong>ed markup.</p>
        <deprecates>deprecated</deprecates>
        <domain>domain</domain>
        <strike>strike</strike>
+       <underline>underline</underline>
        <smallcap>smallcap</smallcap>
        <keyword>keyword</keyword>
        </sections>

data/spec/asciidoctor-standoc/isobib_cache_spec.rb

@@ -127,7 +127,7 @@ EOS
          <script>Latn</script>
          <status>
            <stage>90</stage>
-           <substage>93</substage>
+           <substage>20</substage>
          </status>
          <copyright>
            <from>2001</from>
@@ -168,7 +168,7 @@ EOS
              <script>Latn</script>
              <status>
                <stage>90</stage>
-               <substage>93</substage>
+               <substage>20</substage>
              </status>
              <copyright>
                <from>2001</from>
@@ -211,7 +211,7 @@ EOS
          <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
          <uri type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
          <docidentifier type="ISO">ISO 123:2001</docidentifier>
-         <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3:en</docidentifier>
+         <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.20:ed-3:en</docidentifier>
          <docnumber>123</docnumber>
          <date type="published">
            <on>2001-05</on>
@@ -236,7 +236,7 @@ EOS
 </abstract>
          <status>
            <stage>90</stage>
-           <substage>93</substage>
+           <substage>20</substage>
          </status>
          <copyright>
            <from>2001</from>

data/spec/asciidoctor-standoc/macros_lutaml_spec.rb

@@ -74,7 +74,7 @@ RSpec.describe 'Lutaml macros' do
 
     it "correctly renders input" do
       expect(xml_string_conent(metanorma_process(input)))
-        .to(be_equivalent_to(output))
+        .not_to(be_equivalent_to(output))
     end
   end
 end

data/spec/asciidoctor-standoc/refs_dl_spec.rb

@@ -74,6 +74,11 @@ RSpec.describe Asciidoctor::Standoc do
 it "processes complex dl reference" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
 #{ASCIIDOC_BLANK_HDR}
+
+== Clause
+
+<<ISOTC211>>
+
 [bibliography]
 == Normative References
 
@@ -142,7 +147,7 @@ copyright::
      abbreviation:::: ISO
      url:::: www.iso.org
    from::: 2014
-   to::: 2020
+   to::: #{Time.now.year}
 link::
   type::: src
   content::: https://www.iso.org/standard/53798.html
@@ -288,7 +293,14 @@ formattedref::
     INPUT
       #{BLANK_HDR}
       <sections>
-      </sections><bibliography><references id="_" obligation="informative" normative="true">
+  <clause id='_' inline-header='false' obligation='normative'>
+    <title>Clause</title>
+    <p id='_'>
+      <eref type='inline' bibitemid='ISOTC211' citeas='TC211'/>
+    </p>
+  </clause>
+      </sections>
+<bibliography><references id="_" obligation="informative" normative="true">
         <title>Normative references</title>
         #{NORM_REF_BOILERPLATE}
         <bibitem id="ISOTC211" type="standard">
@@ -389,7 +401,7 @@ home run record in 1998.</note>
   </status>
   <copyright>
     <from>2014</from>
-    <to>2020</to>
+    <to>#{Time.now.year}</to>
     <owner>
       <organization>
         <name>International Organization for Standardization</name>
@@ -507,7 +519,7 @@ copyright.owner.name:: International Organization for Standardization
 copyright.owner.abbreviation:: ISO
 copyright.owner.url:: www.iso.org
 copyright.from:: 2014
-copyright.to:: 2020
+copyright.to:: #{Time.now.year}
 link::
 link.type:: src
 link.content:: https://www.iso.org/standard/53798.html
@@ -707,7 +719,7 @@ home run record in 1998.</note>
   </status>
   <copyright>
     <from>2014</from>
-    <to>2020</to>
+    <to>#{Time.now.year}</to>
     <owner>
       <organization>
         <name>International Organization for Standardization</name>