docgenerator 2.0.0 → 2.1.0

data/lib/docgenerator/tabular.rb

@@ -1,33 +1,29 @@
 #encoding: utf-8
 =begin rdoc
-Definition of tabular elements for DocGenerator.rb
+Definition of tabular elements for docgenerator-gem.
 =end
 
 #
 module Docgenerator
 =begin rdoc
-Definition of tabular elements for DocGenerator.rb
+Definition of tabular elements for docgenerator-gem.
 =end
-module Tables
-#~ if __FILE__ == $0
-	#~ require 'DocGenerator' 
-#~ end
-
-#Define some constants to include packages into document header.
-TEX_PACKAGE_TABULARX	= element(:usepackage,{},'tabularx').cr
-TEX_PACKAGE_LONGTABLE= element(:usepackage,{},'longtable').cr
-TEX_PACKAGE_BOOKTABS	= element(:usepackage,{},'booktabs').cr
+  module Tables
+    #Define some constants to include packages into document header.
+    TEX_PACKAGE_TABULARX	= element(:usepackage,{},'tabularx').cr
+    TEX_PACKAGE_LONGTABLE= element(:usepackage,{},'longtable').cr
+    TEX_PACKAGE_BOOKTABS	= element(:usepackage,{},'booktabs').cr
 
 =begin rdoc
 Environment Table
 =end
-class Table < Environments::Environment
-	add_attributes HTML_ATTR_ALL 
-	add_html_tag 'div'
-	def to_latex( options={} )
-		return to_latex_environment( 'table', nil, options )
-	end
-end
+    class Table < Environments::Environment
+      add_attributes HTML_ATTR_ALL 
+      add_html_tag 'div'
+      def to_latex( options={} )
+        return to_latex_environment( 'table', nil, options )
+      end
+    end
 =begin rdoc
 Tabulars
 
@@ -35,88 +31,108 @@ fixme:  check on attributes. columnsdescription
 ~ :table=> {:border=>nil, :width=>nil, :cellpadding=>nil, :cellspacing=>nil},#complete it
 ~ :colgroup => {}, #comlpete it
 =end
-class Tabular < Element
-	add_attributes HTML_ATTR_ALL
-	#Problem: Nicht weitervererbt
-	add_attribute	:columndescription	,  Attribute.create( [:latex, :required ] ) 
-	add_attribute	:columns			,  Attribute.create( [:required], [ Fixnum ] ) 
-	add_attribute	:border			,  Attribute.create( [:html] ) 
-	add_attribute	:bgcolor			, Attribute.create( [ :html ] )
-	add_attribute	:width			, Attribute.create( [ :html ], [ Integer, String ] )	#String necessary for percentage
-	add_attribute	:frame			, Attribute.create( [ :html ], [ 'box', 'above', 'below', 'hsides', 'vsides', 'lhs', 'rhs' ] )
-	add_attribute	:rules			, Attribute.create( [ :html ], [ 'none', 'rows', 'cols', 'groups', 'all' ] )
-	add_attribute	:height			, Attribute.create( [ :html ], [ Integer ] )
-	add_attribute	:cellspacing		, Attribute.create( [ :html ], [ Integer ] )
-	add_attribute	:cellpadding		, Attribute.create( [ :html ], [ Integer ] )
-	add_attribute	:summary			, Attribute.create( [:html] ) 
-	add_attribute	:align			, HTML_ATTR_ALIGN
-	#Only rows are allowed to be added.
-	#The row get the number of columns.
-	#The row counting does not word, when the row-content is added immediate in element-initialization.
-	def << ( row )
-		#Check on allowed elements for a tabular
-		allowed = false
-		[ :row, :hline, :toprule, :midrule, :bottomrule, :endfirsthead , :endhead , :endfoot, :endlastfoot, 
-			:caption ].each{|el| 
-			if row.is_a?( Element.get(el) )
-				allowed = true
-				break
-			end
-		}
-		if ! allowed
-			@log.warn("Add non-row to tabular (#{row.class})") if @log.warn?
-		end
-		if row.is_a?( Row )
-			row.columns = @attr[:columns].to_s.to_i
-		end
-		@content << row
-	end
-	def to_latex(options={})
-    o = set_option_defaults(options)
-    o[:log].debug("enter to_latex for tabular") if o[:log].debug?
-		cmd	=	''
-		cmd	<<	"\n" if @crbefore
-		cmd	<<	"\\begin{tabular}{"
-		cmd	<<	@attr[:columndescription].content.to_doc(:latex, o)
-		cmd	<<	"}"
-		cmd	<<	"\n" if @crmid
-		cmd	<< @content.to_doc(:latex, o )
-		cmd	<<	"\\end{tabular}"
-		cmd	<<	"\n" if @crafter
-		return cmd
-	end
-  def to_text(options={}); return @content.to_text(options); end
-  def to_wiki(options={}); return "{|\n#{@content.to_wiki(options).strip}\n|}\n"; end
-	def htmltag()
-		return 'table'
-	end
-  def inspect()
-    return "<Class Element(tabular) columns=#{@attr[:columns]}>"
-  end
-end
+    class Tabular < Element
+      add_attributes HTML_ATTR_ALL
+      #Problem: Nicht weitervererbt
+      add_attribute	:columndescription	,  Attribute.create( [:latex, :required ] ) 
+      add_attribute	:columns			,  Attribute.create( [:required], [ Fixnum ] ) 
+      add_attribute	:border			,  Attribute.create( [:html] ) 
+      add_attribute	:bgcolor			, Attribute.create( [ :html ] )
+      add_attribute	:width			, Attribute.create( [ :html ], [ Integer, String ] )	#String necessary for percentage
+      add_attribute	:frame			, Attribute.create( [ :html ], [ 'box', 'above', 'below', 'hsides', 'vsides', 'lhs', 'rhs' ] )
+      add_attribute	:rules			, Attribute.create( [ :html ], [ 'none', 'rows', 'cols', 'groups', 'all' ] )
+      add_attribute	:height			, Attribute.create( [ :html ], [ Integer ] )
+      add_attribute	:cellspacing		, Attribute.create( [ :html ], [ Integer ] )
+      add_attribute	:cellpadding		, Attribute.create( [ :html ], [ Integer ] )
+      add_attribute	:summary			, Attribute.create( [:html] ) 
+      add_attribute	:align			, HTML_ATTR_ALIGN
+=begin rdoc      
+* Only rows are allowed to be added.
+* The row gets the number of columns (attr[:columns])
+* The row counting does not work, when the row-content is added immediate during element-initialization.
+=end
+      def << ( row )
+        #Check on allowed elements for a tabular
+        allowed = false
+        [ :row, :hline, :toprule, :midrule, :bottomrule, :endfirsthead , :endhead , :endfoot, :endlastfoot, 
+          :caption ].each{|el| 
+          if row.is_a?( Element.get(el) )
+            allowed = true
+            break
+          end
+        }
+        if ! allowed
+          @log.warn("Add non-row to tabular (#{row.class})") if @log.warn?
+        end
+        #Add number of expected columns
+        if row.is_a?( Row )
+          row.columns = @attr[:columns].to_s.to_i
+        end
+        @content << row
+      end
+      def to_latex(options={})
+        o = set_option_defaults(options)
+        o[:log].debug("enter to_latex for tabular") if o[:log].debug?
+        cmd	=	''
+        cmd	<<	"\n" if @crbefore
+        cmd	<<	"\\begin{tabular}{"
+        cmd	<<	@attr[:columndescription].content.to_doc(:latex, o)
+        cmd	<<	"}"
+        cmd	<<	"\n" if @crmid
+        cmd	<< @content.to_doc(:latex, o )
+        cmd	<<	"\\end{tabular}"
+        cmd	<<	"\n" if @crafter
+        return cmd
+      end
+      def to_text(options={}); return @content.to_text(options); end
+      def to_wiki(options={}); return "{|\n#{@content.to_wiki(options).strip}\n|}\n"; end
+=begin rdoc  
+Output a complete tabular in wikimedia-like tabular extension for creole.
+=end
+      def to_creole(options={}); 
+        creole = ''
+        creole << "<<<tabular\n"
+        creole << "|!columns=#{@attr[:columns].content.first}\n"   if @attr[:columns].filled?
+        creole << "|!columndescription=%s\n" % @attr[:columndescription].content if @attr[:columndescription].filled?
+        #Add css-components
+        @attr[:style].content.first.to_tab.each{|css|  #loop on Docgenerator::CSS
+          creole << "|!css=%s\n" % css
+        } if @attr[:style].filled?
+        creole << "#{@content.to_creole(options).strip}\n"
+        creole << ">>>\n"
+        return creole
+      end
+      def htmltag()
+        return 'table'
+      end
+      def inspect()
+        return "<Class Element(tabular) columns=#{@attr[:columns]}>"
+      end
+    end #class Tabular
+  
 =begin rdoc
 Use longtable-package.
 
 Requires
 	doc.head	<< element(:usepackage,{},'longtable')
 =end
-class Longtable < Tabular
-	add_attributes Tabular.get_attribute_list( )
-	def to_latex(options={})
-    o = set_option_defaults(options)
-    o[:log].debug("enter to_latex for longtable") if o[:log].debug?
-		cmd	=	''
-		cmd	<<	"\n" if @crbefore
-		cmd	<<	"\\begin{longtable}{"
-		cmd	<<	@attr[:columndescription].content.to_doc(:latex, o)
-		cmd	<<	"}"
-		cmd	<<	"\n" if @crmid
-		cmd	<< @content.to_latex(o)
-		cmd	<<	"\\end{longtable}"
-		cmd	<<	"\n" if @crafter
-		return cmd
-	end
-end
+    class Longtable < Tabular
+      add_attributes Tabular.get_attribute_list( )
+      def to_latex(options={})
+        o = set_option_defaults(options)
+        o[:log].debug("enter to_latex for longtable") if o[:log].debug?
+        cmd	=	''
+        cmd	<<	"\n" if @crbefore
+        cmd	<<	"\\begin{longtable}{"
+        cmd	<<	@attr[:columndescription].content.to_doc(:latex, o)
+        cmd	<<	"}"
+        cmd	<<	"\n" if @crmid
+        cmd	<< @content.to_latex(o)
+        cmd	<<	"\\end{longtable}"
+        cmd	<<	"\n" if @crafter
+        return cmd
+      end
+    end #class Longtable
 =begin rdoc
 Use Tabularx-package.
 
@@ -125,194 +141,195 @@ Requires
 
 fixme :width is obligatory
 =end
-class Tabularx < Tabular
-	#
-	add_attributes Tabular.get_attribute_list( )
-	def to_latex(options={})
-    o = set_option_defaults(options)
-    o[:log].debug("enter to_latex for tabularx") if o[:log].debug?
-		if @attr[:width].content.to_s == ''
-			o[:log].error( "Tabularx: Empty width, set it to \\textwidth" ) if o[:log].error?
-			@attr[:width] << '\\textwidth'
-		end
-		cmd	=	''
-		cmd	<<	"\n" if @crbefore
-		cmd	<<	"\\begin{tabularx}{"
-		cmd	<<	@attr[:width].content.to_s
-		cmd	<<	"}{"
-		cmd	<<	@attr[:columndescription].content.to_s
-		cmd	<<	"}"
-		cmd	<<	"\n" if @crmid
-		cmd	<< @content.to_doc(:latex, o )
-		cmd	<<	"\\end{tabularx}"
-		cmd	<<	"\n" if @crafter
-		return cmd
-	end
-end
+    class Tabularx < Tabular
+      #
+      add_attributes Tabular.get_attribute_list( )
+      def to_latex(options={})
+        o = set_option_defaults(options)
+        o[:log].debug("enter to_latex for tabularx") if o[:log].debug?
+        if @attr[:width].content.to_s == ''
+          o[:log].error( "Tabularx: Empty width, set it to \\textwidth" ) if o[:log].error?
+          @attr[:width] << '\\textwidth'
+        end
+        cmd	=	''
+        cmd	<<	"\n" if @crbefore
+        cmd	<<	"\\begin{tabularx}{"
+        cmd	<<	@attr[:width].content.to_s
+        cmd	<<	"}{"
+        cmd	<<	@attr[:columndescription].content.to_s
+        cmd	<<	"}"
+        cmd	<<	"\n" if @crmid
+        cmd	<< @content.to_doc(:latex, o )
+        cmd	<<	"\\end{tabularx}"
+        cmd	<<	"\n" if @crafter
+        return cmd
+      end
+    end   #class Tabularx
 =begin rdoc
 May only be used insode a tabular. Tabular must set the columns-value. 
 
 If not, zero columns is expected and an error is thrown.
 =end
-class Row < Element
-  add_id :tr
-	#~ :tr	=> {:align=>align},#complete it
-	add_attributes( {
-			:add_vspace	=>  Attribute.create( [:latex] ) ,
-			:bgcolor		=> Attribute.create( [ :html ] ),
-			:width 		=> Attribute.create( [ :html ] ),
-			:height 		=> Attribute.create( [ :html ] ),
-			#fixme
-			#~ :hline			=>  Attribute.create( [:latex], [true, false] ) ,
-		}.update(HTML_ATTR_ALL) ) 
-	def initialize( attr={}, content = nil)
-    super
-    #For Ruby 1.9: Initialize instance variable 
-    @toprule = false
-    @midrule = false
-    @bottomrule = false
-    @endfirsthead = false
-    @endhead = false
-    @endfoot = false
-    @endlastfoot = false
-    @cline = false
-    @cmidrule = false
-    @hline = false
-  end
-	#Set from tabular
-	attr_accessor :columns
-	#Set a line after the row.
-	def hline();		@hline		= element(:hline);		self; end
-	#Set line sequences under the fields
-	def cline( val )
-		@cline = [] if ! defined?( @cline )
-		if ! ( /\A\d+-\d+\z/  =~ val )
-			@log.warn("\\cline with wrong parameter: #{val.inspect}") if @log.warn?
-		end
-		@cline	<< val
-		return self
-	end
-	#Toprule requires booktabs.sty
-	def toprule();		@toprule		= element(:toprule);		self; end
-	#Midrule requires booktabs.sty
-	def midrule();		@midrule		= element(:midrule);		self; end
-	def cmidrule( val )
-		@cmidrule = [] if ! defined?( @cmidrule )
-		if ! ( /\A\d+-\d+\z/  =~ val )
-			@log.warn("\\cmidrule with wrong parameter: #{val.inspect}") if @log.warn?
-		end
-		@cmidrule	<< val
-		return self
-	end
-	
-	#Bottomrule requires booktabs.sty	
-	def bottomrule(); 	@bottomrule	= element(:bottomrule);	self; end
-	#Only inside a longtable
-	def endhead();	@endhead		= element(:endhead);	self; end
-	#Only inside a longtable
-	def endfoot();		@endfoot		= element(:endfoot);		self; end
-	#Only inside a longtable
-	def endfirsthead();	@endfirsthead	= element(:endfirsthead);	self; end
-	#Only inside a longtable
-	def endlastfoot();	@endlastfoot	= element(:endlastfoot);	self; end
-	#Only Colums are allowed to be added.
-	#In combination with longtable, captions are also allowed.
-	def << ( row )
-		#Check on allowed elements inside a row
-		allowed = false
-		[ :col, :multicolumn, :caption].each{|el| 
-			if row.is_a?( Element.get(el) )
-				allowed = true
-				break
-			end
-		}
-		if ! allowed
-			@log.warn("Add non-column to tabular (#{row.class})") if @log.warn?
-		end
-		@content << row
-		#Does not work with multicolumns.
-		if !@columns
-			@log.warn("Add row to tabular with undefined columns number (#{row.inspect})" ) if @log.warn?
-		elsif @content.size > @columns 
-			@log.warn("Tabular with #{@columns} columns get #{@content.size} columns" ) if @log.warn?
-		end
-	end
-  
-	def inspect()
-		return "<Class Row columns=#{@content.size}#{inspect_creation_caller}>"
-	end
-	#Each cell is separated by '&'.
-	def to_latex(options={})
-    o = set_option_defaults(options)
-    o[:log].debug("enter to_latex for row") if o[:log].debug?
-		cmd	=	''
-		cmd	<<	"\n" if @crbefore
-		cmd	<< @content.map{|cell| cell.to_latex(o)}.join(' & ') 
-    #In direct use, one \\ is ok.
-    #In usage in documents, two \\ are needed (-> see unittest )
-    if o[:filename]
-      o[:log].debug("table/row with corresponding file #{o[:filename].inspect}") if o[:log].debug?
-      cmd << Regexp.escape('\\' + '\\')
-    else
-      o[:log].debug("table/row without corresponding file") if o[:log].debug?
-      cmd << Regexp.escape('\\')
-    end
-		cmd	<< "[#{@attr[:add_vspace].content.join}]" if @attr[:add_vspace].content.size > 0
-		cmd	<< @hline.to_latex(o)		if @hline
-		cmd	<< @toprule.to_latex(o)	if @toprule
-		cmd	<< @midrule.to_latex(o)	if @midrule
-		cmd	<< @bottomrule.to_latex(o)	if @bottomrule
-		cmd	<< @endfirsthead.to_latex(o)	if @endfirsthead
-		cmd	<< @endhead.to_latex(o)	if @endhead
-		cmd	<< @endfoot.to_latex(o)	if @endfoot
-		cmd	<< @endlastfoot.to_latex(o)	if @endlastfoot		
-		@cline.each{|cline|	cmd	<< "\\cline{#{cline}}"	} if @cline
-		@cmidrule.each{|cmidrule|	cmd	<< "\\cmidrule{#{cmidrule}}"	} if @cmidrule
-		cmd	<<	"\n" if @crafter
-		return cmd
-	end
-	def htmltag()
-		return 'tr'
-	end
-	def to_html(options={})
-    o = set_option_defaults(options)
-    o[:log].debug("enter to_html for row") if o[:log].debug?
-		cmd	=	''
-		cmd	<<	"\n" if @crbefore
-		cmd	<< '<tr '
-		css = @attr[:style].content[0]
-    o[:log].error( "docgenerator_tabular: style is no CSS #{css.inspect}" ) if css and ! css.is_a?(CSS) and o[:log].error?
-		@attr[:style] << css = CSS.new if ! css		
-    
-		#Doesn't work. Style sheet setting in tr doesn't go to td
-		if @hline
-			css[:border_bottom_style]	= 'solid'  
-			css[:border_bottom_width] = 'medium'  
-		end
-    
-		# cmd	<< @toprule.to_s	if @toprule
-		# cmd	<< @midrule.to_s	if @midrule
-		# cmd	<< @bottomrule.to_s	if @bottomrule
-		# @cline.each{|cline|	cmd	<< "\\cline{#{cline}}"	} if @cline
-		# cmd	<< "[#{@attr[:add_vspace].content.to_s}]" if @attr[:add_vspace].content.size > 0
-		
-		# cmd	<< @endfirsthead.to_s	if @endfirsthead
-		# cmd	<< @endhead.to_s	if @endhead
-		# cmd	<< @endfoot.to_s	if @endfoot
-		# cmd	<< @endlastfoot.to_s	if @endlastfoot		
-		@attr.sort_by{|k,v|	 v.sortkey }.each{|k,v|
-			cmd << "#{k} = \"#{v}\" " if v.to_s != '' and v.html?
-		}
-		cmd	<< '>'
-		cmd	<< "#{@content.to_html(o)}"
-		cmd	<< "\n" if @crmid
-		cmd	<< '</tr>'
-		cmd	<<	"\n" if @crafter
-		return cmd
-	end
-  def to_text(options={}); return "#{@content.to_text(options).strip}\n"; end
-  def to_wiki(options={}); return "\n|-\n#{@content.to_wiki(options).strip}"; end
-end #Row
+    class Row < Element
+      add_id :tr
+      #~ :tr	=> {:align=>align},#complete it
+      add_attributes( {
+          :add_vspace	=>  Attribute.create( [:latex] ) ,
+          :bgcolor		=> Attribute.create( [ :html ] ),
+          :width 		=> Attribute.create( [ :html ] ),
+          :height 		=> Attribute.create( [ :html ] ),
+          #fixme
+          #~ :hline			=>  Attribute.create( [:latex], [true, false] ) ,
+        }.update(HTML_ATTR_ALL) ) 
+      def initialize( attr={}, content = nil)
+        super
+        #For Ruby 1.9: Initialize instance variable 
+        @toprule = false
+        @midrule = false
+        @bottomrule = false
+        @endfirsthead = false
+        @endhead = false
+        @endfoot = false
+        @endlastfoot = false
+        @cline = false
+        @cmidrule = false
+        @hline = false
+      end
+      #Set from tabular
+      attr_accessor :columns
+      #Set a line after the row.
+      def hline();		@hline		= element(:hline);		self; end
+      #Set line sequences under the fields
+      def cline( val )
+        @cline = [] if ! defined?( @cline )
+        if ! ( /\A\d+-\d+\z/  =~ val )
+          @log.warn("\\cline with wrong parameter: #{val.inspect}") if @log.warn?
+        end
+        @cline	<< val
+        return self
+      end
+      #Toprule requires booktabs.sty
+      def toprule();		@toprule		= element(:toprule);		self; end
+      #Midrule requires booktabs.sty
+      def midrule();		@midrule		= element(:midrule);		self; end
+      def cmidrule( val )
+        @cmidrule = [] if ! defined?( @cmidrule )
+        if ! ( /\A\d+-\d+\z/  =~ val )
+          @log.warn("\\cmidrule with wrong parameter: #{val.inspect}") if @log.warn?
+        end
+        @cmidrule	<< val
+        return self
+      end
+      
+      #Bottomrule requires booktabs.sty	
+      def bottomrule(); 	@bottomrule	= element(:bottomrule);	self; end
+      #Only inside a longtable
+      def endhead();	@endhead		= element(:endhead);	self; end
+      #Only inside a longtable
+      def endfoot();		@endfoot		= element(:endfoot);		self; end
+      #Only inside a longtable
+      def endfirsthead();	@endfirsthead	= element(:endfirsthead);	self; end
+      #Only inside a longtable
+      def endlastfoot();	@endlastfoot	= element(:endlastfoot);	self; end
+      #Only Colums are allowed to be added.
+      #In combination with longtable, captions are also allowed.
+      def << ( row )
+        #Check on allowed elements inside a row
+        allowed = false
+        [ :col, :multicolumn, :caption].each{|el| 
+          if row.is_a?( Element.get(el) )
+            allowed = true
+            break
+          end
+        }
+        if ! allowed
+          @log.warn("Add non-column to tabular (#{row.class})") if @log.warn?
+        end
+        @content << row
+        #Does not work with multicolumns.
+        if !@columns
+          @log.warn("Add row to tabular with undefined columns number (#{row.inspect})" ) if @log.warn?
+        elsif @content.size > @columns 
+          @log.warn("Tabular with #{@columns} columns get #{@content.size} columns" ) if @log.warn?
+        end
+      end
+      
+      def inspect()
+        return "<Class Row columns=#{@content.size}#{inspect_creation_caller}>"
+      end
+      #Each cell is separated by '&'.
+      def to_latex(options={})
+        o = set_option_defaults(options)
+        o[:log].debug("enter to_latex for row") if o[:log].debug?
+        cmd	=	''
+        cmd	<<	"\n" if @crbefore
+        cmd	<< @content.map{|cell| cell.to_latex(o)}.join(' & ') 
+        #In direct use, one \\ is ok.
+        #In usage in documents, two \\ are needed (-> see unittest )
+        if o[:filename]
+          o[:log].debug("table/row with corresponding file #{o[:filename].inspect}") if o[:log].debug?
+          cmd << Regexp.escape('\\' + '\\')
+        else
+          o[:log].debug("table/row without corresponding file") if o[:log].debug?
+          cmd << Regexp.escape('\\')
+        end
+        cmd	<< "[#{@attr[:add_vspace].content.join}]" if @attr[:add_vspace].content.size > 0
+        cmd	<< @hline.to_latex(o)		if @hline
+        cmd	<< @toprule.to_latex(o)	if @toprule
+        cmd	<< @midrule.to_latex(o)	if @midrule
+        cmd	<< @bottomrule.to_latex(o)	if @bottomrule
+        cmd	<< @endfirsthead.to_latex(o)	if @endfirsthead
+        cmd	<< @endhead.to_latex(o)	if @endhead
+        cmd	<< @endfoot.to_latex(o)	if @endfoot
+        cmd	<< @endlastfoot.to_latex(o)	if @endlastfoot		
+        @cline.each{|cline|	cmd	<< "\\cline{#{cline}}"	} if @cline
+        @cmidrule.each{|cmidrule|	cmd	<< "\\cmidrule{#{cmidrule}}"	} if @cmidrule
+        cmd	<<	"\n" if @crafter
+        return cmd
+      end
+      def htmltag()
+        return 'tr'
+      end
+      def to_html(options={})
+        o = set_option_defaults(options)
+        o[:log].debug("enter to_html for row") if o[:log].debug?
+        cmd	=	''
+        cmd	<<	"\n" if @crbefore
+        cmd	<< '<tr '
+        css = @attr[:style].content[0]
+        o[:log].error( "docgenerator_tabular: style is no CSS #{css.inspect}" ) if css and ! css.is_a?(CSS) and o[:log].error?
+        @attr[:style] << css = CSS.new if ! css		
+        
+        #Doesn't work. Style sheet setting in tr doesn't go to td
+        if @hline
+          css[:border_bottom_style]	= 'solid'  
+          css[:border_bottom_width] = 'medium'  
+        end
+        
+        # cmd	<< @toprule.to_s	if @toprule
+        # cmd	<< @midrule.to_s	if @midrule
+        # cmd	<< @bottomrule.to_s	if @bottomrule
+        # @cline.each{|cline|	cmd	<< "\\cline{#{cline}}"	} if @cline
+        # cmd	<< "[#{@attr[:add_vspace].content.to_s}]" if @attr[:add_vspace].content.size > 0
+        
+        # cmd	<< @endfirsthead.to_s	if @endfirsthead
+        # cmd	<< @endhead.to_s	if @endhead
+        # cmd	<< @endfoot.to_s	if @endfoot
+        # cmd	<< @endlastfoot.to_s	if @endlastfoot		
+        @attr.sort_by{|k,v|	 v.sortkey }.each{|k,v|
+          cmd << "#{k} = \"#{v}\" " if v.to_s != '' and v.html?
+        }
+        cmd	<< '>'
+        cmd	<< "#{@content.to_html(o)}"
+        cmd	<< "\n" if @crmid
+        cmd	<< '</tr>'
+        cmd	<<	"\n" if @crafter
+        return cmd
+      end
+      def to_text(options={}); return "#{@content.to_text(options).strip}\n"; end
+      def to_wiki(options={}); return "\n|-\n#{@content.to_wiki(options).strip}"; end
+      def to_creole(options={}); return "\n|-\n#{@content.to_creole(options).strip}"; end
+    end #Row
 
 =begin rdoc
 Define Element :hline
