deplate 0.7.3 → 0.8

data/lib/deplate/css/serif.css

@@ -1,12 +1,12 @@
 /* Text style: sans-serif */
 /* @Author:      Thomas Link (samul AT web.de) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 27-Okt-2005. */
-/* @Revision:    0.624 */
+/* @Last Change: 23-Apr-2006. */
+/* @Revision:    0.626 */
 
 body, table, div {
     /* font-family: Georgia, Bookman, Times, Serif; */
-	font-family: Georgia, Minion Web, Palatino, Book Antiqua, Utopia, "Times New Roman", serif;
+	font-family: Georgia, Minion Web, Palatino, "Book Antiqua", Utopia, "Times New Roman", serif;
 	/* font-size-adjust: .5; */
     font-size: 14px;
 }
@@ -188,3 +188,9 @@ span.progress {
     font-size: 10px;
 }
 
+input, textarea {
+	font-family: Georgia, Minion Web, Palatino, "Book Antiqua", Utopia, "Times New Roman", serif;
+    font-size: 90%;
+    line-height: 135%;
+}
+

data/lib/deplate/css/tabbar-right-ie.css

@@ -1,14 +1,8 @@
 @media screen {
-    #tabBody {
-        margin: 0px 40px 40px 240px;
-        padding: 20px;
-    } 		
-    #tabBar {
+    #tabBarRight {
         position: relative;
-        top: 10px;
+        /* top: 10px; */
         left: 10px;
-    }
-    table.tabBarRight {
-        border-collapse: collapse;
+        width: 160px;
     }
 }

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

@@ -1,13 +1,13 @@
 @import url(deplate.css);
 
 body {
-    background-color: #e0e0ff;
+    background-color: #d9e0f0;
 }
 
 #tabFrame {
     /* display: table; */
     /* border-spacing: 0; */
-    background-color: #e0e0ff;
+    background-color: #d9e0f0;
     border-spacing: 0;
     border-collapse: collapse;
     border: 0;
@@ -25,7 +25,7 @@ body {
     border: 0;
     padding: 10px 0 0 0;
     margin: 0;
-    background-color: #e0e0ff;
+    background-color: #d9e0f0;
 }
 #tabBodyFrame {
     /* display: table-cell; */
@@ -35,7 +35,7 @@ body {
     float: left;
     text-align: left;
     vertical-align: top;
-    background-color: #e0e0ff;
+    background-color: #d9e0f0;
     width: 750px;
     padding: 0;
     margin: 0;
@@ -56,12 +56,12 @@ body {
 
 .tabFrameRow {
     /* display: table-row; */
-    background-color: #e0e0ff;
+    background-color: #d9e0f0;
     border: 0;
 }
 .tabFrameCell {
     /* display: table-cell; */
-    background-color: #e0e0ff;
+    background-color: #d9e0f0;
     border: 0;
 }
 
@@ -73,36 +73,65 @@ table.tabBarRight {
     margin: 0;
     /* padding: 10px; */
     border-spacing: 0;
-    max-width: 140px;
+    /* max-width: 160px; */
+    width: 160px;
+    /* min-width: 140px; */
 }
 tr.tabBarRight {
 }
 td.tabBarRight {
 }
 
-.tabBarRightActive {
+*[class|=tabBarRightActive] {
     background-color: #fafafa;
 }
-tr.tabBarRightActive {
+tr[class|=tabBarRightActive] {
 }
-td.tabBarRightActive {
-    border: 1px inset #e0e0e0;
-    /* border-left: 4px solid #e0e0e0; */
-    /* border-right: 4px solid #afafaf; */
+td[class|=tabBarRightActive] {
+    border-top: 0;
+    border-bottom: 0;
     padding: 2px;
 }
 
-.tabBarRightInactive {
+tr.tabBarRightActive-Level1 {
+    border-top: 0;
+    border-bottom: 0;
+}
+tr.tabBarRightActive-Level2 {
+    border-top: 0;
+    border-bottom: 0;
+}
+
+td.tabBarRightActive-Level1 {
+    border-top: 1px solid #555555;
+    border-left: 1px solid #555555;
+    border-bottom: 0 none;
+    background-color: #fff3d0;
+    margin: 5px;
+}
+td.tabBarRightActive-Level2 {
+    border-left: 1px solid #555555;
+    border-top: 0 none;
+    border-bottom: 0 none;
+    background-color: #ffffff;
+    margin: 5px;
+}
+
+*[class|=tabBarRightInactive] {
     background-color: #f0f0f0;
 }
-tr.tabBarRightInactive {
+tr[class|=tabBarRightInactive] {
 }
-td.tabBarRightInactive {
+td[class|=tabBarRightInactive] {
     border: 1px solid #fafafa;
-    /* border-left: 4px solid #afafaf; */
-    /* border-right: 4px solid #e0e0e0; */
     padding: 2px;
 }
+td.tabBarRightInactive-Level1 {
+    border-top: 0 none;
+    border-bottom: 0 none;
+    background-color: #f0f0f0;
+    margin: 5px;
+}
 
 .tabBarRightButtons {
 }
@@ -116,3 +145,7 @@ td.tabBarRightButtons {
     text-align: center;
 }
 
+table.comment_form, td.comment_form {
+    background-color: #d9e0f0;
+}
+

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

@@ -1,5 +1,9 @@
 @import url(deplate.css);
 
+body {
+    background-color: #d9e0f0;
+}
+
 #tabFrame {
     position: absolute;
     top: 0;
@@ -11,7 +15,7 @@
     padding: 0;
     border: 0;
     margin: 10px 0 0 0;
-    background-color: #e9e9ff;
+    background-color: #d9e0f0;
 }
 #tabBodyFrame {
     /* text-align: left; */
@@ -35,11 +39,13 @@ table.tabBarTop {
     border-spacing: 0;
     position: relative;
     top: 1px;
+    text-align: center;
 }
 tr.tabBarTop {
     border: 0;
     margin: 0;
     padding: 0;
+    text-align: center;
 }
 td.tabBarTopActive {
     margin: 0;

data/lib/deplate/define.rb

@@ -3,11 +3,11 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     19-Okt-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.402
+# @Last Change: 29-Apr-2006.
+# @Revision:    0.500
 
-require "deplate/commands"
-require "deplate/macros"
+require 'deplate/commands'
+require 'deplate/macros'
 
 module Deplate::DefRegions; end
 module Deplate::DefElements; end
@@ -24,14 +24,12 @@ module Deplate::DefMacro; end
 # CHANGES:
 # 
 class Deplate::Define < Deplate::Region
-    @line_cont  = true
-
     class << self
         def let_variables(deplate, args, &block)
             unset = []
             saved = {}
             begin
-                for key, val in args
+                args.each do |key, val|
                     if key.kind_of?(String)
                         opt = deplate.variables[key]
                         if opt
@@ -42,12 +40,12 @@ class Deplate::Define < Deplate::Region
                         deplate.variables[key] = val
                     end
                 end
-                block.call
+                return block.call
             ensure
-                for key in unset
+                unset.each do |key|
                     deplate.variables.delete(key)
                 end
-                for key, val in saved
+                saved.each do |key, val|
                     deplate.variables[key] = val
                 end
             end
@@ -57,7 +55,7 @@ class Deplate::Define < Deplate::Region
             if mandatory
                 diff = mandatory.split(/\s+/) - args.keys
                 unless diff.empty?
-                    Deplate::Core.log(["Missing arguments", diff], :error, source)
+                    Deplate::Core.log(['Missing arguments', diff], :error, source)
                 end
             end
         end
@@ -71,7 +69,7 @@ class Deplate::Define < Deplate::Region
 
     def valid_id?(id)
         if id =~ /\W/
-            log(["Invalid id", id], :error)
+            log(['Invalid ID', id], :error)
             return false
         else
             return true
@@ -93,16 +91,16 @@ end
 
 # class Deplate::Define::Region < Deplate::Region::SecondOrder
 class Deplate::Define::Region < Deplate::Region
-    @line_cont = true
     def finish
         finish_accum
         setup_template
-        @args["@body"] = @accum.join("\n")
-        @args["@note"] = @regNote
+        @args['@body'] = @accum.join("\n")
+        @args['@note'] = @regNote
         Deplate::Define.check_arguments(@mandatory, @args, @source)
         @expected = Deplate::Element
         @elt      = []
         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)
         end
         unless @elt.empty?
@@ -113,122 +111,133 @@ class Deplate::Define::Region < Deplate::Region
 end
 
 class Deplate::Regions::DefRegion < Deplate::Define
-    @@regions["DefRegion"] = self
-    @@regions["DefineRegion"] = self
-    @@regions["Defr"] = self
+    @@regions['DefRegion'] = self
+    @@regions['DefineRegion'] = self
+    @@regions['Defr'] = self
     
     def define
-        id = @args["id"] || @regNote
+        id = @args['id'] ||= @regNote
         if valid_id?(id)
-            region = %{
-                class Deplate::DefRegions::#{id} < Deplate::Define::Region
-                    @@regions["#{id}"] = self
-                    def setup_template
-                        @template  = #{@accum.inspect}
-                        @mandatory = #{@args["args"].inspect}
-                    end
+            # if @args['lineCont'] == false
+                line_cont = 'set_line_cont false'
+            # else
+            #     line_cont = ''
+            # end
+            body = <<-EOR
+                #{line_cont}
+                def setup_template
+                    @template  = #{@accum.inspect}
+                    @mandatory = #{@args['args'].inspect}
                 end
-            }
-            eval region
+            EOR
+            @args[:register] = true
+            @args[:super]    = Deplate::Define::Region
+            cls = Deplate::Cache.region(@deplate, body, @args)
         end
     end
 end
 
+class Deplate::Define::Element < Deplate::Element
+    def finish
+        m = self.class.match(@accum.join(' '))
+        if m
+            m.captures.each_with_index do |e, i|
+                @args[(i + 1).to_s] = e
+            end
+            @expected = Deplate::Element
+            tmpl = Deplate::Template.new(:template  => self.class.tpl,
+                                         :source    => @source,
+                                         :container => self)
+            Deplate::Define.let_variables(@deplate, @args) do
+                @accum = tmpl.fill_in(@deplate, :source => @source)
+            end
+            @accum.flatten!
+            @accum.collect! {|l| l.split("\n")}
+            @accum.flatten!
+        else
+            raise 'Internal error!'
+        end
+        @elt = @deplate.parsed_array_from_strings(@accum, @source.begin, @source.file)
+        return @elt
+    end
+end
 
 class Deplate::Regions::DefElement < Deplate::Define
-    @@regions["DefElement"]    = self
-    @@regions["DefineElement"] = self
-    @@regions["Defe"]          = self
+    @@regions['DefElement']    = self
+    @@regions['DefineElement'] = self
+    @@regions['Defe']          = self
     @@def_element_counter      = 0
 
-    @line_cont = false
+    set_line_cont false
     
     def define
-        rx = @args['rx'] || @regNote
+        rx = @args['rx'] ||= @regNote
         if rx
             @@def_element_counter += 1
-            template  = @accum.join("\n").gsub(/\'/, "\\\\\'")
-            rx        = Regexp.new(rx).source.gsub(/\//, '\\\\/')
+            # template  = @accum.join("\n").gsub(/\'/, "\\\\\'")
+            template  = @accum.join("\n")
+            # rx        = Regexp.new(rx).source.gsub(/\//, '\\\\/')
+            rx        = %r{^#{rx}}
             multiline = valid_switch(@args['multiline'], 'true')
             collapse  = valid_switch(@args['collapse'],  'false')
-            eval %{
-                class Deplate::DefElements::Elt#{@@def_element_counter} < Deplate::Element
-                    @@elements << self
-                    @rx = /^#{rx}/
-                    TPL = '#{template}'
-
-                    def setup
-                        @multiliner = #{multiline}
-                        @collapse   = #{collapse}
-                        @accum      = [@match[0]]
-                    end
-
-                    def finish
-                        m = self.class.match(@accum.join(' '))
-                        if m
-                            m.captures.each_with_index do |e, i|
-                                @args[(i + 1).to_s] = e
-                            end
-                            @expected = Deplate::Element
-                            tmpl = Deplate::Template.new(:template  => TPL,
-                                                         :source    => @source,
-                                                         :container => self)
-                            Deplate::Define.let_variables(@deplate, @args) do
-                                @accum = tmpl.fill_in(@deplate, :source => @source)
-                            end
-                            @accum.flatten!
-                            @accum.collect! {|l| l.split("\n")}
-                            @accum.flatten!
-                        else
-                            raise 'Internal error!'
-                        end
-                        @elt = @deplate.parsed_array_from_strings(@accum, @source.begin, @source.file)
-                        return @elt
-                    end
+            body = <<-EOR
+                set_rx(#{rx.inspect})
+                class_attribute :tpl, #{template.inspect}
+                def setup
+                    @multiliner = #{multiline}
+                    @collapse   = #{collapse}
+                    @accum      = [@match[0]]
                 end
-            }
+            EOR
+            @args[:register] = true
+            @args[:super]    = Deplate::Define::Element
+            cls = Deplate::Cache.element(@deplate, body, @args)
         end
     end
 end
 
+class Deplate::Define::Particle < Deplate::Particle
+    def setup
+        @match.captures.each_with_index do |e, i|
+            @args[(i + 1).to_s] = e
+        end
+        @expected = Deplate::Particle
+        tmpl = Deplate::Template.new(:template  => self.class.tpl,
+                                     :source    => @source,
+                                     :container => self)
+        Deplate::Define.let_variables(@deplate, @args) do
+            @elt = tmpl.fill_in(@deplate, :source => @source)
+        end
+        @elt = @deplate.parse(@container, @elt.join(' '))
+    end
+
+    def process
+        @elt = @deplate.format_particles(@elt)
+    end
+end
 
 class Deplate::Regions::DefParticle < Deplate::Define
-    @@regions["DefParticle"]    = self
-    @@regions["DefineParticle"] = self
-    @@regions["Defp"]           = self
+    @@regions['DefParticle']    = self
+    @@regions['DefineParticle'] = self
+    @@regions['Defp']           = self
     @@def_particle_counter      = 0
     
     def define
-        rx = @args['rx'] || @regNote
-        if rx
-            template  = @accum.join("\n").gsub(/\'/, "\\\\\'")
-            rx        = Regexp.new(rx).source
+        rs = @args['rx'] ||= @regNote
+        if rs
+            # template  = @accum.join("\n").gsub(/\'/, "\\\\\'")
+            template  = @accum.join("\n")
+            rx        = %r{^#{rs}}
             multiline = valid_switch(@args['multiline'], 'true')
             collapse  = valid_switch(@args['collapse'],  'false')
-            cls       = @deplate.formatter.retrieve_particle(rx, template)
+            # cls       = @deplate.formatter.retrieve_particle(rx.source, template)
             body = <<-EOR
-                @rx = /^#{rx}/
-                TPL = '#{template}'
-
-                def setup
-                    @match.captures.each_with_index do |e, i|
-                        @args[(i + 1).to_s] = e
-                    end
-                    @expected = Deplate::Particle
-                    tmpl = Deplate::Template.new(:template  => TPL,
-                                                 :source    => @source,
-                                                 :container => self)
-                    Deplate::Define.let_variables(@deplate, @args) do
-                        @elt = tmpl.fill_in(@deplate, :source => @source)
-                    end
-                    @elt = @deplate.parse(@container, @elt.join(' '))
-                end
-
-                def process
-                    @elt = @deplate.format_particles(@elt)
-                end
+                set_rx(#{rx.inspect})
+                class_attribute :tpl, #{template.inspect}
             EOR
-            cls = Deplate::Cache.particle(deplate, body, :register => true)
+            @args[:register] = true
+            @args[:super]    = Deplate::Define::Particle
+            cls = Deplate::Cache.particle(deplate, body, @args)
         end
     end
 end
@@ -239,7 +248,7 @@ class Deplate::Define::Command < Deplate::Command
         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
+            args['@body'] = text
             Deplate::Define.check_arguments(mandatory, args, source)
             Deplate::Define.let_variables(deplate, args) do
                 deplate.include_stringarray(template, array, source.begin, source.file)
@@ -250,34 +259,33 @@ end
 
 
 class Deplate::Regions::DefCommand < Deplate::Define
-    @@regions["DefCommand"] = self
-    @@regions["DefCmd"] = self
-    @@regions["DefineCommand"] = self
-    @@regions["Defc"] = self
+    @@regions['DefCommand'] = self
+    @@regions['DefCmd'] = self
+    @@regions['DefineCommand'] = self
+    @@regions['Defc'] = self
     
     def define
-        id = @args["id"] || @regNote
+        id = @args['id'] ||= @regNote
         if valid_id?(id)
-            eval %{
-                class Deplate::DefCommand::#{id} < Deplate::Define::Command
-                    @@commands["#{id}"] = self
-                    class << self
-                        def setup_template(text, deplate)
-                            [#{@accum.inspect}, #{@args["args"].inspect}]
-                        end
+            body = <<-EOR
+                class << self
+                    def setup_template(text, deplate)
+                        [#{@accum.inspect}, #{@args['args'].inspect}]
                     end
                 end
-            }
+            EOR
+            @args[:register] = true
+            @args[:super]    = Deplate::Define::Command
+            cls = Deplate::Cache.command(@deplate, body, @args)
         end
     end
 end
 
 
 class Deplate::Define::Macro < Deplate::Macro
-    @line_cont = true
     def setup(text)
         setup_template(text)
-        @args["@body"] = text
+        @args['@body'] = text
         Deplate::Define.check_arguments(@mandatory, @args, @container.source)
         tmpl = Deplate::Template.new(:master    => @deplate,
                                      :template  => @template, 
@@ -293,23 +301,22 @@ end
 
 
 class Deplate::Regions::DefMacro < Deplate::Define
-    @@regions["DefMacro"] = self
-    @@regions["DefineMacro"] = self
-    @@regions["Defm"] = self
+    @@regions['DefMacro'] = self
+    @@regions['DefineMacro'] = self
+    @@regions['Defm'] = self
     def define
-        id = @args["id"] || @regNote
+        id = @args['id'] ||= @regNote
         if valid_id?(id)
-            eval %{
-                class Deplate::DefMacro::Define_#{id} < Deplate::Define::Macro
-                    @@macros[#{id.inspect}] = self
-                    def setup_template(text)
-                        @template  = #{@accum.join("\n").inspect}
-                        @mandatory = #{@args["args"].inspect}
-                        @macro_id  = #{id.inspect}
-                    end
+            body = <<-EOR
+                def setup_template(text)
+                    @template  = #{@accum.join("\n").inspect}
+                    @mandatory = #{@args['args'].inspect}
+                    @macro_id  = #{id.inspect}
                 end
-            }
-            # @deplate.initialize_particles(true)
+            EOR
+            @args[:register] = true
+            @args[:super]    = Deplate::Define::Macro
+            cls = Deplate::Cache.macro(@deplate, body, @args)
         end
     end
 end
@@ -318,15 +325,15 @@ end
 
 class Deplate::Regions::Native
     def expand_template
-        @args["@note"] = @regNote
-        @args["@body"] = @accum.join("\n")
+        @args['@note'] = @regNote
+        @args['@body'] = @accum.join("\n")
         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, :body => @args["@body"], :source => @source)
+            rv = tmpl.fill_in(@deplate, :body => @args['@body'], :source => @source)
         end
         return rv
     end
@@ -334,24 +341,24 @@ end
 
 
 class Deplate::Regions::DefRegionN < Deplate::Define
-    @@regions["DefRegionN"] = self
-    @@regions["DefineRegionN"] = self
-    @@regions["Defrn"] = self
+    @@regions['DefRegionN'] = self
+    @@regions['DefineRegionN'] = self
+    @@regions['Defrn'] = self
     def define
-        id = @args["id"] || @regNote
+        id = @args['id'] ||= @regNote
         if valid_id?(id)
-            eval %{
-                class Deplate::DefRegions::#{id} < Deplate::Regions::Native
-                    @@regions["#{id}"] = self
-                    def finish
-                        finish_accum
-                        @template  = #{@accum.join("\n").inspect}
-                        @mandatory = #{@args["args"].inspect}
-                        @elt = [ expand_template ]
-                        return self
-                    end
+            body = <<-EOR
+                def finish
+                    finish_accum
+                    @template  = #{@accum.join("\n").inspect}
+                    @mandatory = #{@args['args'].inspect}
+                    @elt = [ expand_template ]
+                    return self
                 end
-            }
+            EOR
+            @args[:register] = true
+            @args[:super]    = Deplate::Regions::Native
+            cls = Deplate::Cache.region(@deplate, body, @args)
         end
     end
 end
@@ -359,7 +366,7 @@ end
 
 class Deplate::Define::CommandNative < Deplate::Command
     def expand_template
-        @args["@body"] = @accum.join(" ")
+        @args['@body'] = @accum.join(' ')
         tmpl = Deplate::Template.new(:master => @deplate,
                                      :template => @template, 
                                      :source => @source, 
@@ -378,24 +385,24 @@ end
 
 
 class Deplate::Regions::DefCommandN < Deplate::Define
-    @@regions["DefCommandN"] = self
-    @@regions["DefCmdN"] = self
-    @@regions["DefineCommandN"] = self
-    @@regions["Defcn"] = self
+    @@regions['DefCommandN'] = self
+    @@regions['DefCmdN'] = self
+    @@regions['DefineCommandN'] = self
+    @@regions['Defcn'] = self
     def define
-        id = @args["id"] || @regNote
+        id = @args['id'] ||= @regNote
         if valid_id?(id)
-            eval %{
-                class Deplate::DefCommand::#{id} < Deplate::Define::CommandNative
-                    @@commands["#{id}"] = self
-                    def finish
-                        @template  = #{@accum.join("\n").inspect}
-                        @mandatory = #{@args["args"].inspect}
-                        @elt = [ expand_template ]
-                        return self
-                    end
+            body = <<-EOR
+                def finish
+                    @template  = #{@accum.join("\n").inspect}
+                    @mandatory = #{@args['args'].inspect}
+                    @elt = [ expand_template ]
+                    return self
                 end
-            }
+            EOR
+            @args[:register] = true
+            @args[:super]    = Deplate::Define::CommandNative
+            cls = Deplate::Cache.command(@deplate, body, @args)
         end
     end
 end
@@ -404,7 +411,7 @@ end
 class Deplate::Define::MacroNative < Deplate::Macro
     def setup(text)
         setup_template
-        @args["@body"] = text
+        @args['@body'] = text
         tmpl = Deplate::Template.new(:master => @deplate,
                                      :template => @template, 
                                      :source => @source, 
@@ -417,22 +424,21 @@ end
 
 
 class Deplate::Regions::DefMacroN < Deplate::Define
-    @@regions["DefMacroN"] = self
-    @@regions["DefineMacroN"] = self
-    @@regions["Defmn"] = self
+    @@regions['DefMacroN'] = self
+    @@regions['DefineMacroN'] = self
+    @@regions['Defmn'] = self
     def define
-        id = @args["id"] || @regNote
+        id = @args['id'] ||= @regNote
         if valid_id?(id)
-            eval %{
-                class Deplate::DefMacro::Define_#{id} < Deplate::Define::MacroNative
-                    @@macros[#{id.inspect}] = self
-                    def setup_template
-                        @template  = #{@accum.join(" ").inspect}
-                        @mandatory = #{@args["args"].inspect}
-                    end
+            body = <<-EOR
+                def setup_template
+                    @template  = #{@accum.join(' ').inspect}
+                    @mandatory = #{@args['args'].inspect}
                 end
-            }
-            # @deplate.initialize_particles(true)
+            EOR
+            @args[:register] = true
+            @args[:super]    = Deplate::Define::MacroNative
+            cls = Deplate::Cache.macro(@deplate, body, @args)
         end
     end
 end