rdoc 6.3.0 → 6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18741ef6dd2db34af2ea15a9e8a154a760c1f01bb0d69d15dc3af3f70cc00d7c
-  data.tar.gz: e61ab91ee4b0e776dd36e934da0534e6d52aa259ddff18be057955e109db08b4
+  metadata.gz: 327e6414793206350f148388b0df495ff2c748c1d4bb129ef320a442e4084619
+  data.tar.gz: 44c884a1eb18506c90af82fefa6f7686973ab32e1ceb42c6616b0ffbf88ac868
 SHA512:
-  metadata.gz: 9ea75c4b0339de23f73f84c890b23cb0b7bacb87ea191258f54160a28a4519c0e8edfbf6bc17ef67e631d923b17cb2030f79048d269b032eefe8b92f62fdb9df
-  data.tar.gz: bdbf42dea5706d0b13ce653a8591ff9fc0ece11b4d49c18e7d32bd725e901a3dd2e5feb3479b4185a874d12e024e7f77b6324592405a9b826efd00bb68589373
+  metadata.gz: 8691cde93b42f6c4ff77f6212e40c5c15c408b1953e58cf14f17cef142970ff79564bf7fe12b7f072067267fd67ad62920241e54e7a6d592487545bd19a82311
+  data.tar.gz: 3adbda517d389982d0d67ccd92478d0b0912c156c2988a26089715ff77e998025d6f2d8eafd44cdbd66daa2c647bd2201d1c0f57c5731bac19c45aea3014ae4c

data/Rakefile

@@ -2,7 +2,6 @@ $:.unshift File.expand_path 'lib'
 require 'rdoc/task'
 require 'bundler/gem_tasks'
 require 'rake/testtask'
-require 'rubocop/rake_task'
 
 task :docs    => :generate
 task :test    => [:normal_test, :rubygems_test]
@@ -62,13 +61,13 @@ package_parser_files = PARSER_FILES.map do |parser_file|
 end
 
 parsed_files = PARSER_FILES.map do |parser_file|
-  name = File.basename(parser_file, File.extname(parser_file))
-  _path = File.dirname(parser_file)
-  parsed_file = "#{_path}/#{name}.rb"
+  ext = File.extname(parser_file)
+  parsed_file = "#{parser_file.chomp(ext)}.rb"
 
-  file parsed_file do |t|
+  file parsed_file => parser_file do |t|
     puts "Generating #{parsed_file}..."
-    if parser_file =~ /\.ry\z/ # need racc
+    case ext
+    when '.ry' # need racc
       racc = Gem.bin_path 'racc', 'racc'
       rb_file = parser_file.gsub(/\.ry\z/, ".rb")
       ruby "#{racc} -l -o #{rb_file} #{parser_file}"
@@ -77,7 +76,7 @@ parsed_files = PARSER_FILES.map do |parser_file|
         f.rewind
         f.write newtext
       end
-    elsif parser_file =~ /\.kpeg\z/ # need kpeg
+    when '.kpeg' # need kpeg
       kpeg = Gem.bin_path 'kpeg', 'kpeg'
       rb_file = parser_file.gsub(/\.kpeg\z/, ".rb")
       ruby "#{kpeg} -fsv -o #{rb_file} #{parser_file}"
@@ -88,12 +87,15 @@ parsed_files = PARSER_FILES.map do |parser_file|
 end
 
 task "#{path}.gem" => package_parser_files
-
-RuboCop::RakeTask.new(:rubocop) do |t|
-  t.options = [*parsed_files]
-end
-
-desc "Genrate all files used racc and kpeg"
+desc "Generate all files used racc and kpeg"
 task :generate => parsed_files
 
-task :build => [:generate, "rubocop:auto_correct"]
+begin
+  require 'rubocop/rake_task'
+rescue LoadError
+else
+  RuboCop::RakeTask.new(:rubocop) do |t|
+    t.options = [*parsed_files]
+  end
+  task :build => [:generate, "rubocop:auto_correct"]
+end

data/lib/rdoc/generator/template/darkfish/css/rdoc.css

@@ -79,6 +79,25 @@ pre {
   border-radius: 0.2em;
 }
 
