deplate 0.8 → 0.8.1

data/lib/deplate/skeletons.rb

@@ -1,9 +1,9 @@
 # skeletons.rb
-# @Author:      Thomas Link (samul AT web de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     28-Apr-2006.
-# @Last Change: 03-Jun-2006.
-# @Revision:    0.147
+# @Last Change: 2007-02-24.
+# @Revision:    0.149
 
 # Skeletons: 
 class Deplate::SkeletonExpander <  Deplate::CommonObject
@@ -24,6 +24,7 @@ class Deplate::SkeletonExpander <  Deplate::CommonObject
     def require_skeleton(name, source=nil)
         skels = @skeletons_tmpl[@formatter_name] ||= {}
         # names = @deplate.formatter_family_members.collect {|f| "#{name}.#{f}"}
+        # names = @deplate.formatter.formatter_family_members.collect {|f| "#{name}.#{f}"}
         # names << name
         # names.each do |name|
             t = skels[name] ||= load_skeleton(name)

data/lib/deplate/structured.rb

@@ -1,10 +1,10 @@
 # structured.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     17-M�r-2004.
-# @Last Change: 05-Jun-2006.
-# @Revision:    0.2707
+# @Last Change: 2007-07-01.
+# @Revision:    0.2740
 # 
 # TODO:
 # - am Ende des Dokuments muss ein Stapel mit offenen tags abgearbeitet werden
@@ -502,8 +502,7 @@ class Deplate::Formatter::Structured < Deplate::Formatter
             cc = bib_entry(c)
             if cc
                 e  = {}
-                yr = cc.assoc('year')
-                yr = if yr then yr[1] else '' end
+                yr = cc['year'] || ''
                 e[:year] = yr
                 if n
                     e[:note] = @deplate.parse_and_format(container, n)
@@ -513,10 +512,14 @@ class Deplate::Formatter::Structured < Deplate::Formatter
                     p = @deplate.parse_and_format(container, "#{@deplate.msg("p.\\ ")}#{p}")
                     e[:pages] = p
                 end
-                nm = cc.assoc('author') || cc.assoc('editor')
+                nm = cc['author'] || cc['editor']
                 if nm
-                    nm = nm[1].gsub(/\s+/, ' ').split(' and ').collect do |a|
-                        a.scan(/\w+$/)
+                    if nm =~ /^\{(.*?)\}$/
+                        nm = [[$1]]
+                    else
+                        nm = nm.gsub(/\s+/, ' ').split(/ +and +/).collect do |a|
+                            a.scan(/\w+$/)
+                        end
                     end
                     e[:name] = nm
                 else
@@ -599,7 +602,8 @@ class Deplate::Formatter::Structured < Deplate::Formatter
     alias :format_bib_entry_re_structured :format_bib_entry
     def format_bib_entry(invoker, key, bibdef)
         args = invoker.args
-        bib = Hash[*bibdef.flatten]
+        # bib = Hash[*bibdef.flatten]
+        bib = bibdef
         be  = ["author", "title", "pages"]
         entry = {}
         process_bib_entry_part(invoker, args, entry, bib, be)
@@ -618,7 +622,7 @@ class Deplate::Formatter::Structured < Deplate::Formatter
         #     ee = bib[e]
         #     container[e] = self.send("get_bib_%s" % e, args, simple_latex_reformat(ee)) if ee
         # end
-        return get_bib_relation(args, bib['@type'], entry, container)
+        return get_bib_relation(args, bib['_type'], entry, container)
     end
 
     def process_bib_entry_part(invoker, args, accum, bibdef, parts)
@@ -627,9 +631,11 @@ class Deplate::Formatter::Structured < Deplate::Formatter
             if ee
                 ee = simple_latex_reformat(ee)
                 ee = @deplate.parse_and_format(invoker, ee, false, [
-                                         Deplate::HyperLink::Extended,
-                                         Deplate::HyperLink::Simple,
-                                         Deplate::HyperLink::Url,
+                                               Deplate::Particle::Macro,
+                                               Deplate::Particle::CurlyBrace,
+                                               Deplate::HyperLink::Extended,
+                                               Deplate::HyperLink::Simple,
+                                               Deplate::HyperLink::Url,
                 ])
                 accum[e] = self.send("get_bib_#{e}", args, ee)
             end