@@ -323,10 +340,10 @@ or
   Hline.new( [ attributes, [content]] )
 Attributes are not defined for this element.
 =end
-class Hline < Element
-  has_no_content false
-  add_latex_output '\hline '
-end #Hline
+    class Hline < Element
+      has_no_content false
+      add_latex_output '\hline '
+    end #Hline
 
 =begin rdoc
 Define Element :toprule
@@ -337,10 +354,10 @@ or
   Toprule.new( [ attributes, [content]] )
 Attributes are not defined for this element.
 =end
-class Toprule < Element
-  has_no_content false
-  add_latex_output '\toprule'
-end #Toprule
+    class Toprule < Element
+      has_no_content false
+      add_latex_output '\toprule'
+    end #Toprule
 
 =begin rdoc
 Define Element :midrule
@@ -351,10 +368,10 @@ or
   Midrule.new( [ attributes, [content]] )
 Attributes are not defined for this element.
 =end
-class Midrule < Element
-  has_no_content false
-  add_latex_output '\midrule '
-end #Midrule
+    class Midrule < Element
+      has_no_content false
+      add_latex_output '\midrule '
+    end #Midrule
 
 =begin rdoc
 Define Element :bottomrule
@@ -365,10 +382,10 @@ or
   Bottomrule.new( [ attributes, [content]] )
 Attributes are not defined for this element.
 =end
-class Bottomrule < Element
-  has_no_content false
-  add_latex_output '\bottomrule '
-end #Bottomrule
+    class Bottomrule < Element
+      has_no_content false
+      add_latex_output '\bottomrule '
+    end #Bottomrule
 
 =begin rdoc
 Define Element :endfirsthead
@@ -379,10 +396,10 @@ or
   Endfirsthead.new( [ attributes, [content]] )
 Attributes are not defined for this element.
 =end
-class Endfirsthead < Element
-  has_no_content false
-  add_latex_output '\endfirsthead '
-end #Endfirsthead
+    class Endfirsthead < Element
+      has_no_content false
+      add_latex_output '\endfirsthead '
+    end #Endfirsthead
 
 =begin rdoc
 Define Element :endhead
@@ -393,10 +410,10 @@ or
   Endhead.new( [ attributes, [content]] )
 Attributes are not defined for this element.
 =end
-class Endhead < Element
-  has_no_content false
-  add_latex_output '\endhead '
-end #Endhead
+    class Endhead < Element
+      has_no_content false
+      add_latex_output '\endhead '
+    end #Endhead
 
 =begin rdoc
 Define Element :endfoot
@@ -407,12 +424,12 @@ or
   Endfoot.new( [ attributes, [content]] )
 Attributes are not defined for this element.
 =end
-class Endfoot < Element
-  has_no_content false
-  add_html_tag nil
-  add_latex_output '\endfoot '
-  
-end #Endfoot
+    class Endfoot < Element
+      has_no_content false
+      add_html_tag nil
+      add_latex_output '\endfoot '
+      
+    end #Endfoot
 
 =begin rdoc
 Define Element :endlastfoot
@@ -423,111 +440,157 @@ or
   Endlastfoot.new( [ attributes, [content]] )
 Attributes are not defined for this element.
 =end
-class Endlastfoot < Element
-  has_no_content false
-  add_html_tag nil
-  add_latex_output '\endlastfoot '
-end #Endlastfoot
+    class Endlastfoot < Element
+      has_no_content false
+      add_html_tag nil
+      add_latex_output '\endlastfoot '
+    end #Endlastfoot
 
 =begin rdoc
 A column in a tabular.
+
+
 =end
-class Column < Element
-  has_no_content :empty_ok
+    class Column < Element
+      has_no_content :empty_ok
 
-  add_id :col
-  add_id :td
-	add_attributes HTML_ATTR_ALL
-	
-#~ :th	=> {:colspan => nil, :rowspan => nil, :align=>align, :valign=>valign, :border=>nil, :width=>nil},#complete it
-	add_attribute	:width 	, Attribute.create( [ :html ] )
-	add_attribute	:height 		, Attribute.create( [ :html ] )
-	add_attribute	:align 	, HTML_ATTR_ALIGN
-	add_attribute	:bgcolor	, Attribute.create( [ :html ] )
-  
-	def to_latex(options={})
-    o = set_option_defaults(options)
-    o[:log].debug("enter to_latex for column") if o[:log].debug?
-		cmd	=	''
-		cmd	<<	"\n" if @crbefore
-		cmd	<<	"#{@content.to_latex(o)}"
-		cmd	<<	"\n" if @crafter
-		return cmd
-	end
-	def content?; :empty_ok; end
-	def htmltag()
-		return 'td'
-	end
-  def to_text(options={}); return "#{@content.to_text(options).strip}\n"; end
-  def to_wiki(options={}); return "|#{@content.to_wiki(options).strip}\n"; end
-	def inspect()
-		return "<Class Column @content=#{@content.inspect}>"
-	end
-end #Columns
+      add_id :col
+      add_id :td
+      add_attributes HTML_ATTR_ALL
+      
+    #~ :th	=> {:colspan => nil, :rowspan => nil, :align=>align, :valign=>valign, :border=>nil, :width=>nil},#complete it
+      add_attribute	:width 	, Attribute.create( [ :html ] )
+      add_attribute	:height 		, Attribute.create( [ :html ] )
+      add_attribute	:align 	, HTML_ATTR_ALIGN
+      add_attribute	:bgcolor	, Attribute.create( [ :html ] )
+      
+      def to_latex(options={})
+        o = set_option_defaults(options)
+        o[:log].debug("enter to_latex for column") if o[:log].debug?
+        cmd	=	''
+        cmd	<<	"\n" if @crbefore
+        cmd	<<	"#{@content.to_latex(o)}"
+        cmd	<<	"\n" if @crafter
+        return cmd
+      end
+      def content?; :empty_ok; end
+      def htmltag()
+        return 'td'
+      end
+      def to_text(options={}); return "#{@content.to_text(options).strip}\n"; end
+      def to_wiki(options={}); return "|#{@content.to_wiki(options).strip}\n"; end
+=begin rdoc
+Create a tabular-cell in creole.
+
+This implements the docgenerator specific tabular version similar to wikimedia-syntax.
+=end
+      def to_creole(options={})
+        o = set_option_defaults(options)
+        o[:log].debug("enter to_creole for column") if o[:log].debug?
+        result = "|"
+        result << "#{@content.to_creole(options).strip}"
+        if result.gsub!("\n", ' ')
+          o[:log].warn("Tabular cell contained newline") if o[:log].warn?
+        end
+        
+        result << "||"  #separator between content and options
+        #Attach options
+        @attr.each{|attr_key, attr|
+          next unless attr.filled?  #ignore empty attributes
+          case attr_key
+            when :style
+              result << "css=#{attr.content.join}|"
+            when :class
+              result << "class=#{attr.content.join}|"
+            when :title
+              result << "title=#{attr.content.join}|"
+            when :columns ##from multicolumns
+            else
+              #~ p attr_key
+              o[:log].debug("unsupported attribute #{attr_key} in to_creole for column") if o[:log].debug?
+            end
+        }
+        result << "\n"
+        result.sub!(/\|\|\n/, "\n") #remove options separator, if no options available
+        return result 
+      end
+      def inspect()
+        return "<Class Column @content=#{@content.inspect}>"
+      end
+    end #Columns
 =begin rdoc
 Header cell (only for HTML)
 =end
-class Column_th < Column
-	add_id :th
-	add_html_tag 'th'
-end
+    class Column_th < Column
+      add_id :th
+      add_html_tag 'th'
+    end
 =begin rdoc
 Multicolumn 
 =end
-class Multicolumn < Column
-  has_no_content :empty_ok
+    class Multicolumn < Column
+      has_no_content :empty_ok
 
