docgenerator 2.1.0 → 2.1.1

data/lib/docgenerator/elements.rb

@@ -7,7 +7,7 @@ module Docgenerator
 =begin rdoc
 Module to collect subclasses of class Element
 =end
-module Elements
+  module Elements
 
 #
 #Main document control.
@@ -21,35 +21,35 @@ Create an instance with
   
   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
+    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
+    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
@@ -57,28 +57,28 @@ 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
+    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 '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
-  add_latex_output ''
-  add_context_output ''
-  add_text_output ''
-  add_wiki_output ''
-  add_creole_output ''
-end #Htmldummy
+    class Htmldummy < Element
+      add_id :htmlonly
+      add_html_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
+      add_latex_output ''
+      add_context_output ''
+      add_text_output ''
+      add_wiki_output ''
+      add_creole_output ''
+    end #Htmldummy
 
 
 =begin rdoc
@@ -89,80 +89,96 @@ This parameter are better set with
     :title => 'title'
   )
 =end
-class Title < Element
-  add_attributes HTML_ATTR_ALL
-  add_attribute :short, Attribute.create( [ :html ], nil, 1 )
+    class Title < Element
+      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.
 =end
-  def shortoption( options = {} )
-    @attr[:short].content.compact!  #delete nils.
-    return nil  if ! @attr[:short].filled?
-    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
-      case o[:document].template[:latex].template
-        when /beamer/i, /festodoc/
-          return "[#{@attr[:short].content.join}]" 
-        else
-          o[:log].info("No usage of option short in title") if o[:log].info?          
-      end      
-    else  #no related document
-      o[:log].info("No related document for shortoption") if o[:log].info?
-    end
-    return nil
-  end
+      def shortoption( options = {} )
+        @attr[:short].content.compact!  #delete nils.
+        return nil  if ! @attr[:short].filled?
+        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
+          case o[:document].template[:latex].template
+            when /beamer/i, /festodoc/
+              return "[#{@attr[:short].content.join}]" 
+            else
+              o[:log].info("No usage of option short in title") if o[:log].info?          
+          end      
+        else  #no related document
+          o[:log].info("No related document for shortoption") if o[:log].info?
+        end
+        return nil
+      end
 =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
-    
+      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
+Add subtitle.
+
+subtitle is defined in koma script and used for the title page.
+=end
+    class Subtitle < Element
+      #~ add_id :subtitle
+      add_html_output ''
+      add_latex_output '#{linebreak(@crbefore)}\\subtitle{#{@content}}#{linebreak(@crafter)}'
+      add_context_output ''
+      add_text_output ''
+      add_wiki_output ''
+      add_creole_output ''
+    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(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
+      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(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
 
 =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
+    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   #meta w/o name
-  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
+    class Meta2 < Element
+      has_no_content ENDTAG   #meta w/o name
+      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
@@ -174,10 +190,10 @@ or
 
 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
+    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
@@ -187,10 +203,10 @@ Create an instance with
 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
+    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
@@ -202,10 +218,10 @@ or
 
 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
+    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
@@ -217,10 +233,10 @@ or
 
 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
+    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
@@ -231,10 +247,10 @@ 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
+    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
@@ -245,12 +261,12 @@ 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
+    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.
@@ -259,61 +275,61 @@ This element requires a related document.
 
 For LaTeX \tableofcontents is created, with attribute :as_list you can create a list.
 =end
-class Tableofcontents < Element
-  
-  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 = 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,
-        :pre   => @attr[:pre].content,
-        :post  => @attr[:post].content,
-        :as_list => @attr[:as_list].content.first,
-      }.update(o)
-      tocoptions[:level] = 3 unless tocoptions[:level]
-    case target
-      when :latex
-        if @attr[:as_list].content.first
-          if o[:document]
-            return o[:document].toc(tocoptions).to_doc(target, options)
-          else
-            o[:log].error("No related document for tableofcontents") if o[:log].error?
-            return ''
-          end
-        else
-          return "#{linebreak(@crbefore)}\\tableofcontents #{linebreak(@crafter)}"
+    class Tableofcontents < Element
+      
+      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 = 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,
+            :pre   => @attr[:pre].content,
+            :post  => @attr[:post].content,
+            :as_list => @attr[:as_list].content.first,
+          }.update(o)
+          tocoptions[:level] = 3 unless tocoptions[:level]
+        case target
+          when :latex
+            if @attr[:as_list].content.first
+              if o[:document]
+                return o[:document].toc(tocoptions).to_doc(target, options)
+              else
+                o[:log].error("No related document for tableofcontents") if o[:log].error?
+                return ''
+              end
+            else
+              return "#{linebreak(@crbefore)}\\tableofcontents #{linebreak(@crafter)}"
+            end
+          when :html
+            return to_html(tocoptions)
+          when :wiki, :text
+            if o[:document]
+              return o[:document].toc(tocoptions).to_doc(target, options)
+            else
+              o[:log].error("No related document for tableofcontents") if o[:log].error?
+              return ''
+            end
         end
-      when :html
-        return to_html(tocoptions)
-      when :wiki, :text
+      end
+      #Build toc, if there is a related document.
+      def to_html( 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(tocoptions).to_doc(target, options)
+          return o[:document].toc(options).to_html(options)
         else
           o[:log].error("No related document for tableofcontents") if o[:log].error?
-          return ''
+          return "#{linebreak(@crbefore)}<!-- tableofcontents -->#{linebreak(@crafter)}"
         end
+      end    
     end
-  end
-  #Build toc, if there is a related document.
-  def to_html( 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)
-    else
-      o[:log].error("No related document for tableofcontents") if o[:log].error?
-      return "#{linebreak(@crbefore)}<!-- tableofcontents -->#{linebreak(@crafter)}"
-    end
-  end    
-end
 
 =begin rdoc
 Define Element :listoffigures
@@ -324,10 +340,10 @@ 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
+    class Listoffigures < Element
+      has_no_content false
+      add_latex_output '#{linebreak(@crbefore)}\listoffigures #{linebreak(@crafter)}'
+    end #Listoffigures
 
 
 =begin rdoc
@@ -341,11 +357,11 @@ 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
+    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
@@ -357,10 +373,10 @@ or
 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
+    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
@@ -378,19 +394,19 @@ Attributes may be:
 * 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
+    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
@@ -405,14 +421,14 @@ Attributes may be:
 * 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
+    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
@@ -427,18 +443,18 @@ or
 Attributes may be:
 * :clear: ['all']
 =end
-class Newline < Element
-  add_id "br/"
-  add_id "br"
-  add_id :br
-  has_no_content ENDTAG #br
-  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
+    class Newline < Element
+      add_id "br/"
+      add_id "br"
+      add_id :br
+      has_no_content ENDTAG #br
+      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
@@ -453,18 +469,50 @@ or
 Attributes may be:
 * :clear: 
 =end
-class Hrulefill < Element
-  add_id "hr/"
-  add_id "hr"
-  add_id :hr
-  has_no_content ENDTAG #hr
-  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
+    class Hrulefill < Element
+      add_id "hr/"
+      add_id "hr"
+      add_id :hr
+      has_no_content ENDTAG #hr
+      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 :pagestyle
+
+Create an instance with
+  element( :pagestyle, [ attributes, [content]] )
+or
+  Pagestyle.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+
+See also Docgenerator::Packages::Scrpage2
+=end
+    class Pagestyle < Element
+      #fixme check content only scrheadings, scrplain
+      add_latex_output '#{linebreak(@crbefore)}\pagestyle{#{@content}}#{linebreak(@crafter)}'
+    end #Pagestyle
+
+=begin rdoc
+Define Element :pagestyle
+
+Create an instance with
+  element( :pagestyle, [ attributes, [content]] )
+or
+  Pagestyle.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+
+See also Docgenerator::Packages::Scrpage2
+=end
+    class Thispagestyle < Element
+      #fixme check content only headings, plain...
+      add_latex_output '#{linebreak(@crbefore)}\thispagestyle{#{@content}}#{linebreak(@crafter)}'
+    end #Pagestyle
+    
 =begin rdoc
 Define Element :vspace
 
@@ -474,12 +522,12 @@ 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
+    class Vspace < Element
+      add_latex_output '#{linebreak(@crbefore)}\vspace{#{@content}} #{linebreak(@crafter)}'
+        #:htmltag  => 'hr',
+        #~ :wiki      => '----',
+        #~ :text      => '-' * 25,
+    end #Vspace
 
 =begin rdoc
 Define Element :hspace
@@ -492,9 +540,9 @@ 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
+    class Hspace < Element
+      add_latex_output '#{linebreak(@crbefore)}\hspace{#{@content}} #{linebreak(@crafter)}'
+    end #Hspace
 
 =begin rdoc
 Define Element :vfill
@@ -507,10 +555,10 @@ 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
+    class Vfill < Element
+      has_no_content
+      add_latex_output '#{linebreak(@crbefore)}\vfill #{linebreak(@crafter)}'
+    end #Vfill
 
 =begin rdoc
 Define Element :hfill
@@ -523,10 +571,10 @@ 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
+    class Hfill < Element
+      has_no_content false
+      add_latex_output '#{linebreak(@crbefore)}\hfill #{linebreak(@crafter)}'
+    end #Hfill
 
 =begin rdoc
 Define Element :relax
@@ -537,11 +585,11 @@ 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
+    class Relax < Element
+      has_no_content
+      add_html_tag nil
+      add_latex_output '#{linebreak(@crbefore)}\relax #{linebreak(@crafter)}'
+    end #Relax
 
 
 =begin rdoc
@@ -557,12 +605,12 @@ or
 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
+    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
@@ -579,16 +627,16 @@ Attributes may be:
 * :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}'
-  add_creole_output '#{@content}'
-end #Div
+    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}'
+      add_creole_output '#{@content}'
+    end #Div
 
 
 =begin rdoc
@@ -602,11 +650,11 @@ 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
+    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
@@ -619,10 +667,23 @@ 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
+    class Comment < Element
+      add_html_output '<!-- #{@content} -->'
+      #~ add_latex_output '#{linebreak(@crbefore)}#{@content.gsub(/^/, "%")}#{linebreak(@crafter)}'
+      def to_latex( options = {} )
+        cmd = linebreak(@crbefore)
+        cmd << "%"
+        content = @content.to_latex(options)
+        if content =~ /\n/
+          cmd << content.gsub(/\n/, "\n%")
+        else
+          cmd << content
+        end
+        cmd << "\n"
+        cmd << linebreak(@crafter)
+      end
+      
+    end #Comment
 
 =begin rdoc
 Define Element :url
@@ -641,15 +702,15 @@ Attributes may be:
 * 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)}'
-  add_text_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
-end #Url
+    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)}'
+      add_text_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
+    end #Url
 
 =begin rdoc
 Define Element :ensuremath
@@ -660,11 +721,11 @@ 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
+    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
@@ -673,46 +734,46 @@ The corresponding label should be defined in the same document/file.
 
 For external links use :href.
 =end
-class Href < Element
-  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
-  def to_creole( options = {} )
-    "[[#{@attr[:href].to_s}|#{@content.to_doc(:creole, options)}]]"
-  end
-  def to_latex( options = {} )
-    cmd = linebreak(@crbefore)
-    reference = @attr[:href].to_s
-    if reference.sub!(/\A\#/, '')  #Internal reference
-      cmd << "\\hyperlink{#{reference}}{#{@content.to_doc(:latex, options)}}"
-    else  #external reference
-      #reference may not contain unmasked % or #
-      cmd << "\\href{#{reference}}{#{@content.to_doc(:latex, options)}}"
-    end
-    cmd << linebreak(@crafter)
-    cmd
-  end
-  def to_text( options = {} )
-    if @attr[:href].to_s  == @content
-      @content.to_doc(:text, options)
-    else
-      #~ "<#{@attr[:href].to_s} #{@content}>"  --> Problem: Wird gerne als komplette URL interpreitert
-      "#{@content.to_doc(:text, options)} (#{@attr[:href].to_s})"
+    class Href < Element
+      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
+      def to_creole( options = {} )
+        "[[#{@attr[:href].to_s}|#{@content.to_doc(:creole, options)}]]"
+      end
+      def to_latex( options = {} )
+        cmd = linebreak(@crbefore)
+        reference = @attr[:href].to_s
+        if reference.sub!(/\A\#/, '')  #Internal reference
+          cmd << "\\hyperlink{#{reference}}{#{@content.to_doc(:latex, options)}}"
+        else  #external reference
+          #reference may not contain unmasked % or #
+          cmd << "\\href{#{reference}}{#{@content.to_doc(:latex, options)}}"
+        end
+        cmd << linebreak(@crafter)
+        cmd
+      end
+      def to_text( options = {} )
+        if @attr[:href].to_s  == @content
+          @content.to_doc(:text, options)
+        else
+          #~ "<#{@attr[:href].to_s} #{@content}>"  --> Problem: Wird gerne als komplette URL interpreitert
+          "#{@content.to_doc(:text, options)} (#{@attr[:href].to_s})"
+        end
+      end
     end
-  end
-end
 
 =begin rdoc
 Define Element :label
@@ -728,17 +789,17 @@ Attributes may be:
 * 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
+    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
@@ -759,19 +820,19 @@ Attributes may be:
 * 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
+    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
@@ -792,18 +853,18 @@ Attributes may be:
 * 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
+    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
 
 #
 
@@ -813,53 +874,53 @@ Add a TeX-Makro usepackage.
 This method tries to load the package specific definitions in a file
    docgenerator_<<packagename>>
 =end
-class Usepackage < Element
-  #~ add_attributes( HTML_ATTR_ALL ) 
-  add_attribute :option, Attribute.create( )
+    class Usepackage < Element
+      #~ add_attributes( HTML_ATTR_ALL ) 
+      add_attribute :option, Attribute.create( )
   
 =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 = 'docgenerator/packages/' + content + '.rb'
-    begin
-      @log.debug("usepackage: Try to load #{makrodefinitions}") if @log.debug?
-      require makrodefinitions 
-    rescue LoadError 
-      @log.info("usepackage: No supporting definitions #{makrodefinitions} found") if @log.info?
-    end 
-  end  
+      def << ( content )
+        @content << content
+        #Load new additionals makros if available
+        makrodefinitions = 'docgenerator/packages/' + content + '.rb'
+        begin
+          @log.debug("usepackage: Try to load #{makrodefinitions}") if @log.debug?
+          require makrodefinitions 
+        rescue LoadError 
+          @log.info("usepackage: No supporting definitions #{makrodefinitions} found") if @log.info?
+        end 
+      end  
   
 =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'
-    opt = @attr[:option].content
-    cmd << '[' + opt.join(',') + ']' if opt.size > 0
-    cmd << "{#{@content.join}}"
-    cmd << linebreak(@crafter)
-    return cmd
-  end
+      #~ add_latex_output '\usepackage[#{@attr[:option]}]{#{@content}}'
+      def to_latex( options = {} )
+        cmd = linebreak(@crbefore)
+        cmd << '\usepackage'
+        opt = @attr[:option].content
+        cmd << '[' + opt.join(',') + ']' if opt.size > 0
+        cmd << "{#{@content.join}}"
+        cmd << linebreak(@crafter)
+        return cmd
+      end
 =begin rdoc
 Not used in HTML
 =end
-  def to_html( options = {} )
-    return ''
-  end
-end  #Usepackage
+      def to_html( options = {} )
+        return ''
+      end
+    end  #Usepackage
 
 
 
-#~ :em  => {}, #complete it
-#~ :code  => {}, #complete it
+    #~ :em  => {}, #complete it
+    #~ :code  => {}, #complete it
 
 =begin rdoc
 Define Element :font
@@ -871,10 +932,10 @@ or
 Attributes may be:
 * :size: 
 =end
-class Font < Element
-  add_attribute :size, Attribute.create([:html], [ Fixnum ])
-  add_html_tag 'font'
-end #Font
+    class Font < Element
+      add_attribute :size, Attribute.create([:html], [ Fixnum ])
+      add_html_tag 'font'
+    end #Font
 
 =begin rdoc
 Define Element :tiny
@@ -885,10 +946,10 @@ 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
+    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
@@ -899,10 +960,10 @@ 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
+    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
@@ -913,10 +974,10 @@ 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
+    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
@@ -927,10 +988,10 @@ 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
+    class Small < Element
+      add_html_tag 'small'
+      add_latex_output '#{linebreak(@crbefore)}{\small #{@content}}#{linebreak(@crafter)}'
+    end #Small
 
 =begin rdoc
 Define Element :normalsize
@@ -941,10 +1002,10 @@ 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
+    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
@@ -955,10 +1016,10 @@ 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
+    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
@@ -969,11 +1030,11 @@ 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
+    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
@@ -984,10 +1045,10 @@ 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
+    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
@@ -998,11 +1059,11 @@ 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
+    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
@@ -1014,15 +1075,15 @@ 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)}'
-  #The additional space is wanted (else ** may be a itemize-list)
-  add_creole_output '#{linebreak(@crbefore)} **#{@content}**#{linebreak(@crafter)}'
-  add_text_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
-end #Textbf
+    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)}'
+      #The additional space is wanted (else ** may be a itemize-list)
+      add_creole_output '#{linebreak(@crbefore)} **#{@content}**#{linebreak(@crafter)}'
+      add_text_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
+    end #Textbf
 
 =begin rdoc
 Define Element :emph
@@ -1033,13 +1094,13 @@ 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_creole_output '#{linebreak(@crbefore)}//#{@content}//#{linebreak(@crafter)}'
-  add_text_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
-end #Emph
+    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_creole_output '#{linebreak(@crbefore)}//#{@content}//#{linebreak(@crafter)}'
+      add_text_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
+    end #Emph
 
 =begin rdoc
 Define Element :stroke
@@ -1052,9 +1113,9 @@ 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
+    class Stroke < Element
+      add_html_tag 's'
+    end #Stroke
 
 =begin rdoc
 Define Element :underline
@@ -1065,10 +1126,10 @@ 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
+    class Underline < Element
+      add_html_tag 'u'
+      add_latex_output '#{linebreak(@crbefore)}\underline{#{@content}}#{linebreak(@crafter)}'
+    end #Underline
 
 =begin rdoc
 Define Element :sup, :textsuperscript
@@ -1082,17 +1143,17 @@ 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
+    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
 
@@ -1104,13 +1165,13 @@ 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
+    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
@@ -1121,10 +1182,10 @@ 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
+    class Newpage < Element
+      has_no_content
+      add_latex_output '#{linebreak(@crbefore)}\newpage #{linebreak(@crafter)}'
+    end #Newpage
 
 =begin rdoc
 Define Element :clearpage
@@ -1135,10 +1196,10 @@ 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
+    class Clearpage < Element
+      has_no_content
+      add_latex_output '#{linebreak(@crbefore)}\clearpage  #{linebreak(@crafter)}'
+    end #Clearpage
 
 =begin rdoc
 Define Element :twocolumn
@@ -1149,10 +1210,10 @@ 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
+    class Twocolumn < Element
+      has_no_content
+      add_latex_output '#{linebreak(@crbefore)}\twocolumn  #{linebreak(@crafter)}'
+    end #Twocolumn
 
 =begin rdoc
 Define Element :centering
@@ -1169,11 +1230,11 @@ 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
+    class Centering < Element
+      has_no_content false
+      add_html_tag 'center'
+      add_latex_output '\centering  #{linebreak(@crafter)}'
+    end #Centering
 
 
 =begin rdoc
@@ -1187,9 +1248,9 @@ 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
+    class Input < Element
+      add_latex_output '#{linebreak(@crbefore)}\input{#{@content}}#{linebreak(@crafter)}'
+    end #Input
 
 =begin rdoc
 Define Element :include
@@ -1200,9 +1261,9 @@ 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
+    class Include < Element
+      add_latex_output '#{linebreak(@crbefore)}\include{#{@content}}#{linebreak(@crafter)}'
+    end #Include
 
 =begin rdoc
 Define Element :img, :includegraphics
@@ -1228,24 +1289,25 @@ Attributes may be:
 * :title: 
 * HTML_ATTR_CORE
 =end
-class Img < Element
-  add_id :includegraphics
-  has_no_content ENDTAG   #img"
-  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
+    class Img < Element
+      add_id :includegraphics
+      has_no_content ENDTAG   #img"
+      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_attribute :texoption, Attribute.create([:latex], [ String ])
+      add_html_tag 'img'
+      add_latex_output '#{linebreak(@crbefore)}\includegraphics[#{texkeyval},#{@attr[:texoption]}]{#{@attr[:src]}}#{linebreak(@crafter)}'
+    end #Img
 
 =begin rdoc
 Define Element :verb
@@ -1259,21 +1321,18 @@ Attributes may be:
 
 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)}' #\verb| |
-  #~ add_latex_output '#{linebreak(@crbefore)}\verb{#{@content}}#{linebreak(@crafter)}' #\verb{ }
-  add_text_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
-end #Verb
-
-
-
-end #module Elements
+    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)}' #\verb| |
+      #~ add_latex_output '#{linebreak(@crbefore)}\verb{#{@content}}#{linebreak(@crafter)}' #\verb{ }
+      add_text_output '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}'
+    end #Verb
+  end #module Elements
 end #module Docgenerator