data/lib/deplate/template.rb

@@ -1,10 +1,10 @@
 # template.rb -- simple templates for deplate
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-Aug-2004.
-# @Last Change: 28-Mai-2006.
-# @Revision:    0.465
+# @Last Change: 2007-09-28.
+# @Revision:    0.550
 # 
 # Description:
 # 
@@ -105,6 +105,7 @@ class Deplate::Template
         :onthefly_particles => false,
         :vanilla            => true,
         :inherit_options    => true,
+        :paragraph_class    => Deplate::Element::Paragraph,
 
         :elements  => [
             Deplate::Element::Region,
@@ -133,8 +134,8 @@ class Deplate::Template
             'Mingle'  => Deplate::Regions::Mingle,
             'Native'  => Deplate::Regions::Native,
             'Ruby'    => Deplate::Regions::Ruby,
-            'Doc'     => Deplate::Regions::Doc,
-            'Var'     => Deplate::Regions::Doc,
+            'Doc'     => Deplate::Regions::Var,
+            'Var'     => Deplate::Regions::Var,
         },
         
         :particles => [
@@ -188,10 +189,14 @@ class Deplate::Template
         @template  = args[:template]
         @container = args[:container]
         @master    = args[:master]
+        # @deplate_options = @@deplate_options.dup
+        @deplate_options = @@deplate_options
         if @master
-            @@deplate_options[:options] = @master.options
+            @deplate_options[:options] = @master.options.dup
+            @deplate_options[:options].input_def = nil
+            @deplate_options[:options].input_class = nil
         else
-            @@deplate_options[:options] = OpenStruct.new
+            @deplate_options[:options] = OpenStruct.new
         end
                         
         if @template
@@ -229,7 +234,8 @@ class Deplate::Template
             :post => [],
         }
         @keep_whitespace = args.has_key?(:keep_whitespace) ? args[:keep_whitespace] : true
-        if deplate.variables['template_version'] == '1'
+        case deplate.variables['template_version']
+        when '1'
             fill_in_1
         else
             fill_in_2
@@ -240,7 +246,9 @@ class Deplate::Template
         if @@deplate_for_template
             d = @@deplate_for_template
         else
-            d = @@deplate_for_template = Deplate::DeplateForTemplates.new('', @@deplate_options)
+            d = @@deplate_for_template = Deplate::DeplateForTemplates.new('', @deplate_options)
+            d.reset(true)
+            d.push_input_format('template')
         end
         keep_whitespace  = d.options.keep_whitespace
         master           = d.options.master

data/lib/deplate/templates/html-doc.html

@@ -1,24 +1,21 @@
 #Mingle type=pre slot=css:
+<!--[if IE]>
 <style type="text/css">
-    <!--
     @media screen {
-        table.navbar {
-            border-left:10px solid #ffdf70;
-            background-color: #fff0c0;
-        }
-        body {
-            background-color: #dfdfff;
+        table.tabBarTop {
+            border-collapse: collapse;
         }
     }
-    -->
 </style>
+<![endif]-->
 #End
+
 #PREMATTER
 
 <div id="tabFrame">
-    <div class="tabBodyFrame" style="max-width:650pt; text-align:left">
-        <div class="tabBody">
-            #BODY: -navbar_top -navbar_bottom
+    <div id="tabBodyFrame" class="tabBodyFrame">
+        <div id="tabBody" class="tabBody">
+            #BODY
         </div>
         #POSTMATTER: html_pageicons_beg..html_pageicons_end
     </div>

data/lib/deplate/templates/html-tabbar-right.html

@@ -14,7 +14,7 @@
         #POSTMATTER: html_pageicons_beg..html_pageicons_end
     </div>
     <div id="tabBar">
-        #ARG: tabBarRight(spacer=spacer.png depth=2 depthInactive=1)
+        #XARG: tabBarRight(spacer=spacer.png depth=2 depthInactive=1)
     </div>
 </div>
 

data/lib/deplate/templates/html-tabbar-top.html

@@ -16,11 +16,11 @@
     <div id="tabBodyFrame" class="tabBodyFrame">
         <div id="tabBar" class="tabBar">
             #IF: tabBarPos==top
-            #ARG: tabBarTop()
+            #XARG: tabBarTop()
             #ELSEIF: tabBarPos==right
-            #ARG: tabBarRight(progressBar! nextKey! depth=2 depthInactive=1)
+            #XARG: tabBarRight(progressBar! nextKey! depth=2 depthInactive=1)
             #ELSE
-            #ARG: tabBarLeft(progressBar! nextKey! depth=2 depthInactive=1)
+            #XARG: tabBarLeft(progressBar! nextKey! depth=2 depthInactive=1)
             #ENDIF
         </div>
         <div id="tabBody" class="tabBody">

data/lib/deplate/variables.rb

@@ -1,16 +1,17 @@
 # variables.rb
-# @Author:      Thomas Link (samul AT web de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     31-Dez-2005.
-# @Last Change: 18-Apr-2006.
-# @Revision:    0.37
+# @Last Change: 2007-05-22.
+# @Revision:    0.75
 
 class Deplate::Variables < Hash
     attr_accessor :deplate
     
     def initialize(deplate=nil)
         super()
-        @deplate = deplate
+        @deplate  = deplate
+        @priority = false
     end
   
     def log(*args)
@@ -22,8 +23,21 @@ class Deplate::Variables < Hash
             self[key] = val
         end
     end
-    
+
+    def set_value(name, value)
+        begin
+            @priority = true
+            self[name] = value
+        ensure
+            @priority = false
+        end
+    end
+
     def []=(name, value)
+        if name =~ /^[[:upper:]]+?([@\[]|$)/ and !@priority
+            Deplate::Core.log(['No permisson', name, value], :error)
+            return
+        end
         if name.kind_of?(String) and (m = /^(\S+)\[(\S+)?\]$/.match(name))
             key   = m[1]
             field = m[2]
@@ -48,16 +62,16 @@ class Deplate::Variables < Hash
                     field = field.to_i
                     var[field] = value
                 else
-                    Deplate::Core.log(["Wrong index", field, name, var.class], :error)
+                    Deplate::Core.log(['Wrong index', field, name, var.class], :error)
                 end
             elsif var
-                Deplate::Core.log(["Doc variable has wrong type", key, var.class], :error)
+                Deplate::Core.log(['Doc variable has wrong type', key, var.class], :error)
             end
         else
-            super
+            super(name, value)
         end
     end
-    
+
     def [](name)
         begin
             if !name.kind_of?(String) or keys.include?(name)
@@ -119,6 +133,8 @@ class Deplate::Variables < Hash
             else
                 Deplate::Core.log(['Wrong index', field, name, val.class], :error)
             end
+        elsif val.respond_to?('[]')
+            return val[field]
         else
             Deplate::Core.log(['Variable has wrong type', key, val.class], :warning)
         end

data/lib/deplate/wiki-markup.rb

@@ -1,10 +1,10 @@
 # wiki-markup.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 30-Mrz-2006.
-# @Revision:    0.260
+# @Last Change: 2007-09-01.
+# @Revision:    0.284
 #
 # = Description
 # Various elements for defining input filters
@@ -108,6 +108,7 @@ end
 class Deplate::Input::Wiki::ParagraphIndentedVerbatim < Deplate::Element::Paragraph
     set_rx(/^([ \t]*)(.+)[ \t]*$/)
     set_formatter nil
+    attr_reader :regNote
 
     def get_text
         @leading_whitespace = @match[1]
@@ -129,6 +130,7 @@ class Deplate::Input::Wiki::ParagraphIndentedVerbatim < Deplate::Element::Paragr
             format_as_paragraph
         else
             @elt = @leading_whitespace + @accum.join("\n")
+            # p "DBG format_special", @deplate.input.class, @deplate.input.elements, @elt
             format_as_verbatim
         end
     end
@@ -138,11 +140,20 @@ class Deplate::Input::Wiki::ParagraphIndentedVerbatim < Deplate::Element::Paragr
     end
 
     def format_as_verbatim
+      # <+TBD+> Register a code region in rdoc
+      # if @deplate.variables['codeSyntax']
+      #   r = Deplate::Element::Region.new(@deplate, @source, @accum, @match, 'Code', @args)
+      #   r = r.finish
+      #   r = r.process
+      #   r = r.format_compound
+      #   r
+      # else
         margin = @args["wrap"]
         if margin
             @elt = @deplate.formatter.wrap_text(@elt, :margin => margin.to_i)
         end
         format_element(:format_verbatim, self)
+      # end
     end
 end
 

data/lib/deplate/xml.rb

@@ -1,10 +1,10 @@
 # xml.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     17-M�r-2004.
-# @Last Change: 15-Apr-2006.
-# @Revision:    0.2315
+# @Last Change: 2007-07-21.
+# @Revision:    0.2318
 # 
 # TODO:
 # - 
@@ -17,7 +17,6 @@ class Deplate::Formatter::XML < Deplate::Formatter::Structured
     self.suffix = ".xml"
 
     def initialize(deplate, args)
-        @consumed_ids                     = []
         deplate.options.indentation_level = [0]
         super
         @special_symbols = {

data/lib/deplate/{zh-cn.rb → zh_CN.rb}

@@ -1,10 +1,10 @@
 # zh-cn.rb -- Simplified Chinese messages
-# @Author:      Thomas Link; localization by Jjgod Jiang (gzjjgod@21cn.com)
+# @Author:      Thomas Link; localization by Jjgod Jiang (gzjjgod AT 21cn com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     01-Aug-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.207
+# @Last Change: 2007-09-02.
+# @Revision:    0.217
 
 require 'deplate/messages'
 
@@ -12,21 +12,21 @@ class Deplate::Formatter
     attr_reader :cjk_smart_blanks
     
     def hook_pre_setup_zh_cn
-        # @deplate.variables["encoding"] = "gb2312"
-        @cjk_smart_blanks = !(@deplate.variables["noSmartBlanks"] || false)
+        # @deplate.variables['encoding'] = 'GB2312'
+        @cjk_smart_blanks = !(@deplate.variables['noSmartBlanks'] || false)
     end
 end
 
 class Deplate::Formatter::LaTeX
     def prepare_zh_cn
-        family   = @deplate.variables["cjk_family"]   || "gbsn"
-        encoding = @deplate.variables["cjk_encoding"] || "GB"
-        union_at(:pre, :mod_packages, "\\usepackage{CJK}")
-        union_at(:pre, :mod_packages, "\\usepackage{CJKnumb}")
-        union_at(:pre, :mod_packages, "\\usepackage{indentfirst}")
+        family   = @deplate.variables['cjk_family']   || 'gbsn'
+        encoding = @deplate.variables['cjk_encoding'] || 'GB'
+        union_at(:pre, :mod_packages, '\\usepackage{CJK}')
+        union_at(:pre, :mod_packages, '\\usepackage{CJKnumb}')
+        union_at(:pre, :mod_packages, '\\usepackage{indentfirst}')
         output_at(:pre, :body_beg, "\\begin{CJK*}{#{encoding}}{#{family}}", 
-                        "\\CJKtilde{}", "\\CJKcaption{GB}", "\\CJKindent{}")
-        output_at(:post, :prepend_body_end, "\\end{CJK*}")
+                        '\\CJKtilde{}', '\\CJKcaption{GB}', '\\CJKindent{}')
+        output_at(:post, :prepend_body_end, '\\end{CJK*}')
     end
 
     def set_document_encoding
@@ -50,10 +50,10 @@ class Deplate::Formatter
 end
 
 class Deplate::Messages::ZhCnGb2312 < Deplate::Messages
-    setup 'zh-cn'
-    def_prop 'lang', 'zh-cn'
-    def_prop 'encoding', 'gb2312'
+    setup 'zh_CN'
+    def_prop 'lang', 'zh_CN'
+    def_prop 'encoding', 'GB2312'
     def_prop 'latex_encoding', nil
-    load_catalog 'zh_cn.gb2312'
+    load_catalog 'zh_CN.GB2312'
 end
 

data/man/man1/deplate.1

@@ -2,13 +2,13 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "DEPLATE" "1" "07. Jun 2006" "" ""
+.TH "DEPLATE" "1" "25. Sep 2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
 .SH "NAME"
-deplate \- Deplate 0.8 \-\- convert wiki\-like markup to latex, docbook, html, or "html\-slides"
+deplate \- Deplate 0.8.1 \-\- convert wiki\-like markup to latex, docbook, html, or "html\-slides"
 .SH "USAGE"
 .PP
 The command\-line options:
@@ -22,35 +22,35 @@ the terms of the GNU General Public License version 2.
 
 
 General Options:
-    \-a, \-\-[no\-]ask                   On certain actions, query
+    \-a, \-\-[no\-]ask                   On certain actions, query 
     user before overwriting files
-    \-A, \-\-allow ALLOW                Allow certain things: l,
+    \-A, \-\-allow ALLOW                Allow certain things: l, 
     r, t, w, W, x, X, $
     \-c, \-\-config FILE                Alternative user cfg file
         \-\-[no\-]clean                 Clean up temporary files
         \-\-color                      Colored output
-        \-\-css NAME                   Copy NAME.css to the destination
+        \-\-css NAME                   Copy NAME.css to the destination 
         directory, if inexistent
-        \-\-copy\-css NAME              Copy NAME.css to the destination
+        \-\-copy\-css NAME              Copy NAME.css to the destination 
         directory
     \-d, \-\-dir DIR                    Output directory
     \-D, \-\-define NAME=VALUE          Define a document option
     \-e, \-\-[no\-]each                  Handle each file separately
         \-\-[no\-]force                 Force output
-    \-f, \-\-format FORMAT              Output format (default:
+    \-f, \-\-format FORMAT              Output format (default: 
     html)
         \-\-[no\-]included              Output body only
     \-i, \-\-input NAME                 Input definition
-        \-\-list FILE                  A file that contains a list
+        \-\-list FILE                  A file that contains a list 
         of input files
-        \-\-log FILE                   A file (or \- for stdout)
+        \-\-log FILE                   A file (or \- for stdout) 
         where to put the log
-        \-\-[no\-]loop                  Read from stdin forever
+        \-\-[no\-]loop                  Read from stdin forever 
         and ever
-        \-\-metadata [NAME]            Save metadata in this format
+        \-\-metadata [NAME]            Save metadata in this format 
         (default: yaml)
     \-m, \-\-module MODULE              Load a module
-    \-o, \-\-out FILE                   Output to file or stdout
+    \-o, \-\-out FILE                   Output to file or stdout 
     ('\-')
     \-p, \-\-pattern GLOBPATTERN        File name pattern
     \-P, \-\-exclude GLOBPATTERN        Excluded file name pattern
@@ -63,9 +63,9 @@ General Options:
         \-\-suffix SUFFIX              Suffix for output files
     \-t, \-\-template NAME              Template to use
         \-\-[no\-]vanilla               Ignore user configuration
-    \-x, \-\-allow\-ruby [RUBY SAFE]     Allow the execution of ruby
+    \-x, \-\-allow\-ruby [RUBY SAFE]     Allow the execution of ruby 
     code
-    \-X, \-\-[no\-]allow\-exec            Allow the execution of helper
+    \-X, \-\-[no\-]allow\-exec            Allow the execution of helper 
     applications
         \-\-[no\-]external
 
@@ -75,13 +75,14 @@ LaTeX Formatter:
 
 
 Available input defintions:
-deplate, deplate\-headings, deplate\-restricted, rdoc, template
+deplate, deplate\-headings, deplate\-restricted, play, rdoc, template
 
 
 Available formatters:
-dbk\-article, dbk\-article\-4.1.2, dbk\-book, dbk\-ref, dbk\-slides,
-dbk\-snippet, html, html\-snippet, htmlsite, htmlslides, htmlwebsite,
-latex, latex\-snippet, null, php, phpsite, plain, template, xhtml10t
+dbk\-article, dbk\-article\-4.1.2, dbk\-book, dbk\-ref, dbk\-slides, 
+dbk\-snippet, html, html\-snippet, htmlsite, htmlslides, htmlwebsite, 
+latex, latex\-dramatist, latex\-snippet, null, php, phpsite, plain, 
+template, xhtml10t
 
 
 Available metadata formats:
@@ -89,28 +90,30 @@ marshal, xml, yaml
 
 
 Available modules:
-anyword, babelfish, code\-gvim, code\-highlight, colored\-log, de,
-en, endnotes, fr, html\-asciimath, html\-deplate\-button, html\-headings\-navbar,
-html\-jsmath, html\-obfuscate\-email, html\-sidebar, htmlslides\-navbar\-fh,
-iconv, imgurl, inlatex\-compound, koma, latex\-emph\-table\-head,
-latex\-styles, latex\-verbatim\-small, makefile, mark\-external\-urls,
-markup\-1, markup\-1\-warn, navbar\-png, noindent, numpara, particle\-math,
-php\-extra, pstoedit, recode, ru_koi8\-r, smart\-dash, smiley, soffice,
-symbols\-latin1, symbols\-od\-utf\-8, symbols\-plain, symbols\-sgml,
-symbols\-utf\-8, symbols\-xml, syntax\-region\-alt, utf8, validate\-html,
-xmlrpc, zh\-cn, zh\-cn\-autospace
+anyword, babelfish, code\-gvim, code\-gvim71, code\-highlight, colored\-log, 
+endnotes, guesslanguage, html\-asciimath, html\-deplate\-button, 
+html\-headings\-navbar, html\-highstep, html\-jsmath, html\-obfuscate\-email, 
+html\-sidebar, htmlslides\-navbar\-fh, iconv, imgurl, inlatex\-compound, 
+koma, lang\-de, lang\-en, lang\-ru, lang\-ru\-koi8\-r, lang\-zh_CN, 
+lang\-zh_CN\-autospace, latex\-emph\-table\-head, latex\-styles, latex\-verbatim\-small, 
+makefile, mark\-external\-urls, markup\-1, markup\-1\-warn, navbar\-png, 
+noindent, numpara, particle\-math, php\-extra, pstoedit, quiz, 
+recode, smart\-dash, smiley, soffice, symbols\-latin1, symbols\-od\-utf\-8, 
+symbols\-plain, symbols\-sgml, symbols\-utf\-8, symbols\-xml, syntax\-region\-alt, 
+utf8, validate\-html, xmlrpc
 
 
 Available css files:
-article, deplate, heading\-navbar, layout\-deplate, layout\-deplate\-print,
-sans\-serif, serif, serif\-e, serif\-rel, slides, tabbar, tabbar\-left,
-tabbar\-right, tabbar\-right\-ie, tabbar\-top, text\-sans\-serif, text\-serif
+article, deplate, heading\-navbar, highstep, htmldoc, layout\-deplate, 
+layout\-deplate\-print, play, sans\-serif, serif, serif\-e, serif\-rel, 
+slides, styles, tabbar, tabbar\-left, tabbar\-right, tabbar\-right\-ie, 
+tabbar\-top, text\-sans\-serif, text\-serif
 
 
 Available templates:
-html\-doc.html, html\-left\-tabbar\-js.html, html\-left\-tabbar.html,
-html\-tabbar\-right\-pcomments.php, html\-tabbar\-right\-step.html,
-html\-tabbar\-right\-table.html, html\-tabbar\-right.html, html\-tabbar\-top.html,
+html\-doc.html, html\-left\-tabbar\-js.html, html\-left\-tabbar.html, 
+html\-tabbar\-right\-pcomments.php, html\-tabbar\-right\-step.html, 
+html\-tabbar\-right\-table.html, html\-tabbar\-right.html, html\-tabbar\-top.html, 
 html\-tabbar.html
 
 
@@ -120,9 +123,9 @@ Other Options:
         \-\-[no\-]quiet                 Be quiet
     \-v, \-\-[no\-]verbose               Run verbosely
     \-h, \-\-help                       Show this message
-        \-\-list\-modules [REGEXP]      List modules matching a
+        \-\-list\-modules [REGEXP]      List modules matching a 
         pattern
-        \-\-list\-css [REGEXP]          List css files matching
+        \-\-list\-css [REGEXP]          List css files matching 
         a pattern
         \-\-version                    Show version
         \-\-microversion               Show version
@@ -160,7 +163,6 @@ Notes:
 .TP
 \-D VAR, \-D VAR=VALUE
 You can define document variables via the command line; if no value is provided the variable is set to "1".
-.sp
 The option parser library, which
 deplate
 uses, doesn't deal well with spaces in command line arguments. This is why spaces have to be replaced with tildes; a tilde and backslashes have to be preceded with backslashes. Example:
@@ -203,7 +205,7 @@ Flags is a list of comma separated letters which may contain:
 l
 Allow the
 #LANG
-command to automatically load a module of the language's name
+command to automatically load a module of the language's name (this would make it possible for a malicious user to load any module as deplate cannot distinguish localization modules from other modules)
 .TP
 r
 Check files in $PWD/deplate.rc in some cases (e.g. check for a local config.rb); templates, css files, and library snippets are always searched in the
@@ -297,7 +299,13 @@ Configuration requires some knowledge of the ruby language. If you don't already
 \fIfully\fR
 object\-oriented interpreted language in the spirit of Smalltalk (but with a rather modern syntax) plus some features from Perl and Lisp/Scheme (e.g. continuations).
 .PP
-The configuration files are regular ruby files and are loaded after requiring all the libraries necessary. Theses files reside in the directory "$HOME/.deplate/" or "$USERPROFILE/deplate.rc/". This directory may also contain custom modules or css files etc. On Win 2000/XP etc., $USERPROFILE is usually set to "C:\\Documents and Settings\\USERNAME\\".
+The configuration files are regular ruby files and are loaded after requiring all the libraries necessary. Theses files reside in the directory "$HOME/.deplate/" or "$USERPROFILE/deplate.rc/". If these directories are not found, the files are searched in
+$WINDIR/deplate.rc/
+or
+/etc/deplate.rc/. Some files are also looked for in the "datadir" (usually something like
+/usr/share/deplate/).
+.PP
+This directory may also contain custom modules or css files etc. On Win 2000/XP etc., $USERPROFILE is usually set to "C:\\Documents and Settings\\USERNAME\\".
 .PP
 The user configuration directory should look like this:
 .TP 3
@@ -730,53 +738,60 @@ mixes up your template, you should prefix these curly braces that cause problems
 .PP
 Backslashes have always to be doubled.
 .PP
-A LaTeX template could then look like this:
+Example 2.2: A letter template
+.PP
+In this example, we use get for the author's name because the corresponding clip is automatically defined by the standard #AU(THOR) command. For other data we use variables.
+.PP
+Template: tmpl_letter.tex
 .sp
 .nf
-% The author and date clips are automatically set by the #AUTHOR and 
-% #DATE commands
-% (c) {get: date}, {get: author}
-
-\\\\documentclass[12pt,a4paper]{letter}
-
-% Insert all the prematter stuff except the documentclass definition, 
-% which is provided by this template
+\\\\documentclass[12pt,a4paper,english]{letter}
 #PREMATTER: \-doc_def
-
 \\\\address{{get: author}\\\\\\\\
-    Where I live}
+    {val escapebackslash!: address}}
 \\\\signature{{get: author}}
 
-% addresseeAddress and addresseeName refer to document variables defined 
-% using the #VAR command or provided at the command line
-\\\\begin{letter}{{get: addresseeAddress}}
-    
-\\\\opening{Dear {get: addresseeName},}
+\\\\begin{letter}{{val: addresseeName}\\\\\\\\
+    {val escapebackslash!: addresseeAddress}}
+\\\\opening{Dear {val: addresseeName},}
 
-% Insert the body
 #BODY
 
 \\\\closing{Sincerly,}
-
 \\\\vfill{}
-% "enclosure" refers to a clip define by the #PUT command
 \\\\encl{{val: enclosure}}
-
 \\\\end{letter}
-
-% Insert post\-body stuff
 #POSTMATTER
 .fi
 .PP
-You could now copy this example template to "~/.deplate/templates/letter.tex" and call
-deplate
-as:
+Input file: example\-letter.txt
 .sp
 .nf
-deplate \-f latex \-t letter.tex DEPLATE.FILE
+#AU: John Smith
+#DATE: today
+#VAR id=address: Cool Place 1{nl inline!}Hiptown 10000
+#VAR id=enclosure: Important Document
+#VAR: addresseeName=Max Mustermann
+#VAR: addresseeAddress=Tolle Straße 2{nl}Neustadt 20000
+
+I would like to say thanks for your last letter which I read with much joy. I
+hope to be hearing from you soon.
 .fi
+.PP
+Command line:
+.sp
+.nf
+deplate \-t tmpl_letter.tex \-f latex example\-letter.txt
+pdflatex example\-letter.tex
+.fi
+.PP
+Result:
+[2]\&\fIexample\-letter.pdf\fR
 .RE
 .SH "REFERENCES"
 .TP 3
 1.\ Vim viki plugin
 \%http://www.vim.org/scripts/script.php?script_id=861
+.TP 3
+2.\ example\-letter.pdf
+\%example\-letter.pdf