metanorma-standoc 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da7f659bff4d006bb019e303f8d6df764a6870e5ddf6b68d5a710fa160aae5dd
-  data.tar.gz: 65427fce326003810d75ca1fe4a004a117d9d6076f3c676930c8e286b140dd71
+  metadata.gz: 7b1329080ec2d0fd0e0a0f14ef3e59ebacf0d3a7eddb0d44510ef16966073705
+  data.tar.gz: 46051f44a1e660df4357ab06e6018d861698d12679f6002cb46f17d9b0b62684
 SHA512:
-  metadata.gz: '08993a10718efddd39418bb9af4018d55a9e6e0882d6d4cb39cbe8d0b274b4b419c9cb353e2f1606e4851d42b1e668cb8579c5a660bbd1ed651b32bd76823879'
-  data.tar.gz: aa26abdc106f10ea716c2bc98a811e5734cad920f70076dc392fb0ab2743e079cae42195483d81dc271494af8f60592fc7b9f16dfe28f6d39c03e4f6b63c8cb6
+  metadata.gz: f044364c1ac18e56ee6c186c919d0cd332c5253a6e4cc1bb6bc09bbbf5233c74c6f42d10314c4598305d21e5450c5b29ef57d62b6662394c2137d39c965c7d35
+  data.tar.gz: f6806351c9621bfb2bfac2ae868593ce9088c4361d99285495368e3faa6550dbcaa0fa4d88fd3f19238536bd32837182470321f3b9734a33f0807d95ca2719e9

data/Gemfile

@@ -2,6 +2,10 @@ Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
 source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-# Specify your gem's dependencies in gemspec
 gemspec
+
+if File.exist? 'Gemfile.devel'
+  eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.3.1)
+    metanorma-standoc (1.3.2)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       html2doc (~> 0.8.11)
@@ -18,9 +18,6 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    algoliasearch (1.26.1)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.5.1)
     asciidoctor (1.5.8)
     asciimath (1.0.8)
     ast (2.4.0)
@@ -34,10 +31,12 @@ GEM
     docile (1.3.2)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     formatador (0.2.5)
     gb-agencies (0.0.5)
-    guard (2.15.0)
+    guard (2.15.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -61,11 +60,10 @@ GEM
       thread_safe
       uuidtools
     htmlentities (4.3.4)
-    httpclient (2.8.3)
     iev (0.2.2)
       nokogiri
     image_size (2.0.2)
-    isodoc (1.0.1)
+    isodoc (1.0.2)
       asciimath
       html2doc (~> 0.8.11)
       htmlentities (~> 4.3.4)
@@ -89,10 +87,11 @@ GEM
       asciidoctor
       htmlentities
     method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2019.0904)
     mini_portile2 (2.4.0)
+    multipart-post (2.1.1)
     nenv (0.3.0)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
@@ -101,7 +100,7 @@ GEM
       shellany (~> 0.0)
     optout (0.0.2)
     parallel (1.17.0)
-    parser (2.6.4.0)
+    parser (2.6.4.1)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)
@@ -113,40 +112,43 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    relaton (0.5.3)
-      algoliasearch
+    relaton (0.5.4)
       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-bib (0.3.5)
+      relaton-ogc (~> 0.1.0)
+    relaton-bib (0.3.6)
       addressable
-      nokogiri (~> 1.10)
-    relaton-gb (0.6.2)
+      nokogiri
+    relaton-gb (0.6.3)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iec (0.4.3)
+    relaton-iec (0.4.4)
       addressable
       relaton-iso-bib (~> 0.3.0)
-    relaton-ietf (0.6.3)
+    relaton-ietf (0.6.4)
       relaton-bib (~> 0.3.0)
     relaton-iev (0.1.1)
       relaton (~> 0.5.0)
-    relaton-iso (0.6.4)
+    relaton-iso (0.6.5)
       relaton-iec (~> 0.4.0)
       relaton-iso-bib (~> 0.3.0)
-    relaton-iso-bib (0.3.4)
+    relaton-iso-bib (0.3.5)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)
-    relaton-itu (0.3.2)
+    relaton-itu (0.3.3)
       relaton-iso-bib (~> 0.3.0)
-    relaton-nist (0.3.3)
+    relaton-nist (0.3.4)
       relaton-bib (~> 0.3.0)
       rubyzip
