lib/rd2odt.rb in nishidayuya-rd2odt-0.0.1.20090403.01 vs lib/rd2odt.rb in nishidayuya-rd2odt-0.1.1

@@ -3,15 +3,24 @@
 require "pp"
 require "optparse"
 require "find"
 require "tmpdir"
 require "cgi"
-require "rd/rdvisitor"
-require "rd/rdfmt"
 require "rexml/document"
-require "zip/zip"
+begin
+  require "rd/rdvisitor"
+  require "rd/rdfmt"
+  require "zip/zip"
+rescue LoadError
+  require "rubygems"
+  require "rd/rdvisitor"
+  require "rd/rdfmt"
+  require "zip/zip"
+end
 
+require "rd2odt/compat/ruby-1.8.6" if RUBY_VERSION < "1.8.7"
+
 module RD2ODT
   @@options = {
     :backtrace => false,
     :template => nil,
   }
@@ -263,21 +272,17 @@
     attr_accessor :number_of_include_files
 
     # included OLE objects
     attr_accessor :inner_objects
 
-    # 
-    attr_accessor :list_stack
-
     def initialize(*args)
       super
 
       self.number_of_include_files = 0
       self.additional_styles = []
       self.automatic_styles = []
       self.inner_objects = []
-      self.list_stack = []
     end
 
     def apply_to_DocumentElement(element, sub_content)
       result =
         [:office__document_content,
@@ -409,19 +414,9 @@
       if level == 1 && !continue_numbering_headline
         result[1].delete(:text__continue_numbering)
       end
       self.continue_numbering_headline = true
       return result
-    end
-
-    [:enum, :item].each do |s|
-      method_name = "visit_#{s.to_s.capitalize}List"
-      define_method(method_name) do |*args|
-        list_stack.push(s)
-        result = super
-        list_stack.pop
-        return result
-      end
     end
 
     def apply_to_EnumList(element, items)
       return apply_to_list(items,
                            :text__style_name => "Numbering_20_1",