summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-04-24 01:39:45 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-04-24 01:39:45 +0000
commitfea9469fc6d1f3132e724a0c621c8144c682db72 (patch)
tree832050070bfe4a8fb639fdc09a346800819123cb
parentafe19a2c7cf850b20552fb0a7b060d92d8e30370 (diff)
Fix bug where consecutive headings were merged
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/markup/simple_markup.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d80d8f8455..2a72adb90e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Apr 24 10:38:31 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::group_lines):
+ Fix bug where consecutive headings are merged.
+
Fri Apr 23 23:26:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb: $hdrdir should not contain macros for backward
diff --git a/lib/rdoc/markup/simple_markup.rb b/lib/rdoc/markup/simple_markup.rb
index 18971e23e1..21064cb009 100644
--- a/lib/rdoc/markup/simple_markup.rb
+++ b/lib/rdoc/markup/simple_markup.rb
@@ -453,7 +453,7 @@ module SM #:nodoc:
else
wantedType = line.type
end
- wantedLevel = line.level
+ wantedLevel = line.type == Line::HEADING ? line.param : line.level
end
end