ZMediumToMarkdown 2.0.9 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c5da608d284269b0674c80fdd4fd6d93c825937a8eff28669993b623b5fa414
-  data.tar.gz: 17c83bf6c50f8e35b1defe2b4ac8c212d038ab148e174f863bfff370effeb927
+  metadata.gz: 8b93c95279c2e90820d9e0e9048c79f1fa5e5dd0a94dba690cf8a3c3b8679589
+  data.tar.gz: e28c0042b45bf6f29377e3c8acf4e39dff68cda0b3d1b11cba153e95c97dc5aa
 SHA512:
-  metadata.gz: 315bf2b11ce127d096dfa981c306f6882b8bcb0db975ccc7c36c5365b579b157bf9322649495410177cdad8894e3201aa1fadc392b6bd492cd490049b1c48e9e
-  data.tar.gz: c2455da2a611863c1735eadd0f3a02005804228fcdaa3b588b98c75fcf80a362c609fbdaea684eb085559cd32e679c6a59a250f3fb7e116bb4217957a6dfe230
+  metadata.gz: 0f24fbe044fe188d121ca6486173ccd15cd8ca1de6aea5f3ef625a0929615ba33fb890a39b144d0d0914c5c78bb30d94007629b364f87577098607651bd0f4f6
+  data.tar.gz: b4d939b9288c0f57ce3dd0b78bcb6d9abf672a7375cc5b3191d3820a80c9b43558f31fbafd2d5884b1b6b31b8bc9ac40406ef9fe8414964bcda4905f0b405c91

data/lib/Parsers/BQParser.rb

@@ -16,7 +16,11 @@ class BQParser < Parser
 
     def parse(paragraph)
         if BQParser.isBQ(paragraph)
-            result = "> #{paragraph.text} \n\n"
+            result = "\r\n\r\n"
+            paragraph.text.each_line do |p|
+                result += "> #{p} \n\n"
+            end
+            result += "\r\n\r\n"
             result
         else
             if !nextParser.nil?

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
@@ -250,19 +250,32 @@ class MarkupStyleRender
 
                 startTags = tags.select { |tag| tag.startIndex == index }.sort_by(&:sort)
                 if !startTags.nil?
+                    hasCodeBlockTag = false
                     startTags.each do |tag|
-                        response.append(tag.startChars)
+                        if !hasCodeBlockTag 
+                            response.append(tag.startChars)
+                        end
+                        
                         stack.append(tag)
+
+                        if tag.startChars.chars.join() == "`"
+                            hasCodeBlockTag = true
+                        end
                     end
                 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.9
+  version: 2.0.12
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri