metanorma-standoc 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56d1dfa7cef4ffc384854d78494c559fb24c426dd31d2429ad11de246e858b92
-  data.tar.gz: 3069d3e34e8ae8663655073ae67666964312b169bd42a056538d748f2dc8dae0
+  metadata.gz: 224cd7ca429d40a2ab00d82a364e88799f10fe25ab5590a71a80302140dbbc92
+  data.tar.gz: 51e3067befe646bf8bf072f1b28ea98bd9ffdee0c402e4447eb285df39197cd7
 SHA512:
-  metadata.gz: 59cb8b7330a1605369d6216014bfceff8e60345985853a9c424be9bb99105b176e4ec5f3af9131d159f4616c7d2d93a2bfb4e7692b5028dc04bcbaeb2e6db5bf
-  data.tar.gz: b8cc513d452db412d7c86ebb9dd66c12e2c12be64ccdce84a70958ed6e1ce03f9b44226bbe378c14ef506af0dbfffed1562ca91b69a82ae646ad1d7dd84364b7
+  metadata.gz: 76fd5c9ba4a47de3cbaca82fbf8fa355dc8b3e00b10fe50cc6482e675e7c49288b85f849d74df33fddb433eddee4554cbeeac6c473119920620bdd956143b4e4
+  data.tar.gz: 62eefb42214c569b86eaec612a2769c7141686a78e4c2c7c6a62cec6dd819e75db6d856703dedd1b327c90e5ebd2878f74e21ac81af62627a40f417300af4b53

data/Gemfile.lock

