metanorma-standoc 2.2.4 → 2.2.6

data/spec/metanorma/biblio_spec.rb

@@ -12,22 +12,22 @@ RSpec.describe Metanorma::Standoc do
       === Standard
       id:: iso123
       docid::
-        type::: ISO
-        id::: ISO 123
+      type::: ISO
+      id::: ISO 123
       type:: standard
       contributor::
-        role::: publisher
-        organization:::
-          name:::: ISO
+      role::: publisher
+      organization:::
+      name:::: ISO
       contributor::
-        role::: author
-        person:::
-          name::::
+      role::: author
+      person:::
+      name::::
       +
       --
       completename::
-        language::: en
-        content::: Fred
+      language::: en
+      content::: Fred
       --
       contributor::
         role::: author
@@ -89,118 +89,118 @@ RSpec.describe Metanorma::Standoc do
       === Other Title
       fetched:: 2019-06-30
       title::
-        type::: main
-        content::: Geographic information
+      type::: main
+      content::: Geographic information
       title::
-        type::: subtitle
-        content::: Geographic information subtitle
-        language::: en
-        script::: Latn
-        format::: text/plain
+      type::: subtitle
+      content::: Geographic information subtitle
+      language::: en
+      script::: Latn
+      format::: text/plain
       type:: standard
       docid::
-        type::: ISO
-        id::: TC211
-        primary::: true
+      type::: ISO
+      id::: TC211
+      primary::: true
       docnumber:: 211
       edition:: 1
       language::
-        . en
-        . fr
+      . en
+      . fr
       script:: Latn
       version::
-        revision_date::: 2019-04-01
-        draft::: draft
+      revision_date::: 2019-04-01
+      draft::: draft
       biblionote::
-        type::: bibnote
-        content:::
+      type::: bibnote
+      content:::
       +
       --
       Mark set a major league
       home run record in 1998.
       --
       docstatus::
-        stage::: stage
-        substage::: substage
-        iteration::: iteration
+      stage::: stage
+      substage::: substage
+      iteration::: iteration
       date::
-        type::: issued
-        value::: 2014
+      type::: issued
+      value::: 2014
       date::
-        type::: published
-        from::: 2014-04
-        to::: 2014-05
+      type::: published
+      from::: 2014-04
+      to::: 2014-05
       date::
-        type::: accessed
-        value::: 2015-05-20
+      type::: accessed
+      value::: 2015-05-20
       abstract::
-        content:::
+      content:::
       +
       --
       ISO 19115-1:2014 defines the schema required for ...
       --
       abstract::
-        content::: L'ISO 19115-1:2014 définit le schéma requis pour ...
-        language::: fr
-        script::: Latn
-        format::: text/plain
+      content::: L'ISO 19115-1:2014 définit le schéma requis pour ...
+      language::: fr
+      script::: Latn
+      format::: text/plain
       copyright::
-         owner:::
-           name:::: International Organization for Standardization
-           abbreviation:::: ISO
-           url:::: www.iso.org
-         from::: 2014
-         to::: #{Time.now.year}
+      owner:::
+      name:::: International Organization for Standardization
+      abbreviation:::: ISO
+      url:::: www.iso.org
+      from::: 2014
+      to::: #{Time.now.year}
       link::
-        type::: src
-        content::: https://www.iso.org/standard/53798.html
+      type::: src
+      content::: https://www.iso.org/standard/53798.html
       link::
-        type::: obp
-        content::: https://www.iso.org/obp/ui/#!iso:std:53798:en
+      type::: obp
+      content::: https://www.iso.org/obp/ui/#!iso:std:53798:en
       link::
-        type::: rss
-        content::: https://www.iso.org/contents/data/standard/05/37/53798.detail.rss
+      type::: rss
+      content::: https://www.iso.org/contents/data/standard/05/37/53798.detail.rss
       medium::
-        form::: medium form
-        size::: medium size
-        scale::: medium scale
+      form::: medium form
+      size::: medium size
+      scale::: medium scale
       place:: bib place
       extent::
-        locality:::
-          type:::: section
-          reference_from:::: 7
+      locality:::
+      type:::: section
+      reference_from:::: 7
       accesslocation::
-        . accesslocation1
-        . accesslocation2
+      . accesslocation1
+      . accesslocation2
       classification::
-        type::: type
-        value::: value
+      type::: type
+      value::: value
       validity::
-        begins::: 2010-10-10 12:21
-        ends::: 2011-02-03 18:30
+      begins::: 2010-10-10 12:21
+      ends::: 2011-02-03 18:30
 
 
       ==== Contributor
       organization::
-        name::: International Organization for Standardization
-        url::: www.iso.org
-        abbreviation::: ISO
-        subdivision::: division
+      name::: International Organization for Standardization
+      url::: www.iso.org
+      abbreviation::: ISO
+      subdivision::: division
       role::
-        type::: publisher
-        description::: Publisher role
+      type::: publisher
+      description::: Publisher role
 
       ==== Contributor
       person::
-        name:::
-          completename::::
+      name:::
+      completename::::
       +
       --
       content:: A. Bierman
       language:: en
       --
-        affiliation:::
-          organization::::
+      affiliation:::
+      organization::::
       +
       --
       name:: IETF
@@ -209,81 +209,81 @@ RSpec.describe Metanorma::Standoc do
       type::: uri
       id::: www.ietf.org
       --
-          description:::: Affiliation description
-        contact:::
-          street::::
-            . 8 Street St
-          city:::: City
-          postcode:::: 123456
-          country:::: Country
-          state:::: State
-        contact:::
-          type:::: phone
-          value:::: 223322
+      description:::: Affiliation description
+      contact:::
+      street::::
+      . 8 Street St
+      city:::: City
+      postcode:::: 123456
+      country:::: Country
+      state:::: State
+      contact:::
+      type:::: phone
+      value:::: 223322
       role:: author
 
       ==== Contributor
       organization::
-        name::: IETF
-        abbreviation::: IETF
-        identifier:::
-          type:::: uri
-          id:::: www.ietf.org
+      name::: IETF
+      abbreviation::: IETF
+      identifier:::
+      type:::: uri
+      id:::: www.ietf.org
       role:: publisher
 
       ==== Contributor
       person::
-        name:::
-          language:::: en
-          formatted_initials:::: A.
-          surname:::: Bierman
-        affiliation:::
+      name:::
+      language:::: en
+      formatted_initials:::: A.
+      surname:::: Bierman
+      affiliation:::
       +
       --
       organization::
-        name::: IETF
-        abbreviation::: IETF
+      name::: IETF
+      abbreviation::: IETF
       description::
-        content::: Affiliation description
-        language::: en
-        script::: Latn
+      content::: Affiliation description
+      language::: en
+      script::: Latn
       --
-        identifier:::
-          type:::: uri
-          id:::: www.person.com
+      identifier:::
+      type:::: uri
+      id:::: www.person.com
       role:: author
 
       ==== Relation
       type:: updates
       bibitem::
-        title::: Geographic information
-        formattedref::: ISO 19115:2003
-        bib_locality:::
-          type:::: page
-          reference_from:::: 7
-          reference_to:::: 10
+      title::: Geographic information
+      formattedref::: ISO 19115:2003
+      bib_locality:::
+      type:::: page
+      reference_from:::: 7
+      reference_to:::: 10
 
       ==== Relation
       type:: updates
       bibitem::
-        type::: standard
-        formattedref::: ISO 19115:2003/Cor 1:2006
-        title::: Geographic information
+      type::: standard
+      formattedref::: ISO 19115:2003/Cor 1:2006
+      title::: Geographic information
 
       ==== Series
       type:: main
       title::
-        type::: original
-        content::: ISO/IEC FDIS 10118-3
-        language::: en
-        script::: Latn
-        format::: text/plain
+      type::: original
+      content::: ISO/IEC FDIS 10118-3
+      language::: en
+      script::: Latn
+      format::: text/plain
       place:: Serie's place
       organization:: Serie's organization
       abbreviation::
-        content::: ABVR
-        language::: en
-        script::: Latn
+      content::: ABVR
+      language::: en
+      script::: Latn
       from:: 2009-02-01
       to:: 2010-12-20
       number:: serie1234
@@ -293,9 +293,9 @@ RSpec.describe Metanorma::Standoc do
       type:: alt
       title:: seriestitle
       formattedref::
-        content::: serieref
-        language::: en
-        script::: Latn
+      content::: serieref
+      language::: en
+      script::: Latn
 
     INPUT
     output = <<~OUTPUT
@@ -815,28 +815,28 @@ RSpec.describe Metanorma::Standoc do
       ==== Standard
       id:: iso123
       docid::
-        type::: ISO
-        id::: ISO 123
+      type::: ISO
+      id::: ISO 123
       type:: standard
       contributor::
-        role::: publisher
-        organization:::
-          name:::: ISO
+      role::: publisher
+      organization:::
+      name:::: ISO
       contributor::
-        role::: author
-        person:::
-          name::::
+      role::: author
+      person:::
+      name::::
       +
       --
       completename::
-        language::: en
-        content::: Fred
+      language::: en
+      content::: Fred
       --
       contributor::
-        role::: author
-        person:::
-        name::::
-          completename::::: Jack
+      role::: author
+      person:::
+      name::::
+      completename::::: Jack
 
     INPUT
     output = <<~OUTPUT
@@ -980,18 +980,26 @@ RSpec.describe Metanorma::Standoc do
                  </bibitem>
                </relation>
                <extent type='volume'>
-                 <referenceFrom>4</referenceFrom>
+                 <locality>
+                   <referenceFrom>4</referenceFrom>
+                 </locality>
                </extent>
                <extent type='issue'>
-                 <referenceFrom>2</referenceFrom>
-                 <referenceTo>3</referenceTo>
+                 <locality>
+                   <referenceFrom>2</referenceFrom>
+                   <referenceTo>3</referenceTo>
+                 </locality>
                </extent>
                <extent type='page'>
-                 <referenceFrom>12</referenceFrom>
-                 <referenceTo>13</referenceTo>
+                 <locality>
+                   <referenceFrom>12</referenceFrom>
+                   <referenceTo>13</referenceTo>
+                 </locality>
                </extent>
                <extent type='page'>
-                 <referenceFrom>19</referenceFrom>
+                 <locality>
+                   <referenceFrom>19</referenceFrom>
+                 </locality>
                </extent>
              </bibitem>
            </references>

data/spec/metanorma/blocks_spec.rb

@@ -1135,7 +1135,7 @@ RSpec.describe Metanorma::Standoc do
       #{ASCIIDOC_BLANK_HDR}
 
       [[ABC]]
-      [%unnumbered,number=3]
+      [%unnumbered,number=3,class=plate]
       .Split-it-right sample divider
       image::spec/examples/rice_images/rice_image1.png[alttext]
 
@@ -1143,7 +1143,7 @@ RSpec.describe Metanorma::Standoc do
     output = <<~OUTPUT
       #{BLANK_HDR}
               <sections>
-         <figure id="ABC" unnumbered="true" number="3">
+         <figure id="ABC" unnumbered="true" number="3" class="plate">
          <name>Split-it-right sample divider</name>
                   <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="auto" width="auto" alt="alttext"/>
        </figure>

data/spec/metanorma/cleanup_sections_spec.rb

@@ -3,7 +3,6 @@ require "relaton_iec"
 require "fileutils"
 
 RSpec.describe Metanorma::Standoc do
-=begin
   it "appends any initial user-supplied text to boilerplate in terms and definitions" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -1355,7 +1354,7 @@ RSpec.describe Metanorma::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
-=end
+  
   it "processes section names, internationalisation file" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR.sub(/:nodoc:/, ":no-pdf:\n:i18nyaml: spec/assets/i18n.yaml")}

data/spec/metanorma/cleanup_spec.rb

@@ -167,6 +167,9 @@ RSpec.describe Metanorma::Standoc do
 
       "((ppm))" 
 
+      "stem:[3]".
+      footnote:[The mole]
+
       ....
       ((ppm))",
       ....
@@ -195,6 +198,14 @@ RSpec.describe Metanorma::Standoc do
           <primary>ppm</primary>
         </index>
         &#8221;&#160;
+      </p>
+         <p id='_'>“<stem type='MathML'>
+       <math xmlns='http://www.w3.org/1998/Math/MathML'>
+         <mn>3</mn>
+       </math>
+      </stem>”.<fn reference='1'>
+       <p id='_'>The mole</p>
+      </fn>
       </p>
       <figure id='_'>
         <pre id='_'>((ppm))",</pre>

data/spec/metanorma/inline_spec.rb

@@ -389,8 +389,70 @@ RSpec.describe Metanorma::Standoc do
              </sections>
              </standard-document>
     OUTPUT
-    expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to(output)
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(xmlpp(output))
+  end
+
+  it "processes crossreferences style" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      [[reference]]
+      == Section
+
+      Inline Reference to <<reference>>
+      Inline Reference to <<reference,style=basic%>>
+      Inline Reference to <<reference,style=basic>>
+      Inline Reference to <<reference,style=%>>
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+        <sections>
+          <clause id='reference' inline-header='false' obligation='normative'>
+            <title>Section</title>
+            <p id='_'>
+              Inline Reference to
+              <xref target='reference'/>
+               Inline Reference to
+              <xref target='reference' style='basic'/>
+               Inline Reference to
+              <xref target='reference'>style=basic</xref>
+               Inline Reference to
+              <xref target='reference'>style=%</xref>
+            </p>
+          </clause>
+        </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(xmlpp(output))
+  end
+
+  it "processes crossreferences style as document attribute" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR.sub(/:nodoc:/, ":nodoc:\n:xrefstyle: full")}
+      [[reference]]
+      == Section
+
+      Inline Reference to <<reference>>
+      Inline Reference to <<reference,style=basic%>>
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+        <sections>
+          <clause id='reference' inline-header='false' obligation='normative'>
+            <title>Section</title>
+            <p id='_'>
+              Inline Reference to
+              <xref target='reference'/>
+               Inline Reference to
+              <xref target='reference' style='basic'/>
+            </p>
+          </clause>
+        </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(xmlpp(output))
   end
 
   it "processes formatting within crossreferences" do
@@ -417,8 +479,8 @@ RSpec.describe Metanorma::Standoc do
        </sections>
       </standard-document>
     OUTPUT
-    expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to(output)
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(xmlpp(output))
   end
 
   it "processes formatting within crossreferences to non-existent anchor" do
@@ -444,8 +506,8 @@ RSpec.describe Metanorma::Standoc do
        </sections>
        </standard-document>
     OUTPUT
-    expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to(output)
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(xmlpp(output))
   end
 
   it "processes combinations of crossreferences" do
@@ -475,8 +537,8 @@ RSpec.describe Metanorma::Standoc do
        </sections>
        </standard-document>
     OUTPUT
-    expect((strip_guid(Asciidoctor.convert(input, *OPTIONS))))
-      .to be_equivalent_to(output)
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to(xmlpp(output))
   end
 
   it "processes bibliographic anchors" do

data/spec/metanorma/isobib_cache_spec.rb

@@ -50,7 +50,7 @@ ISO_124_DATED = <<~XML.freeze
          <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
          <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
          <docidentifier type="ISO" primary="true">ISO 124:2014</docidentifier>
-         <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
+         <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
          <docnumber>124</docnumber>
          <date type="published">
            <on>2014-03</on>
@@ -210,7 +210,7 @@ ISO_123_DATED = <<~XML.freeze
            <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" primary="true">ISO 123:2001</docidentifier>
-           <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
+           <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
            <docnumber>123</docnumber>
            <date type="published">
              <on>2001-05</on>

data/spec/metanorma/macros_plantuml_spec.rb

@@ -129,8 +129,8 @@ RSpec.describe Metanorma::Standoc do
       expect(
         xmlpp(
           strip_guid(Asciidoctor.convert(input, *OPTIONS))
-                      .gsub(%r{"[^".]+spec/assets/lutaml/[^./"]+\.png},
-                            '"spec/assets/_.png'),
+                      .gsub(%r{spec/assets/lutaml/[^./]+\.png},
+                            "spec/assets/_.png"),
         ),
       ).to(be_equivalent_to(xmlpp(output)))
     end
@@ -169,8 +169,8 @@ RSpec.describe Metanorma::Standoc do
       expect(
         xmlpp(
           strip_guid(Asciidoctor.convert(input, *OPTIONS))
-                      .gsub(%r{"[^".]+spec/assets/lutaml/[^./"]+\.png},
-                            '"spec/assets/_.png'),
+          .gsub(%r{spec/assets/lutaml/[^./]+\.png},
+                            "spec/assets/_.png"),
         ),
       ).to(be_equivalent_to(xmlpp(output)))
     end

data/spec/metanorma/macros_spec.rb

@@ -975,7 +975,7 @@ RSpec.describe Metanorma::Standoc do
                 <uri type='src'>https://www.iso.org/standard/3944.html</uri>
                 <uri type='rss'>https://www.iso.org/contents/data/standard/00/39/3944.detail.rss</uri>
                 <docidentifier type='ISO' primary='true'>ISO 131</docidentifier>
-                <docidentifier type='URN'>urn:iso:std:iso:131:stage-95.99:ed-1</docidentifier>
+                <docidentifier type='URN'>urn:iso:std:iso:131:ed-1</docidentifier>
                 <docnumber>131</docnumber>
                 <contributor>
                   <role type='publisher'/>
@@ -1018,7 +1018,7 @@ RSpec.describe Metanorma::Standoc do
                     <uri type='src'>https://www.iso.org/standard/3944.html</uri>
                     <uri type='rss'>https://www.iso.org/contents/data/standard/00/39/3944.detail.rss</uri>
                     <docidentifier type='ISO' primary='true'>ISO 131:1979</docidentifier>
-                    <docidentifier type='URN'>urn:iso:std:iso:131:stage-95.99:ed-1</docidentifier>
+                    <docidentifier type='URN'>urn:iso:std:iso:131:ed-1</docidentifier>
                     <docnumber>131</docnumber>
                     <date type='published'>
                       <on>1979-11</on>