+table {
+  margin: 0;
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+
+table tr th, table tr td {
+  padding: 0.2em 0.4em;
+  border: 1px solid #ccc;
+}
+
+table tr th {
+  background-color: #eceaed;
+}
+
+table tr:nth-child(even) td {
+  background-color: #f5f4f6;
+}
+
 /* @group Generic Classes */
 
 .initially-hidden {
@@ -166,6 +185,7 @@ nav {
   width: 260px;
   font-family: Helvetica, sans-serif;
   font-size: 14px;
+  border-right: 1px solid #ccc;
 }
 
 main {

data/lib/rdoc/markdown.kpeg

@@ -506,6 +506,7 @@ Block =     @BlankLine*
             ( BlockQuote
             | Verbatim
             | CodeFence
+            | Table
             | Note
             | Reference
             | HorizontalRule
@@ -896,7 +897,8 @@ StyleBlock =    < InStyleTags >
                   end }
 
 Inlines  =  ( !@Endline Inline:i { i }
-            | @Endline:c &Inline { c } )+:chunks @Endline?
+            | @Endline:c !( &{ github? } Ticks3 /[^`\n]*$/ )
+	      &Inline { c } )+:chunks @Endline?
             { chunks }
 
 Inline  = Str
@@ -1195,6 +1197,22 @@ CodeFence = &{ github? }
               verbatim
             }
 
+Table = &{ github? }
+        TableRow:header TableLine:line TableRow+:body
+        { table = RDoc::Markup::Table.new(header, line, body) }
+
+TableRow = TableItem+:row "|" @Newline
+           { row }
+TableItem = "|" < (!"|" !@Newline .)+ >
+            { text.strip }
+
+TableLine = TableColumn+:line "|" @Newline
+            { line }
+TableColumn = "|" < ( "-"+ ":"? | ":" "-"* ) >
+              { text.start_with?(":") ? :left :
+                text.end_with?(":") ? :right : nil
+              }
+
 DefinitionList = &{ definition_lists? }
                  ( DefinitionListItem+:list )
                  { RDoc::Markup::List.new :NOTE, *list.flatten }

data/lib/rdoc/markdown.rb

@@ -897,7 +897,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Block = @BlankLine* (BlockQuote | Verbatim | CodeFence | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)
+  # Block = @BlankLine* (BlockQuote | Verbatim | CodeFence | Table | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)
   def _Block
 
     _save = self.pos
@@ -923,6 +923,9 @@ class RDoc::Markdown
         _tmp = apply(:_CodeFence)
         break if _tmp
         self.pos = _save2
+        _tmp = apply(:_Table)
+        break if _tmp
+        self.pos = _save2
         _tmp = apply(:_Note)
         break if _tmp
         self.pos = _save2
@@ -9320,7 +9323,7 @@ class RDoc::Markdown
     return _tmp
   end
 
-  # Inlines = (!@Endline Inline:i { i } | @Endline:c &Inline { c })+:chunks @Endline? { chunks }
+  # Inlines = (!@Endline Inline:i { i } | @Endline:c !(&{ github? } Ticks3 /[^`\n]*$/) &Inline { c })+:chunks @Endline? { chunks }
   def _Inlines
 
     _save = self.pos
@@ -9367,12 +9370,41 @@ class RDoc::Markdown
             break
           end
           _save6 = self.pos
-          _tmp = apply(:_Inline)
+
+          _save7 = self.pos
+          while true # sequence
+            _save8 = self.pos
+            _tmp = begin;  github? ; end
+            self.pos = _save8
+            unless _tmp
+              self.pos = _save7
+              break
+            end
+            _tmp = apply(:_Ticks3)
+            unless _tmp
+              self.pos = _save7
+              break
+            end
+            _tmp = scan(/\A(?-mix:[^`\n]*$)/)
+            unless _tmp
+              self.pos = _save7
+            end
+            break
+          end # end sequence
+
+          _tmp = _tmp ? nil : true
           self.pos = _save6
           unless _tmp
             self.pos = _save5
             break
           end
+          _save9 = self.pos
+          _tmp = apply(:_Inline)
+          self.pos = _save9
+          unless _tmp
+            self.pos = _save5
+            break
+          end
           @result = begin;  c ; end
           _tmp = true
           unless _tmp
@@ -9390,61 +9422,90 @@ class RDoc::Markdown
         _ary << @result
         while true
 
-          _save7 = self.pos
+          _save10 = self.pos
           while true # choice
 
-            _save8 = self.pos
+            _save11 = self.pos
             while true # sequence
-              _save9 = self.pos
+              _save12 = self.pos
               _tmp = _Endline()
               _tmp = _tmp ? nil : true
-              self.pos = _save9
+              self.pos = _save12
               unless _tmp
-                self.pos = _save8
+                self.pos = _save11
                 break
               end
               _tmp = apply(:_Inline)
               i = @result
               unless _tmp
-                self.pos = _save8
+                self.pos = _save11
                 break
               end
               @result = begin;  i ; end
               _tmp = true
               unless _tmp
-                self.pos = _save8
+                self.pos = _save11
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save7
+            self.pos = _save10
 
-            _save10 = self.pos
+            _save13 = self.pos
             while true # sequence
               _tmp = _Endline()
               c = @result
               unless _tmp
-                self.pos = _save10
+                self.pos = _save13
                 break
               end
-              _save11 = self.pos
+              _save14 = self.pos
+
+              _save15 = self.pos
+              while true # sequence
+                _save16 = self.pos
+                _tmp = begin;  github? ; end
+                self.pos = _save16
+                unless _tmp
+                  self.pos = _save15
+                  break
+                end
+                _tmp = apply(:_Ticks3)
+                unless _tmp
+                  self.pos = _save15
+                  break
+                end
+                _tmp = scan(/\A(?-mix:[^`\n]*$)/)
+                unless _tmp
+                  self.pos = _save15
+                end
+                break
+              end # end sequence
+
+              _tmp = _tmp ? nil : true
+              self.pos = _save14
+              unless _tmp
+                self.pos = _save13
+                break
+              end
+              _save17 = self.pos
               _tmp = apply(:_Inline)
-              self.pos = _save11
+              self.pos = _save17
               unless _tmp
-                self.pos = _save10
+                self.pos = _save13
                 break
               end
               @result = begin;  c ; end
               _tmp = true
               unless _tmp
-                self.pos = _save10
+                self.pos = _save13
               end
               break
             end # end sequence
 
             break if _tmp
-            self.pos = _save7
+            self.pos = _save10
             break
           end # end choice
 
@@ -9461,11 +9522,11 @@ class RDoc::Markdown
         self.pos = _save
         break
       end
-      _save12 = self.pos
+      _save18 = self.pos
       _tmp = _Endline()
       unless _tmp
         _tmp = true
-        self.pos = _save12
+        self.pos = _save18
       end
       unless _tmp
         self.pos = _save
@@ -15847,6 +15908,338 @@ class RDoc::Markdown
     return _tmp
   end
 
+  # Table = &{ github? } TableRow:header TableLine:line TableRow+:body { table = RDoc::Markup::Table.new(header, line, body) }
+  def _Table
+
+    _save = self.pos
+    while true # sequence
+      _save1 = self.pos
+      _tmp = begin;  github? ; end
+      self.pos = _save1
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_TableRow)
+      header = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = apply(:_TableLine)
+      line = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _save2 = self.pos
+      _ary = []
+      _tmp = apply(:_TableRow)
+      if _tmp
+        _ary << @result
+        while true
+          _tmp = apply(:_TableRow)
+          _ary << @result if _tmp
+          break unless _tmp
+        end
+        _tmp = true
+        @result = _ary
+      else
+        self.pos = _save2
+      end
+      body = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  table = RDoc::Markup::Table.new(header, line, body) ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_Table unless _tmp
+    return _tmp
+  end
+
+  # TableRow = TableItem+:row "|" @Newline { row }
+  def _TableRow
+
+    _save = self.pos
+    while true # sequence
+      _save1 = self.pos
+      _ary = []
+      _tmp = apply(:_TableItem)
+      if _tmp
+        _ary << @result
+        while true
+          _tmp = apply(:_TableItem)
+          _ary << @result if _tmp
+          break unless _tmp
+        end
+        _tmp = true
+        @result = _ary
+      else
+        self.pos = _save1
+      end
+      row = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string("|")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = _Newline()
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  row ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_TableRow unless _tmp
+    return _tmp
+  end
+
+  # TableItem = "|" < (!"|" !@Newline .)+ > { text.strip }
+  def _TableItem
+
+    _save = self.pos
+    while true # sequence
+      _tmp = match_string("|")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _text_start = self.pos
+      _save1 = self.pos
+
+      _save2 = self.pos
+      while true # sequence
+        _save3 = self.pos
+        _tmp = match_string("|")
+        _tmp = _tmp ? nil : true
+        self.pos = _save3
+        unless _tmp
+          self.pos = _save2
+          break
+        end
+        _save4 = self.pos
+        _tmp = _Newline()
+        _tmp = _tmp ? nil : true
+        self.pos = _save4
+        unless _tmp
+          self.pos = _save2
+          break
+        end
+        _tmp = get_byte
+        unless _tmp
+          self.pos = _save2
+        end
+        break
+      end # end sequence
+
+      if _tmp
+        while true
+
+          _save5 = self.pos
+          while true # sequence
+            _save6 = self.pos
+            _tmp = match_string("|")
+            _tmp = _tmp ? nil : true
+            self.pos = _save6
+            unless _tmp
+              self.pos = _save5
+              break
+            end
+            _save7 = self.pos
+            _tmp = _Newline()
+            _tmp = _tmp ? nil : true
+            self.pos = _save7
+            unless _tmp
+              self.pos = _save5
+              break
+            end
+            _tmp = get_byte
+            unless _tmp
+              self.pos = _save5
+            end
+            break
+          end # end sequence
+
+          break unless _tmp
+        end
+        _tmp = true
+      else
+        self.pos = _save1
+      end
+      if _tmp
+        text = get_text(_text_start)
+      end
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  text.strip ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_TableItem unless _tmp
+    return _tmp
+  end
+
+  # TableLine = TableColumn+:line "|" @Newline { line }
+  def _TableLine
+
+    _save = self.pos
+    while true # sequence
+      _save1 = self.pos
+      _ary = []
+      _tmp = apply(:_TableColumn)
+      if _tmp
+        _ary << @result
+        while true
+          _tmp = apply(:_TableColumn)
+          _ary << @result if _tmp
+          break unless _tmp
+        end
+        _tmp = true
+        @result = _ary
+      else
+        self.pos = _save1
+      end
+      line = @result
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = match_string("|")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _tmp = _Newline()
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  line ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_TableLine unless _tmp
+    return _tmp
+  end
+
+  # TableColumn = "|" < ("-"+ ":"? | ":" "-"*) > { text.start_with?(":") ? :left :                 text.end_with?(":") ? :right : nil               }
+  def _TableColumn
+
+    _save = self.pos
+    while true # sequence
+      _tmp = match_string("|")
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      _text_start = self.pos
+
+      _save1 = self.pos
+      while true # choice
+
+        _save2 = self.pos
+        while true # sequence
+          _save3 = self.pos
+          _tmp = match_string("-")
+          if _tmp
+            while true
+              _tmp = match_string("-")
+              break unless _tmp
+            end
+            _tmp = true
+          else
+            self.pos = _save3
+          end
+          unless _tmp
+            self.pos = _save2
+            break
+          end
+          _save4 = self.pos
+          _tmp = match_string(":")
+          unless _tmp
+            _tmp = true
+            self.pos = _save4
+          end
+          unless _tmp
+            self.pos = _save2
+          end
+          break
+        end # end sequence
+
+        break if _tmp
+        self.pos = _save1
+
+        _save5 = self.pos
+        while true # sequence
+          _tmp = match_string(":")
+          unless _tmp
+            self.pos = _save5
+            break
+          end
+          while true
+            _tmp = match_string("-")
+            break unless _tmp
+          end
+          _tmp = true
+          unless _tmp
+            self.pos = _save5
+          end
+          break
+        end # end sequence
+
+        break if _tmp
+        self.pos = _save1
+        break
+      end # end choice
+
+      if _tmp
+        text = get_text(_text_start)
+      end
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  text.start_with?(":") ? :left :
+                text.end_with?(":") ? :right : nil
+              ; end
+      _tmp = true
+      unless _tmp
+        self.pos = _save
+      end
+      break
+    end # end sequence
+
+    set_failed_rule :_TableColumn unless _tmp
+    return _tmp
+  end
+
   # DefinitionList = &{ definition_lists? } DefinitionListItem+:list { RDoc::Markup::List.new :NOTE, *list.flatten }
   def _DefinitionList
 
@@ -16046,7 +16439,7 @@ class RDoc::Markdown
   Rules = {}
   Rules[:_root] = rule_info("root", "Doc")
   Rules[:_Doc] = rule_info("Doc", "BOM? Block*:a { RDoc::Markup::Document.new(*a.compact) }")
-  Rules[:_Block] = rule_info("Block", "@BlankLine* (BlockQuote | Verbatim | CodeFence | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)")
+  Rules[:_Block] = rule_info("Block", "@BlankLine* (BlockQuote | Verbatim | CodeFence | Table | Note | Reference | HorizontalRule | Heading | OrderedList | BulletList | DefinitionList | HtmlBlock | StyleBlock | Para | Plain)")
   Rules[:_Para] = rule_info("Para", "@NonindentSpace Inlines:a @BlankLine+ { paragraph a }")
   Rules[:_Plain] = rule_info("Plain", "Inlines:a { paragraph a }")
   Rules[:_AtxInline] = rule_info("AtxInline", "!@Newline !(@Sp /\#*/ @Sp @Newline) Inline")
@@ -16190,7 +16583,7 @@ class RDoc::Markdown
   Rules[:_StyleClose] = rule_info("StyleClose", "\"<\" Spnl \"/\" (\"style\" | \"STYLE\") Spnl \">\"")
   Rules[:_InStyleTags] = rule_info("InStyleTags", "StyleOpen (!StyleClose .)* StyleClose")
   Rules[:_StyleBlock] = rule_info("StyleBlock", "< InStyleTags > @BlankLine* { if css? then                     RDoc::Markup::Raw.new text                   end }")
-  Rules[:_Inlines] = rule_info("Inlines", "(!@Endline Inline:i { i } | @Endline:c &Inline { c })+:chunks @Endline? { chunks }")
+  Rules[:_Inlines] = rule_info("Inlines", "(!@Endline Inline:i { i } | @Endline:c !(&{ github? } Ticks3 /[^`\\n]*$/) &Inline { c })+:chunks @Endline? { chunks }")
   Rules[:_Inline] = rule_info("Inline", "(Str | @Endline | UlOrStarLine | @Space | Strong | Emph | Strike | Image | Link | NoteReference | InlineNote | Code | RawHtml | Entity | EscapedChar | Symbol)")
   Rules[:_Space] = rule_info("Space", "@Spacechar+ { \" \" }")
   Rules[:_Str] = rule_info("Str", "@StartList:a < @NormalChar+ > { a = text } (StrChunk:c { a << c })* { a }")
@@ -16279,6 +16672,11 @@ class RDoc::Markdown
   Rules[:_Notes] = rule_info("Notes", "(Note | SkipBlock)*")
   Rules[:_RawNoteBlock] = rule_info("RawNoteBlock", "@StartList:a (!@BlankLine OptionallyIndentedLine:l { a << l })+ < @BlankLine* > { a << text } { a }")
   Rules[:_CodeFence] = rule_info("CodeFence", "&{ github? } Ticks3 (@Sp StrChunk:format)? Spnl < ((!\"`\" Nonspacechar)+ | !Ticks3 /`+/ | Spacechar | @Newline)+ > Ticks3 @Sp @Newline* { verbatim = RDoc::Markup::Verbatim.new text               verbatim.format = format.intern if format.instance_of?(String)               verbatim             }")
+  Rules[:_Table] = rule_info("Table", "&{ github? } TableRow:header TableLine:line TableRow+:body { table = RDoc::Markup::Table.new(header, line, body) }")
+  Rules[:_TableRow] = rule_info("TableRow", "TableItem+:row \"|\" @Newline { row }")
+  Rules[:_TableItem] = rule_info("TableItem", "\"|\" < (!\"|\" !@Newline .)+ > { text.strip }")
+  Rules[:_TableLine] = rule_info("TableLine", "TableColumn+:line \"|\" @Newline { line }")
+  Rules[:_TableColumn] = rule_info("TableColumn", "\"|\" < (\"-\"+ \":\"? | \":\" \"-\"*) > { text.start_with?(\":\") ? :left :                 text.end_with?(\":\") ? :right : nil               }")
   Rules[:_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 }")