deplate 0.8 → 0.8.1

data/lib/deplate/common.rb

@@ -1,10 +1,10 @@
 # common.rb -- The base class for deplate building blocks
-# @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:     02-Aug-2004.
-# @Last Change: 05-Jun-2006.
-# @Revision:    0.805
+# @Last Change: 2007-09-30.
+# @Revision:    0.896
 # 
 # = Description:
 # Misc classes
@@ -40,7 +40,21 @@ module Deplate::CommonGround
         @deplate         = deplate
         # @args          = {:class => self.class, :self => self, :deplate => deplate}
         @args            = args[:args] || {:self => self, :deplate => deplate}
+        if (cn = self.class.name)
+            cn = cn.split(/::/)
+            if cn[0] == 'Deplate'
+                acc = []
+                cn[-2..-1].each do |cnpart|
+                    acc << cnpart
+                    globalargs = @deplate.variables["$#{acc.join}"]
+                    if globalargs
+                        @args.merge!(globalargs) {|k,o,n| o}
+                    end
+                end
+            end
+        end
         self.level_as_string = args[:level_as_string] || deplate.get_current_heading
+        @heading         = deplate.current_heading_element
         @level_as_list   = args[:level_as_string] || deplate.current_heading.dup
         @elt             = args[:elt]      || nil
         @text            = args[:text]     || nil
@@ -63,17 +77,34 @@ module Deplate::CommonGround
             return nil
         end
     end
-    
+   
+    def top_container
+        c = container
+        return c && c.top_heading
+    end
+
+    def heading_level
+        @heading && @heading.level_as_string
+    end
+
     def update_args(opts={})
         update_styles
         update_id(opts)
     end
 
     def update_styles(styles=nil)
-        styles ||= @args['style']
+        styles ||= @args['style'] || []
         case styles
         when String
-            styles = styles.split(/[ ,;]/)
+            styles = Deplate::Core.split_list(styles, ',', ';', @source)
+        end
+        if @deplate.variables['styledTags']
+            tags = @args['tag']
+            if tags
+                tags = Deplate::Core.split_list(tags, ',', nil, @source)
+                tags.map! {|t| "TAG#{t}"}
+                styles += tags
+            end
         end
         if styles and !styles.empty?
             @styles += styles
@@ -93,7 +124,16 @@ module Deplate::CommonGround
             end
         end
     end
-   
+
+    def tagged_as?(*tag)
+        tags = @args['tag']
+        if tags
+            tags = Deplate::Core.split_list(tags, ',', nil, @source)
+            return tags.any? {|t| tag.include?(t)}
+        end
+        false
+    end
+
     def get_explicit_id(args=@args)
         args[:id] || args['id']
     end
@@ -279,6 +319,20 @@ module Deplate::CommonGround
         text
     end
     module_function :post_process_text
+
+    def filter_template(template, vars=nil, args={})
+        d = args[:deplate]   ||@deplate
+        v = vars || d.variables
+        s = args[:source]    || @source
+        c = args[:container] || @container || self
+        t = Deplate::Template.new(:template  => template,
+                                  :source    => s,
+                                  :container => c)
+        Deplate::Define.let_variables(d, v) do
+            t = t.fill_in(d, :source => s)
+        end
+        t
+    end
 end
 
 
@@ -314,6 +368,8 @@ module Deplate::CommonElement
     attr_accessor :top_heading
     #### accumulated lines
     attr_accessor :accum
+    attr_reader :regNote
+    attr_accessor :indent
 
     def format_as_string
         klass = self.class
@@ -475,6 +531,36 @@ class Deplate::Base <  Deplate::CommonObject
         self.class.label_mode
     end
 
