metanorma-standoc 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8fab97f6fa53dcc3ff51d52897b6b7d7c0eaad734f21cb87e41bc1c8236e333
-  data.tar.gz: f71df060df2100c4a991f08b3d9129547bf8ca7bda29e43ec17a2d24b7847c82
+  metadata.gz: b0e0ef43dc360bd20733a52cc9e810116b6f558b580b3a5c13d4f9f3c53ac04d
+  data.tar.gz: 2d617c3cd329788c18a43fdf73bdae8332d9b49e65506d5752ebf9f1bd557722
 SHA512:
-  metadata.gz: e7ee129d2c67a72e6ec71653e3bb6a064fa16e1de9f6323b3a610802825649243e89cecb23b2f5644cb0508dfa3aa0832af74afe7421a582de6062ee2bea13f9
-  data.tar.gz: 39bfaf064020bf8e8fbf8d7c974f3661128d7331e1b3eb95779743f8d59a295d0410cbb911151c03c162338d37bdee86f9bf8e1d118ad5bee64affcf457795b0
+  metadata.gz: 2490c762b3f8ded3402d554a175aa438e6e2dfde6064d421de8d61504f5d400e0763eaa925e810169e27ab1d1a4328c52bc319e7e3908b7dcc67f1907626ea0b
+  data.tar.gz: d379114d13c65074d39ad217f78f22a3b568e692b42da7490db95f2eb835a5f1ade2eac4fa0e39af3247b6bda94920b7938852a555d369e9b41dc07ecb178af4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.3.8)
+    metanorma-standoc (1.3.9)
       asciidoctor (~> 2.0.0)
       concurrent-ruby
       html2doc (~> 0.9.0)
@@ -32,9 +32,9 @@ GEM
     docile (1.3.2)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    faraday (0.17.0)
+    faraday (0.17.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.2)
+    ffi (1.11.3)
     formatador (0.2.5)
     gb-agencies (0.0.6)
     guard (2.16.1)
@@ -64,7 +64,7 @@ GEM
     iev (0.2.3)
       nokogiri (>= 1.10.4)
     image_size (2.0.2)
-    isodoc (1.0.8)
+    isodoc (1.0.9)
       asciimath
       html2doc (~> 0.9.0)
       htmlentities (~> 4.3.4)
@@ -83,7 +83,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.0.13)
-    metanorma (0.3.17)
+    metanorma (0.3.18)
       asciidoctor
       htmlentities
     method_source (0.9.2)
@@ -100,7 +100,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     optout (0.0.2)
-    parallel (1.19.0)
+    parallel (1.19.1)
     parser (2.6.5.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
@@ -113,7 +113,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    relaton (0.5.14)
+    relaton (0.5.16)
       relaton-calconnect (~> 0.1.0)
       relaton-gb (~> 0.6.0)
       relaton-iec (~> 0.4.0)
@@ -146,7 +146,7 @@ GEM
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.3.7)
+    relaton-itu (0.3.10)
       relaton-iso-bib (~> 0.3.0)
     relaton-nist (0.3.8)
       relaton-bib (~> 0.3.0)

data/lib/asciidoctor/standoc/biblio.rng

@@ -34,7 +34,7 @@
     </data>
   </define>
   <start>
-    <ref name="relaton_collection"/>
+    <ref name="bibitem"/>
   </start>
   <define name="status">
     <element name="status">

data/lib/asciidoctor/standoc/blocks.rb

@@ -1,7 +1,5 @@
 require "htmlentities"
 require "uri"
-require "mime/types"
-require "base64"
 
 module Asciidoctor
   module Standoc
@@ -23,8 +21,6 @@ module Asciidoctor
                   subsequence: node.attr("subsequence") )
       end
 
-      # open block is a container of multiple blocks,
-      # treated as a single block.
       # We append each contained block to its parent
       def open(node)
         role = node.role || node.attr("style")
@@ -37,9 +33,13 @@ module Asciidoctor
         result
       end
 
+      def literal_attrs(node)
+        attr_code(id_attr(node))
+      end
+
       def literal(node)
         noko do |xml|
-          xml.figure **id_attr(node) do |f|
+          xml.figure **literal_attrs(node) do |f|
             figure_title(node, f)
             f.pre node.lines.join("\n"), **{ id: Utils::anchor_or_uuid }
           end
@@ -57,19 +57,15 @@ module Asciidoctor
       end
 
       def sidebar_attrs(node)
-        date = node.attr("date") || Date.today.iso8601.gsub(/\+.*$/, "")
-        date += "T00:00:00Z" unless /T/.match date
-        { reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
-          id: Utils::anchor_or_uuid(node),
-          date: date,
+        todo_attrs(node).merge(attr_code(
           from: node.attr("from"),
-          to: node.attr("to") || node.attr("from") }
+          to: node.attr("to") || node.attr("from") ))
       end
 
       def sidebar(node)
         return unless draft?
         noko do |xml|
-          xml.review **attr_code(sidebar_attrs(node)) do |r|
+          xml.review **(sidebar_attrs(node)) do |r|
             wrap_in_para(node, r)
           end
         end
@@ -78,14 +74,15 @@ module Asciidoctor
       def todo_attrs(node)
         date = node.attr("date") || Date.today.iso8601.gsub(/\+.*$/, "")
         date += "T00:00:00Z" unless /T/.match date
-        { reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
+        attr_code(
           id: Utils::anchor_or_uuid(node),
-          date: date }
+          reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
+          date: date )
       end
 
       def todo(node)
         noko do |xml|
-          xml.review **attr_code(todo_attrs(node)) do |r|
+          xml.review **(todo_attrs(node)) do |r|
             wrap_in_para(node, r)
           end
         end
@@ -100,11 +97,6 @@ module Asciidoctor
       end
 
       def note(n)
-        a = noko do |xml|
-          xml.note **id_attr(n) do |c|
-            wrap_in_para(n, c)
-          end
-        end
         noko do |xml|
           xml.note **id_attr(n) do |c|
             wrap_in_para(n, c)
@@ -119,7 +111,7 @@ module Asciidoctor
             name = t if type.casecmp(t).zero?
           end
         end
-        { id: Utils::anchor_or_uuid(node), type: name }
+        attr_code(id: Utils::anchor_or_uuid(node), type: name)
       end
 
       def admonition(node)
@@ -161,82 +153,53 @@ module Asciidoctor
         end.join("\n")
       end
 
+      def example_attrs(node)
+        attr_code(id_unnum_attr(node))
+      end
+
       def example_proper(node)
         noko do |xml|
-          xml.example **id_unnum_attr(node) do |ex|
+          xml.example **example_attrs(node) do |ex|
             node.title.nil? or ex.name { |name| name << node.title }
             wrap_in_para(node, ex)
           end
         end.join("\n")
       end
 
-      def preamble(node)
-        noko do |xml|
-          xml.foreword do |xml_abstract|
-            xml_abstract.title { |t| t << (node.blocks[0].title || "Foreword") }
-            content = node.content
-            xml_abstract << content
-          end
-        end.join("\n")
-      end
-
-      def datauri(uri)
-        return uri if /^data:/.match(uri)
-        types = MIME::Types.type_for(@localdir + uri)
-        type = types ? types.first.to_s : 'text/plain; charset="utf-8"'
-        bin = File.open(@localdir + uri, 'rb') {|io| io.read}
-        data = Base64.strict_encode64(bin)
-        "data:#{type};base64,#{data}"
-      end
-
-      def image_attributes(node)
-        uri = node.image_uri (node.attr("target") || node.target)
-        types = /^data:/.match(uri) ? datauri2mime(uri) : MIME::Types.type_for(uri)
-        type = types.first.to_s
-        uri = uri.sub(%r{^data:image/\*;}, "data:#{type};")
-        { src: @datauriimage ? datauri(uri) : uri,
-          id: Utils::anchor_or_uuid,
-          mimetype: type,
-          height: node.attr("height") || "auto",
-          width: node.attr("width") || "auto" ,
-          filename: node.attr("filename"),
-          title: node.attr("titleattr"),
-          alt: node.alt == node.attr("default-alt") ? nil : node.alt }
-      end
-
       def figure_title(node, f)
         return if node.title.nil?
         f.name { |name| name << node.title }
       end
 
+      def figure_attrs(node)
+        attr_code(id_unnum_attr(node))
+      end
+
       def image(node)
         noko do |xml|
-          xml.figure **id_unnum_attr(node) do |f|
+          xml.figure **figure_attrs(node) do |f|
             figure_title(node, f)
-            f.image **attr_code(image_attributes(node))
+            f.image **(image_attributes(node))
           end
         end
       end
 
-      def inline_image(node)
-        noko do |xml|
-          xml.image **attr_code(image_attributes(node))
-        end.join("")
+      def para_attrs(node)
+        attr_code(align: node.attr("align"),
+                  id: Utils::anchor_or_uuid(node))
       end
 
       def paragraph(node)
         return termsource(node) if node.role == "source"
-        attrs = { align: node.attr("align"),
-                  id: Utils::anchor_or_uuid(node) }
         noko do |xml|
-          xml.p **attr_code(attrs) do |xml_t|
+          xml.p **para_attrs(node) do |xml_t|
             xml_t << node.content
           end
         end.join("\n")
       end
 
       def quote_attrs(node)
-        { id: Utils::anchor_or_uuid(node), align: node.attr("align") }
+        attr_code(id: Utils::anchor_or_uuid(node), align: node.attr("align"))
       end
 
       def quote_attribution(node, out)
@@ -252,7 +215,7 @@ module Asciidoctor
 
       def quote(node)
         noko do |xml|
-          xml.quote **attr_code(quote_attrs(node)) do |q|
+          xml.quote **(quote_attrs(node)) do |q|
             quote_attribution(node, q)
             wrap_in_para(node, q)
           end
@@ -260,15 +223,15 @@ module Asciidoctor
       end
 
       def listing_attrs(node)
-        { lang: node.attr("language"),
-          id: Utils::anchor_or_uuid(node),
-          filename: node.attr("filename") }
+        attr_code(lang: node.attr("language"),
+                  id: Utils::anchor_or_uuid(node),
+                  filename: node.attr("filename"))
       end
 
       # NOTE: html escaping is performed by Nokogiri
       def listing(node)
         fragment = ::Nokogiri::XML::Builder.new do |xml|
-          xml.sourcecode **attr_code(listing_attrs(node)) do |s|
+          xml.sourcecode **(listing_attrs(node)) do |s|
             figure_title(node, s)
             s << node.content
           end

data/lib/asciidoctor/standoc/front.rb

@@ -190,7 +190,8 @@ module Asciidoctor
       end
 
       def relation_normalise(type)
-        type.sub(/-by$/, "By").sub(/-of$/, "Of").sub(/-from$/, "From")
+        type.sub(/-by$/, "By").sub(/-of$/, "Of").sub(/-from$/, "From").
+          sub(/-in$/, "In")
       end
 
       def metadata_getrelation(node, xml, type)

data/lib/asciidoctor/standoc/inline.rb

@@ -1,6 +1,8 @@
 require "asciidoctor/extensions"
 require "htmlentities"
 require "unicode2latex"
+require "mime/types"
+require "base64"
 
 module Asciidoctor
   module Standoc
@@ -152,6 +154,36 @@ module Asciidoctor
           end
         end.join
       end
+
+      def datauri(uri)
+        return uri if /^data:/.match(uri)
+        types = MIME::Types.type_for(@localdir + uri)
+        type = types ? types.first.to_s : 'text/plain; charset="utf-8"'
+        bin = File.open(@localdir + uri, 'rb') {|io| io.read}
+        data = Base64.strict_encode64(bin)
+        "data:#{type};base64,#{data}"
+      end
+
+      def image_attributes(node)
+        uri = node.image_uri (node.attr("target") || node.target)
+        types = /^data:/.match(uri) ? datauri2mime(uri) : MIME::Types.type_for(uri)
+        type = types.first.to_s
+        uri = uri.sub(%r{^data:image/\*;}, "data:#{type};")
+        attr_code(src: @datauriimage ? datauri(uri) : uri,
+          id: Utils::anchor_or_uuid,
+          mimetype: type,
+          height: node.attr("height") || "auto",
+          width: node.attr("width") || "auto" ,
+          filename: node.attr("filename"),
+          title: node.attr("titleattr"),
+          alt: node.alt == node.attr("default-alt") ? nil : node.alt)
+      end
+
+      def inline_image(node)
+        noko do |xml|
+          xml.image **(image_attributes(node))
+        end.join("")
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/lists.rb

@@ -1,5 +1,3 @@
-require "pp"
-
 module Asciidoctor
   module Standoc
     module Lists
@@ -14,10 +12,14 @@ module Asciidoctor
         end
       end
 
+      def ul_attr(node)
+        attr_code(id_attr(node))
+      end
+
       def ulist(node)
         return reference(node) if in_norm_ref? || in_biblio?
         noko do |xml|
-          xml.ul **id_attr(node) do |xml_ul|
+          xml.ul **ul_attr(node) do |xml_ul|
             node.items.each do |item|
               li(xml_ul, item)
             end
@@ -33,10 +35,14 @@ module Asciidoctor
         style
       end
 
+      def ol_attr(node)
+        attr_code(id: Utils::anchor_or_uuid(node),
+                             type: olist_style(node.style))
+      end
+
       def olist(node)
         noko do |xml|
-          xml.ol **attr_code(id: Utils::anchor_or_uuid(node),
-                             type: olist_style(node.style)) do |xml_ol|
+          xml.ol **ol_attr(node) do |xml_ol|
             node.items.each { |item| li(xml_ol, item) }
           end
         end.join("\n")
@@ -62,9 +68,13 @@ module Asciidoctor
         end
       end
 
+      def dl_attr(node)
+        attr_code(id_attr(node))
+      end
+
       def dlist(node)
         noko do |xml|
-          xml.dl **id_attr(node) do |xml_dl|
+          xml.dl **dl_attr(node) do |xml_dl|
             node.items.each do |terms, dd|
               dt(terms, xml_dl)
               dd(dd, xml_dl)

data/lib/asciidoctor/standoc/section.rb

@@ -85,6 +85,16 @@ module Asciidoctor
                              end
       end
 
+      def preamble(node)
+        noko do |xml|
+          xml.foreword do |xml_abstract|
+            xml_abstract.title { |t| t << (node.blocks[0].title || "Foreword") }
+            content = node.content
+            xml_abstract << content
+          end
+        end.join("\n")
+      end
+
       def abstract_parse(attrs, xml, node)
         xml.abstract **attr_code(attrs) do |xml_section|
           xml_section << node.content

data/lib/metanorma/standoc/version.rb

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

metadata

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