@@ -0,0 +1,212 @@
+PATH
+  remote: .
+  specs:
+    metanorma-standoc (1.0.8)
+      asciidoctor (~> 1.5.7)
+      iev (~> 0.2.0)
+      isodoc (~> 0.9.0)
+      relaton (~> 0.3.0)
+      ruby-jing
+      sterile
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    algoliasearch (1.23.2)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    asciidoctor (1.5.7.1)
+    asciimath (1.0.6)
+    ast (2.4.0)
+    byebug (10.0.2)
+    cnccs (0.1.3)
+    coderay (1.1.2)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    equivalent-xml (0.6.0)
+      nokogiri (>= 1.4.3)
+    ffi (1.9.25)
+    formatador (0.2.5)
+    gb-agencies (0.0.3)
+    gbbib (0.4.1)
+      cnccs (~> 0.1.1)
+      gb-agencies (~> 0.0.1)
+      iso-bib-item (~> 0.4.2)
+    guard (2.14.2)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    hashdiff (0.3.7)
+    html2doc (0.8.5)
+      asciimath
+      htmlentities (~> 4.3.4)
+      image_size
+      mime-types
+      nokogiri
+      ruby-xslt
+      thread_safe
+      uuidtools
+    htmlentities (4.3.4)
+    httpclient (2.8.3)
+    iecbib (0.2.1)
+      addressable
+      iso-bib-item (~> 0.4.2)
+    ietfbib (0.4.3)
+      iso-bib-item (~> 0.4.2)
+    iev (0.2.0)
+      nokogiri
+    image_size (2.0.0)
+    iso-bib-item (0.4.2)
+      isoics (~> 0.1.6)
+      nokogiri (~> 1.8.4)
+      ruby_deep_clone (~> 0.8.0)
+    isobib (0.4.1)
+      algoliasearch
+      iecbib (~> 0.2.1)
+      iso-bib-item (~> 0.4.2)
+    isodoc (0.9.5)
+      asciimath
+      html2doc (~> 0.8.1)
+      htmlentities (~> 4.3.4)
+      liquid
+      metanorma (~> 0.2.7)
+      nokogiri
+      rake (~> 12.0)
+      roman-numerals
+      ruby-xslt
+      sassc (~> 1.12.1)
+      thread_safe
+      uuidtools
+    isoics (0.1.7)
+    jaro_winkler (1.5.1)
+    json (2.1.0)
+    liquid (4.0.1)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.13)
+    metanorma (0.2.11)
+    method_source (0.9.0)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2018.0812)
+    mini_portile2 (2.3.0)
+    nenv (0.3.0)
+    nokogiri (1.8.5)
+      mini_portile2 (~> 2.3.0)
+    notiffany (0.1.1)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    optout (0.0.2)
+    parallel (1.12.1)
+    parser (2.5.1.2)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.3)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    relaton (0.3.0)
+      algoliasearch
+      gbbib (~> 0.4.0)
+      iecbib (~> 0.2.0)
+      ietfbib (~> 0.4.2)
+      iso-bib-item (~> 0.4.2)
+      isobib (~> 0.4.0)
+    roman-numerals (0.3.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.60.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
+    ruby-jing (0.0.1)
+      optout (>= 0.0.2)
+    ruby-progressbar (1.10.0)
+    ruby-xslt (0.9.10)
+    ruby_deep_clone (0.8.0)
+    ruby_dep (1.5.0)
+    safe_yaml (1.0.4)
+    sass (3.6.0)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sassc (1.12.1)
+      ffi (~> 1.9.6)
+      sass (>= 3.3.0)
+    shellany (0.0.1)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    sterile (1.0.13)
+      nokogiri
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    unicode-display_width (1.4.0)
+    uuidtools (2.1.5)
+    vcr (4.0.0)
+    webmock (3.4.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.15)
+  byebug
+  equivalent-xml (~> 0.6)
+  guard (~> 2.14)
+  guard-rspec (~> 4.7)
+  metanorma (~> 0.2.6)
+  metanorma-standoc!
+  rake (~> 12.0)
+  rspec (~> 3.6)
+  rubocop (~> 0.50)
+  simplecov (~> 0.15)
+  timecop (~> 0.9)
+  vcr
+  webmock
+
+BUNDLED WITH
+   1.16.6

data/lib/asciidoctor/standoc/base.rb

@@ -8,6 +8,7 @@ require "pp"
 require "sass"
 require "isodoc"
 require "relaton"
+require "fileutils"
 
 module Asciidoctor
   module Standoc
@@ -74,7 +75,7 @@ module Asciidoctor
       end
 
       def init(node)
-        @fn_number = 0
+        @fn_number ||= 0
         @draft = false
         @refids = Set.new
         @anchors = {}
@@ -98,8 +99,8 @@ module Asciidoctor
           localname = bibliocache_name(false) if node.attr("local-cache") ||
             node.attr("local-cache-only")
           if node.attr("flush-caches")
-            system("rm -f #{globalname}") unless globalname.nil?
-            system("rm -f #{localname}") unless localname.nil?
+            FileUtils.rm_f globalname unless globalname.nil?
+            FileUtils.rm_f localname unless localname.nil?
           end
         end        
         @bibdb = Relaton::Db.new(globalname, localname) unless @no_isobib
@@ -111,8 +112,8 @@ module Asciidoctor
           localname = ievcache_name(false) if node.attr("local-cache") ||
           node.attr("local-cache-only")
           if node.attr("flush-caches")
-            system("rm -f #{globalname}") unless globalname.nil?
-            system("rm -f #{localname}") unless localname.nil?
+            FileUtils.rm_f globalname unless globalname.nil?
+            FileUtils.rm_f localname unless localname.nil?
           end
         end
         @iev = Iev::Db.new(globalname, localname) unless @no_isobib
@@ -137,7 +138,7 @@ module Asciidoctor
           html_converter(node).convert(@filename + ".xml")
           doc_converter(node).convert(@filename + ".xml")
         end
-        @files_to_delete.each { |f| system "rm #{f}" }
+        @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end
 

data/lib/asciidoctor/standoc/biblio.rng

@@ -259,6 +259,9 @@
   </define>
   <define name="uri">
     <element name="uri">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <data type="anyURI"/>
     </element>
   </define>
@@ -411,6 +414,20 @@
       <ref name="BibliographicItem"/>
     </element>
   </define>
+  <define name="relaton_collection">
+    <element name="relaton-collection">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <ref name="btitle"/>
+      <zeroOrMore>
+        <ref name="contributor"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="docrelation"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemType" combine="choice">
     <choice>
       <value>article</value>
@@ -444,6 +461,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <ref name="fetched"/>
+    </optional>
     <choice>
       <oneOrMore>
         <ref name="btitle"/>
@@ -523,6 +543,14 @@
       <ref name="FormattedString"/>
     </element>
   </define>
+  <define name="fetched">
+    <element name="fetched">
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
+    </element>
+  </define>
   <define name="validity">
     <element name="validity">
       <optional>
@@ -538,17 +566,26 @@
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="TypedTitleString">
@@ -733,6 +770,7 @@
     <element name="from">
       <choice>
         <data type="dateTime"/>
+        <data type="date"/>
         <data type="gYear"/>
       </choice>
     </element>
@@ -741,6 +779,7 @@
     <element name="to">
       <choice>
         <data type="dateTime"/>
+        <data type="date"/>
         <data type="gYear"/>
       </choice>
     </element>

data/lib/asciidoctor/standoc/cleanup.rb

@@ -34,7 +34,7 @@ module Asciidoctor
         para_cleanup(xmldoc)
         callout_cleanup(xmldoc)
         element_name_cleanup(xmldoc)
-        footnote_renumber(xmldoc)
+        footnote_cleanup(xmldoc)
         empty_element_cleanup(xmldoc)
         mathml_cleanup(xmldoc)
         script_cleanup(xmldoc)

data/lib/asciidoctor/standoc/cleanup_footnotes.rb

@@ -66,7 +66,7 @@ module Asciidoctor
         end
       end
 
-      def footnote_renumber(xmldoc)
+      def footnote_cleanup(xmldoc)
         table_footnote_renumber(xmldoc)
         other_footnote_renumber(xmldoc)
         xmldoc.xpath("//fn").each do |fn|

data/lib/asciidoctor/standoc/front.rb

@@ -95,8 +95,18 @@ module Asciidoctor
         end
       end
 
+      def metadata_source(node, xml)
+        node.attr("uri") && xml.source(node.attr("uri"))
+        node.attr("xml-uri") && xml.source(node.attr("xml-uri"), type: "xml")
+        node.attr("html-uri") && xml.source(node.attr("html-uri"), type: "html")
+        node.attr("pdf-uri") && xml.source(node.attr("pdf-uri"), type: "pdf")
+        node.attr("doc-uri") && xml.source(node.attr("doc-uri"), type: "doc")
+        node.attr("relaton-uri") && xml.source(node.attr("relaton-uri"), type: "relaton")
+      end
+
       def metadata(node, xml)
         title node, xml
+        metadata_source(node, xml)
         metadata_id(node, xml)
         metadata_author(node, xml)
         metadata_publisher(node, xml)

data/lib/asciidoctor/standoc/inline.rb

@@ -68,6 +68,7 @@ module Asciidoctor
       end
 
       def inline_footnote(node)
+        @fn_number ||= 0
         noko do |xml|
           @fn_number += 1
           xml.fn **{ reference: @fn_number } do |fn|

data/lib/asciidoctor/standoc/macros.rb

@@ -1,4 +1,6 @@
 require "asciidoctor/extensions"
+require "fileutils"
+
 module Asciidoctor
   module Standoc
     class AltTermInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
@@ -58,7 +60,7 @@ module Asciidoctor
           src = "@startuml\n#{src}\n@enduml\n"
         /^@startuml (?<filename>[^\n]+)\n/ =~ src
         filename ||= parent.document.reader.lineno
-        system "mkdir -p plantuml"
+        FileUtils.mkdir_p "plantuml"
         File.open("plantuml/#{filename}.pml", "w") { |f| f.write src }
         system "plantuml plantuml/#{filename}.pml"
         filename

data/lib/asciidoctor/standoc/ref.rb

@@ -1,5 +1,3 @@
-require "pp"
-
 module Asciidoctor
   module Standoc
     module Lists
@@ -88,7 +86,8 @@ module Asciidoctor
       def isorefmatches3(xml, m)
         hasyr =  m.names.include?("year") && m[:year] != "--"
         noyr =  m.names.include?("year") && m[:year] == "--"
-        ref = fetch_ref xml, m[:code], hasyr ? m[:year] : nil, all_parts: true, no_year: noyr
+        ref = fetch_ref xml, m[:code], hasyr ? m[:year] : nil, 
+          all_parts: true, no_year: noyr
         return use_my_anchor(ref, m[:anchor]) if ref
         xml.bibitem(**attr_code(ref_attributes(m))) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
@@ -104,7 +103,7 @@ module Asciidoctor
         return nil if opts[:no_year]
         hit = @bibdb&.fetch(code, year, opts) 
         return nil if hit.nil?
-        xml.parent.add_child(hit.to_xml)
+        xml.parent.add_child(Utils::smart_render_xml(hit))
         xml
       rescue Algolia::AlgoliaProtocolError
         nil # Render reference without an Internet connection.