deplate 0.8 → 0.8.1

data/lib/deplate/css/tabbar-top.css

@@ -1,7 +1,10 @@
 @import url(deplate.css);
 
 body {
-    background-color: #d9e0f0;
+    /* background-color: #d9e0f0; */
+    background-color: #e4e8f0;
+    background-image: url(grad_blue.jpg);
+    background-repeat: repeat-x;
 }
 
 #tabFrame {
@@ -9,17 +12,18 @@ body {
     top: 0;
     left: 10%;
     text-align: left;
-    width: 100%;
+    width: 80%;
 }
 #tabBar {
     padding: 0;
     border: 0;
     margin: 10px 0 0 0;
-    background-color: #d9e0f0;
+    /* background-color: #d9e0f0; */
+    background-color: transparent;
 }
 #tabBodyFrame {
     /* text-align: left; */
-    width: 80%;
+    width: 100%;
     padding: 0;
 }
 #tabBody {
@@ -28,7 +32,11 @@ body {
     vertical-align: top;
     margin-top: 0;
     padding: 10px;
-    border: 1px dashed #cae0ea;
+    /* border: 1px dashed #cae0ea; */
+    border: 1px solid #cae0ea;
+    border-bottom-left-radius: 15px;
+    border-bottom-right-radius: 15px;
+    -moz-border-radius: 0 0 15px 15px;
 }
 
 table.tabBarTop {
@@ -49,18 +57,29 @@ tr.tabBarTop {
 }
 td.tabBarTopActive {
     margin: 0;
-    border-top: 1px dashed #cae0ea;
-    border-left: 1px dashed #cae0ea;
-    border-right: 1px dashed #cae0ea;
+    /* border-top: 1px dashed #cae0ea; */
+    /* border-left: 1px dashed #cae0ea; */
+    /* border-right: 1px dashed #cae0ea; */
+    border-top: 1px solid #cae0ea;
+    border-left: 1px solid #cae0ea;
+    border-right: 1px solid #cae0ea;
     border-bottom: 0;
     background-color: #ffffff;
     text-align: center;
+    /* -moz-border-radius: 15px 15px 0 0; */
 }
 td.tabBarTopInactive {
     margin: 0;
-    border-bottom: 1px dashed #cae0ea;
+    /* border-bottom: 1px dashed #cae0ea; */
+    border-bottom: 1px solid #cae0ea;
     background-color: #f0f0f0;
     text-align: center;
+    /* -moz-border-radius: 15px 15px 0 0; */
+}
+
+tr.tabBarTopAbout {
+}
+td.tabBarTopAbout {
 }
 
 div.pageicons {

data/lib/deplate/css/text-sans-serif.css

@@ -1,5 +1,5 @@
 /* Text style: sans-serif */
-/* @Author:      Thomas Link (samul AT web.de) */
+/* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
 /* @Last Change: 20-Feb-2005. */
 /* @Revision:    0.587 */

data/lib/deplate/css/text-serif.css

@@ -1,5 +1,5 @@
 /* Text style: sans-serif */
-/* @Author:      Thomas Link (samul AT web.de) */
+/* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
 /* @Last Change: 21-Mai-2005. */
 /* @Revision:    0.585 */

data/lib/deplate/define.rb

@@ -1,10 +1,10 @@
 # define.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:     19-Okt-2004.
-# @Last Change: 29-Apr-2006.
-# @Revision:    0.500
+# @Last Change: 2007-05-20.
+# @Revision:    0.546
 
 require 'deplate/commands'
 require 'deplate/macros'
@@ -88,20 +88,46 @@ class Deplate::Define < Deplate::Region
     end
 end
 
+module Deplate::Define::TemplateExpander
+    def use_template(template=@template, oargs={})
+        # deplate = @deplate || oargs[:deplate]
+        # args    = @args    || oargs[:args]
+        # source  = @source  || oargs[:source]
+        deplate = oargs[:deplate] || @deplate
+        args    = oargs[:args] || @args
+        source  = oargs[:source] || @source
+        if args['noTemplate'] or deplate.variables['legacyDefine1']
+            template
+        else
+            tmpl = Deplate::Template.new(:master    => deplate,
+                                         :template  => template, 
+                                         :source    => source, 
+                                         :container => self)
+            rv = nil
+            Deplate::Define.let_variables(deplate, args) do
+                rv = tmpl.fill_in(deplate, :source => source)
+            end
+            rv
+        end
+    end
+end
 
 # class Deplate::Define::Region < Deplate::Region::SecondOrder
 class Deplate::Define::Region < Deplate::Region
+    include Deplate::Define::TemplateExpander
+
     def finish
         finish_accum
         setup_template
         @args['@body'] = @accum.join("\n")
-        @args['@note'] = @regNote
+        deprecated_regnote
         Deplate::Define.check_arguments(@mandatory, @args, @source)
         @expected = Deplate::Element
         @elt      = []
+        tpl = use_template
         Deplate::Define.let_variables(@deplate, @args) do
             # p "DBG DefineRegion: #{@deplate.options.counters.inspect}"
-            @elt = @deplate.parsed_array_from_strings(@template, @source.begin, @source.file)
+            @elt = @deplate.parsed_array_from_strings(tpl, @source.begin, @source.file)
         end
         unless @elt.empty?
             @elt.first.put_label(@label)
@@ -111,12 +137,12 @@ class Deplate::Define::Region < Deplate::Region
 end
 
 class Deplate::Regions::DefRegion < Deplate::Define
-    @@regions['DefRegion'] = self
-    @@regions['DefineRegion'] = self
-    @@regions['Defr'] = self
+    register_as 'DefRegion'
+    register_as 'DefineRegion'
+    register_as 'Defr'
     
     def define
-        id = @args['id'] ||= @regNote
+        id = deprecated_regnote('id')
         if valid_id?(id)
             # if @args['lineCont'] == false
                 line_cont = 'set_line_cont false'
@@ -163,15 +189,15 @@ class Deplate::Define::Element < Deplate::Element
 end
 
 class Deplate::Regions::DefElement < Deplate::Define
-    @@regions['DefElement']    = self
-    @@regions['DefineElement'] = self
-    @@regions['Defe']          = self
+    register_as 'DefElement'
+    register_as 'DefineElement'
+    register_as 'Defe'
     @@def_element_counter      = 0
 
     set_line_cont false
     
     def define
-        rx = @args['rx'] ||= @regNote
+        rx = deprecated_regnote('rx')
         if rx
             @@def_element_counter += 1
             # template  = @accum.join("\n").gsub(/\'/, "\\\\\'")
@@ -223,7 +249,7 @@ class Deplate::Regions::DefParticle < Deplate::Define
     @@def_particle_counter      = 0
     
     def define
-        rs = @args['rx'] ||= @regNote
+        rs = deprecated_regnote('rx')
         if rs
             # template  = @accum.join("\n").gsub(/\'/, "\\\\\'")
             template  = @accum.join("\n")
@@ -245,13 +271,20 @@ end
 
 class Deplate::Define::Command < Deplate::Command
     class << self
+        include Deplate::Define::TemplateExpander
+
         def accumulate(source, array, deplate, text, match, args, cmd)
             Deplate::Core.log("%s: %s" % [cmd, text], :debug)
             template, mandatory = setup_template(text, deplate)
             args['@body'] = text
             Deplate::Define.check_arguments(mandatory, args, source)
+            tpl = use_template(template, 
+                               :deplate => deplate,
+                               :args => args,
+                               :source => source
+                              )
             Deplate::Define.let_variables(deplate, args) do
-                deplate.include_stringarray(template, array, source.begin, source.file)
+                deplate.include_stringarray(tpl, array, source.begin, source.file)
             end
         end
     end
@@ -259,13 +292,13 @@ end
 
 
 class Deplate::Regions::DefCommand < Deplate::Define
-    @@regions['DefCommand'] = self
-    @@regions['DefCmd'] = self
-    @@regions['DefineCommand'] = self
-    @@regions['Defc'] = self
+    register_as 'DefCommand'
+    register_as 'DefCmd'
+    register_as 'DefineCommand'
+    register_as 'Defc'
     
     def define
-        id = @args['id'] ||= @regNote
+        id = deprecated_regnote('id')
         if valid_id?(id)
             body = <<-EOR
                 class << self
@@ -301,11 +334,11 @@ end
 
 
 class Deplate::Regions::DefMacro < Deplate::Define
-    @@regions['DefMacro'] = self
-    @@regions['DefineMacro'] = self
-    @@regions['Defm'] = self
+    register_as 'DefMacro'
+    register_as 'DefineMacro'
+    register_as 'Defm'
     def define
-        id = @args['id'] ||= @regNote
+        id = deprecated_regnote('id')
         if valid_id?(id)
             body = <<-EOR
                 def setup_template(text)
@@ -325,7 +358,7 @@ end
 
 class Deplate::Regions::Native
     def expand_template
-        @args['@note'] = @regNote
+        deprecated_regnote
         @args['@body'] = @accum.join("\n")
         tmpl = Deplate::Template.new(:master => @deplate,
                                      :template => @template, 
@@ -341,11 +374,11 @@ end
 
 
 class Deplate::Regions::DefRegionN < Deplate::Define
-    @@regions['DefRegionN'] = self
-    @@regions['DefineRegionN'] = self
-    @@regions['Defrn'] = self
+    register_as 'DefRegionN'
+    register_as 'DefineRegionN'
+    register_as 'Defrn'
     def define
-        id = @args['id'] ||= @regNote
+        id = deprecated_regnote('id')
         if valid_id?(id)
             body = <<-EOR
                 def finish
@@ -385,12 +418,12 @@ end
 
 
 class Deplate::Regions::DefCommandN < Deplate::Define
-    @@regions['DefCommandN'] = self
-    @@regions['DefCmdN'] = self
-    @@regions['DefineCommandN'] = self
-    @@regions['Defcn'] = self
+    register_as 'DefCommandN'
+    register_as 'DefCmdN'
+    register_as 'DefineCommandN'
+    register_as 'Defcn'
     def define
-        id = @args['id'] ||= @regNote
+        id = deprecated_regnote('id')
         if valid_id?(id)
             body = <<-EOR
                 def finish
@@ -424,11 +457,11 @@ end
 
 
 class Deplate::Regions::DefMacroN < Deplate::Define
-    @@regions['DefMacroN'] = self
-    @@regions['DefineMacroN'] = self
-    @@regions['Defmn'] = self
+    register_as 'DefMacroN'
+    register_as 'DefineMacroN'
+    register_as 'Defmn'
     def define
-        id = @args['id'] ||= @regNote
+        id = deprecated_regnote('id')
         if valid_id?(id)
             body = <<-EOR
                 def setup_template

data/lib/deplate/deplate-string.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 # deplate-string.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: 03-Jan-2006.
-# @Revision:    0.39
+# @Last Change: 18-Aug-2006.
+# @Revision:    0.40
 
 require 'deplate/converter'
 

data/lib/deplate/docbook.rb

@@ -1,10 +1,10 @@
 # docbook.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.2735
+# @Last Change: 2007-09-30.
+# @Revision:    0.2748
 
 require 'deplate/xml'
 
@@ -12,7 +12,6 @@ require 'deplate/xml'
 
 class Deplate::Formatter::Docbook < Deplate::Formatter::XML
     def initialize(deplate, args)
-        @consumed_ids = []
         @sgml         = false
         super
     end
@@ -34,11 +33,11 @@ class Deplate::Formatter::Docbook < Deplate::Formatter::XML
         end
         id = opts['id']
         if id
-            if @consumed_ids.include?(id)
+            if consumed_ids.include?(id)
                 opts = opts.dup
                 opts.delete('id')
             else
-               @consumed_ids << id
+               consumed_ids << id
             end
             opts['xreflabel'] ||= args[:level_as_string]
         end
@@ -195,8 +194,9 @@ class Deplate::Formatter::Docbook < Deplate::Formatter::XML
         if text
             acc = []
             for au in Deplate::Core.authors_split(text)
-                author = Deplate::Names.name_match_sf(au) || Deplate::Names.name_match_fs(au)
-                if author
+                if (author = Deplate::Names.name_match_c(au))
+                    acc << formatted_inline(type, formatted_inline('surname', author[:surname]))
+                elsif (author = Deplate::Names.name_match_sf(au) || Deplate::Names.name_match_fs(au))
                     surname   = formatted_inline('surname', author[:surname])
                     firstname = formatted_inline('firstname', author[:firstname])
                     acc << formatted_inline(type, surname + firstname)
@@ -522,7 +522,7 @@ class Deplate::Formatter::Docbook < Deplate::Formatter::XML
 
     def get_image(args, file, fnroot, inline=false)
         if file =~ Deplate::HyperLink::Url.rx
-            Deplate::Core.log([%{Can't include remote images in current document}, file], :error)
+            Deplate::Core.log([%{Cannot include remote images in current document}, file], :error)
             file = File.basename(file)
         end
         o = {}

data/lib/deplate/elements.rb

@@ -1,10 +1,10 @@
 # elements.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:     26-M�r-2004.
-# @Last Change: 07-Jun-2006.
-# @Revision:    0.4285
+# @Last Change: 2007-09-30.
+# @Revision:    0.4497
 
 require "deplate/abstract-class"
 
@@ -83,17 +83,21 @@ class Deplate::Element < Deplate::BaseElement
 
         def do_accumulate(src, array, deplate, text, *args)
             run_accumulation_hooks(@@accumulate_pre[self], src, array, deplate, text, *args)
-            top = array.last
-            accumulate(src, array, deplate, text, *args)
-            indentation  = text.gsub(/^(\s*).*$/, '\\1')
-            shiftwidth   = deplate.variables['tabWidth']
-            shiftwidth   = shiftwidth ? shiftwidth.to_i : 4
-            indent_level = indentation.size / shiftwidth
-            i = -1
-            while ((e = array[i]) and (!top or e != top))
-                e.indentation       = indentation
-                e.indentation_level = indent_level
-                i -= 1
+            begin
+                top = array.last
+                accumulate(src, array, deplate, text, *args)
+                indentation  = text.gsub(/^(\s*).*$/, '\\1')
+                shiftwidth   = deplate.variables['tabWidth']
+                shiftwidth   = shiftwidth ? shiftwidth.to_i : 4
+                indent_level = indentation.size / shiftwidth
+                i = -1
+                while ((e = array[i]) and (!top or e != top))
+                    e.indentation       = indentation
+                    e.indentation_level = indent_level
+                    i -= 1
+                end
+            rescue Exception => e
+                Deplate::Core.log(['Error when running command', e], :error, src)
             end
             run_accumulation_hooks(@@accumulate_post[self], src, array, deplate, text, *args)
         end
@@ -155,6 +159,7 @@ class Deplate::Element < Deplate::BaseElement
         
         @level = get_level if respond_to?(:get_level)
         @accum = respond_to?(:get_text) ? [get_text] : []
+        @accum.compact!
 
         set_instance_top
 
@@ -198,8 +203,8 @@ class Deplate::Element < Deplate::BaseElement
         return @collapse && other.collapse && self.class == other.class
     end
    
-    def drop?
-        return @collapse == :drop
+    def drop?(filter=nil)
+        return @collapse == :drop || (filter && exclude?(filter))
     end
     
     def unify(other)
@@ -222,7 +227,7 @@ class Deplate::Element < Deplate::BaseElement
     def_abstract :push_match
 
     def to_be_continued?(line, klass, match)
-        klass.nil? && @multiliner
+        @multiliner && (klass == @deplate.input.comment_class || klass.nil?)
     end
     
     # compile the accumulated lines in @accum & put the result into @elt
@@ -381,7 +386,7 @@ class Deplate::Element < Deplate::BaseElement
     end
   
     def register_caption
-        # log(["Can't attach caption to", self.class.name], :error)
+        # log(["Cannot attach caption to", self.class.name], :error)
     end
 
     def set_caption(captiondef, quiet=false)
@@ -418,8 +423,8 @@ class Deplate::Element < Deplate::BaseElement
         # nn = @deplate.get_numbering_mode(en, 2)
         # nn = nil if nn == 0
         cn = @deplate.options.listings.get_prop(list, 'counter') || list
-        # self.level_as_string = @deplate.options.counters.increase(cn, :to_s => true, :level => nn)
-        self.level_as_string = @deplate.options.counters.increase(cn, :to_s => true)
+        # self.level_as_string = @deplate.options.counters.increase(cn, :container => self, :to_s => true, :level => nn)
+        self.level_as_string = @deplate.options.counters.increase(cn, :container => self, :to_s => true)
         prefix = @deplate.options.listings.get_prop(list, 'prefix') || list
         label  = @deplate.elt_label(prefix, level_as_string)
         @label << label
@@ -432,11 +437,13 @@ class Deplate::Element < Deplate::BaseElement
                                                      )
     end
 
-    protected
     def process_etc
         if !@caption and @args['caption']
-            log(['DEBUG: Too late: Add caption', @args['caption']], :error)
-            caption = @deplate.parse(self, @args['caption'])
+            # puts caller[0..10].join("\n")
+            # log(['DEBUG: Too late: Add caption', @args['caption']], :error)
+            log(['Add caption', @args['caption']])
+            # caption = @deplate.parse(self, @args['caption'])
+            caption = @args['caption']
             set_caption(Deplate::CaptionDef.new(caption, @args, @source))
         end
         if defined?(@caption) && @caption
@@ -459,7 +466,7 @@ class Deplate::Element < Deplate::BaseElement
         l.compact!
         l.uniq!
         put_label(l, true)
-        @args.update(other.args)
+        unify_args(other.args)
         # p "DBG", self.class, other.class, @args.keys, other.args.keys
         @level          ||= other.level
         @source.begin   ||= other.source.begin
@@ -479,7 +486,19 @@ class Deplate::Element < Deplate::BaseElement
             update_styles(other.styles)
         end
     end
-    
+   
+	def unify_args(args)
+        @args.update(args) do |k, o, n|
+            case k
+            when 'tag'
+                [o, n].join(',')
+            else
+                n
+            end
+        end
+		update_args
+	end
+
     def unify_elt(other)
         if @elt.nil?
             @elt = other.elt
@@ -510,7 +529,7 @@ class Deplate::Element < Deplate::BaseElement
                 pre  = m.pre_match
                 text = m.post_match
                 add  = tabwidth - pre.size % tabwidth
-                accum << pre + (" " * add)
+                accum << pre + (' ' * add)
             else
                 return accum.join + text
             end
@@ -523,8 +542,10 @@ class Deplate::Element < Deplate::BaseElement
         if @elt
             @elt = (@elt.collect(&block)).join
         else
-            log(["Internal error: No @elt", self.class], :error)
-            @elt = ""
+            # p "DBG", @accum
+            # puts caller.join("\n")
+            log(['Internal error: No @elt', self.class], :error)
+            @elt = ''
         end
     end
     alias process_elements process_particles
@@ -539,19 +560,68 @@ class Deplate::Element < Deplate::BaseElement
 end
 
 
-class Deplate::Element::Comment < Deplate::Element
+# Don't register Paragraph in @@elements -- it's assigned if nothing else 
+# matches
+class Deplate::Element::Paragraph < Deplate::Element
+    set_formatter :format_paragraph
+    set_rx(/^([[:blank:]]*)(.+)[[:blank:]]*$/)
+    def_get :level, lambda {get_indent(@match[1]).size}
+    def_get :text, lambda {@deplate.options.keep_whitespace ? @match[0] : @match[2]}
+
+    class << self
+        def from_text(deplate, src, text)
+            m = self.rx.match(text)
+            self.new(deplate, src, text, m)
+        end
+    end
+
+    def setup
+        @multiliner = true
+    end
+end
+
+
+class Deplate::Element::Comment < Deplate::Element::Paragraph
     register_element
-    set_rx(/^\s*(%+)[[:blank:]]*(.*)$/)
-    def_get :level, lambda {@match[1].size}
+    # set_rx(/^\s*(%+)[[:blank:]]*(.*)$/)
+    set_rx(/^\s*(%+)\s*(.*)$/)
+    # def_get :level, lambda {@match[1].size}
+    def_get :level, lambda {get_marker.size}
+    def_get :marker, 1
     def_get :text, 2
-    
-    # disappear
-    def self.accumulate(src, array, deplate, text, match)
-        Deplate::Core.log(["Hide comment", text], :debug)
+
+    # disappear unless commentsShow is set
+    class << self
+        def accumulate(src, array, deplate, text, match)
+            m = deplate.variables['commentsShow']
+            if m
+                e = self.new(deplate, src, text, match)
+                if e and (m == true or e.get_marker == m)
+                    e.update_styles('sourceComment')
+                    array << e
+                    return
+                end
+            end
+            Deplate::Core.log(["Hide comment", text], :debug)
+        end
+
+        def show_comment?(deplate, text)
+            m = deplate.variables['commentsShow']
+            return m && (m == true || text =~ Regexp.new('^\s*' + Regexp.escape(m)))
+        end
     end
 
     def setup
-        @collapse = true
+        if @deplate.variables['commentsShow']
+            @multiliner = true
+        else
+            @collapse = true
+        end
+    end
+
+    def <<(line)
+        m = self.class.rx.match(line)
+        @accum << m[2]
     end
 end
 
@@ -570,6 +640,15 @@ class Deplate::Element::Note < Deplate::Element
         @multiliner = true
         @marker     = get_marker
     end
+
+    def finish
+        rv = super
+        case @marker
+        when '+'
+            log(['TODO', @accum.join(' ')], :anyway)
+        end
+        return rv
+    end
     
     def to_be_continued?(line, klass, match)
         indent = get_indent(line).size
@@ -600,7 +679,7 @@ class Deplate::List < Deplate::Element
         @collapse   = true
         @itemopts   = get_opts
         if self.instance_of?(Deplate::List::Description)
-            @levelMax = @level + (@deplate.variables["tabwidth"] || 4)
+            @levelMax = @level + (@deplate.variables['tabwidth'] || 4)
         else
             @levelMax = get_level_max
         end
@@ -624,7 +703,17 @@ class Deplate::List < Deplate::Element
         end
     end
 
+    def pop(array)
+        if @elt.empty?
+            array.pop
+        else
+            @elt.pop
+        end
+    end
+
     def unify_now(other)
+        # if other.exclude?(@deplate.variables['efilter'])
+            # Basically, this should happen in Input
         if other.kind_of?(Deplate::Element::Paragraph)
             @elt << Deplate::ListItem.new([], other.elt.flatten, @elt.last.listtype, 
                                         "Paragraph", other.level, other.level, 
@@ -733,10 +822,10 @@ end
 
 class Deplate::List::Task < Deplate::List
     register_element
-    set_rx(/^(([[:blank:]]+)#(([0-9][A-Z]?|[A-Z][0-9]?)[[:blank:]]+(_|x|x?[0-9-]+%?)|(_|x|x?[0-9-]+%?)[[:blank:]]+([0-9][A-Z]?|[A-Z][0-9]?)))[[:blank:]]+(.*)$/)
+    set_rx(/^(([[:blank:]]+)#(([0-9][A-Z]?|[A-Z][0-9]?)([[:blank:]]+(_|x|x?[0-9-]+%?))?|(_|x|x?[0-9-]+%?)[[:blank:]]+([0-9][A-Z]?|[A-Z][0-9]?)))[[:blank:]]+(.*)$/)
     self.listtype = 'Task'
     def_get :item, lambda {[@itemopts[:priority], @itemopts[:category]].join}
-    def_get :text, 8
+    def_get :text, 9
     
     attr_accessor :task
 
@@ -781,7 +870,7 @@ end
 
 class Deplate::Element::Region < Deplate::Element
     register_element
-    set_rx(/^(\s*)#([A-Z]([a-z][A-Za-z]*)?)\b(.*)(\<\<(.+)|:)\s*$/)
+    set_rx(/^(\s*)#([A-Z]([a-z][A-Za-z]*)?)\b(.*)(\<\<(.*)|:)\s*$/)
 
     class_attribute :rxi_indent, 1
     class_attribute :rxi_name,   2
@@ -797,8 +886,10 @@ class Deplate::Element::Region < Deplate::Element
             /^(#{get_indent})?#End\s*$/
         else
             erx = @match[i]
-            if erx
+            if erx =~ /\S/
                 /^(#{get_indent})?#{Regexp.escape(erx)}\s*$/
+            else
+                /^\s*$/
             end
         end
     }
@@ -816,12 +907,19 @@ class Deplate::Element::Region < Deplate::Element
 
     attr_reader :specified, :regNote, :name
     
-    def setup(name=nil)
+    def setup(name=nil, args=nil)
         @multiliner = true
         @endRx      = get_endrx
         @name       = name || get_name
         begin
-            @args, @regNote = @deplate.input.parse_args(get_args)
+            if args
+              @args = args
+              @regNote = ''
+            else
+              @args, @regNote = @deplate.input.parse_args(get_args)
+            end
+            @args = @args.merge(@deplate.variables["args@#{@name}"] || {})
+            Deplate::Region.deprecated_regnote(self, @args, @regNote)
             region = @deplate.input.regions[@name]
             unless region
                 if @deplate.formatter.matches?(@name)
@@ -861,7 +959,7 @@ end
 
 class Deplate::Element::Command < Deplate::Element
     register_element
-    set_rx(/^\s*#([A-Z]+)((\s[^:]+)?(:\s*(.+?)\s*)?)$/)
+    set_rx(/^\s*#([A-Z]+)\s*?((\s[^:]+)?(:\s*(.+?)\s*)?)$/)
     attr :name
    
     class << self
@@ -879,6 +977,7 @@ class Deplate::Element::Command < Deplate::Element
             Deplate::Core.log(['Command', cmd, text], :debug)
             begin
                 args, text = deplate.input.parse_args(match[2])
+                args = args.merge(deplate.variables["args@#{cmd}"] || {})
                 case cmd
                 when 'IF'
                     deplate.switches << !check_switch(deplate, text)
@@ -935,15 +1034,15 @@ class Deplate::Element::Command < Deplate::Element
             if text =~ /^\(.*\)$/
                 text = text[1..-2]
             end
-            m = /^\s*([:]?\w+)\s*((!=~|=~|==|!=)\s*(.+)\s*|!)$/.match(text)
+            m = /^\s*([:]?\w+(\[.+?\])?)\s*((!=~|=~|==|!=)\s*(.+)\s*|!)$/.match(text)
             if m
                 var = m[1]
                 negate = /^no([A-Z].*)$/.match(var)
                 if negate
                     var = negate[1][0..0].downcase + negate[1][1..-1]
                 end
-                val = m[4]
-                op  = val ? m[3] : m[2]
+                val = m[5]
+                op  = val ? m[4] : m[3]
                 case val
                 when 'true'
                     val = true
@@ -953,8 +1052,17 @@ class Deplate::Element::Command < Deplate::Element
                 else
                     val = Deplate::Core.remove_backslashes(val.strip)
                 end
+                case var
+                when 'fmt'
+                    vvar = deplate.formatter.formatter_name
+                else
+                    vvar = get_var_or_option(deplate, var)
+                end
+                # if vvar.nil? and val == false
+                #     vvar = false
+                # end
                 if op == '!'
-                    switch = get_var_or_option(deplate, var)
+                    switch = vvar
                     if negate
                         return !switch
                     else
@@ -969,12 +1077,7 @@ class Deplate::Element::Command < Deplate::Element
                     else
                         raise 'Internal error'
                     end
-                    case var
-                    when 'fmt'
-                        switch = compare.call(deplate.formatter.formatter_name, val)
-                    else
-                        switch = compare.call(get_var_or_option(deplate, var), val)
-                    end
+                    switch = compare.call(vvar, val)
                     if op[0..0] == '!' or negate
                         return !switch
                     else
@@ -990,10 +1093,15 @@ class Deplate::Element::Command < Deplate::Element
         end
 
         def get_var_or_option(deplate, key)
-            if deplate.variables.has_key?(key)
-                return deplate.variables[key]
-            elsif deplate.options.allow.include?(':') && key =~ /^:(.*)$/
-                return deplate.options.send($1)
+            begin
+                if deplate.options.allow.include?(':') && key =~ /^:(.*)$/
+                    return deplate.options.send($1)
+                    # elsif deplate.variables.has_key?(key)
+                else
+                    return deplate.variables[key]
+                end
+            rescue Exception => e
+                Deplate::Core.log(e, :error)
             end
             Deplate::Core.log(['Unknown variable or option', key])
             return nil
@@ -1111,7 +1219,7 @@ class Deplate::Element::Table < Deplate::Element
                     elsif parent
                         parent.span_x += 1
                     else
-                        log(["Table: Can't join with left cell", x, y], :error)
+                        log(["Table: Cannot join with left cell", x, y], :error)
                     end
                 when :join_above
                     parent = find_parent_cell(x, y, 0, 1)
@@ -1119,7 +1227,7 @@ class Deplate::Element::Table < Deplate::Element
                     elsif parent
                         parent.span_y += 1
                     else
-                        log(["Table: Can't join with above cell", x, y], :error)
+                        log(["Table: Cannot join with above cell", x, y], :error)
                     end
                 when :ruler, :noruler
                     row.is_ruler = true
@@ -1169,7 +1277,7 @@ class Deplate::Element::Table < Deplate::Element
     
     def get_table_args(name)
         args = @args[name]
-        args ? args.split(/\s*,\s*/) : []
+        args ? Deplate::Core.split_list(args, nil, nil, @source) : []
     end
 
     def find_parent_cell(x, y, delta_x, delta_y)
@@ -1231,11 +1339,11 @@ class Deplate::Element::Heading < Deplate::Element
     end
     
     def set_instance_top
-        ls = @deplate.variables["levelshift"]
+        ls = @deplate.variables['levelshift']
         if ls
              @level += ls.to_i
         end
-        @deplate.increase_current_heading(@level)
+        @deplate.increase_current_heading(self, @level)
         super
     end
     
@@ -1292,6 +1400,7 @@ class Deplate::Element::Heading < Deplate::Element
             end
         end
         if rv.is_top_heading?
+            @deplate.output.simulate_reset
             @deplate.options.heading_names[@top_heading_idx] = rv.elt
             if @deplate.variables['subToC']
                 args  = {'sub' => true, 'plain' => true}
@@ -1449,27 +1558,6 @@ class Deplate::Element::PotentialPageBreak < Deplate::Element
 end
 
 
-# Don't register Paragraph in @@elements -- it's assigned if nothing else 
-# matches
-class Deplate::Element::Paragraph < Deplate::Element
-    set_formatter :format_paragraph
-    set_rx(/^([[:blank:]]*)(.+)[[:blank:]]*$/)
-    def_get :level, lambda {get_indent(@match[1]).size}
-    def_get :text, lambda {@deplate.options.keep_whitespace ? @match[0] : @match[2]}
-
-    class << self
-        def from_text(deplate, src, text)
-            m = self.rx.match(text)
-            self.new(deplate, src, text, m)
-        end
-    end
-    
-    def setup
-        @multiliner = true
-    end
-end
-
-
 class Deplate::Element::Clip < Deplate::BaseElement
     attr_reader :is_template
     # attr_accessor :prototype
@@ -1498,6 +1586,7 @@ class Deplate::Element::Clip < Deplate::BaseElement
    
     def format_clip(invoker, expected)
         unless @elt
+            puts caller[0..10].join("\n")
             log("We shouldn't be here. If you can track down when this happens, please send an example to the author.", :anyway)
             process
         end