deplate 0.8.4 → 0.8.5

data/CHANGES.TXT

@@ -1,3 +1,121 @@
+2009-02-05  Thomas Link (micathom at gmail com)
+	* formatter.rb (clean_tags): Moved from html.rb and docbook.rb.
+	* core.rb (clean_filename): Encode special characters with =
+	* makefile.rb (deplate_initialize_makefile): Escape $ characters.
+	* core.rb (set_top_heading): Don't escape special characters twice 
+	when autoFileNames is used.
+	* core.rb (parse_and_format): Excluded elements are now passed as 
+	key arguments.
+	* particles.rb (process): Extended wiki names: Don't format URLs as 
+	plain text -- uniform behaviour with URL links.
+	* latex.rb (format_url): Don't escape ''&'' in URLs.
+	* messages.rb (initialize): Get ''canonic_enc_name'' from 
+	''Deplate::Encoding'' if @deplate.formatter hasn't been set up yet.
+
+2009-02-04  Thomas Link (micathom at gmail com)
+	* encoding.rb (ruby_enc_name): Ruby encoding names.
+	* variables.rb ([]=): Set Encoding.default_external (ruby19+).
+
+2009-02-02  Thomas Link (micathom at gmail com)
+	* html.rb (format_list_item): Removed the "�" character from the 
+	standard characters for itemized lists.
+	* several files: Set script-encoding to ASCII whenever possible.
+
+2009-01-31  Thomas Link (micathom at gmail com)
+	* elements.rb (Deplate::List::Itemize): Removed the "�" character 
+	from the standard characters for itemized lists.
+	* several files: The paragraph charachter � was removed from the 
+	list of special symbols in order to keep most source files in ASCII.
+
+2009-01-28  Thomas Link (micathom at gmail com)
+	* messages.rb (initialize): FIX: 
+	@deplate.formatter.canonic_enc_name()
+	* formatter.rb (plain_text): @special_symbols[x] = :identity
+
+2009-01-25  Thomas Link (micathom at gmail com)
+	* regions.rb (finish): FIX nil.split
+
+2009-01-22  Thomas Link (micathom at gmail com)
+	* compat.rb (Deplate::Compat): check for ruby19
+	* parsedate.rb (ParseDate): ruby19 bridge class
+	* formatter.rb (wrap_text): Use String#each_line (ruby19 
+	compatibility)
+	* structured.rb (get_cited): flatten (ruby19)
+	* core.rb (clean_name): text[0] => unpack (ruby19)
+
+2009-01-17  Thomas Link (micathom at gmail com)
+	* sweave.rb (img_R): ''float'' option: If false, don't format the 
+	image as figure.
+	* regions.rb (setup): Don't lose global options defined as 
+	"$Regions#{NAME}".
+	* core.rb (canonic_args): Properly handle boolean hash variables.
+
+2009-01-16  Thomas Link (micathom at gmail com)
+	* xhtml10t.rb (include_image_svg): Reference svg files as object.
+	* formatter.rb (include_image): Generic method
+	* html.rb, latex.rb ... (include_image_general): Default 
+	include_image method -- if the image type doesn't require special 
+	handling.
+	* xhtml10t.rb (include_image_svg): include! argument (include the 
+	svg xml)
+
+2009-01-15  Thomas Link (micathom at gmail com)
+	* imgurl.rb (Deplate::HyperLink::ImgUrl): AbstractImgUrl -> ImgUrl
+
+2009-01-14  Thomas Link (micathom at gmail com)
+	* regions.rb (register_caption): Make sure images (eg when generated 
+	via sweave) don't lose the caption.
+	* regions.rb (finish): imgCmd variable: default command for ''#Img'' 
+	regions.
+
+2008-12-21  Thomas Link (micathom at gmail com)
+	* formatter.rb (indent_text): each_line (ruby19)
+
+2008-12-14  Thomas Link (micathom at gmail com)
+	* regions.rb: Defined #Latex, #LaTeX as synomyms for #Ltx.
+	* regions.rb: Defined latex as synomym for ltx.
+	* external.rb, ps2ppm.rb: Moved ps2ppm.rb to deplate/ps2ppm.rb; 
+	disabled command line usage due to missing getopts library in 
+	ruby19.
+
+2008-11-30  Thomas Link (micathom at gmail com)
+	* core.rb (canonic_args): Strip parentheses from arguments.
+	!!! This could cause problems. In earlier versions, the value of foo 
+		in ''foo=(x y)' was set to "(x y)" but is now set to "x y". In order 
+		to set it to "(x y)", you'd have to use ''foo=((x y))'' or 
+		''foo="(x y)"''.
+
+2008-11-28  Thomas Link (micathom at gmail com)
+	* regions.rb (do_R): R regions: swallow as synonym for drop
+	* regions.rb (Deplate::Regions::Swallow): #Drop as synonym for 
+	#Swallow
+
+2008-11-24  Thomas Link (micathom at gmail com)
+	* sweave.rb: Sweave/LaTeX output format (Rnw).
+
+2008-11-01  Thomas Link (micathom at gmail com)
+	* latex.rb (float_options): If here == H or floatHere == H, use the 
+	float package to place a float really right here.
+
+2008-10-28  Thomas Link (micathom at gmail com)
+	* latex.rb (block_postfix): inlay! parameter also works for lists 
+	and some more.
+
+2008-10-24  Thomas Link (micathom at gmail com)
+	* latex.rb (format_environment): inlay! parameter (don't add a 
+	newline after the environment; reported by Brett Calcott)
+
+2008-08-27  Thomas Link (micathom at gmail com)
+	* html.rb (format_heading): htmlHeading(Pre|Post)
+	* formatter.rb (close_headings): moved from structured.rb
+
+2008-07-27  Thomas Link (micathom at gmail com)
+	* elements.rb (format_contained): Propagate @postponed_format, 
+	@postponed_preformat
+	* regions.rb (format_compound): Call format_contained instead of 
+	format_current (footnotes in Abstracts & similar block elements were 
+	not printed)
+
 2008-07-20  Thomas Link (micathom at gmail com)
 	* gem, zip: Fixed packaging problem
 

data/NEWS.TXT

@@ -1,4 +1,4 @@
-* deplate 0.8.2
+* deplate 0.8.5
 
 ''deplate'' is a [[http://www.ruby-lang.org][ruby]] based tool for 
 converting documents written in wiki-like markup to LaTeX, HTML, "HTML 
@@ -7,26 +7,11 @@ footnotes, citations, bibliographies, automatic generation of an index,
 table of contents etc.  It can be used to create web pages and (via 
 LaTeX or Docbook) high-quality printouts from the same source.
 
-This release incorporates the usual set of bugfixes and general improvements.
-
-Incompatible changes:
-	* Fixed inconsistent handling of the css option with regard to the suffix
-
-Improvements:
-    * Themes (aka collections of css files, templates etc.)
-    * Enable page! parameter for the #MAKETITLE command for latex output
-    * The #CAPTION command takes an optional argument "extended!" that 
-      will case the caption to be parsed with all defined particles.
-    * allow=all -> run in "unsafe" mode
-	* hackish support for xhtml11/mathml
-	* particle-math: Support for ''$$formula$$'' for block formulas.
-
-New modules:
-    * entities-decode.rb: support for &#NNN; entities.
-    * entities-encode.rb: Encodes special characters as entities.
-    * html-mathml.rb: Experimental support for mathml (requires the 
-      mathml package by KURODA Hiraku: http://mathml.rubyforge.org).
-	* code-coderay.rb: Support for coderay http://coderay.rubychan.de
+    + Output to sweave (for preparation of R-based statistics reports via LaTeX)
+    + XHTML output: Support for SVG images
+    - CHANGE: Parentheses are now stripped from arguments
+    * FIX: Footnotes in abstracts, quotations etc.
+    * preliminary support for ruby 1.9.1 (still needs some work)
 
 For other changes please see the CHANGES.TXT.
 

data/VERSION.TXT

@@ -1 +1 @@
-0.8.4final-3109
+0.8.5final-3176

data/etc/deplate.ini

@@ -128,6 +128,8 @@
 ;    hyperHeadingButton :: The text for hyperlinked headings (STRING; 
 ;        default: =>)
 
+;    imgCmd :: The default command for ''#Img'' regions (STRING)
+
 ;    imgSfx :: The default suffix for images (STRING, default: png)
 
 ;    includeVars :: The variables to be used for #INC commands (HASH)
@@ -174,6 +176,8 @@
 ;       For LaTeX output, this make ''deplate'' use proper commands. You 
 ;       can set this for single particles too. (STRING)
 
+;    pdfCompressLevel :: Set ''\\pdfcompresslevel'' (DEFAULT: 9)
+
 ;    pdfOutput :: Automatically set when using pdf output (the ''--pdf'' 
 ;       command line switch) (BOOLEAN)
 
@@ -364,8 +368,9 @@
 ;    typeareaDIV_, DIV_ (koma) :: Same as the above but the parameter is 
 ;       set as a document class option.
 
-;    floatHere :: If true, add a ''h'' flag to floats (BOOLEAN, 
-;       default: false)
+;    floatHere :: If true, add a ''h'' flag to floats. If H, use the 
+;       float package and add the ''H'' flag. (BOOLEAN or 
+;       STRING, default: false)
 
 ;    linespread :: If set, define the ''linespread'' parameter (NUMBER)
 
@@ -378,6 +383,10 @@
 ;    useBooktabs :: If true, use the booktabs package (BOOLEAN, default: false)
 
 
+; **** LaTeX
+;    sweaveOpts :: Document sweave options (STRING)
+
+
 ; **** Docbook
 ;    copyrightYear :: The year field in the copyright section (STRING)
 
@@ -488,6 +497,10 @@
 ;    smileySfx :: The suffix for smiley image files (STRING, default: png)
 
 
+; **** s5 theme
+;    s5theme :: The theme (default: "default)
+;    s5footer :: Text to be displayed in the footer
+
 ; **** validate-html
 ;    noCssValid :: If true, don't add a button for CSS validation 
 ;       (BOOLEAN, default: false)

data/lib/deplate/abstract-class.rb

@@ -1,7 +1,8 @@
+# encoding: ASCII
 # DefAbstract.rb
 # @Created:     18-M�r-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.10
+# @Last Change: 2009-02-02.
+# @Revision:    0.12
 # 
 # Description:
 # From: http://groups.google.at/groups?hl=de&lr=&ie=UTF-8&oe=UTF-8&newwindow=1&selm=20030821221909.53f3274a.rpav%40mephle.com&rnum=38

data/lib/deplate/bib.rb

@@ -1,9 +1,10 @@
+# encoding: ASCII
 # bib.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     11-Feb-2006.
-# @Last Change: 2007-07-01.
-# @Revision:    0.85
+# @Last Change: 2009-02-02.
+# @Revision:    0.89
 #
 # = Description
 # = Usage

data/lib/deplate/builtin.rb

@@ -1,10 +1,11 @@
+# encoding: ISO-8859-1
 # builtin.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     05-Jun-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.4
+# @Last Change: 2008-12-04.
+# @Revision:    0.5
 # 
 # Description:
 # Dummy file

data/lib/deplate/cache.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # cache.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     21-Aug-2005.
-# @Last Change: 08-Apr-2006.
-# @Revision:    0.46
+# @Last Change: 2009-02-02.
+# @Revision:    0.48
 
 # = Description
 # This class provides a cache for dynamically generated classes.

data/lib/deplate/commands.rb

@@ -1,19 +1,11 @@
+# encoding: ASCII
 # commands.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     08-Mai-2004.
-# @Last Change: 2008-07-08.
-# @Revision:    0.1310
-
-# Description:
-# 
-# Usage:
-# 
-# TODO:
-# 
-# CHANGES:
-# 
+# @Last Change: 2009-02-02.
+# @Revision:    0.1315
 
 module Deplate::Names
     module_function

data/lib/deplate/common.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # common.rb -- The base class for deplate building blocks
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     02-Aug-2004.
-# @Last Change: 2007-12-27.
-# @Revision:    0.903
+# @Last Change: 2009-02-02.
+# @Revision:    0.912
 # 
 # = Description:
 # Misc classes
@@ -134,6 +135,10 @@ module Deplate::CommonGround
         false
     end
 
+    def inlay?
+        args['inlay']
+    end
+
     def get_explicit_id(args=@args)
         args[:id] || args['id']
     end

data/lib/deplate/compat.rb

@@ -0,0 +1,21 @@
+# compat.rb
+# @Author:      Thomas Link (micathom AT gmail com)
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     2009-01-22.
+# @Last Change: 2009-01-22.
+# @Revision:    0.0.4
+
+
+module Deplate::Compat
+    module_function
+
+    def isRuby19
+        return RUBY_VERSION !~ /^1\.[6-8]/
+    end
+
+end
+
+
+# Local Variables:
+# revisionRx: REVISION\s\+=\s\+\'
+# End:

data/lib/deplate/compat/parsedate.rb

@@ -0,0 +1,24 @@
+# parsedate.rb
+# @Author:      Thomas Link (micathom AT gmail com)
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     2009-01-22.
+# @Last Change: 2009-01-22.
+# @Revision:    0.0.4
+
+require 'deplate/compat'
+
+if Deplate::Compat.isRuby19
+
+    require 'date'
+    class ParseDate
+        def parsedate(date, guess=false)
+            Date.parse(date, guess)
+        end
+    end
+
+else
+
+    require 'parsedate'
+
+end
+

data/lib/deplate/converter.rb

@@ -1,11 +1,12 @@
+# encoding: ASCII
 #!/usr/bin/env ruby
 # converter.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     14-Okt-2004.
-# @Last Change: 2007-09-01.
-# @Revision:    0.145
+# @Last Change: 2009-02-02.
+# @Revision:    0.147
 # 
 # = Description
 # = Usage

data/lib/deplate/core.rb

@@ -1,15 +1,17 @@
+# encoding: ASCII
 # core.rb -- Convert wiki-like plain text pseudo markup to something else
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     24-Feb-2004.
-# @Last Change: 2008-07-20.
+# @Last Change: 2009-02-08.
 
 require 'uri'
 require 'optparse'
 require 'ostruct'
 require 'rbconfig'
-require 'ftools'
+# require 'ftools'
+require 'fileutils'
 require 'forwardable'
 require 'pathname'
 
@@ -26,10 +28,10 @@ module Deplate; end
 class Deplate::Core
     extend Forwardable
 
-    Version    = '0.8.4'
+    Version    = '0.8.5'
     # VersionSfx = 'a'
     VersionSfx = 'final'
-    MicroRev   = '3109'
+    MicroRev   = '3176'
 
     if ENV['HOME']
         CfgDir = File.join(ENV['HOME'].gsub(/\\/, '/'), '.deplate')
@@ -75,6 +77,7 @@ MESSAGE
     # A hash of known css files and their ruby file names
     @@css        = {}
     # A hash of known templates and their ruby file names
+
     @@templates  = {}
     # A hash of known encodings and the corresponding module
     @@symbols    = {}
@@ -576,7 +579,8 @@ MESSAGE
                 require_module(options, m) if m
             end
 
-            # require 'deplate/mod/en' unless @@messages_last
+            # require 'deplate/mod/en' if we haven't loaded any lang 
+            # module yet.
             require_module(options, 'lang-en') unless @@messages_last
 
             # load general user config
@@ -680,86 +684,90 @@ MESSAGE
 
         def read_ini_file(options, inifile)
             if File.exist?(inifile)
-                ini    = File.open(inifile) {|io| io.read}
                 mode   = :normal
                 acc    = []
                 endm   = nil
                 setter = nil
-                for line in ini
-                    line.chomp!
-                    case mode
-                    when :normal
-                        if line =~ /^\s*[;#%*]/
-                            # comment
-                            next
-                        elsif line =~ /^(-\S+)(\s+(.*?)\s*)?$/
-                            options.ini_command_line_arguments << $1
-                            options.ini_command_line_arguments << $3 if $3
-                        elsif line =~ /^\s*allow\s+(.+?)\s*$/
-                            allow(options.allow, $1, Deplate::Source.new(inifile))
-                        elsif line =~ /^\s*mod\s+(\S+)/
-                            mod = $1
-                            if mod[0..0] == '-'
-                                options.modules.delete(mod[1..-1])
-                            else
-                                options.modules << $1
-                            end
-                        elsif line =~ /^\s*fmt\s+(\S+)/
-                            options.fmt = $1
-                        elsif line =~ /^\s*clip\s+([^\s=]+)\s*=\s*(.+)/
-                            options.clips[$1] = $2
-                        elsif line =~ /^\s*wiki ([A-Z]+)(\.\w+)?\s*=\s*(.+)/
-                            Deplate::InterWiki.add($1, $3, $2)
-                        elsif line =~ /^\s*wikichars\s*(\S+)\s*(\S+)/
-                            Deplate::HyperLink.setup($1, $2)
-                        elsif line =~ /^\s*app\s*([_\w]+)\s*=\s*(.+)/
-                            Deplate::External.def_app $1, $2
-                        elsif line =~ /^\s*(option\s+|:)([_\w]+)([!~]|\s*([?%])?=\s*(.+))/
-                            case $3
-                            when '!'
-                                val = true
-                            when '~'
-                                val = false
-                            else
-                                case $4
-                                when '?'
-                                    case $5
-                                    when 'true', 'yes', 'on'
-                                        val = true
-                                    when 'false', 'no', 'off'
-                                        val = false
+                File.open(inifile) do |io|
+                    until io.eof?
+                        line = io.gets
+                        line.chomp!
+                        case mode
+                        when :normal
+                            if line =~ /^\s*[;#%*]/
+                                # comment
+                                next
+                            elsif line =~ /^(-\S+)(\s+(.*?)\s*)?$/
+                                options.ini_command_line_arguments << $1
+                                options.ini_command_line_arguments << $3 if $3
+                            elsif line =~ /^\s*allow\s+(.+?)\s*$/
+                                allow(options.allow, $1, Deplate::Source.new(inifile))
+                            elsif line =~ /^\s*mod\s+(\S+)/
+                                mod = $1
+                                if mod[0..0] == '-'
+                                    options.modules.delete(mod[1..-1])
+                                else
+                                    options.modules << $1
+                                end
+                            elsif line =~ /^\s*fmt\s+(\S+)/
+                                options.fmt = $1
+                            elsif line =~ /^\s*clip\s+([^\s=]+)\s*=\s*(.+)/
+                                options.clips[$1] = $2
+                            elsif line =~ /^\s*wiki ([A-Z]+)(\.\w+)?\s*=\s*(.+)/
+                                Deplate::InterWiki.add($1, $3, $2)
+                            elsif line =~ /^\s*wikichars\s*(\S+)\s*(\S+)/
+                                Deplate::HyperLink.setup($1, $2)
+                            elsif line =~ /^\s*encoding\s+(.+)/
+                                options.variables['encoding'] = $1
+                            elsif line =~ /^\s*app\s*([_\w]+)\s*=\s*(.+)/
+                                Deplate::External.def_app $1, $2
+                            elsif line =~ /^\s*(option\s+|:)([_\w]+)([!~]|\s*([?%])?=\s*(.+))/
+                                case $3
+                                when '!'
+                                    val = true
+                                when '~'
+                                    val = false
+                                else
+                                    case $4
+                                    when '?'
+                                        case $5
+                                        when 'true', 'yes', 'on'
+                                            val = true
+                                        when 'false', 'no', 'off'
+                                            val = false
+                                        else
+                                            Deplate::Core.log(['Malformed configuration line', line], :error)
+                                            next
+                                        end
+                                    when '%'
+                                        val = $5.to_i
                                     else
-                                        Deplate::Core.log(['Malformed configuration line', line], :error)
-                                        next
+                                        val = $5
                                     end
-                                when '%'
-                                    val = $5.to_i
-                                else
-                                    val = $5
                                 end
-                            end
                             options.send("#$2=", val)
-                        elsif line =~ /^\s*\$(\S+)\s*=\s*(.+)/
-                            ENV[$1] = $2
-                        elsif line =~ /^\s*(\S+)\s*=<<(.+)/
-                            mode = :multiline
-                            endm = $2
-                            setter = lambda {|val| canonic_args(options.variables, $1, val)}
-                        elsif line =~ /^\s*(\S+)\s*=\s*(.+)/
-                            canonic_args(options.variables, $1, $2)
-                        elsif !line.empty?
-                            Deplate::Core.log(['Malformed configuration line', line], :error)
-                        end
-                    when :multiline
-                        if line == endm
-                            setter.call(acc)
-                            acc  = []
-                            mode = :normal
+                            elsif line =~ /^\s*\$(\S+)\s*=\s*(.+)/
+                                ENV[$1] = $2
+                            elsif line =~ /^\s*(\S+)\s*=<<(.+)/
+                                mode = :multiline
+                                endm = $2
+                                setter = lambda {|val| canonic_args(options.variables, $1, val)}
+                            elsif line =~ /^\s*(\S+)\s*=\s*(.+)/
+                                canonic_args(options.variables, $1, $2)
+                            elsif !line.empty?
+                                Deplate::Core.log(['Malformed configuration line', line], :error)
+                            end
+                        when :multiline
+                            if line == endm
+                                setter.call(acc)
+                                acc  = []
+                                mode = :normal
+                            else
+                                acc << line
+                            end
                         else
-                            acc << line
+                            raise "Invalid mode"
                         end
-                    else
-                        raise "Invalid mode"
                     end
                 end
             end
@@ -864,6 +872,7 @@ MESSAGE
             options               = inherit || OpenStruct.new
             options.ini_command_line_arguments ||= []
             options.modules     ||= []
+            options.headings    ||= []
             options.resources   ||= []
             options.prelude     ||= []
             options.clean       ||= true
@@ -1040,6 +1049,8 @@ MESSAGE
                     type = :string
                     if val =~ /^"(.*?)"$/
                         val = val[1..-2]
+                    elsif val =~ /^\((.*?)\)$/
+                        val = val[1..-2]
                     else
                         # val.scan(/\\\\|\s/).each do |s|
                         #     if s =~ /\s/
@@ -1056,7 +1067,12 @@ MESSAGE
             end
             case type
             when :bool
-                hash["no#{key[0..0].upcase}#{key[1..-1]}"] = !val
+                if key =~ /^\$[^\[]+\[/
+                    nokey = key.sub(/\[./) {|t| "[no#{t[1..1].upcase}"}
+                    hash[nokey] = !val
+                else
+                    hash["no#{key[0..0].upcase}#{key[1..-1]}"] = !val
+                end
             end
             hash[key] = val
             hash
@@ -1163,9 +1179,13 @@ MESSAGE
 
         # Return the canonic file name for +name+. +maj+ and +min+ 
         # correspond to section numbers.
-        def canonic_file_name(name, sfx, maj=nil, min=nil, dir=nil)
+        def canonic_file_name(name, sfx, args={})
+            maj  = args[:maj]
+            min  = args[:min]
+            dir  = args[:dir]
+            raw  = args[:raw]
             name = File.basename(name, '.*')
-            name = clean_name(name)
+            name = clean_filename(name) unless raw
             if !name or (maj and maj != 0)
                 canonic_numbered_file_name(name, sfx, maj, min, dir)
             elsif min and min != 0
@@ -1177,20 +1197,26 @@ MESSAGE
             end
         end
 
+        def clean_filename(text, args={})
+            args[:replacement] ||= '='
+            return clean_name(text, args)
+        end
+
         # Return an encoded name
         def clean_name(text, args={})
           if text
-            chars  = args[:chars] || '[:cntrl:].+*:"?<>|&\\\/'
+            chars  = args[:chars] || '[:cntrl:].+*:"?<>|&\\\/%'
             chars += replacement = args[:replacement] || '_'
             if (extrachars = args[:extra])
               chars += extrachars
             end
-            text.gsub(/[#{chars}]/) do |text|
+            text = text.gsub(/[#{chars}]/) do |text|
                 case text
                 when replacement
                     replacement * 2
                 else
-                    replacement + "%02X" % text[0]
+                    # replacement + "%02X" % text[0]
+                    replacement + text.unpack('H2')[0].upcase
                 end
             end
           end
@@ -1252,17 +1278,17 @@ MESSAGE
         # options:: A OpenStruct as returned by Deplate::Core.deplate_options
         # maj:: The major section/page number
         # maj:: The minor section/page number
-        def get_out_fullname(fname, suffix, options, *args)
-            # File.join(options.dir, get_out_name(fname, suffix, options, *args))
-            file_join(options.dir, get_out_name(fname, suffix, options, *args))
+        def get_out_fullname(fname, suffix, options, args={})
+            # File.join(options.dir, get_out_name(fname, suffix, options, args))
+            file_join(options.dir, get_out_name(fname, suffix, options, args))
         end
 
-        def get_out_name(fname, suffix, options, maj=nil, min=nil)
+        def get_out_name(fname, suffix, options, args={})
             path = []
             path << get_out_name_dir(fname, options)
             if suffix
                 fn  = File.basename(fname, '.*')
-                path << canonic_file_name(fn, suffix, maj, min)
+                path << canonic_file_name(fn, suffix, args)
             else
                 path << fname
             end
@@ -1905,14 +1931,20 @@ MESSAGE
         else
             msg_class = lang
         end
-        if msg_class
-            @options.messages  = msg_class.new(self)
-            @@message_object ||= @options.messages
-        elsif is_allowed?('l') and require_module("lang-#{lang}")
-            set_lang(lang)
-        else
-            log(["Bad language definition", lang, "(#{@@messages.keys.join(', ')})"],
-                :error)
+        begin
+            if msg_class
+                @options.messages  = msg_class.new(self)
+                @@message_object ||= @options.messages
+            elsif is_allowed?('l') and require_module("lang-#{lang}")
+                set_lang(lang)
+            else
+                log(["Bad language definition", lang, "(#{@@messages.keys.join(', ')})"],
+                    :error)
+            end
+        rescue LoadError => e
+            log(["Unknown language", lang, "(#{@@messages.keys.join(', ')})",
+                'Please consider contributing a message catalog for your language'],
+                    :error)
         end
     end
 
@@ -2038,7 +2070,7 @@ MESSAGE
         else
             prefix = @variables['prefixID']
             if prefix.nil?
-                prefix = Deplate::Core.clean_name(File.basename(@dest, '.*'))
+                prefix = Deplate::Core.clean_filename(File.basename(@dest, '.*'))
             end
             fn = [prefix]
             fn << ["_#{type}_#{idx}"]
@@ -2296,13 +2328,13 @@ MESSAGE
                 unless text or !@options.multi_file_output
                     afn = @variables['autoFileNames']
                     if afn
-                        fname = Deplate::Core.clean_name(heading.get_text)[0..20]
+                        fname = Deplate::Core.clean_filename(heading.get_text)[0..20]
                         c = auto_numbered(fname)
                         if c
-                            fname = Deplate::Core.canonic_file_name(fname, sfx, c, 0)
+                            fname = Deplate::Core.canonic_file_name(fname, sfx, :maj => c, :min => 0, :raw => true)
                             auto_numbered(fname, :inc => 1)
                         else
-                            fname = Deplate::Core.canonic_file_name(fname, sfx)
+                            fname = Deplate::Core.canonic_file_name(fname, sfx, :raw => true)
                             auto_numbered(fname, :set => 0)
                         end
                     else
@@ -2328,7 +2360,7 @@ MESSAGE
                                 else
                                     auto_numbered(fname, :set => 1)
                                 end
-                        fname = Deplate::Core.canonic_file_name(fname, sfx, fmaj, 0)
+                        fname = Deplate::Core.canonic_file_name(fname, sfx, :maj => fmaj, :min => 0, :raw => true)
                     end
                 end
             end
@@ -2787,7 +2819,7 @@ MESSAGE
                  end
             if ok
                 ensure_dir_exists(dir)
-                File.copy(from, to)
+                FileUtils.cp_r(from, to)
                 log(['Copy file', from, to])
             end
         end
@@ -3036,8 +3068,8 @@ MESSAGE
     end
 
     # Parse +text+ and return a formatted string.
-    def parse_and_format(container, text, alt=true, excluded=nil)
-        t = parse(container, text, alt, :excluded => excluded)
+    def parse_and_format(container, text, alt=true, args={})
+        t = parse(container, text, alt, args)
         return format_particles(t)
     end
 
@@ -3046,7 +3078,7 @@ MESSAGE
             Deplate::HyperLink::Simple,
             Deplate::HyperLink::Extended,
         ]
-        return parse_and_format(container, text, alt, excluded)
+        return parse_and_format(container, text, alt, :excluded => excluded)
     end
 
     # Evaluate block (args: heading, caption) with each heading.