deplate 0.7.3 → 0.8

data/lib/deplate/regions.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     08-Mai-2004.
-# @Last Change: 27-Okt-2005.
-# @Revision:    0.1530
+# @Last Change: 05-Jun-2006.
+# @Revision:    0.1662
 
 # Description:
 # 
@@ -18,9 +18,9 @@
 class Deplate::Region < Deplate::Element
     @@regions = {}
     
+    class_attribute :line_cont, true
+
     class << self
-        attr_reader :line_cont
-        
         def regions
             @@regions
         end
@@ -30,7 +30,7 @@ class Deplate::Region < Deplate::Element
         end
 
         def set_line_cont(val=true)
-            @line_cont=val
+            self.line_cont=val
         end
     end
     
@@ -133,10 +133,16 @@ class Deplate::Region::SecondOrder < Deplate::Region
         process_etc
         @elt = @elt.collect {|e| e.process}.compact
         @prototype = @elt.first
-        @prototype.put_label(@label) if @prototype
+        unless label_mode == :none
+            @prototype.put_label(@label) if @prototype
+        end
         return self
     end
 
+    def push_styles(*args)
+        @elt.each {|e| e.push_styles(*args)}
+    end
+    
     alias format_special format_compound
 end
 
@@ -146,7 +152,6 @@ module Deplate::Regions; end
 class Deplate::Regions::UNKNOWN < Deplate::Region
     register_as 'UNKNOWN'
     set_formatter :format_unknown
-    set_line_cont
 
     def finish
         # finish_accum
@@ -161,7 +166,7 @@ class Deplate::Regions::UNKNOWN < Deplate::Region
     end
 
     def format_special
-        format_unknown(self)
+        @deplate.formatter.format_unknown(self)
     end
 end
 
@@ -173,13 +178,8 @@ class Deplate::Regions::Doc < Deplate::Region
 
     def finish
         finish_accum
-        id = @args["id"] || @regNote
-        @deplate.variables[id] = @accum
-        @deplate.register_metadata(@source, 
-                                   "type"  => "variable", 
-                                   "name"  => id,
-                                   "value" => @accum
-                                  )
+        id = @args['id'] || @regNote
+        Deplate::Command::VAR.set_variable(@deplate, id, @accum, @args, @source)
         return nil
     end
 end
@@ -187,7 +187,9 @@ end
 
 class Deplate::Regions::Native < Deplate::Region
     register_as 'Native'
+    register_as 'Ins'
     set_line_cont false
+    self.label_mode = :once
 
     def finish
         finish_accum
@@ -207,9 +209,49 @@ class Deplate::Regions::Native < Deplate::Region
 end
 
 
+class Deplate::Regions::Write < Deplate::Regions::Native
+    register_as 'Write'
+    self.label_mode = :none
+    
+    def finish
+        @vars = @deplate.variables.dup
+        super
+    end
+    
+    def format_special
+        @elt = Deplate::Template.new(:template  => @elt,
+                                     :source    => @source,
+                                     :container => self)
+        Deplate::Define.let_variables(@deplate, @vars) do
+            @elt = @elt.fill_in(@deplate, :source => @source)
+        end
+        @elt = @elt.join("\n")
+        fname = @args['file'] || @args['id']
+        if @deplate.is_allowed?(['w', 'W'], :logger => self)
+            if fname
+                unless @deplate.is_allowed?('W')
+                    fname = File.basename(fname)
+                end
+                fname = Deplate::Core.get_out_fullname(fname, nil, @deplate.options)
+                sfx   = @args['suffix'] || @args['sfx']
+                fname = [fname, sfx.gsub(/[^[:alnum:].]/, '_')].join('.') if sfx
+                mode  = @args['append'] ? 'a' : 'w'
+                @deplate.write_file(fname, mode) do |io|
+                    io.puts(@elt)
+                end
+            else
+                log(['No filename'], :error)
+            end
+        end
+    end
+
+end
+
+
 class Deplate::Regions::Code < Deplate::Regions::Native
     register_as 'Code'
-    set_line_cont false
+    # set_line_cont false
+    self.label_mode = :once
 
     @@code_idx = 0
     @general_highlighter = {}
@@ -229,7 +271,6 @@ class Deplate::Regions::Code < Deplate::Regions::Native
 
     def setup(region)
         super
-        @label_mode = :once
         @syntax = @deplate.variables["codeSyntax"]
         @style  = @deplate.variables["codeStyle"]
     end
@@ -257,7 +298,7 @@ class Deplate::Regions::Code < Deplate::Regions::Native
                     fcode    = @deplate.auxiliary_filename("code_#{id}")
                     fout     = @deplate.auxiliary_filename("code_#{id}.#{fmt_name}")
                 else
-                    log("No id given", :anyway)
+                    log("No ID given", :anyway)
                     @@code_idx += 1
                     fcode = @deplate.auxiliary_filename(@deplate.auxiliary_auto_filename('code', @@code_idx, @elt, @syntax))
                     fout  = @deplate.auxiliary_filename(@deplate.auxiliary_auto_filename('code', @@code_idx, @elt, fmt_name))
@@ -305,15 +346,14 @@ end
 class Deplate::Regions::Inlatex < Deplate::Region
     register_as 'Inlatex'
     register_as 'Ltx'
-    set_line_cont
     set_formatter :format_inlatex
+    self.label_mode = :once
 
     attr_reader   :content_type
 
     def setup(region)
         super
         @content_type = @args["type"] || "fig"
-        @label_mode   = :once
     end
 
     def finish
@@ -346,7 +386,6 @@ class Deplate::Regions::Img < Deplate::Region
     register_as 'Image'
     register_as 'Fig'
     register_as 'Figure'
-    set_line_cont
 
     @@ImgAutoN   = 0
     @@ImgSuffix  = {}
@@ -514,42 +553,42 @@ module Deplate::Regions::Img_R
 end
 
 
-class Deplate::Regions::Footnote < Deplate::Region
+class Deplate::Regions::Footnote < Deplate::Region::SecondOrder
+# class Deplate::Regions::Footnote < Deplate::Region
     register_as 'Footnote'
     register_as 'Fn'
-    set_line_cont
+    self.label_mode = :none
 
-    FootnoteDef = Struct.new("DeplateFootnoteDef", :args, :body, :label, :n, :consumed)
+    attr_accessor :fn_label, :fn_n, :fn_consumed
 
     def finish
-        finish_accum
-        accum = @deplate.parsed_array_from_strings(@accum, 1 + @source.begin, @source.file)
-        id = @args['id'] ||= @regNote
-        @elt = FootnoteDef.new(@args, [accum], id)
-        @deplate.footnotes[id] = self
-        # @deplate.register_metadata(src, 
-        #                            "type"  => "footnote", 
-        #                            "name"  => id,
-        #                            "value" => accum
-        #                           )
+        rv = super
+        @prototype = Deplate::Element
+        id = (@args['id'] ||= @regNote)
+        if id
+            @deplate.footnotes[id] = rv
+            # @deplate.register_metadata(src, 
+            #                            "type"  => "footnote", 
+            #                            "name"  => id,
+            #                            "value" => accum
+            #                           )
+        else
+            log('Missing arguments', :error)
+        end
         return nil
     end
-
-    def process_particles(&block)
-        @elt.body = ( @elt.body.collect(&block) ).join
-    end
 end
 
 
 class Deplate::Regions::Foreach < Deplate::Region
     register_as 'Foreach'
-    set_line_cont
+    self.label_mode = :once
 
     def finish
         finish_accum
         @id = @args['@id'].split(/[\s,]+/)
         unless @id
-            log('No id given', :error)
+            log('No ID given', :error)
             return nil
         end
         doc = @args['doc']
@@ -605,7 +644,6 @@ end
 
 class Deplate::Regions::Table < Deplate::Region
     register_as 'Table'
-    set_line_cont
     
     def finish
         finish_accum
@@ -618,6 +656,10 @@ class Deplate::Regions::Table < Deplate::Region
         end
     end
 
