diff options
| author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-30 14:22:26 +0000 |
|---|---|---|
| committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-08-30 14:22:26 +0000 |
| commit | 0635d8b9f2b86231e211a037e04f2d0f5d1a9a37 (patch) | |
| tree | 17f3eb310a24fabe871f4f407bd2b98f6ccb270c /lib/rdoc/markup/simple_markup | |
| parent | ae784be859b90900120790aa94073b4efee0d108 (diff) | |
| download | ruby-0635d8b9f2b86231e211a037e04f2d0f5d1a9a37.tar.gz ruby-0635d8b9f2b86231e211a037e04f2d0f5d1a9a37.tar.xz ruby-0635d8b9f2b86231e211a037e04f2d0f5d1a9a37.zip | |
ri now merges the documentation if it finds the same class in multiple places
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/markup/simple_markup')
| -rw-r--r-- | lib/rdoc/markup/simple_markup/fragments.rb | 2 | ||||
| -rw-r--r-- | lib/rdoc/markup/simple_markup/to_flow.rb | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/rdoc/markup/simple_markup/fragments.rb b/lib/rdoc/markup/simple_markup/fragments.rb index 83388fcc0..6ca06382a 100644 --- a/lib/rdoc/markup/simple_markup/fragments.rb +++ b/lib/rdoc/markup/simple_markup/fragments.rb @@ -1,5 +1,5 @@ require 'rdoc/markup/simple_markup/lines.rb' -require 'rdoc/markup/simple_markup/inline.rb' +#require 'rdoc/markup/simple_markup/to_flow.rb' module SM diff --git a/lib/rdoc/markup/simple_markup/to_flow.rb b/lib/rdoc/markup/simple_markup/to_flow.rb index 4718cfaaf..401703a72 100644 --- a/lib/rdoc/markup/simple_markup/to_flow.rb +++ b/lib/rdoc/markup/simple_markup/to_flow.rb @@ -23,14 +23,13 @@ module SM end class ToFlow - LIST_TYPE_TO_HTML = { - ListBase::BULLET => [ "<ul>", "</ul>" ], - ListBase::NUMBER => [ "<ol>", "</ol>" ], - ListBase::UPPERALPHA => [ "<ol>", "</ol>" ], - ListBase::LOWERALPHA => [ "<ol>", "</ol>" ], - ListBase::LABELED => [ "<dl>", "</dl>" ], - ListBase::NOTE => [ "<table>", "</table>" ], + SM::ListBase::BULLET => [ "<ul>", "</ul>" ], + SM::ListBase::NUMBER => [ "<ol>", "</ol>" ], + SM::ListBase::UPPERALPHA => [ "<ol>", "</ol>" ], + SM::ListBase::LOWERALPHA => [ "<ol>", "</ol>" ], + SM::ListBase::LABELED => [ "<dl>", "</dl>" ], + SM::ListBase::NOTE => [ "<table>", "</table>" ], } InlineTag = Struct.new(:bit, :on, :off) |