rdoc 5.1.0 → 6.13.1

data/lib/rdoc/markdown.rb

@@ -1,11 +1,12 @@
 # coding: UTF-8
+# frozen_string_literal: true
 # :markup: markdown
 
 ##
 # 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
@@ -81,6 +82,18 @@
 # :   A little insect that is known
 # to enjoy picnics
 #
+# ### Strike
+#
+# Example:
+#
+# ```
+# This is ~~striked~~.
+# ```
+#
+# Produces:
+#
+# This is ~~striked~~.
+#
 # ### Github
 #
 # The #github extension enables a partial set of [Github Flavored Markdown]
@@ -160,9 +173,9 @@
 # The port to kpeg was performed by Eric Hodel and Evan Phoenix
 #
 # [dingus]: http://daringfireball.net/projects/markdown/dingus
-# [GFM]: http://github.github.com/github-flavored-markdown/
+# [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
@@ -186,6 +199,7 @@ class RDoc::Markdown
       @result = nil
       @failed_rule = nil
       @failing_rule_offset = -1
+      @line_offsets = nil
 
       setup_foreign_grammar
     end
@@ -195,30 +209,75 @@ class RDoc::Markdown
     attr_accessor :result, :pos
 
     def current_column(target=pos)
-      if c = string.rindex("\n", target-1)
-        return target - c - 1
+      if string[target] == "\n" && (c = string.rindex("\n", target-1) || -1)
+        return target - c
+      elsif c = string.rindex("\n", target)
+        return target - c
       end
 
       target + 1
     end
 
-    def current_line(target=pos)
-      cur_offset = 0
-      cur_line = 0
+    def position_line_offsets
+      unless @position_line_offsets
+        @position_line_offsets = []
+        total = 0
+        string.each_line do |line|
+          total += line.size
+          @position_line_offsets << total
+        end
+      end
+      @position_line_offsets
+    end
+
+    if [].respond_to? :bsearch_index
+      def current_line(target=pos)
+        if line = position_line_offsets.bsearch_index {|x| x > target }
+          return line + 1
+        end
+        raise "Target position #{target} is outside of string"
+      end
+    else
+      def current_line(target=pos)
+        if line = position_line_offsets.index {|x| x > target }
+          return line + 1
+        end
+
+        raise "Target position #{target} is outside of string"
+      end
+    end
 
-      string.each_line do |line|
-        cur_line += 1
-        cur_offset += line.size
-        return cur_line if cur_offset >= target
+    def current_character(target=pos)
+      if target < 0 || target >= string.size
+        raise "Target position #{target} is outside of string"
       end
+      string[target, 1]
+    end
+
+    KpegPosInfo = Struct.new(:pos, :lno, :col, :line, :char)
 
-      -1
+    def current_pos_info(target=pos)
+      l = current_line target
+      c = current_column target
+      ln = get_line(l-1)
+      chr = string[target,1]
+      KpegPosInfo.new(target, l, c, ln, chr)
     end
 
     def lines
-      lines = []
-      string.each_line { |l| lines << l }
-      lines
+      string.lines
+    end
+
+    def get_line(no)
+      loff = position_line_offsets
+      if no < 0
+        raise "Line No is out of range: #{no} < 0"
+      elsif no >= loff.size
+        raise "Line No is out of range: #{no} >= #{loff.size}"
+      end
+      lend = loff[no]-1
+      lstart = no > 0 ? loff[no-1] : 0
+      string[lstart..lend]
     end
 
 
@@ -232,6 +291,7 @@ class RDoc::Markdown
       @string = string
       @string_size = string ? string.size : 0
       @pos = pos
+      @position_line_offsets = nil
     end
 
     def show_pos
@@ -256,30 +316,22 @@ class RDoc::Markdown
     end
 
     def failure_caret
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-
-      line = lines[l-1]
-      "#{line}\n#{' ' * (c - 1)}^"
+      p = current_pos_info @failing_rule_offset
+      "#{p.line.chomp}\n#{' ' * (p.col - 1)}^"
     end
 
     def failure_character
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-      lines[l-1][c-1, 1]
+      current_character @failing_rule_offset
     end
 
     def failure_oneline
-      l = current_line @failing_rule_offset
-      c = current_column @failing_rule_offset
-
-      char = lines[l-1][c-1, 1]
+      p = current_pos_info @failing_rule_offset
 
       if @failed_rule.kind_of? Symbol
         info = self.class::Rules[@failed_rule]
-        "@#{l}:#{c} failed rule '#{info.name}', got '#{char}'"
+        "@#{p.lno}:#{p.col} failed rule '#{info.name}', got '#{p.char}'"
       else
-        "@#{l}:#{c} failed rule '#{@failed_rule}', got '#{char}'"
+        "@#{p.lno}:#{p.col} failed rule '#{@failed_rule}', got '#{p.char}'"
       end
     end
 
@@ -292,10 +344,9 @@ class RDoc::Markdown
 
     def show_error(io=STDOUT)
       error_pos = @failing_rule_offset
-      line_no = current_line(error_pos)
-      col_no = current_column(error_pos)
+      p = current_pos_info(error_pos)
 
-      io.puts "On line #{line_no}, column #{col_no}:"
+      io.puts "On line #{p.lno}, column #{p.col}:"
 
       if @failed_rule.kind_of? Symbol
         info = self.class::Rules[@failed_rule]
@@ -304,10 +355,9 @@ class RDoc::Markdown
         io.puts "Failed to match rule '#{@failed_rule}'"
       end
 
-      io.puts "Got: #{string[error_pos,1].inspect}"
-      line = lines[line_no-1]
-      io.puts "=> #{line}"
-      io.print(" " * (col_no + 3))
+      io.puts "Got: #{p.char.inspect}"
+      io.puts "=> #{p.line}"
+      io.print(" " * (p.col + 2))
       io.puts "^"
     end
 
@@ -331,9 +381,8 @@ class RDoc::Markdown
     end
 
     def scan(reg)
-      if m = reg.match(@string[@pos..-1])
-        width = m.end(0)
-        @pos += width
+      if m = reg.match(@string, @pos)
+        @pos = m.end(0)
         return true
       end
 
@@ -417,6 +466,7 @@ class RDoc::Markdown
     end
 
     def apply_with_args(rule, *args)
+      @result = nil
       memo_key = [rule, args]
       if m = @memoizations[memo_key][@pos]
         @pos = m.pos
@@ -450,6 +500,7 @@ class RDoc::Markdown
     end
 
     def apply(rule)
+      @result = nil
       if m = @memoizations[rule][@pos]
         @pos = m.pos
         if !m.set
@@ -521,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
@@ -540,6 +591,7 @@ class RDoc::Markdown
     :github,
     :html,
     :notes,
+    :strike,
   ]
 
   # :section: Extensions
@@ -590,6 +642,11 @@ class RDoc::Markdown
 
   extension :notes
 
+  ##
+  # Enables the strike extension
+
+  extension :strike
+
   # :section:
 
   ##
@@ -678,7 +735,7 @@ class RDoc::Markdown
   # with the linking `text` (usually whitespace).
 
   def link_to content, label = content, text = nil
-    raise 'enable notes extension' if
+    raise ParseError, 'enable notes extension' if
       content.start_with? '^' and label.equal? content
 
     if ref = @references[label] then
@@ -777,7 +834,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
@@ -814,6 +871,17 @@ class RDoc::Markdown
     end
   end
 
+  ##
+  # Wraps `text` in strike markup for rdoc inline formatting
+
+  def strike text
+    if text =~ /\A[a-z\d.\/-]+\z/i then
+      "~#{text}~"
+    else
+      "<s>#{text}</s>"
+    end
+  end
+
 
   # :stopdoc:
   def setup_foreign_grammar
@@ -867,7 +935,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Block = @BlankLine* (BlockQuote | Verbatim | CodeFence | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)
+  # Block = @BlankLine* (BlockQuote | Verbatim | CodeFence | Table | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)
   def _Block
 
     _save = self.pos
@@ -893,6 +961,9 @@ class RDoc::Markdown
         _tmp = apply(:_CodeFence)
         break if _tmp
         self.pos = _save2
+        _tmp = apply(:_Table)
+        break if _tmp
+        self.pos = _save2
         _tmp = apply(:_Note)
         break if _tmp
         self.pos = _save2
@@ -1005,7 +1076,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # AtxInline = !@Newline !(@Sp? /#*/ @Sp @Newline) Inline
+  # AtxInline = !@Newline !(@Sp /#*/ @Sp @Newline) Inline
   def _AtxInline
 
     _save = self.pos
@@ -1022,17 +1093,12 @@ class RDoc::Markdown
 
       _save3 = self.pos
       while true # sequence
-        _save4 = self.pos
         _tmp = _Sp()
-        unless _tmp
-          _tmp = true
-          self.pos = _save4
-        end
         unless _tmp
           self.pos = _save3
           break
         end
