rdoc 7.2.0 → 8.1.0

data/lib/rdoc/markdown.kpeg

@@ -191,7 +191,9 @@
   require_relative 'markup/to_joined_paragraph'
   require_relative 'markdown/entities'
 
-  require_relative 'markdown/literals'
+  require_relative 'markdown/byte_runtime'
+
+  prepend ByteRuntime
 
   ##
   # Supported extensions
@@ -403,6 +405,8 @@
   # the note order list for proper display at the end of the document.
 
   def note_for ref
+    return unless @note_order
+
     @note_order << ref
 
     label = @note_order.length
@@ -446,8 +450,12 @@
     if notes? then
       @footnotes       = {}
 
-      setup_parser markdown, @debug
-      peg_parse 'Notes'
+      # A note definition must contain "[^", so documents without one
+      # have nothing for the collecting pass to find
+      if markdown.include? '[^' then
+        setup_parser markdown, @debug
+        peg_parse 'Notes'
+      end
 
       # using note_order on the first pass would be a bug
       @note_order      = []
@@ -561,7 +569,7 @@
 
 root = Doc
 
-Doc =       BOM? Block*:a { RDoc::Markup::Document.new(*a.compact) }
+Doc =       Block*:a { RDoc::Markup::Document.new(*a.compact) }
 
 Block =     @BlankLine*
             ( BlockQuote
@@ -617,8 +625,8 @@ BlockQuote = BlockQuoteRaw:a
 
 BlockQuoteRaw =  @StartList:a
                  (( ">" " "? Line:l { a << l } )
-                  ( !">" !@BlankLine Line:c { a << c } )*
-                  ( @BlankLine:n { a << n } )*
+                  ( !">" !@BlankLine !(AtxStart @Spacechar) !Bullet !Enumerator !( &{ github? } Ticks3 ) Line:c { a << c } )*
+                  ( ">" @BlankLine:n { a << n } )*
                  )+
                  { inner_parse a.join }
 
@@ -865,7 +873,7 @@ HtmlBlockInTags = HtmlAnchor
                 | HtmlBlockScript
                 | HtmlBlockHead
 
-HtmlBlock = < ( HtmlBlockInTags | HtmlComment | HtmlBlockSelfClosing | HtmlUnclosed) >
+HtmlBlock = &"<" < ( HtmlBlockInTags | HtmlComment | HtmlBlockSelfClosing | HtmlUnclosed) >
             @BlankLine+
             { if html? then
                 RDoc::Markup::Raw.new text
@@ -975,6 +983,7 @@ Inline  = Str
         | InlineNote
         | Code
         | RawHtml
+        | StrippedComment
         | Entity
         | EscapedChar
         | Symbol
@@ -1152,8 +1161,8 @@ Code = ( Ticks1 < (
        )
        { code text }
 
-RawHtml = < (HtmlComment | HtmlBlockScript | HtmlTag) >
-          { if html? then text else '' end }
+RawHtml = < HtmlBlockScript | HtmlTag > { html? ? text : '' }
+StrippedComment = HtmlComment { '' }
 
 BlankLine =     @Sp @Newline { "\n" }
 
@@ -1169,12 +1178,10 @@ SpecialChar =   /[~*_`&\[\]()<!#\\'"]/ | @ExtendedSpecialChar
 NormalChar =    !( @SpecialChar | @Spacechar | @Newline ) .
 Digit = [0-9]
 
-%literals         = RDoc::Markdown::Literals
-Alphanumeric      = %literals.Alphanumeric
-AlphanumericAscii = %literals.AlphanumericAscii
-BOM               = %literals.BOM
-Newline           = %literals.Newline
-Spacechar         = %literals.Spacechar
+Alphanumeric      = /\p{Word}/
+AlphanumericAscii = /[A-Za-z0-9]/
+Newline           = /\n|\r\n?|\p{Zl}|\p{Zp}/
+Spacechar         = /\t|\p{Zs}/
 
 HexEntity  = /&#x/i < /[0-9a-fA-F]+/ > ";"
              { rdoc_escape([text.to_i(16)].pack('U')) }
@@ -1233,10 +1240,12 @@ InlineNote = &{ notes? }
              @StartList:a
              ( !"]" Inline:l { a << l } )+
              "]"
-             { ref = [:inline, @note_order.length]
-               @footnotes[ref] = paragraph a
+             { if @note_order
+                 ref = [:inline, @note_order.length]
+                 @footnotes[ref] = paragraph a
 
-               note_for ref
+                 note_for ref
+               end
              }
 
 Notes = ( Note | SkipBlock )*
@@ -1249,7 +1258,7 @@ RawNoteBlock = @StartList:a
 # Markdown extensions added by RDoc follow
 
 CodeFence = &{ github? }
-            Ticks3 (@Sp StrChunk:format)? Spnl < (
+            Ticks3 (@Sp StrChunk:format)? @Sp @Newline? < (
               ( !"`" Nonspacechar )+ |
               !Ticks3 /`+/ |
               Spacechar |
@@ -1270,13 +1279,13 @@ Table = &{ github? }
 TableHead = TableItem2+:items "|"? @Newline
             { items }
 
-TableRow = ( ( TableItem:item1 TableItem2*:items { [item1, *items] } ):row | TableItem2+:row ) "|"? @Newline
+TableRow = ( ( TableItem:item1 TableItem2+:items { [item1, *items] } ):row | TableItem2+:row ) "|"? @Newline
 	   { row }
 TableItem2 = "|" TableItem
 TableItem = < /(?:\\.|[^|\n])+/ >
 	    { text.strip.gsub(/\\([|])/, '\1')  }
 
-TableLine = ( ( TableAlign:align1 TableAlign2*:aligns {[align1, *aligns] } ):line | TableAlign2+:line ) "|"? @Newline
+TableLine = ( ( TableAlign:align1 TableAlign2+:aligns {[align1, *aligns] } ):line | TableAlign2+:line ) "|"? @Newline
 	    { line }
 TableAlign2 = "|" @Sp TableAlign
 TableAlign = < /:?-+:?/ > @Sp