+    relaton-ogc (0.1.0)
+      faraday
+      relaton-iso-bib (~> 0.3.0)
     roman-numerals (0.3.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -173,7 +175,7 @@ GEM
     ruby-progressbar (1.10.1)
     ruby_deep_clone (0.8.0)
     ruby_dep (1.5.0)
-    rubyzip (1.2.3)
+    rubyzip (1.2.4)
     safe_yaml (1.0.5)
     sassc (2.2.0)
       ffi (~> 1.9)
@@ -192,7 +194,7 @@ GEM
     unicode2latex (0.0.2)
     uuidtools (2.1.5)
     vcr (5.0.0)
-    webmock (3.7.0)
+    webmock (3.7.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/lib/asciidoctor/standoc/cleanup_boilerplate.rb

@@ -26,7 +26,7 @@ module Asciidoctor
 
       def term_defs_boilerplate_cont(src, term, isodoc)
         sources = isodoc.sentence_join(src.map do |s|
-          %{<eref bibitem="#{s['bibitemid']}"/>}
+          %{<eref bibitemid="#{s['bibitemid']}"/>}
         end)
         if src.empty? then @internal_terms_boilerplate
         elsif term.nil? then external_terms_boilerplate(sources)

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -102,8 +102,9 @@ module Asciidoctor
         r = xmldoc.at("//references[title = 'Bibliography'] | "\
                       "//clause[title = 'Bibliography'][.//bibitem]") or return
         r.xpath(".//bibitem[not(ancestor::bibitem)]").each_with_index do |b, i|
-          docid = b.at("./docidentifier[@type = 'metanorma']") and
-            docid.children = "[#{i + 1}]"
+          next unless docid = b.at("./docidentifier[@type = 'metanorma']")
+          next unless  /^\[\d+\]$/.match(docid.text)
+          docid.children = "[#{i + 1}]"
         end
       end
 
@@ -164,7 +165,6 @@ module Asciidoctor
       def ref_dl_cleanup(xmldoc)
         xmldoc.xpath("//clause[@bibitem = 'true']").each do |c|
           bib = dl_bib_extract(c) or next
-          #warn bib
           bibitemxml = RelatonBib::BibliographicItem.new(
             RelatonBib::HashConverter::hash_to_bib(bib)).to_xml or next
           bibitem = Nokogiri::XML(bibitemxml)

data/lib/asciidoctor/standoc/front.rb

@@ -1,10 +1,8 @@
 require "date"
 require "nokogiri"
 require "htmlentities"
-require "json"
 require "pathname"
 require "open-uri"
-require "pp"
 
 module Asciidoctor
   module Standoc
@@ -182,7 +180,7 @@ module Asciidoctor
       end
 
       def relaton_relations
-        %w(part-of)
+        %w(part-of translated-from)
       end
 
       def metadata_relations(node, xml)
@@ -251,14 +249,6 @@ module Asciidoctor
       def metadata_series(node, xml)
       end
 
-      def asciidoc_sub(x)
-        return nil if x.nil?
-        return "" if x.empty?
-        d = Asciidoctor::Document.new(x.lines.entries, {header_footer: false})
-        b = d.parse.blocks.first
-        b.apply_subs(b.source)
-      end
-
       def title(node, xml)
         title_english(node, xml)
         title_otherlangs(node, xml)
@@ -268,7 +258,7 @@ module Asciidoctor
         ["en"].each do |lang|
           at = { language: lang, format: "text/plain" }
           xml.title **attr_code(at) do |t|
-            t << asciidoc_sub(node.attr("title") || node.attr("title-en") ||
+            t << Utils::asciidoc_sub(node.attr("title") || node.attr("title-en") ||
                               node.title)
           end
         end

data/lib/asciidoctor/standoc/ref.rb

@@ -42,7 +42,8 @@ module Asciidoctor
       end
 
       def docid(t, code)
-        type, code1 = /^\[\d+\]$/.match(code) ? ["metanorma", code] :
+        type, code1 = /^\[\d+\]$|^\(.+\)$/.match(code) ? 
+          ["metanorma", code.sub(/^\(/, "[").sub(/\)$/, "]")] :
           @bibdb&.docid_type(code) || [nil, code]
         t.docidentifier code1, **attr_code(type: type)
       end

data/lib/asciidoctor/standoc/utils.rb

@@ -17,6 +17,14 @@ module Asciidoctor
           node.nil? || node.id.nil? || node.id.empty? ? "_" + uuid : node.id
         end
 
+        def asciidoc_sub(x)
+          return nil if x.nil?
+          return "" if x.empty?
+          d = Asciidoctor::Document.new(x.lines.entries, {header_footer: false})
+          b = d.parse.blocks.first
+          b.apply_subs(b.source)
+        end
+
         def localdir(node)
           docfile = node.attr("docfile")
           docfile.nil? ? './' : Pathname.new(docfile).parent.to_s + '/'

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.3.1".freeze
+    VERSION = "1.3.2".freeze
   end
 end

data/spec/asciidoctor-standoc/base_spec.rb

@@ -96,6 +96,7 @@ RSpec.describe Asciidoctor::Standoc do
       :email_2: barney@rockhead.example.com
       :publisher: Hanna Barbera, Cartoon Network
       :part-of: ABC
+      :translated-from: DEF
       :keywords: a, b, c
     INPUT
     <?xml version="1.0" encoding="UTF-8"?>
@@ -234,6 +235,12 @@ RSpec.describe Asciidoctor::Standoc do
   <docidentifier>ABC</docidentifier>
   </bibitem>
 </relation>
+ <relation type="translatedFrom">
+   <bibitem>
+     <title>--</title>
+     <docidentifier>DEF</docidentifier>
+   </bibitem>
+ </relation>
 <keyword>a</keyword>
 <keyword>b</keyword>
 <keyword>c</keyword>

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -572,18 +572,36 @@ RSpec.describe Asciidoctor::Standoc do
       [bibliography]
       == Bibliography
 
-      * [[[iso123,1]]] _Standard_
+      * [[[iso123,2]]] _Standard_
+      * [[[iso124,(B)]]] _Standard_
+      * [[[iso125,1]]] _Standard_
+      * [[[iso126,(A)]]] _Standard_
     INPUT
        #{BLANK_HDR}
               <sections>
 
-       </sections><bibliography><references id="_" obligation="informative">
-         <title>Bibliography</title>
-         <bibitem id="iso123">
+       </sections>
+       <bibliography><references id="_" obligation="informative">
+         <title>Bibliography</title><bibitem id="iso123">
          <formattedref format="application/x-isodoc+xml">
            <em>Standard</em>
          </formattedref>
          <docidentifier type="metanorma">[1]</docidentifier>
+       </bibitem><bibitem id="iso124">
+         <formattedref format="application/x-isodoc+xml">
+           <em>Standard</em>
+         </formattedref>
+         <docidentifier type="metanorma">[B]</docidentifier>
+       </bibitem><bibitem id="iso125">
+         <formattedref format="application/x-isodoc+xml">
+           <em>Standard</em>
+         </formattedref>
+         <docidentifier type="metanorma">[3]</docidentifier>
+       </bibitem><bibitem id="iso126">
+         <formattedref format="application/x-isodoc+xml">
+           <em>Standard</em>
+         </formattedref>
+         <docidentifier type="metanorma">[A]</docidentifier>
        </bibitem>
        </references>
        </bibliography>

data/spec/asciidoctor-standoc/section_spec.rb

@@ -563,7 +563,7 @@ RSpec.describe Asciidoctor::Standoc do
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
           <title>Terms and definitions</title><p>For the purposes of this document, the terms and definitions 
-  given in <eref bibitem="iso1234"/> and <eref bibitem="iso5678"/> and the following apply.</p>
+  given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> and the following apply.</p>
   <term id="_">
   <preferred>Term1</preferred>
 </term>
@@ -616,7 +616,7 @@ RSpec.describe Asciidoctor::Standoc do
        <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          <p>For the purposes of this document,
-        the terms and definitions given in <eref bibitem="iso1234"/> and <eref bibitem="iso5678"/> apply.</p>
+        the terms and definitions given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> apply.</p>
 
 
        </terms></sections>
@@ -649,7 +649,7 @@ RSpec.describe Asciidoctor::Standoc do
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
-        <p>Pour les besoins du présent document, les termes et définitions de <eref bibitem="iso1234"/> et <eref bibitem="iso5678"/> s'appliquent.</p>
+        <p>Pour les besoins du présent document, les termes et définitions de <eref bibitemid="iso1234"/> et <eref bibitemid="iso5678"/> s'appliquent.</p>
 
 
        </terms></sections>
@@ -681,7 +681,7 @@ RSpec.describe Asciidoctor::Standoc do
          <p id="_">Foreword</p>
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
-         <title>Terms and definitions</title><p><eref bibitem="iso1234"/>和<eref bibitem="iso5678"/>界定的术语和定义适用于本文件。</p>
+         <title>Terms and definitions</title><p><eref bibitemid="iso1234"/>和<eref bibitemid="iso5678"/>界定的术语和定义适用于本文件。</p>
      
          
          

metadata

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