rdoc 4.0.1 → 4.1.0.preview.3

data/lib/rdoc/markdown.rb

@@ -8,6 +8,16 @@
 # RDoc::Options@Saved+Options for instructions on setting up a `.doc_options`
 # file to store your project default.
 #
+# ## Usage
+#
+# Here is a brief example of using this parse to read a markdown file by hand.
+#
+#     data = File.read("README.md")
+#     formatter = RDoc::Markup::ToHtml.new(RDoc::Options.new, nil)
+#     html = RDoc::Markdown.parse(data).accept(@formatter)
+#
+#     # do something with html
+#
 # ## Extensions
 #
 # The following markdown extensions are supported by the parser, but not all
@@ -120,7 +130,6 @@
 # ## Limitations
 #
 # * Link titles are not used
-# * Image links are not generated correctly
 # * Footnotes are collapsed into a single paragraph
 #
 # ## Author
@@ -185,7 +194,6 @@ class RDoc::Markdown
     attr_reader :failing_rule_offset
     attr_accessor :result, :pos
 
-    
     def current_column(target=pos)
       if c = string.rindex("\n", target-1)
         return target - c - 1
@@ -868,13 +876,13 @@ 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 | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)
   def _Block
 
     _save = self.pos
     while true # sequence
       while true
-        _tmp = apply(:_BlankLine)
+        _tmp = _BlankLine()
         break unless _tmp
       end
       _tmp = true
@@ -940,12 +948,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Para = NonindentSpace Inlines:a BlankLine+ { paragraph a }
+  # Para = @NonindentSpace Inlines:a @BlankLine+ { paragraph a }
   def _Para
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_NonindentSpace)
+      _tmp = _NonindentSpace()
       unless _tmp
         self.pos = _save
         break
@@ -957,10 +965,10 @@ class RDoc::Markdown
         break
       end
       _save1 = self.pos
-      _tmp = apply(:_BlankLine)
+      _tmp = _BlankLine()
       if _tmp
         while true
-          _tmp = apply(:_BlankLine)
+          _tmp = _BlankLine()
           break unless _tmp
         end
         _tmp = true
@@ -1006,13 +1014,13 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # AtxInline = !Newline !(Sp? /#*/ Sp Newline) Inline
+  # AtxInline = !@Newline !(@Sp? /#*/ @Sp @Newline) Inline
   def _AtxInline
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
@@ -1024,7 +1032,7 @@ class RDoc::Markdown
       _save3 = self.pos
       while true # sequence
         _save4 = self.pos
-        _tmp = apply(:_Sp)
+        _tmp = _Sp()
         unless _tmp
           _tmp = true
           self.pos = _save4
@@ -1038,12 +1046,12 @@ class RDoc::Markdown
           self.pos = _save3
           break
         end
-        _tmp = apply(:_Sp)
+        _tmp = _Sp()
         unless _tmp
           self.pos = _save3
           break
         end
-        _tmp = apply(:_Newline)
+        _tmp = _Newline()
         unless _tmp
           self.pos = _save3
         end
@@ -1093,7 +1101,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 @Sp? AtxInline+:a (@Sp? /#*/ @Sp)? @Newline { RDoc::Markup::Heading.new(s, a.join) }
   def _AtxHeading
 
     _save = self.pos
@@ -1105,7 +1113,7 @@ class RDoc::Markdown
         break
       end
       _save1 = self.pos
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         _tmp = true
         self.pos = _save1
@@ -1139,7 +1147,7 @@ class RDoc::Markdown
       _save4 = self.pos
       while true # sequence
         _save5 = self.pos
-        _tmp = apply(:_Sp)
+        _tmp = _Sp()
         unless _tmp
           _tmp = true
           self.pos = _save5
@@ -1153,7 +1161,7 @@ class RDoc::Markdown
           self.pos = _save4
           break
         end
-        _tmp = apply(:_Sp)
+        _tmp = _Sp()
         unless _tmp
           self.pos = _save4
         end
@@ -1168,7 +1176,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       unless _tmp
         self.pos = _save
         break
@@ -1203,7 +1211,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SetextBottom1 = /={3,}/ Newline
+  # SetextBottom1 = /={3,}/ @Newline
   def _SetextBottom1
 
     _save = self.pos
@@ -1213,7 +1221,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       unless _tmp
         self.pos = _save
       end
@@ -1224,7 +1232,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SetextBottom2 = /-{3,}/ Newline
+  # SetextBottom2 = /-{3,}/ @Newline
   def _SetextBottom2
 
     _save = self.pos
@@ -1234,7 +1242,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       unless _tmp
         self.pos = _save
       end
@@ -1245,7 +1253,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
@@ -1254,7 +1262,7 @@ class RDoc::Markdown
 
       _save2 = self.pos
       while true # sequence
-        _tmp = apply(:_RawLine)
+        _tmp = _RawLine()
         unless _tmp
           self.pos = _save2
           break
@@ -1271,7 +1279,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -1282,7 +1290,7 @@ class RDoc::Markdown
       _save4 = self.pos
       while true # sequence
         _save5 = self.pos
-        _tmp = apply(:_Endline)
+        _tmp = _Endline()
         _tmp = _tmp ? nil : true
         self.pos = _save5
         unless _tmp
@@ -1309,7 +1317,7 @@ class RDoc::Markdown
           _save6 = self.pos
           while true # sequence
             _save7 = self.pos
-            _tmp = apply(:_Endline)
+            _tmp = _Endline()
             _tmp = _tmp ? nil : true
             self.pos = _save7
             unless _tmp
@@ -1341,7 +1349,7 @@ class RDoc::Markdown
         break
       end
       _save8 = self.pos
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         _tmp = true
         self.pos = _save8
@@ -1350,7 +1358,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       unless _tmp
         self.pos = _save
         break
@@ -1372,7 +1380,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
@@ -1381,7 +1389,7 @@ class RDoc::Markdown
 
       _save2 = self.pos
       while true # sequence
-        _tmp = apply(:_RawLine)
+        _tmp = _RawLine()
         unless _tmp
           self.pos = _save2
           break
@@ -1398,7 +1406,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -1409,7 +1417,7 @@ class RDoc::Markdown
       _save4 = self.pos
       while true # sequence
         _save5 = self.pos
-        _tmp = apply(:_Endline)
+        _tmp = _Endline()
         _tmp = _tmp ? nil : true
         self.pos = _save5
         unless _tmp
@@ -1436,7 +1444,7 @@ class RDoc::Markdown
           _save6 = self.pos
           while true # sequence
             _save7 = self.pos
-            _tmp = apply(:_Endline)
+            _tmp = _Endline()
             _tmp = _tmp ? nil : true
             self.pos = _save7
             unless _tmp
@@ -1468,7 +1476,7 @@ class RDoc::Markdown
         break
       end
       _save8 = self.pos
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         _tmp = true
         self.pos = _save8
@@ -1477,7 +1485,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       unless _tmp
         self.pos = _save
         break
@@ -1540,12 +1548,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # BlockQuoteRaw = StartList:a (">" " "? Line:l { a << l } (!">" !BlankLine Line:c { a << c })* (BlankLine:n { a << n })*)+ { inner_parse a.join }
+  # BlockQuoteRaw = @StartList:a (">" " "? Line:l { a << l } (!">" !@BlankLine Line:c { a << c })* (@BlankLine:n { a << n })*)+ { inner_parse a.join }
   def _BlockQuoteRaw
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -1595,7 +1603,7 @@ class RDoc::Markdown
               break
             end
             _save7 = self.pos
-            _tmp = apply(:_BlankLine)
+            _tmp = _BlankLine()
             _tmp = _tmp ? nil : true
             self.pos = _save7
             unless _tmp
@@ -1627,7 +1635,7 @@ class RDoc::Markdown
 
           _save9 = self.pos
           while true # sequence
-            _tmp = apply(:_BlankLine)
+            _tmp = _BlankLine()
             n = @result
             unless _tmp
               self.pos = _save9
@@ -1695,7 +1703,7 @@ class RDoc::Markdown
                   break
                 end
                 _save15 = self.pos
-                _tmp = apply(:_BlankLine)
+                _tmp = _BlankLine()
                 _tmp = _tmp ? nil : true
                 self.pos = _save15
                 unless _tmp
@@ -1727,7 +1735,7 @@ class RDoc::Markdown
 
               _save17 = self.pos
               while true # sequence
-                _tmp = apply(:_BlankLine)
+                _tmp = _BlankLine()
                 n = @result
                 unless _tmp
                   self.pos = _save17
@@ -1772,13 +1780,13 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # NonblankIndentedLine = !BlankLine IndentedLine
+  # NonblankIndentedLine = !@BlankLine IndentedLine
   def _NonblankIndentedLine
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
-      _tmp = apply(:_BlankLine)
+      _tmp = _BlankLine()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
@@ -1796,14 +1804,14 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # VerbatimChunk = BlankLine*:a NonblankIndentedLine+:b { a.concat b }
+  # VerbatimChunk = @BlankLine*:a NonblankIndentedLine+:b { a.concat b }
   def _VerbatimChunk
 
     _save = self.pos
     while true # sequence
       _ary = []
       while true
-        _tmp = apply(:_BlankLine)
+        _tmp = _BlankLine()
         _ary << @result if _tmp
         break unless _tmp
       end
@@ -1883,12 +1891,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # HorizontalRule = NonindentSpace ("*" Sp "*" Sp "*" (Sp "*")* | "-" Sp "-" Sp "-" (Sp "-")* | "_" Sp "_" Sp "_" (Sp "_")*) Sp Newline BlankLine+ { RDoc::Markup::Rule.new 1 }
+  # HorizontalRule = @NonindentSpace ("*" @Sp "*" @Sp "*" (@Sp "*")* | "-" @Sp "-" @Sp "-" (@Sp "-")* | "_" @Sp "_" @Sp "_" (@Sp "_")*) @Sp @Newline @BlankLine+ { RDoc::Markup::Rule.new 1 }
   def _HorizontalRule
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_NonindentSpace)
+      _tmp = _NonindentSpace()
       unless _tmp
         self.pos = _save
         break
@@ -1904,7 +1912,7 @@ class RDoc::Markdown
             self.pos = _save2
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save2
             break
@@ -1914,7 +1922,7 @@ class RDoc::Markdown
             self.pos = _save2
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save2
             break
@@ -1928,7 +1936,7 @@ class RDoc::Markdown
 
             _save4 = self.pos
             while true # sequence
-              _tmp = apply(:_Sp)
+              _tmp = _Sp()
               unless _tmp
                 self.pos = _save4
                 break