+    # duck method
+    def register_caption
+    end
+
     class << self
         def make_char_separated(instance, accum, sep=nil)
             sep   = Regexp.new(sep || "\t")
@@ -625,9 +667,9 @@ class Deplate::Regions::Table < Deplate::Region
             beg   = 1 + instance.source.begin
             file  = instance.source.file
             table = instance.deplate.parsed_array_from_strings(acc, beg, file)
-            n = table[0]
+            n     = table[0]
             n.collapse = false
-            n.args = instance.args
+            n.unify_props(instance)
             return n
         end
     end
@@ -639,6 +681,7 @@ class Deplate::Regions::Verbatim < Deplate::Region
     register_as 'Verb'
     set_formatter :format_verbatim
     set_line_cont false
+    class_attribute :indentation_mode, :none
 
     def finish
         finish_accum
@@ -649,8 +692,11 @@ class Deplate::Regions::Verbatim < Deplate::Region
 
     def process
         process_etc
-        @elt   = @elt.join("\n")
-        margin = @args["wrap"] || @verbatimMargin
+        @elt = @elt.join("\n")
+        if @args['removeBackslashes']
+            @elt = Deplate::Core.remove_backslashes(@elt)
+        end
+        margin = @args['wrap'] || @verbatimMargin
         if margin
             @elt = @deplate.formatter.wrap_text(@elt, :margin => margin.to_i)
         end
@@ -663,7 +709,6 @@ end
 class Deplate::Regions::Abstract < Deplate::Region::SecondOrder
     register_as 'Abstract'
     set_formatter :format_abstract, true
-    set_line_cont
 
     def finish
         rv   = super
@@ -676,9 +721,9 @@ class Deplate::Regions::Abstract < Deplate::Region::SecondOrder
             end
         else
             @deplate.register_metadata(@source, 
-                                       "type"  => "abstract", 
-                                       "lang"  => lang,
-                                       "value" => @accum
+                                       'type'  => 'abstract', 
+                                       'lang'  => lang,
+                                       'value' => @accum
                                       )
         end
         rv
@@ -691,13 +736,11 @@ class Deplate::Regions::Quote < Deplate::Region::SecondOrder
     register_as 'Quote'
     register_as 'Qu'
     set_formatter :format_quote, true
-    set_line_cont
 end
 
 
 class Deplate::Regions::R < Deplate::Region
     register_as 'R'
-    set_line_cont
 
     @@RAutoN   = 0
 
@@ -824,10 +867,13 @@ class Deplate::Regions::R < Deplate::Region
             @accum.collect! do |r|
                 if r =~ /^\s*$/
                     "|   |"
-                elsif @deplate.variables['rScanTable']
+                elsif @args['guess'] or @args['scanTable'] or @deplate.variables['rScanTable']
                     cells = scn.match(r)
                     if cells
-                        cells = cells.captures.collect {|c| c.strip}
+                        cells = cells.captures.collect do |c|
+                            v = c.strip
+                            v.empty? ? @deplate.formatter.table_empty_cell : v
+                        end
                         ['|', cells.join(' | '), '|'].join(' ')
                     else
                         puts @accum.join("\n")
@@ -953,7 +999,6 @@ end
 
 class Deplate::Regions::Ruby < Deplate::Region
     register_as 'Ruby'
-    set_line_cont
 
     def finish
         finish_accum
@@ -980,7 +1025,6 @@ class Deplate::Regions::Clip < Deplate::Region::SecondOrder
     register_as 'Clip'
     register_as 'Put'
     register_as 'Set'
-    set_line_cont
 
     # attr_accessor :prototype
     attr_reader :is_template, :inline
@@ -1028,7 +1072,6 @@ end
 class Deplate::Regions::Header < Deplate::Region
     register_as 'Header'
     set_formatter :format_header
-    set_line_cont
     
     def finish
         finish_accum
@@ -1050,14 +1093,12 @@ end
 class Deplate::Regions::Footer < Deplate::Regions::Header
     register_as 'Footer'
     set_formatter :format_footer
-    set_line_cont
 end
 
 
 class Deplate::Regions::Swallow < Deplate::Region
     register_as 'Swallow'
     register_as 'Skip'
