metanorma-standoc 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 106a6752670de093881dbe34b54de139df3f146de2ffa569db1166734c5a4b5d
-  data.tar.gz: 3185e67d4d921ad7ab77622771fcf70209509b1808afaf651e08ee64059bb7a6
+  metadata.gz: c2d24163148b41a8a3c621702cdb69448ccf743108e18ce07e65998a22636104
+  data.tar.gz: def7d200d381364df0276e4c00870e9871ff95b6e85c508886b71053a3ef015b
 SHA512:
-  metadata.gz: 343159ce51ce6952014f833e571930bf0552726d46a977fc7c0cd7809a3f9cc8f9876db85f5d8857285a038d2f57d08bc253f5a9e6a85c0429fa3db50ade2352
-  data.tar.gz: 0afdde4f04027aba0820d92765d3df52e52603b5bb12a5b2155968eea4f26f7ec25b7908f46e1adc64e728853ad9d42dd547f027f8f3de76c90cb0ae4a2837ba
+  metadata.gz: 13ea1f25bdf8b753740c247f9bfb5613d00690243db0a903d3988bd1d80f20978b9c702cb4212ac83903b00a09e4fbba447d65931cb6255f3b729a7984e51ade
+  data.tar.gz: 2d18df9ae5a96c50bcd5fdea904d1a79aece6c8440d3e7a69e944b68431f69c7b33723a84d7920366806164063cdc7f627592e6ea07e1dda680dc951842b1a3e

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.0.10)
+    metanorma-standoc (1.0.11)
       asciidoctor (~> 1.5.7)
+      concurrent-ruby
       iev (~> 0.2.0)
       isodoc (~> 0.9.0)
-      relaton (~> 0.3.0)
+      relaton (~> 0.3.1)
       ruby-jing
       sterile
 
@@ -23,6 +24,7 @@ GEM
     byebug (10.0.2)
     cnccs (0.1.3)
     coderay (1.1.2)
+    concurrent-ruby (1.1.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -32,7 +34,7 @@ GEM
     ffi (1.9.25)
     formatador (0.2.5)
     gb-agencies (0.0.5)
-    gbbib (0.4.1)
+    gbbib (0.4.2)
       cnccs (~> 0.1.1)
       gb-agencies (~> 0.0.1)
       iso-bib-item (~> 0.4.2)
@@ -70,7 +72,7 @@ GEM
     iev (0.2.0)
       nokogiri
     image_size (2.0.0)
-    iso-bib-item (0.4.3)
+    iso-bib-item (0.4.4)
       isoics (~> 0.1.6)
       nokogiri (~> 1.8.4)
       ruby_deep_clone (~> 0.8.0)
@@ -78,7 +80,7 @@ GEM
       algoliasearch
       iecbib (~> 0.2.1)
       iso-bib-item (~> 0.4.2)
-    isodoc (0.9.10)
+    isodoc (0.9.11)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -100,7 +102,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.3.1)
+    metanorma (0.3.2)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
@@ -126,7 +128,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    relaton (0.3.0)
+    relaton (0.3.1)
       algoliasearch
       gbbib (~> 0.4.0)
       iecbib (~> 0.2.0)

data/README.adoc

@@ -373,6 +373,16 @@ The following terms have non-normative effect, and should be ignored by the amet
 metrical foot consisting of a short, a long, and a short
 --
 
+=== Cross-references to external documents
+
+Metanorma Asciidoctor, like normal Asciidoctor, will process cross-references to
+anchors within external documents. So `<<document1.adoc#b>>` will be processed as a link
+to anchor `#b` in document `document1.adoc`. The `.adoc` suffix is presupposed for
+Asciidoctor documents (as in normal Asciidoctor): it is stripped in Metanorma XML,
+and substituted with the extension of the current document type when rendered. So
+`<<document1.adoc#b>>` is rendered in Metanorma XML as `<xref target="document1#b">`,
+in HTML as `<a href="document1.html#b">`, and in PDF as `<a href="document1.pdf#b">`.
+
 === Sections embedded more than 5 levels
 
 Asciidoctor permits only 5 levels of section embedding (not counting the document title).
