summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-18 15:12:55 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-18 15:12:55 +0000
commitb8f858a30ae0d05e01149ec86e87c997484be4cd (patch)
treefbdcac126db2f63651173263108b186fd264ff15
parent3654677fbc1a52c48fc7592c8c2f1345a5e21fe4 (diff)
downloadruby-b8f858a30ae0d05e01149ec86e87c997484be4cd.tar.gz
ruby-b8f858a30ae0d05e01149ec86e87c997484be4cd.tar.xz
ruby-b8f858a30ae0d05e01149ec86e87c997484be4cd.zip
Strip extraneous spaces from included filename
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/markup/simple_markup/preprocess.rb4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 66f4131d2..3b4d31e62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 19 00:11:05 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/markup/simple_markup/preprocess.rb (SM::PreProcess::handle):
+ Strip extraneous space from filenames in :include:
+
Wed Feb 18 22:52:00 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/unix.rb: remove O_NONBLOCK, thanks \ay
diff --git a/lib/rdoc/markup/simple_markup/preprocess.rb b/lib/rdoc/markup/simple_markup/preprocess.rb
index 09892c2b6..dbf4b216c 100644
--- a/lib/rdoc/markup/simple_markup/preprocess.rb
+++ b/lib/rdoc/markup/simple_markup/preprocess.rb
@@ -20,13 +20,15 @@ module SM
def handle(text)
text.gsub!(/^([ \t#]*):(\w+):\s*(.+)?\n/) do
+ prefix = $1
directive = $2.downcase
param = $3
case directive
when "include"
- include_file($3, $1)
+ filename = param.split[0]
+ include_file(filename, prefix)
else
yield(directive, param)