ZMediumToMarkdown 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b9c991933c802ea5089c22fe1de06dbcc4d7e121ccdd4f95c1c29368da4d309
-  data.tar.gz: ece588c2c5b60ad45b93c75c2362b717167782c491ee6b4a7c0ec5d2b3122119
+  metadata.gz: 3605356973101df17419ca4232f870a0bab0062f04409c78b0a267c1b799a911
+  data.tar.gz: 10506a2d7f3a699059869ecc7e070c63939a361ccf13007308acb7596d73b130
 SHA512:
-  metadata.gz: 9fdee119b831c25f6b8040a5338ad722808ed58f0009dd13deb9424d3b30aba4cbc45bf143dd3669c8cb76a2d3527a6a16d46442a3f6480fc56ea0d98461d862
-  data.tar.gz: b1d53026f922219e610a6a20e3e155bf38a1223396d97d5709c908869e718fa05bf03042fcf0bc996a1bbed906142afb7d16818198622f13193887392066e80d
+  metadata.gz: 950325be2b1088bef87a36ceffdabce9be5d9800a9ba5d47fbeb09f2d8ff90c2a01a827b7272af5ef4ac9285a06b4de86cea2ea03e81b0984aa2a49f78a269ff
+  data.tar.gz: 3a448256e99ad7eb6da7a28b89be0e6984430466b04b3d0eec25a9eed24026f6b29f90f25a226f487ce0639d49192fd41e0045b597d2ef1129f505fab67a65de

data/lib/Parsers/MarkupStyleRender.rb

@@ -48,6 +48,51 @@ class MarkupStyleRender
     end
 
     def optimize(chars) 
+
+        # remove style in codeblock e.g. `hello world **bold**` (markdown not allow style in codeblock)
+
+        while true
+    
+            hasExcute = false
+            inCodeBlock = false
+            index = 0
+
+            chars.each do |char|
+                if char.chars.join() == "`"
+                    if char.type == "TagStart"
+                        inCodeBlock = true
+                    elsif char.type == "TagEnd"
+                        inCodeBlock = false
+                    end
+                elsif inCodeBlock
+                    if char.type == "TagStart" or char.type == "TagEnd"
+                        chars.delete_at(index)
+                        hasExcute = true
+                        break
+                    end
+                end
+                
+                index += 1
+            end
+
+            if !hasExcute
+                break
+            end
+        end
+
+        # treat escape tag as normal text
+        index = 0
+        chars.each do |char|
+            if char.type == "TagEnd" && char.chars.join() == ""
+                chars.delete_at(index)
+            elsif char.type == "TagStart" && char.chars.join() == "\\"
+                chars[index] = TextChar.new("\\".chars, "Text")
+            end
+
+            index += 1
+        end
+
+        # append space between tag and text
         while true
             hasExcute = false
             
@@ -126,37 +171,6 @@ class MarkupStyleRender
             end
         end
 
-        # remove style in codeblock e.g. `hello world **bold**` (markdown not allow style in codeblock)
-        
-        while true
-            
-            hasExcute = false
-            inCodeBlock = false
-            index = 0
-
-            chars.each do |char|
-                if char.chars.join() == "`"
-                    if char.type == "TagStart"
-                        inCodeBlock = true
-                    elsif char.type == "TagEnd"
-                        inCodeBlock = false
-                    end
-                elsif inCodeBlock
-                    if char.type == "TagStart" or char.type == "TagEnd"
-                        chars.delete_at(index)
-                        hasExcute = true
-                        break
-                    end
-                end
-                
-                index += 1
-            end
-
-            if !hasExcute
-                break
-            end
-        end
-
         chars
     end
 
@@ -175,11 +189,7 @@ class MarkupStyleRender
                 elsif markup.type == "STRONG"
                     tag = TagChar.new(2, markup.start, markup.end, "**", "**")
                 elsif markup.type == "ESCAPE"
-                    escapeTagChar = TagChar.new(999,markup.start, markup.end,'','')
-                    escapeTagChar.startChars = TextChar.new('\\'.chars,'Text')
-                    escapeTagChar.endChars = TextChar.new([],'Text')
-
-                    tag = escapeTagChar
+                    tag = TagChar.new(999, markup.start, markup.end, "\\", "")
                 elsif markup.type == "A"
                     url = markup.href
                     if markup.anchorType == "LINK"
@@ -224,16 +234,6 @@ class MarkupStyleRender
             stack = []
 
             chars.each do |index, char|
-
-                # is in code block
-                if !stack.last.nil? && stack.last.endChars.chars.join() == "`"
-                    containEndTag = tags.select { |tag| tag.endIndex == index && tag.endChars.chars.join() == "`" }.length > 0
-                    if !containEndTag 
-                        response.append(char)
-                        next
-                    end
-                end
-
                 if char.chars.join() == "\n"
                     brStack = stack.dup
                     while brStack.length > 0
@@ -265,12 +265,17 @@ class MarkupStyleRender
                 end
 
                 if char.chars.join() != "\n"
-                    resultChar = char.chars.join()
-                    if isForJekyll 
-                        resultChar = Helper.escapeHTML(resultChar)
+                    if !stack.select { |tag| tag.startChars.chars.join() == "`" }.nil?
+                        # is in code block
+                        response.append(char)
+                    else
+                        resultChar = Helper.escapeMarkdown(char.chars.join())
+                        if isForJekyll 
+                            resultChar = Helper.escapeHTML(resultChar)
+                        end
+    
+                        response.append(TextChar.new(resultChar.chars, "Text"))
                     end
-
-                    response.append(TextChar.new(resultChar.chars, "Text"))
                 end
 
                 endTags = tags.select { |tag| tag.endIndex == index }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri