docgenerator 1.2.1 → 2.0.0

data/unittest/expected_wikimedia/test_wiki_picture_thumb.html

@@ -0,0 +1,5 @@
+<p ><span >
+<a href = "Red_Flower.jpg" ><img src = "testthumb.jpg" /></a>
+</span>
+ 
+</p>

data/unittest/{unittest_creole2doc.rb → unittest_creole.rb}

@@ -1,14 +1,15 @@
-# encoding: ASCII-8BIT
+# encoding: cp1252
 if $0 == __FILE__
   $:.unshift("../lib")
 end
 
+gem 'test-unit'
 require 'test/unit'
 require 'more_unit_test/assert_equal_filecontent.rb'
 
 require 'creole/creole2doc.rb'
 
-#~ require 'creole/creole2doc.rb'
+#~ Docgenerator.trace_on
 
 <<missingtests
 see Text and
@@ -17,17 +18,9 @@ labels
 
 <<ruby>>
 
-erweitern:
-*tabulars 
-*Creole_creoletab
-*csv-tabs
-
 Creole_document
 *content mit level..., \tableofcontents...
 
-placeholder mit parameter (siehe creole_rail)
-
-
 Bug:
 http://... am Ende ohne folgenden Text wird falsch erkannt.
 --> test_creole_links_implicit_end()
@@ -37,8 +30,7 @@ missingtests
 #(Running stand alone it's the filename, with require it's './<<filename>>'
 $thisfile = File.basename(__FILE__)
 
-
-class Creole
+class Docgenerator::Creole::Creole
   #Access to the options.
   attr_reader :options
 end
@@ -58,9 +50,13 @@ $log.outputters = Log4r::StdoutOutputter.new('log_stdout')
 $tmplog = Log4r::Logger.new('Creole', Log4r::FATAL)
 
 class Test_creole_basics < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
   #Test some basic definitions.
   def test_creole_initialize()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
       :content => 'test'
     )
     assert_instance_of( Log4r::Logger, creole.log)
@@ -78,44 +74,47 @@ And some more text.
 
 A new paragraph.
 creole
-    creole = Creole.new(:content => source )
+    creole = Docgenerator::Creole::Creole.new(:content => source )
     assert_equal( [source], creole.source)
-    assert_equal_filecontent( "expected_creole/test_creole_input.normsource", creole.normsource.to_yaml)
+    
+    omit_if( RUBY_VERSION == '1.9.2', "Wrong ruby version #{RUBY_VERSION}"){
+      assert_equal_filecontent( "expected_creole/test_creole_input.normsource", creole.normsource.to_yaml)
+    }
 
-    creole = Creole.new(:content => source )
-    creole = Creole.new()
+    creole = Docgenerator::Creole::Creole.new(:content => source )
+    creole = Docgenerator::Creole::Creole.new()
     creole << source 
     creole << source 
     assert_equal( [source, source], creole.source)
   end
   def test_creole_input_array()
 
-    creole = Creole.new(:content => [ "Text1", "Text2" ] )
+    creole = Docgenerator::Creole::Creole.new(:content => [ "Text1", "Text2" ] )
     assert_equal( ["Text1\nText2"], creole.source)
 
-    creole = Creole.new(:content => [ "Text1\n", "Text2" ] )
+    creole = Docgenerator::Creole::Creole.new(:content => [ "Text1\n", "Text2" ] )
     assert_equal( ["Text1\nText2"], creole.source)
     
     #Leading spaces keep staying
-    creole = Creole.new(:content => [ "  Text1\n", "Text2" ] )
+    creole = Docgenerator::Creole::Creole.new(:content => [ "  Text1\n", "Text2" ] )
     assert_equal( ["  Text1\nText2"], creole.source)
     
     #Trailing spaces keep staying
-    creole = Creole.new(:content => [ "Text1  \n", "Text2" ] )
+    creole = Docgenerator::Creole::Creole.new(:content => [ "Text1  \n", "Text2" ] )
     assert_equal( ["Text1  \nText2"], creole.source)
     
   end  #
   def test_creole_input_undefined()
-    assert_nothing_raised(RuntimeError){ Creole.new(:content => 'source' ) }
+    assert_nothing_raised(RuntimeError){ Docgenerator::Creole::Creole.new(:content => 'source' ) }
     #~ assert_nothing_raised(RuntimeError){ Creole.new(:content => ['source'] ) }
-    assert_raise(Creole::InputError){ Creole.new(:content => :source ) }
+    assert_raise(Docgenerator::Creole::Creole::InputError){ Docgenerator::Creole::Creole.new(:content => :source ) }
   end
   #Check for open File-handles
   def test_creole_input_file()
-    creole1 = Creole.new(  :content => File.read('creole1.0test.txt') )
+    creole1 = Docgenerator::Creole::Creole.new(  :content => File.read('creole1.0test.txt') )
     creole2 = nil
     File.open('creole1.0test.txt'){|filehandle|
-      creole2 = Creole.new(  :content => filehandle )
+      creole2 = Docgenerator::Creole::Creole.new(  :content => filehandle )
     }
     assert_equal( creole1.source, creole2.source)
   end
@@ -125,47 +124,54 @@ creole
     #ignore this test, if tests are loaded via require.
     return unless $0 == __FILE__
     
-    creole1 = Creole.new( :name => 'input_file_rb/DATA', :content => DATA )
+    creole1 = Docgenerator::Creole::Creole.new( :name => 'input_file_rb/DATA', :content => DATA )
     creole2 = nil
     File.open($thisfile){|filehandle|
       #~ $log.warn('Test Filehandle auf ruby nicht m�glich (Test $0 == input.path)')
       #Modify $0 temporary to allow test with condition $0 == input.path
       $0 = "xxxx#{$thisfile}"
-      creole2 = Creole.new( :name => 'input_file_rb', :content => filehandle, :log => $tmplog )
+      creole2 = Docgenerator::Creole::Creole.new( :name => 'input_file_rb', :content => filehandle, :log => $tmplog )
       $0 = $thisfile
     }
     assert_equal( creole1.source, creole2.source)
   end
   def test_creole_input_file_simple
     assert_true(File.exist?('creole_testtext.creole'))
-    creole = Creole.new()
+    creole = Docgenerator::Creole::Creole.new()
     File.open('creole_testtext.creole'){|f| creole << f.readlines }
   end
   def test_creole_input_file_simple_readlines
-    creole = Creole.new()
+    creole = Docgenerator::Creole::Creole.new()
     File.open('creole_testtext.creole'){|f| creole << f }
-    assert_equal_filecontent( "expected_creole/#{__method__}.html", creole.to_doc(:html))
+    assert_equal_filecontent( "expected_creole/#{__method__}.html", creole.to_doc(:html, @opt))
   end
   #
   #This testcases are taken from http://www.wikicreole.org/wiki/Creole1.0TestCases
   def test_creole_creole1_0test()
     $log.info('Testcases uncomplete creole1.0test.txt')
-    creole = Creole.new(  
+    #Logger w/o messages
+    @opt_silent = { :log => Log4r::Logger.new('silent') }
+    creole = Docgenerator::Creole::Creole.new(  
                                   :name => 'creole_creole1_0test',
                                   :content => File.readlines('creole1.0test.txt').join,
                                   :log => $tmplog #catch warning for [[links]]
                                 )
-    assert_equal_filecontent( "expected_creole/test_creole_creole1.0test.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_creole1.0test.latex", creole.to_doc(:latex))
+    
+    assert_equal_filecontent( "expected_creole/test_creole_creole1.0test.html", creole.to_doc(:html, @opt_silent))
+    assert_equal_filecontent( "expected_creole/test_creole_creole1.0test.latex", creole.to_doc(:latex, @opt_silent))
     $log.warn('test_creole_creole1.0test: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_creole1.0test.context", creole.to_doc(:context))
     $log.info('test_creole_creole1_0test: uncomplete to_creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_creole1.0test.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_creole1.0test.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_creole1.0test.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_creole1.0test.text", creole.to_doc(:text, @opt_silent))
   end  
 end #Test_creole_basics 
 
 class Test_creole_paragraphs < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
 
   def test_creole_paragraphs()
     source = <<creole
@@ -176,52 +182,54 @@ And some more text.
 And now a new paragraph with some other text.
 
 creole
-    creole = Creole.new(:content => source )
+    creole = Docgenerator::Creole::Creole.new(:content => source )
     assert_equal( [source], creole.source)
     
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_paragraphs: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_paragraphs.context", creole.to_doc(:context))
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs.wiki", creole.to_doc(:wiki))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs.wiki", creole.to_doc(:wiki, @opt))
     $log.info('test_creole_paragraphs: uncomplete to_creole')    
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs.text", creole.to_doc(:text))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs.text", creole.to_doc(:text, @opt))
 
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs.normsource", creole.normsource.to_yaml)
+    omit_if( RUBY_VERSION == '1.9.2', "Wrong ruby version #{RUBY_VERSION}"){
+      assert_equal_filecontent( "expected_creole/test_creole_paragraphs.normsource", creole.normsource.to_yaml)
+    }
   end
   def test_creole_paragraphs_wrap()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 And now a line which is a bit longer then 80 characters in the input line. Creole should split it at position 75 or a bit later (depending on the word length at position 75).
 creole
     )
     
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_paragraphs_wrap: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap.context", creole.to_doc(:context))
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap.wiki", creole.to_doc(:wiki))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap.wiki", creole.to_doc(:wiki, @opt))
     $log.info('test_creole_paragraphs_wrap: uncomplete to_creole')    
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap.text", creole.to_doc(:text))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap.text", creole.to_doc(:text, @opt))
   end #test_creole_paragraphs_wrap()
   def test_creole_paragraphs_wrap60()
 
-    creole = Creole.new(:wrap_at => 60, :content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:wrap_at => 60, :content => <<creole
 And now a line which is a bit longer then 80 characters in the input line. Creole should split it at position 60 or a bit later (depending on the word length at position 60).
 creole
     )
     
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap60.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap60.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap60.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap60.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_paragraphs_wrap60: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap60.context", creole.to_doc(:context))
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap60.wiki", creole.to_doc(:wiki))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap60.wiki", creole.to_doc(:wiki, @opt))
     $log.info('test_creole_paragraphs_wrap: uncomplete to_creole')    
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap60.text", creole.to_doc(:text))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap60.text", creole.to_doc(:text, @opt))
   end #test_creole_paragraphs_wrap60()
 
   def test_creole_paragraphs_wrap0()
 
-    creole = Creole.new(:wrap_at => 0, :content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:wrap_at => 0, :content => <<creole
 And now a line which is a bit longer then 80 characters in the input line. Creole should not split it, because we defined split_at to 0.
 
 And now a line which is a bit longer then 80 characters in the input line. 
@@ -229,20 +237,24 @@ Creole should not split it, because we defined split_at to 0.
 creole
     )
     
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap0.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap0.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap0.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap0.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_paragraphs_wrap0: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap0.context", creole.to_doc(:context))
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap0.wiki", creole.to_doc(:wiki))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap0.wiki", creole.to_doc(:wiki, @opt))
     $log.info('test_creole_paragraphs_wrap: uncomplete to_creole')    
-    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap0.text", creole.to_doc(:text))
+    assert_equal_filecontent( "expected_creole/test_creole_paragraphs_wrap0.text", creole.to_doc(:text, @opt))
   end
 end #Test_creole_paragraphs < Test::Unit::TestCase
 
 class Test_creole_headings < Test::Unit::TestCase
-  
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
+ 
   def test_creole_headings()
-    creole = Creole.new(:content =>  <<creole
+    creole = Docgenerator::Creole::Creole.new(:content =>  <<creole
 = Top-level heading (1)
 == This a test for creole 0.1 (2)
 === This is a Subheading (3)
@@ -263,20 +275,20 @@ The content is not parsed.
 creole
     )
 
-    assert_equal_filecontent( "expected_creole/test_creole_headings.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_headings.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_headings.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_headings.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_headings: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_headings.context", creole.to_doc(:context))
-    assert_equal_filecontent( "expected_creole/test_creole_headings.wiki", creole.to_doc(:wiki))
+    assert_equal_filecontent( "expected_creole/test_creole_headings.wiki", creole.to_doc(:wiki, @opt))
     $log.info('test_creole_paragraphs: uncomplete to_creole')    
-    assert_equal_filecontent( "expected_creole/test_creole_headings.text", creole.to_doc(:text))
+    assert_equal_filecontent( "expected_creole/test_creole_headings.text", creole.to_doc(:text, @opt))
   end #test_creole_headings
   #
   #Modification of standard: Labels for headings.
   #
   #Including the definition of a label tor the toc.
   def test_creole_label()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 ==Titel 1==
 Text
 ===Titel 2===
@@ -286,20 +298,24 @@ Text unter Titel 2b.
 creole
     )
     #Check the manual label