+    def pop(array)
+        array.pop
+    end
+
+    def exclude?(filter, container=nil)
+        unless filter
+            return false
+        end
+        tags = @args['tag'] || 'any'
+        taglist = Deplate::Core.split_list(tags)
+		if container and (tags = @container.args['tag'])
+			taglist += Deplate::Core.split_list(tags)
+		end
+        if (globaltags = @deplate.variables['tag'])
+            taglist += Deplate::Core.split_list(globaltags)
+        end
+        Deplate::Core.split_list(filter).each do |ftag|
+            if ftag == 'any' and taglist.empty?
+                return false
+            else
+                taglist.each do |tag|
+                    if ftag == tag
+                        return false
+                    end
+                end
+            end
+        end
+        return true
+    end
+
     class_attribute :formatter
     class_attribute :formatter2
     class_attribute :rx

data/lib/deplate/converter.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 # converter.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:     14-Okt-2004.
-# @Last Change: 07-Apr-2006.
-# @Revision:    0.128
+# @Last Change: 2007-09-01.
+# @Revision:    0.145
 # 
 # = Description
 # = Usage
@@ -79,10 +79,16 @@ end
 
 # if __FILE__ == $0
 #     t = <<EOF
+# #DefCmd id=FOO <<
+# FOO {arg: @body} FOO
+# 
 # * Introduction
 # 
 # ''deplate'' is a tool for converting wiki-like markup to latex, html, or 
 # "html-slides".
+# 
+# #FOO: bla bla
+# 
 # EOF
 #     to_html = Deplate::Converter.new
 #     to_latex = Deplate::Converter.new("latex")
@@ -102,4 +108,4 @@ end
 #     puts "----------------------------------------------------------------"
 #     
 # end
-# 
+#

data/lib/deplate/core.rb

@@ -1,9 +1,9 @@
 # core.rb -- Convert wiki-like plain text pseudo markup to something else
-# @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:     24-Feb-2004.
-# @Last Change: 07-Jun-2006.
+# @Last Change: 2007-10-21.
 
 require 'uri'
 require 'optparse'
@@ -26,10 +26,10 @@ module Deplate; end
 class Deplate::Core
     extend Forwardable
 
-    Version    = '0.8'
+    Version    = '0.8.1'
     # VersionSfx = 'a'
     VersionSfx = 'final'
-    MicroRev   = '2711'
+    MicroRev   = '2965'
 
     if ENV['HOME']
         CfgDir = File.join(ENV['HOME'].gsub(/\\/, '/'), '.deplate')
@@ -43,7 +43,7 @@ class Deplate::Core
         end
         # CfgDir = File.join(Dir.pwd.gsub(/\\/, '/'), 'deplate.rc')
         puts <<MESSAGE
-Can't find your personal configuration directory. Neither HOME nor 
+Cannot find your personal configuration directory. Neither HOME nor 
 USERPROFILE is set. I will look for configuration files in:
     #{CfgDir}
 MESSAGE
@@ -107,6 +107,7 @@ MESSAGE
         :user_packages   => 20,
         :head            => 30,
         :head_meta       => 31,
+        :meta            => 31,
         :head_identifier => 32,
         :head_title      => 33,
         :head_extra      => 34,
@@ -170,8 +171,9 @@ MESSAGE
         # arguments, sets up a Deplate::Core object, and makes it convert the 
         # input files.
         def deplate(args=ARGV)
+            log(['Configuration directory', CfgDir], :debug)
             if ENV['DeplateOptions']
-                for keyval in ENV['DeplateOptions'].split(/\s*;\s*/)
+                for keyval in Deplate::Core.split_list(ENV['DeplateOptions'], ';')
                     key, val = keyval.split(/\s*=\s*/)
                     case key
                     when 'vanilla'
@@ -199,7 +201,7 @@ MESSAGE
 
                 opts.on('-A', '--allow ALLOW', 
                         'Allow certain things: l, r, t, w, W, x, X, $') do |string|
-                    allow(options.allow, string)
+                    allow(options.allow, string, '[COMMAND LINE ARGUMENT]')
                     log("options.allow = #{string}")
                 end
             
