martile 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be76b25bcef2907f0d7603e5576018fe669ca9b954fff5b14bd002ba648a20f0
-  data.tar.gz: 2c66373e1409180abc5d6f06f1698e516bf0fe658b792cd68e36ed866c9781be
+  metadata.gz: 45bed3d0771bb32b6215f3b90ed567171b628811ca7a1fa0f721a198945f5b35
+  data.tar.gz: 6f30e95b6696a2dc82ba117c91e0a7fe06a99822e02ad60abbf540ccf43f08a3
 SHA512:
-  metadata.gz: 5bae3c21b1974e818bb50d36b593b1c98f8ebf0ad559fe6aeab269bc43fbb34ea31e50e53abd7e9fbaecd52356e07786db6a0c1b22f02b8a233302bf2b35f925
-  data.tar.gz: f94ae42b6b29daedb73d810e2acc0a24bf41724d49e9ff83ce20d3822de73838591f65dcb9415c47a209a9fdeaa7d5c9da0acdb9d42ff7c0d45ad8ffd5ea798d
+  metadata.gz: 1b7da4fbed2332530432d3784eec11fb071db3ae66d3aebf7d3638ecc7a14418a5bd65cc9d299a23bbddc78b9b15d4b2380890bc4e748d3ea27218514b0ce1b0
+  data.tar.gz: 7e538b514e0d0e361585b16c65525fdff0caf2576c6eeaee1791b26ee0bdb9fc708ef246586e29844eef53a500cfdc6c924c7cf00545c3e6ca10fd7b52e9a52f

data/lib/martile.rb

@@ -15,6 +15,7 @@ require 'jsmenubuilder'
 
 
 # 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 
@@ -154,7 +155,8 @@ class Martile
     
     s250 = apply_filter(s240) {|x| nomarkdown x }
     
-    s255 = tabs(s250)
+    s253 = bang_xml(s250)
+    s255 = tabs(s253)
     s260 = Yatoc.new(Kramdown::Document.new(s255).to_html, debug: debug).to_html
     puts ('s260: '  + s260.inspect).debug if debug    
     
@@ -228,7 +230,30 @@ class Martile
       "<audio controls='controls'>\n%s\n</audio>" % [sources.join("\n")]
     end    
 
-  end    
+  end
+  
+  def bang_xml(s)
+
+    indent = -> (line) { '  ' + line }    
+    a = s.split(/(?=^\!\w+)/)    
+    
+    a.map do |s|
+      
+      if s =~ /^!!/ then
+
+        parent, children = s.split(/^!!/,2)
+        tree = parent.sub(/^!/,'') + children.split(/^!!/).map do |x|
+          x.lines[1..-1].map(&indent).unshift(x.lines[0]).map(&indent)
+        end.join
+
+        LineTree.new(tree).to_xml(declaration: false)
+
+      else
+        s
+      end
+      
+    end.join
+  end
 
   def code_block_to_html(s)
 
@@ -741,7 +766,7 @@ class Martile
     a.each do |html|
       
       istart = s =~ /^<tabs[^>]*>/
-      iend = s =~ /^<\/tabs>/
+      iend = s =~ /<\/tabs>/
       s.slice!(istart, (iend - istart) + '</tab>'.length + 1)
       s.insert(istart, html)
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - James Robertson