ZMediumToMarkdown 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc5867264a6441b236d54340f34e507ef4308f99b6908f21fd975a9061c81483
-  data.tar.gz: 00d61d0b23a23afe0e445f5a6d98533dd41a02cc41e6ea55168a12620860203f
+  metadata.gz: f15b01478e2f941c658c49359b921f152df549fc32778b8305ccd65f05578fbe
+  data.tar.gz: 5707c63e3c917c8598a009b9a49952bb10f50281e085ec75f2c664e2fd6d5bb2
 SHA512:
-  metadata.gz: 23e6f4244d5c291872bcfcedfe961b30e377638e812dade41a9ade68c9e83d66dfe7e1061e2131d106b2605f61014cacc632e4a6984c09b1089e458d0d88cfda
-  data.tar.gz: b5577f2dd3cec3ce63f15e531b0b9a0574ff74fef8981d21d32badac236a562d1a4ad3cf14757aee8073da9877119b7f3fe64b5ef4a37abf94cbcbcdc1f409f1
+  metadata.gz: 1db021ec2a782ea9da912b18b78ec99295813ddc1aa64555f7026eddaf43bc42823cbc287486f2bc8ca03ccbc05022e7aa1085abdb0ae2a9af1b026661412c3f
+  data.tar.gz: bf7bb9132809a5361a7911667cc889adf239d9322ad1fb9e8df0a325b49875fc358530d80be43450d5dccef2c5032512f37b8b81f208544c40bbc244ab5c841e

data/lib/Parsers/MarkupParser.rb

@@ -19,12 +19,12 @@ class MarkupParser
         if !paragraph.markups.nil? && paragraph.markups.length > 0
             markupRender = MarkupStyleRender.new(paragraph, isForJekyll)
 
-            begin
+            #begin
                 result = markupRender.parse()
-            rescue => e
-                puts e.backtrace
-                Helper.makeWarningText("Error occurred during render markup text, please help to open an issue on github.")
-            end
+            #rescue => e
+            #    puts e.backtrace
+            #    Helper.makeWarningText("Error occurred during render markup text, please help to open an issue on github.")
+            #end
         end
 
         result

data/lib/Parsers/MarkupStyleRender.rb

@@ -16,14 +16,13 @@ class MarkupStyleRender
     end
 
     class TagChar < TextChar
-        attr_accessor :sort, :startIndex, :endIndex, :startChars, :endChars, :isCodeBlock
-        def initialize(sort, startIndex, endIndex, startChars, endChars, isCodeBlock = false)
+        attr_accessor :sort, :startIndex, :endIndex, :startChars, :endChars
+        def initialize(sort, startIndex, endIndex, startChars, endChars)
             @sort = sort
             @startIndex = startIndex
             @endIndex = endIndex - 1
             @startChars = TextChar.new(startChars.chars, 'TagStart')
             @endChars = TextChar.new(endChars.chars, 'TagEnd')
-            @isCodeBlock = isCodeBlock
         end
     end
 
@@ -127,6 +126,37 @@ 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
 
@@ -141,7 +171,7 @@ class MarkupStyleRender
                 if markup.type == "EM"
                     tag = TagChar.new(2, markup.start, markup.end, "_", "_")
                 elsif markup.type == "CODE"
-                    tag = TagChar.new(3, markup.start, markup.end, "`", "`", true)
+                    tag = TagChar.new(3, markup.start, markup.end, "`", "`")
                 elsif markup.type == "STRONG"
                     tag = TagChar.new(2, markup.start, markup.end, "**", "**")
                 elsif markup.type == "A"
@@ -167,9 +197,6 @@ class MarkupStyleRender
             response = []
             stack = []
 
-            # markdown unsupoort style in code block
-            inCodeBlock = false
-
             chars.each do |index, char|
 
                 if char.chars.join() == "\n"
@@ -189,18 +216,13 @@ class MarkupStyleRender
                 startTags = tags.select { |tag| tag.startIndex == index }.sort_by(&:sort)
                 if !startTags.nil?
                     startTags.each do |tag|
-                        if inCodeBlock == false
-                            response.append(tag.startChars)
-                            stack.append(tag)
-                        end
-                        if tag.isCodeBlock
-                            inCodeBlock = true
-                        end
+                        response.append(tag.startChars)
+                        stack.append(tag)
                     end
                 end
 
                 if char.chars.join() != "\n"
-                    if inCodeBlock
+                    if !stack.select { |tag| tag.startChars.chars.join() == "`" }.nil?
                         # is in code block
                         response.append(char)
                     else
@@ -223,17 +245,9 @@ class MarkupStyleRender
                             # as expected
                             endTags.delete_at(stackTagInEndTagsIndex)
                         else
-                            if inCodeBlock == false or stackTag.isCodeBlock == true
-                                mismatchTags.append(stackTag)
-                            end
-                        end
-                        if inCodeBlock == false or stackTag.isCodeBlock == true
-                            response.append(stackTag.endChars)
-                        end
-
-                        if stackTag.isCodeBlock 
-                            inCodeBlock = false
+                            mismatchTags.append(stackTag)
                         end
+                        response.append(stackTag.endChars)
                     end
 
                     while mismatchTags.length > 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ZMediumToMarkdown
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - ZhgChgLi