docgenerator 1.2.1 → 2.0.0

data/lib/docgenerator/element_meta.rb

@@ -0,0 +1,303 @@
+module Docgenerator   
+=begin rdoc
+===Meta-methods
+The Element-class contains meta functions to define the
+behaviour of subclasses.
+
+Details see
+* Element.inherited
+* Element.add_id
+* Element.has_no_content
+* Element.add_attribute
+* Element.add_attributes
+* Element.add_output
+  * Element.add_latex_output
+  * Element.add_html_output
+  * Element.add_context_output
+  * Element.add_creole_output
+  * Element.add_wiki_output
+  * Element.add_text_output
+=end
+class Element
+  
+  #Hash with all ids and their corresponding classes.
+  @@ids = Hash.new( )
+  
+=begin rdoc
+Meta-class for metaprogramming
+=end
+  class << self #Meta-class Element
+=begin rdoc
+This method is called, when a subclass of this class is defined.
+
+The class will be added to the element list with class name, converted to a symbol 
+(modules are extracted in adcance).
+The element ma be created with element-method.
+=end
+  def inherited( subclass )
+    DOCGENERATOR_LOGGER.info("New Element class: #{subclass}") if DOCGENERATOR_LOGGER.debug?
+    if subclass.name
+      subclass.add_id(subclass.name.split('::').last.downcase.to_sym)
+    else
+      DOCGENERATOR_LOGGER.warn("New Element class without name: #{subclass}") if DOCGENERATOR_LOGGER.warn?
+    end
+  end
+=begin rdoc
+Define meta/class accessor to element_ids.
+
+@element_ids isd defined in Element.add_id
+
+=end
+  def element_ids; @element_ids; end
+=begin rdoc
+Add a new element class or assign another name (synonym) for a class.
+The initial call is made by Element.inherited.
+=end
+  def add_id(id)
+    @element_ids ||= []
+    if @@ids[ id ] == nil
+      DOCGENERATOR_LOGGER.debug("Element id '#{id}' is new for #{self}") if DOCGENERATOR_LOGGER.debug?
+      #All new ids are collected
+      @@ids[ id ] = self
+      @element_ids << id
+    elsif  @@ids[ id ] == self
+      DOCGENERATOR_LOGGER.warn("Element class '#{id}' is defined double: #{self}") if DOCGENERATOR_LOGGER.warn?
+    else
+      DOCGENERATOR_LOGGER.error("Error: ID '#{id}' is redefined #{@@ids[id]} -> #{self}") if DOCGENERATOR_LOGGER.error?
+      @@ids[id] = self
+      @element_ids << id
+    end
+  end
+  #Return a element class.
+  def get( name )
+    return @@ids[name]
+  end
+
+=begin rdoc
+Set flag, that the element does not support content.
+
+See also Docgenerator::Element#content?
+=end
+    def has_no_content(value = nil)
+      self.class_eval( "def content?(); #{value.inspect}; end" )
+    end
+    
+=begin rdoc
+Add a attribute to the metaclass
+
+Example:
+  class XX < Element
+    add_attribute :key, Attribute.create( ... )
+      }
+  end
+=end
+    def add_attribute(id, attribute)
+      @attr = {} unless @attr
+      #~ if ! attribute.is_a?(Attribute)
+      #~ DOCGENERATOR_LOGGER.error("Attribute #{id} is no Docgenerator::Attribute but #{attribute.inspect}") if DOCGENERATOR_LOGGER.error?
+      #~ end
+      @attr[id] = attribute
+    end
+=begin rdoc  
+Add possible attributes to an element class.
+
+Attributes are defined in a hash, each key get a Attribute-instance.
+
+Example:
+  class XX < Element
+    add_attributes { 
+        :key => Attribute.create( ... ),
+      }
+  end
+=end
+  def add_attributes( attr )
+    attr.each{ |k,a |
+      self.add_attribute(k,a)
+    }
+  end    
+=begin rdoc
+Return the attributes for the metaclass.
+=end
+    def attributes()
+      @attr || {}
+    end
+
+=begin rdoc
+Returns list of attributes.
+Can be used for copying attributes from one class to another class.
+=end
+  def get_attribute_list()
+    return self.attributes
+  end
+  
+=begin rdoc
+Add an output routine.
+
+Called by
+* add_latex_output
+* add_context_output
+* add_html_output
+* add_text_output
+* add_wiki_output
+* add_creole_output
+
+The definition can be made in two ways:
+* block
+* result string
+
+
+For very complex elements, it may be better to 
+use the block variant or to redefine to_latex, to_html ...
+
+
+=Definition with block
+Example:
+  add_output(:latex) {|options = {}|
+      o = set_option_defaults(options) #define logger
+      o[:log].debug("enter to_doc(#{target}) for #{self.inspect}") if o[:log].debug?
+      ...
+    }
+
+The block must contain one optional parameter (default {}).
+
+
+=Definition with result string
+Example:
+  add_output( :latex, '\section{#{@content}}' )
+  
+The string contains the result.
+The string will be interpreted, when the to_xxxx method is called.
+
+Examples for string:
+  '#{linebreak(@crbefore)}\section{#{@content}}#{linebreak(@crafter)}'
+
+=Some special helper to build the result:
+==linebreaks 
+linebreak(xx) will create a #linebreak, when xx is true. 
+xx may be @crbefore, @crmid, @crafter.
+The variables can be influenced by #cr, #Cr, #cR, #CR.
+
+==recursive content
+'@content}' will be replaced by '@content.to_doc( _target_ , o)}'
+
+* If you define something like @content.to_html..., please give attention for the options.
+
+==Attributes
+Attributes can be accessed with @attr[:key]  
+
+===Key-val attributes
+#texkeyval add all attributes with flag :texkeyval. (see Attribute#texkeyval?)
+
+=end
+  def add_output( target, string = nil, &proc )
+    
+    if ! [ :latex, :context, :html, :text, :wiki, :creole ].include?(target)
+      DOCGENERATOR_LOGGER.error("#{self}: Undefined target format #{target}") if DOCGENERATOR_LOGGER.error?
+    end
+    
+    if block_given?
+      if string
+        DOCGENERATOR_LOGGER.error("add_output #{target} contains result string and block. Use the block definietion #{self.inspect}") if DOCGENERATOR_LOGGER.error?
+      end
+      #The (optional) parameter should be {} by default.
+      if proc.respond_to?(:parameters) #since ruby 1.9.2
+        if proc.parameters.size != 1  #Proc#parameters introduced with ruby 1.9.2
+          DOCGENERATOR_LOGGER.error("add_output #{target}: Arity of block not 1 but #{proc.parameters.inspect} #{self.inspect}") if DOCGENERATOR_LOGGER.error?
+        elsif proc.parameters.first.first != :opt
+          DOCGENERATOR_LOGGER.error("add_output #{target}: Block parameter is not optional #{proc.parameters.inspect} #{self.inspect}") if DOCGENERATOR_LOGGER.error?
+          #the optional parameter should have the default {}
+          #no way to test it, see http://forum.ruby-portal.de/viewtopic.php?f=22&t=12384
+        end
+      else  #Proc#parameters not supported
+        if proc.arity > 1  #makes arity 0 also for optional parameters.
+          DOCGENERATOR_LOGGER.error("add_output #{target}: Arity of block not 1 but #{proc.arity} #{self.inspect}") if DOCGENERATOR_LOGGER.error?
+        end
+      end
+      #Define the method.
+      define_method( "to_#{target}".to_sym, &proc )
+    else      #block_given?
+=begin
+Define the output routine, based on a string.
+=end
+      if ! string.kind_of?( String )
+        DOCGENERATOR_LOGGER.error("<#{self.inspect}>#add_output: #{string.inspect} is no String")
+      end
+      cmd = <<-code
+      def to_#{target}(options = {})
+        o = set_option_defaults(options)
+        o[:log].debug("enter to_doc(#{target}) for #{self.inspect}, options: \#{options.keys.inspect}") if o[:log].debug?
+      code
+      template = string.gsub(/\\/, '\\\\\\')
+      template.gsub!(/"/, '\"')
+      #define recursive to_doc for content.
+      #the closing \} is important. Else you replace '@content.to_latex' with @content.to_doc.to_latex'
+      template.gsub!(/@content\}/, "@content.to_doc(#{target.inspect}, o)}")
+      cmd << "    \"#{template}\"\n"
+      cmd << "end\n"
+      class_eval( cmd )
+      cmd #return cmd for unit test
+    end #block_given? 
+  end
+=begin rdoc
+Define the HTML-tag for the to_html method.
+=end
+  def add_html_tag( tag )
+    self.class_eval( "def htmltag()\n'#{tag}'\nend" )
+  end
+=begin rdoc
+Define the output routine for html.
+See Element.add_output for details.
+=end
+  def add_html_output( output = nil, &cmd )
+    self.add_output(:html, output, &cmd )
+  end
+=begin rdoc
+Define the output routine for LaTeX.
+See Element.add_output for details.
+=end
+  def add_latex_output( output = nil, &cmd )
+    self.add_output(:latex, output, &cmd )
+  end
+=begin rdoc
+Define the output routine for conTeXt.
+See Element.add_output for details.
+=end
+  def add_context_output( output = nil, &cmd )
+    self.add_output(:context, output, &cmd )
+  end
+=begin rdoc
+Define the output routine for text.
+See Element.add_output for details.
+=end
+  def add_text_output( output = nil, &cmd )
+    self.add_output(:text, output, &cmd )
+  end
+=begin rdoc
+Define the output routine for wiki.
+See Element.add_output for details.
+=end
+  def add_wiki_output( output = nil, &cmd )
+    self.add_output(:wiki, output, &cmd )
+  end
+=begin rdoc
+Define the output routine for creole.
+See Element.add_output for details.
+=end
+  def add_creole_output( output = nil, &cmd )
+    self.add_output(:creole, output, &cmd )
+  end
+  
+end #Meta-class Element
+
+=begin rdoc  
+Return all id's of the class.
+The ids are filled via Element.add_id
+=end
+  def element_ids()
+    #~ myids = []
+    #~ @@ids.each{|k,v| myids << k if v == self.class and k.class != Class }
+    return self.class.element_ids
+  end
+
+end #Element
+end #Docgenerator

data/lib/docgenerator/elements.rb

@@ -1,74 +1,107 @@
-#~ @attr  = {:short=> 1}
-#~ puts "\title#{"[#{@attr[:short]}]" if @attr[:short]}"
-#~ __END__
+=begin rdoc
+Definition of basic elements for docgenerator.rb
+=end
 
 #
-#Definition of elements for DocGenerator.rb
-#
-#
+module Docgenerator 
+=begin rdoc
+Module to collect subclasses of class Element
+=end
+module Elements
 
 #
 #Main document control.
 #
-Element.create( [:head], {}, true, 
-  {  :htmltag => 'head',
-    :latex  => '#{@content}',
-    :context  => '#{@content}',
-    :text    => '#{@content}',
-    :wiki    => '#{@content}',
-    :creole   => '#{@content}',
-  } )
-Element.create( [:body],  {
-    :bgcolor  => Attribute.create( [ :html ] ),
-    :text    => Attribute.create( [ :html ] ),
-    :link    => Attribute.create( [ :html ] ),
-    :vlink  => Attribute.create( [ :html ] ),
-    :alink  => Attribute.create( [ :html ] ),
-  }.update(HTML_ATTR_CORE.dup.update(HTML_ATTR_I18N)),
-  true, 
-  {  :htmltag  => 'body',
-    :latex  => '#{@content}',
-    :context => '#{@content}',
-    :text    => '#{@content}',
-    :wiki    => '#{@content}',
-    :creole    => '#{@content}',
-  } )
-
-Element.create( [:latexdummy, :latexonly ], {},true, 
-  {  :htmltag  => nil,
-    :html  => '',
-    :latex  => '#{@content}',
-    :context  => '',
-  } )
-Element.create( [:htmldummy, :htmlonly ], {},true, 
-  {  :html  => '#{@content}',
-    :latex  => '',
-    :context  => '',
-  } )
+
+=begin rdoc
+Define Element ':head'
+
+Create an instance with
+  element( :head, [ attributes, [content]] )
+  
+  Head.new( [ attributes, [content]] )
+=end
+class Head < Element
+  add_html_tag 'head'
+  add_latex_output '#{@content}'
+  add_context_output '#{@content}'
+  add_text_output '#{@content}'
+  add_wiki_output '#{@content}'
+  add_creole_output '#{@content}'
+end #Head
+
+=begin rdoc
+Define Docgenerator::Element ':body'
+=end
+class Body < Element
+  add_attributes HTML_ATTR_CORE
+  add_attributes HTML_ATTR_I18N
+  add_attribute :lang, ATTR_LANG
+  add_attribute :bgcolor, Attribute.create( [ :html ] )
+  add_attribute :text, Attribute.create( [ :html ] )
+  add_attribute :link, Attribute.create( [ :html ] )
+  add_attribute :vlink, Attribute.create( [ :html ] )
+  add_attribute :alink, Attribute.create( [ :html ] )
+  
+  add_html_tag 'body'
+  add_latex_output '#{@content}'
+  add_context_output '#{@content}'
+  add_text_output '#{@content}'
+  add_wiki_output '#{@content}'
+  add_creole_output '#{@content}'
+end #Body
+
+=begin rdoc
+Define Element :latexdummy, :latexonly
+
+Usefull, if you have LaTeX-only text in your document.
+(e.g. \\newcommands in the header).
+=end
+class Latexdummy < Element
+  add_id :latexonly
+  add_html_output ''
+  add_latex_output '#{@content}'
+  add_context_output ''
+  add_text_output ''
+  add_wiki_output ''
+  add_creole_output ''
+end #Latexdummy
+
+=begin rdoc
+Define Element :htmldummy, :htmlonly
+=end
+class Htmldummy < Element
+  add_id :htmlonly
+  add_html_output '#{@content}'
+  add_latex_output ''
+  add_context_output ''
+  add_text_output ''
+  add_wiki_output ''
+  add_creole_output ''
+end #Htmldummy
 
 
 =begin rdoc
 Titlepage
 
-This parameter are better set with Document.title.
+This parameter are better set with 
+  Docgenerator::Document.new(
+    :title => 'title'
+  )
 =end
 class Title < Element
-  Element.add( [:title],  Title)
-  add_attributes( {
-      :short  => Attribute.create( [ :html ], nil, 1 )
-    }.update(HTML_ATTR_ALL)
-    )
+  add_attributes HTML_ATTR_ALL
+  add_attribute :short, Attribute.create( [ :html ], nil, 1 )
+  
 =begin rdoc
 Does the LaTeX-class support the shorttitle-option?
 
 beamer.sty does it, others not.
-
-#Unsaubere realisierung .. fixme
 =end
   def shortoption( options = {} )
     @attr[:short].content.compact!  #delete nils.
     return nil  if ! @attr[:short].filled?
-    o = Docgenerator_logger.set_option_defaults(options)
+    o = set_option_defaults(options)
     o[:log].debug("enter shortoption") if o[:log].debug?
     if o[:document]      
       #Check for known classes, which support the optional short title
@@ -83,100 +116,161 @@ beamer.sty does it, others not.
     end
     return nil
   end
-  #Add shorttitle as a meta-tag.
-  def shorttitle_html()
-    return nil  if ! @attr[:short].filled?
-    return element( :meta, {:name => 'shorttitle', :content => @attr[:short].content }).to_html
+=begin rdoc  
+Add shorttitle as a meta-tag., options should contain :log
+=end
+  def shorttitle_html(options = {})
+    return nil unless @attr[:short].filled?
+    return element( :meta, {:name => 'shorttitle', :content => @attr[:short].content}).to_html(:log => options[:log])
   end
     
+=begin rdoc  
+Define output routines.
+=end
   add_output( :latex,  '#{linebreak(@crbefore)}\title#{shortoption(o)}{#{@content}}#{linebreak(@crmid)}\hypersetup{pdftitle={#{@content}}}#{linebreak(@crafter)}')
   #~ add_output( :latex,  '#{linebreak(@crbefore)}\title{#{@content}}#{linebreak(@crmid)}\hypersetup{pdftitle={#{@content}}}#{linebreak(@crafter)}')
-  add_output( :html,  '#{linebreak(@crbefore)}<title>#{@content}</title>#{linebreak(@crmid) if shorttitle_html}#{shorttitle_html}#{linebreak(@crafter)}')
+  add_output( :html,  '#{linebreak(@crbefore)}<title>#{@content}</title>#{linebreak(@crmid) if shorttitle_html(o)}#{shorttitle_html(o)}#{linebreak(@crafter)}')
   
   add_output( :text,  "\n" + '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}' + "\n")
   add_output( :wiki,  '#{linebreak(@crbefore)}' + '=#{@content}=' + ' #{linebreak(@crafter)}')
   add_output( :creole,  '#{linebreak(@crbefore)}' + '=#{@content}' + ' #{linebreak(@crafter)}')
 end #Title
 
-Element.create( [:meta], {
-    :name  => Attribute.create( [ :html, :required ], nil, 1 ),
-    :content  => Attribute.create( [ :html, :required ], nil, 2 ),
-  }, ENDTAG,
-  {  
-    :htmltag  => 'meta',
-    #~ :html  => '<meta name="#{@attr[:name]}" content="#{@attr[:content]}">',
-    :latex  => '',
-    :context  => '',
-#    :latex  => '#{linebreak(@crbefore)}' +  '\author{#{@content}}\hypersetup{pdfauthor={#{@content}}}' + ' #{linebreak(@crafter)}'
-    :wiki  => '',
-    :creole  => '',
-    :text  => '',
-  } )
-#Like Meta, but not name...
-Element.create( [:meta2], {
-    :'http-equiv'  => Attribute.create( [ :html, :required ], nil, 1 ),
-    :content  => Attribute.create( [ :html, :required ], nil, 2 ),
-  }, nil,
-  {  
-    :htmltag  => 'meta',
-    #~ :html  => '<meta name="#{@attr[:name]}" content="#{@attr[:content]}">',
-    :latex  => '',
-#    :latex  => '#{linebreak(@crbefore)}' +  '\author{#{@content}}\hypersetup{pdfauthor={#{@content}}}' + ' #{linebreak(@crafter)}'
-  } )
-
-Element.create( [:author], {}, true,
-  {  :html  => '<meta name="author" content="#{@content}">' + ' #{linebreak(@crafter)}',
-    :latex  => '#{linebreak(@crbefore)}\author{#{@content}}#{linebreak(@crmid)}\hypersetup{pdfauthor={#{@content}}}#{linebreak(@crafter)}'
-  } )
-Element.create( [:date], {}, true,
-  {  :html  => '<meta name="creation-date" content="#{@content}">' + ' #{linebreak(@crafter)}',
-    :latex  => '#{linebreak(@crbefore)}\date{#{@content}}#{linebreak(@crafter)}'
-  } )
-Element.create( [:keywords], {}, true,
-  {  :html  => '<meta name="keywords" content="#{@content}">' + ' #{linebreak(@crafter)}',
-    :latex  => '#{linebreak(@crbefore)}\hypersetup{pdfkeywords={#{@content}}}#{linebreak(@crafter)}'
-  } )
-Element.create( [:metadescription], {}, true,
-  {  :html  => '<meta name="description" content="#{@content}">' + ' #{linebreak(@crafter)}',
-    :latex  => '#{linebreak(@crbefore)}\hypersetup{pdfsubject={#{@content}}}#{linebreak(@crafter)}'
-  } )
-Element.create( [:creator], {}, true,
-  {  :html  => '<meta name="creator" content="#{@content}">' + ' #{linebreak(@crafter)}',
-    :latex  => '#{linebreak(@crbefore)}\hypersetup{pdfcreator={#{@content}}}#{linebreak(@crafter)}'
-  } )
-#~ Element.create( [:hypersetup], {}, true,
-  #~ {  :html  => '<meta name="description" content="#{@content}">',
-    #~ :latex  => '#{linebreak(@crbefore)}' +  '\pdfinfo{description=#{@content}}' + ' #{linebreak(@crafter)}'
-  #~ } )
-
-Element.create( [:maketitle], {}, false,
-  {  :htmltag  => 'span',  #Empty span
-    :html  => "<!-- maketitle -->\n",
-    :latex  => '#{linebreak(@crbefore)}' +  '\maketitle #{linebreak(@crafter)}'
-  } )
-#~ Element.create( [:tableofcontents], {}, false,
-  #~ {  :htmltag  => 'span',  #Empty span
-    #~ :html  => '#{linebreak(@crbefore)}<!-- tableofcontents -->#{linebreak(@crafter)}',
-    #~ :latex  => '#{linebreak(@crbefore)}' +  '\tableofcontents ' + ' #{linebreak(@crafter)}'
-  #~ } )
-
-#Build table of contents.
-#
-#This element requires a related document.
-#
-#For LaTeX \tableofcontents is created, with attribute :as_list you can create a list.
+=begin rdoc
+Define Element :meta
+=end
+class Meta < Element
+  has_no_content false
+  add_attribute :name, Attribute.create( [ :html, :required ], nil, 1 )
+  add_attribute :content, Attribute.create( [ :html, :required ], nil, 2 )
+  add_html_tag 'meta'
+  add_latex_output ''
+  add_context_output ''
+  add_wiki_output ''
+  add_creole_output ''
+  add_text_output ''
+end #Meta
+
+=begin rdoc
+Define Element :meta2
+
+Like Meta, but without name.
+=end
+class Meta2 < Element
+  has_no_content ENDTAG
+  add_attribute :"http-equiv", Attribute.create( [ :html, :required ], nil, 1 )
+  add_attribute :content, Attribute.create( [ :html, :required ], nil, 2 )
+  add_html_tag 'meta'
+  add_latex_output ''
+end #Meta2
+
+=begin rdoc
+Define Element :author
+
+Create an instance with
+  element( :author, [ attributes, [content]] )
+or
+  Author.new( [ attributes, [content]] )
+
+Attributes are not defined for this element.
+=end
+class Author < Element
+  add_html_output '<meta name="author" content="#{@content}"> #{linebreak(@crafter)}'
+  add_latex_output '#{linebreak(@crbefore)}\author{#{@content}}#{linebreak(@crmid)}\hypersetup{pdfauthor={#{@content}}}#{linebreak(@crafter)}'
+end #Author
+
+=begin rdoc
+Define Element :date
+
+Create an instance with
+  element( :date, [ attributes, [content]] )
+or
+  Date.new( [ attributes, [content]] )
+=end
+class Date < Element
+  add_html_output '<meta name="creation-date" content="#{@content}"> #{linebreak(@crafter)}'
+  add_latex_output '#{linebreak(@crbefore)}\date{#{@content}}#{linebreak(@crafter)}'
+end #Date
+
+=begin rdoc
+Define Element :keywords
+
+Create an instance with
+  element( :keywords, [ attributes, [content]] )
+or
+  Keywords.new( [ attributes, [content]] )
+
+Attributes are not defined for this element.
+=end
+class Keywords < Element
+  add_html_output '<meta name="keywords" content="#{@content}"> #{linebreak(@crafter)}'
+  add_latex_output '#{linebreak(@crbefore)}\hypersetup{pdfkeywords={#{@content}}}#{linebreak(@crafter)}'
+end #Keywords
+
+=begin rdoc
+Define Element :metadescription
+
+Create an instance with
+  element( :metadescription, [ attributes, [content]] )
+or
+  Metadescription.new( [ attributes, [content]] )
+
+Attributes are not defined for this element.
+=end
+class Metadescription < Element
+  add_html_output '<meta name="description" content="#{@content}"> #{linebreak(@crafter)}'
+  add_latex_output '#{linebreak(@crbefore)}\hypersetup{pdfsubject={#{@content}}}#{linebreak(@crafter)}'
+end #Metadescription
+
+=begin rdoc
+Define Element :creator
+
+Create an instance with
+  element( :creator, [ attributes, [content]] )
+or
+  Creator.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Creator < Element
+  add_html_output '<meta name="creator" content="#{@content}"> #{linebreak(@crafter)}'
+  add_latex_output '#{linebreak(@crbefore)}\hypersetup{pdfcreator={#{@content}}}#{linebreak(@crafter)}'
+end #Creator
+
+=begin rdoc
+Define Element :maketitle
+
+Create an instance with
+  element( :maketitle, [ attributes, [content]] )
+or
+  Maketitle.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Maketitle < Element
+  has_no_content  false
+  add_html_tag 'span'
+  add_html_output "<!-- maketitle -->\n"
+  add_latex_output '#{linebreak(@crbefore)}\maketitle #{linebreak(@crafter)}'
+end #Maketitle
+
+=begin rdoc
+Build table of contents.
+
+This element requires a related document.
+
+For LaTeX \tableofcontents is created, with attribute :as_list you can create a list.
+=end
 class Tableofcontents < Element
-  Element.add( [:tableofcontents],  Tableofcontents)
-  add_attributes( {
-      :level      => Attribute.create( [ :html, :latex ], [Fixnum], 1 ),
-      :pre        => Attribute.create( [ :html, :latex ], nil, 2 ),
-      :post      => Attribute.create( [ :html, :latex ], nil, 2 ),
-      :as_list  => Attribute.create( [ :latex ], [true, false], 2 ),
-    }.update(HTML_ATTR_ALL)
-  )
-  def content?(); return false;   end
+  
+  add_attributes HTML_ATTR_ALL
+  add_attribute :level      , Attribute.create( [ :html, :latex ], [Fixnum], 1 )
+  add_attribute :pre        , Attribute.create( [ :html, :latex ], nil, 2 )
+  add_attribute :post      , Attribute.create( [ :html, :latex ], nil, 2 )
+  add_attribute :as_list  , Attribute.create( [ :latex ], [true, false], 2 )
+  
+  has_no_content  false
+  
   def to_doc( target, options = {} )
-    o = Docgenerator_logger.set_option_defaults(options)
+    o = set_option_defaults(options)
     o[:log].debug("enter to_doc(#{target}) for #{self.inspect}, options: #{options.keys.inspect}") if o[:log].debug?
     tocoptions = {
         :level => @attr[:level].content.first,
@@ -210,7 +304,7 @@ class Tableofcontents < Element
   end
   #Build toc, if there is a related document.
   def to_html( options = {} )
-    o = Docgenerator_logger.set_option_defaults(options)
+    o = set_option_defaults(options)
     o[:log].debug("enter to_html for #{self.inspect}, options: #{options.keys.inspect}") if o[:log].debug?
     if o[:document]
       return o[:document].toc(options).to_html(options)
@@ -220,149 +314,376 @@ class Tableofcontents < Element
     end
   end    
 end
-Element.create( [:addcontentsline], {
-      :file  =>  Attribute.create( [ :latex, :required ], [ 'toc', 'lof', 'lot' ] ),
-      :depth =>  Attribute.create( [ :latex, :required ], [ -1, 0,1,2,3,4,5,6] ),
-    }, true,
-  {  #:htmltag  => 'span',  #Empty span
-    #:html  => "<!-- tableofcontents -->\n",
-    :latex  => '#{linebreak(@crbefore)}' +  '\addcontentsline{#{@attr[:file]}}{#{@attr[:depth]}}{#{@content}}' + ' #{linebreak(@crafter)}'
-  } )
-Element.create( [:addtocontents], {
-      :file  =>  Attribute.create( [ :latex, :required ], [ 'toc', 'lof', 'lot' ] ),
-    }, true,
-  {  #:htmltag  => 'span',  #Empty span
-    #:html  => "<!-- tableofcontents -->\n",
-    :latex  => '#{linebreak(@crbefore)}' +  '\addtocontents{#{@attr[:file]}}{#{@content}}' + ' #{linebreak(@crafter)}'
-  } )
 
-#
-#Generell paragraph handling.
-#
-Element.create( [:par, :p],  HTML_ATTR_ALL,  true, 
-  {  :htmltag  =>  'p',
-    :latex    =>  "\n\n" + '#{@content}' + "\n\n",
-    :context    =>  "\n\n" + '#{@content}' + "\n\n",
-    :text    =>  "\n" +  '#{@content}' + "\n",  #siehe experimente/textformat.rb
-    :wiki    =>  "\n" +  '#{@content}' + "\n",  #
-    :creole  =>  "\n" +  '#{@content}' + "\n\n",
-  } )
-#~ par.add_output( :html,  '<p>#{@attr[:content]}</p>')
-#~ par.add_output( :latex,  '#{@content}\par')
-
-Element.create( [:nobr],  HTML_ATTR_ALL,  true, 
-  {  :htmltag  =>  'nobr',
-    :latex    =>  '#{linebreak(@crbefore)}\mbox{#{@content}}#{linebreak(@crafter)}'
-    #~ :text    =>  "\n" +  '#{@content}' + "\n",
-  } )
-
-Element.create( [:br, 'br/', 'br', :newline], {
-    :clear=> Attribute.create( [ :html ], ['all'] ),
-  },ENDTAG, 
-  {  :htmltag  => 'br',
-    :latex  => '#{linebreak(@crbefore)}\newline' + ' #{linebreak(@crafter)}',
-    :text    => "\n",
-    :wiki    => '{{newline}}#{linebreak(@crafter)}',
-  } )
-Element.create( [:hr, 'hr/', 'hr', :hrulefill], {
-    :clear=> Attribute.create( [ :html ], ['all'] ),
-  },ENDTAG, 
-  {  :htmltag  => 'hr',
-    :wiki      => '----',
-    :text      => '-' * 25,
-    :latex  => '#{linebreak(@crbefore)}' +  '\hrulefill' + ' #{linebreak(@crafter)}'
-  } )
-
-Element.create( [:vfill], {},false, 
-  {  :htmltag  => nil,
-    :latex  => '#{linebreak(@crbefore)}\vfill #{linebreak(@crafter)}'
-  } )
-Element.create( [:hfill], {},false, 
-  {  :htmltag => nil,
-    :latex  => '#{linebreak(@crbefore)}\hfill #{linebreak(@crafter)}'
-  } )
-
-Element.create( [:relax], {},false, 
-  {  :htmltag => nil,
-    :latex  => '#{linebreak(@crbefore)}\relax #{linebreak(@crafter)}'
-  } )
+=begin rdoc
+Define Element :listoffigures
 
-#
-#Grouping
-#
-Element.create( [:span, :group],  HTML_ATTR_CORE,  true, 
-  {  :htmltag  =>  'span',
-    :latex  =>  '#{linebreak(@crbefore)}' +  
-          '\bgroup '  + '#{linebreak(@crmid)}' +
-          '#{@content}'  + '#{linebreak(@crmid)}' + 
-          '\egroup '  + '#{linebreak(@crafter)}'
-  } )
-
-divattr = { :align => HTML_ATTR_ALIGN} 
-divattr.update( HTML_ATTR_CORE )
-Element.create( [:div, :Group],  divattr,  true, 
-  {  :htmltag  => 'div',
-    :latex  =>  '#{linebreak(@crbefore)}' +  
-          '\begingroup '  + '#{linebreak(@crmid)}' + 
-          '#{@content}'  + '#{linebreak(@crmid)}' + 
-          '\endgroup '  + '#{linebreak(@crafter)}',
-    :text => '#{@content}',
-    :wiki => '#{@content}',
-  } )
-
-
-#Make a separator lin in code
-Element.create( [:sepline],  {},  false, 
-  {  :html  =>  "\n<!--" +  '-' * 50 + " -->\n",
-    :latex    =>  "\n%" +  '-' * 50 + "\n"
-  } )
-#Make a comment in code
-Element.create( [:comment],  {},  true, 
-  {  :htmltag  => '<!-- #{@content} -->',
-    :latex  =>  '#{linebreak(@crbefore)}' +  '% ------- #{@content} -------' + ' #{linebreak(@crafter)}'
-  } )
+Create an instance with
+  element( :listoffigures, [ attributes, [content]] )
+or
+  Listoffigures.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Listoffigures < Element
+  has_no_content false
+  add_latex_output '#{linebreak(@crbefore)}\listoffigures #{linebreak(@crafter)}'
+end #Listoffigures
 
-#
-#Links
-#
-#Better: \hypertarget, hyperlink (pdf)
-Element.create( [ :url ], 
-  HTML_ATTR_ALL,
-  true,
-  {
-    :html  => '#{linebreak(@crbefore)}<a href="#{@content}">#{@content}</a>#{linebreak(@crafter)}',
-    :latex  => '#{linebreak(@crbefore)}\url{#{@content}}#{linebreak(@crafter)}',
-  } )
-
-Element.create( [ :ensuremath ], 
-  {},
-  true,
-  {
-    :html  => '#{@content}',
-    :latex  => '\ensuremath{#{@content}}',
-  } )
 
-#
-#Internal reference
-#The href-parameter is expected with a leading # (HTML)
-#The corresponding label should be defined in the same document/file.
-#
-#For external links use :href.
+=begin rdoc
+Define Element :addcontentsline
+
+Create an instance with
+  element( :addcontentsline, [ attributes, [content]] )
+or
+  Addcontentsline.new( [ attributes, [content]] )
+Attributes may be:
+* :file: [ 'toc', 'lof', 'lot' ]
+* :depth: [ -1, 0,1,2,3,4,5,6]
+=end
+class Addcontentsline < Element
+  add_attribute :file, Attribute.create( [ :latex, :required ], [ 'toc', 'lof', 'lot' ] )
+  add_attribute :depth, Attribute.create( [ :latex, :required ], [ -1, 0,1,2,3,4,5,6] )
+  add_latex_output '#{linebreak(@crbefore)}\addcontentsline{#{@attr[:file]}}{#{@attr[:depth]}}{#{@content}} #{linebreak(@crafter)}'
+end #Addcontentsline
+
+=begin rdoc
+Define Element :addtocontents
+
+Create an instance with
+  element( :addtocontents, [ attributes, [content]] )
+or
+  Addtocontents.new( [ attributes, [content]] )
+Attributes may be:
+* :file: [ 'toc', 'lof', 'lot' ]
+=end
+class Addtocontents < Element
+  add_attribute :file, Attribute.create( [ :latex, :required ], [ 'toc', 'lof', 'lot' ] )
+  add_latex_output '#{linebreak(@crbefore)}\addtocontents{#{@attr[:file]}}{#{@content}} #{linebreak(@crafter)}'
+end #Addtocontents
+
+=begin rdoc
+Define Element :par, :p
+
+Generell paragraph handling.
+
+Create an instance with
+  element( :par, [ attributes, [content]] )
+  element( :p, [ attributes, [content]] )
+or
+  Par.new( [ attributes, [content]] )
+Attributes may be:
+* HTML_ATTR_CORE
+* HTML_ATTR_I18N
+* HTML_ATTR_EVENTS
+* :lang, ATTR_LANG
+=end
+class Par < Element
+  add_id :p
+  add_attributes HTML_ATTR_CORE
+  add_attributes HTML_ATTR_I18N
+  add_attributes HTML_ATTR_EVENTS
+  add_attribute :lang, ATTR_LANG
+  add_html_tag 'p'
+  add_latex_output "\n\n" + '#{@content}' + "\n\n"
+  add_context_output "\n\n" + '#{@content}' + "\n\n"
+  add_text_output "\n" +  '#{@content}' + "\n"
+  add_wiki_output "\n" +  '#{@content}' + "\n"
+  add_creole_output "\n" +  '#{@content}' + "\n\n"
+end #Par
+
+=begin rdoc
+Define Element :nobr
+
+Create an instance with
+  element( :nobr, [ attributes, [content]] )
+or
+  Nobr.new( [ attributes, [content]] )
+Attributes may be:
+* HTML_ATTR_CORE
+* HTML_ATTR_I18N
+* HTML_ATTR_EVENTS
+* :lang, ATTR_LANG
+=end
+class Nobr < Element
+  add_attributes HTML_ATTR_CORE
+  add_attributes HTML_ATTR_I18N
+  add_attributes HTML_ATTR_EVENTS
+  add_attribute :lang, ATTR_LANG
+  add_html_tag 'nobr'
+  add_latex_output '#{linebreak(@crbefore)}\mbox{#{@content}}#{linebreak(@crafter)}'
+end #Nobr
+
+=begin rdoc
+Define Element :br, "br/", "br", :newline
+
+Create an instance with
+  element( :br, [ attributes, [content]] )
+  element( "br/", [ attributes, [content]] )
+  element( "br", [ attributes, [content]] )
+  element( :newline, [ attributes, [content]] )
+or
+  Br.new( [ attributes, [content]] )
+Attributes may be:
+* :clear: ['all']
+=end
+class Newline < Element
+  add_id "br/"
+  add_id "br"
+  add_id :br
+  has_no_content ENDTAG
+  add_attribute :clear, Attribute.create( [ :html ], ['all'] )
+  add_html_tag 'br'
+  add_latex_output '#{linebreak(@crbefore)}\newline #{linebreak(@crafter)}'
+  add_text_output "\n"
+  add_wiki_output '{{newline}}#{linebreak(@crafter)}'
+  add_creole_output '\\\\#{linebreak(@crafter)}'
+end #Br
+
+=begin rdoc
+Define Element :hr, "hr/", "hr", :hrulefill
+
+Create an instance with
+  element( :hr, [ attributes, [content]] )
+  element( "hr/", [ attributes, [content]] )
+  element( "hr", [ attributes, [content]] )
+  element( :hrulefill, [ attributes, [content]] )
+or
+  Hrulefill.new( [ attributes, [content]] )
+Attributes may be:
+* :clear: 
+=end
+class Hrulefill < Element
+  add_id "hr/"
+  add_id "hr"
+  add_id :hr
+  has_no_content ENDTAG
+  add_attribute :clear, Attribute.create( [ :html ], ['all'] )
+  add_html_tag 'hr'
+  add_wiki_output '----'
+  add_text_output '-------------------------'
+  add_latex_output '#{linebreak(@crbefore)}\hrulefill #{linebreak(@crafter)}'
+end #Hr
+
+=begin rdoc
+Define Element :vspace
+
+Create an instance with
+  element( :vspace, [ attributes, [content]] )
+or
+  Vspace.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Vspace < Element
+  add_latex_output '#{linebreak(@crbefore)}\vspace{#{@content}} #{linebreak(@crafter)}'
+    #:htmltag  => 'hr',
+    #~ :wiki      => '----',
+    #~ :text      => '-' * 25,
+end #Vspace
+
+=begin rdoc
+Define Element :hspace
+
+Create an instance with
+  element( :hspace, [ attributes, [content]] )
+or
+  Hspace.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+
+Only for LaTeX
+=end
+class Hspace < Element
+  add_latex_output '#{linebreak(@crbefore)}\hspace{#{@content}} #{linebreak(@crafter)}'
+end #Hspace
+
+=begin rdoc
+Define Element :vfill
+
+Create an instance with
+  element( :vfill, [ attributes, [content]] )
+or
+  Vfill.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+
+Only for LaTeX
+=end
+class Vfill < Element
+  has_no_content
+  add_latex_output '#{linebreak(@crbefore)}\vfill #{linebreak(@crafter)}'
+end #Vfill
+
+=begin rdoc
+Define Element :hfill
+
+Create an instance with
+  element( :hfill, [ attributes, [content]] )
+or
+  Hfill.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+
+Only for LaTeX
+=end
+class Hfill < Element
+  has_no_content false
+  add_latex_output '#{linebreak(@crbefore)}\hfill #{linebreak(@crafter)}'
+end #Hfill
+
+=begin rdoc
+Define Element :relax
+
+Create an instance with
+  element( :relax, [ attributes, [content]] )
+or
+  Relax.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Relax < Element
+  has_no_content
+  add_html_tag nil
+  add_latex_output '#{linebreak(@crbefore)}\relax #{linebreak(@crafter)}'
+end #Relax
+
+
+=begin rdoc
+Define Element :span, :group
+
+Can be used to group something.
+
+Create an instance with
+  element( :span, [ attributes, [content]] )
+  element( :group, [ attributes, [content]] )
+or
+  Span.new( [ attributes, [content]] )
+Attributes may be:
+* HTML_ATTR_CORE
+=end
+class Span < Element
+  add_id :group
+  add_attributes HTML_ATTR_CORE
+  add_html_tag 'span'
+  add_latex_output '#{linebreak(@crbefore)}\bgroup #{linebreak(@crmid)}#{@content}#{linebreak(@crmid)}\egroup #{linebreak(@crafter)}'
+end #Span
+
+=begin rdoc
+Define Element :div, :Group
+
+Create an instance with
+  element( :div, [ attributes, [content]] )
+  element( :Group, [ attributes, [content]] )
+or
+  Div.new( [ attributes, [content]] )
+Attributes may be:
+* :align: 
+* :id: 
+* :class: 
+* :style: 
+* :title: 
+=end
+class Div < Element
+  add_id :Group
+  add_attributes HTML_ATTR_CORE
+  add_attribute :align, HTML_ATTR_ALIGN
+  add_html_tag 'div'
+  add_latex_output '#{linebreak(@crbefore)}\begingroup #{linebreak(@crmid)}#{@content}#{linebreak(@crmid)}\endgroup #{linebreak(@crafter)}'
+  add_text_output '#{@content}'
+  add_wiki_output '#{@content}'
+end #Div
+
+
+=begin rdoc
+Define Element :sepline
+
+Make a separator line in code
+
+Create an instance with
+  element( :sepline, [ attributes, [content]] )
+or
+  Sepline.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Sepline < Element
+  has_no_content false
+  add_html_output "\n<!--" +  '-' * 50 + " -->\n"
+  add_latex_output  "\n%" +  '-' * 50 + "\n"
+end #Sepline
+
+=begin rdoc
+Define Element :comment
+
+Make a comment in code
+
+Create an instance with
+  element( :comment, [ attributes, [content]] )
+or
+  Comment.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Comment < Element
+  add_html_tag '<!-- #{@content} -->'
+  add_latex_output '#{linebreak(@crbefore)}% ------- #{@content} ------- #{linebreak(@crafter)}'
+end #Comment
+
+=begin rdoc
+Define Element :url
+
+Links
+
+Better: \hypertarget, hyperlink (pdf)
+
+Create an instance with
+  element( :url, [ attributes, [content]] )
+or
+  Url.new( [ attributes, [content]] )
+Attributes may be:
+* HTML_ATTR_CORE
+* HTML_ATTR_I18N
+* HTML_ATTR_EVENTS
+* ATTR_LANG
+=end
+class Url < Element
+  add_attributes HTML_ATTR_CORE
+  add_attributes HTML_ATTR_I18N
+  add_attributes HTML_ATTR_EVENTS
+  add_attribute :lang, ATTR_LANG
+  add_html_output '#{linebreak(@crbefore)}<a href="#{@content}">#{@content}</a>#{linebreak(@crafter)}'
+  add_latex_output '#{linebreak(@crbefore)}\url{#{@content}}#{linebreak(@crafter)}'
+end #Url
+
+=begin rdoc
+Define Element :ensuremath
+
+Create an instance with
+  element( :ensuremath, [ attributes, [content]] )
+or
+  Ensuremath.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Ensuremath < Element
+  add_html_output '#{@content}'
+  add_latex_output '\ensuremath{#{@content}}'
+  add_context_output '\math{#{@content}}' #http://www.ntg.nl/pipermail/ntg-context/2010/051451.html
+end #Ensuremath
+
+=begin rdoc
+Internal reference
+The href-parameter is expected with a leading # (HTML)
+The corresponding label should be defined in the same document/file.
+
+For external links use :href.
+=end
 class Href < Element
-  Element.add( [:a, :href],  Href)
-  add_attributes(     {
-    :href    => Attribute.create( [ :html, :required ], [String], 1 ),
-    :hreflang  => ATTR_LANG,
-    :alt    => Attribute.create( [ :html ], [String], 2 ),
-    :name  => Attribute.create( [ :html ], [String] ),
-    :longdesc  => Attribute.create( [ :html ], [String] ),
-    :value  => Attribute.create( [ :html ] ),
-    :shape  => Attribute.create( [ :html ] ),
-    :coords  => Attribute.create( [ :html ] ),
-    :target  => Attribute.create( [ :html ], [  '_blank', '_parent', '_self', '_top' ] ),
-    }.update(HTML_ATTR_ALL)
-  )
-  def htmltag(); 'a'; end
+  add_id :a
+  add_attribute  :href, Attribute.create( [ :html, :required ], [String], 1 )
+  add_attribute  :hreflang, ATTR_LANG
+  add_attribute  :alt, Attribute.create( [ :html ], [String], 2 )
+  add_attribute  :name, Attribute.create( [ :html ], [String] )
+  add_attribute  :longdesc, Attribute.create( [ :html ], [String] )
+  add_attribute  :value, Attribute.create( [ :html ] )
+  add_attribute  :shape, Attribute.create( [ :html ] )
+  add_attribute  :coords,Attribute.create( [ :html ] )
+  add_attribute  :target, Attribute.create( [ :html ], [  '_blank', '_parent', '_self', '_top' ] )
+  add_attributes HTML_ATTR_ALL
+  add_html_tag 'a'
   def to_wiki( options = {} )
     "[#{@attr[:href].to_s} #{@content.to_doc(:wiki, options)}]"
   end
@@ -387,82 +708,118 @@ class Href < Element
   end
 end
 
-#~ Element.create( [ :a, :href ], 
-  #~ {  :href    => Attribute.create( [ :html, :required ], [String], 1 ),
-    #~ :hreflang  => ATTR_LANG,
-    #~ :alt    => Attribute.create( [ :html ], [String], 2 ),
-    #~ :name  => Attribute.create( [ :html ], [String] ),
-    #~ :longdesc  => Attribute.create( [ :html ], [String] ),
-    #~ :value  => Attribute.create( [ :html ] ),
-    #~ :shape  => Attribute.create( [ :html ] ),
-    #~ :coords  => Attribute.create( [ :html ] ),
-    #~ :target  => Attribute.create( [ :html ], [  '_blank', '_parent', '_self', '_top' ] ),
-  #~ }.update( HTML_ATTR_ALL ),
-  #~ true,
-  #~ {
-    #~ :htmltag  => 'a',
-    #~ :latex  => '\href{#{@attr[:href]}}{#{@content}}',
-  #~ } )
-
-Element.create( [ :label ], 
-  {
-    :name    => Attribute.create( [ :html, :latex, :required ] ),
-  }.update( HTML_ATTR_ALL ),
-  true,
-  {
-    #~ :htmltag  => 'a',
-    :html  => '#{linebreak(@crbefore)}<a name="#{@attr[:name]}">#{linebreak(@crmid)}#{@content}</a>#{linebreak(@crafter)}',
-    :latex  => '#{linebreak(@crbefore)}\label{#{@attr[:name]}}#{linebreak(@crmid)}\hypertarget{#{@attr[:name]}}{#{@content}}#{linebreak(@crafter)}',
-    :text => '(#{@attr[:name]}) #{@content}',
-    :wiki => '#{linebreak(@crbefore)}[[??#{@attr[:name]}]]#{@content}#{linebreak(@crafter)}', #fixme wrong
-  } )
-
-Element.create( [ :hypertarget ], 
-  {  :href    => Attribute.create( [ :html, :required ] ),
-    :alt    => Attribute.create( [ :html ] ),
-    :longdesc  => Attribute.create( [ :html ] ),
-    :value  => Attribute.create( [ :html ] ),
-    :shape  => Attribute.create( [ :html ] ),
-    :coords  => Attribute.create( [ :html ] ),
-  }.update( HTML_ATTR_ALL ),
-  true,
-  {
-    #~ :htmltag  => 'a',
-    :latex  => '#{linebreak(@crbefore)}\hypertarget{#{@attr[:href]}}{#{@content}}#{linebreak(@crafter)}',
-  } )
-
-Element.create( [ :link ], 
-  {  :href    => Attribute.create( [ :html, :required ], nil, 1 ),
-    :rel    => Attribute.create( [ :html ], [String], 2 ),
-    :title    => Attribute.create( [ :html ], nil, 3 ),
-    :type  => Attribute.create( [ :html ], nil, 4 ),
-  }.update( HTML_ATTR_ALL ),
-  ENDTAG,  
-  {
-    :htmltag  => 'link',
-    #~ :latex    => '',
-  } )
+=begin rdoc
+Define Element :label
 
-#
+Create an instance with
+  element( :label, [ attributes, [content]] )
+or
+  Label.new( [ attributes, [content]] )
+Attributes may be:
+* :name: 
+* HTML_ATTR_CORE
+* HTML_ATTR_I18N
+* HTML_ATTR_EVENTS
+* ATTR_LANG
+=end
+class Label < Element
+  add_attributes HTML_ATTR_CORE
+  add_attributes HTML_ATTR_I18N
+  add_attributes HTML_ATTR_EVENTS
+  add_attribute :lang, ATTR_LANG
+  add_attribute :name, Attribute.create( [ :html, :latex, :required ] )
+  add_html_output '#{linebreak(@crbefore)}<a name="#{@attr[:name]}">#{linebreak(@crmid)}#{@content}</a>#{linebreak(@crafter)}'
+  add_latex_output '#{linebreak(@crbefore)}\label{#{@attr[:name]}}#{linebreak(@crmid)}\hypertarget{#{@attr[:name]}}{#{@content}}#{linebreak(@crafter)}'
+  add_text_output '(#{@attr[:name]}) #{@content}'
+  add_wiki_output '#{linebreak(@crbefore)}[[??#{@attr[:name]}]]#{@content}#{linebreak(@crafter)}'
+end #Label
+
+=begin rdoc
+Define Element :hypertarget
+
+Create an instance with
+  element( :hypertarget, [ attributes, [content]] )
+or
+  Hypertarget.new( [ attributes, [content]] )
+Attributes may be:
+* :href: 
+* :alt: 
+* :longdesc: 
+* :value: 
+* :shape: 
+* :coords: 
+* HTML_ATTR_CORE
+* HTML_ATTR_I18N
+* HTML_ATTR_EVENTS
+* ATTR_LANG
+=end
+class Hypertarget < Element
+  add_attributes HTML_ATTR_CORE
+  add_attributes HTML_ATTR_I18N
+  add_attributes HTML_ATTR_EVENTS
+  add_attribute :lang, ATTR_LANG
+  add_attribute :href, Attribute.create( [ :html, :required ] )
+  add_attribute :alt, Attribute.create( [ :html ] )
+  add_attribute :longdesc, Attribute.create( [ :html ] )
+  add_attribute :value, Attribute.create( [ :html ] )
+  add_attribute :shape, Attribute.create( [ :html ] )
+  add_attribute :coords, Attribute.create( [ :html ] )
+  add_latex_output '#{linebreak(@crbefore)}\hypertarget{#{@attr[:href]}}{#{@content}}#{linebreak(@crafter)}'
+end #Hypertarget
+
+
+=begin rdoc
+Define Element :link
+
+Create an instance with
+  element( :link, [ attributes, [content]] )
+or
+  Link.new( [ attributes, [content]] )
+Attributes may be:
+* :href: 
+* :rel: 
+* :title: 
+* :type: 
+* :lang: 
+* HTML_ATTR_CORE
+* HTML_ATTR_I18N
+* HTML_ATTR_EVENTS
+* ATTR_LANG
+=end
+class Link < Element
+  has_no_content
+  add_attributes HTML_ATTR_CORE
+  add_attributes HTML_ATTR_I18N
+  add_attributes HTML_ATTR_EVENTS
+  add_attribute :lang, ATTR_LANG
+  add_attribute :href, Attribute.create( [ :html, :required ], nil, 1 )
+  add_attribute :rel, Attribute.create( [ :html ], [String], 2 )
+  add_attribute :title, Attribute.create( [ :html ], nil, 3 )
+  add_attribute :type, Attribute.create( [ :html ], nil, 4 )
+  add_html_tag 'link'
+end #Link
 
 #
-#Add a TeX-Makro usepackage.
-#
-#This method tries to load the package specific definitions in a file
-#   docgenerator_<<packagename>>
-#
+
+=begin rdoc
+Add a TeX-Makro usepackage.
+
+This method tries to load the package specific definitions in a file
+   docgenerator_<<packagename>>
+=end
 class Usepackage < Element
-  #Make the key known to the complete key-list of elements.
-  Element.add( [:usepackage],  Usepackage)
   #~ add_attributes( HTML_ATTR_ALL ) 
-  add_attributes( { :option =>  Attribute.create( ) } ) 
+  add_attribute :option, Attribute.create( )
   
-  #With usepackage additional command may be defined.
-  #Here we load this special commands/elements if available.
+=begin rdoc
+With usepackage additional command may be defined.
+
+Here we load this special commands/elements if available.
+=end
   def << ( content )
     @content << content
     #Load new additionals makros if available
-    makrodefinitions = 'packages/docgenerator_' + content + '.rb'
+    makrodefinitions = 'docgenerator/packages/' + content + '.rb'
     begin
       @log.debug("usepackage: Try to load #{makrodefinitions}") if @log.debug?
       require makrodefinitions 
@@ -471,9 +828,11 @@ class Usepackage < Element
     end 
   end  
   
-  #Redefine standard output. 
-  #Options are given, if an option is available.
-  #~ add_output( :latex,  '\usepackage[#{@attr[:option]}]{#{@content}}' )
+=begin rdoc
+Redefine standard output. 
+Options are given, if an option is available.
+=end
+  #~ add_latex_output '\usepackage[#{@attr[:option]}]{#{@content}}'
   def to_latex( options = {} )
     cmd = linebreak(@crbefore)
     cmd << '\usepackage'
@@ -483,6 +842,9 @@ class Usepackage < Element
     cmd << linebreak(@crafter)
     return cmd
   end
+=begin rdoc
+Not used in HTML
+=end
   def to_html( options = {} )
     return ''
   end
@@ -492,147 +854,416 @@ end  #Usepackage
 
 #~ :em  => {}, #complete it
 #~ :code  => {}, #complete it
-Element.create( [:font], {
-      :size    =>  Attribute.create([:html], [ Fixnum ]),
-    },true, 
-  {  :htmltag => 'font',
-    #~ :latex  => '\tiny ' #+ ' #{linebreak(@crafter)}'
-  } )
-#Fixme: Jeweils :tinytex f�r ungeklammerte
-Element.create( [:tiny ], {},true, 
-  {  :html  => '<span style="font-size:xx-small">#{@content}</span>',
-    :latex  => '#{linebreak(@crbefore)}{\tiny  #{@content}}#{linebreak(@crafter)}' #+ ' #{linebreak(@crafter)}'
-  } )
-Element.create( [:scriptsize ], {},true, 
-  {  :html  => '<span style="font-size:x-small">#{@content}</span>',
-    :latex  => '#{linebreak(@crbefore)}{\scriptsize  #{@content}}#{linebreak(@crafter)}' #+ ' #{linebreak(@crafter)}'
-  } )
-Element.create( [:footnotesize ], {},true, 
-  {  :html  => '<span style="font-size:x-small">#{@content}</span>',
-    :latex  => '#{linebreak(@crbefore)}{\footnotesize  #{@content}}#{linebreak(@crafter)}' #+ ' #{linebreak(@crafter)}'
-  } )
-#fixme \small oder {\small ..}  
-Element.create( [:small ], {},true, 
-  {  #:html => '<span style="font-size:small">#{@content}</span>',
-    :htmltag  => 'small',
-    :latex  => '#{linebreak(@crbefore)}{\small #{@content}}#{linebreak(@crafter)}' #+ ' #{linebreak(@crafter)}'
-  } )
-Element.create( [:normalsize ], {},true, 
-  {  :html  => '<span style="font-size:medium">#{@content}</span>',
-    :latex  => '#{linebreak(@crbefore)}{\normalsize  #{@content}}#{linebreak(@crafter)}' #+ ' #{linebreak(@crafter)}'
-  } )
-Element.create( [:large ], {},true, 
-  {  :html  => '<span style="font-size:large">#{@content}</span>',
-    :latex  => '#{linebreak(@crbefore)}{\large  #{@content}}#{linebreak(@crafter)}' #+ ' #{linebreak(@crafter)}'
-  } )
-Element.create( [:Large ], {},true, 
-  {  :html  => '<span style="font-size:x-large">#{@content}</span>',
-    :latex  => '#{linebreak(@crbefore)}{\Large  #{@content}}#{linebreak(@crafter)}' #+ ' #{linebreak(@crafter)}'
-  } )
-Element.create( [:huge ], {},true, 
-  {  :html  => '<span style="font-size:xx-large">#{@content}</span>',
-    :latex  => '#{linebreak(@crbefore)}{\huge  #{@content}}#{linebreak(@crafter)}' #+ ' #{linebreak(@crafter)}'
-  } )
-Element.create( [:Huge ], {},true, 
-  {  :html  => '<span style="font-size:xx-large">#{@content}</span>',
-    :latex  => '#{linebreak(@crbefore)}{\Huge  #{@content}}#{linebreak(@crafter)}' #+ ' #{linebreak(@crafter)}'
-  } )
-
-Element.create( [:textbf, :strong ], {},true, 
-  {  :htmltag  => 'strong',
-    :latex  => '#{linebreak(@crbefore)}\textbf{#{@content}}#{linebreak(@crafter)}',
-    :wiki    => %q|#{linebreak(@crbefore)}'''#{@content}'''#{linebreak(@crafter)}|,
-    :text    => '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}',
-  } )
-Element.create( [:emph ], {},true, 
-  {  :htmltag  => 'em',
-    :latex  => '#{linebreak(@crbefore)}\emph{#{@content}}#{linebreak(@crafter)}',
-    :wiki    => '#{linebreak(@crbefore)}''#{@content}''#{linebreak(@crafter)}',
-    :text    => '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}',
-  } )
-
-Element.create( [:stroke ], {},true, 
-  {  #:html => '<span style="font-size:small">#{@content}</span>',
-    :htmltag  => 's',
-    #~ :latex  => '#{linebreak(@crbefore)}{\stroke #{@content}}#{linebreak(@crafter)}' #+ ' #{linebreak(@crafter)}'
-  } )
-
-Element.create( [:underline ], {},true, 
-  {  #:html => '<span style="font-size:small">#{@content}</span>',
-    :htmltag  => 'undeline',
-    :latex  => '#{linebreak(@crbefore)}{\underline#{@content}}#{linebreak(@crafter)}' #+ ' #{linebreak(@crafter)}'
-  } )
-
-Element.create( [:sup, :textsuperscript ], {}.update(HTML_ATTR_ALL),true, 
-  {  :htmltag  => 'sup',
-    :latex  => '#{linebreak(@crbefore)}\textsuperscript{#{@content}}#{linebreak(@crafter)}',
-    :wiki   => '#{linebreak(@crbefore)}^#{@content}^#{linebreak(@crafter)}',
-    :text   => '#{linebreak(@crbefore)}^#{@content}^#{linebreak(@crafter)}'
-  } )
 
-#
-#Math function: sup
-#~ Element.create( [:latexsup ], {}.update(HTML_ATTR_ALL),false, 
-  #~ {  :html  => 'sup',
-    #~ :latex  => '#{linebreak(@crbefore)}\sup}#{linebreak(@crafter)}'
-  #~ } )
+=begin rdoc
+Define Element :font
+
+Create an instance with
+  element( :font, [ attributes, [content]] )
+or
+  Font.new( [ attributes, [content]] )
+Attributes may be:
+* :size: 
+=end
+class Font < Element
+  add_attribute :size, Attribute.create([:html], [ Fixnum ])
+  add_html_tag 'font'
+end #Font
+
+=begin rdoc
+Define Element :tiny
+
+Create an instance with
+  element( :tiny, [ attributes, [content]] )
+or
+  Tiny.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Tiny < Element
+  add_html_output '<span style="font-size:xx-small">#{@content}</span>'
+  add_latex_output '#{linebreak(@crbefore)}{\tiny  #{@content}}#{linebreak(@crafter)}'
+end #Tiny
+
+=begin rdoc
+Define Element :scriptsize
+
+Create an instance with
+  element( :scriptsize, [ attributes, [content]] )
+or
+  Scriptsize.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Scriptsize < Element
+  add_html_output '<span style="font-size:x-small">#{@content}</span>'
+  add_latex_output '#{linebreak(@crbefore)}{\scriptsize  #{@content}}#{linebreak(@crafter)}'
+end #Scriptsize
+
+=begin rdoc
+Define Element :footnotesize
+
+Create an instance with
+  element( :footnotesize, [ attributes, [content]] )
+or
+  Footnotesize.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Footnotesize < Element
+  add_html_output '<span style="font-size:x-small">#{@content}</span>'
+  add_latex_output '#{linebreak(@crbefore)}{\footnotesize  #{@content}}#{linebreak(@crafter)}'
+end #Footnotesize
+
+=begin rdoc
+Define Element :small
+
+Create an instance with
+  element( :small, [ attributes, [content]] )
+or
+  Small.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Small < Element
+  add_html_tag 'small'
+  add_latex_output '#{linebreak(@crbefore)}{\small #{@content}}#{linebreak(@crafter)}'
+end #Small
+
+=begin rdoc
+Define Element :normalsize
+
+Create an instance with
+  element( :normalsize, [ attributes, [content]] )
+or
+  Normalsize.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Normalsize < Element
+  add_html_output '<span style="font-size:medium">#{@content}</span>'
+  add_latex_output '#{linebreak(@crbefore)}{\normalsize  #{@content}}#{linebreak(@crafter)}'
+end #Normalsize
+
+=begin rdoc
+Define Element :large
+
+Create an instance with
+  element( :large, [ attributes, [content]] )
+or
+  Large.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Large < Element
+  add_html_output '<span style="font-size:large">#{@content}</span>'
+  add_latex_output '#{linebreak(@crbefore)}{\large  #{@content}}#{linebreak(@crafter)}'
+end #Large
+
+=begin rdoc
+Define Element :Large
+
+Create an instance with
+  element( :Large, [ attributes, [content]] )
+or
+  LLarge.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class LLarge < Element
+  add_id :Large
+  add_html_output '<span style="font-size:x-large">#{@content}</span>'
+  add_latex_output '#{linebreak(@crbefore)}{\Large  #{@content}}#{linebreak(@crafter)}'
+end #Large
+
+=begin rdoc
+Define Element :huge
+
+Create an instance with
+  element( :huge, [ attributes, [content]] )
+or
+  Huge.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Huge < Element
+  add_html_output '<span style="font-size:xx-large">#{@content}</span>'
+  add_latex_output '#{linebreak(@crbefore)}{\huge  #{@content}}#{linebreak(@crafter)}'
+end #Huge
+
+=begin rdoc
+Define Element :Huge
+
+Create an instance with
+  element( :Huge, [ attributes, [content]] )
+or
+  Huge.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class HHuge < Element
+  add_id :Huge
+  add_html_output '<span style="font-size:xx-large">#{@content}</span>'
+  add_latex_output '#{linebreak(@crbefore)}{\Huge  #{@content}}#{linebreak(@crafter)}'
+end #Huge
+
+=begin rdoc
+Define Element :textbf, :strong
+
+Create an instance with
+  element( :textbf, [ attributes, [content]] )
+  element( :strong, [ attributes, [content]] )
+or
+  Textbf.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Textbf < Element
+  add_id :strong
+  add_html_tag 'strong'
+  add_latex_output '#{linebreak(@crbefore)}\textbf{#{@content}}#{linebreak(@crafter)}'
+  add_wiki_output '#{linebreak(@crbefore)}'''#{@content}'''#{linebreak(@crafter)}'
+  add_text_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
+end #Textbf
+
+=begin rdoc
+Define Element :emph
+
+Create an instance with
+  element( :emph, [ attributes, [content]] )
+or
+  Emph.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Emph < Element
+  add_html_tag 'em'
+  add_latex_output '#{linebreak(@crbefore)}\emph{#{@content}}#{linebreak(@crafter)}'
+  add_wiki_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
+  add_text_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
+end #Emph
+
+=begin rdoc
+Define Element :stroke
+
+Create an instance with
+  element( :stroke, [ attributes, [content]] )
+or
+  Stroke.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+
+Not defined for LaTeX (use of xout-package?)
+=end
+class Stroke < Element
+  add_html_tag 's'
+end #Stroke
+
+=begin rdoc
+Define Element :underline
+
+Create an instance with
+  element( :underline, [ attributes, [content]] )
+or
+  Underline.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Underline < Element
+  add_html_tag 'u'
+  add_latex_output '#{linebreak(@crbefore)}\underline{#{@content}}#{linebreak(@crafter)}'
+end #Underline
+
+=begin rdoc
+Define Element :sup, :textsuperscript
+
+Create an instance with
+  element( :sup, [ attributes, [content]] )
+  element( :textsuperscript, [ attributes, [content]] )
+or
+  Sup.new( [ attributes, [content]] )
+Attributes may be:
+* :lang: 
+* HTML_ATTR_CORE, HTML_ATTR_I18N, HTML_ATTR_EVENTS
+=end
+class Sup < Element
+  add_id :textsuperscript
+  add_attributes HTML_ATTR_CORE
+  add_attributes HTML_ATTR_I18N
+  add_attributes HTML_ATTR_EVENTS
+  add_attribute :lang, ATTR_LANG
+  add_html_tag 'sup'
+  add_latex_output '#{linebreak(@crbefore)}\textsuperscript{#{@content}}#{linebreak(@crafter)}'
+  add_wiki_output '#{linebreak(@crbefore)}^#{@content}^#{linebreak(@crafter)}'
+  add_text_output '#{linebreak(@crbefore)}^#{@content}^#{linebreak(@crafter)}'
+end #Sup
+=begin rdoc
+Define Element :sub
+
+Create an instance with
+  element( :sub, [ attributes, [content]] )
+or
+  Sub.new( [ attributes, [content]] )
+Attributes may be:
+* :lang: 
+* HTML_ATTR_CORE, HTML_ATTR_I18N, HTML_ATTR_EVENTS
+=end
+class Sub < Element
+  add_attributes HTML_ATTR_CORE
+  add_attributes HTML_ATTR_I18N
+  add_attributes HTML_ATTR_EVENTS
+  add_attribute :lang, ATTR_LANG
+  add_html_tag 'sub'
+end #Sub
+
+=begin rdoc
+Define Element :newpage
+
+Create an instance with
+  element( :newpage, [ attributes, [content]] )
+or
+  Newpage.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Newpage < Element
+  has_no_content
+  add_latex_output '#{linebreak(@crbefore)}\newpage #{linebreak(@crafter)}'
+end #Newpage
+
+=begin rdoc
+Define Element :clearpage
+
+Create an instance with
+  element( :clearpage, [ attributes, [content]] )
+or
+  Clearpage.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Clearpage < Element
+  has_no_content
+  add_latex_output '#{linebreak(@crbefore)}\clearpage  #{linebreak(@crafter)}'
+end #Clearpage
+
+=begin rdoc
+Define Element :twocolumn
+
+Create an instance with
+  element( :twocolumn, [ attributes, [content]] )
+or
+  Twocolumn.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Twocolumn < Element
+  has_no_content
+  add_latex_output '#{linebreak(@crbefore)}\twocolumn  #{linebreak(@crafter)}'
+end #Twocolumn
+
+=begin rdoc
+Define Element :centering
+
+Please check also Center.
+Maybe, thats the better soultion.
+
+Create an instance with
+  element( :centering, [ attributes, [content]] )
+or
+  Centering.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+
+
+fixme: TeX kein content, HTML hat content
+=end
+class Centering < Element
+  has_no_content false
+  add_html_tag 'center'
+  add_latex_output '\centering  #{linebreak(@crafter)}'
+end #Centering
+
+
+=begin rdoc
+Define Element :input
+
+Only LaTeX
+
+Create an instance with
+  element( :input, [ attributes, [content]] )
+or
+  Input.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Input < Element
+  add_latex_output '#{linebreak(@crbefore)}\input{#{@content}}#{linebreak(@crafter)}'
+end #Input
+
+=begin rdoc
+Define Element :include
+
+Create an instance with
+  element( :include, [ attributes, [content]] )
+or
+  Include.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+class Include < Element
+  add_latex_output '#{linebreak(@crbefore)}\include{#{@content}}#{linebreak(@crafter)}'
+end #Include
+
+=begin rdoc
+Define Element :img, :includegraphics
+
+Create an instance with
+  element( :img, [ attributes, [content]] )
+  element( :includegraphics, [ attributes, [content]] )
+or
+  Img.new( [ attributes, [content]] )
+Attributes may be:
+* :src: 
+* :alt: 
+* :width: String for \textwidth... for HTML use CSS
+* :height: String for \textwidth... for HTML use CSS
+* :border: 
+* :longdesc: 
+* :usemap: 
+* :name: 
+* :angle: 
+* :align: 
+* :id: 
+* :class: 
+* :title: 
+* HTML_ATTR_CORE
+=end
+class Img < Element
+  add_id :includegraphics
+  has_no_content ENDTAG
+  add_attributes HTML_ATTR_CORE
+  add_attribute :align, HTML_ATTR_ALIGN
+  add_attribute :src, Attribute.create([:html, :latex, :required], [ String ], 1)
+  add_attribute :alt, Attribute.create([:html], [String], 2  )
+  add_attribute :width, Attribute.create([:texkeyval], [Integer, String]  )#String for \textwidth... for HTML use CSS
+  add_attribute :height, Attribute.create([:texkeyval], [Integer, String]  )
+  add_attribute :border, Attribute.create([:html], [Integer]  )
+  add_attribute :longdesc, Attribute.create([:html], [String]  )
+  add_attribute :usemap, Attribute.create([:html], [String]  )
+  add_attribute :name, Attribute.create([:html], [String]  )
+  add_attribute :angle, Attribute.create([:texkeyval], [Integer]  )
+  add_attribute :align, HTML_ATTR_ALIGN
+  add_html_tag 'img'
+  add_latex_output '#{linebreak(@crbefore)}\includegraphics[#{texkeyval}]{#{@attr[:src]}}#{linebreak(@crafter)}'
+end #Img
+
+=begin rdoc
+Define Element :verb
+
+Create an instance with
+  element( :verb, [ attributes, [content]] )
+or
+  Verb.new( [ attributes, [content]] )
+Attributes may be:
+* HTML_ATTR_CORE
+
+See also Environments::Verbatim
+=end
+class Verb < Element
+  add_attributes HTML_ATTR_CORE
+    #This builds a new block
+    #~ :htmltag	=> 'pre',
+    #With "display: inline" the element is continued correct, but <pre starts on new line. 
+    #~ :html	=> '#{linebreak(@crbefore)}<pre style = "display: inline">#{@content}</pre>#{linebreak(@crafter)}',
+    #fixme font tt
+    #~ :html	=> '#{linebreak(@crbefore)}<span style = "display: inline;white-space:pre;font-family:monospace">#{@content}</span>#{linebreak(@crafter)}',
+  add_html_output	'#{linebreak(@crbefore)}<span style = "display: inline;white-space:pre;font-family:monospace">#{@content.join.gsub(/</, \'&lt;\').gsub(/>/, \'&gt;\')}</span>#{linebreak(@crafter)}'
+  add_latex_output '#{linebreak(@crbefore)}\verb|#{@content}|#{linebreak(@crafter)}'
+  add_text_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
+end #Verb
 
-Element.create( [:sub ], {}.update(HTML_ATTR_ALL),true, 
-  {  :htmltag  => 'sub',
-    #:latex  => '\emph{#{@content}}'
-  } )
 
-  
-Element.create( [:newpage ], {},false, 
-  {  #:htmltag => '',
-    :latex  => '#{linebreak(@crbefore)}\newpage #{linebreak(@crafter)}'
-  } )
-Element.create( [:clearpage ], {},false, 
-  {  #:htmltag => '',
-    :latex  => '#{linebreak(@crbefore)}' + '\clearpage ' + ' #{linebreak(@crafter)}'
-  } )
-Element.create( [:twocolumn ], {},false, 
-  {  #:htmltag => '',
-    :latex  => '#{linebreak(@crbefore)}' + '\twocolumn ' + ' #{linebreak(@crafter)}'
-  } )
-#fixme: TeX kein content, HTML hat content
-Element.create( [:centering ], {},false, 
-  {  :htmltag  => 'center',
-    :latex  => '\centering ' + ' #{linebreak(@crafter)}'
-  } )
-
-#~ :link  => {}, #complete it
-#~ :center  => {}, #complete it
-#~ :map  => all.update({}), #complete it
-#~ :area  => all.update({}), #complete it
-#~ :option=> {:value=>nil}, #complete it
-#~ :select=> events.update({}), #complete it
-
-Element.create( :input, {}, true, {
-    :latex  => '#{linebreak(@crbefore)}\input{#{@content}}#{linebreak(@crafter)}'
-    } )
-Element.create( :include, {}, true, {
-    :latex  => '#{linebreak(@crbefore)}\include{#{@content}}#{linebreak(@crafter)}'
-  } )
-
-
-Element.create( [:img, :includegraphics],
-  {
-    :src    =>  Attribute.create([:html, :latex, :required], [ String ], 1),
-    :alt    =>  Attribute.create([:html], [String], 2  ),
-    :style  =>  Attribute.create([:html], [String]  ),
-    :width  =>  Attribute.create([:texkeyval], [Integer, String]  ),  #String for \textwidth... for HTML use CSS
-    :height  =>  Attribute.create([:texkeyval], [Integer, String]  ),  #String for \textwidth... for HTML use CSS
-    :border  =>  Attribute.create([:html], [Integer]  ),
-    :longdesc  =>  Attribute.create([:html], [String]  ),
-    :usemap  =>  Attribute.create([:html], [String]  ),
-    :name  =>  Attribute.create([:html], [String]  ),
-    :angle  =>  Attribute.create([:texkeyval], [Integer]  ),  #Rotation angle.
-    :align  =>  HTML_ATTR_ALIGN,
-  }.update(HTML_ATTR_CORE), ENDTAG,
-  {  #:html => '<span style="font-size:xx-small">#{@content}</span>',
-    :htmltag  => 'img',
-    :latex  => '#{linebreak(@crbefore)}\includegraphics[#{texkeyval}]{#{@attr[:src]}}#{linebreak(@crafter)}' 
-  }
-)
 
+end #module Elements
+end #module Docgenerator