-#~ add_attributes( HTML_ATTR_ALL ) 
-	add_attributes( { 
-		#~ :columns	=>  Attribute.create( [:required], [ Fixnum ] ) ,	#colspan
-		:colspan	=> 	Attribute.create( [:required, :html, :latex], [ Fixnum ], 2 ) ,
-		:columns => :colspan,
-		:rowspan	=> 	Attribute.create( [:html ], [ Fixnum ], 2 ),
-		:pos		=>  Attribute.create( [:latex] ) ,
-		:align	=>  HTML_ATTR_ALIGN,
-		:width 	=> Attribute.create( [ :html ] ),
-		:height 	=> Attribute.create( [ :html ] ),
-	}.update( HTML_ATTR_ALL ) ) 
-	def to_latex(options={})
-    o = set_option_defaults(options)
-    o[:log].debug("enter to_latex for multicolumn") if o[:log].debug?
-		cmd	=	''
-		cmd	<<	"\n" if @crbefore
-		cmd	<< 	"\\multicolumn{#{@attr[:colspan]}}{#{@attr[:pos]}}{#{@content.to_latex(o)}}"
-		cmd	<<	"\n" if @crafter
-		return cmd
-	end
-  #add_html_output -> like Column, :colspan is obligatory
-  def to_text(options={}); return "#{@content.to_text(options).strip}\n"; end
-  def to_wiki(options={}); return "|columns=#{@attr[:colspan]}|pos=#{@attr[:pos]}||#{@content.to_wiki(options).strip}\n"; end
-  
-  #
-	def inspect()
-		return "<Class Multicolumn @content=#{@content.inspect}>"
-	end
-end
+    #~ add_attributes( HTML_ATTR_ALL ) 
+      add_attributes( { 
+        #~ :columns	=>  Attribute.create( [:required], [ Fixnum ] ) ,	#colspan
+        :colspan	=> 	Attribute.create( [:required, :html, :latex], [ Fixnum ], 2 ) ,
+        :columns => :colspan,
+        :rowspan	=> 	Attribute.create( [:html ], [ Fixnum ], 2 ),
+        :pos		=>  Attribute.create( [:latex] ) ,
+        :align	=>  HTML_ATTR_ALIGN,
+        :width 	=> Attribute.create( [ :html ] ),
+        :height 	=> Attribute.create( [ :html ] ),
+      }.update( HTML_ATTR_ALL ) ) 
+      def to_latex(options={})
+        o = set_option_defaults(options)
+        o[:log].debug("enter to_latex for multicolumn") if o[:log].debug?
+        o[:log].warn("multicolumn without latex-position") unless @attr[:pos].filled?
+        cmd	=	''
+        cmd	<<	"\n" if @crbefore
+        cmd	<< 	"\\multicolumn{#{@attr[:colspan]}}{#{@attr[:pos]}}{#{@content.to_latex(o)}}"
+        cmd	<<	"\n" if @crafter
+        return cmd
+      end
+      #add_html_output -> like Column, :colspan is obligatory
+      def to_text(options={}); return "#{@content.to_text(options).strip}\n"; end
+      def to_wiki(options={}); return "|columns=#{@attr[:colspan]}|pos=#{@attr[:pos]}||#{@content.to_wiki(options).strip}\n"; end
+      def to_creole(options={}); 
+        #~ o = set_option_defaults(options)
+        col = super.strip
+        col << "||columns=#{@attr[:colspan]}"
+        col << "|pos=#{@attr[:pos]}"  if @attr[:pos].filled?
+        col << "\n"
+        return col
+      end
+      
+      #
+      def inspect()
+        return "<Class Multicolumn @content=#{@content.inspect}>"
+      end
+    end
 
-class Caption < Element
-	#
-	add_attribute :optional, Attribute.create( [ :latex ] )
-  
-	def to_latex(options= {})
-		cmd	=	''
-		cmd	<<	"\n" if @crbefore
-		cmd	<<	"\\caption"
-		if @attr[:optional].content != []
-			cmd	<<	"["
-			cmd	<<	@attr[:optional].content.to_s
-			cmd	<<	"]"
-			cmd	<<	"\n\t" if @crmid
-		end
-		cmd	<<	"{"
-		cmd	<< @content.to_s
-		cmd	<<	"}"
-		cmd	<<	"\n" if @crafter
-		return cmd
-	end
-end
+    class Caption < Element
+      #
+      add_attribute :optional, Attribute.create( [ :latex ] )
+      
+      def to_latex(options= {})
+        cmd	=	''
+        cmd	<<	"\n" if @crbefore
+        cmd	<<	"\\caption"
+        if @attr[:optional].content != []
+          cmd	<<	"["
+          cmd	<<	@attr[:optional].content.to_s
+          cmd	<<	"]"
+          cmd	<<	"\n\t" if @crmid
+        end
+        cmd	<<	"{"
+        cmd	<< @content.to_latex(options)
+        cmd	<<	"}"
+        cmd	<<	"\n" if @crafter
+        return cmd
+      end
+    end #class Caption
 
-end #module Tab
+  end #module Tab
 end #module Docgenerator