rdoc 6.3.4.1 → 8.0.0

data/lib/rdoc/markdown.rb

@@ -6,7 +6,7 @@
 # RDoc::Markdown as described by the [markdown syntax][syntax].
 #
 # To choose Markdown as your only default format see
-# RDoc::Options@Saved+Options for instructions on setting up a `.doc_options`
+# RDoc::Options@Saved+Options for instructions on setting up a `.rdoc_options`
 # file to store your project default.
 #
 # ## Usage
@@ -175,7 +175,7 @@
 # [dingus]: http://daringfireball.net/projects/markdown/dingus
 # [GFM]: https://github.github.com/gfm/
 # [pegmarkdown]: https://github.com/jgm/peg-markdown
-# [PHPE]: http://michelf.com/projects/php-markdown/extra/#def-list
+# [PHPE]: https://michelf.ca/projects/php-markdown/extra/#def-list
 # [syntax]: http://daringfireball.net/projects/markdown/syntax
 #--
 # Last updated to jgm/peg-markdown commit 8f8fc22ef0
@@ -572,11 +572,11 @@ class RDoc::Markdown
 
 
 
-  require 'rdoc'
-  require 'rdoc/markup/to_joined_paragraph'
-  require 'rdoc/markdown/entities'
+  require_relative '../rdoc'
+  require_relative 'markup/to_joined_paragraph'
+  require_relative 'markdown/entities'
 
-  require 'rdoc/markdown/literals'
+  require_relative 'markdown/literals'
 
   ##
   # Supported extensions
@@ -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
@@ -834,7 +850,7 @@ class RDoc::Markdown
 
       @note_order.each_with_index do |ref, index|
         label = index + 1
-        note = @footnotes[ref]
+        note = @footnotes[ref] or raise ParseError, "footnote [^#{ref}] not found"
 
         link = "{^#{label}}[rdoc-label:footmark-#{label}:foottext-#{label}] "
         note.parts.unshift link
@@ -875,10 +891,57 @@ class RDoc::Markdown
   # Wraps `text` in strike markup for rdoc inline formatting
 
   def strike text
-    if text =~ /\A[a-z\d.\/-]+\z/i then
-      "~#{text}~"
+    "<del>#{text}</del>"
+  end
+
+  ##
+  # Wraps `text` in code markup for rdoc inline formatting
+
+  def code text
+    # trim even spaces
+    text = $2 while /\A( +|\t+)(.*)\1\z/ =~ text
+    # escape unescaped backslash at the end
+    backslash_at_end = "\\" if /(?<!\\)(?:\\\\)*\\\z/.match?(text)
+    "<code>#{text}#{backslash_at_end}</code>"
+  end
+
+  ##
+  # Parses inline markdown in table cells
+
+  def parse_table_cells(table)
+    # Parse header cells
+    table.header = table.header.map { |cell| parse_cell_inline(cell) }
+
+    # Parse body cells
+    table.body = table.body.map do |row|
+      row.map { |cell| parse_cell_inline(cell) }
+    end
+
+    table
+  end
+
+  ##
+  # Parses inline markdown in a single table cell
+
+  def parse_cell_inline(text)
+    return text if text.nil? || text.empty?
+
+    # Create a new parser instance for the cell
+    cell_parser = RDoc::Markdown.new(@extensions, @debug)
+
+    # Parse the cell content
+    doc = cell_parser.parse(text)
+
+    # Extract the parsed content
+    if doc && doc.parts && !doc.parts.empty?
+      para = doc.parts.first
+      if para.is_a?(RDoc::Markup::Paragraph)
+        para.parts.join
+      else
+        text
+      end
     else
-      "<s>#{text}</s>"
+      text
     end
   end
 
@@ -1158,7 +1221,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # AtxHeading = AtxStart:s @Sp AtxInline+:a (@Sp /#*/ @Sp)? @Newline { RDoc::Markup::Heading.new(s, a.join) }
+  # AtxHeading = AtxStart:s @Spacechar+ AtxInline+:a (@Sp /#*/ @Sp)? @Newline { RDoc::Markup::Heading.new(s, a.join) }
   def _AtxHeading
 
     _save = self.pos
@@ -1169,12 +1232,22 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = _Sp()
+      _save1 = self.pos
+      _tmp = _Spacechar()
+      if _tmp
+        while true
+          _tmp = _Spacechar()
+          break unless _tmp
+        end
+        _tmp = true
+      else
+        self.pos = _save1
+      end
       unless _tmp
         self.pos = _save
         break
       end
-      _save1 = self.pos
+      _save2 = self.pos
       _ary = []
       _tmp = apply(:_AtxInline)
       if _tmp
@@ -1187,37 +1260,37 @@ class RDoc::Markdown
         _tmp = true
         @result = _ary
       else
-        self.pos = _save1
+        self.pos = _save2
       end
       a = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _save2 = self.pos
-
       _save3 = self.pos
+
+      _save4 = self.pos
       while true # sequence
         _tmp = _Sp()
         unless _tmp
-          self.pos = _save3
+          self.pos = _save4
           break
         end
         _tmp = scan(/\G(?-mix:#*)/)
         unless _tmp
-          self.pos = _save3
+          self.pos = _save4
           break
         end
         _tmp = _Sp()
         unless _tmp
-          self.pos = _save3
+          self.pos = _save4
         end
         break
       end # end sequence
 
       unless _tmp
         _tmp = true
-        self.pos = _save2
+        self.pos = _save3
       end
       unless _tmp
         self.pos = _save
@@ -1585,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
@@ -1647,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
@@ -1670,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
@@ -1698,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
@@ -1765,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
@@ -1790,7 +1997,7 @@ class RDoc::Markdown
             end
             _tmp = true
             unless _tmp
-              self.pos = _save10
+              self.pos = _save17
             end
             break
           end # end sequence
@@ -9582,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
@@ -9626,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
@@ -9674,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
@@ -9735,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
@@ -9837,7 +10047,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # EscapedChar = "\\" !@Newline < /[:\\`|*_{}\[\]()#+.!><-]/ > { text }
+  # EscapedChar = "\\" !@Newline < /[:\\`|*_{}\[\]()#+.!><-]/ > { rdoc_escape(text) }
   def _EscapedChar
 
     _save = self.pos
@@ -9864,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
@@ -10065,7 +10275,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Symbol = < @SpecialChar > { text }
+  # Symbol = < @SpecialChar > { rdoc_escape(text) }
   def _Symbol
 
     _save = self.pos
@@ -10079,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
@@ -10968,7 +11178,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Image = "!" (ExplicitLink | ReferenceLink):a { "rdoc-image:#{a[/\[(.*)\]/, 1]}" }
+  # Image = "!" ExplicitLinkWithLabel:a { "rdoc-image:#{a[:link]}:#{a[:label]}" }
   def _Image
 
     _save = self.pos
@@ -10978,24 +11188,13 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-
-      _save1 = self.pos
-      while true # choice
-        _tmp = apply(:_ExplicitLink)
-        break if _tmp
-        self.pos = _save1
-        _tmp = apply(:_ReferenceLink)
-        break if _tmp
-        self.pos = _save1
-        break
-      end # end choice
-
+      _tmp = apply(:_ExplicitLinkWithLabel)
       a = @result
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  "rdoc-image:#{a[/\[(.*)\]/, 1]}" ; end
+      @result = begin;  "rdoc-image:#{a[:link]}:#{a[:label]}" ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -11143,13 +11342,36 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # ExplicitLink = Label:l "(" @Sp Source:s Spnl Title @Sp ")" { "{#{l}}[#{s}]" }
+  # ExplicitLink = ExplicitLinkWithLabel:a { "{#{a[:label]}}[#{rdoc_link_url_escape(a[:link])}]" }
   def _ExplicitLink
 
+    _save = self.pos
+    while true # sequence
+      _tmp = apply(:_ExplicitLinkWithLabel)
+      a = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  "{#{a[:label]}}[#{rdoc_link_url_escape(a[:link])}]" ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_ExplicitLink unless _tmp
+    return _tmp
+  end
+
+  # ExplicitLinkWithLabel = Label:label "(" @Sp Source:link Spnl Title @Sp ")" { { label: label, link: link } }
+  def _ExplicitLinkWithLabel
+
     _save = self.pos
     while true # sequence
       _tmp = apply(:_Label)
-      l = @result
+      label = @result
       unless _tmp
         self.pos = _save
         break
@@ -11165,7 +11387,7 @@ class RDoc::Markdown
         break
       end
       _tmp = apply(:_Source)
-      s = @result
+      link = @result
       unless _tmp
         self.pos = _save
         break
@@ -11190,7 +11412,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  "{#{l}}[#{s}]" ; end
+      @result = begin;  { label: label, link: link } ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -11198,7 +11420,7 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_ExplicitLink unless _tmp
+    set_failed_rule :_ExplicitLinkWithLabel unless _tmp
     return _tmp
   end
 
@@ -12507,7 +12729,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Code = (Ticks1 @Sp < ((!"`" Nonspacechar)+ | !Ticks1 /`+/ | !(@Sp Ticks1) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks1 | Ticks2 @Sp < ((!"`" Nonspacechar)+ | !Ticks2 /`+/ | !(@Sp Ticks2) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks2 | Ticks3 @Sp < ((!"`" Nonspacechar)+ | !Ticks3 /`+/ | !(@Sp Ticks3) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks3 | Ticks4 @Sp < ((!"`" Nonspacechar)+ | !Ticks4 /`+/ | !(@Sp Ticks4) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks4 | Ticks5 @Sp < ((!"`" Nonspacechar)+ | !Ticks5 /`+/ | !(@Sp Ticks5) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks5) { "<code>#{text}</code>" }
+  # 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 }
   def _Code
 
     _save = self.pos
@@ -12523,11 +12745,6 @@ class RDoc::Markdown
             self.pos = _save2
             break
           end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save2
-            break
-          end
           _text_start = self.pos
           _save3 = self.pos
 
@@ -12604,21 +12821,7 @@ class RDoc::Markdown
             _save12 = self.pos
             while true # sequence
               _save13 = self.pos
-
-              _save14 = self.pos
-              while true # sequence
-                _tmp = _Sp()
-                unless _tmp
-                  self.pos = _save14
-                  break
-                end
-                _tmp = apply(:_Ticks1)
-                unless _tmp
-                  self.pos = _save14
-                end
-                break
-              end # end sequence
-
+              _tmp = apply(:_Ticks1)
               _tmp = _tmp ? nil : true
               self.pos = _save13
               unless _tmp
@@ -12626,31 +12829,31 @@ class RDoc::Markdown
                 break
               end
 
-              _save15 = self.pos
+              _save14 = self.pos
               while true # choice
                 _tmp = _Spacechar()
                 break if _tmp
-                self.pos = _save15
+                self.pos = _save14
 
-                _save16 = self.pos
+                _save15 = self.pos
                 while true # sequence
                   _tmp = _Newline()
                   unless _tmp
-                    self.pos = _save16
+                    self.pos = _save15
                     break
                   end
-                  _save17 = self.pos
+                  _save16 = self.pos
                   _tmp = _BlankLine()
                   _tmp = _tmp ? nil : true
-                  self.pos = _save17
+                  self.pos = _save16
                   unless _tmp
-                    self.pos = _save16
+                    self.pos = _save15
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save15
+                self.pos = _save14
                 break
               end # end choice
 
@@ -12668,23 +12871,23 @@ class RDoc::Markdown
           if _tmp
             while true
 
-              _save18 = self.pos
+              _save17 = self.pos
               while true # choice
-                _save19 = self.pos
+                _save18 = self.pos
 
-                _save20 = self.pos
+                _save19 = self.pos
                 while true # sequence
-                  _save21 = self.pos
+                  _save20 = self.pos
                   _tmp = match_string("`")
                   _tmp = _tmp ? nil : true
-                  self.pos = _save21
+                  self.pos = _save20
                   unless _tmp
-                    self.pos = _save20
+                    self.pos = _save19
                     break
                   end
                   _tmp = apply(:_Nonspacechar)
                   unless _tmp
-                    self.pos = _save20
+                    self.pos = _save19
                   end
                   break
                 end # end sequence
@@ -12692,19 +12895,19 @@ class RDoc::Markdown
                 if _tmp
                   while true
 
-                    _save22 = self.pos
+                    _save21 = self.pos
                     while true # sequence
-                      _save23 = self.pos
+                      _save22 = self.pos
                       _tmp = match_string("`")
                       _tmp = _tmp ? nil : true
-                      self.pos = _save23
+                      self.pos = _save22
                       unless _tmp
-                        self.pos = _save22
+                        self.pos = _save21
                         break
                       end
                       _tmp = apply(:_Nonspacechar)
                       unless _tmp
-                        self.pos = _save22
+                        self.pos = _save21
                       end
                       break
                     end # end sequence
@@ -12713,92 +12916,78 @@ class RDoc::Markdown
                   end
                   _tmp = true
                 else
-                  self.pos = _save19
+                  self.pos = _save18
                 end
                 break if _tmp
-                self.pos = _save18
+                self.pos = _save17
 
-                _save24 = self.pos
+                _save23 = self.pos
                 while true # sequence
-                  _save25 = self.pos
+                  _save24 = self.pos
                   _tmp = apply(:_Ticks1)
                   _tmp = _tmp ? nil : true
-                  self.pos = _save25
+                  self.pos = _save24
                   unless _tmp
-                    self.pos = _save24
+                    self.pos = _save23
                     break
                   end
                   _tmp = scan(/\G(?-mix:`+)/)
                   unless _tmp
-                    self.pos = _save24
+                    self.pos = _save23
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save18
+                self.pos = _save17
 
-                _save26 = self.pos
+                _save25 = self.pos
                 while true # sequence
-                  _save27 = self.pos
-
-                  _save28 = self.pos
-                  while true # sequence
-                    _tmp = _Sp()
-                    unless _tmp
-                      self.pos = _save28
-                      break
-                    end
-                    _tmp = apply(:_Ticks1)
-                    unless _tmp
-                      self.pos = _save28
-                    end
-                    break
-                  end # end sequence
-
+                  _save26 = self.pos
+                  _tmp = apply(:_Ticks1)
                   _tmp = _tmp ? nil : true
-                  self.pos = _save27
+                  self.pos = _save26
                   unless _tmp
-                    self.pos = _save26
+                    self.pos = _save25
                     break
                   end
 
-                  _save29 = self.pos
+                  _save27 = self.pos
                   while true # choice
                     _tmp = _Spacechar()
                     break if _tmp
-                    self.pos = _save29
+                    self.pos = _save27
 
-                    _save30 = self.pos
+                    _save28 = self.pos
                     while true # sequence
                       _tmp = _Newline()
                       unless _tmp
-                        self.pos = _save30
+                        self.pos = _save28
                         break
                       end
-                      _save31 = self.pos
+                      _save29 = self.pos
                       _tmp = _BlankLine()
                       _tmp = _tmp ? nil : true
-                      self.pos = _save31
+                      self.pos = _save29
                       unless _tmp
-                        self.pos = _save30
+                        self.pos = _save28
                       end
                       break
                     end # end sequence
 
                     break if _tmp
-                    self.pos = _save29
+                    self.pos = _save27
                     break
                   end # end choice
 
                   unless _tmp
-                    self.pos = _save26
+                    self.pos = _save25
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save18
+                self.pos = _save17
                 break
               end # end choice
 
@@ -12815,11 +13004,6 @@ class RDoc::Markdown
             self.pos = _save2
             break
           end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save2
-            break
-          end
           _tmp = apply(:_Ticks1)
           unless _tmp
             self.pos = _save2
@@ -12830,38 +13014,33 @@ class RDoc::Markdown
         break if _tmp
         self.pos = _save1
 
-        _save32 = self.pos
+        _save30 = self.pos
         while true # sequence
           _tmp = apply(:_Ticks2)
           unless _tmp
-            self.pos = _save32
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save32
+            self.pos = _save30
             break
           end
           _text_start = self.pos
-          _save33 = self.pos
+          _save31 = self.pos
 
-          _save34 = self.pos
+          _save32 = self.pos
           while true # choice
-            _save35 = self.pos
+            _save33 = self.pos
 
-            _save36 = self.pos
+            _save34 = self.pos
             while true # sequence
-              _save37 = self.pos
+              _save35 = self.pos
               _tmp = match_string("`")
               _tmp = _tmp ? nil : true
-              self.pos = _save37
+              self.pos = _save35
               unless _tmp
-                self.pos = _save36
+                self.pos = _save34
                 break
               end
               _tmp = apply(:_Nonspacechar)
               unless _tmp
-                self.pos = _save36
+                self.pos = _save34
               end
               break
             end # end sequence
@@ -12869,19 +13048,19 @@ class RDoc::Markdown
             if _tmp
               while true
 
-                _save38 = self.pos
+                _save36 = self.pos
                 while true # sequence
-                  _save39 = self.pos
+                  _save37 = self.pos
                   _tmp = match_string("`")
                   _tmp = _tmp ? nil : true
-                  self.pos = _save39
+                  self.pos = _save37
                   unless _tmp
-                    self.pos = _save38
+                    self.pos = _save36
                     break
                   end
                   _tmp = apply(:_Nonspacechar)
                   unless _tmp
-                    self.pos = _save38
+                    self.pos = _save36
                   end
                   break
                 end # end sequence
@@ -12890,115 +13069,101 @@ class RDoc::Markdown
               end
               _tmp = true
             else
-              self.pos = _save35
+              self.pos = _save33
             end
             break if _tmp
-            self.pos = _save34
+            self.pos = _save32
 
-            _save40 = self.pos
+            _save38 = self.pos
             while true # sequence
-              _save41 = self.pos
+              _save39 = self.pos
               _tmp = apply(:_Ticks2)
               _tmp = _tmp ? nil : true
-              self.pos = _save41
+              self.pos = _save39
               unless _tmp
-                self.pos = _save40
+                self.pos = _save38
                 break
               end
               _tmp = scan(/\G(?-mix:`+)/)
               unless _tmp
-                self.pos = _save40
+                self.pos = _save38
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save34
+            self.pos = _save32
 
-            _save42 = self.pos
+            _save40 = self.pos
             while true # sequence
-              _save43 = self.pos
-
-              _save44 = self.pos
-              while true # sequence
-                _tmp = _Sp()
-                unless _tmp
-                  self.pos = _save44
-                  break
-                end
-                _tmp = apply(:_Ticks2)
-                unless _tmp
-                  self.pos = _save44
-                end
-                break
-              end # end sequence
-
+              _save41 = self.pos
+              _tmp = apply(:_Ticks2)
               _tmp = _tmp ? nil : true
-              self.pos = _save43
+              self.pos = _save41
               unless _tmp
-                self.pos = _save42
+                self.pos = _save40
                 break
               end
 
-              _save45 = self.pos
+              _save42 = self.pos
               while true # choice
                 _tmp = _Spacechar()
                 break if _tmp
-                self.pos = _save45
+                self.pos = _save42
 
-                _save46 = self.pos
+                _save43 = self.pos
                 while true # sequence
                   _tmp = _Newline()
                   unless _tmp
-                    self.pos = _save46
+                    self.pos = _save43
                     break
                   end
-                  _save47 = self.pos
+                  _save44 = self.pos
                   _tmp = _BlankLine()
                   _tmp = _tmp ? nil : true
-                  self.pos = _save47
+                  self.pos = _save44
                   unless _tmp
-                    self.pos = _save46
+                    self.pos = _save43
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save45
+                self.pos = _save42
                 break
               end # end choice
 
               unless _tmp
-                self.pos = _save42
+                self.pos = _save40
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save34
+            self.pos = _save32
             break
           end # end choice
 
           if _tmp
             while true
 
-              _save48 = self.pos
+              _save45 = self.pos
               while true # choice
-                _save49 = self.pos
+                _save46 = self.pos
 
-                _save50 = self.pos
+                _save47 = self.pos
                 while true # sequence
-                  _save51 = self.pos
+                  _save48 = self.pos
                   _tmp = match_string("`")
                   _tmp = _tmp ? nil : true
-                  self.pos = _save51
+                  self.pos = _save48
                   unless _tmp
-                    self.pos = _save50
+                    self.pos = _save47
                     break
                   end
                   _tmp = apply(:_Nonspacechar)
                   unless _tmp
-                    self.pos = _save50
+                    self.pos = _save47
                   end
                   break
                 end # end sequence
@@ -13006,19 +13171,19 @@ class RDoc::Markdown
                 if _tmp
                   while true
 
-                    _save52 = self.pos
+                    _save49 = self.pos
                     while true # sequence
-                      _save53 = self.pos
+                      _save50 = self.pos
                       _tmp = match_string("`")
                       _tmp = _tmp ? nil : true
-                      self.pos = _save53
+                      self.pos = _save50
                       unless _tmp
-                        self.pos = _save52
+                        self.pos = _save49
                         break
                       end
                       _tmp = apply(:_Nonspacechar)
                       unless _tmp
-                        self.pos = _save52
+                        self.pos = _save49
                       end
                       break
                     end # end sequence
@@ -13027,92 +13192,78 @@ class RDoc::Markdown
                   end
                   _tmp = true
                 else
-                  self.pos = _save49
+                  self.pos = _save46
                 end
                 break if _tmp
-                self.pos = _save48
+                self.pos = _save45
 
-                _save54 = self.pos
+                _save51 = self.pos
                 while true # sequence
-                  _save55 = self.pos
+                  _save52 = self.pos
                   _tmp = apply(:_Ticks2)
                   _tmp = _tmp ? nil : true
-                  self.pos = _save55
+                  self.pos = _save52
                   unless _tmp
-                    self.pos = _save54
+                    self.pos = _save51
                     break
                   end
                   _tmp = scan(/\G(?-mix:`+)/)
                   unless _tmp
-                    self.pos = _save54
+                    self.pos = _save51
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save48
+                self.pos = _save45
 
-                _save56 = self.pos
+                _save53 = self.pos
                 while true # sequence
-                  _save57 = self.pos
-
-                  _save58 = self.pos
-                  while true # sequence
-                    _tmp = _Sp()
-                    unless _tmp
-                      self.pos = _save58
-                      break
-                    end
-                    _tmp = apply(:_Ticks2)
-                    unless _tmp
-                      self.pos = _save58
-                    end
-                    break
-                  end # end sequence
-
+                  _save54 = self.pos
+                  _tmp = apply(:_Ticks2)
                   _tmp = _tmp ? nil : true
-                  self.pos = _save57
+                  self.pos = _save54
                   unless _tmp
-                    self.pos = _save56
+                    self.pos = _save53
                     break
                   end
 
-                  _save59 = self.pos
+                  _save55 = self.pos
                   while true # choice
                     _tmp = _Spacechar()
                     break if _tmp
-                    self.pos = _save59
+                    self.pos = _save55
 
-                    _save60 = self.pos
+                    _save56 = self.pos
                     while true # sequence
                       _tmp = _Newline()
                       unless _tmp
-                        self.pos = _save60
+                        self.pos = _save56
                         break
                       end
-                      _save61 = self.pos
+                      _save57 = self.pos
                       _tmp = _BlankLine()
                       _tmp = _tmp ? nil : true
-                      self.pos = _save61
+                      self.pos = _save57
                       unless _tmp
-                        self.pos = _save60
+                        self.pos = _save56
                       end
                       break
                     end # end sequence
 
                     break if _tmp
-                    self.pos = _save59
+                    self.pos = _save55
                     break
                   end # end choice
 
                   unless _tmp
-                    self.pos = _save56
+                    self.pos = _save53
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save48
+                self.pos = _save45
                 break
               end # end choice
 
@@ -13120,23 +13271,18 @@ class RDoc::Markdown
             end
             _tmp = true
           else
-            self.pos = _save33
+            self.pos = _save31
           end
           if _tmp
             text = get_text(_text_start)
           end
           unless _tmp
-            self.pos = _save32
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save32
+            self.pos = _save30
             break
           end
           _tmp = apply(:_Ticks2)
           unless _tmp
-            self.pos = _save32
+            self.pos = _save30
           end
           break
         end # end sequence
@@ -13144,38 +13290,33 @@ class RDoc::Markdown
         break if _tmp
         self.pos = _save1
 
-        _save62 = self.pos
+        _save58 = self.pos
         while true # sequence
           _tmp = apply(:_Ticks3)
           unless _tmp
-            self.pos = _save62
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save62
+            self.pos = _save58
             break
           end
           _text_start = self.pos
-          _save63 = self.pos
+          _save59 = self.pos
 
-          _save64 = self.pos
+          _save60 = self.pos
           while true # choice
-            _save65 = self.pos
+            _save61 = self.pos
 
-            _save66 = self.pos
+            _save62 = self.pos
             while true # sequence
-              _save67 = self.pos
+              _save63 = self.pos
               _tmp = match_string("`")
               _tmp = _tmp ? nil : true
-              self.pos = _save67
+              self.pos = _save63
               unless _tmp
-                self.pos = _save66
+                self.pos = _save62
                 break
               end
               _tmp = apply(:_Nonspacechar)
               unless _tmp
-                self.pos = _save66
+                self.pos = _save62
               end
               break
             end # end sequence
@@ -13183,19 +13324,19 @@ class RDoc::Markdown
             if _tmp
               while true
 
-                _save68 = self.pos
+                _save64 = self.pos
                 while true # sequence
-                  _save69 = self.pos
+                  _save65 = self.pos
                   _tmp = match_string("`")
                   _tmp = _tmp ? nil : true
-                  self.pos = _save69
+                  self.pos = _save65
                   unless _tmp
-                    self.pos = _save68
+                    self.pos = _save64
                     break
                   end
                   _tmp = apply(:_Nonspacechar)
                   unless _tmp
-                    self.pos = _save68
+                    self.pos = _save64
                   end
                   break
                 end # end sequence
@@ -13204,115 +13345,101 @@ class RDoc::Markdown
               end
               _tmp = true
             else
-              self.pos = _save65
+              self.pos = _save61
             end
             break if _tmp
-            self.pos = _save64
+            self.pos = _save60
 
-            _save70 = self.pos
+            _save66 = self.pos
             while true # sequence
-              _save71 = self.pos
+              _save67 = self.pos
               _tmp = apply(:_Ticks3)
               _tmp = _tmp ? nil : true
-              self.pos = _save71
+              self.pos = _save67
               unless _tmp
-                self.pos = _save70
+                self.pos = _save66
                 break
               end
               _tmp = scan(/\G(?-mix:`+)/)
               unless _tmp
-                self.pos = _save70
+                self.pos = _save66
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save64
+            self.pos = _save60
 
-            _save72 = self.pos
+            _save68 = self.pos
             while true # sequence
-              _save73 = self.pos
-
-              _save74 = self.pos
-              while true # sequence
-                _tmp = _Sp()
-                unless _tmp
-                  self.pos = _save74
-                  break
-                end
-                _tmp = apply(:_Ticks3)
-                unless _tmp
-                  self.pos = _save74
-                end
-                break
-              end # end sequence
-
+              _save69 = self.pos
+              _tmp = apply(:_Ticks3)
               _tmp = _tmp ? nil : true
-              self.pos = _save73
+              self.pos = _save69
               unless _tmp
-                self.pos = _save72
+                self.pos = _save68
                 break
               end
 
-              _save75 = self.pos
+              _save70 = self.pos
               while true # choice
                 _tmp = _Spacechar()
                 break if _tmp
-                self.pos = _save75
+                self.pos = _save70
 
-                _save76 = self.pos
+                _save71 = self.pos
                 while true # sequence
                   _tmp = _Newline()
                   unless _tmp
-                    self.pos = _save76
+                    self.pos = _save71
                     break
                   end
-                  _save77 = self.pos
+                  _save72 = self.pos
                   _tmp = _BlankLine()
                   _tmp = _tmp ? nil : true
-                  self.pos = _save77
+                  self.pos = _save72
                   unless _tmp
-                    self.pos = _save76
+                    self.pos = _save71
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save75
+                self.pos = _save70
                 break
               end # end choice
 
               unless _tmp
-                self.pos = _save72
+                self.pos = _save68
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save64
+            self.pos = _save60
             break
           end # end choice
 
           if _tmp
             while true
 
-              _save78 = self.pos
+              _save73 = self.pos
               while true # choice
-                _save79 = self.pos
+                _save74 = self.pos
 
-                _save80 = self.pos
+                _save75 = self.pos
                 while true # sequence
-                  _save81 = self.pos
+                  _save76 = self.pos
                   _tmp = match_string("`")
                   _tmp = _tmp ? nil : true
-                  self.pos = _save81
+                  self.pos = _save76
                   unless _tmp
-                    self.pos = _save80
+                    self.pos = _save75
                     break
                   end
                   _tmp = apply(:_Nonspacechar)
                   unless _tmp
-                    self.pos = _save80
+                    self.pos = _save75
                   end
                   break
                 end # end sequence
@@ -13320,19 +13447,19 @@ class RDoc::Markdown
                 if _tmp
                   while true
 
-                    _save82 = self.pos
+                    _save77 = self.pos
                     while true # sequence
-                      _save83 = self.pos
+                      _save78 = self.pos
                       _tmp = match_string("`")
                       _tmp = _tmp ? nil : true
-                      self.pos = _save83
+                      self.pos = _save78
                       unless _tmp
-                        self.pos = _save82
+                        self.pos = _save77
                         break
                       end
                       _tmp = apply(:_Nonspacechar)
                       unless _tmp
-                        self.pos = _save82
+                        self.pos = _save77
                       end
                       break
                     end # end sequence
@@ -13341,92 +13468,78 @@ class RDoc::Markdown
                   end
                   _tmp = true
                 else
-                  self.pos = _save79
+                  self.pos = _save74
                 end
                 break if _tmp
-                self.pos = _save78
+                self.pos = _save73
 
-                _save84 = self.pos
+                _save79 = self.pos
                 while true # sequence
-                  _save85 = self.pos
+                  _save80 = self.pos
                   _tmp = apply(:_Ticks3)
                   _tmp = _tmp ? nil : true
-                  self.pos = _save85
+                  self.pos = _save80
                   unless _tmp
-                    self.pos = _save84
+                    self.pos = _save79
                     break
                   end
                   _tmp = scan(/\G(?-mix:`+)/)
                   unless _tmp
-                    self.pos = _save84
+                    self.pos = _save79
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save78
+                self.pos = _save73
 
-                _save86 = self.pos
+                _save81 = self.pos
                 while true # sequence
-                  _save87 = self.pos
-
-                  _save88 = self.pos
-                  while true # sequence
-                    _tmp = _Sp()
-                    unless _tmp
-                      self.pos = _save88
-                      break
-                    end
-                    _tmp = apply(:_Ticks3)
-                    unless _tmp
-                      self.pos = _save88
-                    end
-                    break
-                  end # end sequence
-
+                  _save82 = self.pos
+                  _tmp = apply(:_Ticks3)
                   _tmp = _tmp ? nil : true
-                  self.pos = _save87
+                  self.pos = _save82
                   unless _tmp
-                    self.pos = _save86
+                    self.pos = _save81
                     break
                   end
 
-                  _save89 = self.pos
+                  _save83 = self.pos
                   while true # choice
                     _tmp = _Spacechar()
                     break if _tmp
-                    self.pos = _save89
+                    self.pos = _save83
 
-                    _save90 = self.pos
+                    _save84 = self.pos
                     while true # sequence
                       _tmp = _Newline()
                       unless _tmp
-                        self.pos = _save90
+                        self.pos = _save84
                         break
                       end
-                      _save91 = self.pos
+                      _save85 = self.pos
                       _tmp = _BlankLine()
                       _tmp = _tmp ? nil : true
-                      self.pos = _save91
+                      self.pos = _save85
                       unless _tmp
-                        self.pos = _save90
+                        self.pos = _save84
                       end
                       break
                     end # end sequence
 
                     break if _tmp
-                    self.pos = _save89
+                    self.pos = _save83
                     break
                   end # end choice
 
                   unless _tmp
-                    self.pos = _save86
+                    self.pos = _save81
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save78
+                self.pos = _save73
                 break
               end # end choice
 
@@ -13434,23 +13547,18 @@ class RDoc::Markdown
             end
             _tmp = true
           else
-            self.pos = _save63
+            self.pos = _save59
           end
           if _tmp
             text = get_text(_text_start)
           end
           unless _tmp
-            self.pos = _save62
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save62
+            self.pos = _save58
             break
           end
           _tmp = apply(:_Ticks3)
           unless _tmp
-            self.pos = _save62
+            self.pos = _save58
           end
           break
         end # end sequence
@@ -13458,38 +13566,33 @@ class RDoc::Markdown
         break if _tmp
         self.pos = _save1
 
-        _save92 = self.pos
+        _save86 = self.pos
         while true # sequence
           _tmp = apply(:_Ticks4)
           unless _tmp
-            self.pos = _save92
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save92
+            self.pos = _save86
             break
           end
           _text_start = self.pos
-          _save93 = self.pos
+          _save87 = self.pos
 
-          _save94 = self.pos
+          _save88 = self.pos
           while true # choice
-            _save95 = self.pos
+            _save89 = self.pos
 
-            _save96 = self.pos
+            _save90 = self.pos
             while true # sequence
-              _save97 = self.pos
+              _save91 = self.pos
               _tmp = match_string("`")
               _tmp = _tmp ? nil : true
-              self.pos = _save97
+              self.pos = _save91
               unless _tmp
-                self.pos = _save96
+                self.pos = _save90
                 break
               end
               _tmp = apply(:_Nonspacechar)
               unless _tmp
-                self.pos = _save96
+                self.pos = _save90
               end
               break
             end # end sequence
@@ -13497,19 +13600,19 @@ class RDoc::Markdown
             if _tmp
               while true
 
-                _save98 = self.pos
+                _save92 = self.pos
                 while true # sequence
-                  _save99 = self.pos
+                  _save93 = self.pos
                   _tmp = match_string("`")
                   _tmp = _tmp ? nil : true
-                  self.pos = _save99
+                  self.pos = _save93
                   unless _tmp
-                    self.pos = _save98
+                    self.pos = _save92
                     break
                   end
                   _tmp = apply(:_Nonspacechar)
                   unless _tmp
-                    self.pos = _save98
+                    self.pos = _save92
                   end
                   break
                 end # end sequence
@@ -13518,115 +13621,101 @@ class RDoc::Markdown
               end
               _tmp = true
             else
-              self.pos = _save95
+              self.pos = _save89
             end
             break if _tmp
-            self.pos = _save94
+            self.pos = _save88
 
-            _save100 = self.pos
+            _save94 = self.pos
             while true # sequence
-              _save101 = self.pos
+              _save95 = self.pos
               _tmp = apply(:_Ticks4)
               _tmp = _tmp ? nil : true
-              self.pos = _save101
+              self.pos = _save95
               unless _tmp
-                self.pos = _save100
+                self.pos = _save94
                 break
               end
               _tmp = scan(/\G(?-mix:`+)/)
               unless _tmp
-                self.pos = _save100
+                self.pos = _save94
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save94
+            self.pos = _save88
 
-            _save102 = self.pos
+            _save96 = self.pos
             while true # sequence
-              _save103 = self.pos
-
-              _save104 = self.pos
-              while true # sequence
-                _tmp = _Sp()
-                unless _tmp
-                  self.pos = _save104
-                  break
-                end
-                _tmp = apply(:_Ticks4)
-                unless _tmp
-                  self.pos = _save104
-                end
-                break
-              end # end sequence
-
+              _save97 = self.pos
+              _tmp = apply(:_Ticks4)
               _tmp = _tmp ? nil : true
-              self.pos = _save103
+              self.pos = _save97
               unless _tmp
-                self.pos = _save102
+                self.pos = _save96
                 break
               end
 
-              _save105 = self.pos
+              _save98 = self.pos
               while true # choice
                 _tmp = _Spacechar()
                 break if _tmp
-                self.pos = _save105
+                self.pos = _save98
 
-                _save106 = self.pos
+                _save99 = self.pos
                 while true # sequence
                   _tmp = _Newline()
                   unless _tmp
-                    self.pos = _save106
+                    self.pos = _save99
                     break
                   end
-                  _save107 = self.pos
+                  _save100 = self.pos
                   _tmp = _BlankLine()
                   _tmp = _tmp ? nil : true
-                  self.pos = _save107
+                  self.pos = _save100
                   unless _tmp
-                    self.pos = _save106
+                    self.pos = _save99
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save105
+                self.pos = _save98
                 break
               end # end choice
 
               unless _tmp
-                self.pos = _save102
+                self.pos = _save96
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save94
+            self.pos = _save88
             break
           end # end choice
 
           if _tmp
             while true
 
-              _save108 = self.pos
+              _save101 = self.pos
               while true # choice
-                _save109 = self.pos
+                _save102 = self.pos
 
-                _save110 = self.pos
+                _save103 = self.pos
                 while true # sequence
-                  _save111 = self.pos
+                  _save104 = self.pos
                   _tmp = match_string("`")
                   _tmp = _tmp ? nil : true
-                  self.pos = _save111
+                  self.pos = _save104
                   unless _tmp
-                    self.pos = _save110
+                    self.pos = _save103
                     break
                   end
                   _tmp = apply(:_Nonspacechar)
                   unless _tmp
-                    self.pos = _save110
+                    self.pos = _save103
                   end
                   break
                 end # end sequence
@@ -13634,19 +13723,19 @@ class RDoc::Markdown
                 if _tmp
                   while true
 
-                    _save112 = self.pos
+                    _save105 = self.pos
                     while true # sequence
-                      _save113 = self.pos
+                      _save106 = self.pos
                       _tmp = match_string("`")
                       _tmp = _tmp ? nil : true
-                      self.pos = _save113
+                      self.pos = _save106
                       unless _tmp
-                        self.pos = _save112
+                        self.pos = _save105
                         break
                       end
                       _tmp = apply(:_Nonspacechar)
                       unless _tmp
-                        self.pos = _save112
+                        self.pos = _save105
                       end
                       break
                     end # end sequence
@@ -13655,92 +13744,78 @@ class RDoc::Markdown
                   end
                   _tmp = true
                 else
-                  self.pos = _save109
+                  self.pos = _save102
                 end
                 break if _tmp
-                self.pos = _save108
+                self.pos = _save101
 
-                _save114 = self.pos
+                _save107 = self.pos
                 while true # sequence
-                  _save115 = self.pos
+                  _save108 = self.pos
                   _tmp = apply(:_Ticks4)
                   _tmp = _tmp ? nil : true
-                  self.pos = _save115
+                  self.pos = _save108
                   unless _tmp
-                    self.pos = _save114
+                    self.pos = _save107
                     break
                   end
                   _tmp = scan(/\G(?-mix:`+)/)
                   unless _tmp
-                    self.pos = _save114
+                    self.pos = _save107
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save108
+                self.pos = _save101
 
-                _save116 = self.pos
+                _save109 = self.pos
                 while true # sequence
-                  _save117 = self.pos
-
-                  _save118 = self.pos
-                  while true # sequence
-                    _tmp = _Sp()
-                    unless _tmp
-                      self.pos = _save118
-                      break
-                    end
-                    _tmp = apply(:_Ticks4)
-                    unless _tmp
-                      self.pos = _save118
-                    end
-                    break
-                  end # end sequence
-
+                  _save110 = self.pos
+                  _tmp = apply(:_Ticks4)
                   _tmp = _tmp ? nil : true
-                  self.pos = _save117
+                  self.pos = _save110
                   unless _tmp
-                    self.pos = _save116
+                    self.pos = _save109
                     break
                   end
 
-                  _save119 = self.pos
+                  _save111 = self.pos
                   while true # choice
                     _tmp = _Spacechar()
                     break if _tmp
-                    self.pos = _save119
+                    self.pos = _save111
 
-                    _save120 = self.pos
+                    _save112 = self.pos
                     while true # sequence
                       _tmp = _Newline()
                       unless _tmp
-                        self.pos = _save120
+                        self.pos = _save112
                         break
                       end
-                      _save121 = self.pos
+                      _save113 = self.pos
                       _tmp = _BlankLine()
                       _tmp = _tmp ? nil : true
-                      self.pos = _save121
+                      self.pos = _save113
                       unless _tmp
-                        self.pos = _save120
+                        self.pos = _save112
                       end
                       break
                     end # end sequence
 
                     break if _tmp
-                    self.pos = _save119
+                    self.pos = _save111
                     break
                   end # end choice
 
                   unless _tmp
-                    self.pos = _save116
+                    self.pos = _save109
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save108
+                self.pos = _save101
                 break
               end # end choice
 
@@ -13748,23 +13823,18 @@ class RDoc::Markdown
             end
             _tmp = true
           else
-            self.pos = _save93
+            self.pos = _save87
           end
           if _tmp
             text = get_text(_text_start)
           end
           unless _tmp
-            self.pos = _save92
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save92
+            self.pos = _save86
             break
           end
           _tmp = apply(:_Ticks4)
           unless _tmp
-            self.pos = _save92
+            self.pos = _save86
           end
           break
         end # end sequence
@@ -13772,38 +13842,33 @@ class RDoc::Markdown
         break if _tmp
         self.pos = _save1
 
-        _save122 = self.pos
+        _save114 = self.pos
         while true # sequence
           _tmp = apply(:_Ticks5)
           unless _tmp
-            self.pos = _save122
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save122
+            self.pos = _save114
             break
           end
           _text_start = self.pos
-          _save123 = self.pos
+          _save115 = self.pos
 
-          _save124 = self.pos
+          _save116 = self.pos
           while true # choice
-            _save125 = self.pos
+            _save117 = self.pos
 
-            _save126 = self.pos
+            _save118 = self.pos
             while true # sequence
-              _save127 = self.pos
+              _save119 = self.pos
               _tmp = match_string("`")
               _tmp = _tmp ? nil : true
-              self.pos = _save127
+              self.pos = _save119
               unless _tmp
-                self.pos = _save126
+                self.pos = _save118
                 break
               end
               _tmp = apply(:_Nonspacechar)
               unless _tmp
-                self.pos = _save126
+                self.pos = _save118
               end
               break
             end # end sequence
@@ -13811,19 +13876,19 @@ class RDoc::Markdown
             if _tmp
               while true
 
-                _save128 = self.pos
+                _save120 = self.pos
                 while true # sequence
-                  _save129 = self.pos
+                  _save121 = self.pos
                   _tmp = match_string("`")
                   _tmp = _tmp ? nil : true
-                  self.pos = _save129
+                  self.pos = _save121
                   unless _tmp
-                    self.pos = _save128
+                    self.pos = _save120
                     break
                   end
                   _tmp = apply(:_Nonspacechar)
                   unless _tmp
-                    self.pos = _save128
+                    self.pos = _save120
                   end
                   break
                 end # end sequence
@@ -13832,115 +13897,101 @@ class RDoc::Markdown
               end
               _tmp = true
             else
-              self.pos = _save125
+              self.pos = _save117
             end
             break if _tmp
-            self.pos = _save124
+            self.pos = _save116
 
-            _save130 = self.pos
+            _save122 = self.pos
             while true # sequence
-              _save131 = self.pos
+              _save123 = self.pos
               _tmp = apply(:_Ticks5)
               _tmp = _tmp ? nil : true
-              self.pos = _save131
+              self.pos = _save123
               unless _tmp
-                self.pos = _save130
+                self.pos = _save122
                 break
               end
               _tmp = scan(/\G(?-mix:`+)/)
               unless _tmp
-                self.pos = _save130
+                self.pos = _save122
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save124
+            self.pos = _save116
 
-            _save132 = self.pos
+            _save124 = self.pos
             while true # sequence
-              _save133 = self.pos
-
-              _save134 = self.pos
-              while true # sequence
-                _tmp = _Sp()
-                unless _tmp
-                  self.pos = _save134
-                  break
-                end
-                _tmp = apply(:_Ticks5)
-                unless _tmp
-                  self.pos = _save134
-                end
-                break
-              end # end sequence
-
+              _save125 = self.pos
+              _tmp = apply(:_Ticks5)
               _tmp = _tmp ? nil : true
-              self.pos = _save133
+              self.pos = _save125
               unless _tmp
-                self.pos = _save132
+                self.pos = _save124
                 break
               end
 
-              _save135 = self.pos
+              _save126 = self.pos
               while true # choice
                 _tmp = _Spacechar()
                 break if _tmp
-                self.pos = _save135
+                self.pos = _save126
 
-                _save136 = self.pos
+                _save127 = self.pos
                 while true # sequence
                   _tmp = _Newline()
                   unless _tmp
-                    self.pos = _save136
+                    self.pos = _save127
                     break
                   end
-                  _save137 = self.pos
+                  _save128 = self.pos
                   _tmp = _BlankLine()
                   _tmp = _tmp ? nil : true
-                  self.pos = _save137
+                  self.pos = _save128
                   unless _tmp
-                    self.pos = _save136
+                    self.pos = _save127
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save135
+                self.pos = _save126
                 break
               end # end choice
 
               unless _tmp
-                self.pos = _save132
+                self.pos = _save124
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save124
+            self.pos = _save116
             break
           end # end choice
 
           if _tmp
             while true
 
-              _save138 = self.pos
+              _save129 = self.pos
               while true # choice
-                _save139 = self.pos
+                _save130 = self.pos
 
-                _save140 = self.pos
+                _save131 = self.pos
                 while true # sequence
-                  _save141 = self.pos
+                  _save132 = self.pos
                   _tmp = match_string("`")
                   _tmp = _tmp ? nil : true
-                  self.pos = _save141
+                  self.pos = _save132
                   unless _tmp
-                    self.pos = _save140
+                    self.pos = _save131
                     break
                   end
                   _tmp = apply(:_Nonspacechar)
                   unless _tmp
-                    self.pos = _save140
+                    self.pos = _save131
                   end
                   break
                 end # end sequence
@@ -13948,19 +13999,19 @@ class RDoc::Markdown
                 if _tmp
                   while true
 
-                    _save142 = self.pos
+                    _save133 = self.pos
                     while true # sequence
-                      _save143 = self.pos
+                      _save134 = self.pos
                       _tmp = match_string("`")
                       _tmp = _tmp ? nil : true
-                      self.pos = _save143
+                      self.pos = _save134
                       unless _tmp
-                        self.pos = _save142
+                        self.pos = _save133
                         break
                       end
                       _tmp = apply(:_Nonspacechar)
                       unless _tmp
-                        self.pos = _save142
+                        self.pos = _save133
                       end
                       break
                     end # end sequence
@@ -13969,92 +14020,78 @@ class RDoc::Markdown
                   end
                   _tmp = true
                 else
-                  self.pos = _save139
+                  self.pos = _save130
                 end
                 break if _tmp
-                self.pos = _save138
+                self.pos = _save129
 
-                _save144 = self.pos
+                _save135 = self.pos
                 while true # sequence
-                  _save145 = self.pos
+                  _save136 = self.pos
                   _tmp = apply(:_Ticks5)
                   _tmp = _tmp ? nil : true
-                  self.pos = _save145
+                  self.pos = _save136
                   unless _tmp
-                    self.pos = _save144
+                    self.pos = _save135
                     break
                   end
                   _tmp = scan(/\G(?-mix:`+)/)
                   unless _tmp
-                    self.pos = _save144
+                    self.pos = _save135
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save138
+                self.pos = _save129
 
-                _save146 = self.pos
+                _save137 = self.pos
                 while true # sequence
-                  _save147 = self.pos
-
-                  _save148 = self.pos
-                  while true # sequence
-                    _tmp = _Sp()
-                    unless _tmp
-                      self.pos = _save148
-                      break
-                    end
-                    _tmp = apply(:_Ticks5)
-                    unless _tmp
-                      self.pos = _save148
-                    end
-                    break
-                  end # end sequence
-
+                  _save138 = self.pos
+                  _tmp = apply(:_Ticks5)
                   _tmp = _tmp ? nil : true
-                  self.pos = _save147
+                  self.pos = _save138
                   unless _tmp
-                    self.pos = _save146
+                    self.pos = _save137
                     break
                   end
 
-                  _save149 = self.pos
+                  _save139 = self.pos
                   while true # choice
                     _tmp = _Spacechar()
                     break if _tmp
-                    self.pos = _save149
+                    self.pos = _save139
 
-                    _save150 = self.pos
+                    _save140 = self.pos
                     while true # sequence
                       _tmp = _Newline()
                       unless _tmp
-                        self.pos = _save150
+                        self.pos = _save140
                         break
                       end
-                      _save151 = self.pos
+                      _save141 = self.pos
                       _tmp = _BlankLine()
                       _tmp = _tmp ? nil : true
-                      self.pos = _save151
+                      self.pos = _save141
                       unless _tmp
-                        self.pos = _save150
+                        self.pos = _save140
                       end
                       break
                     end # end sequence
 
                     break if _tmp
-                    self.pos = _save149
+                    self.pos = _save139
                     break
                   end # end choice
 
                   unless _tmp
-                    self.pos = _save146
+                    self.pos = _save137
                   end
                   break
                 end # end sequence
 
                 break if _tmp
-                self.pos = _save138
+                self.pos = _save129
                 break
               end # end choice
 
@@ -14062,23 +14099,18 @@ class RDoc::Markdown
             end
             _tmp = true
           else
-            self.pos = _save123
+            self.pos = _save115
           end
           if _tmp
             text = get_text(_text_start)
           end
           unless _tmp
-            self.pos = _save122
-            break
-          end
-          _tmp = _Sp()
-          unless _tmp
-            self.pos = _save122
+            self.pos = _save114
             break
           end
           _tmp = apply(:_Ticks5)
           unless _tmp
-            self.pos = _save122
+            self.pos = _save114
           end
           break
         end # end sequence
@@ -14092,7 +14124,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  "<code>#{text}</code>" ; end
+      @result = begin;  code text ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -14104,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
@@ -14113,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
@@ -14132,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
@@ -14144,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
 
@@ -14736,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
@@ -14760,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
@@ -14772,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
@@ -14796,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
@@ -14808,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
@@ -14833,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
@@ -14957,7 +15008,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # RawLine = (< (!"\r" !"\n" .)* @Newline > | < .+ > @Eof) { text }
+  # RawLine = (< /[^\r\n]*/ @Newline > | < .+ > @Eof) { text }
   def _RawLine
 
     _save = self.pos
@@ -14969,36 +15020,7 @@ class RDoc::Markdown
 
         _save2 = self.pos
         while true # sequence
-          while true
-
-            _save4 = self.pos
-            while true # sequence
-              _save5 = self.pos
-              _tmp = match_string("\r")
-              _tmp = _tmp ? nil : true
-              self.pos = _save5
-              unless _tmp
-                self.pos = _save4
-                break
-              end
-              _save6 = self.pos
-              _tmp = match_string("\n")
-              _tmp = _tmp ? nil : true
-              self.pos = _save6
-              unless _tmp
-                self.pos = _save4
-                break
-              end
-              _tmp = get_byte
-              unless _tmp
-                self.pos = _save4
-              end
-              break
-            end # end sequence
-
-            break unless _tmp
-          end
-          _tmp = true
+          _tmp = scan(/\G(?-mix:[^\r\n]*)/)
           unless _tmp
             self.pos = _save2
             break
@@ -15016,10 +15038,10 @@ class RDoc::Markdown
         break if _tmp
         self.pos = _save1
 
-        _save7 = self.pos
+        _save3 = self.pos
         while true # sequence
           _text_start = self.pos
-          _save8 = self.pos
+          _save4 = self.pos
           _tmp = get_byte
           if _tmp
             while true
@@ -15028,18 +15050,18 @@ class RDoc::Markdown
             end
             _tmp = true
           else
-            self.pos = _save8
+            self.pos = _save4
           end
           if _tmp
             text = get_text(_text_start)
           end
           unless _tmp
-            self.pos = _save7
+            self.pos = _save3
             break
           end
           _tmp = _Eof()
           unless _tmp
-            self.pos = _save7
+            self.pos = _save3
           end
           break
         end # end sequence
@@ -15456,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
@@ -15547,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
@@ -15585,7 +15609,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # RawNoteBlock = @StartList:a (!@BlankLine OptionallyIndentedLine:l { a << l })+ < @BlankLine* > { a << text } { a }
+  # RawNoteBlock = @StartList:a (!@BlankLine !RawNoteReference OptionallyIndentedLine:l { a << l })+ < @BlankLine* > { a << text } { a }
   def _RawNoteBlock
 
     _save = self.pos
@@ -15608,6 +15632,14 @@ class RDoc::Markdown
           self.pos = _save2
           break
         end
+        _save4 = self.pos
+        _tmp = apply(:_RawNoteReference)
+        _tmp = _tmp ? nil : true
+        self.pos = _save4
+        unless _tmp
+          self.pos = _save2
+          break
+        end
         _tmp = apply(:_OptionallyIndentedLine)
         l = @result
         unless _tmp
@@ -15625,26 +15657,34 @@ class RDoc::Markdown
       if _tmp
         while true
 
-          _save4 = self.pos
+          _save5 = self.pos
           while true # sequence
-            _save5 = self.pos
+            _save6 = self.pos
             _tmp = _BlankLine()
             _tmp = _tmp ? nil : true
-            self.pos = _save5
+            self.pos = _save6
             unless _tmp
-              self.pos = _save4
+              self.pos = _save5
+              break
+            end
+            _save7 = self.pos
+            _tmp = apply(:_RawNoteReference)
+            _tmp = _tmp ? nil : true
+            self.pos = _save7
+            unless _tmp
+              self.pos = _save5
               break
             end
             _tmp = apply(:_OptionallyIndentedLine)
             l = @result
             unless _tmp
-              self.pos = _save4
+              self.pos = _save5
               break
             end
             @result = begin;  a << l ; end
             _tmp = true
             unless _tmp
-              self.pos = _save4
+              self.pos = _save5
             end
             break
           end # end sequence
@@ -15690,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
@@ -15732,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
@@ -15764,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
@@ -15785,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
@@ -15845,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
@@ -15866,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
 
@@ -15903,7 +15953,7 @@ class RDoc::Markdown
         end
         _tmp = true
       else
-        self.pos = _save4
+        self.pos = _save5
       end
       if _tmp
         text = get_text(_text_start)
@@ -15946,7 +15996,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Table = &{ github? } TableRow:header TableLine:line TableRow+:body { table = RDoc::Markup::Table.new(header, line, body) }
+  # Table = &{ github? } TableHead:header TableLine:line TableRow+:body {           table = RDoc::Markup::Table.new(header, line, body)           parse_table_cells(table)         }
   def _Table
 
     _save = self.pos
@@ -15958,7 +16008,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_TableRow)
+      _tmp = apply(:_TableHead)
       header = @result
       unless _tmp
         self.pos = _save
@@ -15990,7 +16040,10 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  table = RDoc::Markup::Table.new(header, line, body) ; end
+      @result = begin;
+          table = RDoc::Markup::Table.new(header, line, body)
+          parse_table_cells(table)
+        ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -16002,18 +16055,18 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # TableRow = TableItem+:row "|" @Newline { row }
-  def _TableRow
+  # TableHead = TableItem2+:items "|"? @Newline { items }
+  def _TableHead
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
       _ary = []
-      _tmp = apply(:_TableItem)
+      _tmp = apply(:_TableItem2)
       if _tmp
         _ary << @result
         while true
-          _tmp = apply(:_TableItem)
+          _tmp = apply(:_TableItem2)
           _ary << @result if _tmp
           break unless _tmp
         end
@@ -16022,12 +16075,17 @@ class RDoc::Markdown
       else
         self.pos = _save1
       end
-      row = @result
+      items = @result
       unless _tmp
         self.pos = _save
         break
       end
+      _save2 = self.pos
       _tmp = match_string("|")
+      unless _tmp
+        _tmp = true
+        self.pos = _save2
+      end
       unless _tmp
         self.pos = _save
         break
@@ -16037,7 +16095,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  row ; end
+      @result = begin;  items ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -16045,90 +16103,99 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_TableRow unless _tmp
+    set_failed_rule :_TableHead unless _tmp
     return _tmp
   end
 
-  # TableItem = "|" < (!"|" !@Newline .)+ > { text.strip }
-  def _TableItem
+  # TableRow = ((TableItem:item1 TableItem2+:items { [item1, *items] }):row | TableItem2+:row) "|"? @Newline { row }
+  def _TableRow
 
     _save = self.pos
     while true # sequence
-      _tmp = match_string("|")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
+
       _save1 = self.pos
+      while true # choice
 
-      _save2 = self.pos
-      while true # sequence
-        _save3 = self.pos
-        _tmp = match_string("|")
-        _tmp = _tmp ? nil : true
-        self.pos = _save3
-        unless _tmp
-          self.pos = _save2
+        _save2 = self.pos
+        while true # sequence
+          _tmp = apply(:_TableItem)
+          item1 = @result
+          unless _tmp
+            self.pos = _save2
+            break
+          end
+          _save3 = self.pos
+          _ary = []
+          _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
+          items = @result
+          unless _tmp
+            self.pos = _save2
+            break
+          end
+          @result = begin;  [item1, *items] ; end
+          _tmp = true
+          unless _tmp
+            self.pos = _save2
+          end
           break
-        end
+        end # end sequence
+
+        row = @result
+        break if _tmp
+        self.pos = _save1
         _save4 = self.pos
-        _tmp = _Newline()
-        _tmp = _tmp ? nil : true
-        self.pos = _save4
-        unless _tmp
-          self.pos = _save2
-          break
-        end
-        _tmp = get_byte
-        unless _tmp
-          self.pos = _save2
+        _ary = []
+        _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 = _save4
         end
+        row = @result
+        break if _tmp
+        self.pos = _save1
         break
-      end # end sequence
-
-      if _tmp
-        while true
-
-          _save5 = self.pos
-          while true # sequence
-            _save6 = self.pos
-            _tmp = match_string("|")
-            _tmp = _tmp ? nil : true
-            self.pos = _save6
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _save7 = self.pos
-            _tmp = _Newline()
-            _tmp = _tmp ? nil : true
-            self.pos = _save7
-            unless _tmp
-              self.pos = _save5
-              break
-            end
-            _tmp = get_byte
-            unless _tmp
-              self.pos = _save5
-            end
-            break
-          end # end sequence
+      end # end choice
 
-          break unless _tmp
-        end
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save5 = self.pos
+      _tmp = match_string("|")
+      unless _tmp
         _tmp = true
-      else
-        self.pos = _save1
+        self.pos = _save5
       end
-      if _tmp
-        text = get_text(_text_start)
+      unless _tmp
+        self.pos = _save
+        break
       end
+      _tmp = _Newline()
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  text.strip ; end
+      @result = begin;  row ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -16136,46 +16203,46 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_TableItem unless _tmp
+    set_failed_rule :_TableRow unless _tmp
     return _tmp
   end
 
-  # TableLine = TableColumn+:line "|" @Newline { line }
-  def _TableLine
+  # TableItem2 = "|" TableItem
+  def _TableItem2
 
     _save = self.pos
     while true # sequence
-      _save1 = self.pos
-      _ary = []
-      _tmp = apply(:_TableColumn)
-      if _tmp
-        _ary << @result
-        while true
-          _tmp = apply(:_TableColumn)
-          _ary << @result if _tmp
-          break unless _tmp
-        end
-        _tmp = true
-        @result = _ary
-      else
-        self.pos = _save1
-      end
-      line = @result
+      _tmp = match_string("|")
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = match_string("|")
+      _tmp = apply(:_TableItem)
       unless _tmp
         self.pos = _save
-        break
       end
-      _tmp = _Newline()
+      break
+    end # end sequence
+
+    set_failed_rule :_TableItem2 unless _tmp
+    return _tmp
+  end
+
+  # TableItem = < /(?:\\.|[^|\n])+/ > { text.strip.gsub(/\\([|])/, '\1')  }
+  def _TableItem
+
+    _save = self.pos
+    while true # sequence
+      _text_start = self.pos
+      _tmp = scan(/\G(?-mix:(?:\\.|[^|\n])+)/)
+      if _tmp
+        text = get_text(_text_start)
+      end
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  line ; end
+      @result = begin;  text.strip.gsub(/\\([|])/, '\1')  ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -16183,80 +16250,143 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_TableLine unless _tmp
+    set_failed_rule :_TableItem unless _tmp
     return _tmp
   end
 
-  # TableColumn = "|" < ("-"+ ":"? | ":" "-"*) > { text.start_with?(":") ? :left :                 text.end_with?(":") ? :right : nil               }
-  def _TableColumn
+  # TableLine = ((TableAlign:align1 TableAlign2+:aligns {[align1, *aligns] }):line | TableAlign2+:line) "|"? @Newline { line }
+  def _TableLine
 
     _save = self.pos
     while true # sequence
-      _tmp = match_string("|")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _text_start = self.pos
 
       _save1 = self.pos
       while true # choice
 
         _save2 = self.pos
         while true # sequence
+          _tmp = apply(:_TableAlign)
+          align1 = @result
+          unless _tmp
+            self.pos = _save2
+            break
+          end
           _save3 = self.pos
-          _tmp = match_string("-")
+          _ary = []
+          _tmp = apply(:_TableAlign2)
           if _tmp
+            _ary << @result
             while true
-              _tmp = match_string("-")
+              _tmp = apply(:_TableAlign2)
+              _ary << @result if _tmp
               break unless _tmp
             end
             _tmp = true
+            @result = _ary
           else
             self.pos = _save3
           end
+          aligns = @result
           unless _tmp
             self.pos = _save2
             break
           end
-          _save4 = self.pos
-          _tmp = match_string(":")
-          unless _tmp
-            _tmp = true
-            self.pos = _save4
-          end
+          @result = begin; [align1, *aligns] ; end
+          _tmp = true
           unless _tmp
             self.pos = _save2
           end
           break
         end # end sequence
 
+        line = @result
         break if _tmp
         self.pos = _save1
-
-        _save5 = self.pos
-        while true # sequence
-          _tmp = match_string(":")
-          unless _tmp
-            self.pos = _save5
-            break
-          end
+        _save4 = self.pos
+        _ary = []
+        _tmp = apply(:_TableAlign2)
+        if _tmp
+          _ary << @result
           while true
-            _tmp = match_string("-")
+            _tmp = apply(:_TableAlign2)
+            _ary << @result if _tmp
             break unless _tmp
           end
           _tmp = true
-          unless _tmp
-            self.pos = _save5
-          end
-          break
-        end # end sequence
-
+          @result = _ary
+        else
+          self.pos = _save4
+        end
+        line = @result
         break if _tmp
         self.pos = _save1
         break
       end # end choice
 
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save5 = self.pos
+      _tmp = match_string("|")
+      unless _tmp
+        _tmp = true
+        self.pos = _save5
+      end
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = _Newline()
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  line ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_TableLine unless _tmp
+    return _tmp
+  end
+
+  # TableAlign2 = "|" @Sp TableAlign
+  def _TableAlign2
+
+    _save = self.pos
+    while true # sequence
+      _tmp = match_string("|")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = _Sp()
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_TableAlign)
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_TableAlign2 unless _tmp
+    return _tmp
+  end
+
+  # TableAlign = < /:?-+:?/ > @Sp {                 text.start_with?(":") ?                 (text.end_with?(":") ? :center : :left) :                 (text.end_with?(":") ? :right : nil)               }
+  def _TableAlign
+
+    _save = self.pos
+    while true # sequence
+      _text_start = self.pos
+      _tmp = scan(/\G(?-mix::?-+:?)/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -16264,8 +16394,15 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  text.start_with?(":") ? :left :
-                text.end_with?(":") ? :right : nil
+      _tmp = _Sp()
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;
+                text.start_with?(":") ?
+                (text.end_with?(":") ? :center : :left) :
+                (text.end_with?(":") ? :right : nil)
               ; end
       _tmp = true
       unless _tmp
@@ -16274,7 +16411,7 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_TableColumn unless _tmp
+    set_failed_rule :_TableAlign unless _tmp
     return _tmp
   end
 
@@ -16388,12 +16525,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # DefinitionListLabel = StrChunk:label @Sp @Newline { label }
+  # DefinitionListLabel = Inline:label @Sp @Newline { label }
   def _DefinitionListLabel
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_StrChunk)
+      _tmp = apply(:_Inline)
       label = @result
       unless _tmp
         self.pos = _save
@@ -16482,7 +16619,7 @@ class RDoc::Markdown
   Rules[:_Plain] = rule_info("Plain", "Inlines:a { paragraph a }")
   Rules[:_AtxInline] = rule_info("AtxInline", "!@Newline !(@Sp /\#*/ @Sp @Newline) Inline")
   Rules[:_AtxStart] = rule_info("AtxStart", "< /\\\#{1,6}/ > { text.length }")
-  Rules[:_AtxHeading] = rule_info("AtxHeading", "AtxStart:s @Sp AtxInline+:a (@Sp /\#*/ @Sp)? @Newline { RDoc::Markup::Heading.new(s, a.join) }")
+  Rules[:_AtxHeading] = rule_info("AtxHeading", "AtxStart:s @Spacechar+ AtxInline+:a (@Sp /\#*/ @Sp)? @Newline { RDoc::Markup::Heading.new(s, a.join) }")
   Rules[:_SetextHeading] = rule_info("SetextHeading", "(SetextHeading1 | SetextHeading2)")
   Rules[:_SetextBottom1] = rule_info("SetextBottom1", "/={1,}/ @Newline")
   Rules[:_SetextBottom2] = rule_info("SetextBottom2", "/-{1,}/ @Newline")
@@ -16490,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) }")
@@ -16622,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 })")
@@ -16644,12 +16781,13 @@ class RDoc::Markdown
   Rules[:_StrongStar] = rule_info("StrongStar", "\"**\" !@Whitespace @StartList:a (!\"**\" Inline:b { a << b })+ \"**\" { strong a.join }")
   Rules[:_StrongUl] = rule_info("StrongUl", "\"__\" !@Whitespace @StartList:a (!\"__\" Inline:b { a << b })+ \"__\" { strong a.join }")
   Rules[:_Strike] = rule_info("Strike", "&{ strike? } \"~~\" !@Whitespace @StartList:a (!\"~~\" Inline:b { a << b })+ \"~~\" { strike a.join }")
-  Rules[:_Image] = rule_info("Image", "\"!\" (ExplicitLink | ReferenceLink):a { \"rdoc-image:\#{a[/\\[(.*)\\]/, 1]}\" }")
+  Rules[:_Image] = rule_info("Image", "\"!\" ExplicitLinkWithLabel:a { \"rdoc-image:\#{a[:link]}:\#{a[:label]}\" }")
   Rules[:_Link] = rule_info("Link", "(ExplicitLink | ReferenceLink | AutoLink)")
   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", "Label:l \"(\" @Sp Source:s Spnl Title @Sp \")\" { \"{\#{l}}[\#{s}]\" }")
+  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 \")\")*")
   Rules[:_Title] = rule_info("Title", "(TitleSingle | TitleDouble | \"\"):a { a }")
@@ -16672,8 +16810,9 @@ class RDoc::Markdown
   Rules[:_Ticks3] = rule_info("Ticks3", "\"```\" !\"`\"")
   Rules[:_Ticks4] = rule_info("Ticks4", "\"````\" !\"`\"")
   Rules[:_Ticks5] = rule_info("Ticks5", "\"`````\" !\"`\"")
-  Rules[:_Code] = rule_info("Code", "(Ticks1 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks1 /`+/ | !(@Sp Ticks1) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks1 | Ticks2 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks2 /`+/ | !(@Sp Ticks2) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks2 | Ticks3 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | !(@Sp Ticks3) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks3 | Ticks4 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks4 /`+/ | !(@Sp Ticks4) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks4 | Ticks5 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks5 /`+/ | !(@Sp Ticks5) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks5) { \"<code>\#{text}</code>\" }")
-  Rules[:_RawHtml] = rule_info("RawHtml", "< (HtmlComment | HtmlBlockScript | HtmlTag) > { if html? then text else '' end }")
+  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", "< (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")
@@ -16691,33 +16830,36 @@ 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")
   Rules[:_OptionallyIndentedLine] = rule_info("OptionallyIndentedLine", "Indent? Line")
   Rules[:_StartList] = rule_info("StartList", "&. { [] }")
   Rules[:_Line] = rule_info("Line", "@RawLine:a { a }")
-  Rules[:_RawLine] = rule_info("RawLine", "(< (!\"\\r\" !\"\\n\" .)* @Newline > | < .+ > @Eof) { text }")
+  Rules[:_RawLine] = rule_info("RawLine", "(< /[^\\r\\n]*/ @Newline > | < .+ > @Eof) { text }")
   Rules[:_SkipBlock] = rule_info("SkipBlock", "(HtmlBlock | (!\"\#\" !SetextBottom1 !SetextBottom2 !@BlankLine @RawLine)+ @BlankLine* | @BlankLine+ | @RawLine)")
   Rules[:_ExtendedSpecialChar] = rule_info("ExtendedSpecialChar", "&{ notes? } \"^\"")
   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 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[:_Table] = rule_info("Table", "&{ github? } TableRow:header TableLine:line TableRow+:body { table = RDoc::Markup::Table.new(header, line, body) }")
-  Rules[:_TableRow] = rule_info("TableRow", "TableItem+:row \"|\" @Newline { row }")
-  Rules[:_TableItem] = rule_info("TableItem", "\"|\" < (!\"|\" !@Newline .)+ > { text.strip }")
-  Rules[:_TableLine] = rule_info("TableLine", "TableColumn+:line \"|\" @Newline { line }")
-  Rules[:_TableColumn] = rule_info("TableColumn", "\"|\" < (\"-\"+ \":\"? | \":\" \"-\"*) > { text.start_with?(\":\") ? :left :                 text.end_with?(\":\") ? :right : nil               }")
+  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)? @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[:_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[:_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 }")
   Rules[:_DefinitionListItem] = rule_info("DefinitionListItem", "DefinitionListLabel+:label DefinitionListDefinition+:defns { list_items = []                        list_items <<                          RDoc::Markup::ListItem.new(label, defns.shift)                         list_items.concat defns.map { |defn|                          RDoc::Markup::ListItem.new nil, defn                        } unless list_items.empty?                         list_items                      }")
-  Rules[:_DefinitionListLabel] = rule_info("DefinitionListLabel", "StrChunk:label @Sp @Newline { label }")
+  Rules[:_DefinitionListLabel] = rule_info("DefinitionListLabel", "Inline:label @Sp @Newline { label }")
   Rules[:_DefinitionListDefinition] = rule_info("DefinitionListDefinition", "@NonindentSpace \":\" @Space Inlines:a @BlankLine+ { paragraph a }")
   # :startdoc:
 end