-    set_line_cont
 
     def finish
         finish_accum

data/lib/deplate/skeletons.rb

@@ -0,0 +1,122 @@
+# skeletons.rb
+# @Author:      Thomas Link (samul AT web de)
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     28-Apr-2006.
+# @Last Change: 03-Jun-2006.
+# @Revision:    0.147
+
+# Skeletons: 
+class Deplate::SkeletonExpander <  Deplate::CommonObject
+    def initialize(deplate)
+        @deplate        = deplate
+        @formatter      = deplate.formatter
+        @formatter_name = @formatter.class.myname
+        @max_iteration  = 5
+        @skeletons      = deplate.options.skeletons
+        @skeletons_tmpl = {}
+        @skel_ids       = {}
+        @skel_names     = @skeletons.collect {|n| Regexp.escape(n)}.join('|')
+        @rx = Deplate::Rx.builder("\\{\\{((#@skel_names)\\b(?>\\\\\\{|\\\\\\}|\\\\\\\\|[^{}]+?|{#})*)\\}\\}|^[[:blank:]]+", 
+                                  Regexp::MULTILINE, 5, false)
+        srand(Time.now.to_i)
+    end
+
+    def require_skeleton(name, source=nil)
+        skels = @skeletons_tmpl[@formatter_name] ||= {}
+        # names = @deplate.formatter_family_members.collect {|f| "#{name}.#{f}"}
+        # names << name
+        # names.each do |name|
+            t = skels[name] ||= load_skeleton(name)
+            return t if t
+        # end
+        Deplate::Core.log(['Unknown skeleton', name], :error, source)
+    end
+
+    def load_skeleton(name)
+        # tmpl = @deplate.skeletons[name]
+        tmpl = @deplate.find_in_lib(name, :pwd => true)
+        if tmpl and File.exist?(tmpl)
+            t = File.open(tmpl) {|io| io.read}
+            return t
+        end
+        return nil
+    end
+
+    def expand(string, source=nil, iterations=@max_iteration)
+        if string.empty?
+            return string
+        end
+        expanded = false
+        indent   = ''
+        string.gsub!(@rx) do |s|
+            text = $1
+            if text
+                expansion = expand_skeleton(text, indent, source)
+                if expansion
+                    expanded ||= true
+                    expansion
+                else
+                    text
+                end
+            else
+                indent = s
+            end
+        end
+        if expanded and iterations > 0
+            return expand(string, source, iterations - 1)
+        else
+            return string
+        end
+    end
+    
+    def split_name_args(string)
+        m    = Regexp.new("^(#@skel_names)\s*").match(string)
+        name = m[1]
+        args = m.post_match.strip
+        if args
+            args = Deplate::Core.remove_backslashes(args)
+            args, body = @deplate.input.parse_args(args)
+            args['@body'] = body
+        else
+            args = {}
+        end
+        return name, args
+    end
+    
+    def expand_skeleton(string, indent='', source=nil)
+        name, args = split_name_args(string)
+        if @skeletons.include?(name)
+            special = "skeleton_#{name}"
+            text    = if respond_to?(special)
+                          send(special, args)
+                      else
+                          skeleton = require_skeleton(name, source)
+                          if skeleton
+                              tmpl  = Deplate::Template.new(:template => skeleton, 
+                                                            :source   => source)
+                              accum = Deplate::Define.let_variables(@deplate, args) do
+                                  tmpl.fill_in(@deplate, :source => source)
+                              end
+                              accum.flatten!
+                              accum.join("\n")
+                          else
+                              nil
+                          end
+                      end
+            if text
+                return @formatter.indent_text(text, :hanging => true, :indenttail => indent)
+            end
+        end
+        return nil
+    end
+
+    def skeleton_id(args)
+        name = args['name'] || args['id'] || args['@body']
+        sep  = '_' * (4 + rand(4))
+        # rid  = Time.now.to_f
+        rid  = '%x' % rand.to_s[2..-1].to_i
+        @skel_ids[name] ||= [sep, name, rid, sep].join('_')
+        return @skel_ids[name]
+    end
+end
+