@@ -1959,7 +1967,7 @@ class RDoc::Markdown
             self.pos = _save5
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save5
             break
@@ -1969,7 +1977,7 @@ class RDoc::Markdown
             self.pos = _save5
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save5
             break
@@ -1983,7 +1991,7 @@ class RDoc::Markdown
 
             _save7 = self.pos
             while true # sequence
-              _tmp = apply(:_Sp)
+              _tmp = _Sp()
               unless _tmp
                 self.pos = _save7
                 break
@@ -2014,7 +2022,7 @@ class RDoc::Markdown
             self.pos = _save8
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save8
             break
@@ -2024,7 +2032,7 @@ class RDoc::Markdown
             self.pos = _save8
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save8
             break
@@ -2038,7 +2046,7 @@ class RDoc::Markdown
 
             _save10 = self.pos
             while true # sequence
-              _tmp = apply(:_Sp)
+              _tmp = _Sp()
               unless _tmp
                 self.pos = _save10
                 break
@@ -2068,21 +2076,21 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       unless _tmp
         self.pos = _save
         break
       end
       _save11 = self.pos
-      _tmp = apply(:_BlankLine)
+      _tmp = _BlankLine()
       if _tmp
         while true
-          _tmp = apply(:_BlankLine)
+          _tmp = _BlankLine()
           break unless _tmp
         end
         _tmp = true
@@ -2105,7 +2113,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Bullet = !HorizontalRule NonindentSpace /[+*-]/ Spacechar+
+  # Bullet = !HorizontalRule @NonindentSpace /[+*-]/ @Spacechar+
   def _Bullet
 
     _save = self.pos
@@ -2118,7 +2126,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_NonindentSpace)
+      _tmp = _NonindentSpace()
       unless _tmp
         self.pos = _save
         break
@@ -2129,10 +2137,10 @@ class RDoc::Markdown
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       if _tmp
         while true
-          _tmp = apply(:_Spacechar)
+          _tmp = _Spacechar()
           break unless _tmp
         end
         _tmp = true
@@ -2190,7 +2198,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # ListTight = ListItemTight+:a BlankLine* !(Bullet | Enumerator) { a }
+  # ListTight = ListItemTight+:a @BlankLine* !(Bullet | Enumerator) { a }
   def _ListTight
 
     _save = self.pos
@@ -2216,7 +2224,7 @@ class RDoc::Markdown
         break
       end
       while true
-        _tmp = apply(:_BlankLine)
+        _tmp = _BlankLine()
         break unless _tmp
       end
       _tmp = true
@@ -2255,12 +2263,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # ListLoose = StartList:a (ListItem:b BlankLine* { a << b })+ { a }
+  # ListLoose = @StartList:a (ListItem:b @BlankLine* { a << b })+ { a }
   def _ListLoose
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -2277,7 +2285,7 @@ class RDoc::Markdown
           break
         end
         while true
-          _tmp = apply(:_BlankLine)
+          _tmp = _BlankLine()
           break unless _tmp
         end
         _tmp = true
@@ -2305,7 +2313,7 @@ class RDoc::Markdown
               break
             end
             while true
-              _tmp = apply(:_BlankLine)
+              _tmp = _BlankLine()
               break unless _tmp
             end
             _tmp = true
@@ -2343,7 +2351,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # ListItem = (Bullet | Enumerator) StartList:a ListBlock:b { a << b } (ListContinuationBlock:c { a.push(*c) })* { list_item_from a }
+  # ListItem = (Bullet | Enumerator) @StartList:a ListBlock:b { a << b } (ListContinuationBlock:c { a.push(*c) })* { list_item_from a }
   def _ListItem
 
     _save = self.pos
@@ -2364,7 +2372,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -2419,7 +2427,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # ListItemTight = (Bullet | Enumerator) ListBlock:a (!BlankLine ListContinuationBlock:b { a.push(*b) })* !ListContinuationBlock { list_item_from a }
+  # ListItemTight = (Bullet | Enumerator) ListBlock:a (!@BlankLine ListContinuationBlock:b { a.push(*b) })* !ListContinuationBlock { list_item_from a }
   def _ListItemTight
 
     _save = self.pos
@@ -2451,7 +2459,7 @@ class RDoc::Markdown
         _save3 = self.pos
         while true # sequence
           _save4 = self.pos
-          _tmp = apply(:_BlankLine)
+          _tmp = _BlankLine()
           _tmp = _tmp ? nil : true
           self.pos = _save4
           unless _tmp
@@ -2499,13 +2507,13 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # ListBlock = !BlankLine Line:a ListBlockLine*:c { [a, *c] }
+  # ListBlock = !@BlankLine Line:a ListBlockLine*:c { [a, *c] }
   def _ListBlock
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
-      _tmp = apply(:_BlankLine)
+      _tmp = _BlankLine()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
@@ -2543,19 +2551,19 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # ListContinuationBlock = StartList:a BlankLine* { a << "\n" } (Indent ListBlock:b { a.concat b })+ { a }
+  # ListContinuationBlock = @StartList:a @BlankLine* { a << "\n" } (Indent ListBlock:b { a.concat b })+ { a }
   def _ListContinuationBlock
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
         break
       end
       while true
-        _tmp = apply(:_BlankLine)
+        _tmp = _BlankLine()
         break unless _tmp
       end
       _tmp = true
@@ -2638,12 +2646,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Enumerator = NonindentSpace [0-9]+ "." Spacechar+
+  # Enumerator = @NonindentSpace [0-9]+ "." @Spacechar+
   def _Enumerator
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_NonindentSpace)
+      _tmp = _NonindentSpace()
       unless _tmp
         self.pos = _save
         break
@@ -2683,10 +2691,10 @@ class RDoc::Markdown
         break
       end
       _save4 = self.pos
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       if _tmp
         while true
-          _tmp = apply(:_Spacechar)
+          _tmp = _Spacechar()
           break unless _tmp
         end
         _tmp = true
@@ -2744,13 +2752,13 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # ListBlockLine = !BlankLine !(Indent? (Bullet | Enumerator)) !HorizontalRule OptionallyIndentedLine
+  # ListBlockLine = !@BlankLine !(Indent? (Bullet | Enumerator)) !HorizontalRule OptionallyIndentedLine
   def _ListBlockLine
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
-      _tmp = apply(:_BlankLine)
+      _tmp = _BlankLine()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
@@ -8392,7 +8400,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # HtmlBlock = < (HtmlBlockInTags | HtmlComment | HtmlBlockSelfClosing | HtmlUnclosed) > BlankLine+ { if html? then                 RDoc::Markup::Raw.new text               end }
+  # HtmlBlock = < (HtmlBlockInTags | HtmlComment | HtmlBlockSelfClosing | HtmlUnclosed) > @BlankLine+ { if html? then                 RDoc::Markup::Raw.new text               end }
   def _HtmlBlock
 
     _save = self.pos
@@ -8424,10 +8432,10 @@ class RDoc::Markdown
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_BlankLine)
+      _tmp = _BlankLine()
       if _tmp
         while true
-          _tmp = apply(:_BlankLine)
+          _tmp = _BlankLine()
           break unless _tmp
         end
         _tmp = true
@@ -8952,7 +8960,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # StyleBlock = < InStyleTags > BlankLine* { if css? then                     RDoc::Markup::Raw.new text                   end }
+  # StyleBlock = < InStyleTags > @BlankLine* { if css? then                     RDoc::Markup::Raw.new text                   end }
   def _StyleBlock
 
     _save = self.pos
@@ -8967,7 +8975,7 @@ class RDoc::Markdown
         break
       end
       while true
-        _tmp = apply(:_BlankLine)
+        _tmp = _BlankLine()
         break unless _tmp
       end
       _tmp = true
@@ -8989,7 +8997,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 &Inline { c })+:chunks @Endline? { chunks }
   def _Inlines
 
     _save = self.pos
@@ -9003,7 +9011,7 @@ class RDoc::Markdown
         _save3 = self.pos
         while true # sequence
           _save4 = self.pos
-          _tmp = apply(:_Endline)
+          _tmp = _Endline()
           _tmp = _tmp ? nil : true
           self.pos = _save4
           unless _tmp
@@ -9029,7 +9037,7 @@ class RDoc::Markdown
 
         _save5 = self.pos
         while true # sequence
-          _tmp = apply(:_Endline)
+          _tmp = _Endline()
           c = @result
           unless _tmp
             self.pos = _save5
@@ -9065,7 +9073,7 @@ class RDoc::Markdown
             _save8 = self.pos
             while true # sequence
               _save9 = self.pos
-              _tmp = apply(:_Endline)
+              _tmp = _Endline()
               _tmp = _tmp ? nil : true
               self.pos = _save9
               unless _tmp
@@ -9091,7 +9099,7 @@ class RDoc::Markdown
 
             _save10 = self.pos
             while true # sequence
-              _tmp = apply(:_Endline)
+              _tmp = _Endline()
               c = @result
               unless _tmp
                 self.pos = _save10
@@ -9131,7 +9139,7 @@ class RDoc::Markdown
         break
       end
       _save12 = self.pos
-      _tmp = apply(:_Endline)
+      _tmp = _Endline()
       unless _tmp
         _tmp = true
         self.pos = _save12
@@ -9152,7 +9160,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 | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)
   def _Inline
 
     _save = self.pos
@@ -9160,13 +9168,13 @@ class RDoc::Markdown
       _tmp = apply(:_Str)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_Endline)
+      _tmp = _Endline()
       break if _tmp
       self.pos = _save
       _tmp = apply(:_UlOrStarLine)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_Space)
+      _tmp = _Space()
       break if _tmp
       self.pos = _save
       _tmp = apply(:_Strong)
@@ -9209,16 +9217,16 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Space = Spacechar+ { " " }
+  # Space = @Spacechar+ { " " }
   def _Space
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       if _tmp
         while true
-          _tmp = apply(:_Spacechar)
+          _tmp = _Spacechar()
           break unless _tmp
         end
         _tmp = true
@@ -9241,12 +9249,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Str = StartList:a < NormalChar+ > { a = text } (StrChunk:c { a << c })* { a }
+  # Str = @StartList:a < @NormalChar+ > { a = text } (StrChunk:c { a << c })* { a }
   def _Str
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -9254,10 +9262,10 @@ class RDoc::Markdown
       end
       _text_start = self.pos
       _save1 = self.pos
-      _tmp = apply(:_NormalChar)
+      _tmp = _NormalChar()
       if _tmp
         while true
-          _tmp = apply(:_NormalChar)
+          _tmp = _NormalChar()
           break unless _tmp
         end
         _tmp = true
@@ -9314,7 +9322,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # StrChunk = < (NormalChar | /_+/ &Alphanumeric)+ > { text }
+  # StrChunk = < (@NormalChar | /_+/ &Alphanumeric)+ > { text }
   def _StrChunk
 
     _save = self.pos
@@ -9324,7 +9332,7 @@ class RDoc::Markdown
 
       _save2 = self.pos
       while true # choice
-        _tmp = apply(:_NormalChar)
+        _tmp = _NormalChar()
         break if _tmp
         self.pos = _save2
 
@@ -9354,7 +9362,7 @@ class RDoc::Markdown
 
           _save5 = self.pos
           while true # choice
-            _tmp = apply(:_NormalChar)
+            _tmp = _NormalChar()
             break if _tmp
             self.pos = _save5
 
@@ -9404,7 +9412,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # EscapedChar = "\\" !Newline < /[:\\`|*_{}\[\]()#+.!><-]/ > { text }
+  # EscapedChar = "\\" !@Newline < /[:\\`|*_{}\[\]()#+.!><-]/ > { text }
   def _EscapedChar
 
     _save = self.pos
@@ -9415,7 +9423,7 @@ class RDoc::Markdown
         break
       end
       _save1 = self.pos
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
@@ -9480,18 +9488,18 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Endline = (LineBreak | TerminalEndline | NormalEndline)
+  # Endline = (@LineBreak | @TerminalEndline | @NormalEndline)
   def _Endline
 
     _save = self.pos
     while true # choice
-      _tmp = apply(:_LineBreak)
+      _tmp = _LineBreak()
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_TerminalEndline)
+      _tmp = _TerminalEndline()
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_NormalEndline)
+      _tmp = _NormalEndline()
       break if _tmp
       self.pos = _save
       break
@@ -9501,23 +9509,23 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # NormalEndline = Sp Newline !BlankLine !">" !AtxStart !(Line /={3,}|-{3,}=/ Newline) { "\n" }
+  # NormalEndline = @Sp @Newline !@BlankLine !">" !AtxStart !(Line /={3,}|-{3,}=/ @Newline) { "\n" }
   def _NormalEndline
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       unless _tmp
         self.pos = _save
         break
       end
       _save1 = self.pos
-      _tmp = apply(:_BlankLine)
+      _tmp = _BlankLine()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
@@ -9554,7 +9562,7 @@ class RDoc::Markdown
           self.pos = _save5
           break
         end
-        _tmp = apply(:_Newline)
+        _tmp = _Newline()
         unless _tmp
           self.pos = _save5
         end
@@ -9579,22 +9587,22 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # TerminalEndline = Sp Newline Eof
+  # TerminalEndline = @Sp @Newline @Eof
   def _TerminalEndline
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_Eof)
+      _tmp = _Eof()
       unless _tmp
         self.pos = _save
       end
@@ -9605,7 +9613,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # LineBreak = "  " NormalEndline { RDoc::Markup::HardBreak.new }
+  # LineBreak = "  " @NormalEndline { RDoc::Markup::HardBreak.new }
   def _LineBreak
 
     _save = self.pos
@@ -9615,7 +9623,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_NormalEndline)
+      _tmp = _NormalEndline()
       unless _tmp
         self.pos = _save
         break
@@ -9632,13 +9640,13 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Symbol = < SpecialChar > { text }
+  # Symbol = < @SpecialChar > { text }
   def _Symbol
 
     _save = self.pos
     while true # sequence
       _text_start = self.pos
-      _tmp = apply(:_SpecialChar)
+      _tmp = _SpecialChar()
       if _tmp
         text = get_text(_text_start)
       end
@@ -9692,7 +9700,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # StarLine = (< /\*{4,}/ > { text } | < Spacechar /\*+/ &Spacechar > { text })
+  # StarLine = (< /\*{4,}/ > { text } | < @Spacechar /\*+/ &@Spacechar > { text })
   def _StarLine
 
     _save = self.pos
@@ -9726,7 +9734,7 @@ class RDoc::Markdown
 
         _save3 = self.pos
         while true # sequence
-          _tmp = apply(:_Spacechar)
+          _tmp = _Spacechar()
           unless _tmp
             self.pos = _save3
             break
@@ -9737,7 +9745,7 @@ class RDoc::Markdown
             break
           end
           _save4 = self.pos
-          _tmp = apply(:_Spacechar)
+          _tmp = _Spacechar()
           self.pos = _save4
           unless _tmp
             self.pos = _save3
@@ -9769,7 +9777,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # UlLine = (< /_{4,}/ > { text } | < Spacechar /_+/ &Spacechar > { text })
+  # UlLine = (< /_{4,}/ > { text } | < @Spacechar /_+/ &@Spacechar > { text })
   def _UlLine
 
     _save = self.pos
@@ -9803,7 +9811,7 @@ class RDoc::Markdown
 
         _save3 = self.pos
         while true # sequence
-          _tmp = apply(:_Spacechar)
+          _tmp = _Spacechar()
           unless _tmp
             self.pos = _save3
             break
@@ -9814,7 +9822,7 @@ class RDoc::Markdown
             break
           end
           _save4 = self.pos
-          _tmp = apply(:_Spacechar)
+          _tmp = _Spacechar()
           self.pos = _save4
           unless _tmp
             self.pos = _save3
@@ -9864,7 +9872,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # OneStarOpen = !StarLine "*" !Spacechar !Newline
+  # OneStarOpen = !StarLine "*" !@Spacechar !@Newline
   def _OneStarOpen
 
     _save = self.pos
@@ -9883,7 +9891,7 @@ class RDoc::Markdown
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       _tmp = _tmp ? nil : true
       self.pos = _save2
       unless _tmp
@@ -9891,7 +9899,7 @@ class RDoc::Markdown
         break
       end
       _save3 = self.pos
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       _tmp = _tmp ? nil : true
       self.pos = _save3
       unless _tmp
@@ -9904,13 +9912,13 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # OneStarClose = !Spacechar !Newline Inline:a "*" { a }
+  # OneStarClose = !@Spacechar !@Newline Inline:a "*" { a }
   def _OneStarClose
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
@@ -9918,7 +9926,7 @@ class RDoc::Markdown
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       _tmp = _tmp ? nil : true
       self.pos = _save2
       unless _tmp
@@ -9948,7 +9956,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # EmphStar = OneStarOpen StartList:a (!OneStarClose Inline:l { a << l })* OneStarClose:l { a << l } { emphasis a.join }
+  # EmphStar = OneStarOpen @StartList:a (!OneStarClose Inline:l { a << l })* OneStarClose:l { a << l } { emphasis a.join }
   def _EmphStar
 
     _save = self.pos
@@ -9958,7 +9966,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -10021,7 +10029,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # OneUlOpen = !UlLine "_" !Spacechar !Newline
+  # OneUlOpen = !UlLine "_" !@Spacechar !@Newline
   def _OneUlOpen
 
     _save = self.pos
@@ -10040,7 +10048,7 @@ class RDoc::Markdown
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       _tmp = _tmp ? nil : true
       self.pos = _save2
       unless _tmp
@@ -10048,7 +10056,7 @@ class RDoc::Markdown
         break
       end
       _save3 = self.pos
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       _tmp = _tmp ? nil : true
       self.pos = _save3
       unless _tmp
@@ -10061,13 +10069,13 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # OneUlClose = !Spacechar !Newline Inline:a "_" { a }
+  # OneUlClose = !@Spacechar !@Newline Inline:a "_" { a }
   def _OneUlClose
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
@@ -10075,7 +10083,7 @@ class RDoc::Markdown
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       _tmp = _tmp ? nil : true
       self.pos = _save2
       unless _tmp
@@ -10105,7 +10113,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # EmphUl = OneUlOpen StartList:a (!OneUlClose Inline:l { a << l })* OneUlClose:l { a << l } { emphasis a.join }
+  # EmphUl = OneUlOpen @StartList:a (!OneUlClose Inline:l { a << l })* OneUlClose:l { a << l } { emphasis a.join }
   def _EmphUl
 
     _save = self.pos
@@ -10115,7 +10123,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -10196,7 +10204,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # TwoStarOpen = !StarLine "**" !Spacechar !Newline
+  # TwoStarOpen = !StarLine "**" !@Spacechar !@Newline
   def _TwoStarOpen
 
     _save = self.pos
@@ -10215,7 +10223,7 @@ class RDoc::Markdown
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       _tmp = _tmp ? nil : true
       self.pos = _save2
       unless _tmp
@@ -10223,7 +10231,7 @@ class RDoc::Markdown
         break
       end
       _save3 = self.pos
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       _tmp = _tmp ? nil : true
       self.pos = _save3
       unless _tmp
@@ -10236,13 +10244,13 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # TwoStarClose = !Spacechar !Newline Inline:a "**" { a }
+  # TwoStarClose = !@Spacechar !@Newline Inline:a "**" { a }
   def _TwoStarClose
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
@@ -10250,7 +10258,7 @@ class RDoc::Markdown
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       _tmp = _tmp ? nil : true
       self.pos = _save2
       unless _tmp
@@ -10280,7 +10288,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # StrongStar = TwoStarOpen StartList:a (!TwoStarClose Inline:l { a << l })* TwoStarClose:l { a << l } { strong a.join }
+  # StrongStar = TwoStarOpen @StartList:a (!TwoStarClose Inline:l { a << l })* TwoStarClose:l { a << l } { strong a.join }
   def _StrongStar
 
     _save = self.pos
@@ -10290,7 +10298,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -10353,7 +10361,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # TwoUlOpen = !UlLine "__" !Spacechar !Newline
+  # TwoUlOpen = !UlLine "__" !@Spacechar !@Newline
   def _TwoUlOpen
 
     _save = self.pos
@@ -10372,7 +10380,7 @@ class RDoc::Markdown
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       _tmp = _tmp ? nil : true
       self.pos = _save2
       unless _tmp
@@ -10380,7 +10388,7 @@ class RDoc::Markdown
         break
       end
       _save3 = self.pos
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       _tmp = _tmp ? nil : true
       self.pos = _save3
       unless _tmp
@@ -10393,13 +10401,13 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # TwoUlClose = !Spacechar !Newline Inline:a "__" { a }
+  # TwoUlClose = !@Spacechar !@Newline Inline:a "__" { a }
   def _TwoUlClose
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
@@ -10407,7 +10415,7 @@ class RDoc::Markdown
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       _tmp = _tmp ? nil : true
       self.pos = _save2
       unless _tmp
@@ -10437,7 +10445,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # StrongUl = TwoUlOpen StartList:a (!TwoUlClose Inline:i { a << i })* TwoUlClose:l { a << l } { strong a.join }
+  # StrongUl = TwoUlOpen @StartList:a (!TwoUlClose Inline:i { a << i })* TwoUlClose:l { a << l } { strong a.join }
   def _StrongUl
 
     _save = self.pos
@@ -10447,7 +10455,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -10510,7 +10518,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Image = "!" (ExplicitLink | ReferenceLink):a { a }
+  # Image = "!" (ExplicitLink | ReferenceLink):a { "rdoc-image:#{a[/\[(.*)\]/, 1]}" }
   def _Image
 
     _save = self.pos
@@ -10537,7 +10545,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      @result = begin;  a ; end
+      @result = begin;  "rdoc-image:#{a[/\[(.*)\]/, 1]}" ; end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -10685,7 +10693,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # ExplicitLink = Label:l Spnl "(" Sp Source:s Spnl Title Sp ")" { "{#{l}}[#{s}]" }
+  # ExplicitLink = Label:l Spnl "(" @Sp Source:s Spnl Title @Sp ")" { "{#{l}}[#{s}]" }
   def _ExplicitLink
 
     _save = self.pos
@@ -10706,7 +10714,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         self.pos = _save
         break
@@ -10727,7 +10735,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         self.pos = _save
         break
@@ -10974,7 +10982,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # TitleSingle = "'" (!("'" Sp (")" | Newline)) .)* "'"
+  # TitleSingle = "'" (!("'" @Sp (")" | @Newline)) .)* "'"
   def _TitleSingle
 
     _save = self.pos
@@ -10997,7 +11005,7 @@ class RDoc::Markdown
               self.pos = _save4
               break
             end
-            _tmp = apply(:_Sp)
+            _tmp = _Sp()
             unless _tmp
               self.pos = _save4
               break
@@ -11008,7 +11016,7 @@ class RDoc::Markdown
               _tmp = match_string(")")
               break if _tmp
               self.pos = _save5
-              _tmp = apply(:_Newline)
+              _tmp = _Newline()
               break if _tmp
               self.pos = _save5
               break
@@ -11051,7 +11059,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # TitleDouble = "\"" (!("\"" Sp (")" | Newline)) .)* "\""
+  # TitleDouble = "\"" (!("\"" @Sp (")" | @Newline)) .)* "\""
   def _TitleDouble
 
     _save = self.pos
@@ -11074,7 +11082,7 @@ class RDoc::Markdown
               self.pos = _save4
               break
             end
-            _tmp = apply(:_Sp)
+            _tmp = _Sp()
             unless _tmp
               self.pos = _save4
               break
@@ -11085,7 +11093,7 @@ class RDoc::Markdown
               _tmp = match_string(")")
               break if _tmp
               self.pos = _save5
-              _tmp = apply(:_Newline)
+              _tmp = _Newline()
               break if _tmp
               self.pos = _save5
               break
@@ -11146,7 +11154,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # AutoLinkUrl = "<" < /[A-Za-z]+/ "://" (!Newline !">" .)+ > ">" { text }
+  # AutoLinkUrl = "<" < /[A-Za-z]+/ "://" (!@Newline !">" .)+ > ">" { text }
   def _AutoLinkUrl
 
     _save = self.pos
@@ -11175,7 +11183,7 @@ class RDoc::Markdown
         _save3 = self.pos
         while true # sequence
           _save4 = self.pos
-          _tmp = apply(:_Newline)
+          _tmp = _Newline()
           _tmp = _tmp ? nil : true
           self.pos = _save4
           unless _tmp
@@ -11203,7 +11211,7 @@ class RDoc::Markdown
             _save6 = self.pos
             while true # sequence
               _save7 = self.pos
-              _tmp = apply(:_Newline)
+              _tmp = _Newline()
               _tmp = _tmp ? nil : true
               self.pos = _save7
               unless _tmp
@@ -11261,7 +11269,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # AutoLinkEmail = "<" "mailto:"? < /[\w+.\/!%~$-]+/i "@" (!Newline !">" .)+ > ">" { "mailto:#{text}" }
+  # AutoLinkEmail = "<" "mailto:"? < /[\w+.\/!%~$-]+/i "@" (!@Newline !">" .)+ > ">" { "mailto:#{text}" }
   def _AutoLinkEmail
 
     _save = self.pos
@@ -11300,7 +11308,7 @@ class RDoc::Markdown
         _save4 = self.pos
         while true # sequence
           _save5 = self.pos
-          _tmp = apply(:_Newline)
+          _tmp = _Newline()
           _tmp = _tmp ? nil : true
           self.pos = _save5
           unless _tmp
@@ -11328,7 +11336,7 @@ class RDoc::Markdown
             _save7 = self.pos
             while true # sequence
               _save8 = self.pos
-              _tmp = apply(:_Newline)
+              _tmp = _Newline()
               _tmp = _tmp ? nil : true
               self.pos = _save8
               unless _tmp
@@ -11386,12 +11394,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Reference = NonindentSpace !"[]" Label:label ":" Spnl RefSrc:link RefTitle BlankLine+ { # TODO use title               reference label, link               nil             }
+  # Reference = @NonindentSpace !"[]" Label:label ":" Spnl RefSrc:link RefTitle @BlankLine+ { # TODO use title               reference label, link               nil             }
   def _Reference
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_NonindentSpace)
+      _tmp = _NonindentSpace()
       unless _tmp
         self.pos = _save
         break
@@ -11432,10 +11440,10 @@ class RDoc::Markdown
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_BlankLine)
+      _tmp = _BlankLine()
       if _tmp
         while true
-          _tmp = apply(:_BlankLine)
+          _tmp = _BlankLine()
           break unless _tmp
         end
         _tmp = true
@@ -11461,7 +11469,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Label = "[" (!"^" &{ notes? } | &. &{ !notes? }) StartList:a (!"]" Inline:l { a << l })* "]" { a.join.gsub(/\s+/, ' ') }
+  # Label = "[" (!"^" &{ notes? } | &. &{ !notes? }) @StartList:a (!"]" Inline:l { a << l })* "]" { a.join.gsub(/\s+/, ' ') }
   def _Label
 
     _save = self.pos
@@ -11524,7 +11532,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -11647,7 +11655,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # RefTitleSingle = Spnl "'" < (!("'" Sp Newline | Newline) .)* > "'" { text }
+  # RefTitleSingle = Spnl "'" < (!("'" @Sp @Newline | @Newline) .)* > "'" { text }
   def _RefTitleSingle
 
     _save = self.pos
@@ -11679,12 +11687,12 @@ class RDoc::Markdown
                 self.pos = _save5
                 break
               end
-              _tmp = apply(:_Sp)
+              _tmp = _Sp()
               unless _tmp
                 self.pos = _save5
                 break
               end
-              _tmp = apply(:_Newline)
+              _tmp = _Newline()
               unless _tmp
                 self.pos = _save5
               end
@@ -11693,7 +11701,7 @@ class RDoc::Markdown
 
             break if _tmp
             self.pos = _save4
-            _tmp = apply(:_Newline)
+            _tmp = _Newline()
             break if _tmp
             self.pos = _save4
             break
@@ -11739,7 +11747,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # RefTitleDouble = Spnl "\"" < (!("\"" Sp Newline | Newline) .)* > "\"" { text }
+  # RefTitleDouble = Spnl "\"" < (!("\"" @Sp @Newline | @Newline) .)* > "\"" { text }
   def _RefTitleDouble
 
     _save = self.pos
@@ -11771,12 +11779,12 @@ class RDoc::Markdown
                 self.pos = _save5
                 break
               end
-              _tmp = apply(:_Sp)
+              _tmp = _Sp()
               unless _tmp
                 self.pos = _save5
                 break
               end
-              _tmp = apply(:_Newline)
+              _tmp = _Newline()
               unless _tmp
                 self.pos = _save5
               end
@@ -11785,7 +11793,7 @@ class RDoc::Markdown
 
             break if _tmp
             self.pos = _save4
-            _tmp = apply(:_Newline)
+            _tmp = _Newline()
             break if _tmp
             self.pos = _save4
             break
@@ -11831,7 +11839,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # RefTitleParens = Spnl "(" < (!(")" Sp Newline | Newline) .)* > ")" { text }
+  # RefTitleParens = Spnl "(" < (!(")" @Sp @Newline | @Newline) .)* > ")" { text }
   def _RefTitleParens
 
     _save = self.pos
@@ -11863,12 +11871,12 @@ class RDoc::Markdown
                 self.pos = _save5
                 break
               end
-              _tmp = apply(:_Sp)
+              _tmp = _Sp()
               unless _tmp
                 self.pos = _save5
                 break
               end
-              _tmp = apply(:_Newline)
+              _tmp = _Newline()
               unless _tmp
                 self.pos = _save5
               end
@@ -11877,7 +11885,7 @@ class RDoc::Markdown
 
             break if _tmp
             self.pos = _save4
-            _tmp = apply(:_Newline)
+            _tmp = _Newline()
             break if _tmp
             self.pos = _save4
             break
