martile 1.4.6 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3072339279e9010415dab6b0aac593b625ad7fddce9895449cdf90d750ad6e82
-  data.tar.gz: b32add46e7c651c1311778ca3ca25eaa8e171540d4bab14f23404218ad750730
+  metadata.gz: 18c6765c2caf1958e7ced7e78348e16fc3368e1f87854c822a45ecbfc66b9b10
+  data.tar.gz: 81b3ae3967ad9604521bf18723f4adf4894e7d26d2d6e0f7d8d603eb930b3285
 SHA512:
-  metadata.gz: 8a52f3f5dec66a4c3b8c696657285c5e18ddd6ebcd76d2f0c26b02a9ca0f0d6374c93973a87374281e736aaec3b0e5d89ee763b2d00905768cd614f41ead6c39
-  data.tar.gz: 5faf6a84bc1b8b587674c9b74677ff5a25ae343d225e735bf652dd37fd465fe883e30e0e5177672f74b33121c397c3df2d168d1435ff25a20d773d1057bd474f
+  metadata.gz: 5b95868a57546459aa12ea73df25e4963007c49eef727cfc6697c9e6d6cd0d8c15663def19a0e5ef62e6f5c8cdeef95fcd4b008cca704da528bbb10f40e58dfa
+  data.tar.gz: 182633395847fc88e7f9375112a9ff9fe11d8e3956492a37c2f17427b168610ff20e9792ea3b6a4a1caa6b1d922907389be287e1bd9825148569e3a3ab4846ff

data/lib/martile.rb

@@ -15,9 +15,12 @@ require 'jsmenubuilder'
 require 'htmlcom'
 
 
+# bug fix:  01-Feb-2022 When a Martile document has nomarkdown2 tags applied,
+#                       they will no longer be applied from a
+#                       nested Martile statement
 # feature:  01-Sep-2020 Introduced the nomarkdown tag and nomarkdown2 tag.
-#                       The nomarkdown2 tag has the advantage of being used 
-#                       inside tags which other Markdown parse don't read. 
+#                       The nomarkdown2 tag has the advantage of being used
+#                       inside tags which other Markdown parse don't read.
 #                       The tag will remove itself before completion to_s.
 # feature:  08-Aug-2020 Implemented #to_Webpage
 # improvement:  23-Apr-2020 A self-closing sidenav tag is now valid
@@ -25,61 +28,61 @@ require 'htmlcom'
 # feature:  29-Feb-2020 The sidenav tag can now contain a raw hierachical list
 # feature:  22-Jan-2020 An HtmlCom::Accordion component can now be generated
 #                       using the tag <accordion>
-# feature:  16-Sep-2019 An HTML Tree component can now be generated when 
+# feature:  16-Sep-2019 An HTML Tree component can now be generated when
 #                       the tag <sidebar/> is used
 # feature:  16-Jul-2019 An HTML Tabs component can now be created from XML
 #                       XML can now be created using !tag notation e.g. !tabs
 # feature:  05-May-2019 Dimensions can now be supplied for an iframe
 # improvment: 06-Mar-2019 Checks for mindmap tags outside of other tags
-# feature:  03-Mar-2019 A high level mindmap with associated doc can now be 
+# feature:  03-Mar-2019 A high level mindmap with associated doc can now be
 #                       easily created using the -mm---identifier
-# bug fix:  25-Feb-2019 The section content is now rendered using to_s 
+# bug fix:  25-Feb-2019 The section content is now rendered using to_s
 #                       instead of to_html
-# feature:  16-Feb-2019 A hidden field cam now be rendered using 
-#                       the syntax [? name: value]                       
-# feature:  11-Feb-2019 An apostrophe used between words is now preserved 
+# feature:  16-Feb-2019 A hidden field cam now be rendered using
+#                       the syntax [? name: value]
+# feature:  11-Feb-2019 An apostrophe used between words is now preserved
 #                       from Kramdown HTML rendering
-# feature:  23-Dec-2018 A SectionX or KVX object can now be referenced 
+# feature:  23-Dec-2018 A SectionX or KVX object can now be referenced
 #                       from interpolated variables
-# feature:  17-Dec-2018 Now automatically generates a toc when there are 3 
+# feature:  17-Dec-2018 Now automatically generates a toc when there are 3
 #                       sections or more
 # feature:   3-Oct-2018 An embed tag can now be used to dynamically load content
-# bug fix:  26-Sep-2018 An extra new line is added after a code block to 
-#                       ensure the line directly below it is transformed to 
+# bug fix:  26-Sep-2018 An extra new line is added after a code block to
+#                       ensure the line directly below it is transformed to
 #                       HTML correctly.
-# bug fix:  23-Sep-2018 mindmap tag is now properly 
+# bug fix:  23-Sep-2018 mindmap tag is now properly
 #                       transformed before parse__data__
 # feature:  23-Jul-2018 An HTML form can now be generated
-# feature:  12-Feb-2018 Transforms <mindmap> tags into a 
+# feature:  12-Feb-2018 Transforms <mindmap> tags into a
 #                       mindmap + related headings
 # feature:   8-Feb-2018 A section attribute id can now include a dash (-).
-#                       Markdown inside a section element is no longer 
+#                       Markdown inside a section element is no longer
 #                       rendered by RDiscount
-# minor improvement: 29-Sep-2017 A Markdownviz or Flowchartviz embedded 
+# minor improvement: 29-Sep-2017 A Markdownviz or Flowchartviz embedded
 #                 document can now be declared without the word viz at the end.
-# feature:  21-Sep-2017 A qrcode can now be rendered 
+# feature:  21-Sep-2017 A qrcode can now be rendered
 #                         e.g. !q[](http://github.com)
 # feature:  16-Sep-2017 A Flowchartviz raw document can now be embedded
 # feature:   9-Sep-2017 A Mindmapviz raw document can now be embedded
 # feature:   8-Sep-2017 An SVG doc can now be embedded from !s[]()
-# feature:   6-Sep-2017 The preparation of a Dynarex table in Markdown is now 
+# 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 
-#                       as <code> and a string containig a caret is no longer 
-#                       interpreted as <nark> if it contains non 
+# bug fix:  13-Aug-2017  bug fixes: A markdown table is no longer interpreted
+#                       as <code> and a string containig a caret is no longer
+#                       interpreted as <nark> if it contains non
 #                       alphanumerical characters.
-# feature:  28-May-2017  Within the context of an embedded Dynarex table, 
+# feature:  28-May-2017  Within the context of an embedded Dynarex table,
 #  the nomarkdown extension was wrapped around the inner HTML for each column
-#                        
+#
 #                        Return characters are now stripped out.
 #
-#                        An embeded Dynarex table contents are now rendered to 
+#                        An embeded Dynarex table contents are now rendered to
 #                        Markdown by default
-# feature:  11-Mar-2017  A details and summary tag can now be generated from +> 
+# feature:  11-Mar-2017  A details and summary tag can now be generated from +>
 #                        e.g.
 #                        !+
 #                        This a paragraph
-# 
+#
 #                        ----------------
 #
 #                        * something
@@ -94,52 +97,64 @@ class Martile
 
   attr_reader :to_s, :to_html, :data_source
 
-  def initialize(raw_s='', ignore_domainlabel: nil, toc: true, debug: false, 
-                 log: nil)
+  # embedded: Is the Martile object being run inside another Martile object?
+  #
+  def initialize(raw_s='', ignore_domainlabel: nil, toc: true,
+                 embedded: false, debug: false, log: nil)
 
 
     @debug = debug
     @data_source = {}
-    
+
     @ignore_domainlabel, @log = ignore_domainlabel, log
-    
+
     @css, @js = [], []
 
     raw_s.gsub!("\r",'')
-    
+
     mmd = MindmapDoc.new(debug: debug)
     s5 = apply_filter(raw_s) {|x| mmd.to_mmd(x) }
     s10 = apply_filter(s5) {|x| mmd.transform(s5) }
     #puts 's10: ' + s10.inspect if debug
     #s10 = raw_s
     s20 = s10 =~ /^__DATA__$/ ? parse__data__(s10) : s10
-    puts ('s20: ' + s20.inspect).debug if debug    
-    
+    puts ('s20: ' + s20.inspect).debug if debug
+
     s30 = apply_filter(s20) {|x| slashpre x }
+    puts ('s30: ' + s30.inspect).debug if @debug
+
     #puts 's1 : ' + s1.inspect
     s40 = apply_filter(s30) {|x| code_block_to_html(x.strip + "\n") }
+    puts ('s40: ' + s40.inspect).debug if @debug
+
+    s45 = if !embedded then
+      s40.gsub(/<pre[^>]*>/,'\0{::nomarkdown2}').gsub(/<\/pre>/,'{:2/}\0')
+    else
+      s40
+    end
+    puts ('s45: ' + s45.inspect).debug if @debug
 
-    s45 = s40.gsub(/<pre[^>]*>/,'\0{::nomarkdown2}').gsub(/<\/pre>/,'{:2/}\0')
     #puts 's2 : ' + s2.inspect
     #s3 = apply_filter(s2, %w(ol ul)) {|x| explicit_list_to_html x }
     #puts 's3 : ' + s3.inspect
     s50 = apply_filter(s45) {|x| ordered_list_to_html x }
-    #puts 's4 : ' + s4.inspect
+    puts ('s50: ' + s50.inspect).debug if @debug
 
     s60 = apply_filter(s50) {|x| unordered_list_to_html x }
-    #puts 's5 : ' + s5.inspect
+    puts ('s60: ' + s60.inspect).debug if @debug
 
     s70 = apply_filter(s60) {|x| dynarex_to_markdown x }
-    #puts 's6 :' + s6.inspect
+    puts ('s70: ' + s70.inspect).debug if @debug
 
     s80 = apply_filter(s70) {|x| table_to_html x }
-    #puts 's7 : ' + s7.inspect
+    puts ('s80: ' + s80.inspect).debug if @debug
 
     s90 = apply_filter(s80) {|x| underline x}
     puts ('s90: ' + s90.inspect).debug if @debug
+
     s100 = apply_filter(s90) {|x| section x }
     puts ('s100: ' + s100.inspect).debug if @debug
-    
+
     s110 = apply_filter(s100) {|x| smartlink x }
 
     puts 's110: ' + s110.inspect if @debug
@@ -147,69 +162,82 @@ class Martile
     #s11 = section s9
     #puts 's11 : ' + s11.inspect
     s120 = apply_filter(s110) {|x| audiotag x }
-    #puts 's12 : ' + s12.inspect
+    puts 's120 : ' + s120.inspect if @debug
     s130 = apply_filter(s120) {|x| videotag x }
-    #puts 's13 : ' + s13.inspect
+    puts 's130 : ' + s130.inspect if @debug
     s140 = apply_filter(s130) {|x| iframetag x }
-    #puts 's14 : ' + s14.inspect
+    puts 's140 : ' + s140.inspect if @debug
     s150 = apply_filter(s140) {|x| kvx_to_dl x }
-    #puts 's15 : ' + s15.inspect
+    puts 's150 : ' + s150.inspect if @debug
     s160 = apply_filter(s150) {|x| list_item_to_hyperlink x }
+    puts 's160 : ' + s160.inspect if @debug
     s165 = apply_filter(s160) {|x| formify x }
-    #puts 's16 : ' + s16.inspect
+    puts 's165 : ' + s165.inspect if @debug
     s170 = apply_filter(s165) {|x| mtlite_utils x }
+    puts 's170 : ' + s170.inspect if @debug
     s180 = apply_filter(s170) {|x| hyperlinkify x }
+    puts 's180 : ' + s180.inspect if @debug
     s190 = apply_filter(s180) {|x| highlight x }
+    puts 's190 : ' + s190.inspect if @debug
     s200 = apply_filter(s190) {|x| details x }
+    puts 's200 : ' + s200.inspect if @debug
     s210 = apply_filter(s200) {|x| qrcodetag x }
+    puts 's210 : ' + s210.inspect if @debug
     s220 = apply_filter(s210) {|x| svgtag x }
+    puts 's220 : ' + s220.inspect if @debug
     s230 = apply_filter(s220) {|x| embedtag x }
+    puts 's230 : ' + s230.inspect if @debug
     s240 = apply_filter(s230) {|x| script_out x }
+    puts 's240 : ' + s240.inspect if @debug
     s245 = s240.gsub(/\{::nomarkdown2\}/,'').gsub(/\{:2\/\}/,'')
+    puts 's245 : ' + s245.inspect if @debug
     @to_s = s245.to_s
-    
+
     s250 = apply_filter(s245) {|x| nomarkdown x }
+    puts 's250 : ' + s250.inspect if @debug
     s252 = sidenav(s250)
+    puts 's252 : ' + s252.inspect if @debug
     s253 = bang_xml(s252)
-    puts ('s235 after bang_xml: ' + s253.inspect).debug if @debug
+    puts ('s253 after bang_xml: ' + s253.inspect).debug if @debug
 
     s255 = tabs(s253)
     puts ('s255 after tabs: ' + s255.inspect).debug if @debug
-    
+
     s257 = accordion(s255)
