metanorma-standoc 1.1.9 → 1.2.0

data/lib/asciidoctor/standoc/front.rb

@@ -115,12 +115,15 @@ module Asciidoctor
       end
 
       def metadata_status(node, xml)
-        xml.status(**{ format: "plain" }) do |s|
-          s << ( node.attr("status") || "published" )
+        xml.status do |s|
+          s.stage ( node.attr("status") || node.attr("docstage") || "published" )
+          node.attr("docsubstage") and s.substage node.attr("docsubstage")
+          node.attr("iteration") and s.iteration node.attr("iteration")
         end
       end
 
       def metadata_committee(node, xml)
+        return unless node.attr("technical-committee")
         xml.editorialgroup do |a|
           committee_component("technical-committee", node, a)
         end
@@ -216,13 +219,28 @@ module Asciidoctor
         metadata_status(node, xml)
         metadata_copyright(node, xml)
         metadata_relations(node, xml)
-        metadata_committee(node, xml)
-        metadata_ics(node, xml)
+        metadata_series(node, xml)
+        xml.ext do |ext|
+        metadata_ext(node, xml)
+        end
+      end
+
+      def metadata_ext(node, ext)
+          metadata_doctype(node, ext)
+          metadata_committee(node, ext)
+          metadata_ics(node, ext)
+      end
+
+      def metadata_doctype(node, xml)
+        xml.doctype doctype(node)
       end
 
       def metadata_note(node, xml)
       end
 
+      def metadata_series(node, xml)
+      end
+
       def asciidoc_sub(x)
         return nil if x.nil?
         return "" if x.empty?

data/lib/asciidoctor/standoc/isodoc.rng

@@ -19,21 +19,7 @@
 -->
 <grammar ns="http://riboseinc.com/isoxml" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
-  <include href="biblio.rng">
-    <define name="status">
-      <element name="status">
-        <choice>
-          <value>proposal</value>
-          <value>working_draft</value>
-          <value>committee_draft</value>
-          <value>draft_standard</value>
-          <value>final_draft</value>
-          <value>published</value>
-          <value>withdrawn</value>
-        </choice>
-      </element>
-    </define>
-  </include>
+  <include href="biblio.rng"/>
   <start>
     <ref name="standard-document"/>
   </start>
@@ -485,6 +471,11 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <ref name="stem"/>
       <optional>
         <ref name="dl"/>
@@ -533,6 +524,11 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="lang"/>
       </optional>
@@ -572,6 +568,11 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -689,6 +690,11 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <choice>
           <ref name="formula"/>
@@ -732,6 +738,11 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <ref name="source"/>
       </optional>
@@ -1094,57 +1105,28 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="BibData">
-    <optional>
-      <attribute name="type">
-        <ref name="BibItemType"/>
-      </attribute>
-    </optional>
-    <oneOrMore>
-      <ref name="btitle"/>
-    </oneOrMore>
-    <optional>
-      <ref name="formattedref"/>
-    </optional>
-    <zeroOrMore>
-      <ref name="bsource"/>
-    </zeroOrMore>
-    <zeroOrMore>
-      <ref name="docidentifier"/>
-    </zeroOrMore>
-    <optional>
-      <ref name="docnumber"/>
-    </optional>
-    <zeroOrMore>
-      <ref name="bdate"/>
-    </zeroOrMore>
-    <zeroOrMore>
-      <ref name="contributor"/>
-    </zeroOrMore>
-    <optional>
-      <ref name="edition"/>
-    </optional>
-    <optional>
-      <ref name="version"/>
-    </optional>
-    <zeroOrMore>
-      <ref name="biblionote"/>
-    </zeroOrMore>
-    <zeroOrMore>
-      <ref name="language"/>
-    </zeroOrMore>
-    <zeroOrMore>
-      <ref name="script"/>
-    </zeroOrMore>
+  <define name="ext">
+    <element name="ext">
+      <ref name="BibDataExtensionType"/>
+    </element>
+  </define>
+  <define name="BibDataExtensionType">
     <optional>
-      <ref name="abstract"/>
+      <ref name="doctype"/>
     </optional>
+  </define>
+  <define name="doctype">
+    <element name="doctype">
+      <ref name="DocumentType"/>
+    </element>
+  </define>
+  <define name="DocumentType">
+    <value>document</value>
+  </define>
+  <define name="BibData">
+    <ref name="BibliographicItem"/>
     <optional>
-      <ref name="status"/>
+      <ref name="ext"/>
     </optional>
-    <ref name="copyright"/>
-    <zeroOrMore>
-      <ref name="docrelation"/>
-    </zeroOrMore>
   </define>
 </grammar>

data/lib/asciidoctor/standoc/ref.rb

@@ -95,7 +95,10 @@ module Asciidoctor
           conditional_date(t, m, noyr)
           iso_publisher(t, m[:code])
           t.note(**plaintxt) { |p| p << "ISO DATE: #{m[:fn]}" } if m.names.include?("fn") && m[:fn]
-          t.allparts "true"
+          #t.allparts "true"
+          t.extent **{ type: 'part' } do |e|
+            e.referenceFrom "all"
+          end
         end
       end
 
@@ -194,16 +197,6 @@ module Asciidoctor
         end.join("\n")
       end
 
-      def global_bibliocache_name
-        "#{Dir.home}/.relaton/cache"
-      end
-
-      def local_bibliocache_name(cachename)
-        return nil if cachename.nil?
-        cachename = "relaton" if cachename.empty?
-        "#{cachename}/cache"
-      end
-
       def global_ievcache_name
         "#{Dir.home}/.iev/cache"
       end

data/lib/asciidoctor/standoc/reqt.rng

@@ -25,6 +25,11 @@
         <ref name="ObligationType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="unnumbered">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>

data/lib/asciidoctor/standoc/section.rb

@@ -87,6 +87,7 @@ module Asciidoctor
 
       def clause_parse(attrs, xml, node)
         attrs["inline-header".to_sym] = node.option? "inline-header"
+        attrs[:bibitem] = true if node.option? "bibitem"
         attrs[:level] = node.attr("level")
         set_obligation(attrs, node)
         xml.send "clause", **attr_code(attrs) do |xml_section|

data/lib/asciidoctor/standoc/table.rb

@@ -4,6 +4,7 @@ module Asciidoctor
       def table_attrs(node)
         { id: Utils::anchor_or_uuid(node),
           headerrows: node.attr("headerrows"),
+          unnumbered: node.option?("unnumbered") ? "true" : nil,
           alt: node.attr("alt") }
       end
 

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.1.9".freeze
+    VERSION = "1.2.0".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -24,17 +24,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 0.9.0"
+  spec.add_dependency "isodoc", "~> 0.10.0"
   spec.add_dependency "iev", "~> 0.2.1"
-  spec.add_dependency "relaton", "~> 0.3.1"
+  spec.add_dependency "relaton", "~> 0.4.0"
   spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "concurrent-ruby"
-  spec.add_dependency "html2doc", "~> 0.8.0"
+  spec.add_dependency "html2doc", "~> 0.8.11"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
+  spec.add_dependency "relaton-cli", "~> 0.2.0"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug"
@@ -47,6 +48,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.3.0"
-  spec.add_development_dependency "vcr"
+  spec.add_development_dependency "vcr", "~> 5.0.0"
   spec.add_development_dependency "webmock"
+  #spec.add_development_dependency "relaton-iec"
+  #spec.add_development_dependency "relaton-iso"
+  #spec.add_development_dependency "relaton-ietf"
 end

data/spec/asciidoctor-standoc/base_spec.rb

@@ -99,7 +99,7 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
     <?xml version="1.0" encoding="UTF-8"?>
 <standard-document xmlns="http://riboseinc.com/isoxml">
-<bibdata type="article">
+<bibdata type="standard">
 <title language="en" format="text/plain">Main Title — Title</title>
   <docidentifier>1000-1</docidentifier>
   <docnumber>1000</docnumber>
@@ -206,7 +206,11 @@ RSpec.describe Asciidoctor::Standoc do
 </version>
   <language>en</language>
   <script>Latn</script>
-  <status format="plain">published</status>
+  <status>
+    <stage>10</stage>
+    <substage>20</substage>
+    <iteration>3</iteration>
+  </status>
   <copyright>
     <from>2001</from>
        <owner>
@@ -229,6 +233,8 @@ RSpec.describe Asciidoctor::Standoc do
   <docidentifier>ABC</docidentifier>
   </bibitem>
 </relation>
+<ext>
+<doctype>article</doctype>
   <editorialgroup>
     <technical-committee number="1" type="A">TC</technical-committee>
     <technical-committee number="11" type="A1">TC1</technical-committee>
@@ -242,6 +248,7 @@ RSpec.describe Asciidoctor::Standoc do
   <ics>
     <code>3</code>
   </ics>
+  </ext>
 </bibdata>
 <sections/>
 </standard-document>
@@ -277,7 +284,7 @@ RSpec.describe Asciidoctor::Standoc do
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
        <standard-document xmlns="http://riboseinc.com/isoxml">
-       <bibdata type="article">
+       <bibdata type="standard">
          <title language="en" format="text/plain">Document title</title>
          <title language="eo" format="text/plain">Dokumenttitolo</title>
          <uri>A</uri>
@@ -328,7 +335,7 @@ RSpec.describe Asciidoctor::Standoc do
          <script>Grek</script>
          <abstract><p id="_">This is the abstract of the document</p>
 <p id="_">This is the second paragraph of the abstract of the document.</p></abstract>
-         <status format="plain">published</status>
+         <status><stage>published</stage></status>
          <copyright>
            <from>#{Date.today.year}</from>
            <owner>
@@ -353,9 +360,9 @@ RSpec.describe Asciidoctor::Standoc do
              </organization>
            </owner>
          </copyright>
-         <editorialgroup>
-           <technical-committee/>
-         </editorialgroup>
+         <ext>
+         <doctype>article</doctype>
+         </ext>
        </bibdata>
     OUTPUT
   end

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe Asciidoctor::Standoc do
       r = 1 % 
       ++++
 
-      [stem]
+      [stem%unnumbered]
       ++++
       <mml:math><mml:msub xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"> <mml:mrow> <mml:mrow> <mml:mi mathvariant="bold-italic">F</mml:mi> </mml:mrow> </mml:mrow> <mml:mrow> <mml:mrow> <mml:mi mathvariant="bold-italic">&#x0391;</mml:mi> </mml:mrow> </mml:mrow> </mml:msub> </mml:math>
       ++++
@@ -69,7 +69,7 @@ RSpec.describe Asciidoctor::Standoc do
        r = 1 %</stem>
        </formula>
 
-       <formula id="_">
+       <formula id="_" unnumbered="true">
          <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><msub> <mrow> <mrow> <mi mathvariant="bold-italic">F</mi> </mrow> </mrow> <mrow> <mrow> <mi mathvariant="bold-italic">Α</mi> </mrow> </mrow> </msub> </math></stem>
        </formula>
               <formula id="_">
@@ -277,7 +277,7 @@ RSpec.describe Asciidoctor::Standoc do
       ****
       INPUT
       <standard-document xmlns="http://riboseinc.com/isoxml">
-       <bibdata type="article">
+       <bibdata type="standard">
          <title language="en" format="text/plain">Document title</title>
 
 
@@ -286,13 +286,13 @@ RSpec.describe Asciidoctor::Standoc do
          </version>
          <language>en</language>
          <script>Latn</script>
-         <status format="plain">published</status>
+         <status><stage>published</stage></status>
          <copyright>
            <from>#{Date.today.year}</from>
          </copyright>
-         <editorialgroup>
-           <technical-committee/>
-         </editorialgroup>
+         <ext>
+         <doctype>article</doctype>
+         </ext>
        </bibdata>
        <sections><p id="foreword">Foreword</p>
        <review reviewer="ISO" id="_" date="20170101T00:00:00Z" from="foreword" to="foreword"><p id="_">A Foreword shall appear in each document. The generic text is shown here. It does not contain requirements, recommendations or permissions.</p>
@@ -570,11 +570,17 @@ RSpec.describe Asciidoctor::Standoc do
 
       Amen
       ====
+
+      [example%unnumbered]
+      ====
+      This is another example
+      ====
       INPUT
       #{BLANK_HDR}
        <sections>
          <example id="_"><p id="_">This is an example</p>
        <p id="_">Amen</p></example>
+         <example id="_" unnumbered="true"><p id="_">This is another example</p></example>
        </sections>
        </standard-document>
       OUTPUT
@@ -623,13 +629,14 @@ RSpec.describe Asciidoctor::Standoc do
     it "processes images" do
       expect(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to <<~"OUTPUT"
       #{ASCIIDOC_BLANK_HDR}
+      [%unnumbered]
       .Split-it-right sample divider
       image::spec/examples/rice_images/rice_image1.png[alttext]
 
       INPUT
       #{BLANK_HDR}
               <sections>
-         <figure id="_">
+         <figure id="_" unnumbered="true">
          <name>Split-it-right sample divider</name>
                   <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="auto" width="auto" alt="alttext"/>
        </figure>
@@ -844,7 +851,7 @@ RSpec.describe Asciidoctor::Standoc do
         it "processes recommendation" do
     input = <<~"INPUT"
       #{ASCIIDOC_BLANK_HDR}
-      [recommendation,label="/ogc/recommendation/wfs/2",subject="user",inherit="/ss/584/2015/level/1"]
+      [.recommendation,label="/ogc/recommendation/wfs/2",subject="user",inherit="/ss/584/2015/level/1",options="unnumbered"]
       ====
       I recommend this
       ====
@@ -852,7 +859,7 @@ RSpec.describe Asciidoctor::Standoc do
              output = <<~"OUTPUT"
             #{BLANK_HDR}
        <sections>
-  <recommendation id="_">
+  <recommendation id="_" unnumbered="true">
   <label>/ogc/recommendation/wfs/2</label>
 <subject>user</subject>
 <inherit>/ss/584/2015/level/1</inherit>
@@ -868,7 +875,7 @@ RSpec.describe Asciidoctor::Standoc do
     it "processes requirement" do
     input = <<~"INPUT"
       #{ASCIIDOC_BLANK_HDR}
-      [requirement]
+      [.requirement]
       .Title
       ====
       I recommend this
@@ -890,7 +897,7 @@ RSpec.describe Asciidoctor::Standoc do
         it "processes permission" do
     input = <<~"INPUT"
       #{ASCIIDOC_BLANK_HDR}
-      [permission]
+      [.permission]
       ====
       I recommend this
       ====
@@ -912,7 +919,7 @@ RSpec.describe Asciidoctor::Standoc do
        it "processes nested permissions" do
     input = <<~"INPUT"
       #{ASCIIDOC_BLANK_HDR}
-      [permission]
+      [.permission]
       ====
       I permit this
 
@@ -920,7 +927,7 @@ RSpec.describe Asciidoctor::Standoc do
       Example 2
       =====
 
-      [permission]
+      [.permission]
       =====
       I also permit this
       =====
@@ -946,11 +953,11 @@ RSpec.describe Asciidoctor::Standoc do
         it "processes recommendation with internal markup of structure" do
     input = <<~"INPUT"
       #{ASCIIDOC_BLANK_HDR}
-      [recommendation,label="/ogc/recommendation/wfs/2",subject="user",classification="control-class:Technical;priority:P0;family:System and Communications Protection,System and Communications Protocols",obligation="permission,recommendation",filename="reqt1.rq"]
+      [.recommendation,label="/ogc/recommendation/wfs/2",subject="user",classification="control-class:Technical;priority:P0;family:System and Communications Protection,System and Communications Protocols",obligation="permission,recommendation",filename="reqt1.rq"]
       ====
       I recommend _this_.
 
-      [specification,type="tabular"]
+      [.specification,type="tabular"]
       --
       This is the object of the recommendation:
       |===
@@ -961,7 +968,7 @@ RSpec.describe Asciidoctor::Standoc do
 
       As for the measurement targets,
 
-      [measurement-target]
+      [.measurement-target]
       --
       The measurement target shall be measured as:
       [stem]
@@ -970,7 +977,7 @@ RSpec.describe Asciidoctor::Standoc do
       ++++
       --
 
-      [verification]
+      [.verification]
       --
       The following code will be run for verification:
 
@@ -983,7 +990,7 @@ RSpec.describe Asciidoctor::Standoc do
       ----
       --
       
-      [import%exclude]
+      [.import%exclude]
       --
       [source,CoreRoot]
       ----