-        _tmp = scan(/\A(?-mix:#*)/)
+        _tmp = scan(/\G(?-mix:#*)/)
         unless _tmp
           self.pos = _save3
           break
@@ -1072,7 +1138,7 @@ class RDoc::Markdown
     _save = self.pos
     while true # sequence
       _text_start = self.pos
-      _tmp = scan(/\A(?-mix:\#{1,6})/)
+      _tmp = scan(/\G(?-mix:\#{1,6})/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -1092,7 +1158,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
@@ -1104,9 +1170,14 @@ class RDoc::Markdown
         break
       end
       _save1 = self.pos
-      _tmp = _Sp()
-      unless _tmp
+      _tmp = _Spacechar()
+      if _tmp
+        while true
+          _tmp = _Spacechar()
+          break unless _tmp
+        end
         _tmp = true
+      else
         self.pos = _save1
       end
       unless _tmp
@@ -1137,17 +1208,12 @@ class RDoc::Markdown
 
       _save4 = self.pos
       while true # sequence
-        _save5 = self.pos
         _tmp = _Sp()
-        unless _tmp
-          _tmp = true
-          self.pos = _save5
-        end
         unless _tmp
           self.pos = _save4
           break
         end
-        _tmp = scan(/\A(?-mix:#*)/)
+        _tmp = scan(/\G(?-mix:#*)/)
         unless _tmp
           self.pos = _save4
           break
@@ -1202,12 +1268,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SetextBottom1 = /={3,}/ @Newline
+  # SetextBottom1 = /={1,}/ @Newline
   def _SetextBottom1
 
     _save = self.pos
     while true # sequence
-      _tmp = scan(/\A(?-mix:={3,})/)
+      _tmp = scan(/\G(?-mix:={1,})/)
       unless _tmp
         self.pos = _save
         break
@@ -1223,12 +1289,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SetextBottom2 = /-{3,}/ @Newline
+  # SetextBottom2 = /-{1,}/ @Newline
   def _SetextBottom2
 
     _save = self.pos
     while true # sequence
-      _tmp = scan(/\A(?-mix:-{3,})/)
+      _tmp = scan(/\G(?-mix:-{1,})/)
       unless _tmp
         self.pos = _save
         break
@@ -1244,7 +1310,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SetextHeading1 = &(@RawLine SetextBottom1) @StartList:a (!@Endline Inline:b { a << b })+ @Sp? @Newline SetextBottom1 { RDoc::Markup::Heading.new(1, a.join) }
+  # SetextHeading1 = &(@RawLine SetextBottom1) @StartList:a (!@Endline Inline:b { a << b })+ @Sp @Newline SetextBottom1 { RDoc::Markup::Heading.new(1, a.join) }
   def _SetextHeading1
 
     _save = self.pos
@@ -1339,12 +1405,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _save8 = self.pos
       _tmp = _Sp()
-      unless _tmp
-        _tmp = true
-        self.pos = _save8
-      end
       unless _tmp
         self.pos = _save
         break
@@ -1371,7 +1432,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SetextHeading2 = &(@RawLine SetextBottom2) @StartList:a (!@Endline Inline:b { a << b })+ @Sp? @Newline SetextBottom2 { RDoc::Markup::Heading.new(2, a.join) }
+  # SetextHeading2 = &(@RawLine SetextBottom2) @StartList:a (!@Endline Inline:b { a << b })+ @Sp @Newline SetextBottom2 { RDoc::Markup::Heading.new(2, a.join) }
   def _SetextHeading2
 
     _save = self.pos
@@ -1466,12 +1527,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _save8 = self.pos
       _tmp = _Sp()
-      unless _tmp
-        _tmp = true
-        self.pos = _save8
-      end
       unless _tmp
         self.pos = _save
         break
@@ -2122,7 +2178,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = scan(/\A(?-mix:[+*-])/)
+      _tmp = scan(/\G(?-mix:[+*-])/)
       unless _tmp
         self.pos = _save
         break
@@ -8446,7 +8502,162 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # HtmlBlockInTags = (HtmlAnchor | HtmlBlockAddress | HtmlBlockBlockquote | HtmlBlockCenter | HtmlBlockDir | HtmlBlockDiv | HtmlBlockDl | HtmlBlockFieldset | HtmlBlockForm | HtmlBlockH1 | HtmlBlockH2 | HtmlBlockH3 | HtmlBlockH4 | HtmlBlockH5 | HtmlBlockH6 | HtmlBlockMenu | HtmlBlockNoframes | HtmlBlockNoscript | HtmlBlockOl | HtmlBlockP | HtmlBlockPre | HtmlBlockTable | HtmlBlockUl | HtmlBlockDd | HtmlBlockDt | HtmlBlockFrameset | HtmlBlockLi | HtmlBlockTbody | HtmlBlockTd | HtmlBlockTfoot | HtmlBlockTh | HtmlBlockThead | HtmlBlockTr | HtmlBlockScript)
+  # HtmlBlockOpenHead = "<" Spnl ("head" | "HEAD") Spnl HtmlAttribute* ">"
+  def _HtmlBlockOpenHead
+
+    _save = self.pos
+    while true # sequence
+      _tmp = match_string("<")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Spnl)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+
+      _save1 = self.pos
+      while true # choice
+        _tmp = match_string("head")
+        break if _tmp
+        self.pos = _save1
+        _tmp = match_string("HEAD")
+        break if _tmp
+        self.pos = _save1
+        break
+      end # end choice
+
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Spnl)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      while true
+        _tmp = apply(:_HtmlAttribute)
+        break unless _tmp
+      end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string(">")
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_HtmlBlockOpenHead unless _tmp
+    return _tmp
+  end
+
+  # HtmlBlockCloseHead = "<" Spnl "/" ("head" | "HEAD") Spnl ">"
+  def _HtmlBlockCloseHead
+
+    _save = self.pos
+    while true # sequence
+      _tmp = match_string("<")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Spnl)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string("/")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+
+      _save1 = self.pos
+      while true # choice
+        _tmp = match_string("head")
+        break if _tmp
+        self.pos = _save1
+        _tmp = match_string("HEAD")
+        break if _tmp
+        self.pos = _save1
+        break
+      end # end choice
+
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Spnl)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string(">")
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_HtmlBlockCloseHead unless _tmp
+    return _tmp
+  end
+
+  # HtmlBlockHead = HtmlBlockOpenHead (!HtmlBlockCloseHead .)* HtmlBlockCloseHead
+  def _HtmlBlockHead
+
+    _save = self.pos
+    while true # sequence
+      _tmp = apply(:_HtmlBlockOpenHead)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      while true
+
+        _save2 = self.pos
+        while true # sequence
+          _save3 = self.pos
+          _tmp = apply(:_HtmlBlockCloseHead)
+          _tmp = _tmp ? nil : true
+          self.pos = _save3
+          unless _tmp
+            self.pos = _save2
+            break
+          end
+          _tmp = get_byte
+          unless _tmp
+            self.pos = _save2
+          end
+          break
+        end # end sequence
+
+        break unless _tmp
+      end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_HtmlBlockCloseHead)
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_HtmlBlockHead unless _tmp
+    return _tmp
+  end
+
+  # HtmlBlockInTags = (HtmlAnchor | HtmlBlockAddress | HtmlBlockBlockquote | HtmlBlockCenter | HtmlBlockDir | HtmlBlockDiv | HtmlBlockDl | HtmlBlockFieldset | HtmlBlockForm | HtmlBlockH1 | HtmlBlockH2 | HtmlBlockH3 | HtmlBlockH4 | HtmlBlockH5 | HtmlBlockH6 | HtmlBlockMenu | HtmlBlockNoframes | HtmlBlockNoscript | HtmlBlockOl | HtmlBlockP | HtmlBlockPre | HtmlBlockTable | HtmlBlockUl | HtmlBlockDd | HtmlBlockDt | HtmlBlockFrameset | HtmlBlockLi | HtmlBlockTbody | HtmlBlockTd | HtmlBlockTfoot | HtmlBlockTh | HtmlBlockThead | HtmlBlockTr | HtmlBlockScript | HtmlBlockHead)
   def _HtmlBlockInTags
 
     _save = self.pos
@@ -8553,6 +8764,9 @@ class RDoc::Markdown
       _tmp = apply(:_HtmlBlockScript)
       break if _tmp
       self.pos = _save
+      _tmp = apply(:_HtmlBlockHead)
+      break if _tmp
+      self.pos = _save
       break
     end # end choice
 
@@ -9157,7 +9371,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Inlines = (!@Endline Inline:i { i } | @Endline:c &Inline { c })+:chunks @Endline? { chunks }
+  # Inlines = (!@Endline Inline:i { i } | @Endline:c !(&{ github? } Ticks3 /[^`\n]*$/) &Inline { c })+:chunks @Endline? { chunks }
   def _Inlines
 
     _save = self.pos
@@ -9204,12 +9418,41 @@ class RDoc::Markdown
             break
           end
           _save6 = self.pos
-          _tmp = apply(:_Inline)
+
+          _save7 = self.pos
+          while true # sequence
+            _save8 = self.pos
+            _tmp = begin;  github? ; end
+            self.pos = _save8
+            unless _tmp
+              self.pos = _save7
+              break
+            end
+            _tmp = apply(:_Ticks3)
+            unless _tmp
+              self.pos = _save7
+              break
+            end
+            _tmp = scan(/\G(?-mix:[^`\n]*$)/)
+            unless _tmp
+              self.pos = _save7
+            end
+            break
+          end # end sequence
+
+          _tmp = _tmp ? nil : true
           self.pos = _save6
           unless _tmp
             self.pos = _save5
             break
           end
+          _save9 = self.pos
+          _tmp = apply(:_Inline)
+          self.pos = _save9
+          unless _tmp
+            self.pos = _save5
+            break
+          end
           @result = begin;  c ; end
           _tmp = true
           unless _tmp
@@ -9227,61 +9470,90 @@ class RDoc::Markdown
         _ary << @result
         while true
 
-          _save7 = self.pos
+          _save10 = self.pos
           while true # choice
 
-            _save8 = self.pos
+            _save11 = self.pos
             while true # sequence
-              _save9 = self.pos
+              _save12 = self.pos
               _tmp = _Endline()
               _tmp = _tmp ? nil : true
-              self.pos = _save9
+              self.pos = _save12
               unless _tmp
-                self.pos = _save8
+                self.pos = _save11
                 break
               end
               _tmp = apply(:_Inline)
               i = @result
               unless _tmp
-                self.pos = _save8
+                self.pos = _save11
                 break
               end
               @result = begin;  i ; end
               _tmp = true
               unless _tmp
-                self.pos = _save8
+                self.pos = _save11
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save7
+            self.pos = _save10
 
-            _save10 = self.pos
+            _save13 = self.pos
             while true # sequence
               _tmp = _Endline()
               c = @result
               unless _tmp
-                self.pos = _save10
+                self.pos = _save13
                 break
               end
-              _save11 = self.pos
+              _save14 = self.pos
+
+              _save15 = self.pos
+              while true # sequence
+                _save16 = self.pos
+                _tmp = begin;  github? ; end
+                self.pos = _save16
+                unless _tmp
+                  self.pos = _save15
+                  break
+                end
+                _tmp = apply(:_Ticks3)
+                unless _tmp
+                  self.pos = _save15
+                  break
+                end
+                _tmp = scan(/\G(?-mix:[^`\n]*$)/)
+                unless _tmp
+                  self.pos = _save15
+                end
+                break
+              end # end sequence
+
+              _tmp = _tmp ? nil : true
+              self.pos = _save14
+              unless _tmp
+                self.pos = _save13
+                break
+              end
+              _save17 = self.pos
               _tmp = apply(:_Inline)
-              self.pos = _save11
+              self.pos = _save17
               unless _tmp
-                self.pos = _save10
+                self.pos = _save13
                 break
               end
               @result = begin;  c ; end
               _tmp = true
               unless _tmp
-                self.pos = _save10
+                self.pos = _save13
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save7
+            self.pos = _save10
             break
           end # end choice
 
@@ -9298,11 +9570,11 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _save12 = self.pos
+      _save18 = self.pos
       _tmp = _Endline()
       unless _tmp
         _tmp = true
-        self.pos = _save12
+        self.pos = _save18
       end
       unless _tmp
         self.pos = _save
@@ -9320,7 +9592,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Inline = (Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)
+  # Inline = (Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Strike | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)
   def _Inline
 
     _save = self.pos
@@ -9343,6 +9615,9 @@ class RDoc::Markdown
       _tmp = apply(:_Emph)
       break if _tmp
       self.pos = _save
+      _tmp = apply(:_Strike)
+      break if _tmp
+      self.pos = _save
       _tmp = apply(:_Image)
       break if _tmp
       self.pos = _save
@@ -9498,7 +9773,7 @@ class RDoc::Markdown
 
         _save3 = self.pos
         while true # sequence
-          _tmp = scan(/\A(?-mix:_+)/)
+          _tmp = scan(/\G(?-mix:_+)/)
           unless _tmp
             self.pos = _save3
             break
@@ -9528,7 +9803,7 @@ class RDoc::Markdown
 
             _save6 = self.pos
             while true # sequence
-              _tmp = scan(/\A(?-mix:_+)/)
+              _tmp = scan(/\G(?-mix:_+)/)
               unless _tmp
                 self.pos = _save6
                 break
@@ -9591,7 +9866,7 @@ class RDoc::Markdown
         break
       end
       _text_start = self.pos
-      _tmp = scan(/\A(?-mix:[:\\`|*_{}\[\]()#+.!><-])/)
+      _tmp = scan(/\G(?-mix:[:\\`|*_{}\[\]()#+.!><-])/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -9669,7 +9944,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # NormalEndline = @Sp @Newline !@BlankLine !">" !AtxStart !(Line /={3,}|-{3,}=/ @Newline) { "\n" }
+  # NormalEndline = @Sp @Newline !@BlankLine !">" !AtxStart !(Line /={1,}|-{1,}/ @Newline) { "\n" }
   def _NormalEndline
 
     _save = self.pos
@@ -9717,7 +9992,7 @@ class RDoc::Markdown
           self.pos = _save5
           break
         end
-        _tmp = scan(/\A(?-mix:={3,}|-{3,}=)/)
+        _tmp = scan(/\G(?-mix:={1,}|-{1,})/)
         unless _tmp
           self.pos = _save5
           break
@@ -9869,7 +10144,7 @@ class RDoc::Markdown
       _save1 = self.pos
       while true # sequence
         _text_start = self.pos
-        _tmp = scan(/\A(?-mix:\*{4,})/)
+        _tmp = scan(/\G(?-mix:\*{4,})/)
         if _tmp
           text = get_text(_text_start)
         end
@@ -9899,7 +10174,7 @@ class RDoc::Markdown
             self.pos = _save3
             break
           end
-          _tmp = scan(/\A(?-mix:\*+)/)
+          _tmp = scan(/\G(?-mix:\*+)/)
           unless _tmp
             self.pos = _save3
             break
@@ -9946,7 +10221,7 @@ class RDoc::Markdown
       _save1 = self.pos
       while true # sequence
         _text_start = self.pos
-        _tmp = scan(/\A(?-mix:_{4,})/)
+        _tmp = scan(/\G(?-mix:_{4,})/)
         if _tmp
           text = get_text(_text_start)
         end
@@ -9976,7 +10251,7 @@ class RDoc::Markdown
             self.pos = _save3
             break
           end
-          _tmp = scan(/\A(?-mix:_+)/)
+          _tmp = scan(/\G(?-mix:_+)/)
           unless _tmp
             self.pos = _save3
             break
@@ -10032,96 +10307,38 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # OneStarOpen = !StarLine "*" !@Spacechar !@Newline
-  def _OneStarOpen
+  # Whitespace = (@Spacechar | @Newline)
+  def _Whitespace
 
     _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = apply(:_StarLine)
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = match_string("*")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
+    while true # choice
       _tmp = _Spacechar()
-      _tmp = _tmp ? nil : true
-      self.pos = _save2
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save3 = self.pos
+      break if _tmp
+      self.pos = _save
       _tmp = _Newline()
-      _tmp = _tmp ? nil : true
-      self.pos = _save3
-      unless _tmp
-        self.pos = _save
-      end
+      break if _tmp
+      self.pos = _save
       break
-    end # end sequence
+    end # end choice
 
-    set_failed_rule :_OneStarOpen unless _tmp
+    set_failed_rule :_Whitespace unless _tmp
     return _tmp
   end
 
-  # OneStarClose = !@Spacechar !@Newline Inline:a "*" { a }
-  def _OneStarClose
+  # EmphStar = "*" !@Whitespace @StartList:a (!"*" Inline:b { a << b } | StrongStar:b { a << b })+ "*" { emphasis a.join }
+  def _EmphStar
 
     _save = self.pos
     while true # sequence
-      _save1 = self.pos
-      _tmp = _Spacechar()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _tmp = _Newline()
-      _tmp = _tmp ? nil : true
-      self.pos = _save2
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Inline)
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
       _tmp = match_string("*")
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_OneStarClose unless _tmp
-    return _tmp
-  end
-
-  # EmphStar = OneStarOpen @StartList:a (!OneStarClose Inline:l { a << l })* OneStarClose:l { a << l } { emphasis a.join }
-  def _EmphStar
-
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_OneStarOpen)
+      _save1 = self.pos
+      _tmp = _Whitespace()
+      _tmp = _tmp ? nil : true
+      self.pos = _save1
       unless _tmp
         self.pos = _save
         break
@@ -10132,47 +10349,124 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      while true
+      _save2 = self.pos
 
-        _save2 = self.pos
+      _save3 = self.pos
+      while true # choice
+
+        _save4 = self.pos
         while true # sequence
-          _save3 = self.pos
-          _tmp = apply(:_OneStarClose)
+          _save5 = self.pos
+          _tmp = match_string("*")
           _tmp = _tmp ? nil : true
-          self.pos = _save3
+          self.pos = _save5
           unless _tmp
-            self.pos = _save2
+            self.pos = _save4
             break
           end
           _tmp = apply(:_Inline)
-          l = @result
+          b = @result
           unless _tmp
-            self.pos = _save2
+            self.pos = _save4
             break
           end
-          @result = begin;  a << l ; end
+          @result = begin;  a << b ; end
           _tmp = true
           unless _tmp
-            self.pos = _save2
+            self.pos = _save4
           end
           break
         end # end sequence
 
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
+        break if _tmp
+        self.pos = _save3
+
+        _save6 = self.pos
+        while true # sequence
+          _tmp = apply(:_StrongStar)
+          b = @result
+          unless _tmp
+            self.pos = _save6
+            break
+          end
+          @result = begin;  a << b ; end
+          _tmp = true
+          unless _tmp
+            self.pos = _save6
+          end
+          break
+        end # end sequence
+
+        break if _tmp
+        self.pos = _save3
         break
+      end # end choice
+
+      if _tmp
+        while true
+
+          _save7 = self.pos
+          while true # choice
+
+            _save8 = self.pos
+            while true # sequence
+              _save9 = self.pos
+              _tmp = match_string("*")
+              _tmp = _tmp ? nil : true
+              self.pos = _save9
+              unless _tmp
+                self.pos = _save8
+                break
+              end
+              _tmp = apply(:_Inline)
+              b = @result
+              unless _tmp
+                self.pos = _save8
+                break
+              end
+              @result = begin;  a << b ; end
+              _tmp = true
+              unless _tmp
+                self.pos = _save8
+              end
+              break
+            end # end sequence
+
+            break if _tmp
+            self.pos = _save7
+
+            _save10 = self.pos
+            while true # sequence
+              _tmp = apply(:_StrongStar)
+              b = @result
+              unless _tmp
+                self.pos = _save10
+                break
+              end
+              @result = begin;  a << b ; end
+              _tmp = true
+              unless _tmp
+                self.pos = _save10
+              end
+              break
+            end # end sequence
+
+            break if _tmp
+            self.pos = _save7
+            break
+          end # end choice
+
+          break unless _tmp
+        end
+        _tmp = true
+      else
+        self.pos = _save2
       end
-      _tmp = apply(:_OneStarClose)
-      l = @result
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  a << l ; end
-      _tmp = true
+      _tmp = match_string("*")
       unless _tmp
         self.pos = _save
         break
@@ -10189,147 +10483,148 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # OneUlOpen = !UlLine "_" !@Spacechar !@Newline
-  def _OneUlOpen
+  # EmphUl = "_" !@Whitespace @StartList:a (!"_" Inline:b { a << b } | StrongUl:b { a << b })+ "_" { emphasis a.join }
+  def _EmphUl
 
     _save = self.pos
     while true # sequence
-      _save1 = self.pos
-      _tmp = apply(:_UlLine)
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
       _tmp = match_string("_")
       unless _tmp
         self.pos = _save
         break
       end
-      _save2 = self.pos
-      _tmp = _Spacechar()
-      _tmp = _tmp ? nil : true
-      self.pos = _save2
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save3 = self.pos
-      _tmp = _Newline()
-      _tmp = _tmp ? nil : true
-      self.pos = _save3
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_OneUlOpen unless _tmp
-    return _tmp
-  end
-
-  # OneUlClose = !@Spacechar !@Newline Inline:a "_" { a }
-  def _OneUlClose
-
-    _save = self.pos
-    while true # sequence
       _save1 = self.pos
-      _tmp = _Spacechar()
+      _tmp = _Whitespace()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
         self.pos = _save
         break
       end
-      _save2 = self.pos
-      _tmp = _Newline()
-      _tmp = _tmp ? nil : true
-      self.pos = _save2
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = apply(:_Inline)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = match_string("_")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_OneUlClose unless _tmp
-    return _tmp
-  end
-
-  # EmphUl = OneUlOpen @StartList:a (!OneUlClose Inline:l { a << l })* OneUlClose:l { a << l } { emphasis a.join }
-  def _EmphUl
+      _save2 = self.pos
 
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_OneUlOpen)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      while true
+      _save3 = self.pos
+      while true # choice
 
-        _save2 = self.pos
+        _save4 = self.pos
         while true # sequence
-          _save3 = self.pos
-          _tmp = apply(:_OneUlClose)
+          _save5 = self.pos
+          _tmp = match_string("_")
           _tmp = _tmp ? nil : true
-          self.pos = _save3
+          self.pos = _save5
           unless _tmp
-            self.pos = _save2
+            self.pos = _save4
             break
           end
           _tmp = apply(:_Inline)
-          l = @result
+          b = @result
           unless _tmp
-            self.pos = _save2
+            self.pos = _save4
             break
           end
-          @result = begin;  a << l ; end
+          @result = begin;  a << b ; end
           _tmp = true
           unless _tmp
-            self.pos = _save2
+            self.pos = _save4
           end
           break
         end # end sequence
 
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
+        break if _tmp
+        self.pos = _save3
+
+        _save6 = self.pos
+        while true # sequence
+          _tmp = apply(:_StrongUl)
+          b = @result
+          unless _tmp
+            self.pos = _save6
+            break
+          end
+          @result = begin;  a << b ; end
+          _tmp = true
+          unless _tmp
+            self.pos = _save6
+          end
+          break
+        end # end sequence
+
+        break if _tmp
+        self.pos = _save3
         break
+      end # end choice
+
+      if _tmp
+        while true
+
+          _save7 = self.pos
+          while true # choice
+
+            _save8 = self.pos
+            while true # sequence
+              _save9 = self.pos
+              _tmp = match_string("_")
+              _tmp = _tmp ? nil : true
+              self.pos = _save9
+              unless _tmp
+                self.pos = _save8
+                break
+              end
+              _tmp = apply(:_Inline)
+              b = @result
+              unless _tmp
+                self.pos = _save8
+                break
+              end
+              @result = begin;  a << b ; end
+              _tmp = true
+              unless _tmp
+                self.pos = _save8
+              end
+              break
+            end # end sequence
+
+            break if _tmp
+            self.pos = _save7
+
+            _save10 = self.pos
+            while true # sequence
+              _tmp = apply(:_StrongUl)
+              b = @result
+              unless _tmp
+                self.pos = _save10
+                break
+              end
+              @result = begin;  a << b ; end
+              _tmp = true
+              unless _tmp
+                self.pos = _save10
+              end
+              break
+            end # end sequence
+
+            break if _tmp
+            self.pos = _save7
+            break
+          end # end choice
+
+          break unless _tmp
+        end
+        _tmp = true
+      else
+        self.pos = _save2
       end
-      _tmp = apply(:_OneUlClose)
-      l = @result
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  a << l ; end
-      _tmp = true
+      _tmp = match_string("_")
       unless _tmp
         self.pos = _save
         break
@@ -10364,69 +10659,89 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # TwoStarOpen = !StarLine "**" !@Spacechar !@Newline
-  def _TwoStarOpen
+  # StrongStar = "**" !@Whitespace @StartList:a (!"**" Inline:b { a << b })+ "**" { strong a.join }
+  def _StrongStar
 
     _save = self.pos
     while true # sequence
-      _save1 = self.pos
-      _tmp = apply(:_StarLine)
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
-      unless _tmp
-        self.pos = _save
-        break
-      end
       _tmp = match_string("**")
       unless _tmp
         self.pos = _save
         break
       end
-      _save2 = self.pos
-      _tmp = _Spacechar()
+      _save1 = self.pos
+      _tmp = _Whitespace()
       _tmp = _tmp ? nil : true
-      self.pos = _save2
+      self.pos = _save1
       unless _tmp
         self.pos = _save
         break
       end
-      _save3 = self.pos
-      _tmp = _Newline()
-      _tmp = _tmp ? nil : true
-      self.pos = _save3
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TwoStarOpen unless _tmp
-    return _tmp
-  end
-
-  # TwoStarClose = !@Spacechar !@Newline Inline:a "**" { a }
-  def _TwoStarClose
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = _Spacechar()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
+      _tmp = _StartList()
+      a = @result
       unless _tmp
         self.pos = _save
         break
       end
       _save2 = self.pos
-      _tmp = _Newline()
-      _tmp = _tmp ? nil : true
-      self.pos = _save2
-      unless _tmp
-        self.pos = _save
+
+      _save3 = self.pos
+      while true # sequence
+        _save4 = self.pos
+        _tmp = match_string("**")
+        _tmp = _tmp ? nil : true
+        self.pos = _save4
+        unless _tmp
+          self.pos = _save3
+          break
+        end
+        _tmp = apply(:_Inline)
+        b = @result
+        unless _tmp
+          self.pos = _save3
+          break
+        end
+        @result = begin;  a << b ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save3
+        end
         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
+            _tmp = apply(:_Inline)
+            b = @result
+            unless _tmp
+              self.pos = _save5
+              break
+            end
+            @result = begin;  a << b ; end
+            _tmp = true
+            unless _tmp
+              self.pos = _save5
+            end
+            break
+          end # end sequence
+
+          break unless _tmp
+        end
+        _tmp = true
+      else
+        self.pos = _save2
       end
-      _tmp = apply(:_Inline)
-      a = @result
       unless _tmp
         self.pos = _save
         break
@@ -10436,7 +10751,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  a ; end
+      @result = begin;  strong a.join ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -10444,16 +10759,24 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_TwoStarClose unless _tmp
+    set_failed_rule :_StrongStar unless _tmp
     return _tmp
   end
 
-  # StrongStar = TwoStarOpen @StartList:a (!TwoStarClose Inline:l { a << l })* TwoStarClose:l { a << l } { strong a.join }
-  def _StrongStar
+  # StrongUl = "__" !@Whitespace @StartList:a (!"__" Inline:b { a << b })+ "__" { strong a.join }
+  def _StrongUl
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_TwoStarOpen)
+      _tmp = match_string("__")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save1 = self.pos
+      _tmp = _Whitespace()
+      _tmp = _tmp ? nil : true
+      self.pos = _save1
       unless _tmp
         self.pos = _save
         break
@@ -10464,47 +10787,70 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      while true
+      _save2 = self.pos
 
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-          _tmp = apply(:_TwoStarClose)
-          _tmp = _tmp ? nil : true
+      _save3 = self.pos
+      while true # sequence
+        _save4 = self.pos
+        _tmp = match_string("__")
+        _tmp = _tmp ? nil : true
+        self.pos = _save4
+        unless _tmp
           self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = apply(:_Inline)
-          l = @result
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          @result = begin;  a << l ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save2
-          end
           break
-        end # end sequence
-
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
+        end
+        _tmp = apply(:_Inline)
+        b = @result
+        unless _tmp
+          self.pos = _save3
+          break
+        end
+        @result = begin;  a << b ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save3
+        end
         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
+            _tmp = apply(:_Inline)
+            b = @result
+            unless _tmp
+              self.pos = _save5
+              break
+            end
+            @result = begin;  a << b ; end
+            _tmp = true
+            unless _tmp
+              self.pos = _save5
+            end
+            break
+          end # end sequence
+
+          break unless _tmp
+        end
+        _tmp = true
+      else
+        self.pos = _save2
       end
-      _tmp = apply(:_TwoStarClose)
-      l = @result
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  a << l ; end
-      _tmp = true
+      _tmp = match_string("__")
       unless _tmp
         self.pos = _save
         break
@@ -10517,156 +10863,110 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_StrongStar unless _tmp
+    set_failed_rule :_StrongUl unless _tmp
     return _tmp
   end
 
-  # TwoUlOpen = !UlLine "__" !@Spacechar !@Newline
-  def _TwoUlOpen
+  # Strike = &{ strike? } "~~" !@Whitespace @StartList:a (!"~~" Inline:b { a << b })+ "~~" { strike a.join }
+  def _Strike
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
-      _tmp = apply(:_UlLine)
-      _tmp = _tmp ? nil : true
+      _tmp = begin;  strike? ; end
       self.pos = _save1
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = match_string("__")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save2 = self.pos
-      _tmp = _Spacechar()
-      _tmp = _tmp ? nil : true
-      self.pos = _save2
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _save3 = self.pos
-      _tmp = _Newline()
-      _tmp = _tmp ? nil : true
-      self.pos = _save3
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TwoUlOpen unless _tmp
-    return _tmp
-  end
-
-  # TwoUlClose = !@Spacechar !@Newline Inline:a "__" { a }
-  def _TwoUlClose
-
-    _save = self.pos
-    while true # sequence
-      _save1 = self.pos
-      _tmp = _Spacechar()
-      _tmp = _tmp ? nil : true
-      self.pos = _save1
+      _tmp = match_string("~~")
       unless _tmp
         self.pos = _save
         break
       end
       _save2 = self.pos
-      _tmp = _Newline()
+      _tmp = _Whitespace()
       _tmp = _tmp ? nil : true
       self.pos = _save2
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_Inline)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = match_string("__")
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      @result = begin;  a ; end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-      end
-      break
-    end # end sequence
-
-    set_failed_rule :_TwoUlClose unless _tmp
-    return _tmp
-  end
-
-  # StrongUl = TwoUlOpen @StartList:a (!TwoUlClose Inline:i { a << i })* TwoUlClose:l { a << l } { strong a.join }
-  def _StrongUl
+      _save3 = self.pos
 
-    _save = self.pos
-    while true # sequence
-      _tmp = apply(:_TwoUlOpen)
-      unless _tmp
-        self.pos = _save
-        break
-      end
-      _tmp = _StartList()
-      a = @result
-      unless _tmp
-        self.pos = _save
+      _save4 = self.pos
+      while true # sequence
+        _save5 = self.pos
+        _tmp = match_string("~~")
+        _tmp = _tmp ? nil : true
+        self.pos = _save5
+        unless _tmp
+          self.pos = _save4
+          break
+        end
+        _tmp = apply(:_Inline)
+        b = @result
+        unless _tmp
+          self.pos = _save4
+          break
+        end
+        @result = begin;  a << b ; end
+        _tmp = true
+        unless _tmp
+          self.pos = _save4
+        end
         break
-      end
-      while true
+      end # end sequence
 
-        _save2 = self.pos
-        while true # sequence
-          _save3 = self.pos
-          _tmp = apply(:_TwoUlClose)
-          _tmp = _tmp ? nil : true
-          self.pos = _save3
-          unless _tmp
-            self.pos = _save2
-            break
-          end
-          _tmp = apply(:_Inline)
-          i = @result
-          unless _tmp
-            self.pos = _save2
+      if _tmp
+        while true
+
+          _save6 = self.pos
+          while true # sequence
+            _save7 = self.pos
+            _tmp = match_string("~~")
+            _tmp = _tmp ? nil : true
+            self.pos = _save7
+            unless _tmp
+              self.pos = _save6
+              break
+            end
+            _tmp = apply(:_Inline)
+            b = @result
+            unless _tmp
+              self.pos = _save6
+              break
+            end
+            @result = begin;  a << b ; end
+            _tmp = true
+            unless _tmp
+              self.pos = _save6
+            end
             break
-          end
-          @result = begin;  a << i ; end
-          _tmp = true
-          unless _tmp
-            self.pos = _save2
-          end
-          break
-        end # end sequence
+          end # end sequence
 
-        break unless _tmp
-      end
-      _tmp = true
-      unless _tmp
-        self.pos = _save
-        break
+          break unless _tmp
+        end
+        _tmp = true
+      else
+        self.pos = _save3
       end
-      _tmp = apply(:_TwoUlClose)
-      l = @result
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  a << l ; end
-      _tmp = true
+      _tmp = match_string("~~")
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  strong a.join ; end
+      @result = begin;  strike a.join ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -10674,11 +10974,11 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_StrongUl unless _tmp
+    set_failed_rule :_Strike unless _tmp
     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
@@ -10688,24 +10988,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
@@ -10853,18 +11142,36 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # ExplicitLink = Label:l Spnl "(" @Sp Source:s Spnl Title @Sp ")" { "{#{l}}[#{s}]" }
+  # ExplicitLink = ExplicitLinkWithLabel:a { "{#{a[:label]}}[#{a[:link]}]" }
   def _ExplicitLink
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_Label)
-      l = @result
+      _tmp = apply(:_ExplicitLinkWithLabel)
+      a = @result
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_Spnl)
+      @result = begin;  "{#{a[:label]}}[#{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)
+      label = @result
       unless _tmp
         self.pos = _save
         break
@@ -10880,7 +11187,7 @@ class RDoc::Markdown
         break
       end
       _tmp = apply(:_Source)
-      s = @result
+      link = @result
       unless _tmp
         self.pos = _save
         break
@@ -10905,7 +11212,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
@@ -10913,7 +11220,7 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_ExplicitLink unless _tmp
+    set_failed_rule :_ExplicitLinkWithLabel unless _tmp
     return _tmp
   end
 
@@ -10977,130 +11284,119 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SourceContents = (((!"(" !")" !">" Nonspacechar)+ | "(" SourceContents ")")* | "")
+  # SourceContents = ((!"(" !")" !">" Nonspacechar)+ | "(" SourceContents ")")*
   def _SourceContents
+    while true
 
-    _save = self.pos
-    while true # choice
-      while true
-
+      _save1 = self.pos
+      while true # choice
         _save2 = self.pos
-        while true # choice
-          _save3 = self.pos
 
+        _save3 = self.pos
+        while true # sequence
           _save4 = self.pos
-          while true # sequence
-            _save5 = self.pos
-            _tmp = match_string("(")
-            _tmp = _tmp ? nil : true
-            self.pos = _save5
-            unless _tmp
-              self.pos = _save4
-              break
-            end
-            _save6 = self.pos
-            _tmp = match_string(")")
-            _tmp = _tmp ? nil : true
-            self.pos = _save6
-            unless _tmp
-              self.pos = _save4
-              break
-            end
-            _save7 = self.pos
-            _tmp = match_string(">")
-            _tmp = _tmp ? nil : true
-            self.pos = _save7
-            unless _tmp
-              self.pos = _save4
-              break
-            end
-            _tmp = apply(:_Nonspacechar)
-            unless _tmp
-              self.pos = _save4
-            end
+          _tmp = match_string("(")
+          _tmp = _tmp ? nil : true
+          self.pos = _save4
+          unless _tmp
+            self.pos = _save3
             break
-          end # end sequence
+          end
+          _save5 = self.pos
+          _tmp = match_string(")")
+          _tmp = _tmp ? nil : true
+          self.pos = _save5
+          unless _tmp
+            self.pos = _save3
+            break
+          end
+          _save6 = self.pos
+          _tmp = match_string(">")
+          _tmp = _tmp ? nil : true
+          self.pos = _save6
+          unless _tmp
+            self.pos = _save3
+            break
+          end
+          _tmp = apply(:_Nonspacechar)
+          unless _tmp
+            self.pos = _save3
+          end
+          break
+        end # end sequence
 
-          if _tmp
-            while true
+        if _tmp
+          while true
 
+            _save7 = self.pos
+            while true # sequence
               _save8 = self.pos
-              while true # sequence
-                _save9 = self.pos
-                _tmp = match_string("(")
-                _tmp = _tmp ? nil : true
-                self.pos = _save9
-                unless _tmp
-                  self.pos = _save8
-                  break
-                end
-                _save10 = self.pos
-                _tmp = match_string(")")
-                _tmp = _tmp ? nil : true
-                self.pos = _save10
-                unless _tmp
-                  self.pos = _save8
-                  break
-                end
-                _save11 = self.pos
-                _tmp = match_string(">")
-                _tmp = _tmp ? nil : true
-                self.pos = _save11
-                unless _tmp
-                  self.pos = _save8
-                  break
-                end
-                _tmp = apply(:_Nonspacechar)
-                unless _tmp
-                  self.pos = _save8
-                end
+              _tmp = match_string("(")
+              _tmp = _tmp ? nil : true
+              self.pos = _save8
+              unless _tmp
+                self.pos = _save7
                 break
-              end # end sequence
+              end
+              _save9 = self.pos
+              _tmp = match_string(")")
+              _tmp = _tmp ? nil : true
+              self.pos = _save9
+              unless _tmp
+                self.pos = _save7
+                break
+              end
+              _save10 = self.pos
+              _tmp = match_string(">")
+              _tmp = _tmp ? nil : true
+              self.pos = _save10
+              unless _tmp
+                self.pos = _save7
+                break
+              end
+              _tmp = apply(:_Nonspacechar)
+              unless _tmp
+                self.pos = _save7
+              end
+              break
+            end # end sequence
 
-              break unless _tmp
-            end
-            _tmp = true
-          else
-            self.pos = _save3
+            break unless _tmp
           end
-          break if _tmp
+          _tmp = true
+        else
           self.pos = _save2
+        end
+        break if _tmp
+        self.pos = _save1
 
-          _save12 = self.pos
-          while true # sequence
-            _tmp = match_string("(")
-            unless _tmp
-              self.pos = _save12
-              break
-            end
-            _tmp = apply(:_SourceContents)
-            unless _tmp
-              self.pos = _save12
-              break
-            end
-            _tmp = match_string(")")
-            unless _tmp
-              self.pos = _save12
-            end
+        _save11 = self.pos
+        while true # sequence
+          _tmp = match_string("(")
+          unless _tmp
+            self.pos = _save11
             break
-          end # end sequence
-
-          break if _tmp
-          self.pos = _save2
+          end
+          _tmp = apply(:_SourceContents)
+          unless _tmp
+            self.pos = _save11
+            break
+          end
+          _tmp = match_string(")")
+          unless _tmp
+            self.pos = _save11
+          end
           break
-        end # end choice
+        end # end sequence
 
-        break unless _tmp
-      end
-      _tmp = true
-      break if _tmp
-      self.pos = _save
-      _tmp = match_string("")
-      break if _tmp
-      self.pos = _save
-      break
-    end # end choice
+        break if _tmp
+        self.pos = _save1
+        break
+      end # end choice
 
+      break unless _tmp
+    end
+    _tmp = true
     set_failed_rule :_SourceContents unless _tmp
     return _tmp
   end
@@ -11328,7 +11624,7 @@ class RDoc::Markdown
 
       _save1 = self.pos
       while true # sequence
-        _tmp = scan(/\A(?-mix:[A-Za-z]+)/)
+        _tmp = scan(/\G(?-mix:[A-Za-z]+)/)
         unless _tmp
           self.pos = _save1
           break
@@ -11453,7 +11749,7 @@ class RDoc::Markdown
 
       _save2 = self.pos
       while true # sequence
-        _tmp = scan(/\A(?i-mx:[\w+.\/!%~$-]+)/)
+        _tmp = scan(/\G(?i-mx:[\w+.\/!%~$-]+)/)
         unless _tmp
           self.pos = _save2
           break
@@ -12317,7 +12613,7 @@ class RDoc::Markdown
                 self.pos = _save10
                 break
               end
-              _tmp = scan(/\A(?-mix:`+)/)
+              _tmp = scan(/\G(?-mix:`+)/)
               unless _tmp
                 self.pos = _save10
               end
@@ -12454,7 +12750,7 @@ class RDoc::Markdown
                     self.pos = _save24
                     break
                   end
-                  _tmp = scan(/\A(?-mix:`+)/)
+                  _tmp = scan(/\G(?-mix:`+)/)
                   unless _tmp
                     self.pos = _save24
                   end
@@ -12631,7 +12927,7 @@ class RDoc::Markdown
                 self.pos = _save40
                 break
               end
-              _tmp = scan(/\A(?-mix:`+)/)
+              _tmp = scan(/\G(?-mix:`+)/)
               unless _tmp
                 self.pos = _save40
               end
@@ -12768,7 +13064,7 @@ class RDoc::Markdown
                     self.pos = _save54
                     break
                   end
-                  _tmp = scan(/\A(?-mix:`+)/)
+                  _tmp = scan(/\G(?-mix:`+)/)
                   unless _tmp
                     self.pos = _save54
                   end
@@ -12945,7 +13241,7 @@ class RDoc::Markdown
                 self.pos = _save70
                 break
               end
-              _tmp = scan(/\A(?-mix:`+)/)
+              _tmp = scan(/\G(?-mix:`+)/)
               unless _tmp
                 self.pos = _save70
               end
@@ -13082,7 +13378,7 @@ class RDoc::Markdown
                     self.pos = _save84
                     break
                   end
-                  _tmp = scan(/\A(?-mix:`+)/)
+                  _tmp = scan(/\G(?-mix:`+)/)
                   unless _tmp
                     self.pos = _save84
                   end
@@ -13259,7 +13555,7 @@ class RDoc::Markdown
                 self.pos = _save100
                 break
               end
-              _tmp = scan(/\A(?-mix:`+)/)
+              _tmp = scan(/\G(?-mix:`+)/)
               unless _tmp
                 self.pos = _save100
               end
@@ -13396,7 +13692,7 @@ class RDoc::Markdown
                     self.pos = _save114
                     break
                   end
-                  _tmp = scan(/\A(?-mix:`+)/)
+                  _tmp = scan(/\G(?-mix:`+)/)
                   unless _tmp
                     self.pos = _save114
                   end
@@ -13573,7 +13869,7 @@ class RDoc::Markdown
                 self.pos = _save130
                 break
               end
-              _tmp = scan(/\A(?-mix:`+)/)
+              _tmp = scan(/\G(?-mix:`+)/)
               unless _tmp
                 self.pos = _save130
               end
@@ -13710,7 +14006,7 @@ class RDoc::Markdown
                     self.pos = _save144
                     break
                   end
-                  _tmp = scan(/\A(?-mix:`+)/)
+                  _tmp = scan(/\G(?-mix:`+)/)
                   unless _tmp
                     self.pos = _save144
                   end
@@ -14357,12 +14653,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SpecialChar = (/[*_`&\[\]()<!#\\'"]/ | @ExtendedSpecialChar)
+  # SpecialChar = (/[~*_`&\[\]()<!#\\'"]/ | @ExtendedSpecialChar)
   def _SpecialChar
 
     _save = self.pos
     while true # choice
-      _tmp = scan(/\A(?-mix:[*_`&\[\]()<!#\\'"])/)
+      _tmp = scan(/\G(?-mix:[~*_`&\[\]()<!#\\'"])/)
       break if _tmp
       self.pos = _save
       _tmp = _ExtendedSpecialChar()
@@ -14455,13 +14751,6 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # NonAlphanumeric = %literals.NonAlphanumeric
-  def _NonAlphanumeric
-    _tmp = @_grammar_literals.external_invoke(self, :_NonAlphanumeric)
-    set_failed_rule :_NonAlphanumeric unless _tmp
-    return _tmp
-  end
-
   # Spacechar = %literals.Spacechar
   def _Spacechar
     _tmp = @_grammar_literals.external_invoke(self, :_Spacechar)
@@ -14474,13 +14763,13 @@ class RDoc::Markdown
 
     _save = self.pos
     while true # sequence
-      _tmp = scan(/\A(?i-mx:&#x)/)
+      _tmp = scan(/\G(?i-mx:&#x)/)
       unless _tmp
         self.pos = _save
         break
       end
       _text_start = self.pos
-      _tmp = scan(/\A(?-mix:[0-9a-fA-F]+)/)
+      _tmp = scan(/\G(?-mix:[0-9a-fA-F]+)/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -14516,7 +14805,7 @@ class RDoc::Markdown
         break
       end
       _text_start = self.pos
-      _tmp = scan(/\A(?-mix:[0-9]+)/)
+      _tmp = scan(/\G(?-mix:[0-9]+)/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -14552,7 +14841,7 @@ class RDoc::Markdown
         break
       end
       _text_start = self.pos
-      _tmp = scan(/\A(?-mix:[A-Za-z0-9]+)/)
+      _tmp = scan(/\G(?-mix:[A-Za-z0-9]+)/)
       if _tmp
         text = get_text(_text_start)
       end
@@ -14584,14 +14873,14 @@ class RDoc::Markdown
 
   # NonindentSpace = / {0,3}/
   def _NonindentSpace
-    _tmp = scan(/\A(?-mix: {0,3})/)
+    _tmp = scan(/\G(?-mix: {0,3})/)
     set_failed_rule :_NonindentSpace unless _tmp
     return _tmp
   end
 
   # Indent = /\t|    /
   def _Indent
-    _tmp = scan(/\A(?-mix:\t|    )/)
+    _tmp = scan(/\G(?-mix:\t|    )/)
     set_failed_rule :_Indent unless _tmp
     return _tmp
   end
@@ -14690,7 +14979,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # RawLine = (< (!"\r" !"\n" .)* @Newline > | < .+ > @Eof) { text }
+  # RawLine = (< /[^\r\n]*/ @Newline > | < .+ > @Eof) { text }
   def _RawLine
 
     _save = self.pos
@@ -14702,36 +14991,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
@@ -14749,10 +15009,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
@@ -14761,18 +15021,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
@@ -15189,7 +15449,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 })+ "]" { ref = [:inline, @note_order.length]                @footnotes[ref] = paragraph a                 note_for ref              }
   def _InlineNote
 
     _save = self.pos
@@ -15280,8 +15540,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;
-               ref = [:inline, @note_order.length]
+      @result = begin;  ref = [:inline, @note_order.length]
                @footnotes[ref] = paragraph a
 
                note_for ref
@@ -15319,7 +15578,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
@@ -15342,6 +15601,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
@@ -15359,26 +15626,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
@@ -15424,7 +15699,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               verbatim             }
+  # 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             }
   def _CodeFence
 
     _save = self.pos
@@ -15436,217 +15711,597 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Ticks3)
+      _tmp = apply(:_Ticks3)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save2 = self.pos
+
+      _save3 = self.pos
+      while true # sequence
+        _tmp = _Sp()
+        unless _tmp
+          self.pos = _save3
+          break
+        end
+        _tmp = apply(:_StrChunk)
+        format = @result
+        unless _tmp
+          self.pos = _save3
+        end
+        break
+      end # end sequence
+
+      unless _tmp
+        _tmp = true
+        self.pos = _save2
+      end
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Spnl)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _text_start = self.pos
+      _save4 = self.pos
+
+      _save5 = self.pos
+      while true # choice
+        _save6 = self.pos
+
+        _save7 = self.pos
+        while true # sequence
+          _save8 = self.pos
+          _tmp = match_string("`")
+          _tmp = _tmp ? nil : true
+          self.pos = _save8
+          unless _tmp
+            self.pos = _save7
+            break
+          end
+          _tmp = apply(:_Nonspacechar)
+          unless _tmp
+            self.pos = _save7
+          end
+          break
+        end # end sequence
+
+        if _tmp
+          while true
+
+            _save9 = self.pos
+            while true # sequence
+              _save10 = self.pos
+              _tmp = match_string("`")
+              _tmp = _tmp ? nil : true
+              self.pos = _save10
+              unless _tmp
+                self.pos = _save9
+                break
+              end
+              _tmp = apply(:_Nonspacechar)
+              unless _tmp
+                self.pos = _save9
+              end
+              break
+            end # end sequence
+
+            break unless _tmp
+          end
+          _tmp = true
+        else
+          self.pos = _save6
+        end
+        break if _tmp
+        self.pos = _save5
+
+        _save11 = self.pos
+        while true # sequence
+          _save12 = self.pos
+          _tmp = apply(:_Ticks3)
+          _tmp = _tmp ? nil : true
+          self.pos = _save12
+          unless _tmp
+            self.pos = _save11
+            break
+          end
+          _tmp = scan(/\G(?-mix:`+)/)
+          unless _tmp
+            self.pos = _save11
+          end
+          break
+        end # end sequence
+
+        break if _tmp
+        self.pos = _save5
+        _tmp = apply(:_Spacechar)
+        break if _tmp
+        self.pos = _save5
+        _tmp = _Newline()
+        break if _tmp
+        self.pos = _save5
+        break
+      end # end choice
+
+      if _tmp
+        while true
+
+          _save13 = self.pos
+          while true # choice
+            _save14 = self.pos
+
+            _save15 = self.pos
+            while true # sequence
+              _save16 = self.pos
+              _tmp = match_string("`")
+              _tmp = _tmp ? nil : true
+              self.pos = _save16
+              unless _tmp
+                self.pos = _save15
+                break
+              end
+              _tmp = apply(:_Nonspacechar)
+              unless _tmp
+                self.pos = _save15
+              end
+              break
+            end # end sequence
+
+            if _tmp
+              while true
+
+                _save17 = self.pos
+                while true # sequence
+                  _save18 = self.pos
+                  _tmp = match_string("`")
+                  _tmp = _tmp ? nil : true
+                  self.pos = _save18
+                  unless _tmp
+                    self.pos = _save17
+                    break
+                  end
+                  _tmp = apply(:_Nonspacechar)
+                  unless _tmp
+                    self.pos = _save17
+                  end
+                  break
+                end # end sequence
+
+                break unless _tmp
+              end
+              _tmp = true
+            else
+              self.pos = _save14
+            end
+            break if _tmp
+            self.pos = _save13
+
+            _save19 = self.pos
+            while true # sequence
+              _save20 = self.pos
+              _tmp = apply(:_Ticks3)
+              _tmp = _tmp ? nil : true
+              self.pos = _save20
+              unless _tmp
+                self.pos = _save19
+                break
+              end
+              _tmp = scan(/\G(?-mix:`+)/)
+              unless _tmp
+                self.pos = _save19
+              end
+              break
+            end # end sequence
+
+            break if _tmp
+            self.pos = _save13
+            _tmp = apply(:_Spacechar)
+            break if _tmp
+            self.pos = _save13
+            _tmp = _Newline()
+            break if _tmp
+            self.pos = _save13
+            break
+          end # end choice
+
+          break unless _tmp
+        end
+        _tmp = true
+      else
+        self.pos = _save4
+      end
+      if _tmp
+        text = get_text(_text_start)
+      end
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_Ticks3)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = _Sp()
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      while true
+        _tmp = _Newline()
+        break unless _tmp
+      end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  verbatim = RDoc::Markup::Verbatim.new text
+              verbatim.format = format.intern if format.instance_of?(String)
+              verbatim
+            ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_CodeFence unless _tmp
+    return _tmp
+  end
+
+  # Table = &{ github? } TableHead:header TableLine:line TableRow+:body { table = RDoc::Markup::Table.new(header, line, body) }
+  def _Table
+
+    _save = self.pos
+    while true # sequence
+      _save1 = self.pos
+      _tmp = begin;  github? ; end
+      self.pos = _save1
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_TableHead)
+      header = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_TableLine)
+      line = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save2 = self.pos
+      _ary = []
+      _tmp = apply(:_TableRow)
+      if _tmp
+        _ary << @result
+        while true
+          _tmp = apply(:_TableRow)
+          _ary << @result if _tmp
+          break unless _tmp
+        end
+        _tmp = true
+        @result = _ary
+      else
+        self.pos = _save2
+      end
+      body = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  table = RDoc::Markup::Table.new(header, line, body) ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_Table unless _tmp
+    return _tmp
+  end
+
+  # TableHead = TableItem2+:items "|"? @Newline { items }
+  def _TableHead
+
+    _save = self.pos
+    while true # sequence
+      _save1 = 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 = _save1
+      end
+      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
+      end
+      _tmp = _Newline()
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  items ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_TableHead unless _tmp
+    return _tmp
+  end
+
+  # TableRow = ((TableItem:item1 TableItem2*:items { [item1, *items] }):row | TableItem2+:row) "|"? @Newline { row }
+  def _TableRow
+
+    _save = self.pos
+    while true # sequence
+
+      _save1 = self.pos
+      while true # choice
+
+        _save2 = self.pos
+        while true # sequence
+          _tmp = apply(:_TableItem)
+          item1 = @result
+          unless _tmp
+            self.pos = _save2
+            break
+          end
+          _ary = []
+          while true
+            _tmp = apply(:_TableItem2)
+            _ary << @result if _tmp
+            break unless _tmp
+          end
+          _tmp = true
+          @result = _ary
+          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 sequence
+
+        row = @result
+        break if _tmp
+        self.pos = _save1
+        _save4 = 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 = _save4
+        end
+        row = @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;  row ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_TableRow unless _tmp
+    return _tmp
+  end
+
+  # TableItem2 = "|" TableItem
+  def _TableItem2
+
+    _save = self.pos
+    while true # sequence
+      _tmp = match_string("|")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_TableItem)
       unless _tmp
         self.pos = _save
-        break
       end
-      _save2 = self.pos
+      break
+    end # end sequence
 
-      _save3 = self.pos
-      while true # sequence
-        _tmp = _Sp()
-        unless _tmp
-          self.pos = _save3
-          break
-        end
-        _tmp = apply(:_StrChunk)
-        format = @result
-        unless _tmp
-          self.pos = _save3
-        end
-        break
-      end # end sequence
+    set_failed_rule :_TableItem2 unless _tmp
+    return _tmp
+  end
 
-      unless _tmp
-        _tmp = true
-        self.pos = _save2
+  # 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
-      _tmp = apply(:_Spnl)
+      @result = begin;  text.strip.gsub(/\\(.)/, '\1')  ; end
+      _tmp = true
       unless _tmp
         self.pos = _save
-        break
       end
-      _text_start = self.pos
-      _save4 = self.pos
+      break
+    end # end sequence
 
-      _save5 = self.pos
+    set_failed_rule :_TableItem unless _tmp
+    return _tmp
+  end
+
+  # TableLine = ((TableAlign:align1 TableAlign2*:aligns {[align1, *aligns] }):line | TableAlign2+:line) "|"? @Newline { line }
+  def _TableLine
+
+    _save = self.pos
+    while true # sequence
+
+      _save1 = self.pos
       while true # choice
-        _save6 = self.pos
 
-        _save7 = self.pos
+        _save2 = self.pos
         while true # sequence
-          _save8 = self.pos
-          _tmp = match_string("`")
-          _tmp = _tmp ? nil : true
-          self.pos = _save8
+          _tmp = apply(:_TableAlign)
+          align1 = @result
           unless _tmp
-            self.pos = _save7
+            self.pos = _save2
             break
           end
-          _tmp = apply(:_Nonspacechar)
-          unless _tmp
-            self.pos = _save7
-          end
-          break
-        end # end sequence
-
-        if _tmp
+          _ary = []
           while true
-
-            _save9 = self.pos
-            while true # sequence
-              _save10 = self.pos
-              _tmp = match_string("`")
-              _tmp = _tmp ? nil : true
-              self.pos = _save10
-              unless _tmp
-                self.pos = _save9
-                break
-              end
-              _tmp = apply(:_Nonspacechar)
-              unless _tmp
-                self.pos = _save9
-              end
-              break
-            end # end sequence
-
+            _tmp = apply(:_TableAlign2)
+            _ary << @result if _tmp
             break unless _tmp
           end
           _tmp = true
-        else
-          self.pos = _save6
-        end
-        break if _tmp
-        self.pos = _save5
-
-        _save11 = self.pos
-        while true # sequence
-          _save12 = self.pos
-          _tmp = apply(:_Ticks3)
-          _tmp = _tmp ? nil : true
-          self.pos = _save12
+          @result = _ary
+          aligns = @result
           unless _tmp
-            self.pos = _save11
+            self.pos = _save2
             break
           end
-          _tmp = scan(/\A(?-mix:`+)/)
+          @result = begin; [align1, *aligns] ; end
+          _tmp = true
           unless _tmp
-            self.pos = _save11
+            self.pos = _save2
           end
           break
         end # end sequence
 
+        line = @result
         break if _tmp
-        self.pos = _save5
-        _tmp = apply(:_Spacechar)
-        break if _tmp
-        self.pos = _save5
-        _tmp = _Newline()
+        self.pos = _save1
+        _save4 = self.pos
+        _ary = []
+        _tmp = apply(:_TableAlign2)
+        if _tmp
+          _ary << @result
+          while true
+            _tmp = apply(:_TableAlign2)
+            _ary << @result if _tmp
+            break unless _tmp
+          end
+          _tmp = true
+          @result = _ary
+        else
+          self.pos = _save4
+        end
+        line = @result
         break if _tmp
-        self.pos = _save5
+        self.pos = _save1
         break
       end # end choice
 
-      if _tmp
-        while true
-
-          _save13 = self.pos
-          while true # choice
-            _save14 = self.pos
-
-            _save15 = self.pos
-            while true # sequence
-              _save16 = self.pos
-              _tmp = match_string("`")
-              _tmp = _tmp ? nil : true
-              self.pos = _save16
-              unless _tmp
-                self.pos = _save15
-                break
-              end
-              _tmp = apply(:_Nonspacechar)
-              unless _tmp
-                self.pos = _save15
-              end
-              break
-            end # end sequence
-
-            if _tmp
-              while true
-
-                _save17 = self.pos
-                while true # sequence
-                  _save18 = self.pos
-                  _tmp = match_string("`")
-                  _tmp = _tmp ? nil : true
-                  self.pos = _save18
-                  unless _tmp
-                    self.pos = _save17
-                    break
-                  end
-                  _tmp = apply(:_Nonspacechar)
-                  unless _tmp
-                    self.pos = _save17
-                  end
-                  break
-                end # end sequence
-
-                break unless _tmp
-              end
-              _tmp = true
-            else
-              self.pos = _save14
-            end
-            break if _tmp
-            self.pos = _save13
-
-            _save19 = self.pos
-            while true # sequence
-              _save20 = self.pos
-              _tmp = apply(:_Ticks3)
-              _tmp = _tmp ? nil : true
-              self.pos = _save20
-              unless _tmp
-                self.pos = _save19
-                break
-              end
-              _tmp = scan(/\A(?-mix:`+)/)
-              unless _tmp
-                self.pos = _save19
-              end
-              break
-            end # end sequence
-
-            break if _tmp
-            self.pos = _save13
-            _tmp = apply(:_Spacechar)
-            break if _tmp
-            self.pos = _save13
-            _tmp = _Newline()
-            break if _tmp
-            self.pos = _save13
-            break
-          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 = _save4
+        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
-      _tmp = apply(:_Ticks3)
+      @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
@@ -15656,19 +16311,41 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      while true
-        _tmp = _Newline()
-        break unless _tmp
+      _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
-      _tmp = true
       unless _tmp
         self.pos = _save
         break
       end
-      @result = begin;  verbatim = RDoc::Markup::Verbatim.new text
-              verbatim.format = format.intern if format
-              verbatim
-            ; end
+      _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
         self.pos = _save
@@ -15676,7 +16353,7 @@ class RDoc::Markdown
       break
     end # end sequence
 
-    set_failed_rule :_CodeFence unless _tmp
+    set_failed_rule :_TableAlign unless _tmp
     return _tmp
   end
 
@@ -15790,12 +16467,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
@@ -15879,17 +16556,17 @@ class RDoc::Markdown
   Rules = {}
   Rules[:_root] = rule_info("root", "Doc")
   Rules[:_Doc] = rule_info("Doc", "BOM? Block*:a { RDoc::Markup::Document.new(*a.compact) }")
-  Rules[:_Block] = rule_info("Block", "@BlankLine* (BlockQuote | Verbatim | CodeFence | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)")
+  Rules[:_Block] = rule_info("Block", "@BlankLine* (BlockQuote | Verbatim | CodeFence | Table | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)")
   Rules[:_Para] = rule_info("Para", "@NonindentSpace Inlines:a @BlankLine+ { paragraph a }")
   Rules[:_Plain] = rule_info("Plain", "Inlines:a { paragraph a }")
-  Rules[:_AtxInline] = rule_info("AtxInline", "!@Newline !(@Sp? /\#*/ @Sp @Newline) Inline")
+  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", "/={3,}/ @Newline")
-  Rules[:_SetextBottom2] = rule_info("SetextBottom2", "/-{3,}/ @Newline")
-  Rules[:_SetextHeading1] = rule_info("SetextHeading1", "&(@RawLine SetextBottom1) @StartList:a (!@Endline Inline:b { a << b })+ @Sp? @Newline SetextBottom1 { RDoc::Markup::Heading.new(1, a.join) }")
-  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[:_SetextBottom1] = rule_info("SetextBottom1", "/={1,}/ @Newline")
+  Rules[:_SetextBottom2] = rule_info("SetextBottom2", "/-{1,}/ @Newline")
+  Rules[:_SetextHeading1] = rule_info("SetextHeading1", "&(@RawLine SetextBottom1) @StartList:a (!@Endline Inline:b { a << b })+ @Sp @Newline SetextBottom1 { RDoc::Markup::Heading.new(1, a.join) }")
+  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 }")
@@ -16010,7 +16687,10 @@ class RDoc::Markdown
   Rules[:_HtmlBlockOpenScript] = rule_info("HtmlBlockOpenScript", "\"<\" Spnl (\"script\" | \"SCRIPT\") Spnl HtmlAttribute* \">\"")
   Rules[:_HtmlBlockCloseScript] = rule_info("HtmlBlockCloseScript", "\"<\" Spnl \"/\" (\"script\" | \"SCRIPT\") Spnl \">\"")
   Rules[:_HtmlBlockScript] = rule_info("HtmlBlockScript", "HtmlBlockOpenScript (!HtmlBlockCloseScript .)* HtmlBlockCloseScript")
-  Rules[:_HtmlBlockInTags] = rule_info("HtmlBlockInTags", "(HtmlAnchor | HtmlBlockAddress | HtmlBlockBlockquote | HtmlBlockCenter | HtmlBlockDir | HtmlBlockDiv | HtmlBlockDl | HtmlBlockFieldset | HtmlBlockForm | HtmlBlockH1 | HtmlBlockH2 | HtmlBlockH3 | HtmlBlockH4 | HtmlBlockH5 | HtmlBlockH6 | HtmlBlockMenu | HtmlBlockNoframes | HtmlBlockNoscript | HtmlBlockOl | HtmlBlockP | HtmlBlockPre | HtmlBlockTable | HtmlBlockUl | HtmlBlockDd | HtmlBlockDt | HtmlBlockFrameset | HtmlBlockLi | HtmlBlockTbody | HtmlBlockTd | HtmlBlockTfoot | HtmlBlockTh | HtmlBlockThead | HtmlBlockTr | HtmlBlockScript)")
+  Rules[:_HtmlBlockOpenHead] = rule_info("HtmlBlockOpenHead", "\"<\" Spnl (\"head\" | \"HEAD\") Spnl HtmlAttribute* \">\"")
+  Rules[:_HtmlBlockCloseHead] = rule_info("HtmlBlockCloseHead", "\"<\" Spnl \"/\" (\"head\" | \"HEAD\") Spnl \">\"")
+  Rules[:_HtmlBlockHead] = rule_info("HtmlBlockHead", "HtmlBlockOpenHead (!HtmlBlockCloseHead .)* HtmlBlockCloseHead")
+  Rules[:_HtmlBlockInTags] = rule_info("HtmlBlockInTags", "(HtmlAnchor | HtmlBlockAddress | HtmlBlockBlockquote | HtmlBlockCenter | HtmlBlockDir | HtmlBlockDiv | HtmlBlockDl | HtmlBlockFieldset | HtmlBlockForm | HtmlBlockH1 | HtmlBlockH2 | HtmlBlockH3 | HtmlBlockH4 | HtmlBlockH5 | HtmlBlockH6 | HtmlBlockMenu | HtmlBlockNoframes | HtmlBlockNoscript | HtmlBlockOl | HtmlBlockP | HtmlBlockPre | HtmlBlockTable | HtmlBlockUl | HtmlBlockDd | HtmlBlockDt | HtmlBlockFrameset | HtmlBlockLi | HtmlBlockTbody | HtmlBlockTd | HtmlBlockTfoot | HtmlBlockTh | HtmlBlockThead | HtmlBlockTr | HtmlBlockScript | HtmlBlockHead)")
   Rules[:_HtmlBlock] = rule_info("HtmlBlock", "< (HtmlBlockInTags | HtmlComment | HtmlBlockSelfClosing | HtmlUnclosed) > @BlankLine+ { if html? then                 RDoc::Markup::Raw.new text               end }")
   Rules[:_HtmlUnclosed] = rule_info("HtmlUnclosed", "\"<\" Spnl HtmlUnclosedType Spnl HtmlAttribute* Spnl \">\"")
   Rules[:_HtmlUnclosedType] = rule_info("HtmlUnclosedType", "(\"HR\" | \"hr\")")
@@ -16020,15 +16700,15 @@ class RDoc::Markdown
   Rules[:_StyleClose] = rule_info("StyleClose", "\"<\" Spnl \"/\" (\"style\" | \"STYLE\") Spnl \">\"")
   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 &Inline { c })+:chunks @Endline? { chunks }")
-  Rules[:_Inline] = rule_info("Inline", "(Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)")
+  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[:_Space] = rule_info("Space", "@Spacechar+ { \" \" }")
   Rules[:_Str] = rule_info("Str", "@StartList:a < @NormalChar+ > { a = text } (StrChunk:c { a << c })* { a }")
   Rules[:_StrChunk] = rule_info("StrChunk", "< (@NormalChar | /_+/ &Alphanumeric)+ > { text }")
   Rules[:_EscapedChar] = rule_info("EscapedChar", "\"\\\\\" !@Newline < /[:\\\\`|*_{}\\[\\]()\#+.!><-]/ > { 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 /={3,}|-{3,}=/ @Newline) { \"\\n\" }")
+  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 }")
@@ -16036,27 +16716,22 @@ class RDoc::Markdown
   Rules[:_StarLine] = rule_info("StarLine", "(< /\\*{4,}/ > { text } | < @Spacechar /\\*+/ &@Spacechar > { text })")
   Rules[:_UlLine] = rule_info("UlLine", "(< /_{4,}/ > { text } | < @Spacechar /_+/ &@Spacechar > { text })")
   Rules[:_Emph] = rule_info("Emph", "(EmphStar | EmphUl)")
-  Rules[:_OneStarOpen] = rule_info("OneStarOpen", "!StarLine \"*\" !@Spacechar !@Newline")
-  Rules[:_OneStarClose] = rule_info("OneStarClose", "!@Spacechar !@Newline Inline:a \"*\" { a }")
-  Rules[:_EmphStar] = rule_info("EmphStar", "OneStarOpen @StartList:a (!OneStarClose Inline:l { a << l })* OneStarClose:l { a << l } { emphasis a.join }")
-  Rules[:_OneUlOpen] = rule_info("OneUlOpen", "!UlLine \"_\" !@Spacechar !@Newline")
-  Rules[:_OneUlClose] = rule_info("OneUlClose", "!@Spacechar !@Newline Inline:a \"_\" { a }")
-  Rules[:_EmphUl] = rule_info("EmphUl", "OneUlOpen @StartList:a (!OneUlClose Inline:l { a << l })* OneUlClose:l { a << l } { emphasis a.join }")
+  Rules[:_Whitespace] = rule_info("Whitespace", "(@Spacechar | @Newline)")
+  Rules[:_EmphStar] = rule_info("EmphStar", "\"*\" !@Whitespace @StartList:a (!\"*\" Inline:b { a << b } | StrongStar:b { a << b })+ \"*\" { emphasis a.join }")
+  Rules[:_EmphUl] = rule_info("EmphUl", "\"_\" !@Whitespace @StartList:a (!\"_\" Inline:b { a << b } | StrongUl:b { a << b })+ \"_\" { emphasis a.join }")
   Rules[:_Strong] = rule_info("Strong", "(StrongStar | StrongUl)")
-  Rules[:_TwoStarOpen] = rule_info("TwoStarOpen", "!StarLine \"**\" !@Spacechar !@Newline")
-  Rules[:_TwoStarClose] = rule_info("TwoStarClose", "!@Spacechar !@Newline Inline:a \"**\" { a }")
-  Rules[:_StrongStar] = rule_info("StrongStar", "TwoStarOpen @StartList:a (!TwoStarClose Inline:l { a << l })* TwoStarClose:l { a << l } { strong a.join }")
-  Rules[:_TwoUlOpen] = rule_info("TwoUlOpen", "!UlLine \"__\" !@Spacechar !@Newline")
-  Rules[:_TwoUlClose] = rule_info("TwoUlClose", "!@Spacechar !@Newline Inline:a \"__\" { a }")
-  Rules[:_StrongUl] = rule_info("StrongUl", "TwoUlOpen @StartList:a (!TwoUlClose Inline:i { a << i })* TwoUlClose:l { a << l } { strong a.join }")
-  Rules[:_Image] = rule_info("Image", "\"!\" (ExplicitLink | ReferenceLink):a { \"rdoc-image:\#{a[/\\[(.*)\\]/, 1]}\" }")
+  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", "\"!\" 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 Spnl \"(\" @Sp Source:s Spnl Title @Sp \")\" { \"{\#{l}}[\#{s}]\" }")
+  Rules[:_ExplicitLink] = rule_info("ExplicitLink", "ExplicitLinkWithLabel:a { \"{\#{a[:label]}}[\#{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[:_SourceContents] = rule_info("SourceContents", "((!\"(\" !\")\" !\">\" Nonspacechar)+ | \"(\" SourceContents \")\")*")
   Rules[:_Title] = rule_info("Title", "(TitleSingle | TitleDouble | \"\"):a { a }")
   Rules[:_TitleSingle] = rule_info("TitleSingle", "\"'\" (!(\"'\" @Sp (\")\" | @Newline)) .)* \"'\"")
   Rules[:_TitleDouble] = rule_info("TitleDouble", "\"\\\"\" (!(\"\\\"\" @Sp (\")\" | @Newline)) .)* \"\\\"\"")
@@ -16088,14 +16763,13 @@ class RDoc::Markdown
   Rules[:_Nonspacechar] = rule_info("Nonspacechar", "!@Spacechar !@Newline .")
   Rules[:_Sp] = rule_info("Sp", "@Spacechar*")
   Rules[:_Spnl] = rule_info("Spnl", "@Sp (@Newline @Sp)?")
-  Rules[:_SpecialChar] = rule_info("SpecialChar", "(/[*_`&\\[\\]()<!\#\\\\'\"]/ | @ExtendedSpecialChar)")
+  Rules[:_SpecialChar] = rule_info("SpecialChar", "(/[~*_`&\\[\\]()<!\#\\\\'\"]/ | @ExtendedSpecialChar)")
   Rules[:_NormalChar] = rule_info("NormalChar", "!(@SpecialChar | @Spacechar | @Newline) .")
   Rules[:_Digit] = rule_info("Digit", "[0-9]")
   Rules[:_Alphanumeric] = rule_info("Alphanumeric", "%literals.Alphanumeric")
   Rules[:_AlphanumericAscii] = rule_info("AlphanumericAscii", "%literals.AlphanumericAscii")
   Rules[:_BOM] = rule_info("BOM", "%literals.BOM")
   Rules[:_Newline] = rule_info("Newline", "%literals.Newline")
-  Rules[:_NonAlphanumeric] = rule_info("NonAlphanumeric", "%literals.NonAlphanumeric")
   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' }")
@@ -16106,19 +16780,27 @@ class RDoc::Markdown
   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 })+ \"]\" { ref = [:inline, @note_order.length]                @footnotes[ref] = paragraph a                 note_for ref              }")
   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               verbatim             }")
+  Rules[:_RawNoteBlock] = rule_info("RawNoteBlock", "@StartList:a (!@BlankLine !RawNoteReference OptionallyIndentedLine:l { a << l })+ < @BlankLine* > { a << text } { a }")
+  Rules[:_CodeFence] = rule_info("CodeFence", "&{ github? } Ticks3 (@Sp StrChunk:format)? Spnl < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text               verbatim.format = format.intern if format.instance_of?(String)               verbatim             }")
+  Rules[:_Table] = rule_info("Table", "&{ github? } TableHead:header TableLine:line TableRow+:body { table = RDoc::Markup::Table.new(header, line, body) }")
+  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