@@ -12065,7 +12073,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Code = (Ticks1 Sp < ((!"`" Nonspacechar)+ | !Ticks1 /`+/ | !(Sp Ticks1) (Spacechar | Newline !BlankLine))+ > Sp Ticks1 | Ticks2 Sp < ((!"`" Nonspacechar)+ | !Ticks2 /`+/ | !(Sp Ticks2) (Spacechar | Newline !BlankLine))+ > Sp Ticks2 | Ticks3 Sp < ((!"`" Nonspacechar)+ | !Ticks3 /`+/ | !(Sp Ticks3) (Spacechar | Newline !BlankLine))+ > Sp Ticks3 | Ticks4 Sp < ((!"`" Nonspacechar)+ | !Ticks4 /`+/ | !(Sp Ticks4) (Spacechar | Newline !BlankLine))+ > Sp Ticks4 | Ticks5 Sp < ((!"`" Nonspacechar)+ | !Ticks5 /`+/ | !(Sp Ticks5) (Spacechar | Newline !BlankLine))+ > Sp Ticks5) { "<code>#{text}</code>" }
+  # Code = (Ticks1 @Sp < ((!"`" Nonspacechar)+ | !Ticks1 /`+/ | !(@Sp Ticks1) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks1 | Ticks2 @Sp < ((!"`" Nonspacechar)+ | !Ticks2 /`+/ | !(@Sp Ticks2) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks2 | Ticks3 @Sp < ((!"`" Nonspacechar)+ | !Ticks3 /`+/ | !(@Sp Ticks3) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks3 | Ticks4 @Sp < ((!"`" Nonspacechar)+ | !Ticks4 /`+/ | !(@Sp Ticks4) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks4 | Ticks5 @Sp < ((!"`" Nonspacechar)+ | !Ticks5 /`+/ | !(@Sp Ticks5) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks5) { "<code>#{text}</code>" }
   def _Code
 
     _save = self.pos
@@ -12081,7 +12089,7 @@ class RDoc::Markdown
             self.pos = _save2
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save2
             break
@@ -12165,7 +12173,7 @@ class RDoc::Markdown
 
               _save14 = self.pos
               while true # sequence
-                _tmp = apply(:_Sp)
+                _tmp = _Sp()
                 unless _tmp
                   self.pos = _save14
                   break
@@ -12186,19 +12194,19 @@ class RDoc::Markdown
 
               _save15 = self.pos
               while true # choice
-                _tmp = apply(:_Spacechar)
+                _tmp = _Spacechar()
                 break if _tmp
                 self.pos = _save15
 
                 _save16 = self.pos
                 while true # sequence
-                  _tmp = apply(:_Newline)
+                  _tmp = _Newline()
                   unless _tmp
                     self.pos = _save16
                     break
                   end
                   _save17 = self.pos
-                  _tmp = apply(:_BlankLine)
+                  _tmp = _BlankLine()
                   _tmp = _tmp ? nil : true
                   self.pos = _save17
                   unless _tmp
@@ -12302,7 +12310,7 @@ class RDoc::Markdown
 
                   _save28 = self.pos
                   while true # sequence
-                    _tmp = apply(:_Sp)
+                    _tmp = _Sp()
                     unless _tmp
                       self.pos = _save28
                       break
@@ -12323,19 +12331,19 @@ class RDoc::Markdown
 
                   _save29 = self.pos
                   while true # choice
-                    _tmp = apply(:_Spacechar)
+                    _tmp = _Spacechar()
                     break if _tmp
                     self.pos = _save29
 
                     _save30 = self.pos
                     while true # sequence
-                      _tmp = apply(:_Newline)
+                      _tmp = _Newline()
                       unless _tmp
                         self.pos = _save30
                         break
                       end
                       _save31 = self.pos
-                      _tmp = apply(:_BlankLine)
+                      _tmp = _BlankLine()
                       _tmp = _tmp ? nil : true
                       self.pos = _save31
                       unless _tmp
@@ -12373,7 +12381,7 @@ class RDoc::Markdown
             self.pos = _save2
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save2
             break
@@ -12395,7 +12403,7 @@ class RDoc::Markdown
             self.pos = _save32
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save32
             break
@@ -12479,7 +12487,7 @@ class RDoc::Markdown
 
               _save44 = self.pos
               while true # sequence
-                _tmp = apply(:_Sp)
+                _tmp = _Sp()
                 unless _tmp
                   self.pos = _save44
                   break
@@ -12500,19 +12508,19 @@ class RDoc::Markdown
 
               _save45 = self.pos
               while true # choice
-                _tmp = apply(:_Spacechar)
+                _tmp = _Spacechar()
                 break if _tmp
                 self.pos = _save45
 
                 _save46 = self.pos
                 while true # sequence
-                  _tmp = apply(:_Newline)
+                  _tmp = _Newline()
                   unless _tmp
                     self.pos = _save46
                     break
                   end
                   _save47 = self.pos
-                  _tmp = apply(:_BlankLine)
+                  _tmp = _BlankLine()
                   _tmp = _tmp ? nil : true
                   self.pos = _save47
                   unless _tmp
@@ -12616,7 +12624,7 @@ class RDoc::Markdown
 
                   _save58 = self.pos
                   while true # sequence
-                    _tmp = apply(:_Sp)
+                    _tmp = _Sp()
                     unless _tmp
                       self.pos = _save58
                       break
@@ -12637,19 +12645,19 @@ class RDoc::Markdown
 
                   _save59 = self.pos
                   while true # choice
-                    _tmp = apply(:_Spacechar)
+                    _tmp = _Spacechar()
                     break if _tmp
                     self.pos = _save59
 
                     _save60 = self.pos
                     while true # sequence
-                      _tmp = apply(:_Newline)
+                      _tmp = _Newline()
                       unless _tmp
                         self.pos = _save60
                         break
                       end
                       _save61 = self.pos
-                      _tmp = apply(:_BlankLine)
+                      _tmp = _BlankLine()
                       _tmp = _tmp ? nil : true
                       self.pos = _save61
                       unless _tmp
@@ -12687,7 +12695,7 @@ class RDoc::Markdown
             self.pos = _save32
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save32
             break
@@ -12709,7 +12717,7 @@ class RDoc::Markdown
             self.pos = _save62
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save62
             break
@@ -12793,7 +12801,7 @@ class RDoc::Markdown
 
               _save74 = self.pos
               while true # sequence
-                _tmp = apply(:_Sp)
+                _tmp = _Sp()
                 unless _tmp
                   self.pos = _save74
                   break
@@ -12814,19 +12822,19 @@ class RDoc::Markdown
 
               _save75 = self.pos
               while true # choice
-                _tmp = apply(:_Spacechar)
+                _tmp = _Spacechar()
                 break if _tmp
                 self.pos = _save75
 
                 _save76 = self.pos
                 while true # sequence
-                  _tmp = apply(:_Newline)
+                  _tmp = _Newline()
                   unless _tmp
                     self.pos = _save76
                     break
                   end
                   _save77 = self.pos
-                  _tmp = apply(:_BlankLine)
+                  _tmp = _BlankLine()
                   _tmp = _tmp ? nil : true
                   self.pos = _save77
                   unless _tmp
@@ -12930,7 +12938,7 @@ class RDoc::Markdown
 
                   _save88 = self.pos
                   while true # sequence
-                    _tmp = apply(:_Sp)
+                    _tmp = _Sp()
                     unless _tmp
                       self.pos = _save88
                       break
@@ -12951,19 +12959,19 @@ class RDoc::Markdown
 
                   _save89 = self.pos
                   while true # choice
-                    _tmp = apply(:_Spacechar)
+                    _tmp = _Spacechar()
                     break if _tmp
                     self.pos = _save89
 
                     _save90 = self.pos
                     while true # sequence
-                      _tmp = apply(:_Newline)
+                      _tmp = _Newline()
                       unless _tmp
                         self.pos = _save90
                         break
                       end
                       _save91 = self.pos
-                      _tmp = apply(:_BlankLine)
+                      _tmp = _BlankLine()
                       _tmp = _tmp ? nil : true
                       self.pos = _save91
                       unless _tmp
@@ -13001,7 +13009,7 @@ class RDoc::Markdown
             self.pos = _save62
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save62
             break
@@ -13023,7 +13031,7 @@ class RDoc::Markdown
             self.pos = _save92
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save92
             break
@@ -13107,7 +13115,7 @@ class RDoc::Markdown
 
               _save104 = self.pos
               while true # sequence
-                _tmp = apply(:_Sp)
+                _tmp = _Sp()
                 unless _tmp
                   self.pos = _save104
                   break
@@ -13128,19 +13136,19 @@ class RDoc::Markdown
 
               _save105 = self.pos
               while true # choice
-                _tmp = apply(:_Spacechar)
+                _tmp = _Spacechar()
                 break if _tmp
                 self.pos = _save105
 
                 _save106 = self.pos
                 while true # sequence
-                  _tmp = apply(:_Newline)
+                  _tmp = _Newline()
                   unless _tmp
                     self.pos = _save106
                     break
                   end
                   _save107 = self.pos
-                  _tmp = apply(:_BlankLine)
+                  _tmp = _BlankLine()
                   _tmp = _tmp ? nil : true
                   self.pos = _save107
                   unless _tmp
@@ -13244,7 +13252,7 @@ class RDoc::Markdown
 
                   _save118 = self.pos
                   while true # sequence
-                    _tmp = apply(:_Sp)
+                    _tmp = _Sp()
                     unless _tmp
                       self.pos = _save118
                       break
@@ -13265,19 +13273,19 @@ class RDoc::Markdown
 
                   _save119 = self.pos
                   while true # choice
-                    _tmp = apply(:_Spacechar)
+                    _tmp = _Spacechar()
                     break if _tmp
                     self.pos = _save119
 
                     _save120 = self.pos
                     while true # sequence
-                      _tmp = apply(:_Newline)
+                      _tmp = _Newline()
                       unless _tmp
                         self.pos = _save120
                         break
                       end
                       _save121 = self.pos
-                      _tmp = apply(:_BlankLine)
+                      _tmp = _BlankLine()
                       _tmp = _tmp ? nil : true
                       self.pos = _save121
                       unless _tmp
@@ -13315,7 +13323,7 @@ class RDoc::Markdown
             self.pos = _save92
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save92
             break
@@ -13337,7 +13345,7 @@ class RDoc::Markdown
             self.pos = _save122
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save122
             break
@@ -13421,7 +13429,7 @@ class RDoc::Markdown
 
               _save134 = self.pos
               while true # sequence
-                _tmp = apply(:_Sp)
+                _tmp = _Sp()
                 unless _tmp
                   self.pos = _save134
                   break
@@ -13442,19 +13450,19 @@ class RDoc::Markdown
 
               _save135 = self.pos
               while true # choice
-                _tmp = apply(:_Spacechar)
+                _tmp = _Spacechar()
                 break if _tmp
                 self.pos = _save135
 
                 _save136 = self.pos
                 while true # sequence
-                  _tmp = apply(:_Newline)
+                  _tmp = _Newline()
                   unless _tmp
                     self.pos = _save136
                     break
                   end
                   _save137 = self.pos
-                  _tmp = apply(:_BlankLine)
+                  _tmp = _BlankLine()
                   _tmp = _tmp ? nil : true
                   self.pos = _save137
                   unless _tmp
@@ -13558,7 +13566,7 @@ class RDoc::Markdown
 
                   _save148 = self.pos
                   while true # sequence
-                    _tmp = apply(:_Sp)
+                    _tmp = _Sp()
                     unless _tmp
                       self.pos = _save148
                       break
@@ -13579,19 +13587,19 @@ class RDoc::Markdown
 
                   _save149 = self.pos
                   while true # choice
-                    _tmp = apply(:_Spacechar)
+                    _tmp = _Spacechar()
                     break if _tmp
                     self.pos = _save149
 
                     _save150 = self.pos
                     while true # sequence
-                      _tmp = apply(:_Newline)
+                      _tmp = _Newline()
                       unless _tmp
                         self.pos = _save150
                         break
                       end
                       _save151 = self.pos
-                      _tmp = apply(:_BlankLine)
+                      _tmp = _BlankLine()
                       _tmp = _tmp ? nil : true
                       self.pos = _save151
                       unless _tmp
@@ -13629,7 +13637,7 @@ class RDoc::Markdown
             self.pos = _save122
             break
           end
-          _tmp = apply(:_Sp)
+          _tmp = _Sp()
           unless _tmp
             self.pos = _save122
             break
@@ -13702,17 +13710,17 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # BlankLine = Sp Newline { "\n" }
+  # BlankLine = @Sp @Newline { "\n" }
   def _BlankLine
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       unless _tmp
         self.pos = _save
         break
@@ -14106,13 +14114,13 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Nonspacechar = !Spacechar !Newline .
+  # Nonspacechar = !@Spacechar !@Newline .
   def _Nonspacechar
 
     _save = self.pos
     while true # sequence
       _save1 = self.pos
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       _tmp = _tmp ? nil : true
       self.pos = _save1
       unless _tmp
@@ -14120,7 +14128,7 @@ class RDoc::Markdown
         break
       end
       _save2 = self.pos
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       _tmp = _tmp ? nil : true
       self.pos = _save2
       unless _tmp
@@ -14138,10 +14146,10 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Sp = Spacechar*
+  # Sp = @Spacechar*
   def _Sp
     while true
-      _tmp = apply(:_Spacechar)
+      _tmp = _Spacechar()
       break unless _tmp
     end
     _tmp = true
@@ -14149,12 +14157,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Spnl = Sp (Newline Sp)?
+  # Spnl = @Sp (@Newline @Sp)?
   def _Spnl
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         self.pos = _save
         break
@@ -14163,12 +14171,12 @@ class RDoc::Markdown
 
       _save2 = self.pos
       while true # sequence
-        _tmp = apply(:_Newline)
+        _tmp = _Newline()
         unless _tmp
           self.pos = _save2
           break
         end
-        _tmp = apply(:_Sp)
+        _tmp = _Sp()
         unless _tmp
           self.pos = _save2
         end
@@ -14189,7 +14197,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SpecialChar = (/[*_`&\[\]()<!#\\'"]/ | ExtendedSpecialChar)
+  # SpecialChar = (/[*_`&\[\]()<!#\\'"]/ | @ExtendedSpecialChar)
   def _SpecialChar
 
     _save = self.pos
@@ -14197,7 +14205,7 @@ class RDoc::Markdown
       _tmp = scan(/\A(?-mix:[*_`&\[\]()<!#\\'"])/)
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_ExtendedSpecialChar)
+      _tmp = _ExtendedSpecialChar()
       break if _tmp
       self.pos = _save
       break
@@ -14207,7 +14215,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # NormalChar = !(SpecialChar | Spacechar | Newline) .
+  # NormalChar = !(@SpecialChar | @Spacechar | @Newline) .
   def _NormalChar
 
     _save = self.pos
@@ -14216,13 +14224,13 @@ class RDoc::Markdown
 
       _save2 = self.pos
       while true # choice
-        _tmp = apply(:_SpecialChar)
+        _tmp = _SpecialChar()
         break if _tmp
         self.pos = _save2
-        _tmp = apply(:_Spacechar)
+        _tmp = _Spacechar()
         break if _tmp
         self.pos = _save2
-        _tmp = apply(:_Newline)
+        _tmp = _Newline()
         break if _tmp
         self.pos = _save2
         break
@@ -14499,12 +14507,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Line = RawLine:a { a }
+  # Line = @RawLine:a { a }
   def _Line
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_RawLine)
+      _tmp = _RawLine()
       a = @result
       unless _tmp
         self.pos = _save
@@ -14522,7 +14530,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # RawLine = (< (!"
+  # RawLine = (< (!"\r" !"\n" .)* @Newline > | < .+ > @Eof) { text }
   def _RawLine
 
     _save = self.pos
@@ -14568,7 +14576,7 @@ class RDoc::Markdown
             self.pos = _save2
             break
           end
-          _tmp = apply(:_Newline)
+          _tmp = _Newline()
           unless _tmp
             self.pos = _save2
           end
@@ -14602,7 +14610,7 @@ class RDoc::Markdown
             self.pos = _save7
             break
           end
-          _tmp = apply(:_Eof)
+          _tmp = _Eof()
           unless _tmp
             self.pos = _save7
           end
@@ -14630,7 +14638,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # SkipBlock = (HtmlBlock | (!"#" !SetextBottom1 !SetextBottom2 !BlankLine RawLine)+ BlankLine* | BlankLine+ | RawLine)
+  # SkipBlock = (HtmlBlock | (!"#" !SetextBottom1 !SetextBottom2 !@BlankLine @RawLine)+ @BlankLine* | @BlankLine+ | @RawLine)
   def _SkipBlock
 
     _save = self.pos
@@ -14670,14 +14678,14 @@ class RDoc::Markdown
             break
           end
           _save7 = self.pos
-          _tmp = apply(:_BlankLine)
+          _tmp = _BlankLine()
           _tmp = _tmp ? nil : true
           self.pos = _save7
           unless _tmp
             self.pos = _save3
             break
           end
-          _tmp = apply(:_RawLine)
+          _tmp = _RawLine()
           unless _tmp
             self.pos = _save3
           end
@@ -14714,14 +14722,14 @@ class RDoc::Markdown
                 break
               end
               _save12 = self.pos
-              _tmp = apply(:_BlankLine)
+              _tmp = _BlankLine()
               _tmp = _tmp ? nil : true
               self.pos = _save12
               unless _tmp
                 self.pos = _save8
                 break
               end
-              _tmp = apply(:_RawLine)
+              _tmp = _RawLine()
               unless _tmp
                 self.pos = _save8
               end
@@ -14739,7 +14747,7 @@ class RDoc::Markdown
           break
         end
         while true
-          _tmp = apply(:_BlankLine)
+          _tmp = _BlankLine()
           break unless _tmp
         end
         _tmp = true
@@ -14752,10 +14760,10 @@ class RDoc::Markdown
       break if _tmp
       self.pos = _save
       _save14 = self.pos
-      _tmp = apply(:_BlankLine)
+      _tmp = _BlankLine()
       if _tmp
         while true
-          _tmp = apply(:_BlankLine)
+          _tmp = _BlankLine()
           break unless _tmp
         end
         _tmp = true
@@ -14764,7 +14772,7 @@ class RDoc::Markdown
       end
       break if _tmp
       self.pos = _save
-      _tmp = apply(:_RawLine)
+      _tmp = _RawLine()
       break if _tmp
       self.pos = _save
       break
@@ -14827,7 +14835,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # RawNoteReference = "[^" < (!Newline !"]" .)+ > "]" { text }
+  # RawNoteReference = "[^" < (!@Newline !"]" .)+ > "]" { text }
   def _RawNoteReference
 
     _save = self.pos
@@ -14843,7 +14851,7 @@ class RDoc::Markdown
       _save2 = self.pos
       while true # sequence
         _save3 = self.pos
-        _tmp = apply(:_Newline)
+        _tmp = _Newline()
         _tmp = _tmp ? nil : true
         self.pos = _save3
         unless _tmp
@@ -14871,7 +14879,7 @@ class RDoc::Markdown
           _save5 = self.pos
           while true # sequence
             _save6 = self.pos
-            _tmp = apply(:_Newline)
+            _tmp = _Newline()
             _tmp = _tmp ? nil : true
             self.pos = _save6
             unless _tmp
@@ -14923,7 +14931,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Note = &{ notes? } NonindentSpace RawNoteReference:ref ":" Sp StartList:a RawNoteBlock (&Indent RawNoteBlock:i { a.concat i })* { @footnotes[ref] = paragraph a                    nil                 }
+  # Note = &{ notes? } @NonindentSpace RawNoteReference:ref ":" @Sp @StartList:a RawNoteBlock:i { a.concat i } (&Indent RawNoteBlock:i { a.concat i })* { @footnotes[ref] = paragraph a                    nil                 }
   def _Note
 
     _save = self.pos
@@ -14935,7 +14943,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_NonindentSpace)
+      _tmp = _NonindentSpace()
       unless _tmp
         self.pos = _save
         break
@@ -14951,18 +14959,25 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
         break
       end
       _tmp = apply(:_RawNoteBlock)
+      i = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  a.concat i ; end
+      _tmp = true
       unless _tmp
         self.pos = _save
         break
@@ -15014,7 +15029,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
@@ -15031,7 +15046,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -15144,12 +15159,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # RawNoteBlock = StartList:a (!BlankLine OptionallyIndentedLine:l { a << l })+ < BlankLine* > { a << text } { a }
+  # RawNoteBlock = @StartList:a (!@BlankLine OptionallyIndentedLine:l { a << l })+ < @BlankLine* > { a << text } { a }
   def _RawNoteBlock
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_StartList)
+      _tmp = _StartList()
       a = @result
       unless _tmp
         self.pos = _save
@@ -15160,7 +15175,7 @@ class RDoc::Markdown
       _save2 = self.pos
       while true # sequence
         _save3 = self.pos
-        _tmp = apply(:_BlankLine)
+        _tmp = _BlankLine()
         _tmp = _tmp ? nil : true
         self.pos = _save3
         unless _tmp
@@ -15187,7 +15202,7 @@ class RDoc::Markdown
           _save4 = self.pos
           while true # sequence
             _save5 = self.pos
-            _tmp = apply(:_BlankLine)
+            _tmp = _BlankLine()
             _tmp = _tmp ? nil : true
             self.pos = _save5
             unless _tmp
@@ -15220,7 +15235,7 @@ class RDoc::Markdown
       end
       _text_start = self.pos
       while true
-        _tmp = apply(:_BlankLine)
+        _tmp = _BlankLine()
         break unless _tmp
       end
       _tmp = true
@@ -15249,7 +15264,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               verbatim             }
   def _CodeFence
 
     _save = self.pos
@@ -15270,7 +15285,7 @@ class RDoc::Markdown
 
       _save3 = self.pos
       while true # sequence
-        _tmp = apply(:_Sp)
+        _tmp = _Sp()
         unless _tmp
           self.pos = _save3
           break
@@ -15371,7 +15386,7 @@ class RDoc::Markdown
         _tmp = apply(:_Spacechar)
         break if _tmp
         self.pos = _save5
-        _tmp = apply(:_Newline)
+        _tmp = _Newline()
         break if _tmp
         self.pos = _save5
         break
@@ -15452,7 +15467,7 @@ class RDoc::Markdown
             _tmp = apply(:_Spacechar)
             break if _tmp
             self.pos = _save13
-            _tmp = apply(:_Newline)
+            _tmp = _Newline()
             break if _tmp
             self.pos = _save13
             break
@@ -15476,13 +15491,13 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         self.pos = _save
         break
       end
       while true
-        _tmp = apply(:_Newline)
+        _tmp = _Newline()
         break unless _tmp
       end
       _tmp = true
@@ -15615,7 +15630,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # DefinitionListLabel = StrChunk:label Sp Newline { label }
+  # DefinitionListLabel = StrChunk:label @Sp @Newline { label }
   def _DefinitionListLabel
 
     _save = self.pos
@@ -15626,12 +15641,12 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Sp)
+      _tmp = _Sp()
       unless _tmp
         self.pos = _save
         break
       end
-      _tmp = apply(:_Newline)
+      _tmp = _Newline()
       unless _tmp
         self.pos = _save
         break
@@ -15648,12 +15663,12 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # DefinitionListDefinition = NonindentSpace ":" Space Inlines:a BlankLine+ { paragraph a }
+  # DefinitionListDefinition = @NonindentSpace ":" @Space Inlines:a @BlankLine+ { paragraph a }
   def _DefinitionListDefinition
 
     _save = self.pos
     while true # sequence
-      _tmp = apply(:_NonindentSpace)
+      _tmp = _NonindentSpace()
       unless _tmp
         self.pos = _save
         break
@@ -15663,7 +15678,7 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _tmp = apply(:_Space)
+      _tmp = _Space()
       unless _tmp
         self.pos = _save
         break
@@ -15675,10 +15690,10 @@ class RDoc::Markdown
         break
       end
       _save1 = self.pos
-      _tmp = apply(:_BlankLine)
+      _tmp = _BlankLine()
       if _tmp
         while true
-          _tmp = apply(:_BlankLine)
+          _tmp = _BlankLine()
           break unless _tmp
         end
         _tmp = true
@@ -15704,35 +15719,35 @@ 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[:_Para] = rule_info("Para", "NonindentSpace Inlines:a BlankLine+ { paragraph a }")
+  Rules[:_Block] = rule_info("Block", "@BlankLine* (BlockQuote | Verbatim | CodeFence | 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 @Sp? 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", "/={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[:_Heading] = rule_info("Heading", "(SetextHeading | AtxHeading)")
   Rules[:_BlockQuote] = rule_info("BlockQuote", "BlockQuoteRaw:a { RDoc::Markup::BlockQuote.new(*a) }")
-  Rules[:_BlockQuoteRaw] = rule_info("BlockQuoteRaw", "StartList:a (\">\" \" \"? Line:l { a << l } (!\">\" !BlankLine Line:c { a << c })* (BlankLine:n { a << n })*)+ { inner_parse a.join }")
-  Rules[:_NonblankIndentedLine] = rule_info("NonblankIndentedLine", "!BlankLine IndentedLine")
-  Rules[:_VerbatimChunk] = rule_info("VerbatimChunk", "BlankLine*:a NonblankIndentedLine+:b { a.concat b }")
+  Rules[:_BlockQuoteRaw] = rule_info("BlockQuoteRaw", "@StartList:a (\">\" \" \"? Line:l { a << l } (!\">\" !@BlankLine Line:c { a << c })* (@BlankLine:n { a << n })*)+ { inner_parse a.join }")
+  Rules[:_NonblankIndentedLine] = rule_info("NonblankIndentedLine", "!@BlankLine IndentedLine")
+  Rules[:_VerbatimChunk] = rule_info("VerbatimChunk", "@BlankLine*:a NonblankIndentedLine+:b { a.concat b }")
   Rules[:_Verbatim] = rule_info("Verbatim", "VerbatimChunk+:a { RDoc::Markup::Verbatim.new(*a.flatten) }")
-  Rules[:_HorizontalRule] = rule_info("HorizontalRule", "NonindentSpace (\"*\" Sp \"*\" Sp \"*\" (Sp \"*\")* | \"-\" Sp \"-\" Sp \"-\" (Sp \"-\")* | \"_\" Sp \"_\" Sp \"_\" (Sp \"_\")*) Sp Newline BlankLine+ { RDoc::Markup::Rule.new 1 }")
-  Rules[:_Bullet] = rule_info("Bullet", "!HorizontalRule NonindentSpace /[+*-]/ Spacechar+")
+  Rules[:_HorizontalRule] = rule_info("HorizontalRule", "@NonindentSpace (\"*\" @Sp \"*\" @Sp \"*\" (@Sp \"*\")* | \"-\" @Sp \"-\" @Sp \"-\" (@Sp \"-\")* | \"_\" @Sp \"_\" @Sp \"_\" (@Sp \"_\")*) @Sp @Newline @BlankLine+ { RDoc::Markup::Rule.new 1 }")
+  Rules[:_Bullet] = rule_info("Bullet", "!HorizontalRule @NonindentSpace /[+*-]/ @Spacechar+")
   Rules[:_BulletList] = rule_info("BulletList", "&Bullet (ListTight | ListLoose):a { RDoc::Markup::List.new(:BULLET, *a) }")
-  Rules[:_ListTight] = rule_info("ListTight", "ListItemTight+:a BlankLine* !(Bullet | Enumerator) { a }")
-  Rules[:_ListLoose] = rule_info("ListLoose", "StartList:a (ListItem:b BlankLine* { a << b })+ { a }")
-  Rules[:_ListItem] = rule_info("ListItem", "(Bullet | Enumerator) StartList:a ListBlock:b { a << b } (ListContinuationBlock:c { a.push(*c) })* { list_item_from a }")
-  Rules[:_ListItemTight] = rule_info("ListItemTight", "(Bullet | Enumerator) ListBlock:a (!BlankLine ListContinuationBlock:b { a.push(*b) })* !ListContinuationBlock { list_item_from a }")
-  Rules[:_ListBlock] = rule_info("ListBlock", "!BlankLine Line:a ListBlockLine*:c { [a, *c] }")
-  Rules[:_ListContinuationBlock] = rule_info("ListContinuationBlock", "StartList:a BlankLine* { a << \"\\n\" } (Indent ListBlock:b { a.concat b })+ { a }")
-  Rules[:_Enumerator] = rule_info("Enumerator", "NonindentSpace [0-9]+ \".\" Spacechar+")
+  Rules[:_ListTight] = rule_info("ListTight", "ListItemTight+:a @BlankLine* !(Bullet | Enumerator) { a }")
+  Rules[:_ListLoose] = rule_info("ListLoose", "@StartList:a (ListItem:b @BlankLine* { a << b })+ { a }")
+  Rules[:_ListItem] = rule_info("ListItem", "(Bullet | Enumerator) @StartList:a ListBlock:b { a << b } (ListContinuationBlock:c { a.push(*c) })* { list_item_from a }")
+  Rules[:_ListItemTight] = rule_info("ListItemTight", "(Bullet | Enumerator) ListBlock:a (!@BlankLine ListContinuationBlock:b { a.push(*b) })* !ListContinuationBlock { list_item_from a }")
+  Rules[:_ListBlock] = rule_info("ListBlock", "!@BlankLine Line:a ListBlockLine*:c { [a, *c] }")
+  Rules[:_ListContinuationBlock] = rule_info("ListContinuationBlock", "@StartList:a @BlankLine* { a << \"\\n\" } (Indent ListBlock:b { a.concat b })+ { a }")
+  Rules[:_Enumerator] = rule_info("Enumerator", "@NonindentSpace [0-9]+ \".\" @Spacechar+")
   Rules[:_OrderedList] = rule_info("OrderedList", "&Enumerator (ListTight | ListLoose):a { RDoc::Markup::List.new(:NUMBER, *a) }")
-  Rules[:_ListBlockLine] = rule_info("ListBlockLine", "!BlankLine !(Indent? (Bullet | Enumerator)) !HorizontalRule OptionallyIndentedLine")
+  Rules[:_ListBlockLine] = rule_info("ListBlockLine", "!@BlankLine !(Indent? (Bullet | Enumerator)) !HorizontalRule OptionallyIndentedLine")
   Rules[:_HtmlBlockOpenAddress] = rule_info("HtmlBlockOpenAddress", "\"<\" Spnl (\"address\" | \"ADDRESS\") Spnl HtmlAttribute* \">\"")
   Rules[:_HtmlBlockCloseAddress] = rule_info("HtmlBlockCloseAddress", "\"<\" Spnl \"/\" (\"address\" | \"ADDRESS\") Spnl \">\"")
   Rules[:_HtmlBlockAddress] = rule_info("HtmlBlockAddress", "HtmlBlockOpenAddress (HtmlBlockAddress | !HtmlBlockCloseAddress .)* HtmlBlockCloseAddress")
@@ -15833,7 +15848,7 @@ class RDoc::Markdown
   Rules[:_HtmlBlockCloseScript] = rule_info("HtmlBlockCloseScript", "\"<\" Spnl \"/\" (\"script\" | \"SCRIPT\") Spnl \">\"")
   Rules[:_HtmlBlockScript] = rule_info("HtmlBlockScript", "HtmlBlockOpenScript (!HtmlBlockCloseScript .)* HtmlBlockCloseScript")
   Rules[:_HtmlBlockInTags] = rule_info("HtmlBlockInTags", "(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[:_HtmlBlock] = rule_info("HtmlBlock", "< (HtmlBlockInTags | HtmlComment | HtmlBlockSelfClosing | HtmlUnclosed) > BlankLine+ { if html? then                 RDoc::Markup::Raw.new text               end }")
+  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\")")
   Rules[:_HtmlBlockSelfClosing] = rule_info("HtmlBlockSelfClosing", "\"<\" Spnl HtmlBlockType Spnl HtmlAttribute* \"/\" Spnl \">\"")
@@ -15841,77 +15856,77 @@ class RDoc::Markdown
   Rules[:_StyleOpen] = rule_info("StyleOpen", "\"<\" Spnl (\"style\" | \"STYLE\") Spnl HtmlAttribute* \">\"")
   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[:_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[:_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[:_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[:_TerminalEndline] = rule_info("TerminalEndline", "Sp Newline Eof")
-  Rules[:_LineBreak] = rule_info("LineBreak", "\"  \" NormalEndline { RDoc::Markup::HardBreak.new }")
-  Rules[:_Symbol] = rule_info("Symbol", "< SpecialChar > { text }")
+  Rules[:_Endline] = rule_info("Endline", "(@LineBreak | @TerminalEndline | @NormalEndline)")
+  Rules[:_NormalEndline] = rule_info("NormalEndline", "@Sp @Newline !@BlankLine !\">\" !AtxStart !(Line /={3,}|-{3,}=/ @Newline) { \"\\n\" }")
+  Rules[:_TerminalEndline] = rule_info("TerminalEndline", "@Sp @Newline @Eof")
+  Rules[:_LineBreak] = rule_info("LineBreak", "\"  \" @NormalEndline { RDoc::Markup::HardBreak.new }")
+  Rules[:_Symbol] = rule_info("Symbol", "< @SpecialChar > { text }")
   Rules[:_UlOrStarLine] = rule_info("UlOrStarLine", "(UlLine | StarLine):a { a }")
-  Rules[:_StarLine] = rule_info("StarLine", "(< /\\*{4,}/ > { text } | < Spacechar /\\*+/ &Spacechar > { text })")
-  Rules[:_UlLine] = rule_info("UlLine", "(< /_{4,}/ > { text } | < Spacechar /_+/ &Spacechar > { text })")
+  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[:_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[:_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 { a }")
+  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[:_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", "Label:l Spnl \"(\" @Sp Source:s Spnl Title @Sp \")\" { \"{\#{l}}[\#{s}]\" }")
   Rules[:_Source] = rule_info("Source", "(\"<\" < SourceContents > \">\" | < SourceContents >) { text }")
   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)) .)* \"\\\"\"")
+  Rules[:_TitleSingle] = rule_info("TitleSingle", "\"'\" (!(\"'\" @Sp (\")\" | @Newline)) .)* \"'\"")
+  Rules[:_TitleDouble] = rule_info("TitleDouble", "\"\\\"\" (!(\"\\\"\" @Sp (\")\" | @Newline)) .)* \"\\\"\"")
   Rules[:_AutoLink] = rule_info("AutoLink", "(AutoLinkUrl | AutoLinkEmail)")
-  Rules[:_AutoLinkUrl] = rule_info("AutoLinkUrl", "\"<\" < /[A-Za-z]+/ \"://\" (!Newline !\">\" .)+ > \">\" { text }")
-  Rules[:_AutoLinkEmail] = rule_info("AutoLinkEmail", "\"<\" \"mailto:\"? < /[\\w+.\\/!%~$-]+/i \"@\" (!Newline !\">\" .)+ > \">\" { \"mailto:\#{text}\" }")
-  Rules[:_Reference] = rule_info("Reference", "NonindentSpace !\"[]\" Label:label \":\" Spnl RefSrc:link RefTitle BlankLine+ { \# TODO use title               reference label, link               nil             }")
-  Rules[:_Label] = rule_info("Label", "\"[\" (!\"^\" &{ notes? } | &. &{ !notes? }) StartList:a (!\"]\" Inline:l { a << l })* \"]\" { a.join.gsub(/\\s+/, ' ') }")
+  Rules[:_AutoLinkUrl] = rule_info("AutoLinkUrl", "\"<\" < /[A-Za-z]+/ \"://\" (!@Newline !\">\" .)+ > \">\" { text }")
+  Rules[:_AutoLinkEmail] = rule_info("AutoLinkEmail", "\"<\" \"mailto:\"? < /[\\w+.\\/!%~$-]+/i \"@\" (!@Newline !\">\" .)+ > \">\" { \"mailto:\#{text}\" }")
+  Rules[:_Reference] = rule_info("Reference", "@NonindentSpace !\"[]\" Label:label \":\" Spnl RefSrc:link RefTitle @BlankLine+ { \# TODO use title               reference label, link               nil             }")
+  Rules[:_Label] = rule_info("Label", "\"[\" (!\"^\" &{ notes? } | &. &{ !notes? }) @StartList:a (!\"]\" Inline:l { a << l })* \"]\" { a.join.gsub(/\\s+/, ' ') }")
   Rules[:_RefSrc] = rule_info("RefSrc", "< Nonspacechar+ > { text }")
   Rules[:_RefTitle] = rule_info("RefTitle", "(RefTitleSingle | RefTitleDouble | RefTitleParens | EmptyTitle)")
   Rules[:_EmptyTitle] = rule_info("EmptyTitle", "\"\"")
-  Rules[:_RefTitleSingle] = rule_info("RefTitleSingle", "Spnl \"'\" < (!(\"'\" Sp Newline | Newline) .)* > \"'\" { text }")
-  Rules[:_RefTitleDouble] = rule_info("RefTitleDouble", "Spnl \"\\\"\" < (!(\"\\\"\" Sp Newline | Newline) .)* > \"\\\"\" { text }")
-  Rules[:_RefTitleParens] = rule_info("RefTitleParens", "Spnl \"(\" < (!(\")\" Sp Newline | Newline) .)* > \")\" { text }")
+  Rules[:_RefTitleSingle] = rule_info("RefTitleSingle", "Spnl \"'\" < (!(\"'\" @Sp @Newline | @Newline) .)* > \"'\" { text }")
+  Rules[:_RefTitleDouble] = rule_info("RefTitleDouble", "Spnl \"\\\"\" < (!(\"\\\"\" @Sp @Newline | @Newline) .)* > \"\\\"\" { text }")
+  Rules[:_RefTitleParens] = rule_info("RefTitleParens", "Spnl \"(\" < (!(\")\" @Sp @Newline | @Newline) .)* > \")\" { text }")
   Rules[:_References] = rule_info("References", "(Reference | SkipBlock)*")
   Rules[:_Ticks1] = rule_info("Ticks1", "\"`\" !\"`\"")
   Rules[:_Ticks2] = rule_info("Ticks2", "\"``\" !\"`\"")
   Rules[:_Ticks3] = rule_info("Ticks3", "\"```\" !\"`\"")
   Rules[:_Ticks4] = rule_info("Ticks4", "\"````\" !\"`\"")
   Rules[:_Ticks5] = rule_info("Ticks5", "\"`````\" !\"`\"")
-  Rules[:_Code] = rule_info("Code", "(Ticks1 Sp < ((!\"`\" Nonspacechar)+ | !Ticks1 /`+/ | !(Sp Ticks1) (Spacechar | Newline !BlankLine))+ > Sp Ticks1 | Ticks2 Sp < ((!\"`\" Nonspacechar)+ | !Ticks2 /`+/ | !(Sp Ticks2) (Spacechar | Newline !BlankLine))+ > Sp Ticks2 | Ticks3 Sp < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | !(Sp Ticks3) (Spacechar | Newline !BlankLine))+ > Sp Ticks3 | Ticks4 Sp < ((!\"`\" Nonspacechar)+ | !Ticks4 /`+/ | !(Sp Ticks4) (Spacechar | Newline !BlankLine))+ > Sp Ticks4 | Ticks5 Sp < ((!\"`\" Nonspacechar)+ | !Ticks5 /`+/ | !(Sp Ticks5) (Spacechar | Newline !BlankLine))+ > Sp Ticks5) { \"<code>\#{text}</code>\" }")
+  Rules[:_Code] = rule_info("Code", "(Ticks1 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks1 /`+/ | !(@Sp Ticks1) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks1 | Ticks2 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks2 /`+/ | !(@Sp Ticks2) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks2 | Ticks3 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | !(@Sp Ticks3) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks3 | Ticks4 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks4 /`+/ | !(@Sp Ticks4) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks4 | Ticks5 @Sp < ((!\"`\" Nonspacechar)+ | !Ticks5 /`+/ | !(@Sp Ticks5) (@Spacechar | @Newline !@BlankLine))+ > @Sp Ticks5) { \"<code>\#{text}</code>\" }")
   Rules[:_RawHtml] = rule_info("RawHtml", "< (HtmlComment | HtmlBlockScript | HtmlTag) > { if html? then text else '' end }")
-  Rules[:_BlankLine] = rule_info("BlankLine", "Sp Newline { \"\\n\" }")
+  Rules[:_BlankLine] = rule_info("BlankLine", "@Sp @Newline { \"\\n\" }")
   Rules[:_Quoted] = rule_info("Quoted", "(\"\\\"\" (!\"\\\"\" .)* \"\\\"\" | \"'\" (!\"'\" .)* \"'\")")
   Rules[:_HtmlAttribute] = rule_info("HtmlAttribute", "(AlphanumericAscii | \"-\")+ Spnl (\"=\" Spnl (Quoted | (!\">\" Nonspacechar)+))? Spnl")
   Rules[:_HtmlComment] = rule_info("HtmlComment", "\"<!--\" (!\"-->\" .)* \"-->\"")
   Rules[:_HtmlTag] = rule_info("HtmlTag", "\"<\" Spnl \"/\"? AlphanumericAscii+ Spnl HtmlAttribute* \"/\"? Spnl \">\"")
   Rules[:_Eof] = rule_info("Eof", "!.")
-  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[:_NormalChar] = rule_info("NormalChar", "!(SpecialChar | Spacechar | Newline) .")
+  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[:_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")
@@ -15927,20 +15942,20 @@ class RDoc::Markdown
   Rules[:_IndentedLine] = rule_info("IndentedLine", "Indent Line")
   Rules[:_OptionallyIndentedLine] = rule_info("OptionallyIndentedLine", "Indent? Line")
   Rules[:_StartList] = rule_info("StartList", "&. { [] }")
-  Rules[:_Line] = rule_info("Line", "RawLine:a { a }")
-  Rules[:_RawLine] = rule_info("RawLine", "(< (!\"
-  Rules[:_SkipBlock] = rule_info("SkipBlock", "(HtmlBlock | (!\"\#\" !SetextBottom1 !SetextBottom2 !BlankLine RawLine)+ BlankLine* | BlankLine+ | RawLine)")
+  Rules[:_Line] = rule_info("Line", "@RawLine:a { a }")
+  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 (&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[:_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[:_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 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[:_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[:_DefinitionListDefinition] = rule_info("DefinitionListDefinition", "NonindentSpace \":\" Space Inlines:a BlankLine+ { paragraph a }")
+  Rules[:_DefinitionListLabel] = rule_info("DefinitionListLabel", "StrChunk:label @Sp @Newline { label }")
+  Rules[:_DefinitionListDefinition] = rule_info("DefinitionListDefinition", "@NonindentSpace \":\" @Space Inlines:a @BlankLine+ { paragraph a }")
   # :startdoc:
 end