martile 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d0189e6255d77ce27db6579973e3891aab3d8a966be6d4e1109b7d63ad214bf
-  data.tar.gz: 9353b7b5dd8827bde94c4732ba4580d9e03cfc1f9dc524ca82bbd12baf142d59
+  metadata.gz: 6cf601753597fa04c7e12d03c01580d931e797c06550e711016eabd9792d84de
+  data.tar.gz: b8e55247e68d7ae1bc1f553d5e407c6ad26af23bf827781df1408ce484ebe8c3
 SHA512:
-  metadata.gz: 2f6e9d34799b9672639d8f16a5e8eb0431c934f85b89f72d48217fe0ce83f2f4ce3786733bfdef2ffb8a538d1b2c7ba9b699eaae5eab273a19cedaf6c6d94b71
-  data.tar.gz: 669187ab91c6cd7faa15079997b388b96cf25c6613f69e61e7ee496a207c905b58a12965dca1f573c67cd9e4e409a285aef4f5854601f928fc0f05180f203f42
+  metadata.gz: d44dabfbc8642c8ff44fbacc6934bffc80fdee5b5f2efa127c90577edbc61b3cb1eb8d52fbe6065dabd825fad081b1f4722f733e2f53381fbf1590b36a58d042
+  data.tar.gz: ab8c4bb5ff400b54bbe8b8509fb7643f841c452b35606df18e323e244f56823c78d5123a014f9c67d471f210594348f988458556f6c7e336bcfb880f031095dc

data/lib/martile.rb

@@ -17,13 +17,14 @@ require 'rxfhelper'
 require 'mindwords'
 
 
+# feature:  24-Feb-2023 Plugins are now supported
 # 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
 # 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
@@ -31,61 +32,61 @@ require 'mindwords'
 # 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
@@ -103,27 +104,30 @@ class Martile
   # 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)
+                 embedded: false, debug: false, log: nil, plugins: {})
 
 
     @debug = debug
     @data_source = {}
-
+    
     @ignore_domainlabel, @log = ignore_domainlabel, log
-
+    
     @css, @js = [], []
+    
+    @plugins = initialize_plugins(plugins || [])
 
     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    
+    s25 = apply_filter(s20) {|x| commentout x }
 
-    s30 = apply_filter(s20) {|x| slashpre x }
+    s30 = apply_filter(s25) {|x| slashpre x }
     puts ('s30: ' + s30.inspect).debug if @debug
 
     #puts 's1 : ' + s1.inspect
@@ -157,7 +161,7 @@ class Martile
 
     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
@@ -195,8 +199,14 @@ class Martile
     s245 = s240.gsub(/\{::nomarkdown2\}/,'').gsub(/\{:2\/\}/,'')
     puts 's245 : ' + s245.inspect if @debug
     s246 = mindwords(s245)
-    @to_s = s246.to_s
-
+    
+    s248 = @plugins.inject(s246) do |r, x| 
+      puts 'plugin x: ' + x.inspect if @debug
+      x.apply(r) if x.respond_to? :apply
+    end
+    
+    @to_s = s248.to_s
+    
     s250 = apply_filter(s246) {|x| nomarkdown x }
     puts 's250 : ' + s250.inspect if @debug
     s252 = sidenav(s250)
@@ -210,38 +220,38 @@ class Martile
     s257 = accordion(s255)
     puts 's257 : ' + s257.inspect if @debug
 
-    toc = false if s257 =~ /class=['"]sidenav['"]>/
-
+    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/
@@ -260,21 +270,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"
@@ -284,58 +294,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' }
@@ -346,17 +356,17 @@ class Martile
       end
 
       "<audio controls='controls'>\n%s\n</audio>" % [sources.join("\n")]
-    end
+    end    
 
   end
-
+  
   def bang_xml(s)
 
-    indent = -> (line) { '  ' + line }
+    indent = -> (line) { '  ' + line }    
     a = s.split(/(?=^\![a-zA-Z]+)/)
-
+    
     a.map do |s|
-
+      
       if s =~ /^!!/ then
 
         parent, children = s.split(/^!!/,2)
@@ -369,17 +379,17 @@ 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
-
+        
         s2.lines.chunk {|x| x =~ /^\n|^    |\n/ }.map do |_, x|
 
           if x.join.lstrip[/^    /] then
@@ -393,18 +403,26 @@ class Martile
       else
         s2
       end
-
+      
     end.join
+      
 
+  end
+
+  # comments out blocks of text using the XML comment style tags.
+  #
+  def commentout(s1)
+
+    return s1.clone.split(/\n(?=<!--)/).map {|x| x.sub(/<!--.*-->/m,'') }.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|
@@ -414,23 +432,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
@@ -458,43 +476,43 @@ class Martile
     end
 
   end
-
+  
   def embedtag(s)
-
-    s.gsub(/\B!\(((?:https?|rse|dfs):\/\/[^\)]+)\)/) do
+    
+    s.gsub(/\B!\(((?:https?|rse|dfs):\/\/[^\)]+)\)/) do                         
       RXFReader.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]
@@ -502,8 +520,8 @@ class Martile
 
 
   end
-
-
+  
+  
 
   def list_to_html(s,symbol='#')
 
@@ -511,11 +529,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)
@@ -524,17 +542,17 @@ 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 = []
@@ -562,14 +580,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)
 
@@ -594,25 +612,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|
@@ -628,60 +646,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"
@@ -699,12 +717,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|
@@ -720,35 +738,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 mindwords(s1)
 
@@ -785,131 +803,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
           RXFReader.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)
@@ -923,7 +941,7 @@ class Martile
   end
 
   def table_to_html(s)
-
+    
     # create any tables
     s.gsub!(/^\[[^|]+\|[^\n]+\n\|[^\]]+\]/) do |x|
 
@@ -945,50 +963,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] }
@@ -998,41 +1016,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
@@ -1042,7 +1060,7 @@ 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, embedded: true).to_s
@@ -1053,10 +1071,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
@@ -1067,44 +1085,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
-
+      
         RXFReader.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|
@@ -1114,13 +1132,34 @@ 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
+  
+  private
+  
+  def initialize_plugins(plugins)
+
+    @plugins = plugins.inject([]) do |r, plugin|
+      
+      name, settings = plugin
+      return r if settings[:active] == false and !settings[:active]
+      
+      klass_name = 'MartilePlugin' + name.to_s
+
+      r << Kernel.const_get(klass_name).new(settings: settings)
+      
+      def r.to_s()
+        klass_name
+      end
+      
+      r
+    end
+  end    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,32 +10,33 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  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
-  BgkqhkiG9w0BAQsFAAOCAYEAMkGd71LQJVg9SUpo4v+uv1FQWDUnaml69mmt9o6K
-  sp2xIhTP7ZOr4xktFM1v2toFen5spnw2D27ydH7g/LyZfb6gvssfuelP6E8pnWEF
-  BBAj6z9JLqH/XYLttJ96RkvAxHFXAchiqjIknlesadvn49Y8LBsz6bw+9yVGZDwr
-  P2qlPhBZ8OCV2Fk7SaCGCMrN0XQb+wERg1hLgxEE1VwJbIKMKuODgrsPuNTDx3Lk
-  IDU0+h3wmirfIeWHGf3YOjWTBi9XNUP60jhi4SuPejlXZp9A7kL3kBtsMThb/k1n
-  VEnfzskAkhHzszdJyQCgiMm1Vq7gK2/s3QdSdgTSUef73SsAEaKJq510bDXxPinK
-  KZk39ZADGwdeqANr4XzQsVTdu1ELJzGIA0xTfC1FCR3Rx/hlOnSIIarc3jTOz5TJ
-  6D95KZcJmHrfG4EGldnq07fqQvCHdxjq1Yg3FzORugyyjrO9+L73oxuf6alZi9bk
-  ELVtuWI4ASfMFfqxPi48ym1T
+  MIIEljCCAv6gAwIBAgIBATANBgkqhkiG9w0BAQsFADBIMRIwEAYDVQQDDAlnZW1t
+  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
+  8ixkARkWAmV1MB4XDTIzMDIyNDE4MzkwMloXDTI0MDIyNDE4MzkwMlowSDESMBAG
+  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
+  EjAQBgoJkiaJk/IsZAEZFgJldTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoC
+  ggGBAKdnCMCqodBviJiJ+iHla0eSwAoepZX+aCBNBe9PEvRsZ8ZWrx3p+UIcFr1d
+  Aksax46nVc8/xcNBXkz1hIPgcE0h0eVtr14sLjDqRO8eRWX9Hm0bjWgx9ra7sglo
+  r9YJUd/xQxKDGxYwh4BKlODKJOJMfFNmy1dOSzykVzlMQxtSL2ArS60sT3x4NGR2
+  8ZPf4D88jTNgdSJS82joZd/NLE/EJ+rqBbTJ+XU0WbN+KBqS886lIz4R7+1dp4Np
+  ASbv5z7MUxJrt18vpg7eEUyJKgSuQ8F3l9rFmNtBW6Lls9oq7D7mjaS75BQ6WWDL
+  W9bbJ1z1y3qQuvUixnHEIBlTJ6yhcmDo5oha+8LZmEOmHYpUuypWQ/JpYVCelyre
+  Arha9IC4BIR4i0fE1OYrc2wJMMohIpBB4GMWFqP5t4vFg6IjiaPK74GHjQtgzPEP
+  kzSvQuy3m4lj7zpgfLM4FEwwUJv2leLVxyv4zhubJvWxYJbBnhTEtagopeLC7ckj
+  MDYp3QIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBRA5uvB6AJ629OfHMqHJNIrAXYjeTAmBgNVHREEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MA0GCSqGSIb3DQEBCwUAA4IBgQCOV68wjRVU9FGvagTo5Ejps0wBKvA6
+  IDppCnwP6388HVPm56f1Euepjjzbtfx+4YZ272n1/WFRtlqf9OuVQpYklNfDW+HY
+  TNtbMJpSW1hXCCn9XV8gijwzvoMxNAj6Yu0LxfDYBv1V9mgcEs5hlE5oxwWGGWYN
+  NYlV79pQN8GXBCauc2F4xjUxYk6M0zesyG+dhb2e0PuvtyKLtm/3Qqnw52TTUGEw
+  Rr58U2WoKLLN57V7T4FmAgKhisAvw7gF+uBDTeNkoh/RGaUILb46X0bV4esooIW8
+  svgC8LV9M+Ro2AX4R2XNV1FnQMcKm+a2jjcNZts9deug87r2EjpDWHhEyxWc2pNK
+  umCVGRPZGlB4N4m3pisZhS3wG1irYeonBsp38ozgfgo8RkRT41E632ANftiX+9v2
+  Kb0GddGEXoUej3rtoU1RzVB8qUstVA1iH2IqOi5iOBSBKDNWDvOSQ0X6HEbhCX8t
+  xfEqNtXh6NJ5yCPsubFzX2w7ssExXhtY9CQ=
   -----END CERTIFICATE-----
-date: 2022-04-08 00:00:00.000000000 Z
+date: 2023-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yatoc
@@ -66,7 +67,7 @@ dependencies:
         version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +77,7 @@ dependencies:
         version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: mindmapdoc
   requirement: !ruby/object:Gem::Requirement
@@ -123,20 +124,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: mindwords
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: Martile is a Markdown pre formatter which is designed to format custom Markdown