metanorma-standoc 1.3.10 → 1.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea42d5a3c0c61e4678fd05f453afde82b15a4cf9b74044516d4f59a301cbae1c
-  data.tar.gz: af553b4a2a5484f38120a8f0af0cf2eb679678a7bd1d1b20ce434cae18a04515
+  metadata.gz: 849cbd5381b880bcb3e5cbd9b6f93a6ec09ca0e45fefbe2ccb5f1bdbce81387c
+  data.tar.gz: 6719ec18705bf478ec7c585ac170a534979ad8eb02f9c1c8db08e88c99f6bc79
 SHA512:
-  metadata.gz: f17e2f2fcdab711f86147b7d448cca5a11dcfe4d17a6259289c38b2cbcd08d233d14fbfb9dc305e19a0bddc9d6d5d533236016c1b9c04901a039cec1462b2d75
-  data.tar.gz: b515736de4a7fe758c939d53dc94c9142d085f29571d94b130d775748cf48aa9355159aa24bf57688a05910a1d505fee9260be8f34eab7427f721bf56dfb336d
+  metadata.gz: 4918be4b5e96a0b307f5dc937a48e1e50dbe16dae17f91648913d5ae3ed95c64b6a2ae8473c260c8e4aa95fd7c28d6b6ec38d022ff06617417041b3a7eb4c433
+  data.tar.gz: f4961df85d85193abf1d092fcdb0adbd1178543ddae1c02a462bdbc7038b61747ff914c95e30ccc9e1328311ccf141aaf079bb401b06eb0369b84a93912ad2f4

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.3.9)
+    metanorma-standoc (1.3.11)
       asciidoctor (~> 2.0.0)
       concurrent-ruby
       html2doc (~> 0.9.0)
       iev (~> 0.2.1)
       isodoc (~> 1.0.0)
       mimemagic
-      relaton (~> 0.5.0)
+      relaton (~> 0.6.0)
       relaton-iev (~> 0.1.0)
       ruby-jing
       sterile (~> 1.0.14)
@@ -64,7 +64,7 @@ GEM
     iev (0.2.3)
       nokogiri (>= 1.10.4)
     image_size (2.0.2)
-    isodoc (1.0.10)
+    isodoc (1.0.11)
       asciimath
       html2doc (~> 0.9.0)
       htmlentities (~> 4.3.4)
@@ -113,47 +113,47 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    relaton (0.5.19)
-      relaton-calconnect (~> 0.1.0)
-      relaton-gb (~> 0.6.0)
-      relaton-iec (~> 0.4.0)
-      relaton-ietf (~> 0.6.0)
-      relaton-iso (~> 0.6.0)
-      relaton-itu (~> 0.3.0)
-      relaton-nist (~> 0.3.0)
-      relaton-ogc (~> 0.1.0)
-    relaton-bib (0.3.12)
+    relaton (0.6.3)
+      relaton-calconnect (~> 0.2.0)
+      relaton-gb (~> 0.7.0)
+      relaton-iec (~> 0.5.0)
+      relaton-ietf (~> 0.7.0)
+      relaton-iso (~> 0.7.0)
+      relaton-itu (~> 0.4.0)
+      relaton-nist (~> 0.4.0)
+      relaton-ogc (~> 0.2.0)
+    relaton-bib (0.4.1)
       addressable
       nokogiri
-    relaton-calconnect (0.1.2)
+    relaton-calconnect (0.2.1)
       faraday
-      relaton-iso-bib (~> 0.3.0)
-    relaton-gb (0.6.8)
+      relaton-iso-bib (~> 0.4.0)
+    relaton-gb (0.7.1)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
-      relaton-iso-bib (~> 0.3.0)
-    relaton-iec (0.4.12)
+      relaton-iso-bib (~> 0.4.0)
+    relaton-iec (0.5.1)
       addressable