@@ -494,8 +504,6 @@ In addition, if any entries in Terms and Definitions cite the International Elec
 the http://www.electropedia.org[IEV Electropedia] termbank is queried during validation, to confirm
 that the cited entries are the same as what is cited online; those queries are routed through the `iev` gem
 
-TODO: update
-
 [[cache]]
 The results of all `relaton` searches done to date, across all documents,
 are cached in the global cache file `~/.relaton/cache`,  
@@ -523,6 +531,7 @@ in the global cache fule `~/iev.pstore`, and the results of all `iev` searches
 done to date for the current document are stored in the same directory as the
 current document, in the file `(filename).iev.pstore`.
 
+[[docattributes]]
 == Document Attributes
 
 The gem relies on Asciidoctor document attributes to provide necessary

data/lib/asciidoctor/standoc/front.rb

@@ -145,6 +145,7 @@ module Asciidoctor
 
       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)

data/lib/asciidoctor/standoc/inline.rb

@@ -31,7 +31,7 @@ module Asciidoctor
         matched = /^fn(:\s*(?<text>.*))?$/.match node.text
         f = matched.nil? ? "inline" : "footnote"
         c = matched.nil? ? node.text : matched[:text]
-        t = node.target.gsub(/^#/, "").gsub(%r{(.)(\.xml)?#.*$}, "\\1")
+        t = node.target.gsub(/^#/, "").gsub(%r{(\.xml|\.adoc)(#.*$)}, "\\2")
         noko do |xml|
           xml.xref **attr_code(target: t, type: f) do |x|
             x << c
@@ -124,6 +124,7 @@ module Asciidoctor
 
             when "strike" then xml.strike node.text
             when "smallcap" then xml.smallcap node.text
+            when "keyword" then xml.keyword node.text
             else
               xml << node.text
             end

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.0.10".freeze
+    VERSION = "1.0.11".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -30,8 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", "~> 0.9.0"
   spec.add_dependency "iev", "~> 0.2.0"
-  spec.add_dependency "relaton", "~> 0.3.0"
+  spec.add_dependency "relaton", "~> 0.3.1"
   spec.add_dependency "sterile"
+  spec.add_dependency "concurrent-ruby"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug"

data/spec/asciidoctor-standoc/inline_spec.rb

@@ -18,6 +18,7 @@ RSpec.describe Asciidoctor::Standoc do
       [domain]#domain#
       [strike]#strike#
       [smallcap]#smallcap#
+      [keyword]#keyword#
     INPUT
             #{BLANK_HDR}
        <sections>
@@ -35,6 +36,7 @@ RSpec.describe Asciidoctor::Standoc do
        <domain>domain</domain>
        <strike>strike</strike>
        <smallcap>smallcap</smallcap>
+       <keyword>keyword</keyword>
        </sections>
        </standard-document>
     OUTPUT
@@ -99,6 +101,7 @@ RSpec.describe Asciidoctor::Standoc do
       Footnoted Reference to <<reference,fn>>
       Inline Reference with Text to <<reference,text>>
       Footnoted Reference with Text to <<reference,fn: text>>
+      Anchored Crossreference to other document <<a.adoc#b>>
     INPUT
        #{BLANK_HDR}
         <sections>
@@ -107,7 +110,8 @@ RSpec.describe Asciidoctor::Standoc do
          <p id="_">Inline Reference to <xref target="reference"/>
        Footnoted Reference to <xref target="reference"/>
        Inline Reference with Text to <xref target="reference">text</xref>
-       Footnoted Reference with Text to <xref target="reference">text</xref></p>
+       Footnoted Reference with Text to <xref target="reference">text</xref>
+       Anchored Crossreference to other document <xref target="a#b"/></p>
        </clause>
        </sections>
        </standard-document>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: sterile
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement