rdoc 7.1.0 → 8.0.0

data/lib/rdoc/markdown.rb

@@ -688,6 +688,20 @@ class RDoc::Markdown
     end
   end
 
+  # Escape character that has special meaning in RDoc format.
+  # To allow rdoc-styled link used in markdown format for now, bracket and brace are not escaped.
+
+  def rdoc_escape(text)
+    text.gsub(/[*+<\\_]/) {|s| "\\#{s}" }
+  end
+
+  # Escape link url that contains brackets.
+  # Brackets needs escape because link url will be surrounded by `[]` in RDoc format.
+
+  def rdoc_link_url_escape(text)
+    text.gsub(/[\[\]\\]/) {|s| "\\#{s}" }
+  end
+
   ##
   # :category: Extensions
   #
@@ -774,6 +788,8 @@ class RDoc::Markdown
   # the note order list for proper display at the end of the document.
 
   def note_for ref
+    return unless @note_order
+
     @note_order << ref
 
     label = @note_order.length
@@ -1642,7 +1658,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # BlockQuoteRaw = @StartList:a (">" " "? Line:l { a << l } (!">" !@BlankLine Line:c { a << c })* (@BlankLine:n { a << n })*)+ { inner_parse a.join }
+  # BlockQuoteRaw = @StartList:a (">" " "? Line:l { a << l } (!">" !@BlankLine !(AtxStart @Spacechar) !Bullet !Enumerator !(&{ github? } Ticks3) Line:c { a << c })* (">" @BlankLine:n { a << n })*)+ { inner_parse a.join }
   def _BlockQuoteRaw
 
     _save = self.pos
@@ -1704,6 +1720,68 @@ class RDoc::Markdown
               self.pos = _save5
               break
             end
+            _save8 = self.pos
+
+            _save9 = self.pos
+            while true # sequence
+              _tmp = apply(:_AtxStart)
+              unless _tmp
+                self.pos = _save9
+                break
+              end
+              _tmp = _Spacechar()
+              unless _tmp
+                self.pos = _save9
+              end
+              break
+            end # end sequence
+
+            _tmp = _tmp ? nil : true
+            self.pos = _save8
+            unless _tmp
+              self.pos = _save5
+              break
+            end
+            _save10 = self.pos
+            _tmp = apply(:_Bullet)
+            _tmp = _tmp ? nil : true
+            self.pos = _save10
+            unless _tmp
+              self.pos = _save5
+              break
+            end
+            _save11 = self.pos
+            _tmp = apply(:_Enumerator)
+            _tmp = _tmp ? nil : true
+            self.pos = _save11
+            unless _tmp
+              self.pos = _save5
+              break
+            end
+            _save12 = self.pos
+
+            _save13 = self.pos
+            while true # sequence
+              _save14 = self.pos
+              _tmp = begin;  github? ; end
+              self.pos = _save14
+              unless _tmp
+                self.pos = _save13
+                break
+              end
+              _tmp = apply(:_Ticks3)
+              unless _tmp
+                self.pos = _save13
+              end
+              break
+            end # end sequence
+
+            _tmp = _tmp ? nil : true
+            self.pos = _save12
+            unless _tmp
+              self.pos = _save5
+              break
+            end
             _tmp = apply(:_Line)
             c = @result
             unless _tmp
@@ -1727,18 +1805,23 @@ class RDoc::Markdown
         end
         while true
 
-          _save9 = self.pos
+          _save16 = self.pos
           while true # sequence
+            _tmp = match_string(">")
+            unless _tmp
+              self.pos = _save16
+              break
+            end
             _tmp = _BlankLine()
             n = @result
             unless _tmp
-              self.pos = _save9
+              self.pos = _save16
               break
             end
             @result = begin;  a << n ; end
             _tmp = true
             unless _tmp
-              self.pos = _save9
+              self.pos = _save16
             end
             break
           end # end sequence
@@ -1755,65 +1838,127 @@ class RDoc::Markdown
       if _tmp
         while true
 
-          _save10 = self.pos
+          _save17 = self.pos
           while true # sequence
             _tmp = match_string(">")
             unless _tmp
-              self.pos = _save10
+              self.pos = _save17
               break
             end
-            _save11 = self.pos
+            _save18 = self.pos
             _tmp = match_string(" ")
             unless _tmp
               _tmp = true
-              self.pos = _save11
+              self.pos = _save18
             end
             unless _tmp
-              self.pos = _save10
+              self.pos = _save17
               break
             end
             _tmp = apply(:_Line)
             l = @result
             unless _tmp
-              self.pos = _save10
+              self.pos = _save17
               break
             end
             @result = begin;  a << l ; end
             _tmp = true
             unless _tmp
-              self.pos = _save10
+              self.pos = _save17
               break
             end
             while true
 
-              _save13 = self.pos
+              _save20 = self.pos
               while true # sequence
-                _save14 = self.pos
+                _save21 = self.pos
                 _tmp = match_string(">")
                 _tmp = _tmp ? nil : true
-                self.pos = _save14
+                self.pos = _save21
                 unless _tmp
-                  self.pos = _save13
+                  self.pos = _save20
                   break
                 end
-                _save15 = self.pos
+                _save22 = self.pos
                 _tmp = _BlankLine()
                 _tmp = _tmp ? nil : true
-                self.pos = _save15
+                self.pos = _save22
+                unless _tmp
+                  self.pos = _save20
+                  break
+                end
+                _save23 = self.pos
+
+                _save24 = self.pos
+                while true # sequence
+                  _tmp = apply(:_AtxStart)
+                  unless _tmp
+                    self.pos = _save24
+                    break
+                  end
+                  _tmp = _Spacechar()
+                  unless _tmp
+                    self.pos = _save24
+                  end
+                  break
+                end # end sequence
+
+                _tmp = _tmp ? nil : true
+                self.pos = _save23
+                unless _tmp
+                  self.pos = _save20
+                  break
+                end
+                _save25 = self.pos
+                _tmp = apply(:_Bullet)
+                _tmp = _tmp ? nil : true
+                self.pos = _save25
+                unless _tmp
+                  self.pos = _save20
+                  break
+                end
+                _save26 = self.pos
+                _tmp = apply(:_Enumerator)
+                _tmp = _tmp ? nil : true
+                self.pos = _save26
+                unless _tmp
+                  self.pos = _save20
+                  break
+                end
+                _save27 = self.pos
+
+                _save28 = self.pos
+                while true # sequence
+                  _save29 = self.pos
+                  _tmp = begin;  github? ; end
+                  self.pos = _save29
+                  unless _tmp
+                    self.pos = _save28
+                    break
+                  end
+                  _tmp = apply(:_Ticks3)
+                  unless _tmp
+                    self.pos = _save28
+                  end
+                  break
+                end # end sequence
+
+                _tmp = _tmp ? nil : true
+                self.pos = _save27
                 unless _tmp
-                  self.pos = _save13
+                  self.pos = _save20
                   break
                 end
                 _tmp = apply(:_Line)
                 c = @result
                 unless _tmp
-                  self.pos = _save13
+                  self.pos = _save20
                   break
                 end
                 @result = begin;  a << c ; end
                 _tmp = true
                 unless _tmp
-                  self.pos = _save13
+                  self.pos = _save20
                 end
                 break
               end # end sequence
@@ -1822,23 +1967,28 @@ class RDoc::Markdown
             end
             _tmp = true
             unless _tmp
-              self.pos = _save10
+              self.pos = _save17
               break
             end
             while true
 
-              _save17 = self.pos
+              _save31 = self.pos
               while true # sequence
+                _tmp = match_string(">")
+                unless _tmp
+                  self.pos = _save31
+                  break
+                end
                 _tmp = _BlankLine()
                 n = @result
                 unless _tmp
-                  self.pos = _save17
+                  self.pos = _save31
                   break
                 end
                 @result = begin;  a << n ; end
                 _tmp = true
                 unless _tmp
-                  self.pos = _save17
+                  self.pos = _save31
                 end
                 break
               end # end sequence
@@ -1847,7 +1997,7 @@ class RDoc::Markdown
             end
             _tmp = true
             unless _tmp
-              self.pos = _save10
+              self.pos = _save17
             end
             break
           end # end sequence
@@ -9639,7 +9789,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Inline = (Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Strike | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)
+  # Inline = (Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Strike | Image | Link | NoteReference | InlineNote | Code | RawHtml | StrippedComment | Entity | EscapedChar | Symbol)
   def _Inline
 
     _save = self.pos
@@ -9683,6 +9833,9 @@ class RDoc::Markdown
       _tmp = apply(:_RawHtml)
       break if _tmp
       self.pos = _save
+      _tmp = apply(:_StrippedComment)
+      break if _tmp
+      self.pos = _save
       _tmp = apply(:_Entity)
       break if _tmp
       self.pos = _save
@@ -9731,7 +9884,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Str = @StartList:a < @NormalChar+ > { a = text } (StrChunk:c { a << c })* { a }
+  # Str = @StartList:a < @NormalChar+ > { a = text } (StrChunk:c { a << c })* { rdoc_escape(a) }
   def _Str
 
     _save = self.pos
@@ -9792,7 +9945,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  a ; end
+      @result = begin;  rdoc_escape(a) ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -9894,7 +10047,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # EscapedChar = "\\" !@Newline < /[:\\`|*_{}\[\]()#+.!><-]/ > { text }
+  # EscapedChar = "\\" !@Newline < /[:\\`|*_{}\[\]()#+.!><-]/ > { rdoc_escape(text) }
   def _EscapedChar
 
     _save = self.pos
@@ -9921,7 +10074,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  text ; end
+      @result = begin;  rdoc_escape(text) ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -10122,7 +10275,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Symbol = < @SpecialChar > { text }
+  # Symbol = < @SpecialChar > { rdoc_escape(text) }
   def _Symbol
 
     _save = self.pos
@@ -10136,7 +10289,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  text ; end
+      @result = begin;  rdoc_escape(text) ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -11189,7 +11342,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # ExplicitLink = ExplicitLinkWithLabel:a { "{#{a[:label]}}[#{a[:link]}]" }
+  # ExplicitLink = ExplicitLinkWithLabel:a { "{#{a[:label]}}[#{rdoc_link_url_escape(a[:link])}]" }
   def _ExplicitLink
 
     _save = self.pos
@@ -11200,7 +11353,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  "{#{a[:label]}}[#{a[:link]}]" ; end
+      @result = begin;  "{#{a[:label]}}[#{rdoc_link_url_escape(a[:link])}]" ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -13983,7 +14136,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # RawHtml = < (HtmlComment | HtmlBlockScript | HtmlTag) > { if html? then text else '' end }
+  # RawHtml = < (HtmlBlockScript | HtmlTag) > { html? ? text : '' }
   def _RawHtml
 
     _save = self.pos
@@ -13992,9 +14145,6 @@ class RDoc::Markdown
 
       _save1 = self.pos
       while true # choice
-        _tmp = apply(:_HtmlComment)
-        break if _tmp
-        self.pos = _save1
         _tmp = apply(:_HtmlBlockScript)
         break if _tmp
         self.pos = _save1
@@ -14011,7 +14161,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  if html? then text else '' end ; end
+      @result = begin;  html? ? text : '' ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -14023,6 +14173,28 @@ class RDoc::Markdown
     return _tmp
   end
 
+  # StrippedComment = HtmlComment { '' }
+  def _StrippedComment
+
+    _save = self.pos
+    while true # sequence
+      _tmp = apply(:_HtmlComment)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  '' ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_StrippedComment unless _tmp
+    return _tmp
+  end
+
   # BlankLine = @Sp @Newline { "\n" }
   def _BlankLine
 
@@ -14615,7 +14787,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # HexEntity = /&#x/i < /[0-9a-fA-F]+/ > ";" { [text.to_i(16)].pack 'U' }
+  # HexEntity = /&#x/i < /[0-9a-fA-F]+/ > ";" { rdoc_escape([text.to_i(16)].pack('U')) }
   def _HexEntity
 
     _save = self.pos
@@ -14639,7 +14811,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  [text.to_i(16)].pack 'U' ; end
+      @result = begin;  rdoc_escape([text.to_i(16)].pack('U')) ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -14651,7 +14823,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # DecEntity = "&#" < /[0-9]+/ > ";" { [text.to_i].pack 'U' }
+  # DecEntity = "&#" < /[0-9]+/ > ";" { rdoc_escape([text.to_i].pack('U')) }
   def _DecEntity
 
     _save = self.pos
@@ -14675,7 +14847,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  [text.to_i].pack 'U' ; end
+      @result = begin;  rdoc_escape([text.to_i].pack('U')) ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -14687,7 +14859,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # CharEntity = "&" < /[A-Za-z0-9]+/ > ";" { if entity = HTML_ENTITIES[text] then                  entity.pack 'U*'                else                  "&#{text};"                end              }
+  # CharEntity = "&" < /[A-Za-z0-9]+/ > ";" { if entity = HTML_ENTITIES[text] then                  rdoc_escape(entity.pack('U*'))                else                  "&#{text};"                end              }
   def _CharEntity
 
     _save = self.pos
@@ -14712,7 +14884,7 @@ class RDoc::Markdown
         break
       end
       @result = begin;  if entity = HTML_ENTITIES[text] then
-                 entity.pack 'U*'
+                 rdoc_escape(entity.pack('U*'))
                else
                  "&#{text};"
                end
@@ -15306,7 +15478,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # InlineNote = &{ notes? } "^[" @StartList:a (!"]" Inline:l { a << l })+ "]" { ref = [:inline, @note_order.length]                @footnotes[ref] = paragraph a                 note_for ref              }
+  # InlineNote = &{ notes? } "^[" @StartList:a (!"]" Inline:l { a << l })+ "]" { if @note_order                  ref = [:inline, @note_order.length]                  @footnotes[ref] = paragraph a                   note_for ref                end              }
   def _InlineNote
 
     _save = self.pos
@@ -15397,10 +15569,12 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  ref = [:inline, @note_order.length]
-               @footnotes[ref] = paragraph a
+      @result = begin;  if @note_order
+                 ref = [:inline, @note_order.length]
+                 @footnotes[ref] = paragraph a
 
-               note_for ref
+                 note_for ref
+               end
              ; end
       _tmp = true
       unless _tmp
@@ -15556,7 +15730,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # CodeFence = &{ github? } Ticks3 (@Sp StrChunk:format)? Spnl < ((!"`" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text               verbatim.format = format.intern if format.instance_of?(String)               verbatim             }
+  # CodeFence = &{ github? } Ticks3 (@Sp StrChunk:format)? @Sp @Newline? < ((!"`" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text               verbatim.format = format.intern if format.instance_of?(String)               verbatim             }
   def _CodeFence
 
     _save = self.pos
@@ -15598,31 +15772,41 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Spnl)
+      _tmp = _Sp()
       unless _tmp
         self.pos = _save
         break
       end
-      _text_start = self.pos
       _save4 = self.pos
-
+      _tmp = _Newline()
+      unless _tmp
+        _tmp = true
+        self.pos = _save4
+      end
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _text_start = self.pos
       _save5 = self.pos
-      while true # choice
-        _save6 = self.pos
 
+      _save6 = self.pos
+      while true # choice
         _save7 = self.pos
+
+        _save8 = self.pos
         while true # sequence
-          _save8 = self.pos
+          _save9 = self.pos
           _tmp = match_string("`")
           _tmp = _tmp ? nil : true
-          self.pos = _save8
+          self.pos = _save9
           unless _tmp
-            self.pos = _save7
+            self.pos = _save8
             break
           end
           _tmp = apply(:_Nonspacechar)
           unless _tmp
-            self.pos = _save7
+            self.pos = _save8
           end
           break
         end # end sequence
@@ -15630,19 +15814,19 @@ class RDoc::Markdown
         if _tmp
           while true
 
-            _save9 = self.pos
+            _save10 = self.pos
             while true # sequence
-              _save10 = self.pos
+              _save11 = self.pos
               _tmp = match_string("`")
               _tmp = _tmp ? nil : true
-              self.pos = _save10
+              self.pos = _save11
               unless _tmp
-                self.pos = _save9
+                self.pos = _save10
                 break
               end
               _tmp = apply(:_Nonspacechar)
               unless _tmp
-                self.pos = _save9
+                self.pos = _save10
               end
               break
             end # end sequence
@@ -15651,59 +15835,59 @@ class RDoc::Markdown
           end
           _tmp = true
         else
-          self.pos = _save6
+          self.pos = _save7
         end
         break if _tmp
-        self.pos = _save5
+        self.pos = _save6
 
-        _save11 = self.pos
+        _save12 = self.pos
         while true # sequence
-          _save12 = self.pos
+          _save13 = self.pos
           _tmp = apply(:_Ticks3)
           _tmp = _tmp ? nil : true
-          self.pos = _save12
+          self.pos = _save13
           unless _tmp
-            self.pos = _save11
+            self.pos = _save12
             break
           end
           _tmp = scan(/\G(?-mix:`+)/)
           unless _tmp
-            self.pos = _save11
+            self.pos = _save12
           end
           break
         end # end sequence
 
         break if _tmp
-        self.pos = _save5
+        self.pos = _save6
         _tmp = apply(:_Spacechar)
         break if _tmp
-        self.pos = _save5
+        self.pos = _save6
         _tmp = _Newline()
         break if _tmp
-        self.pos = _save5
+        self.pos = _save6
         break
       end # end choice
 
       if _tmp
         while true
 
-          _save13 = self.pos
+          _save14 = self.pos
           while true # choice
-            _save14 = self.pos
-
             _save15 = self.pos
+
+            _save16 = self.pos
             while true # sequence
-              _save16 = self.pos
+              _save17 = self.pos
               _tmp = match_string("`")
               _tmp = _tmp ? nil : true
-              self.pos = _save16
+              self.pos = _save17
               unless _tmp
-                self.pos = _save15
+                self.pos = _save16
                 break
               end
               _tmp = apply(:_Nonspacechar)
               unless _tmp
-                self.pos = _save15
+                self.pos = _save16
               end
               break
             end # end sequence
@@ -15711,19 +15895,19 @@ class RDoc::Markdown
             if _tmp
               while true
 
-                _save17 = self.pos
+                _save18 = self.pos
                 while true # sequence
-                  _save18 = self.pos
+                  _save19 = self.pos
                   _tmp = match_string("`")
                   _tmp = _tmp ? nil : true
-                  self.pos = _save18
+                  self.pos = _save19
                   unless _tmp
-                    self.pos = _save17
+                    self.pos = _save18
                     break
                   end
                   _tmp = apply(:_Nonspacechar)
                   unless _tmp
-                    self.pos = _save17
+                    self.pos = _save18
                   end
                   break
                 end # end sequence
@@ -15732,36 +15916,36 @@ class RDoc::Markdown
               end
               _tmp = true
             else
-              self.pos = _save14
+              self.pos = _save15
             end
             break if _tmp
-            self.pos = _save13
+            self.pos = _save14
 
-            _save19 = self.pos
+            _save20 = self.pos
             while true # sequence
-              _save20 = self.pos
+              _save21 = self.pos
               _tmp = apply(:_Ticks3)
               _tmp = _tmp ? nil : true
-              self.pos = _save20
+              self.pos = _save21
               unless _tmp
-                self.pos = _save19
+                self.pos = _save20
                 break
               end
               _tmp = scan(/\G(?-mix:`+)/)
               unless _tmp
-                self.pos = _save19
+                self.pos = _save20
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save13
+            self.pos = _save14
             _tmp = apply(:_Spacechar)
             break if _tmp
-            self.pos = _save13
+            self.pos = _save14
             _tmp = _Newline()
             break if _tmp
-            self.pos = _save13
+            self.pos = _save14
             break
           end # end choice
 
@@ -15769,7 +15953,7 @@ class RDoc::Markdown
         end
         _tmp = true
       else
-        self.pos = _save4
+        self.pos = _save5
       end
       if _tmp
         text = get_text(_text_start)
@@ -15923,7 +16107,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # TableRow = ((TableItem:item1 TableItem2*:items { [item1, *items] }):row | TableItem2+:row) "|"? @Newline { row }
+  # TableRow = ((TableItem:item1 TableItem2+:items { [item1, *items] }):row | TableItem2+:row) "|"? @Newline { row }
   def _TableRow
 
     _save = self.pos
@@ -15940,14 +16124,21 @@ class RDoc::Markdown
             self.pos = _save2
             break
           end
+          _save3 = self.pos
           _ary = []
-          while true
-            _tmp = apply(:_TableItem2)
-            _ary << @result if _tmp
-            break unless _tmp
+          _tmp = apply(:_TableItem2)
+          if _tmp
+            _ary << @result
+            while true
+              _tmp = apply(:_TableItem2)
+              _ary << @result if _tmp
+              break unless _tmp
+            end
+            _tmp = true
+            @result = _ary
+          else
+            self.pos = _save3
           end
-          _tmp = true
-          @result = _ary
           items = @result
           unless _tmp
             self.pos = _save2
@@ -16063,7 +16254,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # TableLine = ((TableAlign:align1 TableAlign2*:aligns {[align1, *aligns] }):line | TableAlign2+:line) "|"? @Newline { line }
+  # TableLine = ((TableAlign:align1 TableAlign2+:aligns {[align1, *aligns] }):line | TableAlign2+:line) "|"? @Newline { line }
   def _TableLine
 
     _save = self.pos
@@ -16080,14 +16271,21 @@ class RDoc::Markdown
             self.pos = _save2
             break
           end
+          _save3 = self.pos
           _ary = []
-          while true
-            _tmp = apply(:_TableAlign2)
-            _ary << @result if _tmp
-            break unless _tmp
+          _tmp = apply(:_TableAlign2)
+          if _tmp
+            _ary << @result
+            while true
+              _tmp = apply(:_TableAlign2)
+              _ary << @result if _tmp
+              break unless _tmp
+            end
+            _tmp = true
+            @result = _ary
+          else
+            self.pos = _save3
           end
-          _tmp = true
-          @result = _ary
           aligns = @result
           unless _tmp
             self.pos = _save2
@@ -16429,7 +16627,7 @@ class RDoc::Markdown
   Rules[:_SetextHeading2] = rule_info("SetextHeading2", "&(@RawLine SetextBottom2) @StartList:a (!@Endline Inline:b { a << b })+ @Sp @Newline SetextBottom2 { RDoc::Markup::Heading.new(2, a.join) }")
   Rules[:_Heading] = rule_info("Heading", "(SetextHeading | AtxHeading)")
   Rules[:_BlockQuote] = rule_info("BlockQuote", "BlockQuoteRaw:a { RDoc::Markup::BlockQuote.new(*a) }")
-  Rules[:_BlockQuoteRaw] = rule_info("BlockQuoteRaw", "@StartList:a (\">\" \" \"? Line:l { a << l } (!\">\" !@BlankLine Line:c { a << c })* (@BlankLine:n { a << n })*)+ { inner_parse a.join }")
+  Rules[:_BlockQuoteRaw] = rule_info("BlockQuoteRaw", "@StartList:a (\">\" \" \"? Line:l { a << l } (!\">\" !@BlankLine !(AtxStart @Spacechar) !Bullet !Enumerator !(&{ github? } Ticks3) Line:c { a << c })* (\">\" @BlankLine:n { a << n })*)+ { inner_parse a.join }")
   Rules[:_NonblankIndentedLine] = rule_info("NonblankIndentedLine", "!@BlankLine IndentedLine")
   Rules[:_VerbatimChunk] = rule_info("VerbatimChunk", "@BlankLine*:a NonblankIndentedLine+:b { a.concat b }")
   Rules[:_Verbatim] = rule_info("Verbatim", "VerbatimChunk+:a { RDoc::Markup::Verbatim.new(*a.flatten) }")
@@ -16561,17 +16759,17 @@ class RDoc::Markdown
   Rules[:_InStyleTags] = rule_info("InStyleTags", "StyleOpen (!StyleClose .)* StyleClose")
   Rules[:_StyleBlock] = rule_info("StyleBlock", "< InStyleTags > @BlankLine* { if css? then                     RDoc::Markup::Raw.new text                   end }")
   Rules[:_Inlines] = rule_info("Inlines", "(!@Endline Inline:i { i } | @Endline:c !(&{ github? } Ticks3 /[^`\\n]*$/) &Inline { c })+:chunks @Endline? { chunks }")
-  Rules[:_Inline] = rule_info("Inline", "(Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Strike | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)")
+  Rules[:_Inline] = rule_info("Inline", "(Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Strike | Image | Link | NoteReference | InlineNote | Code | RawHtml | StrippedComment | Entity | EscapedChar | Symbol)")
   Rules[:_Space] = rule_info("Space", "@Spacechar+ { \" \" }")
-  Rules[:_Str] = rule_info("Str", "@StartList:a < @NormalChar+ > { a = text } (StrChunk:c { a << c })* { a }")
+  Rules[:_Str] = rule_info("Str", "@StartList:a < @NormalChar+ > { a = text } (StrChunk:c { a << c })* { rdoc_escape(a) }")
   Rules[:_StrChunk] = rule_info("StrChunk", "< (@NormalChar | /_+/ &Alphanumeric)+ > { text }")
-  Rules[:_EscapedChar] = rule_info("EscapedChar", "\"\\\\\" !@Newline < /[:\\\\`|*_{}\\[\\]()\#+.!><-]/ > { text }")
+  Rules[:_EscapedChar] = rule_info("EscapedChar", "\"\\\\\" !@Newline < /[:\\\\`|*_{}\\[\\]()\#+.!><-]/ > { rdoc_escape(text) }")
   Rules[:_Entity] = rule_info("Entity", "(HexEntity | DecEntity | CharEntity):a { a }")
   Rules[:_Endline] = rule_info("Endline", "(@LineBreak | @TerminalEndline | @NormalEndline)")
   Rules[:_NormalEndline] = rule_info("NormalEndline", "@Sp @Newline !@BlankLine !\">\" !AtxStart !(Line /={1,}|-{1,}/ @Newline) { \"\\n\" }")
   Rules[:_TerminalEndline] = rule_info("TerminalEndline", "@Sp @Newline @Eof")
   Rules[:_LineBreak] = rule_info("LineBreak", "\"  \" @NormalEndline { RDoc::Markup::HardBreak.new }")
-  Rules[:_Symbol] = rule_info("Symbol", "< @SpecialChar > { text }")
+  Rules[:_Symbol] = rule_info("Symbol", "< @SpecialChar > { rdoc_escape(text) }")
   Rules[:_UlOrStarLine] = rule_info("UlOrStarLine", "(UlLine | StarLine):a { a }")
   Rules[:_StarLine] = rule_info("StarLine", "(< /\\*{4,}/ > { text } | < @Spacechar /\\*+/ &@Spacechar > { text })")
   Rules[:_UlLine] = rule_info("UlLine", "(< /_{4,}/ > { text } | < @Spacechar /_+/ &@Spacechar > { text })")
@@ -16588,7 +16786,7 @@ class RDoc::Markdown
   Rules[:_ReferenceLink] = rule_info("ReferenceLink", "(ReferenceLinkDouble | ReferenceLinkSingle)")
   Rules[:_ReferenceLinkDouble] = rule_info("ReferenceLinkDouble", "Label:content < Spnl > !\"[]\" Label:label { link_to content, label, text }")
   Rules[:_ReferenceLinkSingle] = rule_info("ReferenceLinkSingle", "Label:content < (Spnl \"[]\")? > { link_to content, content, text }")
-  Rules[:_ExplicitLink] = rule_info("ExplicitLink", "ExplicitLinkWithLabel:a { \"{\#{a[:label]}}[\#{a[:link]}]\" }")
+  Rules[:_ExplicitLink] = rule_info("ExplicitLink", "ExplicitLinkWithLabel:a { \"{\#{a[:label]}}[\#{rdoc_link_url_escape(a[:link])}]\" }")
   Rules[:_ExplicitLinkWithLabel] = rule_info("ExplicitLinkWithLabel", "Label:label \"(\" @Sp Source:link Spnl Title @Sp \")\" { { label: label, link: link } }")
   Rules[:_Source] = rule_info("Source", "(\"<\" < SourceContents > \">\" | < SourceContents >) { text }")
   Rules[:_SourceContents] = rule_info("SourceContents", "((!\"(\" !\")\" !\">\" Nonspacechar)+ | \"(\" SourceContents \")\")*")
@@ -16613,7 +16811,8 @@ class RDoc::Markdown
   Rules[:_Ticks4] = rule_info("Ticks4", "\"````\" !\"`\"")
   Rules[:_Ticks5] = rule_info("Ticks5", "\"`````\" !\"`\"")
   Rules[:_Code] = rule_info("Code", "(Ticks1 < ((!\"`\" Nonspacechar)+ | !Ticks1 /`+/ | !Ticks1 (@Spacechar | @Newline !@BlankLine))+ > Ticks1 | Ticks2 < ((!\"`\" Nonspacechar)+ | !Ticks2 /`+/ | !Ticks2 (@Spacechar | @Newline !@BlankLine))+ > Ticks2 | Ticks3 < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | !Ticks3 (@Spacechar | @Newline !@BlankLine))+ > Ticks3 | Ticks4 < ((!\"`\" Nonspacechar)+ | !Ticks4 /`+/ | !Ticks4 (@Spacechar | @Newline !@BlankLine))+ > Ticks4 | Ticks5 < ((!\"`\" Nonspacechar)+ | !Ticks5 /`+/ | !Ticks5 (@Spacechar | @Newline !@BlankLine))+ > Ticks5) { code text }")
-  Rules[:_RawHtml] = rule_info("RawHtml", "< (HtmlComment | HtmlBlockScript | HtmlTag) > { if html? then text else '' end }")
+  Rules[:_RawHtml] = rule_info("RawHtml", "< (HtmlBlockScript | HtmlTag) > { html? ? text : '' }")
+  Rules[:_StrippedComment] = rule_info("StrippedComment", "HtmlComment { '' }")
   Rules[:_BlankLine] = rule_info("BlankLine", "@Sp @Newline { \"\\n\" }")
   Rules[:_Quoted] = rule_info("Quoted", "(\"\\\"\" (!\"\\\"\" .)* \"\\\"\" | \"'\" (!\"'\" .)* \"'\")")
   Rules[:_HtmlAttribute] = rule_info("HtmlAttribute", "(AlphanumericAscii | \"-\")+ Spnl (\"=\" Spnl (Quoted | (!\">\" Nonspacechar)+))? Spnl")
@@ -16631,9 +16830,9 @@ class RDoc::Markdown
   Rules[:_BOM] = rule_info("BOM", "%literals.BOM")
   Rules[:_Newline] = rule_info("Newline", "%literals.Newline")
   Rules[:_Spacechar] = rule_info("Spacechar", "%literals.Spacechar")
-  Rules[:_HexEntity] = rule_info("HexEntity", "/&\#x/i < /[0-9a-fA-F]+/ > \";\" { [text.to_i(16)].pack 'U' }")
-  Rules[:_DecEntity] = rule_info("DecEntity", "\"&\#\" < /[0-9]+/ > \";\" { [text.to_i].pack 'U' }")
-  Rules[:_CharEntity] = rule_info("CharEntity", "\"&\" < /[A-Za-z0-9]+/ > \";\" { if entity = HTML_ENTITIES[text] then                  entity.pack 'U*'                else                  \"&\#{text};\"                end              }")
+  Rules[:_HexEntity] = rule_info("HexEntity", "/&\#x/i < /[0-9a-fA-F]+/ > \";\" { rdoc_escape([text.to_i(16)].pack('U')) }")
+  Rules[:_DecEntity] = rule_info("DecEntity", "\"&\#\" < /[0-9]+/ > \";\" { rdoc_escape([text.to_i].pack('U')) }")
+  Rules[:_CharEntity] = rule_info("CharEntity", "\"&\" < /[A-Za-z0-9]+/ > \";\" { if entity = HTML_ENTITIES[text] then                  rdoc_escape(entity.pack('U*'))                else                  \"&\#{text};\"                end              }")
   Rules[:_NonindentSpace] = rule_info("NonindentSpace", "/ {0,3}/")
   Rules[:_Indent] = rule_info("Indent", "/\\t|    /")
   Rules[:_IndentedLine] = rule_info("IndentedLine", "Indent Line")
@@ -16646,16 +16845,16 @@ class RDoc::Markdown
   Rules[:_NoteReference] = rule_info("NoteReference", "&{ notes? } RawNoteReference:ref { note_for ref }")
   Rules[:_RawNoteReference] = rule_info("RawNoteReference", "\"[^\" < (!@Newline !\"]\" .)+ > \"]\" { text }")
   Rules[:_Note] = rule_info("Note", "&{ notes? } @NonindentSpace RawNoteReference:ref \":\" @Sp @StartList:a RawNoteBlock:i { a.concat i } (&Indent RawNoteBlock:i { a.concat i })* { @footnotes[ref] = paragraph a                    nil                 }")
-  Rules[:_InlineNote] = rule_info("InlineNote", "&{ notes? } \"^[\" @StartList:a (!\"]\" Inline:l { a << l })+ \"]\" { ref = [:inline, @note_order.length]                @footnotes[ref] = paragraph a                 note_for ref              }")
+  Rules[:_InlineNote] = rule_info("InlineNote", "&{ notes? } \"^[\" @StartList:a (!\"]\" Inline:l { a << l })+ \"]\" { if @note_order                  ref = [:inline, @note_order.length]                  @footnotes[ref] = paragraph a                   note_for ref                end              }")
   Rules[:_Notes] = rule_info("Notes", "(Note | SkipBlock)*")
   Rules[:_RawNoteBlock] = rule_info("RawNoteBlock", "@StartList:a (!@BlankLine !RawNoteReference OptionallyIndentedLine:l { a << l })+ < @BlankLine* > { a << text } { a }")
-  Rules[:_CodeFence] = rule_info("CodeFence", "&{ github? } Ticks3 (@Sp StrChunk:format)? Spnl < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text               verbatim.format = format.intern if format.instance_of?(String)               verbatim             }")
+  Rules[:_CodeFence] = rule_info("CodeFence", "&{ github? } Ticks3 (@Sp StrChunk:format)? @Sp @Newline? < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text               verbatim.format = format.intern if format.instance_of?(String)               verbatim             }")
   Rules[:_Table] = rule_info("Table", "&{ github? } TableHead:header TableLine:line TableRow+:body {           table = RDoc::Markup::Table.new(header, line, body)           parse_table_cells(table)         }")
   Rules[:_TableHead] = rule_info("TableHead", "TableItem2+:items \"|\"? @Newline { items }")
-  Rules[:_TableRow] = rule_info("TableRow", "((TableItem:item1 TableItem2*:items { [item1, *items] }):row | TableItem2+:row) \"|\"? @Newline { row }")
+  Rules[:_TableRow] = rule_info("TableRow", "((TableItem:item1 TableItem2+:items { [item1, *items] }):row | TableItem2+:row) \"|\"? @Newline { row }")
   Rules[:_TableItem2] = rule_info("TableItem2", "\"|\" TableItem")
   Rules[:_TableItem] = rule_info("TableItem", "< /(?:\\\\.|[^|\\n])+/ > { text.strip.gsub(/\\\\([|])/, '\\1')  }")
-  Rules[:_TableLine] = rule_info("TableLine", "((TableAlign:align1 TableAlign2*:aligns {[align1, *aligns] }):line | TableAlign2+:line) \"|\"? @Newline { line }")
+  Rules[:_TableLine] = rule_info("TableLine", "((TableAlign:align1 TableAlign2+:aligns {[align1, *aligns] }):line | TableAlign2+:line) \"|\"? @Newline { line }")
   Rules[:_TableAlign2] = rule_info("TableAlign2", "\"|\" @Sp TableAlign")
   Rules[:_TableAlign] = rule_info("TableAlign", "< /:?-+:?/ > @Sp {                 text.start_with?(\":\") ?                 (text.end_with?(\":\") ? :center : :left) :                 (text.end_with?(\":\") ? :right : nil)               }")
   Rules[:_DefinitionList] = rule_info("DefinitionList", "&{ definition_lists? } DefinitionListItem+:list { RDoc::Markup::List.new :NOTE, *list.flatten }")