ruby-changes:30892
From: drbrain <ko1@a...>
Date: Thu, 19 Sep 2013 08:34:05 +0900 (JST)
Subject: [ruby-changes:30892] drbrain:r42971 (trunk): * lib/rdoc: Update to RDoc 4.1.0.preview.1
drbrain 2013-09-19 08:33:36 +0900 (Thu, 19 Sep 2013) New Revision: 42971 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42971 Log: * lib/rdoc: Update to RDoc 4.1.0.preview.1 RDoc 4.1.0 contains a number of enhancements including a new default style and accessibility support. You can see the changelog here: https://github.com/rdoc/rdoc/blob/v4.1.0.preview.1/History.rdoc * test/rdoc: ditto. Added directories: trunk/lib/rdoc/generator/template/darkfish/fonts/ Added files: trunk/lib/rdoc/generator/template/darkfish/fonts/Lato-Light.ttf trunk/lib/rdoc/generator/template/darkfish/fonts/Lato-LightItalic.ttf trunk/lib/rdoc/generator/template/darkfish/fonts/Lato-Regular.ttf trunk/lib/rdoc/generator/template/darkfish/fonts/Lato-RegularItalic.ttf trunk/lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Bold.ttf trunk/lib/rdoc/generator/template/darkfish/fonts/SourceCodePro-Regular.ttf trunk/lib/rdoc/generator/template/darkfish/fonts.css trunk/lib/rdoc/mixin.rb Modified files: trunk/ChangeLog trunk/lib/rdoc/any_method.rb trunk/lib/rdoc/class_module.rb trunk/lib/rdoc/code_object.rb trunk/lib/rdoc/comment.rb trunk/lib/rdoc/context.rb trunk/lib/rdoc/cross_reference.rb trunk/lib/rdoc/extend.rb trunk/lib/rdoc/generator/darkfish.rb trunk/lib/rdoc/generator/template/darkfish/_footer.rhtml trunk/lib/rdoc/generator/template/darkfish/_head.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml trunk/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml trunk/lib/rdoc/generator/template/darkfish/class.rhtml trunk/lib/rdoc/generator/template/darkfish/index.rhtml trunk/lib/rdoc/generator/template/darkfish/js/darkfish.js trunk/lib/rdoc/generator/template/darkfish/js/search.js trunk/lib/rdoc/generator/template/darkfish/page.rhtml trunk/lib/rdoc/generator/template/darkfish/rdoc.css trunk/lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml trunk/lib/rdoc/generator/template/darkfish/servlet_root.rhtml trunk/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml trunk/lib/rdoc/include.rb trunk/lib/rdoc/known_classes.rb trunk/lib/rdoc/markdown/literals_1_9.rb trunk/lib/rdoc/markdown.rb trunk/lib/rdoc/markup/attribute_manager.rb trunk/lib/rdoc/markup/formatter.rb trunk/lib/rdoc/markup/heading.rb trunk/lib/rdoc/markup/parser.rb trunk/lib/rdoc/markup/pre_process.rb trunk/lib/rdoc/markup/to_html.rb trunk/lib/rdoc/markup/to_html_crossref.rb trunk/lib/rdoc/markup/to_markdown.rb trunk/lib/rdoc/markup.rb trunk/lib/rdoc/method_attr.rb trunk/lib/rdoc/normal_class.rb trunk/lib/rdoc/normal_module.rb trunk/lib/rdoc/options.rb trunk/lib/rdoc/parser/c.rb trunk/lib/rdoc/parser/ruby.rb trunk/lib/rdoc/parser.rb trunk/lib/rdoc/rd/block_parser.rb trunk/lib/rdoc/rd/inline_parser.rb trunk/lib/rdoc/rdoc.rb trunk/lib/rdoc/ri/driver.rb trunk/lib/rdoc/ruby_lex.rb trunk/lib/rdoc/ruby_token.rb trunk/lib/rdoc/rubygems_hook.rb trunk/lib/rdoc/servlet.rb trunk/lib/rdoc/stats.rb trunk/lib/rdoc/store.rb trunk/lib/rdoc/test_case.rb trunk/lib/rdoc/text.rb trunk/lib/rdoc/tom_doc.rb trunk/lib/rdoc/top_level.rb trunk/lib/rdoc.rb trunk/test/rdoc/test_rdoc_any_method.rb trunk/test/rdoc/test_rdoc_class_module.rb trunk/test/rdoc/test_rdoc_code_object.rb trunk/test/rdoc/test_rdoc_context.rb trunk/test/rdoc/test_rdoc_context_section.rb trunk/test/rdoc/test_rdoc_cross_reference.rb trunk/test/rdoc/test_rdoc_generator_darkfish.rb trunk/test/rdoc/test_rdoc_generator_json_index.rb trunk/test/rdoc/test_rdoc_generator_ri.rb trunk/test/rdoc/test_rdoc_markdown.rb trunk/test/rdoc/test_rdoc_markdown_test.rb trunk/test/rdoc/test_rdoc_markup_attribute_manager.rb trunk/test/rdoc/test_rdoc_markup_document.rb trunk/test/rdoc/test_rdoc_markup_formatter.rb trunk/test/rdoc/test_rdoc_markup_heading.rb trunk/test/rdoc/test_rdoc_markup_parser.rb trunk/test/rdoc/test_rdoc_markup_pre_process.rb trunk/test/rdoc/test_rdoc_markup_raw.rb trunk/test/rdoc/test_rdoc_markup_to_html.rb trunk/test/rdoc/test_rdoc_markup_to_html_crossref.rb trunk/test/rdoc/test_rdoc_markup_to_html_snippet.rb trunk/test/rdoc/test_rdoc_markup_to_markdown.rb trunk/test/rdoc/test_rdoc_method_attr.rb trunk/test/rdoc/test_rdoc_normal_class.rb trunk/test/rdoc/test_rdoc_normal_module.rb trunk/test/rdoc/test_rdoc_options.rb trunk/test/rdoc/test_rdoc_parser.rb trunk/test/rdoc/test_rdoc_parser_c.rb trunk/test/rdoc/test_rdoc_parser_changelog.rb trunk/test/rdoc/test_rdoc_parser_rd.rb trunk/test/rdoc/test_rdoc_parser_ruby.rb trunk/test/rdoc/test_rdoc_rd_block_parser.rb trunk/test/rdoc/test_rdoc_rd_inline_parser.rb trunk/test/rdoc/test_rdoc_rdoc.rb trunk/test/rdoc/test_rdoc_ri_driver.rb trunk/test/rdoc/test_rdoc_ruby_lex.rb trunk/test/rdoc/test_rdoc_servlet.rb trunk/test/rdoc/test_rdoc_stats.rb trunk/test/rdoc/test_rdoc_store.rb trunk/test/rdoc/test_rdoc_text.rb trunk/test/rdoc/test_rdoc_tom_doc.rb trunk/test/rdoc/xref_test_case.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 42970) +++ ChangeLog (revision 42971) @@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Thu Sep 19 08:33:14 2013 Eric Hodel <drbrain@s...> + + * lib/rdoc: Update to RDoc 4.1.0.preview.1 + + RDoc 4.1.0 contains a number of enhancements including a new default + style and accessibility support. You can see the changelog here: + + https://github.com/rdoc/rdoc/blob/v4.1.0.preview.1/History.rdoc + + * test/rdoc: ditto. + Thu Sep 19 07:16:26 2013 Aaron Patterson <aaron@t...> * ext/psych/lib/psych.rb: updating Psych version Index: lib/rdoc.rb =================================================================== --- lib/rdoc.rb (revision 42970) +++ lib/rdoc.rb (revision 42971) @@ -14,7 +14,7 @@ $DEBUG_RDOC = nil https://github.com/ruby/ruby/blob/trunk/lib/rdoc.rb#L14 # # == Roadmap # -# If you think you found a bug in RDoc see DEVELOPERS@Bugs +# If you think you found a bug in RDoc see CONTRIBUTING@Bugs # # If you want to use RDoc to create documentation for your Ruby source files, # see RDoc::Markup and refer to <tt>rdoc --help</tt> for command line usage. @@ -42,7 +42,7 @@ $DEBUG_RDOC = nil https://github.com/ruby/ruby/blob/trunk/lib/rdoc.rb#L42 # # If you want to write your own output generator see RDoc::Generator. # -# If you want an overview of how RDoc works see DEVELOPERS +# If you want an overview of how RDoc works see CONTRIBUTING # # == Credits # @@ -64,7 +64,7 @@ module RDoc https://github.com/ruby/ruby/blob/trunk/lib/rdoc.rb#L64 ## # RDoc version you are using - VERSION = '4.0.0' + VERSION = '4.1.0.preview.1' ## # Method visibilities @@ -174,6 +174,7 @@ module RDoc https://github.com/ruby/ruby/blob/trunk/lib/rdoc.rb#L174 autoload :Attr, 'rdoc/attr' autoload :Constant, 'rdoc/constant' + autoload :Mixin, 'rdoc/mixin' autoload :Include, 'rdoc/include' autoload :Extend, 'rdoc/extend' autoload :Require, 'rdoc/require' Index: lib/rdoc/markdown.rb =================================================================== --- lib/rdoc/markdown.rb (revision 42970) +++ lib/rdoc/markdown.rb (revision 42971) @@ -8,6 +8,16 @@ https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L8 # 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 @@ https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L130 # ## Limitations # # * Link titles are not used -# * Image links are not generated correctly # * Footnotes are collapsed into a single paragraph # # ## Author @@ -172,8 +181,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L181 # Prepares for parsing +str+. If you define a custom initialize you must # call this method before #parse def setup_parser(str, debug=false) - @string = str - @pos = 0 + set_string str, 0 @memoizations = Hash.new { |h,k| h[k] = {} } @result = nil @failed_rule = nil @@ -186,7 +194,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L194 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 @@ -220,6 +228,13 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L228 @string[start..@pos-1] end + # Sets the string and current parsing position for the parser. + def set_string string, pos + @string = string + @string_size = string ? string.size : 0 + @pos = pos + end + def show_pos width = 10 if @pos < width @@ -326,19 +341,19 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L341 return nil end - if "".respond_to? :getbyte + if "".respond_to? :ord def get_byte - if @pos >= @string.size + if @pos >= @string_size return nil end - s = @string.getbyte @pos + s = @string[@pos].ord @pos += 1 s end else def get_byte - if @pos >= @string.size + if @pos >= @string_size return nil end @@ -387,8 +402,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L402 old_pos = @pos old_string = @string - @pos = other.pos - @string = other.string + set_string other.string, other.pos begin if val = __send__(rule, *args) @@ -399,8 +413,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L413 end val ensure - @pos = old_pos - @string = old_string + set_string old_string, old_pos end end @@ -548,15 +561,13 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L561 def self.extension name EXTENSIONS << name - eval <<-RUBY - def #{name}? - extension? __method__ - end + define_method "#{name}?" do + extension? name + end - def #{name}= enable - extension __method__, enable - end - RUBY + define_method "#{name}=" do |enable| + extension name, enable + end end ## @@ -636,8 +647,6 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L647 # Is the extension `name` enabled? def extension? name - name = name.to_s.delete('?').intern - @extensions.include? name end @@ -647,8 +656,6 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L656 # Enables or disables the extension with `name` def extension name, enable - name = name.to_s.delete('=').intern - if enable then @extensions |= [name] else @@ -870,13 +877,13 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L877 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 @@ -942,12 +949,12 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L949 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 @@ -959,10 +966,10 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L966 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 @@ -1008,13 +1015,13 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1015 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 @@ -1026,7 +1033,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1033 _save3 = self.pos while true # sequence _save4 = self.pos - _tmp = apply(:_Sp) + _tmp = _Sp() unless _tmp _tmp = true self.pos = _save4 @@ -1035,21 +1042,17 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1042 self.pos = _save3 break end - while true - _tmp = match_string("#") - break unless _tmp - end - _tmp = true + _tmp = scan(/\A(?-mix:#*)/) unless _tmp 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 @@ -1073,36 +1076,13 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1076 return _tmp end - # AtxStart = < ("######" | "#####" | "####" | "###" | "##" | "#") > { text.length } + # AtxStart = < /\#{1,6}/ > { text.length } def _AtxStart _save = self.pos while true # sequence _text_start = self.pos - - _save1 = self.pos - while true # choice - _tmp = match_string("######") - break if _tmp - self.pos = _save1 - _tmp = match_string("#####") - break if _tmp - self.pos = _save1 - _tmp = match_string("####") - break if _tmp - self.pos = _save1 - _tmp = match_string("###") - break if _tmp - self.pos = _save1 - _tmp = match_string("##") - break if _tmp - self.pos = _save1 - _tmp = match_string("#") - break if _tmp - self.pos = _save1 - break - end # end choice - + _tmp = scan(/\A(?-mix:\#{1,6})/) if _tmp text = get_text(_text_start) end @@ -1122,7 +1102,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1102 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 @@ -1134,7 +1114,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1114 break end _save1 = self.pos - _tmp = apply(:_Sp) + _tmp = _Sp() unless _tmp _tmp = true self.pos = _save1 @@ -1168,7 +1148,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1148 _save4 = self.pos while true # sequence _save5 = self.pos - _tmp = apply(:_Sp) + _tmp = _Sp() unless _tmp _tmp = true self.pos = _save5 @@ -1177,16 +1157,12 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1157 self.pos = _save4 break end - while true - _tmp = match_string("#") - break unless _tmp - end - _tmp = true + _tmp = scan(/\A(?-mix:#*)/) unless _tmp self.pos = _save4 break end - _tmp = apply(:_Sp) + _tmp = _Sp() unless _tmp self.pos = _save4 end @@ -1201,7 +1177,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1177 self.pos = _save break end - _tmp = apply(:_Newline) + _tmp = _Newline() unless _tmp self.pos = _save break @@ -1236,26 +1212,17 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1212 return _tmp end - # SetextBottom1 = "===" "="* Newline + # SetextBottom1 = /={3,}/ @Newline def _SetextBottom1 _save = self.pos while true # sequence - _tmp = match_string("===") - unless _tmp - self.pos = _save - break - end - while true - _tmp = match_string("=") - break unless _tmp - end - _tmp = true + _tmp = scan(/\A(?-mix:={3,})/) unless _tmp self.pos = _save break end - _tmp = apply(:_Newline) + _tmp = _Newline() unless _tmp self.pos = _save end @@ -1266,26 +1233,17 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1233 return _tmp end - # SetextBottom2 = "---" "-"* Newline + # SetextBottom2 = /-{3,}/ @Newline def _SetextBottom2 _save = self.pos while true # sequence - _tmp = match_string("---") - unless _tmp - self.pos = _save - break - end - while true - _tmp = match_string("-") - break unless _tmp - end - _tmp = true + _tmp = scan(/\A(?-mix:-{3,})/) unless _tmp self.pos = _save break end - _tmp = apply(:_Newline) + _tmp = _Newline() unless _tmp self.pos = _save end @@ -1296,7 +1254,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1254 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 @@ -1305,7 +1263,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1263 _save2 = self.pos while true # sequence - _tmp = apply(:_RawLine) + _tmp = _RawLine() unless _tmp self.pos = _save2 break @@ -1322,7 +1280,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1280 self.pos = _save break end - _tmp = apply(:_StartList) + _tmp = _StartList() a = @result unless _tmp self.pos = _save @@ -1333,7 +1291,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1291 _save4 = self.pos while true # sequence _save5 = self.pos - _tmp = apply(:_Endline) + _tmp = _Endline() _tmp = _tmp ? nil : true self.pos = _save5 unless _tmp @@ -1360,7 +1318,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1318 _save6 = self.pos while true # sequence _save7 = self.pos - _tmp = apply(:_Endline) + _tmp = _Endline() _tmp = _tmp ? nil : true self.pos = _save7 unless _tmp @@ -1392,7 +1350,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1350 break end _save8 = self.pos - _tmp = apply(:_Sp) + _tmp = _Sp() unless _tmp _tmp = true self.pos = _save8 @@ -1401,7 +1359,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1359 self.pos = _save break end - _tmp = apply(:_Newline) + _tmp = _Newline() unless _tmp self.pos = _save break @@ -1423,7 +1381,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1381 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 @@ -1432,7 +1390,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1390 _save2 = self.pos while true # sequence - _tmp = apply(:_RawLine) + _tmp = _RawLine() unless _tmp self.pos = _save2 break @@ -1449,7 +1407,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1407 self.pos = _save break end - _tmp = apply(:_StartList) + _tmp = _StartList() a = @result unless _tmp self.pos = _save @@ -1460,7 +1418,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1418 _save4 = self.pos while true # sequence _save5 = self.pos - _tmp = apply(:_Endline) + _tmp = _Endline() _tmp = _tmp ? nil : true self.pos = _save5 unless _tmp @@ -1487,7 +1445,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1445 _save6 = self.pos while true # sequence _save7 = self.pos - _tmp = apply(:_Endline) + _tmp = _Endline() _tmp = _tmp ? nil : true self.pos = _save7 unless _tmp @@ -1519,7 +1477,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1477 break end _save8 = self.pos - _tmp = apply(:_Sp) + _tmp = _Sp() unless _tmp _tmp = true self.pos = _save8 @@ -1528,7 +1486,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1486 self.pos = _save break end - _tmp = apply(:_Newline) + _tmp = _Newline() unless _tmp self.pos = _save break @@ -1591,12 +1549,12 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1549 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 @@ -1646,7 +1604,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1604 break end _save7 = self.pos - _tmp = apply(:_BlankLine) + _tmp = _BlankLine() _tmp = _tmp ? nil : true self.pos = _save7 unless _tmp @@ -1678,7 +1636,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1636 _save9 = self.pos while true # sequence - _tmp = apply(:_BlankLine) + _tmp = _BlankLine() n = @result unless _tmp self.pos = _save9 @@ -1746,7 +1704,7 @@ class RDoc::Markdown https://github.com/ruby/ruby/blob/trunk/lib/rdoc/markdown.rb#L1704 break end _save15 = self.pos - _tmp = apply(:_Blan (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/