@@ -402,7 +404,7 @@ MESSAGE
                         'Allow the execution of ruby code') do |level|
                     if level
                         options.allow_ruby = level
-                        allow(options.allow, level)
+                        allow(options.allow, level, '[COMMAND LINE ARGUMENT]')
                     else
                         options.allow_ruby = true
                         allow(options.allow, 'x')
@@ -413,7 +415,7 @@ MESSAGE
                 opts.on('-X', '--[no-]allow-exec', '--[no-]external',
                         'Allow the execution of helper applications') do |bool|
                     options.allow_external = bool
-                    allow(options.allow, 'X')
+                    allow(options.allow, 'X', '[COMMAND LINE ARGUMENT]')
                     log("options.allow_external = #{bool}")
                 end
             
@@ -538,26 +540,7 @@ MESSAGE
             # end
             
             if formatter_class
-                f = options.files[0]
-                case f
-                when '-'
-                    options.ext      = ''
-                    options.srcdir ||= Dir.pwd
-                    options.out    ||= '-'
-                else
-                    options.ext      = File.extname(f)
-                    options.srcdir ||= File.dirname(f)
-                    options.suffix ||= formatter_class.suffix
-                    if options.out
-                        options.out = Deplate::Core.file_join(options.dir, options.out)
-                        # if options.out != '-'
-                        #     options.out = options.dir ? Deplate::Core.file_join(options.dir, options.out) : options.out
-                        # end
-                    else
-                        options.out = get_out_fullname(f, options.suffix, options)
-                    end
-                end
-                
+                formatter_class.set_options_for_file(options, options.files[0])
                 prc = Deplate::Core.new(options.fmt,
                                   :formatter => formatter_class, 
                                   :options => options, 
@@ -579,7 +562,8 @@ MESSAGE
                 require_module(options, m) if m
             end
 
-            require 'deplate/mod/en' unless @@messages_last
+            # require 'deplate/mod/en' unless @@messages_last
+            require_module(options, 'lang-en') unless @@messages_last
 
             # load general user config
             options.cfg ||= ['config.rb', CfgDir]
@@ -590,14 +574,14 @@ MESSAGE
         end
 
         # Set certain allow flags in array.
-        def allow(arr, ids)
+        def allow(arr, ids, source=nil)
             case ids
             when String
-                ids = ids.split(/[,; ]+/)
+                ids = Deplate::Core.split_list(ids, ',', '; ', source)
                 # ids = ids.scan(/[a-zA-Z.:]/)
             when Array
             else
-                log(['Internal error', 'allow', ids], :error)
+                log(['Internal error', 'allow', ids], :error, source)
             end
             ids.each do |i|
                 m = i[0..0]
@@ -618,7 +602,7 @@ MESSAGE
             arr = options.allow
             case ids
             when String
-                ids = ids.split(/[,; ]/)
+                ids = Deplate::Core.split_list(ids, ',', '; ')
             when Array
             else
                 log(['Internal error', 'allow', ids], :error)
@@ -670,9 +654,14 @@ MESSAGE
                             options.ini_command_line_arguments << $1
                             options.ini_command_line_arguments << $3 if $3
                         elsif line =~ /^\s*allow\s+(.+?)\s*$/
-                            allow(options.allow, $1)
+                            allow(options.allow, $1, Deplate::Source.new(inifile))
                         elsif line =~ /^\s*mod\s+(\S+)/
-                            options.modules << $1
+                            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*(.+)/
@@ -716,6 +705,8 @@ MESSAGE
                             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
@@ -753,15 +744,17 @@ MESSAGE
                 fmtf = @@formatters[fmt]
                 require fmtf
             end
-            user_config(options, File.join('after', 'fmt', '%s.rb' % fmt), CfgDir)
-            user_config(options, File.join('after', 'fmt', fmt), CfgDir)
+            for fmt in @@formatter_classes[fmt].formatter_family_members.reverse
+                user_config(options, File.join('after', 'fmt', '%s.rb' % fmt), CfgDir)
+                user_config(options, File.join('after', 'fmt', fmt), CfgDir)
+            end
         end
             
         # Load a module.
         # options:: A OpenStruct as returned by Deplate::Core.deplate_options
         # module_name:: The name of the module to be loaded
         def require_module(options, module_name)
-            Deplate::Core.log(["Require module", module_name])
+            Deplate::Core.log(['Require module', module_name])
             mf = @@modules[module_name]
             vsave, $VERBOSE = $VERBOSE, false
             begin
@@ -770,7 +763,8 @@ MESSAGE
                 user_config(options, File.join('after', 'mod', module_name), CfgDir)
                 return true
             rescue Exception => e
-                Deplate::Core.log(["Loading module failed", module_name, e], :error)
+                Deplate::Core.log(['Loading module failed', module_name, e], :error)
+                Deplate::Core.log(['Known modules', @@modules], :debug)
                 return false
             ensure
                 $VERBOSE = vsave
@@ -831,6 +825,7 @@ MESSAGE
             options.force       ||= true
             options.css         ||= []
             options.variables   ||= Deplate::Variables.new
+            deplate_predefined_variables(options)
             options.clips       ||= {}
             options.ext         ||= ''
             # options.dir         ||= '.'
@@ -839,11 +834,16 @@ MESSAGE
             options.split_level ||= 1
             options.disabled_particles ||= []
             options.autoindexed        ||= []
+            options.abbrevs     ||= {}
             reset_listings_and_counters(options, true)
             read_ini(options) unless inherit
             return options
         end
 
+        def deplate_predefined_variables(options)
+            options.variables['env'] = ENV
+        end
+
         def reset_listings_and_counters(options, conditionally=false)
             unless conditionally and options.counters
                 c = options.counters = Deplate::Counters.new(self)
@@ -965,7 +965,7 @@ MESSAGE
             end
         end
 
-        def canonic_args(hash, key, val)
+        def canonic_args(hash, key, val, source=nil)
             if key[-1..-1] == '!'
                 key  = key[0..-2]
                 type = :bool
@@ -990,6 +990,14 @@ MESSAGE
                     if val =~ /^"(.*?)"$/
                         val = val[1..-2]
                     else
+                        # val.scan(/\\\\|\s/).each do |s|
+                        #     if s =~ /\s/
+                        #         Deplate::Core.log(['Deprecated syntax', 
+                        #             'Character should be preceded by a backslash', 
+                        #             s.inspect, val],
+                        #             :anyway, source)
+                        #     end
+                        # end
                         val = val.strip
                     end
                     val = Deplate::Core.remove_backslashes(val)
@@ -1018,9 +1026,34 @@ MESSAGE
             return text.gsub(/\\(.)/, '\\1') if text
         end
 
+        def split_list(string, chars=nil, deprecated=nil, source=nil, doubt=:use_deprecated)
+            if string
+                chars ||= ','
+                list = string.scan(/((?:\\.|[^#{chars}\\]+)+)(?:[#{chars}]\s*|\Z)/).flatten
+                list = list.map {|e| remove_backslashes(e)}
+                if deprecated
+                    list1 = split_list(string, deprecated)
+                    if list1 != list and 
+                        # (list1.size > 1 or list1[0] != string) and 
+                        string !~ /[#{chars}]/ and string =~ /[#{deprecated}]/
+                        # case doubt
+                        # when :use_deprecated
+                            Deplate::Core.log(['Assuming the use of deprecated list separators', deprecated.inspect, string.inspect], :error, source)
+                            return list1
+                        # else
+                        #     Deplate::Core.log(['Possible use of deprecated list separators', deprecated.inspect, string.inspect], :anyway, source)
+                        # end
+                    end
+                end
+                return list
+            else
+                return []
+            end
+        end
+
         def escape_characters(text, args)
             esc = args[:esc] || args[:escape] || args['esc'] || args['escape'] || ''
-            ebs = args[:escapebackslash] || args['escapebackslash'] || 0
+            ebs = args[:escapebackslash] || args['escapebackslash'] || args['template'] || 0
             case ebs
             when true
                 ebs = 1
@@ -1054,7 +1087,7 @@ MESSAGE
         # specifying column widths in tables
         def props(proplist, field)
             if proplist
-                proplist.split(/\s*[,;]\s*/).collect do |c|
+                Deplate::Core.split_list(proplist, ',', ';').collect do |c|
                     rv = nil
                     for key, val in c.scan(/(\w+?)[:.](\S+)/)
                         if key == field
@@ -1073,7 +1106,7 @@ MESSAGE
         # correspond to section numbers.
         def canonic_file_name(name, sfx, maj=nil, min=nil, dir=nil)
             name = File.basename(name, '.*')
-            name = clean_file_name(name)
+            name = clean_name(name)
             if !name or (maj and maj != 0)
                 canonic_numbered_file_name(name, sfx, maj, min, dir)
             elsif min and min != 0
@@ -1085,10 +1118,18 @@ MESSAGE
             end
         end
 
-        # Return a valid file name based on +text+
-        def clean_file_name(text, replacement='_')
-            rx = /[[:cntrl:].+*:"?<>|&\\\/]/
-            text.gsub(rx, replacement) if text
+        # Return an encoded name
+        def clean_name(text, args={})
+          if text
+            replacement = args[:replacement] || '_'
+            chars       = args[:chars] || '_[:cntrl:].+*:"?<>|&\\\/'
+            if (extrachars = args[:extra])
+              chars += extrachars
+            end
+            text.gsub(/[#{chars}]/) do |text|
+              replacement + "%02X" % text[0]
+            end
+          end
         end
 
         # Make sure +dir+ exists
@@ -1569,6 +1610,8 @@ MESSAGE
     
     def_delegator(:@input, :initialize_particles)
     def_delegator(:@input, :register_particle)
+    def_delegator(:@input, :register_element)
+    def_delegator(:@input, :register_region)
     def_delegator(:@input, :parse_with_particles)
     def_delegator(:@input, :parse_with_source)
     def_delegator(:@input, :parse)
@@ -1578,7 +1621,12 @@ MESSAGE
     def initialize_input(args=@args)
         @input = args[:input] || @options.input
         unless @input
-            input_class = args[:input_class] || @options.input_class || Deplate::Input
+            # @options.input_class is only considered when defined on 
+            # startup (i.e. on the command-line), which is why we check 
+            # for :now
+            input_class = args[:input_class] ||
+                (args[:now] && @options.input_class) ||
+                Deplate::Input
             @input = input_class.new(self, args)
         end
     end
@@ -1619,6 +1667,15 @@ MESSAGE
         end
     end    
 
+    def get_formatter_class(fmt)
+        case fmt
+        when String
+            @@formatter_classes[fmt]
+        else
+            fmt
+        end
+    end
+
     # Define a new slot or reset the position of an already known slot.
     # <+TBD+>There is no information on whether the slot belongs to the 
     # prematter/postmatter/body.
@@ -1768,7 +1825,7 @@ MESSAGE
         if msg_class
             @options.messages  = msg_class.new(self)
             @@message_object ||= @options.messages
-        elsif is_allowed?('l') and require_module(lang)
+        elsif is_allowed?('l') and require_module("lang-#{lang}")
             set_lang(lang)
         else
             log(["Bad language definition", lang, "(#{@@messages.keys.join(', ')})"],
@@ -1888,7 +1945,7 @@ MESSAGE
         else
             prefix = @variables['prefixID']
             if prefix.nil?
-                prefix = Deplate::Core.clean_file_name(File.basename(@dest, '.*'))
+                prefix = Deplate::Core.clean_name(File.basename(@dest, '.*'))
             end
             fn = [prefix]
             fn << ["_#{type}_#{idx}"]
@@ -1932,8 +1989,8 @@ MESSAGE
         pwd = Dir.pwd
         begin
             Dir.chdir(dir)
-            files = Dir["*"]
-            match = Dir[@options.file_pattern || "*"]
+            files = Dir['*']
+            match = Dir[@options.file_pattern || '*']
             files.delete_if {|f| File.stat(f).file? and !match.include?(f)}
             if @options.file_excl_pattern
                 antilist = Dir[@options.file_excl_pattern]
@@ -1941,11 +1998,11 @@ MESSAGE
                     files.delete(anti)
                 end
             end
-            log(["DIR", dir])
+            log(['DIR', dir])
         ensure
             Dir.chdir(pwd)
         end
-        unless dir == "."
+        unless dir == '.'
             files.collect! {|f| File.join(dir, f)}
         end
         return files
@@ -1955,42 +2012,31 @@ MESSAGE
         if args[:pwd]
             fn = File.join(Deplate::Core.current_pwd(self), fname)
             if Deplate::Core.is_file?(fn)
+                log(['File in CWD', fn])
                 return fn
             end
         end
         files = []
         if @formatter
-            formatter_family_members do |myname|
+            @formatter.class.formatter_family_members(:names => args[:formatters]) do |myname|
                 dd = File.join('lib', myname, fname)
                 files << dd unless files.include?(dd)
             end
         end
-        files << File.join('lib', fname)
+        files << File.join(args['subdir'] || 'lib', fname)
         files = Deplate::Core.library_directories(true, *files)
         for fn in files
             if Deplate::Core.is_file?(fn)
+                log(['File in lib', fn])
                 return fn
             end
         end
         return nil
     end
 
-    def formatter_family_members(formatter_class=nil)
-        acc = []
-        fmt = formatter_class ||= @formatter.class
-        myname = fmt.myname
-        while myname
-            acc << myname
-            yield(myname) if block_given?
-            fmt = fmt.superclass
-            myname = fmt.myname
-        end
-        formatter_class.related.each do |myname|
-            acc << myname
-            yield(myname) if block_given?
-        end
-        acc
-    end
+    # def formatter_family_members(args)
+    #     (args[:formatter_class] || @formatter.class).formatter_family_members(args)
+    # end
     
     # Format either text or, if text is nil, the file "sourcename".  
     # This is the method called by the Deplate::Formatter's 
@@ -2005,14 +2051,14 @@ MESSAGE
 
     # Format a file by means of formatter_class that is a child of Deplate::Formatter
     def format_file_with_formatter(formatter_class, sourcename)
-        with_formatter(formatter_class) do
+        with_formatter(formatter_class, sourcename) do
             go_each([sourcename])
         end
     end
    
     # Format text by means of formatter_class that is a child of Deplate::Formatter
     def format_string_with_formatter(formatter_class, text, sourcename=nil)
-        with_formatter(formatter_class) do
+        with_formatter(formatter_class, sourcename) do
             format_string(text, sourcename)
         end
     end
@@ -2054,7 +2100,7 @@ MESSAGE
     end
 
     # Read a file and add the parsed elements to array
-    def include_file(array, filename)
+    def include_file(array, filename, args={})
         maintain_current_source(filename) do
             log(['Including', filename])
             filename_abs    = File.expand_path(filename)
@@ -2063,7 +2109,20 @@ MESSAGE
                 @labels_floating << filename_label
             end
             File.open(filename, 'r') do |io|
-                text = io.read
+                range = if (skip = args['skip'])
+                            skip.to_i..-1
+                        elsif (head = args['head'])
+                            0..head.to_i
+                        elsif (tail = args['tail'])
+                            -tail.to_i..-1
+                        else
+                            nil
+                        end
+                if range
+                    text = io.readlines[range].join
+                else
+                    text = io.read
+                end
                 include_each(text, array, filename)
             end
         end
@@ -2144,7 +2203,7 @@ MESSAGE
                 unless text or !@options.multi_file_output
                     afn = @variables['autoFileNames']
                     if afn
-                        fname = Deplate::Core.clean_file_name(heading.get_text)[0..20]
+                        fname = Deplate::Core.clean_name(heading.get_text)[0..20]
                         c = auto_numbered(fname)
                         if c
                             fname = Deplate::Core.canonic_file_name(fname, sfx, c, 0)
@@ -2190,6 +2249,7 @@ MESSAGE
                 if fname
                     fname = Deplate::Core.get_out_fullname(fname, nil, @options)
                 end
+                @output.simulate_reset
             end
             # if fname and @options.multi_file_output
             if fname
@@ -2322,8 +2382,13 @@ MESSAGE
 
     # Get a clip.
     # id:: The clip's name
+    # FIXME: This check for @elt should not be necessary.
     def get_clip(id)
-        @clips[id]
+        c = @clips[id]
+        if c and !c.elt
+            c = @clips[id] = c.process
+        end
+        c
     end
 
     # Set all clips.
@@ -2392,14 +2457,14 @@ MESSAGE
 
     # Amend +file+'s suffix.
     def file_with_suffix(file, sfx=nil, filename_only=false)
-        sfx  = sfx || ""
+        sfx  = sfx || ''
         fn   = File.basename(file, '.*')
         if filename_only
             return fn + sfx
         else
             dir   = File.dirname(file)
             fname = fn + sfx
-            if dir == "."
+            if dir == '.'
                 return fname
             else
                 return File.join(dir, fname)
@@ -2427,7 +2492,7 @@ MESSAGE
                             throw :ok
                         end
                     end
-                    raise "Internal error: unknown level: #{level_as_string}"
+                    # raise "Internal error: unknown level: #{level_as_string}"
                     log(['Internal error: Unknown level', level_as_string], :error)
                     return nil
                 end
@@ -2462,6 +2527,7 @@ MESSAGE
         @collected_output << @output
         @output.top_heading = top_heading_by_idx(@collected_output.size - 1)
         @output.index       = @output_maj_min.dup
+        @output.reset
         increase_maj_min
     end
 
@@ -2562,15 +2628,24 @@ MESSAGE
         if file
             # pwd = Dir.pwd
             begin
-                #     Dir.chdir(@options.dir)
-                ensure_dir_exists(File.dirname(file))
-                ok = if File.exist?(file)
-                         Deplate::Core.query_user(@options, 
+                case file
+                when 1, 2, 3, '-'
+                    ok = true
+                    case file
+                    when String
+                        file = mode =~ /r/ ? 1 : 2
+                    end
+                else
+                    #     Dir.chdir(@options.dir)
+                    ensure_dir_exists(File.dirname(file))
+                    ok = if File.exist?(file)
+                             Deplate::Core.query_user(@options, 
                                                   "File '#{file}' already exists. Overwrite (y/N)? ", 
                                                   'y')
-                     else
-                         true
-                     end
+                         else
+                             true
+                         end
+                end
                 if ok
                     log(['Writing file', file], :debug)
                     File.open(file, mode) do |io|
@@ -2608,7 +2683,7 @@ MESSAGE
             if ok
                 ensure_dir_exists(dir)
                 File.copy(from, to)
-                log(['Copy file', to])
+                log(['Copy file', from, to])
             end
         end
     end
@@ -2617,14 +2692,19 @@ MESSAGE
         @options.counters.get('toc')
     end
     
+    def current_heading_element
+        e = @options.counters.get('toc', true)
+        e && e[:container]
+    end
+    
     # Get the current section's level as string.
     def get_current_heading
         @options.counters.get_s('toc')
     end
 
     # Increase the heading level.
-    def increase_current_heading(level)
-        @options.counters.increase('toc', :level => level)
+    def increase_current_heading(container, level)
+        @options.counters.increase('toc', :container => container, :level => level)
     end
 
     # Get the current top heading object.
@@ -2773,11 +2853,14 @@ MESSAGE
         id    = "idx00#{@index_last_idx}"
         words = names.split(/\s*\|\s*/)
         lname = Deplate::Core.remove_backslashes(words[0])
-        level_as_string = container ? container.level_as_string : level_as_string
+        if container
+            # container = container.top_container || container
+            level_as_string = container.level_as_string
+        end
         if @options.dont_index.delete(lname)
             return nil
         else
-            i      = @index[lname]
+            i = @index[lname]
             unless i
                 i = @index.find do |k, a|
                     a.find do |i|
@@ -2923,15 +3006,21 @@ MESSAGE
     end
 
     def set_standard_clips
-        if defined?(@input) and @input
-            for id, text in @options.clips
-                src  = '[clip]'
-                text = parse_with_source(src, text, false)
-                @options.clips[id] = Deplate::Element::Clip.new(text, self, src)
+        unless @options.clips_initialized
+            if defined?(@input) and @input
+                for id, text in @options.clips
+                    if text.kind_of?(Deplate::Element::Clip)
+                        @options.clips[id] = text
+                    else
+                        src  = '[clip]'
+                        text = parse_with_source(src, text, false) 
+                        @options.clips[id] = Deplate::Element::Clip.new(text, self, src)
+                    end
+                end
+                @options.clips_initialized = true
             end
-            options.clips_initialized = true
+            @clips = @options.clips.dup
         end
-        @clips = @options.clips.dup if options.clips_initialized
     end
     
     def reset_footnotes
@@ -2959,8 +3048,9 @@ MESSAGE
 
     # Set @formatter to an instance of formatter_class, call block, and 
     # restore the old @formatter
-    def with_formatter(formatter_class, &block)
+    def with_formatter(formatter_class, sourcename=nil, &block)
         formatter_orig = @formatter
+        options_orig   = @options
         begin
             if @formatter.instance_of?(formatter_class)
                 @formatter = @formatter.dup
@@ -2968,9 +3058,11 @@ MESSAGE
             else
                 @formatter = formatter_class.new(self, @args)
             end
-            block.call
+            @options = formatter_class.set_options_for_file(options.dup, sourcename)
+            rv = block.call
         ensure
             @formatter = formatter_orig
+            @options   = options_orig
         end
     end
 
@@ -3013,9 +3105,23 @@ MESSAGE
             @output_headings.first.first_top = true
             @output_headings.last.last_top   = true
         end
-        
+
+        filter = @variables['efilter']
+
         for p in preprocess
-            p.call
+            p.call unless p.exclude?(filter)
+        end
+
+        for hd in @headings.keys
+            if @headings[hd].exclude?(filter)
+                @headings.delete(hd)
+            end
+        end
+
+        # Basically, this shouldn't be necessary as a filtered element 
+        # should never make it into the listing.
+        for name,_ in @options.listings
+            @options.listings.get(name).delete_if {|e| e.exclude?(filter)}
         end
 
         for fn in @footnotes.keys
@@ -3031,17 +3137,18 @@ MESSAGE
 
     # process elts
     def process
-        log("Processing elements")
+        log('Processing elements')
         call_methods_matching(@formatter, /^hook_pre_process_/)
+        filter = @variables['efilter']
         @accum_elements.collect! do |e|
-            e.process
+            e.process unless e.exclude?(filter)
         end
         @accum_elements.flatten!
         @accum_elements.compact!
     end
 
     def print_prepare
-        log("Preparing formatting")
+        log('Preparing formatting')
         call_methods_matching(@formatter, /^hook_pre_prepare_/)
         @formatter.prepare
         call_methods_matching(@formatter, /^prepare_/)