metanorma-standoc 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c3b117ea592275339f9ee8103f17645d9675f45635abfbc8e5333fc512af1c
-  data.tar.gz: a345b19a2657f356225f2087e17a7dba7bd4720389cf44487892d3f1e1bc5345
+  metadata.gz: 2b4ec9dd5050345506b6b416eaad6b57865cb3c0b9e57e00e3b52f625fe87a48
+  data.tar.gz: 4e53f6a44684a9694104f74c7560040893a47c70c5c8292810e9349a32c1e151
 SHA512:
-  metadata.gz: 630d1159cc78920d3bab3e73a2577b54d00bb966b0faa15166ff1af832656ab985e55f8fa830d40a2fbec96a8cf8555880f89f0e73d749dc73540e6cd8303469
-  data.tar.gz: f3c46604bb69f1e34eb8b2af182e198e99a6f2cae3bce808a9547e096b1852b4868c00a8522370a52c92ad5f263ab2f7e5ee348196fffbe1084ef1c666900080
+  metadata.gz: 8d437d0619e0da4931009f2f92db0778bdd0eccb9bd15f81a7e38edc66a89474cecaa4099bd55bf8178a13a9551d533378068730231e2ed13d2ead794da7cb3a
+  data.tar.gz: c5a606e3c94a341a6ce19bf5e77df8bf49eeae5d68cf6143d7050190a29f7213a34d74ab7743b87f54d7766fd17606cfb05f05b51a63f7a85ae113b9a23e98fd

data/.github/workflows/ubuntu.yml

@@ -43,7 +43,7 @@ jobs:
           polling_interval_seconds: 5
           timeout_minutes: 5
           max_attempts: 3
-          command: sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
+          command: sudo apt-get update -y && sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
       - name: Run specs
         run: |
           bundle exec rake

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -133,14 +133,16 @@ module Asciidoctor
       end
 
       def validate_ref_dl(bib, c)
-        unless bib["id"]
+        id = bib["id"]
+        id ||= c["id"] unless /^_/.match(c["id"]) # do not accept implicit id
+        unless id
           @log.add("Anchors", c, "The following reference is missing "\
                    "an anchor:\n" + c.to_xml)
           return
         end
-        bib["title"] or @log.add("Bibliography", c, "Reference #{bib['id']} "\
+        bib["title"] or @log.add("Bibliography", c, "Reference #{id} "\
                                  "is missing a title")
-        bib["docid"] or @log.add("Bibliography", c, "Reference #{bib['id']} "\
+        bib["docid"] or @log.add("Bibliography", c, "Reference #{id} "\
                                  "is missing a document identifier (docid)")
       end
 

data/lib/asciidoctor/standoc/front.rb

@@ -25,18 +25,6 @@ module Asciidoctor
         end
       end
 
-      def metadata_copyright(node, xml)
-        publishers = node.attr("publisher") || " "
-        publishers.split(/,[ ]?/).each do |p|
-          xml.copyright do |c|
-            c.from (node.attr("copyright-year") || Date.today.year)
-            p.match(/[A-Za-z]/).nil? or c.owner do |owner|
-              owner.organization { |o| organization(o, p) }
-            end
-          end
-        end
-      end
-
       def metadata_status(node, xml)
         xml.status do |s|
           s.stage ( node.attr("status") || node.attr("docstage") || "published" )

data/lib/asciidoctor/standoc/front_contributor.rb

@@ -3,6 +3,7 @@ require "nokogiri"
 require "htmlentities"
 require "pathname"
 require "open-uri"
+require "csv"
 
 module Asciidoctor
   module Standoc
@@ -24,8 +25,15 @@ module Asciidoctor
         org.name orgname
       end
 
+      # , " => ," : CSV definition does not deal with space followed by quote
+      # at start of field
+      def csv_split(s, delim = ",")
+        CSV.parse_line(s&.gsub(/, "(?!")/, ',"'), liberal_parsing: true,
+                       col_sep: delim)&.map { |x| x.strip }
+      end
+
       def metadata_author(node, xml)
-        (node.attr("publisher") || "").split(/,[ ]?/).each do |p|
+        csv_split(node.attr("publisher") || default_publisher || "")&.each do |p|
           xml.contributor do |c|
             c.role **{ type: "author" }
             c.organization { |a| organization(a, p) }
@@ -85,15 +93,32 @@ module Asciidoctor
         end
       end
 
+      def default_publisher
+        nil
+      end
+
       def metadata_publisher(node, xml)
-        publishers = node.attr("publisher") || return
-        publishers.split(/,[ ]?/).each do |p|
+        publishers = node.attr("publisher") || default_publisher || return
+        csv_split(publishers)&.each do |p|
           xml.contributor do |c|
             c.role **{ type: "publisher" }
             c.organization { |a| organization(a, p) }
           end
         end
       end
+
+      def metadata_copyright(node, xml)
+        publishers = node.attr("copyright-holder") || node.attr("publisher") || 
+          default_publisher || "-"
+        csv_split(publishers)&.each do |p|
+          xml.copyright do |c|
+            c.from (node.attr("copyright-year") || Date.today.year)
+            p.match(/[A-Za-z]/).nil? or c.owner do |owner|
+              owner.organization { |o| organization(o, p) }
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/section.rb

@@ -150,9 +150,10 @@ module Asciidoctor
       end
 
       def nonterm_symbols_parse(attrs, xml, node)
+        defs = @definitions
         @definitions = false
         clause_parse(attrs, xml, node)
-        @definitions = true
+        @definitions = defs
       end
 
       def symbols_attrs(node, a)
@@ -179,9 +180,10 @@ module Asciidoctor
       end
 
       def nonterm_term_def_subclause_parse(attrs, xml, node)
+        defs = @term_def
         @term_def = false
         clause_parse(attrs, xml, node)
-        @term_def = true
+        @term_def = defs
       end
 
       # subclause contains subclauses

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-   VERSION = "1.5.0".freeze
+   VERSION = "1.5.1".freeze
   end
 end

data/spec/asciidoctor-standoc/base_spec.rb

@@ -102,7 +102,8 @@ RSpec.describe Asciidoctor::Standoc do
       :email_2: barney@rockhead.example.com
       :phone_2: 789
       :fax_2: 012
-      :publisher: Hanna Barbera, Cartoon Network
+      :publisher: "Hanna Barbera", "Cartoon Network", "Ribose, Inc."
+      :copyright-holder: "Ribose, Inc.", Hanna Barbera
       :part-of: ABC
       :translated-from: DEF,GHI;JKL MNO,PQR
       :keywords: a, b, c
@@ -155,6 +156,12 @@ RSpec.describe Asciidoctor::Standoc do
 <date type="Jack">
   <on>1010-01-01</on>
 </date>
+<contributor>
+  <role type="author"/>
+  <organization>
+    <name>Ribose, Inc.</name>
+  </organization>
+</contributor>
 <contributor>
   <role type="author"/>
   <organization>
@@ -221,6 +228,12 @@ RSpec.describe Asciidoctor::Standoc do
     <name>Cartoon Network</name>
   </organization>
 </contributor>
+<contributor>
+  <role type="publisher"/>
+  <organization>
+    <name>Ribose, Inc.</name>
+  </organization>
+</contributor>
 <edition>2</edition>
 <version>
   <revision-date>2000-01-01</revision-date>
@@ -237,7 +250,7 @@ RSpec.describe Asciidoctor::Standoc do
     <from>2001</from>
        <owner>
      <organization>
-       <name>Hanna Barbera</name>
+       <name>Ribose, Inc.</name>
      </organization>
    </owner>
  </copyright>
@@ -245,7 +258,7 @@ RSpec.describe Asciidoctor::Standoc do
    <from>2001</from>
    <owner>
      <organization>
-       <name>Cartoon Network</name>
+       <name>Hanna Barbera</name>
      </organization>
    </owner>
   </copyright>

data/spec/asciidoctor-standoc/refs_dl_spec.rb

@@ -77,7 +77,7 @@ it "processes complex dl reference" do
 [bibliography]
 == Normative References
 
-[[ISO/TC211]]
+[[ISOTC211]]
 [%bibitem]
 === {blank}
 fetched:: 2019-06-30
@@ -446,7 +446,7 @@ OUTPUT
 [bibliography]
 == Normative References
 
-[[ISO/TC211]]
+[[ISOTC211]]
 [%bibitem]
 === {blank}
 fetched:: 2019-06-30

data/spec/asciidoctor-standoc/validate_spec.rb

@@ -64,7 +64,25 @@ RSpec.describe Asciidoctor::Standoc do
 INPUT
   errf = File.read("test.err")
   expect(errf).to include "The following reference is missing an anchor"
+  Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+      #{VALIDATING_BLANK_HDR}
+
+      [bibliography]
+      == Normative References
+
+      [[x]]
+      [%bibitem]
+      === Standard
+      type:: standard
+      contributor::
+        role::: publisher
+        organization:::
+          name:::: ISO
+INPUT
+  errf = File.read("test.err")
+  expect(errf).not_to include "The following reference is missing an anchor"
   end
+
   it "warns about malformed LaTeX" do
   FileUtils.rm_f "test.err"
   Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true) 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor