martile 1.5.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18c6765c2caf1958e7ced7e78348e16fc3368e1f87854c822a45ecbfc66b9b10
-  data.tar.gz: 81b3ae3967ad9604521bf18723f4adf4894e7d26d2d6e0f7d8d603eb930b3285
+  metadata.gz: 2d0189e6255d77ce27db6579973e3891aab3d8a966be6d4e1109b7d63ad214bf
+  data.tar.gz: 9353b7b5dd8827bde94c4732ba4580d9e03cfc1f9dc524ca82bbd12baf142d59
 SHA512:
-  metadata.gz: 5b95868a57546459aa12ea73df25e4963007c49eef727cfc6697c9e6d6cd0d8c15663def19a0e5ef62e6f5c8cdeef95fcd4b008cca704da528bbb10f40e58dfa
-  data.tar.gz: 182633395847fc88e7f9375112a9ff9fe11d8e3956492a37c2f17427b168610ff20e9792ea3b6a4a1caa6b1d922907389be287e1bd9825148569e3a3ab4846ff
+  metadata.gz: 2f6e9d34799b9672639d8f16a5e8eb0431c934f85b89f72d48217fe0ce83f2f4ce3786733bfdef2ffb8a538d1b2c7ba9b699eaae5eab273a19cedaf6c6d94b71
+  data.tar.gz: 669187ab91c6cd7faa15079997b388b96cf25c6613f69e61e7ee496a207c905b58a12965dca1f573c67cd9e4e409a285aef4f5854601f928fc0f05180f203f42

data/lib/martile.rb

@@ -13,8 +13,11 @@ require 'mindmapdoc'
 require 'flowchartviz'
 require 'jsmenubuilder'
 require 'htmlcom'
+require 'rxfhelper'
+require 'mindwords'
 
 
+# feature:  08-Apr-2022 A <mindwords> tag an now be embedded
 # bug fix:  01-Feb-2022 When a Martile document has nomarkdown2 tags applied,
 #                       they will no longer be applied from a
 #                       nested Martile statement
@@ -191,9 +194,10 @@ class Martile
     puts 's240 : ' + s240.inspect if @debug
     s245 = s240.gsub(/\{::nomarkdown2\}/,'').gsub(/\{:2\/\}/,'')
     puts 's245 : ' + s245.inspect if @debug
-    @to_s = s245.to_s
+    s246 = mindwords(s245)
+    @to_s = s246.to_s
 
-    s250 = apply_filter(s245) {|x| nomarkdown x }
+    s250 = apply_filter(s246) {|x| nomarkdown x }
     puts 's250 : ' + s250.inspect if @debug
     s252 = sidenav(s250)
     puts 's252 : ' + s252.inspect if @debug
@@ -458,7 +462,7 @@ class Martile
   def embedtag(s)
 
     s.gsub(/\B!\(((?:https?|rse|dfs):\/\/[^\)]+)\)/) do
-      RXFHelper.read(source=($1)  ).first
+      RXFReader.read(source=($1)  ).first
     end
 
   end
@@ -745,6 +749,35 @@ class Martile
 
     end
 
+
+  def mindwords(s1)
+
+    s = s1.clone
+
+    doc = Rexle.new("<root>#{s}</root>")
+    puts 'doc.root.xml: ' + doc.root.xml.inspect if @debug
+    a = doc.root.xpath('mindwords').map.with_index do |e, i |
+      puts 'e: ' + e.text.inspect if @debug
+      "<pre>%s</pre>" % MindWords.new(e.text).to_outline
+
+    end
+    puts 'mindwords a:' + a.inspect if @debug
+
+    # replaces the <mindwords> XML with HTML
+    a.each do |html|
+
+      istart = s =~ /^<mindwords[^>]*>/
+      iend = s =~ /<\/mindwords>/
+      puts [istart, iend].inspect if @debug
+      s.slice!(istart, (iend - istart) + '</mindwords>'.length + 1)
+      s.insert(istart, html)
+
+    end
+
+    return s
+
+  end
+
   def unordered_list_to_html(s)
     list_to_html s, '\*'
   end
@@ -852,7 +885,7 @@ class Martile
         target = h[:target] || 'pgview'
 
         txt = if h[:src] then
-          RXFHelper.read(h[:src]).first.sub(/<\?links[^>]+>\n/,'')
+          RXFReader.read(h[:src]).first.sub(/<\?links[^>]+>\n/,'')
         else
           doc2.root.text
         end
@@ -1043,7 +1076,7 @@ class Martile
 
       svg = if source =~ /^http/ then
 
-        RXFHelper.read(source).first
+        RXFReader.read(source).first
 
       else
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   6D95KZcJmHrfG4EGldnq07fqQvCHdxjq1Yg3FzORugyyjrO9+L73oxuf6alZi9bk
   ELVtuWI4ASfMFfqxPi48ym1T
   -----END CERTIFICATE-----
-date: 2022-02-01 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yatoc
@@ -61,42 +61,42 @@ dependencies:
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: mindmapdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: flowchartviz
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.7
+- !ruby/object:Gem::Dependency
+  name: mindwords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -163,8 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Martile is a Markdown pre formatter which is designed to format custom Markdown