metanorma-standoc 1.3.9 → 1.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0e0ef43dc360bd20733a52cc9e810116b6f558b580b3a5c13d4f9f3c53ac04d
-  data.tar.gz: 2d617c3cd329788c18a43fdf73bdae8332d9b49e65506d5752ebf9f1bd557722
+  metadata.gz: ea42d5a3c0c61e4678fd05f453afde82b15a4cf9b74044516d4f59a301cbae1c
+  data.tar.gz: af553b4a2a5484f38120a8f0af0cf2eb679678a7bd1d1b20ce434cae18a04515
 SHA512:
-  metadata.gz: 2490c762b3f8ded3402d554a175aa438e6e2dfde6064d421de8d61504f5d400e0763eaa925e810169e27ab1d1a4328c52bc319e7e3908b7dcc67f1907626ea0b
-  data.tar.gz: d379114d13c65074d39ad217f78f22a3b568e692b42da7490db95f2eb835a5f1ade2eac4fa0e39af3247b6bda94920b7938852a555d369e9b41dc07ecb178af4
+  metadata.gz: f17e2f2fcdab711f86147b7d448cca5a11dcfe4d17a6259289c38b2cbcd08d233d14fbfb9dc305e19a0bddc9d6d5d533236016c1b9c04901a039cec1462b2d75
+  data.tar.gz: b515736de4a7fe758c939d53dc94c9142d085f29571d94b130d775748cf48aa9355159aa24bf57688a05910a1d505fee9260be8f34eab7427f721bf56dfb336d

data/Gemfile.lock

@@ -64,7 +64,7 @@ GEM
     iev (0.2.3)
       nokogiri (>= 1.10.4)
     image_size (2.0.2)
-    isodoc (1.0.9)
+    isodoc (1.0.10)
       asciimath
       html2doc (~> 0.9.0)
       htmlentities (~> 4.3.4)
@@ -77,9 +77,9 @@ GEM
       thread_safe
       uuidtools
     isoics (0.1.8)
-    json (2.2.0)
+    json (2.3.0)
     liquid (4.0.3)
-    listen (3.2.0)
+    listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.0.13)
@@ -94,7 +94,7 @@ GEM
     mini_portile2 (2.4.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
-    nokogiri (1.10.5)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -113,7 +113,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    relaton (0.5.16)
+    relaton (0.5.19)
       relaton-calconnect (~> 0.1.0)
       relaton-gb (~> 0.6.0)
       relaton-iec (~> 0.4.0)
@@ -125,30 +125,30 @@ GEM
     relaton-bib (0.3.12)
       addressable
       nokogiri
-    relaton-calconnect (0.1.0)
+    relaton-calconnect (0.1.2)
       faraday
       relaton-iso-bib (~> 0.3.0)
-    relaton-gb (0.6.7)
+    relaton-gb (0.6.8)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iec (0.4.10)
+    relaton-iec (0.4.12)
       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.9)
+    relaton-iso (0.6.10)
       relaton-iec (~> 0.4.0)
       relaton-iso-bib (~> 0.3.0)
     relaton-iso-bib (0.3.12)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.3.10)
+    relaton-itu (0.3.11)
       relaton-iso-bib (~> 0.3.0)
-    relaton-nist (0.3.8)
+    relaton-nist (0.3.9)
       relaton-bib (~> 0.3.0)
       rubyzip
     relaton-ogc (0.1.4)

data/lib/asciidoctor/standoc/basicdoc.rng

@@ -284,6 +284,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>

data/lib/asciidoctor/standoc/biblio.rng

@@ -278,10 +278,12 @@
   </define>
   <define name="organization">
     <element name="organization">
-      <ref name="orgname"/>
-      <optional>
+      <oneOrMore>
+        <ref name="orgname"/>
+      </oneOrMore>
+      <zeroOrMore>
         <ref name="subdivision"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="abbreviation"/>
       </optional>
@@ -357,6 +359,9 @@
   </define>
   <define name="phone">
     <element name="phone">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -1024,6 +1029,8 @@
       <value>correctedBy</value>
       <value>revises</value>
       <value>revisedBy</value>
+      <value>describes</value>
+      <value>describedBy</value>
     </choice>
   </define>
   <define name="docrelation">

data/lib/asciidoctor/standoc/blocks.rb

@@ -41,7 +41,8 @@ module Asciidoctor
         noko do |xml|
           xml.figure **literal_attrs(node) do |f|
             figure_title(node, f)
-            f.pre node.lines.join("\n"), **{ id: Utils::anchor_or_uuid }
+            f.pre node.lines.join("\n"), **attr_code(id: Utils::anchor_or_uuid,
+                                                     alt: node.attr("alt"))
           end
         end
       end
@@ -93,7 +94,7 @@ module Asciidoctor
           xml.termnote **id_attr(n) do |ex|
             wrap_in_para(n, ex)
           end
-        end.join("\n")
+        end.join
       end
 
       def note(n)
@@ -101,7 +102,7 @@ module Asciidoctor
           xml.note **id_attr(n) do |c|
             wrap_in_para(n, c)
           end
-        end.join("\n")
+        end.join
       end
 
       def admonition_attrs(node)
@@ -123,7 +124,7 @@ module Asciidoctor
             node.title.nil? or a.name { |name| name << node.title }
             wrap_in_para(node, a)
           end
-        end.join("\n")
+        end.join
       end
 
       def term_example(node)
@@ -131,7 +132,7 @@ module Asciidoctor
           xml.termexample **id_attr(node) do |ex|
             wrap_in_para(node, ex)
           end
-        end.join("\n")
+        end.join
       end
 
       def example(node)
@@ -150,7 +151,7 @@ module Asciidoctor
             figure_title(node, ex)
             wrap_in_para(node, ex)
           end
-        end.join("\n")
+        end.join
       end
 
       def example_attrs(node)
@@ -163,7 +164,7 @@ module Asciidoctor
             node.title.nil? or ex.name { |name| name << node.title }
             wrap_in_para(node, ex)
           end
-        end.join("\n")
+        end.join
       end
 
       def figure_title(node, f)
@@ -195,7 +196,7 @@ module Asciidoctor
           xml.p **para_attrs(node) do |xml_t|
             xml_t << node.content
           end
-        end.join("\n")
+        end.join
       end
 
       def quote_attrs(node)
@@ -219,7 +220,7 @@ module Asciidoctor
             quote_attribution(node, q)
             wrap_in_para(node, q)
           end
-        end
+        end.join
       end
 
       def listing_attrs(node)

data/lib/asciidoctor/standoc/front.rb

@@ -42,8 +42,7 @@ module Asciidoctor
       end
 
       def metadata_author(node, xml)
-        publishers = node.attr("publisher") || ""
-        publishers.split(/,[ ]?/).each do |p|
+        (node.attr("publisher") || "").split(/,[ ]?/).each do |p|
           xml.contributor do |c|
             c.role **{ type: "author" }
             c.organization { |a| organization(a, p) }
@@ -53,9 +52,8 @@ module Asciidoctor
       end
 
       def personal_author(node, xml)
-        if node.attr("fullname") || node.attr("surname")
+        (node.attr("fullname") || node.attr("surname")) and
           personal_author1(node, xml, "")
-        end
         i = 2
         while node.attr("fullname_#{i}") || node.attr("surname_#{i}")
           personal_author1(node, xml, "_#{i}")
@@ -67,23 +65,11 @@ module Asciidoctor
         xml.contributor do |c|
           c.role **{ type: node.attr("role#{suffix}")&.downcase || "author" }
           c.person do |p|
-            p.name do |n|
-              if node.attr("fullname#{suffix}")
-                n.completename node.attr("fullname#{suffix}")
-              else
-                n.forename node.attr("givenname#{suffix}")
-                n.initial node.attr("initials#{suffix}")
-                n.surname node.attr("surname#{suffix}")
-              end
-            end
-            node.attr("affiliation#{suffix}") and p.affiliation do |a|
-              a.organization do |o|
-                o.name node.attr("affiliation#{suffix}")
-                node.attr("address#{suffix}") and o.address do |ad|
-                  ad.formattedAddress node.attr("address#{suffix}")
-                end
-              end
-            end
+            person_name(node, xml, suffix, p)
+            person_affiliation(node, xml, suffix, p)
+            node.attr("phone#{suffix}") and p.phone node.attr("phone#{suffix}")
+            node.attr("fax#{suffix}") and
+              p.phone node.attr("fax#{suffix}"), **{type: "fax"}
             node.attr("email#{suffix}") and p.email node.attr("email#{suffix}")
             node.attr("contributor-uri#{suffix}") and
               p.uri node.attr("contributor-uri#{suffix}")
@@ -91,6 +77,29 @@ module Asciidoctor
         end
       end
 
+      def person_name(node, xml, suffix, p)
+        p.name do |n|
+          if node.attr("fullname#{suffix}")
+            n.completename node.attr("fullname#{suffix}")
+          else
+            n.forename node.attr("givenname#{suffix}")
+            n.initial node.attr("initials#{suffix}")
+            n.surname node.attr("surname#{suffix}")
+          end
+        end
+      end
+
+      def person_affiliation(node, xml, suffix, p)
+        node.attr("affiliation#{suffix}") and p.affiliation do |a|
+          a.organization do |o|
+            o.name node.attr("affiliation#{suffix}")
+            node.attr("address#{suffix}") and o.address do |ad|
+              ad.formattedAddress node.attr("address#{suffix}")
+            end
+          end
+        end
+      end
+
       def metadata_publisher(node, xml)
         publishers = node.attr("publisher") || return
         publishers.split(/,[ ]?/).each do |p|
@@ -131,9 +140,7 @@ module Asciidoctor
       def metadata_ics(node, xml)
         ics = node.attr("library-ics")
         ics && ics.split(/,\s*/).each do |i|
-          xml.ics do |ics|
-            ics.code i
-          end
+          xml.ics { |ics| ics.code i }
         end
       end
 
@@ -231,14 +238,14 @@ module Asciidoctor
         metadata_series(node, xml)
         metadata_keywords(node, xml)
         xml.ext do |ext|
-        metadata_ext(node, xml)
+          metadata_ext(node, xml)
         end
       end
 
       def metadata_ext(node, ext)
-          metadata_doctype(node, ext)
-          metadata_committee(node, ext)
-          metadata_ics(node, ext)
+        metadata_doctype(node, ext)
+        metadata_committee(node, ext)
+        metadata_ics(node, ext)
       end
 
       def metadata_doctype(node, xml)
@@ -261,7 +268,7 @@ module Asciidoctor
           at = { language: lang, format: "text/plain" }
           xml.title **attr_code(at) do |t|
             t << Utils::asciidoc_sub(node.attr("title") || node.attr("title-en") ||
-                              node.title)
+                                     node.title)
           end
         end
       end

data/lib/asciidoctor/standoc/inline.rb

@@ -78,22 +78,22 @@ module Asciidoctor
           xml.fn **{ reference: @fn_number } do |fn|
             fn.p { |p| p << node.text }
           end
-        end.join("\n")
+        end.join
       end
 
       def inline_break(node)
         noko do |xml|
           xml << node.text
           xml.br
-        end.join("\n")
+        end.join
       end
 
       def page_break(_node)
-        noko { |xml| xml.pagebreak }.join("\n")
+        noko { |xml| xml.pagebreak }.join
       end
 
       def thematic_break(_node)
-        noko { |xml| xml.hr }.join("\n")
+        noko { |xml| xml.hr }.join
       end
 
       def xml_encode(text)
@@ -184,6 +184,17 @@ module Asciidoctor
           xml.image **(image_attributes(node))
         end.join("")
       end
+
+      def inline_indexterm(node)
+        noko do |xml|
+          node.type == :visible and xml << node.text
+          terms = node.attr("terms") ||
+            [Nokogiri::XML("<a>#{node.text}</a>").xpath("//text()").text]
+          xml.index nil, **attr_code(primary: terms[0],
+                                     secondary: terms.dig(1),
+                                     tertiary: terms.dig(2))
+        end.join
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/macros.rb

@@ -51,10 +51,23 @@ module Asciidoctor
         prefix + suffix
       end
 
+      def supply_br(lines)
+        lines.each_with_index do |l, i|
+          next if l.empty?
+          next if l.match(/ \+$/)
+          next if i == lines.size - 1
+          next if i < lines.size - 1 && lines[i+1].empty?
+          lines[i] += " +"
+        end
+        lines
+      end
+
       def process parent, reader, attrs
         attrs['role'] = 'pseudocode'
-        create_block parent, :example, reader.lines.map { |m| init_indent(m) }, attrs,
-          content_model: :compound
+        lines = reader.lines.map { |m| init_indent(m) }
+        create_block(parent, :example, 
+                     supply_br(lines),
+                     attrs, content_model: :compound)
       end
     end
 

data/lib/asciidoctor/standoc/ref.rb

@@ -211,7 +211,7 @@ module Asciidoctor
             node.items.each do |item|
               reference1(node, item.text, xml)
             end
-          end.join("\n")
+          end.join
         end
 
         def global_ievcache_name

data/lib/asciidoctor/standoc/reqt.rb

@@ -13,7 +13,7 @@ module Asciidoctor
                                      type: node.attr("type")) do |o|
             o << node.content
           end
-        end.join("\n")
+        end
       end
 
       def req_classif_parse(classif)

data/lib/asciidoctor/standoc/section.rb

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

data/lib/asciidoctor/standoc/utils.rb

@@ -164,8 +164,8 @@ module Asciidoctor
         doc = ::Nokogiri::XML.parse(NOKOHEAD)
         fragment = doc.fragment("")
         ::Nokogiri::XML::Builder.with fragment, &block
-        fragment.to_xml(encoding: "US-ASCII").lines.map do |l|
-          l.gsub(/\s*\n$/m, " ").gsub("–", "\u0096").
+        fragment.to_xml(encoding: "US-ASCII", indent: 0).lines.map do |l|
+          l.gsub(/>\n$/, ">").gsub(/\s*\n$/m, " ").gsub("–", "\u0096").
             gsub("—", "\u0097")
         end
       end

data/lib/metanorma/standoc/version.rb

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

data/spec/asciidoctor-standoc/base_spec.rb

@@ -87,6 +87,8 @@ RSpec.describe Asciidoctor::Standoc do
       :affiliation: Slate Rock and Gravel Company
       :address: 6 Rubble Way, Bedrock
       :contributor-uri: http://slate.example.com
+      :phone: 123
+      :fax: 456
       :surname_2: Rubble
       :givenname_2: Barney
       :initials_2: B. X.
@@ -94,6 +96,8 @@ RSpec.describe Asciidoctor::Standoc do
       :affiliation_2: Rockhead and Quarry Cave Construction Company
       :address_2: 6A Rubble Way, Bedrock
       :email_2: barney@rockhead.example.com
+      :phone_2: 789
+      :fax_2: 012
       :publisher: Hanna Barbera, Cartoon Network
       :part-of: ABC
       :translated-from: DEF,GHI;JKL MNO,PQR
@@ -167,6 +171,8 @@ RSpec.describe Asciidoctor::Standoc do
   </address>
    </organization>
    </affiliation>
+   <phone>123</phone>
+<phone type='fax'>456</phone>
    <uri>http://slate.example.com</uri>
   </person>
 </contributor>
@@ -186,6 +192,8 @@ RSpec.describe Asciidoctor::Standoc do
   </address>
   </organization>
 </affiliation>
+<phone>789</phone>
+<phone type='fax'>012</phone>
    <email>barney@rockhead.example.com</email>
   </person>
 </contributor>

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -413,16 +413,21 @@ RSpec.describe Asciidoctor::Standoc do
     end
 
     it "processes literals" do
-      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      expect((strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to (<<~"OUTPUT")
       #{ASCIIDOC_BLANK_HDR}
+
+      [alt=Literal]
       ....
       <LITERAL>
+      FIGURATIVE
       ....
       INPUT
       #{BLANK_HDR}
        <sections>
            <figure id="_">
-        <pre id="_">&lt;LITERAL&gt;</pre>
+        <pre alt="Literal" id="_">&lt;LITERAL&gt;
+        FIGURATIVE
+        </pre>
         </figure>
        </sections>
        </standard-document>

data/spec/asciidoctor-standoc/inline_spec.rb

@@ -207,6 +207,10 @@ RSpec.describe Asciidoctor::Standoc do
       Hello!footnote:[Footnote text]
 
       == Title footnote:[Footnote text 2]
+
+      Hello.footnote:abc[This is a repeated footnote]
+
+      Repetition.footnote:abc[]     
     INPUT
             #{BLANK_HDR}
               <preface><foreword obligation="informative">
@@ -219,10 +223,38 @@ RSpec.describe Asciidoctor::Standoc do
          <title>Title<fn reference="2">
          <p id="_">Footnote text 2</p>
        </fn></title>
+       <p id='_'>
+  Hello.
+  <fn reference='3'>
+    <p id='_'>This is a repeated footnote</p>
+  </fn>
+</p>
+<p id='_'>
+  Repetition.
+  <fn reference='3'>
+    <p id='_'>This is a repeated footnote</p>
+  </fn>
+</p>
        </clause></sections>
        </standard-document>
     OUTPUT
   end
 
+  it "processes index terms" do 
+          expect((strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to (<<~"OUTPUT")
+      #{ASCIIDOC_BLANK_HDR}
+      ((See)) Index ((_term_)) and(((A, B, C))).
+   INPUT
+   #{BLANK_HDR}
+  <sections>
+    <p id='_'>
+      See
+      <index primary='See'/> Index <em>term</em> <index primary='term'/> and<index primary='A' secondary='B' tertiary='C'/>.
+    </p>
+  </sections>
+</standard-document>
+   OUTPUT
+  end
+
 
 end

data/spec/asciidoctor-standoc/macros_spec.rb

@@ -67,6 +67,37 @@ RSpec.describe Asciidoctor::Standoc do
      OUTPUT
     end
 
+    it "supplies line breaks in pseudocode" do
+        expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+        #{ASCIIDOC_BLANK_HDR}
+
+        [pseudocode]
+        ====
+        A
+        B
+
+        D
+        E
+        ====
+        INPUT
+        #{BLANK_HDR}
+        <sections>
+<figure id='_' class='pseudocode'>
+             <p id='_'>
+               A
+               <br/>
+               B
+             </p>
+             <p id='_'>
+               D
+               <br/>
+               E
+             </p>
+           </figure>
+</sections>
+</standard-document>
+     OUTPUT
+    end
 
   it "processes the Ruby markups" do
     expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")

data/spec/asciidoctor-standoc/table_spec.rb

@@ -130,14 +130,14 @@ RSpec.describe Asciidoctor::Standoc do
       | Husked rice, parboiled | 1,0 | 1,0 | Not applicable | 1,0
       | Milled rice, parboiled | 1,0 | 1,0 | 1,0 | Not applicable
       | Chips | 0,1 | 0,1 | 0,1 | 0,1
-      | HDK | 2,0 footnoteref:[defectsmass,The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.] | 2,0 | 2,0 footnoteref:[defectsmass] | 2,0
+      | HDK | 2,0 footnote:defectsmass[The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.] | 2,0 | 2,0 footnote:defectsmass[] | 2,0
       | Damaged kernels | 4,0 | 3,0 | 4,0 | 3,0
       | Immature and/or malformed kernels | 8,0 | 2,0 | 8,0 | 2,0
-      | Chalky kernels | 5,0 footnoteref:[defectsmass] | 5,0 | Not applicable | Not applicable
-      | Red kernels and red-streaked kernels | 12,0 | 12,0 | 12,0 footnoteref:[defectsmass] | 12,0
-      | Partly gelatinized kernels | Not applicable | Not applicable | 11,0 footnoteref:[defectsmass] | 11,0
+      | Chalky kernels | 5,0 footnote:defectsmass[] | 5,0 | Not applicable | Not applicable
+      | Red kernels and red-streaked kernels | 12,0 | 12,0 | 12,0 footnote:defectsmass[] | 12,0
+      | Partly gelatinized kernels | Not applicable | Not applicable | 11,0 footnote:defectsmass[] | 11,0
       | Pecks | Not applicable | Not applicable | 4,0 | 2,0
-      | Waxy rice | 1,0 footnoteref:[defectsmass] | 1,0 | 1,0 footnoteref:[defectsmass] | 1,0
+      | Waxy rice | 1,0 footnote:defectsmass[] | 1,0 | 1,0 footnote:defectsmass[] | 1,0
       
       5+a| Live insects shall not be present. Dead insects shall be included in extraneous matter.
       |===

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor