docgenerator 1.0.4 → 1.1.1

data/lib/docgenerator_elements.rb

@@ -1,4 +1,4 @@
-#~ @attr	= {:short=> 1}
+#~ @attr  = {:short=> 1}
 #~ puts "\title#{"[#{@attr[:short]}]" if @attr[:short]}"
 #~ __END__
 
@@ -11,34 +11,34 @@
 #Main document control.
 #
 Element.create( [:head], {}, true, 
-	{	:htmltag => 'head',
-		:latex	=> '#{@content}',
-		:text		=> '#{@content}',
-		:wiki		=> '#{@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}',
-		:text		=> '#{@content}',
-		:wiki		=> '#{@content}',
-	} )
+  {  :htmltag => 'head',
+    :latex  => '#{@content}',
+    :text    => '#{@content}',
+    :wiki    => '#{@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}',
+    :text    => '#{@content}',
+    :wiki    => '#{@content}',
+  } )
 
 Element.create( [:latexdummy, :latexonly ], {},true, 
-	{	:htmltag	=> nil,
-		:html	=> '',
-		:latex	=> '#{@content}'
-	} )
+  {  :htmltag  => nil,
+    :html  => '',
+    :latex  => '#{@content}'
+  } )
 Element.create( [:htmldummy, :htmlonly ], {},true, 
-	{	:html	=> '#{@content}',
-		:latex	=> ''
-	} )
+  {  :html  => '#{@content}',
+    :latex  => ''
+  } )
 
 
 #
@@ -47,89 +47,96 @@ Element.create( [:htmldummy, :htmlonly ], {},true,
 #This parameter are better set with Document.title.
 #
 class Title < Element
-	Element.add( [:title],  Title)
-	add_attributes( {
-			:short	=> Attribute.create( [ :html ], nil, 1 )
-		}.update(HTML_ATTR_ALL)
-		)
-	#Unsaubere realisierung .. fixme
-	def shortoption( options = {} )
-		@attr[:short].content.compact!	#delete nils.
-		return nil	if ! @attr[:short].filled?
+  Element.add( [:title],  Title)
+  add_attributes( {
+      :short  => Attribute.create( [ :html ], nil, 1 )
+    }.update(HTML_ATTR_ALL)
+    )
+  #Unsaubere realisierung .. fixme
+  def shortoption( options = {} )
+    @attr[:short].content.compact!  #delete nils.
+    return nil  if ! @attr[:short].filled?
     o = Docgenerator_logger.set_option_defaults(options)
     o[:log].debug("enter shortoption") if o[:log].debug?
     if o[:document]
-			if o[:document].template[:latex].template.include?('Beamer')
-				return "[#{@attr[:short].content}]" 
-			end      
+      if o[:document].template[:latex].template.include?('Beamer')
+        return "[#{@attr[:short].content}]" 
+      end      
     else
       o[:log].info("No related document for shortoption") if o[:log].info?
     end
     return nil
-	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(@crafter)}')
-	add_output( :text,	"\n" + '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}' + "\n")
-	add_output( :wiki,	'#{linebreak(@crbefore)}' + '=#{@content}=' + ' #{linebreak(@crafter)}')
+  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
+  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( :text,  "\n" + '#{linebreak(@crbefore)}#{@content}#{linebreak(@crafter)}' + "\n")
+  add_output( :wiki,  '#{linebreak(@crbefore)}' + '=#{@content}=' + ' #{linebreak(@crafter)}')
 end
 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	=> '',
-#		:latex	=> '#{linebreak(@crbefore)}' +  '\author{#{@content}}\hypersetup{pdfauthor={#{@content}}}' + ' #{linebreak(@crafter)}'
-	} )
+    :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  => '',
+#    :latex  => '#{linebreak(@crbefore)}' +  '\author{#{@content}}\hypersetup{pdfauthor={#{@content}}}' + ' #{linebreak(@crafter)}'
+  } )
 #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)}'
-	} )
+    :'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)}'
-	} )
+  {  :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)}'
-	} )
+  {  :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)}'
-	} )
+  {  :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)}'
-	} )
+  {  :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)}'
-	} )
+  {  :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)}'
-	#~ } )
+  #~ {  :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)}'
-	} )
+  {  :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)}'
-	#~ } )
+  #~ {  :htmltag  => 'span',  #Empty span
+    #~ :html  => '#{linebreak(@crbefore)}<!-- tableofcontents -->#{linebreak(@crafter)}',
+    #~ :latex  => '#{linebreak(@crbefore)}' +  '\tableofcontents ' + ' #{linebreak(@crafter)}'
+  #~ } )
 
 #Build table of contents.
 #
@@ -137,15 +144,15 @@ Element.create( [:maketitle], {}, false,
 #
 #For LaTeX \tableofcontents is created, with attribute :as_list you can create a list.
 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)
+  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
+  def content?(); return false;   end
   def to_doc( target, options = {} )
     o = Docgenerator_logger.set_option_defaults(options)
     o[:log].debug("enter to_doc(#{target}) for #{self.inspect}, options: #{options.keys.inspect}") if o[:log].debug?
@@ -192,124 +199,124 @@ class Tableofcontents < Element
   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)}'
-	} )
+      :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)}'
-	} )
+      :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",
-		:text		=>	"\n" +  '#{@content}' + "\n",	#siehe experimente/textformat.rb
-		:wiki		=>	"\n" +  '#{@content}' + "\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( [:par, :p],  HTML_ATTR_ALL,  true, 
+  {  :htmltag  =>  'p',
+    :latex    =>  "\n\n" + '#{@content}' + "\n\n",
+    :text    =>  "\n" +  '#{@content}' + "\n",  #siehe experimente/textformat.rb
+    :wiki    =>  "\n" +  '#{@content}' + "\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)}',
-	} )
+    :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)}'
-	} )
+    :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)}'
-	} )
+  {  :htmltag  => nil,
+    :latex  => '#{linebreak(@crbefore)}\vfill #{linebreak(@crafter)}'
+  } )
 Element.create( [:hfill], {},false, 
-	{	:htmltag => nil,
-		:latex	=> '#{linebreak(@crbefore)}\hfill #{linebreak(@crafter)}'
-	} )
+  {  :htmltag => nil,
+    :latex  => '#{linebreak(@crbefore)}\hfill #{linebreak(@crafter)}'
+  } )
 
 Element.create( [:relax], {},false, 
-	{	:htmltag => nil,
-		:latex	=> '#{linebreak(@crbefore)}\relax #{linebreak(@crafter)}'
-	} )
+  {  :htmltag => nil,
+    :latex  => '#{linebreak(@crbefore)}\relax #{linebreak(@crafter)}'
+  } )
 
 #
 #Grouping
 #
-Element.create( [:span, :group],	HTML_ATTR_CORE,	true, 
-	{	:htmltag	=>	'span',
-		:latex	=>	'#{linebreak(@crbefore)}' +  
-					'\bgroup '	+ '#{linebreak(@crmid)}' +
-					'#{@content}'	+ '#{linebreak(@crmid)}' + 
-					'\egroup '	+ '#{linebreak(@crafter)}'
-	} )
+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)}',
+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"
-	} )
+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)}'
-	} )
+Element.create( [:comment],  {},  true, 
+  {  :htmltag  => '<!-- #{@content} -->',
+    :latex  =>  '#{linebreak(@crbefore)}' +  '% ------- #{@content} -------' + ' #{linebreak(@crafter)}'
+  } )
 
 #
 #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)}',
-	} )
+  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}}',
-	} )
+  {},
+  true,
+  {
+    :html  => '#{@content}',
+    :latex  => '\ensuremath{#{@content}}',
+  } )
 
 #
 #Internal reference
@@ -318,286 +325,288 @@ Element.create( [ :ensuremath ],
 #
 #For external links use :href.
 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
-	def to_wiki( options = {} )
-		"[#{@attr[:href].to_s} #{@content.to_doc(:wiki, options)}]"
-	end
-	def to_latex( options = {} )
+  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
+  def to_wiki( options = {} )
+    "[#{@attr[:href].to_s} #{@content.to_doc(:wiki, options)}]"
+  end
+  def to_latex( options = {} )
     cmd = linebreak(@crbefore)
-		reference = @attr[:href].to_s
-		if reference.sub!(/\#/, '')	#Internal reference
-			cmd << "\\hyperlink{#{reference}}{#{@content.to_doc(:latex, options)}}"
-		else	#external reference
-			cmd << "\\href{#{reference}}{#{@content.to_doc(:latex, options)}}"
-		end
+    reference = @attr[:href].to_s
+    if reference.sub!(/\#/, '')  #Internal reference
+      cmd << "\\hyperlink{#{reference}}{#{@content.to_doc(:latex, options)}}"
+    else  #external reference
+      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
+  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
 
 #~ 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}}',
-	#~ } )
+  #~ {  :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)}',
+  {
+    :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)}',
-	} )
+  {  :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		=> '',
-	} )
+  {  :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    => '',
+  } )
 
 #
 
 #
-#TeX-Makro usepackage.
-# Trys to load element definitions 
+#Add a TeX-Makro usepackage.
+#
+#This method tries to load the package specific definitions in a file
+#   docgenerator_<<packagename>>
 #
 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( ) } ) 
-	
-	#With usepackage additional command may be defined.
-	#Here we load this special commands/elements if available.
-	def << ( content )
-		@content << content
-		#Load new makros
-		makrodefinitions = 'docgenerator_' + content + '.rb'
-		begin
-			require makrodefinitions 
-		rescue LoadError 
-		end 
-	end	
-	
-	#Redefine standard output. 
-	#Options are given, if an option is available.
-	#~ add_output( :latex,	'\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}}"
-		cmd << linebreak(@crafter)
-		return cmd
-	end
-	def to_html( options = {} )
-		return ''
-	end
-end	#Usepackage
-
-
-
-#~ :em	=> {}, #complete it
-#~ :code	=> {}, #complete it
+  #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( ) } ) 
+  
+  #With usepackage additional command may be defined.
+  #Here we load this special commands/elements if available.
+  def << ( content )
+    @content << content
+    #Load new makros if available
+    makrodefinitions = 'docgenerator_' + content + '.rb'
+    begin
+      require makrodefinitions 
+    rescue LoadError 
+    end 
+  end  
+  
+  #Redefine standard output. 
+  #Options are given, if an option is available.
+  #~ add_output( :latex,  '\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}}"
+    cmd << linebreak(@crafter)
+    return cmd
+  end
+  def to_html( options = {} )
+    return ''
+  end
+end  #Usepackage
+
+
+
+#~ :em  => {}, #complete it
+#~ :code  => {}, #complete it
 Element.create( [:font], {
-			:size		=>  Attribute.create([:html], [ Fixnum ]),
-		},true, 
-	{	:htmltag => 'font',
-		#~ :latex	=> '\tiny ' #+ ' #{linebreak(@crafter)}'
-	} )
+      :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)}'
-	} )
+  {  :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)}'
-	} )
+  {  :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 ..}	
+  {  :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)}'
-	} )
+  {  #: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)}'
-	} )
+  {  :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)}'
-	} )
+  {  :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)}'
-	} )
+  {  :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)}'
-	} )
+  {  :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)}'
-	} )
+  {  :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)}',
-	} )
+  {  :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)}',
-	} )
+  {  :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)}'
-	} )
+  {  #: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)}'
-	} )
+  {  #: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)}'
-	} )
+  {  :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)}'
-	#~ } )
+  #~ {  :html  => 'sup',
+    #~ :latex  => '#{linebreak(@crbefore)}\sup}#{linebreak(@crafter)}'
+  #~ } )
 
 Element.create( [:sub ], {}.update(HTML_ATTR_ALL),true, 
-	{	:htmltag	=> 'sub',
-		#:latex	=> '\emph{#{@content}}'
-	} )
+  {  :htmltag  => 'sub',
+    #:latex  => '\emph{#{@content}}'
+  } )
 
-	
+  
 Element.create( [:newpage ], {},false, 
-	{	#:htmltag => '',
-		:latex	=> '#{linebreak(@crbefore)}\newpage #{linebreak(@crafter)}'
-	} )
+  {  #:htmltag => '',
+    :latex  => '#{linebreak(@crbefore)}\newpage #{linebreak(@crafter)}'
+  } )
 Element.create( [:clearpage ], {},false, 
-	{	#:htmltag => '',
-		:latex	=> '#{linebreak(@crbefore)}' + '\clearpage ' + ' #{linebreak(@crafter)}'
-	} )
+  {  #:htmltag => '',
+    :latex  => '#{linebreak(@crbefore)}' + '\clearpage ' + ' #{linebreak(@crafter)}'
+  } )
 Element.create( [:twocolumn ], {},false, 
-	{	#:htmltag => '',
-		:latex	=> '#{linebreak(@crbefore)}' + '\twocolumn ' + ' #{linebreak(@crafter)}'
-	} )
+  {  #: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
+  {  :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)}'
+    :latex  => '#{linebreak(@crbefore)}\input{#{@content}}#{linebreak(@crafter)}'
     } )
 Element.create( :include, {}, true, {
-		:latex	=> '#{linebreak(@crbefore)}\include{#{@content}}#{linebreak(@crafter)}'
+    :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)}' 
-	}
+  {
+    :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)}' 
+  }
 )