slaw 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f461d44372208bc42f6cedb31c28b4cf8953c58d
-  data.tar.gz: cc3e56f02927e80e96aacfb67b19b3be88c64836
+  metadata.gz: 9743f6466d2fd51cf2b0ed43330c8eecc7855541
+  data.tar.gz: 00a887ed43d64cd0788cda9ebe75be7c8a1af9aa
 SHA512:
-  metadata.gz: 17ba42c10bd5fb2efaf5bec9e9570efb0cbd840c974d0ccf69509114358a9bc4370385d07d4ec18d685c39f96c61899790fdd101d30df69596e634875ebcac9b
-  data.tar.gz: 8c47909bbe42bd51b6fb0ebb46893b4808340e8259aa79721ed1516f8dfd9740e7873a5ba65451245505d8890be26a61bc10aec7ce9f29af2766d1ef74314d27
+  metadata.gz: b2d31f8d468e1dda7b0ee056d12c83fd31cac8e0c647f3a9526dc543ae34a52a5ddb8d3b3299eba310ca5e7fe437594c4686d93570348f16dc98eceba4ad54fe
+  data.tar.gz: 93b9c10f53b69c939b1a90347355561ab07af581aee1f155415a937a55f8f3238a03a4e31c859fdea895aa1bd8f9023f472ec82bfe87c1b6d4c109c8c8f1d630

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
 before_install:
   - gem update bundler

data/README.md

@@ -218,6 +218,10 @@ Akoma Ntoso `component` elements at the end of the XML document, with a name of
 
 ## Changelog
 
+### 0.14.1
+
+* Support links in remarks
+
 ### 0.14.0
 
 * Support inline image tags, using Markdown syntax: \![alt text](image url)

data/lib/slaw/version.rb

@@ -1,3 +1,3 @@
 module Slaw
-  VERSION = "0.14.0"
+  VERSION = "0.14.1"
 end

data/lib/slaw/za/act.treetop

@@ -215,7 +215,7 @@ module Slaw
       end
 
       rule remark
-        '[[' content:(!']]' .)+ ']]'
+        '[[' content:(ref / (!']]' .))+ ']]'
         <Remark>
       end
 

data/lib/slaw/za/act_nodes.rb

@@ -308,7 +308,17 @@ module Slaw
 
       class Remark < Treetop::Runtime::SyntaxNode
         def to_xml(b, idprefix)
-          b.remark('[' + content.text_value + ']', status: 'editorial')
+          b.remark(status: 'editorial') do |b|
+            b << '['
+            for e in content.elements
+              if e.respond_to? :to_xml
+                e.to_xml(b, idprefix)
+              else
+                b << e.text_value
+              end
+            end
+            b << ']'
+          end
         end
       end
 

data/spec/za/act_inline_spec.rb

@@ -274,6 +274,21 @@ EOS
       </item>
     </blockList>
   </content>
+</paragraph>'
+    end
+
+    it 'should handle a link in an inline remark' do
+      node = parse :block_paragraphs, <<EOS
+      This statement has [[a [link in](/foo/bar) a remark]]
+      This statement has [[[a link in](/foo/bar) a remark]]
+      This statement has [[a [link in a remark](/foo/bar)]]
+EOS
+      to_xml(node, "").should == '<paragraph id="paragraph-0">
+  <content>
+    <p>This statement has <remark status="editorial">[a <ref href="/foo/bar">link in</ref> a remark]</remark></p>
+    <p>This statement has <remark status="editorial">[<ref href="/foo/bar">a link in</ref> a remark]</remark></p>
+    <p>This statement has <remark status="editorial">[a <ref href="/foo/bar">link in a remark</ref>]</remark></p>
+  </content>
 </paragraph>'
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slaw
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Greg Kempe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler