martile 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed9a57222bf42f16dfb93edd2d89b95788d8344
-  data.tar.gz: 1953ad3b9f921fd809dd01e4420fc222e2b47e24
+  metadata.gz: ed3e1957a0c090c496c0e71c27630d957d14969d
+  data.tar.gz: fb8ea8ab7d332fd7327446610e5abc25b0c18894
 SHA512:
-  metadata.gz: f3edb31f8e41c1b83a9e9ddf63af6b3fb4c273aa40b8beff9b543fc7d8b3eb4da3919a6d3bc45af4985bb1f3cec04e9d2bc4cdc173dcc745ba0c5858dc39739a
-  data.tar.gz: ab68a0244d95ad96031e33d2d1719e773dcb64af24eecf3d9eb928ce6c2a415905419f80fa6b26a90a00eb6860eeca60c11e05367d18aec909a82805542434b4
+  metadata.gz: 1f07fd7863ec24b3793e0e0734ade4e233852e13e1ae79a13ebcb0db12c293b31d2e424b5f5e120a1900246fde4b3a3b8bb1c228c85ea3e9361739d2dd9a0437
+  data.tar.gz: 1f8d52b2d6cd2fb69df10885e65ed9368c3680ae8f96ae49b2658b2da4134dd8681b6057f67b5c77346987afd125b78679f9ae759c742429c512d84e3da052dc

data/lib/martile.rb

@@ -9,6 +9,7 @@ require 'rdiscount'
 require 'kvx'
 
 
+# feature:   8-Sep-2017 An SVG object can now rendered from !s[]()
 # feature:   6-Sep-2017 The preparation of a Dynarex table in Markdown is now 
 #                       done from the Dynarex object
 # bug fix:  13-Aug-2017  bug fixes: A markdown table is no longer interpreted 
@@ -107,10 +108,11 @@ class Martile
     s18 = apply_filter(s17) {|x| hyperlinkify x }
     s19 = apply_filter(s18) {|x| highlight x }
     s20 = apply_filter(s19) {|x| details x }
+    s21 = apply_filter(s20) {|x| svgtag x }
     
     #puts 's17 : ' + s17.inspect
     
-    @to_s = s20
+    @to_s = s21
   end
   
   def to_html()
@@ -368,17 +370,21 @@ class Martile
   
   def dx_render_table(dx, raw_select)
   
-    fields, markdown, heading = nil, true, true
+    fields, markdown, heading, inner = nil, true, true, true
     
     if raw_select then
+
       raw_fields = raw_select[/select:\s*["']([^"']+)/,1]
+      
       fields = raw_fields.split(/\s*,\s*/) if raw_fields
       inner = false if raw_select[/\bmarkdown:\s*false\b/]
       heading = false if raw_select[/\bheading:\s*false\b/]
+
     end
     
 
-    dx.to_table(markdown: true, innermarkdown: inner, heading: heading)
+    dx.to_table(markdown: true, fields: fields, innermarkdown: inner, 
+                heading: heading)
   end  
   
   def dx_render_table2(dx, raw_select)
@@ -519,7 +525,7 @@ class Martile
   
   def highlight(s)
 
-    s.gsub(/\^\w+\^/) {|x| "<mark>%s</mark>" % x[1..-2] }
+    s.gsub(/\^[\w ]+\^/) {|x| "<mark>%s</mark>" % x[1..-2] }
 
   end  
   
@@ -590,6 +596,15 @@ class Martile
     a2.join
   end
   
+  def svgtag(s)
+    
+    s.gsub(/\B!s\[\]\((https?:\/\/[^\)]+)\)/) do |match, bo|
+      "<object data='#{$1}' type='image/svg+xml'></object>"
+    end    
+
+  end
+  
+  
   def videotag(s)
     
     s.gsub(/\B!v\[\]\((https?:\/\/[^\)]+)\)(\{[^\}]+\})?/) do |match|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   ta+wi0WcePPmMfSbCGQcYixXdM6qZvflWMz0AK44eQcm6OymMXgMQG6GvHPAl6s2
   ASPGReskINIIrA==
   -----END CERTIFICATE-----
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
@@ -62,7 +62,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.23
+        version: 1.7.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.23
+        version: 1.7.24
 - !ruby/object:Gem::Dependency
   name: kvx
   requirement: !ruby/object:Gem::Requirement