-    
-    toc = false if s257 =~ /class=['"]sidenav['"]>/ 
-    
+    puts 's257 : ' + s257.inspect if @debug
+
+    toc = false if s257 =~ /class=['"]sidenav['"]>/
+
     s260 = if toc then
       Yatoc.new(Kramdown::Document.new(s257).to_html, debug: debug).to_html
     else
       s257
     end
-    
-    puts ('s260: '  + s260.inspect).debug if debug        
+
+    puts ('s260: '  + s260.inspect).debug if debug
     #puts 's17 : ' + s17.inspect
 
     @to_html = s260
-    
+
   end
-  
+
   def create_form(s)
 
     a = LineTree.new(s, ignore_blank_lines: true).to_a
-        
+
     def create_form_input(raw_name)
 
       name = raw_name.downcase[/\w+/]
       type =  name =~ /password/ ? :password : :text
 
-      ['div', {}, 
-        ['label', {for: name}, raw_name], 
+      ['div', {},
+        ['label', {for: name}, raw_name],
         ['input', {type: type, id: name, name: name}]
       ]
     end
-    
+
     a2 = a[0][1..-1].select {|x| x[0] =~ /[^:]+\:/}.map do |items|
-            
+
       line = items[0]
       case line
       when /^\w/
@@ -228,21 +256,21 @@ class Martile
     doc = Rexle.new(a2)
     doc.root.element('div/input').attributes['autofocus'] = 'true'
     doc.xml pretty: true, declaration: false
-    
+
   end
-  
+
   def to_css()
     @css.join("\n")
   end
-  
+
   def to_js()
     @js.join("\n")
   end
-  
+
   def to_webpage()
 
     a = RexleBuilder.build do |xml|
-      xml.html do 
+      xml.html do
         xml.head do
           xml.meta name: "viewport", content: \
               "width=device-width, initial-scale=1"
@@ -252,58 +280,58 @@ class Martile
       end
     end
 
-    doc = Rexle.new(a)    
-    
+    doc = Rexle.new(a)
+
     doc.root.element('body').add \
-        Rexle::Element.new('script').add_text "\n" + 
+        Rexle::Element.new('script').add_text "\n" +
         @js.join("\n").gsub(/^ +\/\/[^\n]+\n/,'')
-    
+
     "<!DOCTYPE html>\n" + doc.xml(pretty: true, declaration: false)\
         .gsub(/<\/div>/,'\0' + "\n").gsub(/\n *<!--[^>]+>/,'')
-       
+
   end
-  
+
   private
-  
+
   def accordion(s1)
-    
+
     s = s1.clone
-    
+
     doc = Rexle.new("<root>#{s}</root>")
     puts 'doc.root.xml: ' + doc.root.xml.inspect if @debug
     a = doc.root.xpath('accordion').map.with_index do |e, i |
-      
+
       build = HtmlCom::Accordion.new(e.xml, debug: false)
-      
+
       if i < 1 then
-        @css << build.to_css 
+        @css << build.to_css
         @js << build.to_js
       end
-      
+
       build.to_html
-      
-      
+
+
     end
     puts 'accordion a:' + a.inspect if @debug
 
     # replaces the <accordion> XML with HTML
     a.each do |html|
-      
+
       istart = s =~ /^<accordion[^>]*>/
       iend = s =~ /<\/accordion>/
       s.slice!(istart, (iend - istart) + '</accordion>'.length + 1)
       s.insert(istart, html)
-      
+
     end
-    
+
     return s
-    
-  end  
-  
+
+  end
+
   def audiotag(s)
-    
+
     s.gsub(/\B!a\[\]\((https?:\/\/[^\)]+)\)\B/) do |x|
-      
+
       files = ($1).split
 
       h = {/\.ogg$/ => 'ogg', /\.wav$/ => 'wav', /\.mp3$/ => 'mp3' }
@@ -314,17 +342,17 @@ class Martile
       end
 
       "<audio controls='controls'>\n%s\n</audio>" % [sources.join("\n")]
-    end    
+    end
 
   end
-  
+
   def bang_xml(s)
 
-    indent = -> (line) { '  ' + line }    
-    a = s.split(/(?=^\!\w+)/)    
-    
+    indent = -> (line) { '  ' + line }
+    a = s.split(/(?=^\![a-zA-Z]+)/)
+
     a.map do |s|
-      
+
       if s =~ /^!!/ then
 
         parent, children = s.split(/^!!/,2)
@@ -337,18 +365,18 @@ class Martile
       else
         s
       end
-      
+
     end.join
   end
 
   def code_block_to_html(s)
 
-    
-    s.split(/(?=<pre>)/).map do |s2|      
-      
+
+    s.split(/(?=<pre>)/).map do |s2|
+
       if s2[0] != '<' then
-        
-        s.lines.chunk {|x| x =~ /^\n|^    |\n/ }.map do |_, x| 
+
+        s2.lines.chunk {|x| x =~ /^\n|^    |\n/ }.map do |_, x|
 
           if x.join.lstrip[/^    /] then
             "\n<pre><code>%s</code></pre>\n\n" % escape(x.join.gsub(/^ {4}/,''))
@@ -361,18 +389,18 @@ class Martile
       else
         s2
       end
-      
+
     end.join
-      
+
 
   end
 
   def details(s)
-    
+
     puts ('inside details: ' + s.inspect).debug if @debug
-    
+
     s.split(/(?=\!\+)/).map do |x|
-      
+
       if x =~ /\!\+/ then
 
         x[2..-1].sub(/(.*)[^\+]+\n\+/m) do |x2|
@@ -382,23 +410,23 @@ class Martile
               [summary, Martile.new(detail.chop).to_html]
 
         end
-        
+
       else
         x
       end
     end.join
 
   end
-  
+
   def dynarex_to_markdown(s)
-    
+
     s.gsub(/!d\[\]\(((#\w+|https?:\/\/)?[\w\/\.\-]+)\)(\{[^\}]+\})?/) do |match|
 
       source = ($1)
       raw_select = ($3)
 
       dx = if source =~ /^http/ then
-        Dynarex.new(source)      
+        Dynarex.new(source)
       else
         @data_source[source[/\w+/]]
       end
@@ -426,43 +454,43 @@ class Martile
     end
 
   end
-  
+
   def embedtag(s)
-    
-    s.gsub(/\B!\(((?:https?|rse|dfs):\/\/[^\)]+)\)/) do                         
-      RXFHelper.read(source=($1)  ).first        
+
+    s.gsub(/\B!\(((?:https?|rse|dfs):\/\/[^\)]+)\)/) do
+      RXFHelper.read(source=($1)  ).first
     end
 
   end
-  
-  
+
+
   def escape(s)
     s.gsub('<','&lt;').gsub('>','&gt;')
   end
-  
+
   def formify(s)
-    
+
     s.split(/(?=\n\w+)/).map do |s|
-      
+
       if s =~ /(?=\w+\n\n*  \w+: +\[ +\])/ then
         create_form(s)
       else
         s
       end
-      
+
     end.join
-    
+
   end
-  
+
   def iframetag(s)
-    
+
     s.gsub(/\B!i\[\]\((https?:\/\/[^\)]+)\)(\{[^\}]+\})?/) do |x|
-      
+
       url = ($1)
       attr = ($2)
 
       h = attr ? attr.scan(/(\w+):\s+['"]?(\w+)?/).to_h : {}
-      attributes = h.any? ? (' ' + 
+      attributes = h.any? ? (' ' +
                             h.map {|k,v| "%s='%s'" % [k,v]}.join(' ')) : ''
 
       "<iframe src='%s'%s></iframe>" % [url, attributes]
@@ -470,8 +498,8 @@ class Martile
 
 
   end
-  
-  
+
+
 
   def list_to_html(s,symbol='#')
 
@@ -479,11 +507,11 @@ class Martile
     tag = {'#' => 'ol', '\*' => 'ul'}[symbol]
 
     s.split(/(?=\[#{symbol}|^#{symbol*2})/).map do |x|
-      
+
       if x.strip.length > 0 then
         s2, remainder = [x[/\[#{symbol}.*#{symbol}[^\]]+\]/m], ($').to_s]
       end
-      
+
       if s2 then
 
         raw_list = s2[1..-2].split(/^#{symbol}/).reject(&:empty?).map(&:strip)
@@ -492,23 +520,23 @@ class Martile
                   ignore_domainlabel: @ignore_domainlabel).to_html)\
                                              .to_html[/<p>(.*)<\/p>/,1]}.join
         list + remainder.to_s
-        
+
       else
-        
+
         x
-        
+
       end
-      
+
     end.join
 
   end
-  
+
   def filter_on(s)
 
     @filter = []
 
     a = s.split(/(?=\{::nomarkdown2?\})/).map.with_index do |row, i|
-      
+
       row.sub(/\{::nomarkdown2?\}.*{:2?\/}/m) do |pattern|
         placeholder = '!' + Time.now.to_i.to_s + i.to_s
         @filter << [placeholder, pattern]
@@ -518,11 +546,11 @@ class Martile
     end
 
     a.join
-    
-  end  
-  
+
+  end
+
   def filter_off(raw_s)
-    
+
     s = raw_s.clone
     @filter.each {|id, x| s.sub!(id, x) }
     return s
@@ -530,14 +558,14 @@ class Martile
   end
 
   def apply_filter(s)
-    
+
     s1 = filter_on(s)
     s2 = yield s1
     s3 = filter_off s2
-    
+
     return s3
   end
-  
+
 
   def explicit_list_to_html(s)
 
@@ -562,25 +590,25 @@ class Martile
     else
       s
     end
-    
+
   end
-  
+
   def hyperlinkify(s)
-    
+
    s.gsub(/\[([^\[]+)\]\(([^\)]+\)\)?\))/) do |x|
       "<a href='#{$2.chop}'>#{$1}</a>"
     end
 
   end
-    
-  
+
+
   def mtlite_utils(s)
-    
+
     # convert square brackets to unicode check boxes
-    # replaces a [] with a unicode checkbox, 
+    # replaces a [] with a unicode checkbox,
     #                         and [x] with a unicode checked checkbox
     s2 = s.gsub(/\s\[ {0,1}\]\s/,' &#9744; ').gsub(/\s\[x\]\s/,' &#9745; ')
-    
+
     # create domain labels for hyperlinks
     #
     s3 =  s2.gsub(/(?:^\[|\s\[)[^\]]+\]\((https?:\/\/[^\s]+)/) do |x|
@@ -596,60 +624,60 @@ class Martile
     # e.g. -milk cow- becomes <del>milk cow</del>
     s3.gsub(/\s-[^-]+-?[^-]+-[\s\]]/) do |x|
       x.sub(/-([&\w]+.*\w+)-/,'<del>\1</del>')
-    end    
+    end
 
   end
-  
+
   def nomarkdown(s)
     s.gsub(/\b'\b/,"{::nomarkdown}'{:/}")
   end
-  
+
   def qrcodetag(s)
-    
-    s.gsub(/\B!q\[\]\((https?:\/\/[^\)]+)\)/) do 
-      
-      svg = RQRCode::QRCode.new($1).as_svg     
+
+    s.gsub(/\B!q\[\]\((https?:\/\/[^\)]+)\)/) do
+
+      svg = RQRCode::QRCode.new($1).as_svg
       svg.slice!(/.*(?=<svg)/m)
-      
+
       svg
     end
 
-  end  
-  
+  end
+
   def ordered_list_to_html(s)
     list_to_html s, '#'
   end
-  
+
   def dx_render_table(dx, raw_select)
-  
+
     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, fields: fields, innermarkdown: inner, 
+
+    dx.to_table(markdown: true, fields: fields, innermarkdown: inner,
                 heading: heading)
-  end  
-  
+  end
+
   def dx_render_table2(dx, raw_select)
-    
+
       markdown, heading = true, true
-      
+
       if raw_select then
         raw_fields = raw_select[/select:\s*["']([^"']+)/,1]
         fields = raw_fields.split(/\s*,\s*/) if raw_fields
         markdown = false if raw_select[/\bmarkdown:\s*false\b/]
         heading = false if raw_select[/\bheading:\s*false\b/]
       end
-      
+
       print_row = -> (row, widths) do
         '| ' + row.map\
             .with_index {|y,i| y.to_s.ljust(widths[i])}.join(' | ') + " |\n"
@@ -667,12 +695,12 @@ class Martile
 
 
       flat_records = raw_select ? dx.to_a(select: fields) : dx.to_a
-      
+
       keys = flat_records.map(&:keys).first
       raw_vals = flat_records.map(&:values)
-      
+
       # create Markdown hyperlinks for any URLs
-      
+
       vals = raw_vals.map do |row|
 
         row.map do |col|
@@ -688,35 +716,35 @@ class Martile
             url_title = (a.join('.') + path)[0..39] + '...'
 
             "[%s](%s)" % [url_title, col]
-            
+
           else
-            
-            if markdown then 
-              "{::nomarkdown}" + 
+
+            if markdown then
+              "{::nomarkdown}" +
                   RDiscount.new(col).to_html.strip.gsub("\n",'') + "{:/}"
             else
 
               col
-              
+
             end
-            
+
           end
-          
+
           r
         end
-      end      
+      end
 
       widths = ([keys] + vals).transpose.map{|x| x.max_by(&:length).length}
-      
-            
+
+
       th = heading  ? print_row.call(keys, widths) : ''
-      th_line = print_thline.call widths.map {|x| '-' * (x+1)}, widths        
-      tb = print_rows.call(vals, widths)      
-        
+      th_line = print_thline.call widths.map {|x| '-' * (x+1)}, widths
+      tb = print_rows.call(vals, widths)
+
       table = th + th_line + tb
-      
+
     end
-  
+
   def unordered_list_to_html(s)
     list_to_html s, '\*'
   end
@@ -724,131 +752,131 @@ class Martile
   def parse__data__(s)
 
     puts 'inside parse__data__'.info if @debug
-    
+
     a = s.split(/^__DATA__$/,2)
 
     data = a[-1]
-    
+
     links, locals = data.split(/(?=<)/, 2)
-    
+
     links.strip.split("\n").each do |line|
-      
+
       puts ('line:'  + line.inspect).debug if @debug
       next if line.nil?
-      
+
       id, url = line.split(/:\s+/,2)
       puts 'id: ' + id.inspect if @debug
       puts 'url: ' + url.inspect if @debug
-      
+
       obj, _ = RXFHelper.read(url, auto: true)
       define_singleton_method(id.to_sym) { @data_source[id] }
-      @data_source[id] = obj 
-      
+      @data_source[id] = obj
+
     end
-    
+
     puts 'before locals' if @debug
-    
+
     locals ||= ''
-    
+
     locals.split(/(?=<\?)/).each do |x|
 
       puts ('__data__ x: ' + x.inspect).debug if @debug
-      
+
       s2 = x.strip
       next if s2.empty?
-      
+
       id = s2.lines.first[/id=["']([^"']+)/,1]
-      
-      @data_source[id] = case s2 
+
+      @data_source[id] = case s2
       when /^<\?dynarex /
-        
+
         dx = Dynarex.new
         dx.import s2
         dx
-        
+
       when /^<\?mindmap(?:viz)? /
         puts 's2: ' + s2.inspect if @debug
         Mindmapviz.new s2
-        
+
       when /^<\?flowchart(?:viz)? /
-        
-        Flowchartviz.new s2        
-        
+
+        Flowchartviz.new s2
+
       when /^<\?graphvizml /
-        
-        GraphVizML.new s2        
-                
+
+        GraphVizML.new s2
+
       when /^<\?pxgraphviz /
         puts 'before PxGraphViz.new'.info if @debug
-        PxGraphViz.new s2, debug: @debug                        
-                
+        PxGraphViz.new s2, debug: @debug
+
       when /^<\?depviz /
-        
-        DepViz.new s2          
-        
+
+        DepViz.new s2
+
       when /^<\?sectionx /
-        
+
         sx = SectionX.new
         sx.import s2
         define_singleton_method(id.to_sym) { @data_source[id] }
         sx
-        
+
       when /^<\?kvx /
-        
+
         kvx = Kvx.new s2
 
         define_singleton_method(id.to_sym) { @data_source[id] }
-        kvx        
-        
-      end    
+        kvx
+
+      end
     end
-    
+
     a[0..-2].join
-    
+
   end
-  
+
   def sidenav(s1)
-    
+
     s = s1.clone
     if s =~ /^<sidenav/ then
-      
+
       content = s[/(<sidenav[^>]+\/>|<sidenav[^>]+>([^<]*<[^>]+>)?)/]
       puts ('content: ' + content.inspect) if @debug
-      
+
       doc = if content then
-      
+
         s.sub!(content,'')
         doc2 = Rexle.new(content)
-        
+
         h = doc2.root.attributes
         target = h[:target] || 'pgview'
-        
+
         txt = if h[:src] then
           RXFHelper.read(h[:src]).first.sub(/<\?links[^>]+>\n/,'')
         else
           doc2.root.text
         end
-    
+
         puts 'txt: ' + txt.inspect if @debug
-        
+
         html = HtmlCom::Tree.new(txt).to_webpage
-        puts 'html: ' + html.inspect if @debug        
-        
+        puts 'html: ' + html.inspect if @debug
+
         doc2 = Rexle.new(html)
-        
+
         doc2.root.xpath('body/ul[@class="sidenav"]/li//a').each do |node|
           node.attributes[:target] = target
         end
-        
+
         doc2
-        
+
       else
         s.sub!(/^<sidenav\/>/,'')
         html = HtmlCom::Tree.new(s).to_webpage
         Rexle.new(html)
       end
-      
-      
+
+
       html2 = Kramdown::Document.new(Martile.new(s, toc: false).to_html)\
         .to_html
       div = Rexle.new("<div class='main'>%s</div>" % html2)
@@ -862,7 +890,7 @@ class Martile
   end
 
   def table_to_html(s)
-    
+
     # create any tables
     s.gsub!(/^\[[^|]+\|[^\n]+\n\|[^\]]+\]/) do |x|
 
@@ -884,50 +912,50 @@ class Martile
     end
     return s
   end
-  
+
   def tabs(s1)
-    
+
     s = s1.clone
-    
+
     doc = Rexle.new("<root>#{s}</root>")
     puts 'doc.root.xml: ' + doc.root.xml.inspect if @debug
     a = doc.root.xpath('tabs').map.with_index do |e, i |
-      
+
       build = JsMenuBuilder.new()
       build.import(e.xml)
-      
+
       if i < 1 then
-        @css << build.to_css 
+        @css << build.to_css
         @js << build.to_js
       end
-      
+
       build.to_html
-      
+
     end
     puts 'tabs a:' + a.inspect if @debug
 
     # replaces the <tabs> XML with HTML
     a.each do |html|
-      
+
       istart = s =~ /^<tabs[^>]*>/
       iend = s =~ /<\/tabs>/
       s.slice!(istart, (iend - istart) + '</tab>'.length + 1)
       s.insert(istart, html)
-      
+
     end
-    
+
     return s
-    
+
   end
 
   def underline(s)
 
-    s.gsub(/_[^_\(\)\n]+_\b/) do |x| 
+    s.gsub(/_[^_\(\)\n]+_\b/) do |x|
       "<span class='underline'>%s</span>" % x[1..-2]
     end
 
   end
-  
+
   def highlight(s)
 
     s.gsub(/\^[\w ]+\^/) {|x| "<mark>%s</mark>" % x[1..-2] }
@@ -937,41 +965,41 @@ class Martile
   def script_out(s)
     s.gsub(/({!)[^}]+\}/) {|x| eval(x[/(?<={!)[^}]+/]) }
   end
-  
+
   def smartlink(s)
-        
+
     s.split(/(?= \?)/).inject('') do |r, substring|
 
       r << substring.gsub(/\B\?([^\n]+) +(https?:\/\/.[^\?]+\?)(?=\B)/) do |x|
-        
+
         content, link = $1, ($2).chop
-        
+
         if (link)[/\)$/] then
           "<a href='%s'>%s</a>" % [link, content]
         else
           "[%s](%s)" % [content, link]
         end
       end
-      
-    end    
 
-  end  
-  
+    end
+
+  end
+
   def slashpre(s)
     s.gsub(/^\/\/([^\/]+)^\/\//) do |x|
       "<pre>#{($1).lines.map{|y| y.sub(/^ +/,'')}.join}</pre>"
     end
-    
+
   end
-  
-  # makes HTML sections out of string blocks which start with an 
+
+  # makes HTML sections out of string blocks which start with an
   # equals sign and end with an equals sign
   def section(s)
 
     a = s.lines
 
     a2 = a.inject([[]]) do |r,x|
-      
+
       match = x.match(/^={1}(?:#)?([\w-]+)?$/)
 
       if match then
@@ -981,10 +1009,10 @@ class Martile
           list = r.pop
           puts ('section | list: ' + list.inspect).debug if @debug
 
-          r << ["%s%s</section>" % 
+          r << ["%s%s</section>" %
                  [list[0], \
                   Martile.new(list[1..-1].join, \
-                      ignore_domainlabel: @ignore_domainlabel).to_s
+                      ignore_domainlabel: @ignore_domainlabel, embedded: true).to_s
                  ]
                ]
           puts ('section | r: ' + r.inspect) if @debug
@@ -992,10 +1020,10 @@ class Martile
         else
 
           raw_id = match.captures.first
-          id = raw_id ? (" id='%s'" % raw_id) : ''          
+          id = raw_id ? (" id='%s'" % raw_id) : ''
           r << ["<section#{id} markdown='1'>"]
         end
-        
+
       else
 
         r.last << x
@@ -1006,44 +1034,44 @@ class Martile
 
     a2.join
   end
-  
+
   def svgtag(s)
-    
-    s.gsub(/\B!s\[\]\((#\w+|https?:\/\/[^\)]+)\)/) do 
-      
-      source = ($1)  
-      
+
+    s.gsub(/\B!s\[\]\((#\w+|https?:\/\/[^\)]+)\)/) do
+
+      source = ($1)
+
       svg = if source =~ /^http/ then
-      
-        RXFHelper.read(source).first        
-        
+
+        RXFHelper.read(source).first
+
       else
-        
+
         @data_source[source[/\w+/]].to_svg
-        
-      end     
-      
+
+      end
+
       svg.slice!(/.*(?=<svg)/m)
       svg
     end
 
   end
-  
-  
+
+
   def videotag(s)
-    
+
     s.gsub(/\B!v\[\]\((https?:\/\/[^\)]+)\)(\{[^\}]+\})?/) do |match|
 
       files = ($1).split
       attr = ($2)
 
       h = attr ? attr.scan(/(\w+):\s+(\w+)/).to_h : {}
-      attributes = h.any? ? (' ' + 
+      attributes = h.any? ? (' ' +
                              h.map {|k,v| "%s='%s'" % [k,v]}.join(' ')) : ''
 
       h2 = {
-        /\.og[gv]$/ => 'ogg', /\.mp4$/ => 'mp4', /\.mov$/ => 'mov', 
-        /\.webm$/ => 'webm' 
+        /\.og[gv]$/ => 'ogg', /\.mp4$/ => 'mp4', /\.mov$/ => 'mov',
+        /\.webm$/ => 'webm'
       }
 
       sources = files.map do |file|
@@ -1053,13 +1081,13 @@ class Martile
       end
 
       "<video controls='controls'%s>\n%s\n</video>" % [attributes, sources.join("\n")]
-    end    
-  
+    end
+
   end
-  
+
   def list_item_to_hyperlink(s)
-        
+
     s.gsub(/\B(\* +)([^\n]+)\s+(https?:\/\/.*)/,'\1[\2](\3)')
 
-  end    
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwOTE2MjEzODM5WhcN
-  MjAwOTE1MjEzODM5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCnenuP
-  FWIwR7SoLI3RGCP/z/DId3Gn1vydwIIJoEjYUJo4ggN89r9DNybRna/5AkU/4ZqB
-  qNATSqcDduNjOsaLnIkdhlsCZsF/JOETIXbnNK9Vq+yb1guQD5k5VYd4G+8YrVyq
-  Ym7cFUZubzIpyMIJeWxlonT/pa9LasRKNIHjjagUU0HGUFXl45tzcJ9DI9GoXlLf
-  VggQrlotu7odMgPaxyy5b44AWDByzS/0SawkeNCpN32QedSchhRN6n42w0SQodZg
-  /aY58Z6UfbgXSEYMgWJ12yAhmBuMueD4evqLUTCG5wim8TgZ7qhTA4rjWPp6upAC
-  uSkqtXBclU71u/k4UFpAOKWXibXrpZvuOg0J/GTdGZrsAHnPVpR5utG6nYL+/8qx
-  vEYr8jtDiyaL7qI/lM95cei55s9/0OiI1TYa0Yffv2y2qLgtiYtc0pD+IDn2s/+3
-  opQ7OV6G5Vl0Xuo6r+h8UbhHAFKsm88990Z02+yIP/1IddHSu8/8npXxe3kCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUX2EmAO1E
-  PSABL4PMtcQQi626eGMwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjAxMTIxODA4WhcN
+  MjMwMjAxMTIxODA4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDKhrg5
+  KqIgw+RLws6nPWN06Zrb0xMSzmtm8Q1X6amedGq68uAMQoTpUTkz1V/15m0h/15S
+  dAo5kvXr7zAyFBreTwkzjRUBUoaBzXN2dplaHTjqgnZZlAQQbxjAyREU4wj9/wKi
+  1QI1uErtQvR2bbziVan4GoftdS7KFRbPeqdoZahFnCpPY2JMgeMWhU/M70LjJJxX
+  cPKwVgM5MUXRsBB/Dj/qHBBtPdn65b5ZMPGBvBnjU1Qxev+9+Im9s12jq+M9eKXQ
+  nP2oIg8sEFXJtoekhVloroLfq9PWFn4h7rKWJoJ/Omld0f4EcRnNtAefq6FvCP3/
+  WU4W+SKb1Lk4ykIUyKYbngRPDuyAa1MEWOsdho6RVVyAGwYuGKYWL6EUdwZ53b3t
+  F7BO3KSLKcYj6dNLz+/DgL1y0lNIVYT8aKoG1oEEP6PIHgxqdm24HEJ3st//ZbyQ
+  NUrxHigFx/FsaBZHQP9KjHTE2pD4ja5f4CY1tAXsAbo7RNej/X2XB8B33AMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUEEhUCcru
+  jZRwuqDct8vgJi8gbf0wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAQSJ/hREtKoMtmTPUdqbSlhgNt7EQwzpfDijG0MzV
-  YaiohOzGuUtSS4YwS7el0uAm4GfR33FlSclL2YTRn0PrtXY4fqQpw7LpHO7qNTzH
-  4GEP1prieo5mnw1pbkqQoeTu36Z8P5GBLJC0C4tczXMrRB8ZmsubSir7XAEaU5vh
-  1tv9y0GBL/pzxT1JeJuDw/1ddw5oGZxKilkqq4/upO/Su2AnOzplMNccaFK1H1yP
-  MjZtfGRVDtIKPH91jwfBtU+4IxeoY/HCZL03vTg9RAbJgg/5l5ndx8E17kcWK+cM
-  oU4MMgC5Xl/m7dI9DIQgIXi3CU4Z4LF+i8kgUw7VOP1mDug67fcfSMVus8NbLWEe
-  6jg2WIgE1SSAq8SeDCEkqwLyvDirsS6jUfM20LXaGEeSPr4Vc6Y4FKYfrEv2Vp6S
-  g0+rPDPUCWKVNHo7BG5zGRDcLsJO0QeIILy/AQaSAE3lQiHmC47nhsiBK0qNehWa
-  47XiKvz0ZVCGgrz4GEb723WC
+  BgkqhkiG9w0BAQsFAAOCAYEAMkGd71LQJVg9SUpo4v+uv1FQWDUnaml69mmt9o6K
+  sp2xIhTP7ZOr4xktFM1v2toFen5spnw2D27ydH7g/LyZfb6gvssfuelP6E8pnWEF
+  BBAj6z9JLqH/XYLttJ96RkvAxHFXAchiqjIknlesadvn49Y8LBsz6bw+9yVGZDwr
+  P2qlPhBZ8OCV2Fk7SaCGCMrN0XQb+wERg1hLgxEE1VwJbIKMKuODgrsPuNTDx3Lk
+  IDU0+h3wmirfIeWHGf3YOjWTBi9XNUP60jhi4SuPejlXZp9A7kL3kBtsMThb/k1n
+  VEnfzskAkhHzszdJyQCgiMm1Vq7gK2/s3QdSdgTSUef73SsAEaKJq510bDXxPinK
+  KZk39ZADGwdeqANr4XzQsVTdu1ELJzGIA0xTfC1FCR3Rx/hlOnSIIarc3jTOz5TJ
+  6D95KZcJmHrfG4EGldnq07fqQvCHdxjq1Yg3FzORugyyjrO9+L73oxuf6alZi9bk
+  ELVtuWI4ASfMFfqxPi48ym1T
   -----END CERTIFICATE-----
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yatoc
@@ -61,22 +61,22 @@ dependencies:
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: mindmapdoc
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -136,9 +136,9 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.7
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -163,7 +163,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Martile is a Markdown pre formatter which is designed to format custom Markdown