docgenerator 1.0.4 → 1.1.1

data/lib/docgenerator_environments.rb

@@ -47,8 +47,16 @@ Element.create( [:landscape ], {}, true,
 	} )
 
 Element.create( [:verb ], HTML_ATTR_CORE, true, 
-	{	:htmltag	=> 'pre',	#fixme
+	{	
+    #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)}',
+    :html	=> '#{linebreak(@crbefore)}<span style = "display: inline;white-space:pre;font-family:monospace">#{@content.join.gsub(/</, \'&lt;\').gsub(/>/, \'&gt;\')}</span>#{linebreak(@crafter)}',
 		:latex	=> '#{linebreak(@crbefore)}\verb|#{@content}|#{linebreak(@crafter)}'
+		#~ :latex	=> '#{linebreak(@crbefore)}\verb{#{@content}}#{linebreak(@crafter)}'
 	} )
   
 class Verbatim < Environment
@@ -57,7 +65,25 @@ class Verbatim < Environment
   }.update(HTML_ATTR_ALL))
   
 	Element.add( [:verbatim, :pre],  Verbatim)
-	def htmltag(); 'pre'	end
+	#~ def htmltag(); 'pre'	end
+  def to_html(options = {})
+    o = Docgenerator_logger.set_option_defaults(options)
+    html  = String.new()
+    html  <<  "\n" if @crbefore
+    html  << "<pre"
+    @attr.sort_by{|k,v|   v.sortkey }.each{|k,v|
+      html << " #{k} = \"#{v}\" " if v.to_s != '' and v.html?
+    }
+    html << ">"
+    html  <<"\n" if @crmid
+    #~ html << "#{@content.to_html(options)}"
+    html << @content.join.gsub(/</, '&lt;').gsub(/>/, '&gt;')
+    html  << "\n" if @crmid and @content.size > 0 and html[-1,1] != "\n"
+    html << "</pre>"
+    html  <<  "\n" if @crafter
+    return html
+  end  #to_html
+  
 	def to_text(options = {}); "#{content}"	end
 	def to_wiki(options = {} ); " #{content}"	end
 	def to_latex(options = {}  )

data/lib/docgenerator_footnote.rb

@@ -1,62 +1,3 @@
-#
-# Footnotes
-#
-class Footnote < Element
-	Element.add( [:footnote ],  Footnote)
-	add_attributes( 		{
-			:counter => Attribute.create(),
-			:groupid => Attribute.create()
-		}.update(HTML_ATTR_ALL)
-	)
-  #The footnote group for the corresponding footnote
-  attr_reader :group
-	def counter()
-		if ! @attr[:counter].filled?
-			groupid = @attr[:groupid].content[0]
-      Footnotegroup.get( groupid )  << self
-			@attr[:counter]		<< Footnotegroup.get( groupid ).size
-		end
-		return @attr[:counter].content
-	end
-  def link()
-    link = "foot"
-    if @attr[:groupid].content[0]
-      link << "#{@attr[:groupid]}-"
-    end
-    link << self.counter().to_s
-    link
-  end
-	def to_html( options={} )
-		cmd	= ''
-		cmd	<<	"\n" if @crbefore
-		if Footnotegroup.get( @attr[:groupid].content[0] ).html_link
-			cmd	<<	"<sup><a href=\"##{link}\">#{counter}</a></sup>"
-		else
-			cmd	<<	"<sup>#{counter}</sup>"
-		end
-		cmd	<<	"\n" if @crafter
-		return cmd
-	end
-	def to_latex( options={} )
-		cmd	= ''
-		cmd	<<	"\n" if @crbefore
-		cmd	<<	"\\footnote{#{@content.to_latex(options)}}"
-		cmd	<<	"\n" if @crafter
-		return cmd
-	end
-	def to_text(options={})
-		cmd = ''
-		cmd	<<	"\n" if @crbefore
-    cmd << "(#{counter})"
-		cmd	<<	"\n" if @crafter
-    return cmd
-	end
-  alias :to_wiki :to_text
-	def get_content()
-		return @content
-	end
-end
-
 #Attention!
 #
 #This is a 'global' group.
@@ -64,24 +5,12 @@ end
 #
 #may be fixed in the future.
 class Footnotegroup
-	@@all	= { }
-	#Use
-	#	Footnotegroup.get
-	#to get the collected footnotes.
-	#It is not a good idea to use this with LaTeX, because LaTeX makes it automatic.
-	#(But you can try it with tables).
-	def self.get( groupid = nil )
-		if ! @@all[groupid]
-			@@all[groupid] = self.new( groupid )
-		end
-		return @@all[groupid]
-	end
-  #Ugly -- When you create multiple documents, you get a common Footnotegroup.
-  #Here you can clear it.
-	def self.clear()
-    @@all	= { }    
-  end
-	def initialize( groupid )
+  #Define a default key for the footnotes.
+  #Used as part of the link.
+  DEFAULTGROUPID = 'footnote'
+  DEFAULTGROUPID.freeze
+  #Build a new footnote group.
+	def initialize( groupid = DEFAULTGROUPID)
 		@groupid		= groupid
 		@footnotes	= []
 		@attr		= {}
@@ -89,6 +18,7 @@ class Footnotegroup
 	end
 	#Flag, if the footnote and the footnote mark should be linked.
 	attr_accessor :html_link
+	attr_reader :groupid
 	def attr=( attr )
 		@attr = attr
 	end
@@ -105,9 +35,9 @@ class Footnotegroup
 			#~ ul << element(:sup, {}, f.counter )
 			ul << footnotemark = element(:sup)
 			if @html_link
-				footnotemark  << element(:label, { :name => "#{f.link}" }, f.counter )
+				footnotemark  << element(:label, { :name => "#{f.link}" }, f.label )
 			else
-				footnotemark  << f.counter
+				footnotemark  << f.label
 			end
 			ul << f.get_content
 			ul << element(:br).cr
@@ -116,6 +46,69 @@ class Footnotegroup
 	end
 end #Footnotegroup
 
+#
+# Footnotes
+#
+class Footnote < Element
+	Element.add( [:footnote ],  Footnote)
+	add_attributes( 		{
+			:label   => Attribute.create(),
+			:group  => Attribute.create([:required], [Footnotegroup] )
+		}.update(HTML_ATTR_ALL)
+	)
+  #The footnote group for the corresponding footnote
+  attr_reader :group
+  #Label of the footnote
+  attr_reader :label
+  
+  def initialize( attr={}, content = nil)
+    super
+    @group = attr[:group]
+    #@group must be defined!
+    #This is only a dummy group. it will be lost for overviews.
+    if ! @group.is_a?(Footnotegroup)
+      @group = Footnotegroup.new()
+      @log.error( "Footnote: No group assigned. Build a new group") if @log.error?
+    end
+    
+    @group << self
+    @label = ( attr[:label] ? attr[:label] : @group.size )
+  end
+  def link()
+    "#{@group.groupid}-#{self.label}"
+  end
+	def to_html( options={} )
+		cmd	= ''
+		cmd	<<	"\n" if @crbefore
+		if @group.html_link
+			cmd	<<	"<sup><a href=\"##{link}\">#{label}</a></sup>"
+		else
+			cmd	<<	"<sup>#{label}</sup>"
+		end
+		cmd	<<	"\n" if @crafter
+		return cmd
+	end
+	def to_latex( options={} )
+		cmd	= ''
+		cmd	<<	"\n" if @crbefore
+		cmd	<<	"\\footnote{#{@content.to_latex(options)}}"
+		cmd	<<	"\n" if @crafter
+		return cmd
+	end
+	def to_text(options={})
+		cmd = ''
+		cmd	<<	"\n" if @crbefore
+    cmd << "(#{label})"
+		cmd	<<	"\n" if @crafter
+    return cmd
+	end
+  alias :to_wiki :to_text
+	def get_content()
+		return @content
+	end
+end #Footnote
+
+
 
 Element.create( [:footnotemark ], {}.update(HTML_ATTR_ALL),true, 
 	{	:htmltag	=> 'sup',

data/lib/docgenerator_sections.rb

@@ -21,7 +21,7 @@ sect = Struct.new( 'Sections', :keys, :wiki, :html, :tex )
 	sect.new( [:h3, :subsubsection], 4,	'h3', 'subsubsection'),
 	sect.new( [:h4, :paragraph],	5,	'h4', 'paragraph'),
 	sect.new( [:h5, :subparagraph],	6,	'h5', 'subparagraph'),
-	sect.new( [:minisec],			7,	'h5', 'minisec'),
+	sect.new( [:h6, :minisec],			7,	'h6', 'minisec'),
 ].each{ |s|
 	Element.create( s.keys,	{
 		:short	=> Attribute.create( [ :latex ] ),

data/lib/docgenerator_tabular.rb

@@ -337,8 +337,7 @@ Element.create( [:endlastfoot ], {},false,
 class Column < Element
 	#Make the key known to the complete key-list of elements.
 #~ :th	=> {:colspan => nil, :rowspan => nil, :align=>align, :valign=>valign, :border=>nil, :width=>nil},#complete it
-#~ :td	=> nil,	#like :th
-	Element.add( [:col, :column, :td, :th],  Column )
+	Element.add( [:col, :column, :td ],  Column )
 	add_attributes( HTML_ATTR_ALL )
 	add_attributes( { 
 		:width 	=> Attribute.create( [ :html ] ),
@@ -357,7 +356,6 @@ class Column < Element
 	end
 	def content?; :empty_ok; end
 	def htmltag()
-#	fixme th for head	
 		return 'td'
 	end
   def to_text(options={}); return "#{@content.to_text(options).strip}\n"; end
@@ -366,6 +364,13 @@ class Column < Element
 		return "<Class Column @content=#{@content.inspect}>"
 	end
 end #Columns
+#Header cell (only for HTML
+class Column_th < Column
+	Element.add( [:th ],  Column_th )
+	def htmltag()
+		return 'th'
+	end
+end
 class Multicolumn < Column
 	#Make the key known to the complete key-list of elements.
 	Element.add( [:multicolumn],  Multicolumn )

data/lib/packages/docgenerator_beamer.rb

@@ -0,0 +1,253 @@
+#
+# The text 'Beamer' must be part of this template.
+# Without it, the title-Class will not use the short version for title.#
+#
+DocumentTemplate.new(:beamer, :latex, %q|<<prefix>>
+  % ----------------------------------------------------------------
+  % For Usage with Beamer
+  % ----------------------------------------------------------------
+  <<head>>
+  % ----------------------------------------------------------------
+  \begin{document}
+  <<body>>
+  \end{document}
+  % ----------------------------------------------------------------
+|.gsub(/^\s*/, ''))
+DocumentTemplate.new(:beamerhead, :latex, %q|<<prefix>>
+  \documentclass[<<classoptions>>]{beamer}
+  %<<theme>>
+  \usepackage{babel}
+  \usepackage[ansinew]{inputenc}
+  \usepackage{beamertool}
+  \usepackage{hyperref}
+  % ----------------------------------------------------------------
+  <<head>>
+|.gsub(/^\s*/, ''))
+[	
+  :beamerthemebars, :beamerthemeboxes, :beamerthemeclassic,
+  :beamerthemelined, :beamerthemeplain, :beamerthemesidebar,
+  :beamerthemesidebardark, :beamerthemesidebardarktab,
+  :beamerthemesidebartab, :beamerthemesplit,
+  :beamerthemesplitcondensed, :beamerthemetree,
+  :beamerthemevcd,
+  :beamerthemegemeinschaftsauto
+].each{ |theme|
+  DocumentTemplate.new(theme, :latex, DocumentTemplate[:beamerhead].template.sub(/%<<theme>>/, "\\usepackage{#{theme}}"))
+}
+DocumentTemplate.new(:beamerarticle, :latex, %q|<<prefix>>
+  \documentclass[class=scrartcl,<<classoptions>>]{beamer}
+  \usepackage{babel}
+  \usepackage{beamerbasearticle}
+  \usepackage[article]{beamertool}
+  \usepackage[ansinew]{inputenc}
+  \usepackage{hyperref}
+  % ----------------------------------------------------------------
+  <<head>>
+|.gsub(/^\s*/, ''))
+
+
+#Define TeX-Kommands
+
+#frame -- environment.
+#options
+#~ Element.create( :frame, {}, true, {
+  #~ :latex => '#{linebreak(@crbefore)}\frame{#{@content}}#{linebreak(@crafter)}'
+  #~ } )
+  
+class Frame < Element
+  add_attributes( {
+    :options	=> Attribute.create( [ :latex ], [nil, 'fragile', 't', 'b'] ),
+  }.update( HTML_ATTR_ALL ) )
+  Element.add( [:frame],  Frame)
+  #Returns a div-element.
+  #The class for the css is set to 'frame' (if not defined before).
+  def htmltag( )
+    if @attr[:class].content.empty?
+      @attr[:class]	<< :frame
+    end
+    'div' 
+  end
+  def to_latex( options = {} )
+    option	= "[#{@attr[:options].content.join(',')}]"
+    option	= nil if option == '[]'
+    label = nil
+    label = element(:label,{:name => @attr[:id]}).cr.to_latex(options) unless @attr[:id].content.empty?
+    #~ return "#{linebreak(@crbefore)}\\frame#{option}{\n#{@content}}#{linebreak(@crafter)}"
+    return "#{linebreak(@crbefore)}\\begin{frame}#{option}\n#{label}#{@content.to_latex(options)}\n\\end{frame}#{linebreak(@crafter)}"
+  end
+end
+
+#
+#Frametitle.
+#Can be changed by
+#	Element.get( :frametitle ).class_eval( "def htmltag(); 'h4'; end")
+Element.create( :frametitle, { }, true, {
+  :latex	=> '#{linebreak(@crbefore)}\frametitle{#{@content}}#{linebreak(@crafter)}',
+  :htmltag	=> 'p', #'h4',
+  :html	=> '#{linebreak(@crbefore)}<#{htmltag} class = "frametitle">#{@content}</#{htmltag}>#{linebreak(@crafter)}',
+  } )
+
+Element.create( :block, {
+    :title	=> Attribute.create( [ :latex ] ),
+  }, true, {
+    :latex => '#{linebreak(@crbefore)}' + '\begin{block}{#{@attr[:title]}}' + '#{linebreak(@crmid)}' + '#{@content}\end{block}' + '#{linebreak(@crafter)}'
+  } )
+
+#
+# Notes in Beamer.
+#
+Element.create( :note, { }, true, {
+  :latex	=> '#{linebreak(@crbefore)}\note{#{@content}}#{linebreak(@crafter)}',
+  :htmltag	=> 'p', #'h4',
+  :html	=> '#{linebreak(@crbefore)}<#{htmltag} class = "note">#{@content}</#{htmltag}>#{linebreak(@crafter)}',
+  } )
+
+#\framePic{filename}{
+#	description
+#}
+#~ Element.create( :framepic, {	:file	=> Attribute.create( [ :required ] ), 
+          #~ :link	=> Attribute.create( )
+        #~ }, true, {
+  #~ :latex => '\framePic{#{@attr[:file]}}{#{@content}}'
+  #~ } )
+
+Element.create( :institute, {
+  }, true, {
+    :latex => '#{linebreak(@crbefore)}' + '\institute{#{@content}}' + '#{linebreak(@crafter)}'
+  } )
+
+Element.create( :subtitle, {
+  }, true, {
+    :latex => '#{linebreak(@crbefore)}' + '\subtitle{#{@content}}' + '#{linebreak(@crafter)}'
+  } )
+
+begin
+#define Knut::Picture
+require 'knut_picture'
+rescue
+  #Define Knut::Picture with reduced functionality
+  module Knut
+  class Picture
+    def initialize( filename )	
+      @filename		= filename
+      @basename	= File.basename(@filename)
+      @dir				= File.dirname(@filename)
+      if ! File.exists?( @filename )
+        puts "#{self.class}: #{@filename} not found"
+      else
+        @size			= File.size(@filename)
+        @sizekb		= @size / 1024
+      end
+    end
+    #Filename including the path
+    attr_reader :filename
+    #Directory of the picture
+    attr_reader :dir
+    attr_reader :basename
+    def tech_description()
+      "#{@basename} (#{@sizekb}KB)"
+    end		
+  end
+  end
+end
+
+class Framepic < Element
+  Element.add( [:framepic],  Framepic)
+  add_attributes( {	
+          :file			=>	Attribute.create( [ :required ] ), 
+          :link			=>	Attribute.create( [ :latex ]),  #Hyperlink
+        }.update( HTML_ATTR_ALL ) )
+  #container for the picture
+  def picture()
+    @picture = Knut::Picture.new( @attr[:file].content.first ) if ! @picture
+    @picture
+  end
+  attr_accessor :div_css
+  attr_accessor :img_css
+  attr_accessor :div_class
+  attr_accessor :img_class
+  attr_accessor :picwithname
+  def to_html( options = {})
+    html = []	#element(:div, {:class => :framepic })
+    #~ if @attr[:link].content.size > 0
+      #~ html << "[#{@attr[:link]}]"
+    #~ end
+      
+    html << div_img	= element(:div ).CR
+    if self.picture.href
+      div_img	<< element(:a, { :href => self.picture.href },
+                    img = element(:img )
+                )
+    else
+      div_img	<< img = element(:img )
+    end
+    if self.picture.thumbname	and self.picture.usethumb?
+      img[:src] << self.picture.thumbname
+    else
+      img[:src] << self.picture.filename
+    end
+    @div_css	 = CSS.new() if ! @div_css	
+    div_img[:class]	<< @div_class if @div_class 
+    div_img[:style]	<< @div_css	
+    div_img[:align]	<< 'center'	if div_img[:align].content.empty?
+    img[:class]		<< @img_class if @img_class 
+    img[:style]		<< @img_css	if @img_css
+    if picwithname
+      div_img	<< element(:br ).cr
+      div_img	<< element(:footnotesize, {}, self.picture.tech_description)
+    end
+    html	<< @content
+    return html.to_html(options)
+  end
+  def to_latex( options = {} )
+    result = ""
+    result << "\n" if @crbefore
+    result << "\\framePic"
+    if self.div_css	#Check alignment
+      case self.div_css[:float]
+        when nil, 'left'	#standard
+        when 'right'
+          result << "[right]"
+        else
+          puts "#{__FILE__}##{__LINE__}: Undefined float '#{self.div_css[:float]}' for TeX"
+        end
+    end
+    result << "{#{self.picture.filename}}"
+    if @attr[:link].content.size > 0
+      result << "[#{@attr[:link]}]"
+    end
+    result << "{"
+    result << "\n" if @crmid
+    result << "#{@content.to_latex(options)}"
+    result << "\n" if @crmid
+    result << "}"
+    result << "\n" if @crafter
+    return result
+  end
+end
+
+
+Element.create( :includegraphicsJustified, {}, true, {
+  :latex	=> '\includegraphicsJustified{#{@content}}',
+  :html	=> '<img src = "#{@content}" style = "max-width: 80%" />',
+  } )
+
+#fixme --> docgenerator_color ?
+class Textcolor < Element
+  Element.add( [:textcolor],  Textcolor)
+  add_attributes( {	:mode	=> Attribute.create( [ :required ], [:rgb] ), 
+          :color	=> Attribute.create( [ :required ], [String] ),
+        } ) 
+  def to_latex( options = {})
+    result = ""
+    result << "\n" if @crbefore
+    result << "\\textcolor[#{attr[:mode]}]{#{@attr[:color]}}"
+    result << "\n" if @crmid
+    result << "{"
+    result << "#{@content.to_latex(options)}"
+    result << "\n" if @crmid
+    result << "}"
+    result << "\n" if @crafter
+    return result
+  end
+end

data/lib/packages/docgenerator_scrlettr2.rb

@@ -7,7 +7,7 @@ if __FILE__ == $0
 end
 #~ require 'date' 
 
-DocumentTemplate.add_template( 
+DocumentTemplate.new( 
 	:scrlttr2, :latex, %q|<<prefix>>
 		\documentclass[<<classoptions>>]{scrlttr2}
 		\usepackage{babel}
@@ -22,6 +22,44 @@ DocumentTemplate.add_template(
 		% ----------------------------------------------------------------
 	|)
 
+
+
+class LoadLetterOption < Element
+  Element.add( [:loadletteroption],  LoadLetterOption)
+
+  def to_latex( options = {} )
+		cmd	=	''
+		cmd	<<	"\n" if @crbefore
+		cmd	<<	"\\LoadLetterOption{#{@content.join(',')}}"
+		cmd	<<	"\n" if @crafter
+    return cmd
+  end
+end #LoadLetterOption
+
+#Usage:
+# element(:setkomavar,{:field => field}, .content).cr
+# element(:setkomavar,{:field => field, :fieldtext=>'Text'}, .content).cr
+class Setkomavar < Element
+  Element.add( [:setkomavar],  Setkomavar)
+	add_attributes( {
+			:field	=> Attribute.create( [ :latex, :required ], [Symbol], 1 ),
+			:fieldtext	=> Attribute.create( [ :latex, :required ], [String], 2 ),
+		}#.update(HTML_ATTR_ALL)
+		)
+
+  def to_latex( options = {} )
+		cmd	=	''
+		cmd	<<	"\n" if @crbefore
+		cmd	<<	"\\setkomavar{#{@attr[:field]}}"
+		cmd	<<	"[#{@attr[:fieldtext]}]" if @attr[:fieldtext].filled?
+		cmd	<<	"{#{@content.join(',')}}"
+		cmd	<<	"\n" if @crafter
+    return cmd
+  end
+end #Setkomavar 
+
+
+
 #Example:
 #	letter = Letter.new( {
 #				:address	=> [	'Name',
@@ -38,10 +76,11 @@ class Letter < Environment
 			:address 	=> Attribute.create( [ :latex, :required ] ),
 			:date		=> Attribute.create( [ :latex ], [String] ),	#Date?
 			:opening	=> Attribute.create( [ :latex, :required ] ),
+			:letter_option	=> Attribute.create( [ :latex ] ),	#	F�r \LoadLetterOption
 			:backaddress	=> Attribute.create( [ :latex ] ),	#	R�ucksendeadresse f�ur Fensterbriefumschl�age
 			#~ backaddressseparator Trennzeichen innerhalb der R�ucksendeadresse
 			#~ ccseparator Trennzeichen zwischen Verteilertitel und Verteiler
-			#~ customer Gesch�aftszeilenfeld �Kundennummer�
+			:customer => Attribute.create( [ :latex ] ),	#Gesch�aftszeilenfeld �Kundennummer�
 			#~ emailseparator Trennzeichen zwischen E-Mail-Bezeichner und E-Mail-Adresse
 			#~ enclseparator Trennzeichen zwischen Anlagetitel und Anlagen
 			#~ faxseparator Trennzeichen zwischen Faxbezeichner und Faxnummer
@@ -75,16 +114,20 @@ class Letter < Environment
 
 	def setkomavar( field )
 		if @attr[field].content.size > 0
-			return "\\setkomavar{#{field}}{#{@attr[field]}}\n" 
+			return element(:setkomavar,{:field => field}, @attr[field].content).cr.to_latex
+			#~ return "\\setkomavar{#{field}}{#{@attr[field]}}\n" 
 		else
 			return ''
 		end
 	end
-	def to_latex_environment( environment)
+	def to_latex_environment( environment, options = {} )
 		cmd	=	''
 		cmd	<<	"\n" if @crbefore
 		cmd	<<	"\n\\begin{#{environment}}"
 		cmd	<< "{#{@attr[:address]}}\n"
+    if @attr[:letter_option].filled?
+      cmd << element(:loadletteroption, {}, @attr[:letter_option].content).cr.to_latex(options)
+    end
 		#~ cmd	<< "{"
 		#~ cmd	<< @attr[:address].content.flatten.join( element(:br).to_latex) 
 		#~ cmd	<< "}\n"
@@ -99,10 +142,11 @@ class Letter < Environment
 		cmd	<< setkomavar( :fromphone )
 		cmd	<< setkomavar( :fromurl )
 		cmd	<< setkomavar( :subject)
+		cmd	<< setkomavar( :customer)
 		cmd	<< setkomavar( :invoice)
 		cmd	<< setkomavar( :myref)
 		cmd	<< "\\opening{#{@attr[:opening]}}\n"
-		cmd	<< @content.to_s
+		cmd	<< @content.to_latex(options)
 		cmd	= cmd.chomp + "\n"
 		cmd	<< setkomavar( :signature)
 		cmd	<< "\\closing{#{@attr[:closing]}}\n"
@@ -110,10 +154,10 @@ class Letter < Environment
 		cmd	<<	"\n" if @crafter
 		return cmd
 	end
-	def to_latex( )
-		return to_latex_environment( 'letter' )
+	def to_latex( options = {} )
+		return to_latex_environment( 'letter', options )
 	end
-	def to_html()
+	def to_html( options = {})
 		cmd	=	element( :div ).CR
 		#~ cmd	<<	"\n" if @crbefore
 		cmd	<< anr = element(:p,{}, 'An' )
@@ -123,6 +167,6 @@ class Letter < Environment
 		cmd	<< @content.to_html
 		cmd	<< element(:p,{}, @attr[:closing] )
 		#~ cmd	<<	"\n" if @crafter
-		return cmd.to_html
+		return cmd.to_html(options)
 	end
 end

data/lib/templates/docgenerator_template_css.rb

@@ -23,6 +23,10 @@ class CSS_collection
   def add( key, css)
     @css[key] = css
   end
+  #Get CSS-style for new definition.
+  def []( key )
+    @css[key]
+  end
   #Returns the complete CSS-definition.
   def css()
     css_coll = "/*\n"