martile 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c7e7a5129c34656f11828831a861f08e63fcc47767219d8657a56b484cdf7f0
-  data.tar.gz: 79988d64a4ae83816cd20c182c75b73549217cb5ddc060771483474faae04907
+  metadata.gz: 8cac99545ba0c3f73fcffcd71c8de008cbc7b0074034c7417d302eff401419e8
+  data.tar.gz: f9726561ce6eb1df19f5e01c473e359a9211bb89149e334a791db8f5d3d89733
 SHA512:
-  metadata.gz: 02cbcdc557b6f9085881da520e6c3d12975937e9a9c599614b85c36f697099fab2bf752fd8b5ef57f9dfdffcd31e7d648439e833e5897bd92123cffd01c8c276
-  data.tar.gz: 9d1ce499b5ee42bd05e5c2741be92a274e4f90e25237439932790f469ebebc5ba9a2bddaaf9cbaf7d8551ed5b8bffbc7c1a32ce6ecd516697c0aeeb48b21a0de
+  metadata.gz: 1582650be2cf7c13d675fe849b30e428c7e8d3e5ecf33266863f753623ce16f2d8ae1aed61882b25d9ee3986d4bba7790839a25987fb551c1b0ff944e6e6771b
+  data.tar.gz: 134872da40df6a1ab83760e64eb928d9b268ee74bf432c4b78b873fb515a43c2ce37f6bfc098624727c87b0987d15a81ea4c1761dc67ff6c8730ed046278e3a5

data/lib/martile.rb

@@ -15,6 +15,10 @@ require 'jsmenubuilder'
 require 'htmlcom'
 
 
+# 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 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
 # feature:  01-Mar-2020 A src attribute can now be used in the sidenav tag
@@ -115,10 +119,11 @@ class Martile
     #puts 's1 : ' + s1.inspect
     s40 = apply_filter(s30) {|x| code_block_to_html(x.strip + "\n") }
 
+    s45 = s40.gsub(/<pre/,'{::nomarkdown}\0').gsub(/<\/pre>/,'\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(s40) {|x| ordered_list_to_html x }
+    s50 = apply_filter(s45) {|x| ordered_list_to_html x }
     #puts 's4 : ' + s4.inspect
 
     s60 = apply_filter(s50) {|x| unordered_list_to_html x }
@@ -160,10 +165,10 @@ class Martile
     s220 = apply_filter(s210) {|x| svgtag x }
     s230 = apply_filter(s220) {|x| embedtag x }
     s240 = apply_filter(s230) {|x| script_out x }
+    s245 = s240.gsub(/\{::nomarkdown2\}/,'').gsub(/\{:2\/\}/,'')
+    @to_s = s245.to_s
     
-    @to_s = s240.to_s
-    
-    s250 = apply_filter(s240) {|x| nomarkdown x }
+    s250 = apply_filter(s245) {|x| nomarkdown x }
     s252 = sidenav(s250)
     s253 = bang_xml(s252)
     puts ('s235 after bang_xml: ' + s253.inspect).debug if @debug
@@ -502,15 +507,16 @@ class Martile
 
     @filter = []
 
-    a = s.split(/(?=<pre)/).map.with_index do |row, i|
+    a = s.split(/(?=\{::nomarkdown2?\})/).map.with_index do |row, i|
       
-      row.sub(/<pre.*<\/pre>/m) do |pattern|
+      row.sub(/\{::nomarkdown2?\}.*{:2?\/}/m) do |pattern|
         placeholder = '!' + Time.now.to_i.to_s + i.to_s
         @filter << [placeholder, pattern]
         placeholder
       end
 
     end
+
     a.join
     
   end  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   g0+rPDPUCWKVNHo7BG5zGRDcLsJO0QeIILy/AQaSAE3lQiHmC47nhsiBK0qNehWa
   47XiKvz0ZVCGgrz4GEb723WC
   -----END CERTIFICATE-----
-date: 2020-08-08 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yatoc