docgenerator 2.1.0 → 2.1.1

data/lib/docgenerator/environments.rb

@@ -23,7 +23,7 @@ Create an instance with
 or
   Environment.new( [ attributes, [content]] )
 =end
-class Environment < Element
+  class Environment < Element
 =begin rdoc
 Parameters are given as a string (or anything what gives a String with to_s).
 
@@ -31,41 +31,41 @@ It is difficult to make a generic parameter interface.
 
 If needed, redefine the method.
 =end
-	def to_latex_environment( environment, parameter = nil, options={})
-		cmd	=	''
-		cmd	<<	"\n" if @crbefore
-		cmd	<<	"\n\\begin{#{environment}}"
-		cmd	<< parameter.to_s if parameter
-		cmd	<<	"\n" if @crmid
-		cmd	<< @content.to_latex(options)
-		cmd	<<	"\n" if @crmid and cmd[-1,1] != "\n"
-		cmd	<<	"\\end{#{environment}}\n"
-		cmd	<<	"\n" if @crafter
-		return cmd
-	end
+      def to_latex_environment( environment, parameter = nil, options={})
+        cmd	=	''
+        cmd	<<	"\n" if @crbefore
+        cmd	<<	"\n\\begin{#{environment}}"
+        cmd	<< parameter.to_s if parameter
+        cmd	<<	"\n" if @crmid
+        cmd	<< @content.to_latex(options)
+        cmd	<<	"\n" if @crmid and cmd[-1,1] != "\n"
+        cmd	<<	"\\end{#{environment}}\n"
+        cmd	<<	"\n" if @crafter
+        return cmd
+      end
 =begin rdoc
 ConTeXt-environments start with start and end with stop.
 
 Fixme: Parameters
 =end
-	def to_context_environment( environment, parameter = nil, options={})
-		cmd	=	''
-		cmd	<<	"\n" if @crbefore
-		cmd	<<	"\n\\start#{environment}"
-		cmd	<< parameter.to_s if parameter
-		cmd	<<	"\n" if @crmid
-		cmd	<< @content.to_latex(options)
-		#~ cmd	<<	"\n" if @crmid and cmd[-1,1] != "\n"
-		cmd	<<	"\n\\stop#{environment}\n"
-		cmd	<<	"\n" if @crafter
-		return cmd
-	end	#~ def htmltag()
-		#~ return 'table'
-	#~ end
-	#~ def to_latex( options={} )
-		#~ return to_latex_environment( 'itemize', nil, options )
-	#~ end
-end
+      def to_context_environment( environment, parameter = nil, options={})
+        cmd	=	''
+        cmd	<<	"\n" if @crbefore
+        cmd	<<	"\n\\start#{environment}"
+        cmd	<< parameter.to_s if parameter
+        cmd	<<	"\n" if @crmid
+        cmd	<< @content.to_latex(options)
+        #~ cmd	<<	"\n" if @crmid and cmd[-1,1] != "\n"
+        cmd	<<	"\n\\stop#{environment}\n"
+        cmd	<<	"\n" if @crafter
+        return cmd
+      end	#~ def htmltag()
+        #~ return 'table'
+      #~ end
+      #~ def to_latex( options={} )
+        #~ return to_latex_environment( 'itemize', nil, options )
+      #~ end
+    end
 
 =begin rdoc
 Define Element :minipage
@@ -78,15 +78,15 @@ Attributes may be:
 * :width: 
 * :pos: Optional position for LaTeX
 =end
-class Minipage < Element
-  add_attribute :width, Attribute.create( [ :latex, :html ], [ String ] )
-  add_attribute :pos, Attribute.create( [ :latex ], [ 'b', 't' ] )
-  add_html_tag 'div'
-  add_latex_output '#{linebreak(@crbefore)}' +  
-					'\begin{minipage}[#{@attr[:pos]}]{#{@attr[:width]}}'	+ '#{linebreak(@crmid)}' + 
-					'#{@content}'		+ '#{linebreak(@crmid)}' + 
-					'\end{minipage}'	+ '#{linebreak(@crafter)}'
-end #Minipage
+    class Minipage < Element
+      add_attribute :width, Attribute.create( [ :latex, :html ], [ String ] )
+      add_attribute :pos, Attribute.create( [ :latex ], [ 'b', 't' ] )
+      add_html_tag 'div'
+      add_latex_output '#{linebreak(@crbefore)}' +  
+              '\begin{minipage}[#{@attr[:pos]}]{#{@attr[:width]}}'	+ '#{linebreak(@crmid)}' + 
+              '#{@content}'		+ '#{linebreak(@crmid)}' + 
+              '\end{minipage}'	+ '#{linebreak(@crafter)}'
+    end #Minipage
 
 =begin rdoc
 Define Element :center
@@ -99,11 +99,11 @@ Attributes may be:
 * HTML_ATTR_CORE
 
 =end
-class Center < Element
-  add_attributes HTML_ATTR_CORE
-  add_html_tag 'center'
-  add_latex_output '#{linebreak(@crbefore)}\begin{center}#{linebreak(@crmid)}#{@content}#{linebreak(@crmid)}\end{center}#{linebreak(@crafter)}'
-end #Center
+    class Center < Element
+      add_attributes HTML_ATTR_CORE
+      add_html_tag 'center'
+      add_latex_output '#{linebreak(@crbefore)}\begin{center}#{linebreak(@crmid)}#{@content}#{linebreak(@crmid)}\end{center}#{linebreak(@crafter)}'
+    end #Center
 
 =begin rdoc
 Define Element :quote, :blockquote
@@ -116,12 +116,12 @@ or
 Attributes may be:
 * HTML_ATTR_CORE
 =end
-class Quote < Element
-  add_id :blockquote
-  add_attributes HTML_ATTR_CORE
-  add_html_tag 'blockquote'
-  add_latex_output '#{linebreak(@crbefore)}\begin{quote}#{linebreak(@crmid)}#{@content}#{linebreak(@crmid)}\end{quote}#{linebreak(@crafter)}'
-end #Quote
+    class Quote < Element
+      add_id :blockquote
+      add_attributes HTML_ATTR_CORE
+      add_html_tag 'blockquote'
+      add_latex_output '#{linebreak(@crbefore)}\begin{quote}#{linebreak(@crmid)}#{@content}#{linebreak(@crmid)}\end{quote}#{linebreak(@crafter)}'
+    end #Quote
 
 =begin rdoc
 Define Element :landscape
@@ -134,9 +134,9 @@ or
   Landscape.new( [ attributes, [content]] )
 Attributes are not defined for this element.
 =end
-class Landscape < Element
-  add_latex_output '#{linebreak(@crbefore)}\begin{landscape}#{linebreak(@crmid)}#{@content}#{linebreak(@crmid)}\end{landscape}#{linebreak(@crafter)}'
-end #Landscape
+    class Landscape < Element
+      add_latex_output '#{linebreak(@crbefore)}\begin{landscape}#{linebreak(@crmid)}#{@content}#{linebreak(@crmid)}\end{landscape}#{linebreak(@crafter)}'
+    end #Landscape
 
 
 =begin rdoc
@@ -144,69 +144,101 @@ Environment Verbatim
 
 See also Elements::Verb
 =end
-class Verbatim < Environment
-	add_attribute :width, Attribute.create( [ :html ], [Integer], 1 ) #Number of characters
-  add_attributes HTML_ATTR_ALL
-  add_id :pre
-=begin rdoc
-=end
-  def to_html(options = {})
-    o = 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
+    class Verbatim < Environment
+      add_attribute :width, Attribute.create( [ :html ], [Integer], 1 ) #Number of characters
+      add_attributes HTML_ATTR_ALL
+      add_id :pre
+=begin rdoc
+=end
+      def to_html(options = {})
+        o = 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
   
 =begin rdoc
 =end	
-  def to_text(options = {}); "#{@content.join}"	end
+      def to_text(options = {}); "#{@content.join}"	end
 =begin rdoc
 =end
-  def to_wiki(options = {} ); " #{@content.join}"	end
+      def to_wiki(options = {} ); " #{@content.join}"	end
 =begin rdoc
 =end
-  def to_creole(options = {} ); "{{{\n#{@content.join}\n}}}"	end
+      def to_creole(options = {} ); "{{{\n#{@content.join}\n}}}"	end
 =begin rdoc
 =end
-  def to_latex(options = {}  )
-		return to_latex_environment( 'verbatim', nil, options )
-	end
-end
+      def to_latex(options = {}  )
+        return to_latex_environment( 'verbatim', nil, options )
+      end
+    end
 
 =begin rdoc
 =end
