From fcb0b1f503b392e446e8ee4b1033e1e7c0e7d0fe Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 14 Jan 2008 03:34:05 +0000
Subject: Renamespace lib/rdoc/markup from SM::SimpleMarkup to RDoc::Markup.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15033 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/generator/html.rb | 15 +++++++--------
 lib/rdoc/generator/ri.rb   |  9 +++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'lib/rdoc/generator')

diff --git a/lib/rdoc/generator/html.rb b/lib/rdoc/generator/html.rb
index 32f8235537..e6a6cd9ac9 100644
--- a/lib/rdoc/generator/html.rb
+++ b/lib/rdoc/generator/html.rb
@@ -1,7 +1,7 @@
 require 'fileutils'
 
 require 'rdoc/generator'
-require 'rdoc/markup/simple_markup/to_html'
+require 'rdoc/markup/to_html'
 
 module RDoc::Generator
 
@@ -34,12 +34,11 @@ module RDoc::Generator
   end
 
   ##
-  # Subclass of the SM::ToHtml class that supports looking
-  # up words in the AllReferences list. Those that are
-  # found (like AllReferences in this comment) will
-  # be hyperlinked
+  # Subclass of the RDoc::Markup::ToHtml class that supports looking up words
+  # in the AllReferences list. Those that are found (like AllReferences in
+  # this comment) will be hyperlinked
 
-  class HyperlinkHtml < SM::ToHtml
+  class HyperlinkHtml < RDoc::Markup::ToHtml
 
     ##
     # We need to record the html path of our caller so we can generate
@@ -161,13 +160,13 @@ module RDoc::Generator
 
     ##
     # Convert a string in markup format into HTML. We keep a cached
-    # SimpleMarkup object lying around after the first time we're
+    # RDoc::Markup object lying around after the first time we're
     # called per object.
 
     def markup(str, remove_para=false)
       return '' unless str
       unless defined? @markup
-        @markup = SM::SimpleMarkup.new
+        @markup = RDoc::Markup.new
 
         # class names, variable names, or instance variables
         @markup.add_special(/(
diff --git a/lib/rdoc/generator/ri.rb b/lib/rdoc/generator/ri.rb
index bb0c4f4021..2452d79132 100644
--- a/lib/rdoc/generator/ri.rb
+++ b/lib/rdoc/generator/ri.rb
@@ -1,5 +1,5 @@
 require 'rdoc/generator'
-require 'rdoc/markup/simple_markup/to_flow'
+require 'rdoc/markup/to_flow'
 
 require 'rdoc/ri/cache'
 require 'rdoc/ri/reader'
@@ -26,8 +26,8 @@ class RDoc::Generator::RI
   def initialize(options) #:not-new:
     @options   = options
     @ri_writer = RDoc::RI::Writer.new "."
-    @markup    = SM::SimpleMarkup.new
-    @to_flow   = SM::ToFlow.new
+    @markup    = RDoc::Markup.new
+    @to_flow   = RDoc::Markup::ToFlow.new
 
     @generated = {}
   end
@@ -38,7 +38,7 @@ class RDoc::Generator::RI
 
   def generate(toplevels)
     RDoc::TopLevel.all_classes_and_modules.each do |cls|
-      process_class(cls)
+      process_class cls
     end
   end
 
@@ -58,6 +58,7 @@ class RDoc::Generator::RI
       cls_desc = RDoc::RI::ClassDescription.new
       cls_desc.superclass  = cls.superclass
     end
+
     cls_desc.name        = cls.name
     cls_desc.full_name   = cls.full_name
     cls_desc.comment     = markup(cls.comment)
-- 
cgit v1.2.3