-      relaton-iso-bib (~> 0.3.0)
-    relaton-ietf (0.6.10)
-      relaton-bib (~> 0.3.0)
-    relaton-iev (0.1.1)
-      relaton (~> 0.5.0)
-    relaton-iso (0.6.10)
-      relaton-iec (~> 0.4.0)
-      relaton-iso-bib (~> 0.3.0)
-    relaton-iso-bib (0.3.12)
+      relaton-iso-bib (~> 0.4.0)
+    relaton-ietf (0.7.2)
+      relaton-bib (~> 0.4.0)
+    relaton-iev (0.1.2)
+      relaton (~> 0.6.0)
+    relaton-iso (0.7.1)
+      relaton-iec (~> 0.5.0)
+      relaton-iso-bib (~> 0.4.0)
+    relaton-iso-bib (0.4.1)
       isoics (~> 0.1.6)
-      relaton-bib (~> 0.3.0)
+      relaton-bib (~> 0.4.0)
       ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.3.11)
-      relaton-iso-bib (~> 0.3.0)
-    relaton-nist (0.3.9)
-      relaton-bib (~> 0.3.0)
+    relaton-itu (0.4.1)
+      relaton-iso-bib (~> 0.4.0)
+    relaton-nist (0.4.1)
+      relaton-bib (~> 0.4.0)
       rubyzip
-    relaton-ogc (0.1.4)
+    relaton-ogc (0.2.1)
       faraday
-      relaton-iso-bib (~> 0.3.0)
+      relaton-iso-bib (~> 0.4.0)
     roman-numerals (0.3.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -191,7 +191,7 @@ GEM
     simplecov-html (0.10.2)
     sterile (1.0.14)
       nokogiri
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
     timecop (0.9.1)
     unicode-display_width (1.6.0)

data/lib/asciidoctor/standoc/basicdoc.rng

@@ -52,9 +52,9 @@
     <optional>
       <ref name="section-title"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="BasicBlock"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="note"/>
     </zeroOrMore>
@@ -567,6 +567,7 @@
       <ref name="pagebreak"/>
       <ref name="bookmark"/>
       <ref name="image"/>
+      <ref name="index"/>
     </choice>
   </define>
   <define name="PureTextElement">
@@ -691,6 +692,17 @@
       <empty/>
     </element>
   </define>
+  <define name="index">
+    <element name="index">
+      <attribute name="primary"/>
+      <optional>
+        <attribute name="secondary"/>
+      </optional>
+      <optional>
+        <attribute name="tertiary"/>
+      </optional>
+    </element>
+  </define>
   <!-- bare ID element, used for referencing arbitrary spans of text -->
   <define name="bookmark">
     <element name="bookmark">

data/lib/asciidoctor/standoc/blocks.rb

@@ -94,7 +94,7 @@ module Asciidoctor
           xml.termnote **id_attr(n) do |ex|
             wrap_in_para(n, ex)
           end
-        end.join
+        end.join("\n")
       end
 
       def note(n)
@@ -102,7 +102,7 @@ module Asciidoctor
           xml.note **id_attr(n) do |c|
             wrap_in_para(n, c)
           end
-        end.join
+        end.join("\n")
       end
 
       def admonition_attrs(node)
@@ -124,7 +124,7 @@ module Asciidoctor
             node.title.nil? or a.name { |name| name << node.title }
             wrap_in_para(node, a)
           end
-        end.join
+        end.join("\n")
       end
 
       def term_example(node)
@@ -132,7 +132,7 @@ module Asciidoctor
           xml.termexample **id_attr(node) do |ex|
             wrap_in_para(node, ex)
           end
-        end.join
+        end.join("\n")
       end
 
       def example(node)
@@ -151,7 +151,7 @@ module Asciidoctor
             figure_title(node, ex)
             wrap_in_para(node, ex)
           end
-        end.join
+        end.join("\n")
       end
 
       def example_attrs(node)
@@ -164,7 +164,7 @@ module Asciidoctor
             node.title.nil? or ex.name { |name| name << node.title }
             wrap_in_para(node, ex)
           end
-        end.join
+        end.join("\n")
       end
 
       def figure_title(node, f)
@@ -196,7 +196,7 @@ module Asciidoctor
           xml.p **para_attrs(node) do |xml_t|
             xml_t << node.content
           end
-        end.join
+        end.join("\n")
       end
 
       def quote_attrs(node)
@@ -220,12 +220,13 @@ module Asciidoctor
             quote_attribution(node, q)
             wrap_in_para(node, q)
           end
-        end.join
+        end.join("\n")
       end
 
       def listing_attrs(node)
         attr_code(lang: node.attr("language"),
                   id: Utils::anchor_or_uuid(node),
+                  unnumbered: node.option?("unnumbered") ? "true" : nil,
                   filename: node.attr("filename"))
       end
 

data/lib/asciidoctor/standoc/cleanup.rb

@@ -57,6 +57,7 @@ module Asciidoctor
         bookmark_cleanup(xmldoc)
         smartquotes_cleanup(xmldoc)
         requirement_cleanup(xmldoc)
+        bibdata_cleanup(xmldoc)
         boilerplate_cleanup(xmldoc)
         xmldoc
       end
@@ -65,7 +66,8 @@ module Asciidoctor
         xmldoc.traverse do |n|
           next unless n.text?
           if @smartquotes
-            next unless n.ancestors("pre, tt, sourcecode, bibdata, on").empty?
+            next unless n.ancestors("pre, tt, sourcecode, bibdata, on, "\
+                                    "figure[@class = 'pseudocode']").empty?
             n.replace(Utils::smartformat(n.text))
           else
             n.replace(n.text.gsub(/(?<=\p{Alnum})\u2019(?=\p{Alpha})/, "'"))
@@ -79,9 +81,8 @@ module Asciidoctor
 
       TEXT_ELEMS =
         %w{status language script version author name callout phone email 
-           street city state country postcode identifier referenceFrom
-           referenceTo docidentifier docnumber prefix initial addition surname
-           forename
+           street city state country postcode identifier referenceFrom surname
+           referenceTo docidentifier docnumber prefix initial addition forename
            title draft secretariat title-main title-intro title-part}.freeze
 
       # it seems Nokogiri::XML is treating the content of <script> as cdata,
@@ -112,9 +113,8 @@ module Asciidoctor
         xmldoc.xpath("//sourcecode").each do |x|
           callouts = x.elements.select { |e| e.name == "callout" }
           annotations = x.elements.select { |e| e.name == "annotation" }
-          if callouts.size == annotations.size
+          callouts.size == annotations.size and
             link_callouts_to_annotations(callouts, annotations)
-          end
         end
       end
 
@@ -133,8 +133,7 @@ module Asciidoctor
 
       def termdef_stem_cleanup(xmldoc)
         xmldoc.xpath("//term/p/stem").each do |a|
-          if a.parent.elements.size == 1
-            # para containing just a stem expression
+          if a.parent.elements.size == 1 # para contains just a stem expression
             t = Nokogiri::XML::Element.new("admitted", xmldoc)
             parent = a.parent
             t.children = a.remove
@@ -179,15 +178,13 @@ module Asciidoctor
 
       def termdocsource_cleanup(xmldoc)
         f = xmldoc.at("//preface | //sections")
-        xmldoc.xpath("//terms/termdocsource | "\
-                     "//clause/termdocsource").each do |s|
+        xmldoc.xpath("//termdocsource").each do |s|
           f.previous = s.remove
         end
       end
 
       def term_children_cleanup(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          ex = t.xpath("./termexample")
           t.xpath("./termnote").each { |n| t << n.remove }
           t.xpath("./termexample").each { |n| t << n.remove }
           t.xpath("./termsource").each { |n| t << n.remove }
@@ -240,8 +237,7 @@ module Asciidoctor
           next if x.children.any? { |y| y.element? }
           math = x.text.gsub(/&lt;/, "<").gsub(/&gt;/, ">").gsub(/&quot;/, '"').
             gsub(/&apos;/, "'").gsub(/&amp;/, "&").
-            gsub(/<[^: \r\n\t\/]+:/, "<").
-            gsub(/<\/[^ \r\n\t:]+:/, "</").
+            gsub(/<[^: \r\n\t\/]+:/, "<").gsub(/<\/[^ \r\n\t:]+:/, "</").
             gsub(/ xmlns[^>"']+/, "").
             gsub(/<math /, '<math xmlns="http://www.w3.org/1998/Math/MathML" ').
             gsub(/<math>/, '<math xmlns="http://www.w3.org/1998/Math/MathML">')

data/lib/asciidoctor/standoc/cleanup_boilerplate.rb

@@ -61,6 +61,12 @@ module Asciidoctor
         f = xmldoc.at(self.class::NORM_REF) and
         norm_ref_preface(f)
       end
+
+      def bibdata_cleanup(xmldoc)
+        xmldoc.xpath("//bibdata//bibitem").each do |b|
+          b.delete("id")
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/isodoc.rng

@@ -207,9 +207,9 @@
     </optional>
     <choice>
       <group>
-        <optional>
+        <zeroOrMore>
           <ref name="BasicBlock"/>
-        </optional>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
@@ -244,9 +244,9 @@
     </optional>
     <choice>
       <group>
-        <optional>
+        <zeroOrMore>
           <ref name="BasicBlock"/>
-        </optional>
+        </zeroOrMore>
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
@@ -289,9 +289,9 @@
       </optional>
       <choice>
         <group>
-          <optional>
+          <zeroOrMore>
             <ref name="BasicBlock"/>
-          </optional>
+          </zeroOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>

data/lib/asciidoctor/standoc/macros.rb

@@ -62,9 +62,13 @@ module Asciidoctor
         lines
       end
 
+      def prevent_smart_quotes(m)
+        m.gsub(/'/, "'").gsub(/"/, """)
+      end
+
       def process parent, reader, attrs
         attrs['role'] = 'pseudocode'
-        lines = reader.lines.map { |m| init_indent(m) }
+        lines = reader.lines.map { |m| prevent_smart_quotes(init_indent(m)) }
         create_block(parent, :example, 
                      supply_br(lines),
                      attrs, content_model: :compound)
@@ -147,7 +151,9 @@ module Asciidoctor
         system "plantuml #{umlfile}"
         # sleep need for windows because dot works in separate process and plantuml process may
         # finish erlier then dot, as result png file maybe not created yet after plantuml finish
-        sleep(2) if Gem.win_platform?
+        until !Gem.win_platform? || File.exist?(Pathname.new(localdir) + "plantuml" + "#{fn}.png")
+          sleep(1)
+        end
         outfile = parent.image_uri("#{fn}.png")
         if outfile == "#{fn}.png"
           (Pathname.new("plantuml") + "#{fn}.png").to_s

data/lib/asciidoctor/standoc/section.rb

@@ -92,7 +92,7 @@ module Asciidoctor
             content = node.content
             xml_abstract << content
           end
-        end.join
+        end.join("\n")
       end
 
       def abstract_parse(attrs, xml, node)

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.3.10".freeze
+    VERSION = "1.3.11".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", "~> 1.0.0"
   spec.add_dependency "iev", "~> 0.2.1"
-  spec.add_dependency "relaton", "~> 0.5.0"
+  spec.add_dependency "relaton", "~> 0.6.0"
   spec.add_dependency "relaton-iev", "~> 0.1.0"
   spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "concurrent-ruby"

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -851,7 +851,7 @@ RSpec.describe Asciidoctor::Standoc do
       expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
       .Caption
-      [source,ruby,filename=sourcecode1.rb]
+      [source%unnumbered,ruby,filename=sourcecode1.rb]
       --
       puts "Hello, world."
       %w{a b c}.each do |x|
@@ -861,7 +861,7 @@ RSpec.describe Asciidoctor::Standoc do
       INPUT
       #{BLANK_HDR}
        <sections>
-         <sourcecode id="_" lang="ruby" filename="sourcecode1.rb"><name>Caption</name>puts "Hello, world."
+         <sourcecode id="_" lang="ruby" filename="sourcecode1.rb" unnumbered="true"><name>Caption</name>puts "Hello, world."
        %w{a b c}.each do |x|
          puts x
        end</sourcecode>

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -67,7 +67,7 @@ RSpec.describe Asciidoctor::Standoc do
     OUTPUT
   end
 
-  it "does not apply smartquotes to sourcecode, tt, pre" do
+  it "does not apply smartquotes to sourcecode, tt, pre, pseudocode" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
@@ -88,6 +88,11 @@ RSpec.describe Asciidoctor::Standoc do
       "quote" A's
       ----
 
+      [pseudocode]
+      ====
+      "quote" A's
+      ====
+
     INPUT
        #{BLANK_HDR}
               <sections>
@@ -95,7 +100,11 @@ RSpec.describe Asciidoctor::Standoc do
 <p id="_">
   <tt>"quote" A’s</tt>
 </p>
-<sourcecode id="_">"quote" A's</sourcecode></clause>
+<sourcecode id="_">"quote" A's</sourcecode>
+<figure id='_' class='pseudocode'>
+  <p id='_'>"quote" A's</p>
+</figure>
+</clause>
        </sections>
        </standard-document>
     OUTPUT
@@ -1362,6 +1371,53 @@ it "inserts boilerplate before empty Normative References in French" do
       OUTPUT
       end
 
+it "removes bibdata bibitem IDs" 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:
+    :translated-from: IEC 60050-102
+
+    [bibliography]
+    == Normative References
+
+    INPUT
+    <?xml version='1.0' encoding='UTF-8'?>
+<standard-document xmlns='http://riboseinc.com/isoxml'>
+  <bibdata type='standard'>
+    <title language='en' format='text/plain'>Document title</title>
+    <language>en</language>
+    <script>Latn</script>
+    <status>
+      <stage>published</stage>
+    </status>
+    <copyright>
+      <from>2019</from>
+    </copyright>
+    <relation type='translatedFrom'>
+      <bibitem>
+        <title>--</title>
+        <docidentifier>IEC 60050-102</docidentifier>
+      </bibitem>
+    </relation>
+    <ext>
+      <doctype>article</doctype>
+    </ext>
+  </bibdata>
+  <sections> </sections>
+  <bibliography>
+    <references id='_' obligation='informative'>
+      <title>Normative References</title>
+      <p>There are no normative references in this document.</p>
+    </references>
+  </bibliography>
+</standard-document>
+OUTPUT
+end
+
 
   private
 

data/spec/asciidoctor-standoc/inline_spec.rb

@@ -1,6 +1,40 @@
 require "spec_helper"
 
 RSpec.describe Asciidoctor::Standoc do
+    it "handles spacing around markup" do
+    expect((strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to (<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+      This is
+      a paragraph with <<x>>
+      markup _for_
+      text, including **__nest__**ed markup.
+      INPUT
+      <?xml version="1.0" encoding="UTF-8"?>
+<standard-document xmlns="http://riboseinc.com/isoxml">
+<bibdata type="standard">
+<title language="en" format="text/plain">Document title</title>
+<language>en</language>
+<script>Latn</script>
+<status>
+<stage>published</stage>
+</status>
+<copyright>
+<from>2019</from>
+</copyright>
+<ext>
+<doctype>article</doctype>
+</ext>
+</bibdata>
+<sections>
+<p id="_">This is
+a paragraph with <xref target="x"/>
+markup <em>for</em>
+text, including <strong><em>nest</em></strong>ed markup.</p>
+</sections>
+</standard-document>
+      OUTPUT
+  end
+
   it "processes inline_quoted formatting" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       #{DUMBQUOTE_BLANK_HDR}

data/spec/asciidoctor-standoc/refs_dl_spec.rb

@@ -424,9 +424,9 @@ home run record in 1998.</note>
     <scale>medium scale</scale>
   </medium>
   <place>bib place</place>
-  <locality type="section">
+  <extent type="section">
     <referenceFrom>7</referenceFrom>
-  </locality>
+  </extent>
   <accesslocation>accesslocation1</accesslocation>
   <accesslocation>accesslocation2</accesslocation>
   <classification type="type">value</classification>
@@ -742,9 +742,9 @@ home run record in 1998.</note>
     <scale>medium scale</scale>
   </medium>
   <place>bib place</place>
-  <locality type="section">
+  <extent type="section">
     <referenceFrom>7</referenceFrom>
-  </locality>
+  </extent>
   <accesslocation>accesslocation1</accesslocation>
   <accesslocation>accesslocation2</accesslocation>
   <classification type="type">value</classification>

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -596,7 +596,7 @@ OUTPUT
   </sections><bibliography><references id="_" obligation="informative">
   <title>Normative References</title>
         #{NORM_REF_BOILERPLATE}
-  <bibitem id="iso123">
+  <bibitem id="iso123" type="standard">
     <fetched>#{Date.today}</fetched>
     <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
     <uri type='xml'>https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.RFC.8341.xml</uri>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: relaton-iev
   requirement: !ruby/object:Gem::Requirement