-class Figure < Environment
-	add_attributes HTML_ATTR_ALL
-	def htmltag(); 'div'; end
-	def to_latex( options = {} )
-		return to_latex_environment( 'figure', nil, options )
-	end
-end
+    class Figure < Environment
+      add_attributes HTML_ATTR_ALL
+      def htmltag(); 'div'; end
+      def to_latex( options = {} )
+        return to_latex_environment( 'figure', nil, options )
+      end
+    end
 
 =begin rdoc
 Environment Abstract.
 
 Only LaTeX
 =end
-class Abstract < Environment
-	#~ add_attributes( HTML_ATTR_ALL ) 
-	#~ def htmltag(); ''; end
+    class Abstract < Environment
+      #~ add_attributes( HTML_ATTR_ALL ) 
+      #~ def htmltag(); ''; end
 =begin rdoc
 =end
-	def to_latex( options = {} )
-		return to_latex_environment( 'abstract', nil, options )
-	end
-end
-end  #module Environments
+      def to_latex( options = {} )
+        return to_latex_environment( 'abstract', nil, options )
+      end
+    end
+
+=begin rdoc
+Environment Flushleft.
+
+Only LaTeX    ##fixme##
+=end
+    class Flushleft < Environment
+      #~ add_attributes( HTML_ATTR_ALL ) 
+      #~ def htmltag(); ''; end
+=begin rdoc
+=end
+      def to_latex( options = {} )
+        return to_latex_environment( 'flushleft', nil, options )
+      end
+    end
+=begin rdoc
+Environment Flushright.
+
+Only LaTeX  ##fixme##
+=end
+    class Flushright < Environment
+      #~ add_attributes( HTML_ATTR_ALL ) 
+      #~ def htmltag(); ''; end
+=begin rdoc
+=end
+      def to_latex( options = {} )
+        return to_latex_environment( 'flushright', nil, options )
+      end
+    end
+
+  end  #module Environments
+  
+  
 end #module Docgenerator

data/lib/docgenerator/index.rb

@@ -0,0 +1,110 @@
+=begin rdoc
+Elements to build an index
+=end
+
+#
+module Docgenerator 
+=begin rdoc
+Elements to build an index.
+
+This module supports the standard index and splitidx.
+=end
+    module Index
+      PACKAGE = element(:usepackage,{},'makeidx').cr
+      #See http://www.ctan.org/pkg/splitindex
+      PACKAGE_SPLITINDEX = element(:usepackage,{},'splitidx').cr
+=begin rdoc
+Define Element ':index'
+
+Create an instance with
+  element( :index, [ attributes, [content]] )
+  
+  Index.new( [ attributes, [content]] )
+=end
+      class Index < Element
+        #~ add_html_tag 'head'
+        add_latex_output '#{linebreak(@crbefore)}\\index{#{@content}}#{linebreak(@crafter)}'
+        #~ add_context_output '#{@content}'
+        #~ add_text_output '#{@content}'
+        #~ add_wiki_output '#{@content}'
+        #~ add_creole_output '#{@content}'
+      end #Index
+=begin rdoc
+Define Element :makeindex
+
+Create an instance with
+  element( :makeindex, [ attributes, [content]] )
+or
+  Makeindex.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end      
+      class Makeindex < Element
+         #~ add_id :makeindex
+        has_no_content false         
+         
+        #~ add_html_tag 'head'
+        add_latex_output '#{linebreak(@crbefore)}\\makeindex #{linebreak(@crafter)}'
+        #~ add_context_output '#{@content}'
+        #~ add_text_output '#{@content}'
+        #~ add_wiki_output '#{@content}'
+        #~ add_creole_output '#{@content}'
+      end #Index    
+=begin rdoc
+Define Element :printindex
+
+Create an instance with
+  element( :printindex, [ attributes, [content]] )
+or
+  Printindex.new( [ attributes, [content]] )
+Attributes are not defined for this element.
+=end
+      class Printindex < Element
+        has_no_content false
+        add_attribute :subindex, Attribute.create( [ :latex] )
+        #~ add_html_tag 'head'
+        #~ add_latex_output '#{linebreak(@crbefore)}\\printindex#{@attr[:subindex] ? "[#{@attr[:subindex]}]" : ""} #{linebreak(@crafter)}'
+        
+        #Include support for splitindex. 
+        def to_latex( options = {} )
+          cmd = linebreak(@crbefore)
+          cmd << "\\printindex"
+          case @attr[:subindex].to_s
+            when ''
+            when '*'
+              cmd << "*"
+            else
+              cmd << "[#{@attr[:subindex]}]"
+          end
+          cmd = linebreak(@crafter)
+          cmd
+        end
+        
+        #~ add_context_output '#{@content}'
+        #~ add_text_output '#{@content}'
+        #~ add_wiki_output '#{@content}'
+        #~ add_creole_output '#{@content}'
+      end #Index    
+      #Provide \sindex. Defined in the splitidx-package
+      class Newindex < Element
+        add_attribute :subname, Attribute.create( [ :latex, :required ] )
+
+        #~ add_html_tag 'head'
+        add_latex_output '#{linebreak(@crbefore)}\\newindex[#{@attr[:subname]}]{#{@content}}#{linebreak(@crafter)}'
+        #~ add_context_output '#{@content}'
+        #~ add_text_output '#{@content}'
+        #~ add_wiki_output '#{@content}'
+        #~ add_creole_output '#{@content}'
+      end #Index
+      #Provide \sindex. Defined in the splitidx-package
+      class Sindex < Element
+        add_attribute :subindex, Attribute.create( [ :latex, :required ] )
+
+        #~ add_html_tag 'head'
+        add_latex_output '#{linebreak(@crbefore)}\\sindex[#{@attr[:subindex]}]{#{@content}}#{linebreak(@crafter)}'
+        #~ add_context_output '#{@content}'
+        #~ add_text_output '#{@content}'
+        #~ add_wiki_output '#{@content}'
+        #~ add_creole_output '#{@content}'
+      end #Index
+  end #Index
+end

data/lib/docgenerator/lists.rb

@@ -15,7 +15,7 @@ Used to define Itemize, Enumerate...
           item.each{|it| self << it }
         else
           if self.class == Description
-            #fixme: Reihenfolge
+            #fixme: check sequence :dt/:dd
             if ! ( item.is_a?( Element.get(:dt) ) or item.is_a?( Element.get(:dd) ) )
               @log.warn("Add non-item to list (get #{item.inspect})") if @log.warn
             end
@@ -125,6 +125,7 @@ The look will be defined by the environment where it is in (itemize/ul, enumerat
         cmd	<<	"\n" if @crafter
         return cmd
       end
+      
       #fixme cascaded lists will not work!!
       #each list will be on first level.
       #-	wanted: ** on level 2

data/lib/docgenerator/packages/caption.rb

@@ -4,49 +4,47 @@ Support for caption.sty.
 
 #
 module Docgenerator
-module Packages
+  module Packages
 =begin rdoc
 Support for caption.sty.
 
 * http://www.ctan.org/tex-archive/macros/latex/contrib/caption/
 =end
-module Caption
-#~ Element.create( [:captionof], {
-			#~ :float_type =>	Attribute.create( [ :latex, :required ], [ 'figure', 'table' ] ),
-			#~ :lst_entry =>	Attribute.create( [ ], [ String ] ),
-		#~ }, true, {
-		#~ :latex	=> '#{linebreak(@crbefore)}\captionof{#{@attr[:float_type]}}[#{@attr[:lst_entry]}]{#{@content}}#{linebreak(@crafter)}',
-			#~ })
+    module Caption
+    #~ Element.create( [:captionof], {
+          #~ :float_type =>	Attribute.create( [ :latex, :required ], [ 'figure', 'table' ] ),
+          #~ :lst_entry =>	Attribute.create( [ ], [ String ] ),
+        #~ }, true, {
+        #~ :latex	=> '#{linebreak(@crbefore)}\captionof{#{@attr[:float_type]}}[#{@attr[:lst_entry]}]{#{@content}}#{linebreak(@crafter)}',
+          #~ })
 
 =begin rdoc
-Macro defined by caption.sty.
+This Macro is defined by caption.sty.
 
 =end
-class Captionof < Element
-	#~ add_attributes( HTML_ATTR_ALL ) 
-	add_attribute :float_type, Attribute.create( [ :latex, :required ], [ 'figure', 'table' ] )
-	add_attribute :lst_entry, Attribute.create( [ ], [ String ] )
-	
-	#Redefine standard output. 
-	#Options are given, if an option is avalaible.
-	add_latex_output  { | options = {} |
-		cmd = linebreak(@crbefore)
-		cmd << "\\captionof{#{@attr[:float_type]}}"
-		#Empty [] would return empty entry for list of figures,
-		cmd << "[#{@attr[:lst_entry]}]" if @attr[:lst_entry].content?
-		cmd << "{#{@content}}"
-		cmd << linebreak(@crafter)
-		
-    cmd
-  }
-    
-	add_html_tag 'span' #fixme
-  
-end	#Captionof
+      class Captionof < Element
+        #~ add_attributes( HTML_ATTR_ALL ) 
+        add_attribute :float_type, Attribute.create( [ :latex, :required ], [ 'figure', 'table' ] )
+        add_attribute :lst_entry, Attribute.create( [ ], [ String ] )
+        
+        #Redefine standard output. 
+        #Options are given, if an option is avalaible.
+        add_latex_output  { | options = {} |
+          cmd = linebreak(@crbefore)
+          cmd << "\\captionof{#{@attr[:float_type]}}"
+          #Empty [] would return empty entry for list of figures,
+          cmd << "[#{@attr[:lst_entry]}]" if @attr[:lst_entry].content?
+          cmd << "{#{@content}}"
+          cmd << linebreak(@crafter)
+          
+          cmd
+        }
+          
+        add_html_tag 'span' #fixme
+        
+      end	#Captionof
 
-end #module Caption
-end #module Packages
+    end #module Caption
+  end #module Packages
 end #module Docgenerator
 __END__
-
-C:\proTeXt\texmf\doc\latex\caption

data/lib/docgenerator/packages/hyperref.rb

@@ -63,6 +63,7 @@ Create an instance with
   element( :PushButton, [ attributes, [content]] )
 or
   Pushbutton.new( [ attributes, [content]] )
+
 Attributes may be:
 * :onclick: 
 * :width: 

data/lib/docgenerator/packages/multicol.rb

@@ -7,7 +7,7 @@ Example:
     class Multicols < Environments::Environment
       add_attributes( {
           :colnum =>	Attribute.create( [:latex], [ Fixnum ], 1 ),
-          :titleline =>	Attribute.create( [:latex], [ String], 2 ),
+          :titleline =>	Attribute.create( [:latex], [ String,Element], 2 ),
         }#.update(HTML_ATTR_ALL)
         )
 
@@ -17,7 +17,8 @@ Example:
         cmd	<<	"\\begin{multicols}{"
         cmd	<<	@attr[:colnum].content.first.to_s
         cmd	<<	"}"
-        cmd	<<	"[#{@attr[:titleline].content.join}]" if @attr[:titleline].filled?
+        #~ cmd	<<	"[#{@attr[:titleline].content.join}]" if @attr[:titleline].filled?
+        cmd	<<	"[#{@attr[:titleline].content.to_latex(options)}]" if @attr[:titleline].filled?
         cmd	<<	"\n" if @crmid
         cmd	<< @content.to_doc(:latex, options )
         cmd	<<	"\\end{multicols}"

data/lib/docgenerator/packages/pdfpages.rb

@@ -15,29 +15,80 @@ You may also use:
 
 #
 module Docgenerator
-module Packages
+  module Packages
 =begin rdoc
 Implement includepdf from pdfpages-package.
 =end
-class IncludePDF < Element
+    module PDFPages
+      #Add usepackage{pdfpages}
+      def self.head()
+        element(:usepackage,{},'pdfpages').cr
+      end
 =begin rdoc
-Return header definition for usage of the command.
+Implement includepdf from pdfpages-package.
+=end
+      class IncludePDF < Element        
+        add_attribute    :pages,  Attribute.create( [ :texkeyval], [ String ] )
+        add_attribute    :nup,  Attribute.create( [ :texkeyval], [ /\d+x\d+/ ] )  #multiple logical pages onto each sheet of paper. e.g. 1x2
+        add_attribute    :landscape,  Attribute.create( [ :texkeyval], [ true, false ] )  #
+        add_attribute    :pagecommand,  Attribute.create( [ :texkeyval], [ String ] )  #e.g. \thispagestyle{empty}
+        #~ add_attribute    :picturecommand,  Attribute.create( [ :texkeyval], [ String ] )  #e.g. trim={<left> <lower> <right> <upper>}
+        add_attribute    :link,  Attribute.create( [ :texkeyval], [ true, false] )
+        add_attribute    :linkname,  Attribute.create( [ :texkeyval], [ String ] )
+        add_attribute    :linktodoc,  Attribute.create( [ :texkeyval], [ true, false] )  #Lets the inserted pages be hyperlinks to the document from which they were extracted.
+        #~ add_attribute :addtotoc, Attribute.create( [ :texkeyval], [ /.+,.+,.+,.+,.+/] ),  #
+          
+        add_output( :latex,  '#{linebreak(@crbefore)}\includepdf[#{texkeyval()}]{#{@content}}#{linebreak(@crafter)}')
+          
+        end #IncludePDF
+=begin rdoc
+Implement includepdfmerge from pdfpages-package.
+
+The \includepdfmerge command uses the same options as \includepdf with one exception. 
+The option pages has no meaning for \includepdfmerge.
+
+Content is a file-page-list: filename[,pagespec][,filepagelist]
+=end
+      class IncludePDFmerge < IncludePDF
+=begin rdoc
+Copy attributes from IncludePDF (inheritance doas not work with dynamic attribute definition).
+=end         
+        add_attribute    :pages,  Attribute.create( [ :texkeyval], [ String ] )
+        add_attribute    :nup,  Attribute.create( [ :texkeyval], [ /\d+x\d+/ ] )  #multiple logical pages onto each sheet of paper. e.g. 1x2
+        add_attribute    :landscape,  Attribute.create( [ :texkeyval], [ true, false ] )  #
+        add_attribute    :pagecommand,  Attribute.create( [ :texkeyval], [ String ] )  #e.g. \thispagestyle{empty}
+        #~ add_attribute    :picturecommand,  Attribute.create( [ :texkeyval], [ String ] )  #e.g. trim={<left> <lower> <right> <upper>}
+        add_attribute    :link,  Attribute.create( [ :texkeyval], [ true, false] )
+        add_attribute    :linkname,  Attribute.create( [ :texkeyval], [ String ] )
+        add_attribute    :linktodoc,  Attribute.create( [ :texkeyval], [ true, false] )  #Lets the inserted pages be hyperlinks to the document from which they were extracted.
+=begin rdoc
+
 =end  
-  def self.head()
-    element(:usepackage,{},'pdfpages').cr
-  end
-  
-  add_attribute    :pages,  Attribute.create( [ :texkeyval], [ String ] )
-  add_attribute    :nup,  Attribute.create( [ :texkeyval], [ /\d+x\d+/ ] )  #multiple logical pages onto each sheet of paper. 
-  add_attribute    :landscape,  Attribute.create( [ :texkeyval], [ true, false ] )  #multiple logical pages onto each sheet of paper. 
-  add_attribute    :pagecommand,  Attribute.create( [ :texkeyval], [ String ] )  #multiple logical pages onto each sheet of paper. 
-  add_attribute    :link,  Attribute.create( [ :texkeyval], [ true, false] )
-  add_attribute    :linkname,  Attribute.create( [ :texkeyval], [ String ] )
-  add_attribute    :linktodoc,  Attribute.create( [ :texkeyval], [ true, false] )  #Lets the inserted pages be hyperlinks to the document from which they were extracted.
-  #~ add_attribute :addtotoc, Attribute.create( [ :texkeyval], [ /.+,.+,.+,.+,.+/] ),  #
-    
-  add_output( :latex,  '#{linebreak(@crbefore)}\includepdf[#{texkeyval()}]{#{@content}}#{linebreak(@crafter)}')
-    
-  end #IncludePDF
-end #module Packages
+        def to_latex(options={})
+          filelist = []
+          @content.flatten.each{|element|
+            case element
+              when String
+                filelist << element
+              when Hash
+                element.each{|filename, pagespec|
+                  filelist << filename
+                  filelist << pagespec
+                }
+              else
+                raise ArgumentError,"Dont know how to handle %s->%s in %s" % [element, self.class, __method__]
+              end
+          }
+          cmd = ''
+          cmd <<  linebreak(@crbefore)
+          cmd << "\\includepdfmerge[#{texkeyval()}]{"
+          cmd << filelist.join(',')
+          cmd << '}'
+          cmd << linebreak(@crafter)
+          return cmd
+        end
+          
+        end #IncludePDFmerge
+      end #PDFPages
+    end #module Packages
 end #module Docgenerator