-    assert_equal_filecontent( "expected_creole/test_creole_label.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_label.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_label.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_label.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_label: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_label.context", creole.to_doc(:context))
     $log.info('test_creole_label: uncomplete text/to_creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_label.creole", creole.to_doc(:creole))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_label.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_label.creole", creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_label.text", creole.to_doc(:text, @opt))
 
   end
 end #Test_creole_headings < Test::Unit::TestCase
 
 class Test_creole_toc < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
     def test_creole_toc()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'toc',
                     :content => <<creole
 =one
@@ -309,20 +325,20 @@ class Test_creole_toc < Test::Unit::TestCase
 ==three-one
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_toc.html",         creole.toc.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_toc_text.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_toc.latex",        creole.toc.to_doc(:latex))
-    assert_equal_filecontent( "expected_creole/test_creole_toc_text.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_toc.html",         creole.toc.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_toc_text.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_toc.latex",        creole.toc.to_doc(:latex, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_toc_text.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_toc_text: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_toc_text.context", creole.to_doc(:context))
     $log.warn('test_creole_toc: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_toc.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_toc.text", creole.toc.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_toc.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_toc.text", creole.toc.to_doc(:text, @opt))
   end #test_creole_toc
   #Build the toc, but only up to level toclevel.
   def test_creole_toc_level()
     toclevel = 1
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'toc',
                     :content => <<creole
 Test for document with toc-level #{toclevel}
@@ -333,21 +349,25 @@ Test for document with toc-level #{toclevel}
 ==three-one
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_toc_level.html",         creole.toc(:level => toclevel).to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_toc_level_text.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_toc_level.latex",        creole.toc(:level => toclevel).to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_toc_level.html",         creole.toc(:level => toclevel).to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_toc_level_text.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_toc_level.latex",        creole.toc(:level => toclevel).to_doc(:latex, @opt))
     assert_equal_filecontent( "expected_creole/test_creole_toc_level_text.latex", creole.to_doc(:latex, :level => toclevel))
     $log.warn('test_creole_toc_text: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_toc_text.context", creole.to_doc(:context)
     $log.warn('test_creole_toc: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_toc_level.creole", creole.to_doc(:creole)
-    assert_equal_filecontent( "expected_creole/test_creole_toc_level.text", creole.toc(:level => toclevel).to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_toc_level.creole", creole.to_doc(:creole, @opt)
+    assert_equal_filecontent( "expected_creole/test_creole_toc_level.text", creole.toc(:level => toclevel).to_doc(:text, @opt))
   end #test_creole_toc_level
 end   #Test_creole_toc
 
 class Test_creole_paragraph2 < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
   def test_creole_newline()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'newline',
                     :content => <<'creole'
 You can format an address by simply forcing linebreaks:
@@ -359,16 +379,16 @@ Mobile: abc
 
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_newline.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_newline.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_newline.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_newline.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_newline: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_newline.context", creole.to_doc(:context))
     $log.warn('test_creole_newline: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_newline.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_newline.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_newline.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_newline.text", creole.to_doc(:text, @opt))
   end #test_creole_newline
   def test_creole_hr()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'hr',
                     :content => <<creole
 
@@ -377,58 +397,66 @@ You can use this to draw a line to separate the page:
 This is after the horizontal line
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_hr.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_hr.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_hr.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_hr.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_hr: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_hr.context", creole.to_doc(:context))
     $log.warn('test_creole_hr: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_hr.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_hr.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_hr.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_hr.text", creole.to_doc(:text, @opt))
   end #test_creole_hr
   
 end   #Test_creole_paragraph2
 
 
 class Test_creole_inline < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
   
   def test_creole_inline_bold_em()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 You can make things **bold** or //italic// or **//both//** or //**both**//.
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_inline.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_inline.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_inline.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_inline.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_inline: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_inline.context", creole.to_doc(:context))
     $log.info('test_creole_inline_bold_em: inline to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_inline.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_inline.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_inline_bold_em: inline text with additional spaces')
-    assert_equal_filecontent( "expected_creole/test_creole_inline.text", creole.to_doc(:text))
+    assert_equal_filecontent( "expected_creole/test_creole_inline.text", creole.to_doc(:text, @opt))
   end
   
   def test_creole_inline_bold_line_break()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 Character formatting extends across line breaks: **bold,
 this is still bold. This line deliberately does not end in star-star.
 
 Not bold. Character formatting does not cross paragraph boundaries.
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_line_break.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_line_break.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_line_break.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_line_break.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_line_break: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_line_break.context", creole.to_doc(:context))
     $log.info('test_creole_inline_bold_line_break: inline to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_line_break.creole", creole.to_doc(:creole))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_line_break.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_line_break.creole", creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_line_break.text", creole.to_doc(:text, @opt))
   end  
 
 end #Test_creole_inline
 
 
 class Test_creole_lists < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
   def test_creole_list_ul()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 Text before
 *Listentry 1
 *Listentry 2
@@ -446,19 +474,21 @@ list item
 Text afterwords
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_list_ul.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_list_ul.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_list_ul.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_list_ul.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_list_ul: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul.context", creole.to_doc(:context))
     $log.warn('test_creole_list_ul: list to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul.creole", creole.to_doc(:creole))    
-    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul.wiki", creole.to_doc(:wiki))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul.text", creole.to_doc(:text))
-    assert_equal_filecontent( "expected_creole/test_creole_list_ul.normsource", creole.normsource.to_yaml)
+    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul.creole", creole.to_doc(:creole, @opt))    
+    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul.wiki", creole.to_doc(:wiki, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul.text", creole.to_doc(:text, @opt))
+    omit_if( RUBY_VERSION == '1.9.2', "Wrong ruby version #{RUBY_VERSION}"){
+      assert_equal_filecontent( "expected_creole/test_creole_list_ul.normsource", creole.normsource.to_yaml)
+    }
   end
   #It works fine here, but LaTeX will give you an error.
  def test_creole_list_ul_too_much()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 Text before
 *Listentry 1
 *Listentry 2
@@ -472,16 +502,16 @@ Text before
 Text afterwords
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_list_ul_too_much.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_list_ul_too_much.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_list_ul_too_much.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_list_ul_too_much.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_list_ul_too_much: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul_too_much.context", creole.to_doc(:context))
     $log.warn('test_creole_list_ul_too_much: list to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul_too_much.creole", creole.to_doc(:creole))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul_too_much.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul_too_much.creole", creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ul_too_much.text", creole.to_doc(:text, @opt))
   end  
   def test_creole_list_ol()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 Text before
 #Listentry 1
 #Listentry 2
@@ -491,17 +521,17 @@ Text before
 Text afterwords
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_list_ol.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_list_ol.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_list_ol.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_list_ol.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_list_ol: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol.context", creole.to_doc(:context))
     $log.warn('test_creole_list_ol: list to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol.creole", creole.to_doc(:creole))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol.creole", creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol.text", creole.to_doc(:text, @opt))
   end  #ol
 
   def test_creole_list_ol_ul()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 Text before
 #Listentry 1
 #Listentry 2
@@ -512,17 +542,17 @@ Text before
 Text afterwords
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_list_ol_ul.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_list_ol_ul.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_list_ol_ul.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_list_ol_ul.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_list_ol_ul: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol_ul.context", creole.to_doc(:context))
     $log.warn('test_creole_list_ol_ul: list to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol_ul.creole", creole.to_doc(:creole))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol_ul.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol_ul.creole", creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol_ul.text", creole.to_doc(:text, @opt))
   end  
 
   def test_creole_list_ol_after_ul()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 Text before
 *Listentry 1
 #Listentry 2
@@ -530,19 +560,19 @@ Text before
 Text afterwords
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_list_ol_after_ul.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_list_ol_after_ul.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_list_ol_after_ul.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_list_ol_after_ul.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_list_ol_after_ul: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol_after_ul.context", creole.to_doc(:context))
     $log.warn('test_creole_list_ol_after_ul: list to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol_after_ul.creole", creole.to_doc(:creole))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol_after_ul.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol_after_ul.creole", creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_list_ol_after_ul.text", creole.to_doc(:text, @opt))
   end  
 
   #Line breaks will be lost.
   def test_creole_ul_multiple_line()
     $log.warn('test_creole_ul_multiple_line: latex: grosse textl�cken (wrap mit leerzeichen bereinigen?)')
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 *	vorher
 *	text
 	mehr text zum item
@@ -552,16 +582,16 @@ creole
 *	nachher
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_ul_multiple_line.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_ul_multiple_line.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_ul_multiple_line.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_ul_multiple_line.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_ul_multiple_line: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_ul_multiple_line.context", creole.to_doc(:context))
     $log.warn('test_creole_ul_multiple_line: list to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_ul_multiple_line.creole", creole.to_doc(:creole))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_ul_multiple_line.text", creole.to_doc(:text)) #fixme
+    #~ assert_equal_filecontent( "expected_creole/test_creole_ul_multiple_line.creole", creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_ul_multiple_line.text", creole.to_doc(:text, @opt)) #fixme
   end
   def test_creole_ul_with_bold()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 You can use lists, start it at the first column for now, please...
 
 unnumbered lists are like
@@ -571,16 +601,16 @@ unnumbered lists are like
 Text
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_ul_with_bold.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_ul_with_bold.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_ul_with_bold.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_ul_with_bold.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_ul_with_bold: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_ul_with_bold.context", creole.to_doc(:context))
     $log.warn('test_creole_ul_with_bold: list to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_ul_with_bold.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_ul_with_bold.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_ul_with_bold.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_ul_with_bold.text", creole.to_doc(:text, @opt))
   end
   def test_creole_ul_with_blank()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 blank space is also permitted before lists like:
   *   item a
  * item b
@@ -589,17 +619,17 @@ blank space is also permitted before lists like:
 Text
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_ul_with_blank.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_ul_with_blank.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_ul_with_blank.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_ul_with_blank.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_ul_with_blank: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_ul_with_blank.context", creole.to_doc(:context))
     $log.warn('test_creole_ul_with_blank: list to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_ul_with_blank.creole", creole.to_doc(:creole))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_ul_with_blank.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_ul_with_blank.creole", creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_ul_with_blank.text", creole.to_doc(:text, @opt))
   end
   #Check, if the second list is really a second list.
   def test_creole_mix_titles_list()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'mix_titles_list',
                     :content => <<creole
 =Titel 1
@@ -610,13 +640,13 @@ creole
 *item 2
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_mix_titles_list.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_mix_titles_list.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_mix_titles_list.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_mix_titles_list.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_mix_titles_list: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_mix_titles_list.context", creole.to_doc(:context))
     $log.warn('test_creole_mix_titles_list: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_mix_titles_list.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_mix_titles_list.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_mix_titles_list.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_mix_titles_list.text", creole.to_doc(:text, @opt))
   end #test_creole_mix_titles_list
 
 end #Test_creole_List
@@ -624,24 +654,28 @@ end #Test_creole_List
 
 
 class Test_creole_links < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
   def test_creole_links_external_explizit()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 Here's a external link without a description: [[http://www.wikicreole.org]].
 
 And here's a external link with a description: [[http://www.wikicreole.org|wikicreole.org]].
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_links_external.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_links_external.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_links_external.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_links_external.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_links_external: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_links_external.context", creole.to_doc(:context))
     $log.warn('test_creole_links_external: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_links_external.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_links_external.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_links_external.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_links_external.text", creole.to_doc(:text, @opt))
   end #test_creole_links_external
   
   def test_creole_links_external_implicit()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 Free links without braces should be rendered as well, like http://www.wikicreole.org/ and [[http://www.wikicreole.org/users/~example]].
 
 See also description: http://www.wikicreole.org/wiki/Links
@@ -650,13 +684,13 @@ In case of phrase ends with . you should use explicit links like
 [[http://www.wikicreole.org/users/~example]].
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_links_external_implicit.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_links_external_implicit.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_links_external_implicit.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_links_external_implicit.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_links_external_implicit: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_links_external_implicit.context", creole.to_doc(:context))
     $log.warn('test_creole_links_external_implicit: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_links_external_implicit.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_links_external_implicit.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_links_external_implicit.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_links_external_implicit.text", creole.to_doc(:text, @opt))
   end #test_creole_links_external_implicit
   
   #
@@ -664,73 +698,77 @@ creole
   #   <a href = "http:" >http:</a> <em >www.wikicreole.org/users/~example</em>
   #If the very end of a text is a link, it is not detected correct
   def test_creole_links_implicit_end()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'links_implicit_end',
                     :content => "http://www.wikicreole.org/users/~example"
     )
-    assert_equal_filecontent( "expected_creole/test_creole_links_implicit_end.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_links_implicit_end.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_links_implicit_end.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_links_implicit_end.latex", creole.to_doc(:latex, @opt))
     #~ $log.warn('test_creole_links_implicit_end: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_links_implicit_end.context", creole.to_doc(:context))
     #~ $log.warn('test_creole_links_implicit_end: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_links_implicit_end.creole", creole.to_doc(:creole))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_links_implicit_end.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_links_implicit_end.creole", creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_links_implicit_end.text", creole.to_doc(:text, @opt))
   end #test_creole_links_implicit_end
   
   def test_creole_links_explicit_with_em()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 Be careful that italic links are rendered properly:  //[[http://my.book.example/|My Book Title]]// 
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_links_explicit_with_em.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_links_explicit_with_em.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_links_explicit_with_em.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_links_explicit_with_em.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_links_explicit_with_em: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_links_explicit_with_em.context", creole.to_doc(:context))
     $log.warn('test_creole_links_explicit_with_em: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_links_explicit_with_em.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_links_explicit_with_em.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_links_explicit_with_em.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_links_explicit_with_em.text", creole.to_doc(:text, @opt))
   end #test_creole_links_explicit_with_em
 
   def test_creole_links_file()
 
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 [[./#{$thisfile}]]
 
 [[./#{$thisfile}|This unittest-source]]
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_links_file.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_links_file.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_links_file.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_links_file.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_links_file: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_links_file.context", creole.to_doc(:context))
     $log.warn('test_creole_links_file: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_links_file.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_links_file.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_links_file.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_links_file.text", creole.to_doc(:text, @opt))
   end #test_creole_links_file
 
   def test_creole_links_explicit_internal()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 [[#internal]]
 
 [[#internal|Links inside]]
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_links_explicit_internal.html", creole.to_doc(:html))
+    assert_equal_filecontent( "expected_creole/test_creole_links_explicit_internal.html", creole.to_doc(:html, @opt))
     $log.warn('test_creole_links_explicit_internal: to latex')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_links_explicit_internal.latex", creole.to_doc(:latex))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_links_explicit_internal.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_links_explicit_internal: to_context')
     #~ #~ assert_equal_filecontent( "expected_creole/test_creole_links_explicit_internal.context", creole.to_doc(:context))
     $log.warn('test_creole_links_explicit_internal: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_links_explicit_internal.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_links_explicit_internal.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_links_explicit_internal.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_links_explicit_internal.text", creole.to_doc(:text, @opt))
   end #test_creole_links_explicit_internal
 
 end #Test_creole_links
 
 
 class Test_creole_pictures < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
   def test_creole_pictures()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 This should be a flower with the ALT text "this is a flower" if your wiki supports ALT text on images:
 
 {{Red_Flower.jpg}}
@@ -738,33 +776,33 @@ This should be a flower with the ALT text "this is a flower" if your wiki suppor
 {{Red_Flower.jpg|here is a red flower}}
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_pictures.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_pictures.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_pictures.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_pictures.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_pictures: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_pictures.context", creole.to_doc(:context))
     $log.warn('test_creole_pictures: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_pictures: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures.text", creole.to_doc(:text, @opt))
   end #test_creole_pictures
   def test_creole_picture_link()
-    creole = Creole.new(:name => 'Creole_picture_link',
+    creole = Docgenerator::Creole::Creole.new(:name => 'Creole_picture_link',
                                 :content => <<creole
 [[./#{$thisfile}|{{Red_Flower.jpg}}]] - if you click on the image, will goto "some link"
 
 [[http://example.com/|{{Red_Flower.jpg}}]] - same as above: picture links to url
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_picture_link.html", creole.to_doc(:html))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_picture_link.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_picture_link.html", creole.to_doc(:html, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_picture_link.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_picture_link: to_context')
     #~ #~ assert_equal_filecontent( "expected_creole/test_creole_picture_link.context", creole.to_doc(:context))
     $log.warn('test_creole_picture_link: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_picture_link.creole", creole.to_doc(:creole))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_picture_link.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_picture_link.creole", creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_picture_link.text", creole.to_doc(:text, @opt))
   end #test_creole_picture_link
   def test_creole_pictures_css()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'pictures_css',
                     :content => <<creole
 {{Red_Flower.jpg|red flower|css=width:50px}}
@@ -772,17 +810,17 @@ creole
 {{Red_Flower.jpg|red flower|imgcss=width:100px}}
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_pictures_css.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_pictures_css.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_pictures_css.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_pictures_css.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_pictures_css: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_css.context", creole.to_doc(:context))
     $log.warn('test_creole_pictures_css: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_css.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_css.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_pictures_css: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_css.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_css.text", creole.to_doc(:text, @opt))
   end #test_creole_pictures_css
   def test_creole_pictures_imgclass()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'pictures_imgclass',
                     :content => <<creole
 {{Red_Flower.jpg||class=test}}
@@ -790,56 +828,60 @@ creole
 {{Red_Flower.jpg||imgclass=test}}
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_pictures_imgclass.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_pictures_imgclass.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_pictures_imgclass.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_pictures_imgclass.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_pictures_imgclass: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_imgclass.context", creole.to_doc(:context))
     $log.warn('test_creole_pictures_imgclass: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_imgclass.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_imgclass.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_pictures_imgclass: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_imgclass.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_imgclass.text", creole.to_doc(:text, @opt))
   end #test_creole_pictures_imgclass
 
   def test_creole_pictures_longdesc()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'pictures_longdesc',
                     :content => <<creole
 {{Red_Flower.jpg||longdesc=http://www.pixelio.de/details.php?image_id=405788}}
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_pictures_longdesc.html", creole.to_doc(:html))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_longdesc.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_pictures_longdesc.html", creole.to_doc(:html, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_longdesc.latex", creole.to_doc(:latex, @opt))
     #~ $log.warn('test_creole_pictures_longdesc: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_longdesc.context", creole.to_doc(:context))
     $log.warn('test_creole_pictures_longdesc: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_longdesc.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_longdesc.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_pictures_longdesc: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_longdesc.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_longdesc.text", creole.to_doc(:text, @opt))
   end #test_creole_pictures_longdesc
   
   def test_creole_pictures_width()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'pictures_width',
                     :content => <<creole
 {{Red_Flower.jpg||width=\\textwidth|css=width:100%}}
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_pictures_width.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_pictures_width.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_pictures_width.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_pictures_width.latex", creole.to_doc(:latex, @opt))
     #~ $log.warn('test_creole_pictures_width: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_width.context", creole.to_doc(:context))
     $log.warn('test_creole_pictures_width: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_width.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_width.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_pictures_width: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_width.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_pictures_width.text", creole.to_doc(:text, @opt))
   end #test_creole_pictures_width
   
 end   #Test_creole_pictures
 
 
 class Test_creole_verbatim < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
   def test_creole_verbatim()
-    creole = Creole.new(  :name => 'creole_verbatim',
+    creole = Docgenerator::Creole::Creole.new(  :name => 'creole_verbatim',
                                   :content => <<creole
 You can use nowiki syntax if you would like do stuff like this:
 
@@ -863,17 +905,17 @@ after
 See [[http://www.wikicreole.org/wiki/PreformattedAndNowiki]]
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_verbatim.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_verbatim.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_verbatim.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_verbatim.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_verbatim: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim.context", creole.to_doc(:context))
     $log.warn('test_creole_verbatim: change < to &lt; ....')
     $log.warn('test_creole_verbatim: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_verbatim.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_verbatim.text", creole.to_doc(:text, @opt))
   end #test_creole_verbatim
   def test_creole_verbatim_inline()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 
 You can also use inline nowiki {{{ in a sentence }}} like this.
 See [[http://www.wikicreole.org/wiki/PreformattedAndNowiki]].
@@ -881,16 +923,16 @@ See [[http://www.wikicreole.org/wiki/PreformattedAndNowiki]].
 Some examples of markup are: {{{** <i>this</i> ** }}}
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_verbatim_inline: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline.context", creole.to_doc(:context))
     $log.warn('test_creole_verbatim_inline: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline.creole", creole.to_doc(:creole))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline.creole", creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline.text", creole.to_doc(:text, @opt))
   end #test_creole_verbatim_inline
   def test_creole_verbatim_inline_at_start()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'verbatim_inline_at_start',
                     :content => <<creole
 Short verbatim can also be at the start:
@@ -899,201 +941,26 @@ Short verbatim can also be at the start:
 This test checks, if the differences of normal verbatim is detected.
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline_at_start.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline_at_start.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline_at_start.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline_at_start.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_verbatim_inline_at_start: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline_at_start.context", creole.to_doc(:context))
     $log.warn('test_creole_verbatim_inline_at_start: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline_at_start.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline_at_start.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_verbatim_inline_at_start: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline_at_start.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_verbatim_inline_at_start.text", creole.to_doc(:text, @opt))
   end #test_creole_verbatim_inline_at_start
   
 end #Test_creole_verbatim
 
-class Test_creole_placeholders < Test::Unit::TestCase
-  def test_creole_placeholders()
-    creole = Creole.new(:content => <<creole
-==Titel 1==
-Text
-creole
-    )
-    assert_equal( Creole::Placeholders, creole.placeholders)
-    assert_equal( Creole_dummy_placeholder, Creole::Placeholders[:undefined])
-    assert_equal( Creole_html, Creole::Placeholders['html'])
-    #~ assert_instance_of( Creole_dummy_placeholder, Creole::Placeholders[:undefined])
-    Creole::Placeholders.each{|key,placeholder_class|
-      assert_equal( placeholder_class, Creole::Placeholders[key])
-      assert_equal( placeholder_class, creole.placeholders[key])
-      
-      placeholder = placeholder_class.new( Creole.new )
-      #Check inheratance.
-      assert_kind_of( Creole_placeholder, placeholder)
-    }
-  end #test_creole_placeholders
-  def test_creole_placeholders_html()
-    creole = Creole.new(:content => <<creole
-before
-<<<html
-<em>this is only for HTML</em>
->>>
-after
-creole
-    )
-    #Really like this? Or should there be no paragraph?
-    assert_equal_filecontent( "expected_creole/test_creole_placeholders_html.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_placeholders_html.latex", creole.to_doc(:latex))
-    $log.warn('test_creole_placeholders_html: to_context')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_placeholders_html.context", creole.to_doc(:context))
-    $log.warn('test_creole_placeholders_html: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_placeholders_html.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_placeholders_html.text", creole.to_doc(:text))
-  end #test_creole_placeholders_html
-  def test_creole_placeholders_latex()
-    creole = Creole.new(:content => <<creole
-before
-<<<latex
-\\textbf{this is only for latex}
->>>
-after
-creole
-    )
-    #Really like this? Or should there be no paragraph?
-    assert_equal_filecontent( "expected_creole/test_creole_placeholders_latex.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_placeholders_latex.latex", creole.to_doc(:latex))
-    $log.warn('test_creole_placeholders_latex: to_context')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_placeholders_context.context", creole.to_doc(:context))
-    $log.warn('test_creole_placeholders_latex: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_placeholders_latex.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_placeholders_latex.text", creole.to_doc(:text))
-  end #test_creole_placeholders_latex
-  
-end   #Test_creole_placeholders
-
-#http://www.wikicreole.org/wiki/Tables
-class Test_creole_tabular < Test::Unit::TestCase
-  def test_creole_tabular_creole()
-    creole = Creole.new(
-                    :name => 'tabular_creole',
-                    :content => <<'creole'
-Tables are done like this:
-|=header col1|=header col2| 
-|col1|col2| 
-|you         |can         | 
-|also        |align\\ it. | 
-creole
-    )
-    $log.warn('test_creole_tabular_creole: tabular inside paragraphs/list...')
-    $log.warn('test_creole_tabular_creole: wiki syntax inside cell ')
-    assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.latex", creole.to_doc(:latex))
-    $log.warn('test_creole_tabular_creole: to_context')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.context", creole.to_doc(:context))
-    $log.warn('test_creole_tabular_creole: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.creole", creole.to_doc(:creole))
-    $log.warn('test_creole_tabular_creole: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_creole.text", creole.to_doc(:text))
-  end #test_creole_tabular_creole
-  
-  def test_creole_tabular()
-    creole = Creole.new(:content => <<creole
-before
-<<<tabular
-|!columns=3
-|!columndescription=ccc
-|=1
-|=2
-|=3
-|-
-|eins
-|zwei
-|drei
-|-
-|one
-|two
-|three
->>>
-after
-creole
-    )
-    assert_equal_filecontent( "expected_creole/test_creole_tabular.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_tabular.latex", creole.to_doc(:latex))
-    $log.warn('test_creole_tabular: to_context')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.context", creole.to_doc(:context))
-    $log.warn('test_creole_tabular: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.creole", creole.to_doc(:creole))
-    $log.warn('test_creole_tabular: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.text", creole.to_doc(:text))
-  end #test_creole_tabular
-
-  def test_creole_tabular_with_cell_option()
-#  title...    
-    creole = Creole.new(:content => <<creole
-before
-<<<tabular
-|!columns=3
-|eins||css=color: red
-|css = zwei
-|||class=empty
-|-
-|normal
-|//italic//
-|//italic//||class=it
-|-
-|text with | nice! ||class = it
-|||css = 
-|
->>>
-after
-creole
-    )
-    assert_equal_filecontent( "expected_creole/test_creole_tabular_with_cell_option.html", creole.to_doc(:html))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_with_option.latex", creole.to_doc(:latex))
-    $log.warn('test_creole_tabular: to_context')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.context", creole.to_doc(:context))
-    $log.warn('test_creole_tabular: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.creole", creole.to_doc(:creole))
-    $log.warn('test_creole_tabular: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular.text", creole.to_doc(:text))
-  end #test_creole_tabular
-
-  def test_creole_tabular_css()
-    creole = Creole.new(:content => <<creole
-before
-<<<tabular
-|!columns=3
-|!columndescription=ccc
-|!css=border-width: 1px
-|!css=border-style: solid
-|=1
-|=2
-|=3
-|-
-|eins
-|zwei
-|drei
-|-
-|one
-|two
-|three
->>>
-after
-creole
-    )
-    assert_equal_filecontent( "expected_creole/test_creole_tabular_css.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_tabular_css.latex", creole.to_doc(:latex))
-    $log.warn('test_creole_tabular_css: to_context')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_css.context", creole.to_doc(:context))
-    $log.warn('test_creole_tabular_css: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_css.creole", creole.to_doc(:creole))
-    $log.warn('test_creole_tabular_css: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_tabular_css.text", creole.to_doc(:text))
-  end #test_creole_tabular_css
-end   #Test_creole_tabular
 
 class Test_creole_footnote < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
   def test_creole_footnotes()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'footnotes',
                     :content => <<creole
 <<footnote|This is a footnote>>
@@ -1101,17 +968,17 @@ class Test_creole_footnote < Test::Unit::TestCase
 <<footnotes>>
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_footnotes.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_footnotes.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_footnotes.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_footnotes.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_footnotes: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes.context", creole.to_doc(:context))
     $log.warn('test_creole_footnotes: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_footnotes: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes.text", creole.to_doc(:text, @opt))
   end #test_creole_footnotes
   def test_creole_footnotes_label()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'footnotes_label',
                     :content => <<creole
 <<footnote|This is a footnote|label=s>>
@@ -1120,16 +987,37 @@ This makes only sense in HTML
 <<footnotes>>
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_footnotes_label.html", creole.to_doc(:html))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_label.latex", creole.to_doc(:latex))
-    $log.warn('test_creole_footnotes_label: to_context')
-    #~ #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_label.context", creole.to_doc(:context))
+    assert_equal_filecontent( "expected_creole/#{__method__}.html", creole.to_doc(:html, @opt))
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.latex", creole.to_doc(:latex, @opt))
+    #~ $log.warn('test_creole_footnotes_label: to_context')
+    #~ #~ assert_equal_filecontent( "expected_creole/#{__method__}.context", creole.to_doc(:context))
     #~ $log.warn('test_creole_footnotes_label: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_label.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.creole", creole.to_doc(:creole, @opt))
     #~ $log.warn('test_creole_footnotes_label: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_label.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.text", creole.to_doc(:text, @opt))
   end #test_creole_footnotes_label
   
+  def test_creole_footnotes_groupid()
+    creole = Docgenerator::Creole::Creole.new(
+                    :name => 'footnotes_group',
+                    :content => <<creole
+Text<<footnote|This is a footnote|>>
+more text<<footnote|This is a footnote in group g1|groupid=g1>>
+----
+<<footnotes>>
+----
+<<footnotes|g1>>
+creole
+    )
+    assert_equal_filecontent( "expected_creole/#{__method__}.html", creole.to_doc(:html, @opt))
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.latex", creole.to_doc(:latex, @opt))
+    #~ $log.warn('test_creole_footnotes_label: to_context')
+    #~ #~ assert_equal_filecontent( "expected_creole/#{__method__}.context", creole.to_doc(:context))
+    #~ $log.warn('test_creole_footnotes_label: to wiki/creole')
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}l.creole", creole.to_doc(:creole, @opt))
+    #~ $log.warn('test_creole_footnotes_label: to text/creole')
+    #~ assert_equal_filecontent( "expected_creole/#{__method__}.text", creole.to_doc(:text, @opt))
+  end #test_creole_footnotes_label
 =begin rdoc
 Footnotes in tabulars don't work.
 =end
@@ -1137,7 +1025,7 @@ Footnotes in tabulars don't work.
     return
     #check for warning?
     
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'footnotes',
                     :content => <<creole
 <<<tabular
@@ -1149,55 +1037,68 @@ Footnotes in tabulars don't work.
 creole
     )  
     $log.warn('test_creole_footnotes_in_tabular: html')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_in_tabular.html", creole.to_doc(:html))
-    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_in_tabular.latex", creole.to_doc(:latex))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_in_tabular.html", creole.to_doc(:html, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_in_tabular.latex", creole.to_doc(:latex, @opt))
     #~ $log.warn('test_creole_footnotes_in_tabular: to_context')
     #~ #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_in_tabular.context", creole.to_doc(:context))
     #~ $log.warn('test_creole_footnotes_in_tabular: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_in_tabular.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_in_tabular.creole", creole.to_doc(:creole, @opt))
     #~ $log.warn('test_creole_footnotes_in_tabular: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_in_tabular.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_footnotes_in_tabular.text", creole.to_doc(:text, @opt))
   end #test_creole_footnotes_in_tabular
 end   #Test_creole_footnote 
 
 class Test_creole_short_html < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
   def test_creole_short_html()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 before
 {{html|<em>this is only for HTML</em>}}
 after
 creole
     )
     #Really like this? Or should there be no paragraph?
-    assert_equal_filecontent( "expected_creole/test_creole_short_html.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_short_html.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_short_html.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_short_html.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_short_html: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_short_html.context", creole.to_doc(:context))
     $log.warn('test_creole_short_html: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_short_html.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_short_html.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_short_html.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_short_html.text", creole.to_doc(:text, @opt))
   end #test_creole_short_html
 end #Test_creole_short_html
 
 
 class Test_creole_characters < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
   def test_creole_characters_all()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'characters_all',
-                    :content => Creole::CHARACTERS.keys.sort.map{|char| "*#{char}" }.join("\n")
+                    #~ :content => Creole::CHARACTERS.keys.sort.map{|char| "*#{char}" }.join("\n")
+                    :content => Docgenerator::Creole::Creole::CHARACTERS.sort.map{|char, o| "* #{o.class}: #{char}"}.join("\n")
     )
-    self.readoption = 'r:utf-8'
-    assert_equal_filecontent( "expected_creole/test_creole_characters_all.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_characters_all.latex", creole.to_doc(:latex))
+    self.readoption = 'r:cp1252'
+    assert_equal_filecontent( "expected_creole/test_creole_characters_all.html", creole.to_doc(:html, @opt))
+    
+    $log.warn('test_creole_characters_all: to_latex Dollar Missing escape mechanism')
+    assert_equal_filecontent( "expected_creole/test_creole_characters_all.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_characters_all: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_characters_all.context", creole.to_doc(:context))
     $log.warn('test_creole_characters_all: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_characters_all.creole", creole.to_doc(:creole))
+    #~ assert_equal(creole.source.join , creole.to_doc(:creole, @opt))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_characters_all.creole", creole.source.join)
+    #~ assert_equal_filecontent( "expected_creole/test_creole_characters_all.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_characters_all: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_characters_all.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_characters_all.text", creole.to_doc(:text, @opt))
   end #test_creole_characters_all  
   def test_creole_characters_special()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'characters_special',
                     :content => <<creole
 Special Characters:
@@ -1208,19 +1109,19 @@ Special Characters:
 *_ Underscore
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_characters_special.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_characters_special.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_characters_special.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_characters_special.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_characters_special: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_characters_special.context", creole.to_doc(:context))
     $log.warn('test_creole_characters_special: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_characters_special.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_characters_special.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_characters_special: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_characters_special.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_characters_special.text", creole.to_doc(:text, @opt))
   end #test_creole_characters_special
 
   #This is also a test for multiple inclusions in one line.
   def test_creole_shy()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'shy',
                     :content => <<creole
 Donau{{shy}}dampf{{shy}}schiff{{shy}}fahrt
@@ -1228,22 +1129,26 @@ Donau{{shy}}dampf{{shy}}schiff{{shy}}fahrt
 Donau{{-}}dampf{{-}}schiff{{-}}fahrt
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_shy.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_shy.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_shy.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_shy.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_shy: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_shy.context", creole.to_doc(:context))
-    assert_equal_filecontent( "expected_creole/test_creole_shy.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_shy.text", creole.to_doc(:text))
+    assert_equal_filecontent( "expected_creole/test_creole_shy.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_shy.text", creole.to_doc(:text, @opt))
   end #test_creole_shy
 
 end   #Test_creole_characters
 
 class Test_creole_inline_ruby < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
   def self.ruby_test()
     return '*hallo welt'
   end  
   def test_creole_inline_ruby_raw()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'inline_ruby_raw',
                     :content => <<creole
 The following Rubycode is added as raw text.
@@ -1252,17 +1157,17 @@ The following Rubycode is added as raw text.
 <<ruby_raw|Test_creole_inline_ruby::ruby_test>>
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_inline_ruby_raw.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_inline_ruby_raw.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_inline_ruby_raw.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_inline_ruby_raw.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_inline_ruby_raw: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_inline_ruby_raw.context", creole.to_doc(:context))
     $log.warn('test_creole_inline_ruby_raw: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_inline_ruby_raw.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_inline_ruby_raw.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_inline_ruby_raw: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_inline_ruby_raw.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_inline_ruby_raw.text", creole.to_doc(:text, @opt))
   end #test_creole_inline_ruby_raw  
   def test_creole_inline_ruby()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'inline_ruby',
                     :content => <<creole
 The following ruby code is added and parsed by the wiki.
@@ -1270,37 +1175,41 @@ The following ruby code is added and parsed by the wiki.
 <<ruby|Test_creole_inline_ruby::ruby_test>>
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_inline_ruby.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_inline_ruby.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_inline_ruby.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_inline_ruby.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_inline_ruby: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_inline_ruby.context", creole.to_doc(:context))
     $log.warn('test_creole_inline_ruby: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_inline_ruby.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_inline_ruby.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_inline_ruby: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_inline_ruby.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_inline_ruby.text", creole.to_doc(:text, @opt))
   end #test_creole_inline_ruby
   def test_creole_countdown()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'countdown',
                     :content => <<creole
 Countdown: <<ruby_raw|(1..10).to_a.reverse.join("-")>>
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_countdown.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_countdown.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_countdown.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_countdown.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_countdown: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_countdown.context", creole.to_doc(:context))
     $log.warn('test_creole_countdown: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_countdown.creole", creole.to_doc(:creole))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_countdown.creole", creole.to_doc(:creole, @opt))
     $log.warn('test_creole_countdown: to text/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_countdown.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_countdown.text", creole.to_doc(:text, @opt))
   end #test_creole_countdown
   
 end   #Test_creole_inline_ruby
 
 class Test_creole_ignore < Test::Unit::TestCase
+  def setup()
+    #Avoid warnings about missing logger in to_doc
+    @opt = { :log => Docgenerator::DOCGENERATOR_DEFAULT_LOGGER }
+  end
   def test_creole_ignore()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'ignore',
                     :ignore => /^#~.*$/,
                     :log => $tmplog,  #catch info about comment
@@ -1310,17 +1219,17 @@ Text
 more text
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_ignore.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_ignore.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_ignore.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_ignore.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_ignore: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_ignore.context", creole.to_doc(:context))
     $log.warn('test_creole_ignore: to wiki/creole')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_ignore.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_ignore.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_ignore.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_ignore.text", creole.to_doc(:text, @opt))
   end #test_creole_ignore
 
   def test_creole_comment()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => 'comment',
                     :content => <<creole
 ==Titel 1==
@@ -1332,13 +1241,13 @@ It's part of the document, but not visible to readers.
 Text after
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_comment.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_comment.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_comment.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_comment.latex", creole.to_doc(:latex, @opt))
     assert_equal_filecontent( "expected_creole/test_creole_comment.context", creole.to_doc(:context))
-    assert_equal_filecontent( "expected_creole/test_creole_comment.creole", creole.to_doc(:creole))
-    #~ assert_raise( RuntimeError ) { creole.to_doc(:text) }
+    assert_equal_filecontent( "expected_creole/test_creole_comment.creole", creole.to_doc(:creole, @opt))
+    #~ assert_raise( RuntimeError ) { creole.to_doc(:text, @opt) }
     $log.warn('test_creole_comment: to text')
-    #~ assert_equal_filecontent( "expected_creole/test_creole_comment.text", creole.to_doc(:text))
+    #~ assert_equal_filecontent( "expected_creole/test_creole_comment.text", creole.to_doc(:text, @opt))
   end #test_creole_comment
   
 end   #Test_creole_ignore
@@ -1349,20 +1258,20 @@ def newtest(text, with_class = false )
     code << "class Test_creole_#{text} < Test::Unit::TestCase\n" if with_class
     code << <<code
   def test_creole_#{text}()
-    creole = Creole.new(
+    creole = Docgenerator::Creole::Creole.new(
                     :name => '#{text}',
                     :content => <<creole
 ==Titel 1==
 Text
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_#{text}.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_#{text}.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_#{text}.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_#{text}.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_#{text}: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_#{text}.context", creole.to_doc(:context))
     $log.warn('test_creole_#{text}: to wiki/creole')
-    assert_equal_filecontent( "expected_creole/test_creole_#{text}.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_#{text}.text", creole.to_doc(:text))
+    assert_equal_filecontent( "expected_creole/test_creole_#{text}.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_#{text}.text", creole.to_doc(:text, @opt))
   end #test_creole_#{text}
 code
   code << "end   #Test_creole_#{text}\n" if with_class
@@ -1390,18 +1299,18 @@ Meine Erweiterungen
 --------------------------------------------
 
 def test_creole_amazon()
-    creole = Creole.new(:content => <<creole
+    creole = Docgenerator::Creole::Creole.new(:content => <<creole
 {{amazon|asin=B000AFEJAM}}
 
 {{amazon|asin=B000AFEJAM|right}}
 creole
     )
-    assert_equal_filecontent( "expected_creole/test_creole_amazon.html", creole.to_doc(:html))
-    assert_equal_filecontent( "expected_creole/test_creole_amazon.latex", creole.to_doc(:latex))
+    assert_equal_filecontent( "expected_creole/test_creole_amazon.html", creole.to_doc(:html, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_amazon.latex", creole.to_doc(:latex, @opt))
     $log.warn('test_creole_amazon: to_context')
     #~ assert_equal_filecontent( "expected_creole/test_creole_amazon.context", creole.to_doc(:context))
-    assert_equal_filecontent( "expected_creole/test_creole_amazon.creole", creole.to_doc(:creole))
-    assert_equal_filecontent( "expected_creole/test_creole_amazon.text", creole.to_doc(:text))
+    assert_equal_filecontent( "expected_creole/test_creole_amazon.creole", creole.to_doc(:creole, @opt))
+    assert_equal_filecontent( "expected_creole/test_creole_amazon.text", creole.to_doc(:text, @opt))
   end
 
 Option :ignore