deplate 0.8.1 → 0.8.2

data/lib/deplate/mod/latex-styles.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     26-Nov-2004.
-# @Last Change: 2007-06-30.
-# @Revision:    0.352
+# @Last Change: 2008-01-30.
+# @Revision:    0.363
 # 
 # Description:
 # 
@@ -119,6 +119,14 @@ class Deplate::Formatter::LaTeX::Styles
         rv
     end
 
+    def table_tabular_top(rv, invoker)
+        rv
+    end
+
+    def table_tabular_bottom(rv, invoker)
+        rv
+    end
+
     def table_top(rv, invoker, *args)
         rv
     end
@@ -193,33 +201,33 @@ end
 #     end
 # end
 class Deplate::Formatter::LaTeX::Styles::TableSmall < Deplate::Formatter::LaTeX::Styles
-    def table_top(rv, invoker, capAbove, rown)
+    def table_tabular_top(rv, invoker)
         "\\small{}\n#{rv}"
     end
-    def table_bottom(rv, invoker, capAbove, rown)
-        "#{rv}\\normalsize{}\n"
+    def table_tabular_bottom(rv, invoker)
+        "#{rv}\n\\normalsize{}"
     end
     def table_caption_text(rv, invoker, *args)
         "\\normalsize{#{rv}}"
     end
 end
 class Deplate::Formatter::LaTeX::Styles::TableFootnotesize < Deplate::Formatter::LaTeX::Styles
-    def table_top(rv, invoker, capAbove, rown)
+    def table_tabular_top(rv, invoker)
         "\\footnotesize{}\n#{rv}"
     end
-    def table_bottom(rv, invoker, capAbove, rown)
-        "#{rv}\\normalsize{}\n"
+    def table_tabular_bottom(rv, invoker)
+        "#{rv}\n\\normalsize{}"
     end
     def table_caption_text(rv, invoker, *args)
         "\\normalsize{#{rv}}"
     end
 end
 class Deplate::Formatter::LaTeX::Styles::TableScriptsize < Deplate::Formatter::LaTeX::Styles
-    def table_top(rv, invoker, capAbove, rown)
+    def table_tabular_top(rv, invoker)
         "\\scriptsize{}\n#{rv}"
     end
-    def table_bottom(rv, invoker, capAbove, rown)
-        "#{rv}\\normalsize{}\n"
+    def table_tabular_bottom(rv, invoker)
+        "#{rv}\n\\normalsize{}"
     end
     def table_caption_text(rv, invoker, *args)
         "\\normalsize{#{rv}}"
@@ -408,6 +416,7 @@ class Deplate::Formatter::LaTeX
         @style_engines = {
             :default => Deplate::Formatter::LaTeX::Styles.new(@deplate),
         }
+        @format_advice_backlist += [:format_table]
 
         table_agents = [
             :format_table, :table_args, 
@@ -418,6 +427,7 @@ class Deplate::Formatter::LaTeX
             :table_horizontal_ruler, :table_horizontal_ruler_from_to,
             :table_longtable_top, :table_longtable_bottom, 
             :table_table_bottom, :table_table_top, :table_top,
+            :table_tabular_top, :table_tabular_bottom,
             :tabular_col_widths, :tabular_col_justifications, :tabular_vertical_rulers,
             :table_indented_row,
         ]

data/lib/deplate/mod/makefile.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     28-Aug-2005.
-# @Last Change: 2007-07-17.
-# @Revision:    0.164
+# @Last Change: 2008-04-13.
+# @Revision:    0.168
 #
 # = Description
 # Create a standard makefile.
@@ -60,11 +60,15 @@ OTHER=#{files.join(' ') if files}
 
 DEPLATE=deplate
 
+OFLAGS=
 DFLAGS=#{options.join(' ')}
 
 HTML_DIR=html
 HTML_DFLAGS=-d ${HTML_DIR} -f html
 
+XHTML_DIR=html
+XHTML_DFLAGS=-d ${XHTML_DIR} -f xhtml10t
+
 WEBSITE_DIR=website
 WEBSITE_DFLAGS=-d ${WEBSITE_DIR} -f htmlsite
 
@@ -93,8 +97,9 @@ all: dbk html pdf tex text man
 dvi: ${BASE}.dvi
 dbk: ${BASE}.dbk
 html: ${BASE}.html
+xhtml: ${BASE}.xhtml
 pdf:
-	make DFLAGS="${DFLAGS} --pdf" "${BASE}.pdf"
+	make DFLAGS="${DFLAGS} ${OFLAGS} --pdf" "${BASE}.pdf"
 php: ${BASE}.php
 tex: ${BASE}.tex
 text: ${BASE}.text
@@ -104,41 +109,46 @@ pdfclean: pdf cleantex
 dviclean: dvi cleantex
 
 makefile:
-	${DEPLATE} -m makefile ${DFLAGS} ${BASE}#{suffix} ${OTHER}
+	${DEPLATE} -m makefile ${DFLAGS} ${OFLAGS} ${BASE}#{suffix} ${OTHER}
 
 website:
 	make prepare_website
-	${DEPLATE} ${DFLAGS} ${WEBSITE_DFLAGS} ${FILE} ${OTHER}
+	${DEPLATE} ${DFLAGS} ${OFLAGS} ${WEBSITE_DFLAGS} ${FILE} ${OTHER}
 	echo ${WEBSITE_DIR}/${BASE}.html > .last_output
 
 %.html: %#{suffix}
 	make prepare_html
-	${DEPLATE} ${DFLAGS} ${HTML_DFLAGS} $< ${OTHER}
+	${DEPLATE} ${DFLAGS} ${OFLAGS} ${HTML_DFLAGS} $< ${OTHER}
 	echo ${HTML_DIR}/$@ > .last_output
 
+%.xhtml: %#{suffix}
+	make prepare_xhtml
+	${DEPLATE} ${DFLAGS} ${OFLAGS} ${XHTML_DFLAGS} $< ${OTHER}
+	echo ${XHTML_DIR}/$@ > .last_output
+
 %.text: %#{suffix}
 	make prepare_text
-	${DEPLATE} ${DFLAGS} ${TEXT_DFLAGS} $< ${OTHER}
+	${DEPLATE} ${DFLAGS} ${OFLAGS} ${TEXT_DFLAGS} $< ${OTHER}
 	echo ${TEXT_DIR}/$@ > .last_output
 
 %.php: %#{suffix}
 	make prepare_php
-	${DEPLATE} ${DFLAGS} ${PHP_DFLAGS} $< ${OTHER}
+	${DEPLATE} ${DFLAGS} ${OFLAGS} ${PHP_DFLAGS} $< ${OTHER}
 	echo ${PHP_DIR}/$@ > .last_output
 
 %.dbk: %#{suffix}
 	make prepare_dbk
-	${DEPLATE} ${DFLAGS} ${DBK_DFLAGS} $< ${OTHER}
+	${DEPLATE} ${DFLAGS} ${OFLAGS} ${DBK_DFLAGS} $< ${OTHER}
 	echo ${DBK_DIR}/$@ > .last_output
 
 %.tex: %#{suffix}
 	make prepare_tex
-	${DEPLATE} ${DFLAGS} ${TEX_DFLAGS} $< ${OTHER}
+	${DEPLATE} ${DFLAGS} ${OFLAGS} ${TEX_DFLAGS} $< ${OTHER}
 	echo ${TEX_DIR}/$@ > .last_output
 
 %.ref: %#{suffix}
 	make prepare_ref
-	${DEPLATE} ${DFLAGS} ${REF_DFLAGS} -o $@ $< ${OTHER}
+	${DEPLATE} ${DFLAGS} ${OFLAGS} ${REF_DFLAGS} -o $@ $< ${OTHER}
 	echo ${REF_DIR}/$@ > .last_output
 
 %.dvi: %.tex

data/lib/deplate/mod/markup-1.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     03-Okt-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.12
+# @Last Change: 2007-11-11.
+# @Revision:    0.13
 
 class Deplate::Particle::Emphasize < Deplate::SimpleParticle
     @rx = /^\*\*(.+?)\*\*/
@@ -34,7 +34,7 @@ class Deplate::Macro::Emphasize < Deplate::Macro::FormattedText
     @@macros["*"] = self
 end
 
-class Deplate::Macro::Code < Deplate::Macro::FormattedText
+class Deplate::Macro::Code
     @@macros.delete("'")
     @@macros["="] = self
 end

data/lib/deplate/mod/particle-math.rb

@@ -3,18 +3,22 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     25-M�r-2005.
-# @Last Change: 12-Nov-2005.
-# @Revision:    0.20
+# @Last Change: 2008-04-14.
+# @Revision:    0.30
 #
 # = Description
-# This provides a math markup as known from LaTeX: $\latexmarkup$
+# This provides a math markup as known from LaTeX:
+# $\latexmarkup$
+#
+# Support block markup for formulas via: $$\latexmarkup$$
+
 
 class Deplate::Particle::Math < Deplate::Particle
     register_particle
-    set_rx(/^\$(\S.*?)\$/)
+    set_rx(/^(\$\$?)(\S.*?)(\$\$?)/)
 
     def setup
-        @proxy = Deplate::Macro::Math.new(@deplate, @container, @context, {}, @alt, get_text)
+        @proxy = Deplate::Macro::Math.new(@deplate, @container, @context, {'block' => is_block?}, @alt, get_text)
     end
     
     def process
@@ -22,10 +26,15 @@ class Deplate::Particle::Math < Deplate::Particle
     end
 
     def get_text
-        @match[1]
+        return @match[2]
+    end
+
+    def is_block?
+        return @match[1] == '$$'
     end
 end
 
+
 class Deplate::Core
     def hook_late_require_particle_math
         register_particle(Deplate::Particle::Math)

data/lib/deplate/particles.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     24-M�r-2004.
-# @Last Change: 2007-09-29.
-# @Revision:    0.1922
+# @Last Change: 2008-07-06.
+# @Revision:    0.1925
 
 require "uri"
 require "deplate/common"

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: 2007-09-30.
-# @Revision:    0.1752
+# @Last Change: 2008-07-06.
+# @Revision:    0.1770
 
 # Description:
 # 
@@ -290,15 +290,28 @@ class Deplate::Regions::Code < Deplate::Regions::Native
     @@code_idx = 0
     @general_highlighter = {}
     @syntax_highlighter  = {}
+    @options = Hash.new {|h, k| h[k] = {}}
 
     class << self
-        attr_reader :syntax_highlighter, :general_highlighter
+        attr_reader :syntax_highlighter, :general_highlighter, :options
+
+        def highlighter_option(agent, options)
+            @options[agent].merge!(options)
+        end
+
         def add_highlighter(syntax, format, agent)
-            if syntax
-                @syntax_highlighter[syntax] ||= []
-                @syntax_highlighter[syntax] << [format, agent]
+            case syntax
+            when Array
+                syntax.each do |syn|
+                    add_highlighter(syn, format, agent)
+                end
             else
-                @general_highlighter[format] = agent
+                if syntax
+                    @syntax_highlighter[syntax] ||= []
+                    @syntax_highlighter[syntax] << [format, agent]
+                else
+                    @general_highlighter[format] = agent
+                end
             end
         end
     end
@@ -324,8 +337,8 @@ class Deplate::Regions::Code < Deplate::Regions::Native
         end
         if @syntax
             e = nil
+            fmt_name = @deplate.formatter.formatter_name
             @deplate.in_working_dir do
-                fmt_name = @deplate.formatter.formatter_name
                 id       = @args['id']
                 if id
                     id.gsub!(/\W/, '00')
@@ -337,16 +350,37 @@ class Deplate::Regions::Code < Deplate::Regions::Native
                     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))
                 end
+
+                # highlighter_agent = nil
+                # specialized_highlighter = self.class.syntax_highlighter[@syntax]
+                # if specialized_highlighter
+                #     specialized_highlighter.each do |fmt, agent|
+                #         if @deplate.formatter.matches?(fmt)
+                #             highlighter_agent = agent
+                #             break
+                #         end
+                #     end
+                # end
+                # unless highlighter_agent
+                #     highlighter_agent = self.class.general_highlighter[fmt_name]
+                # end
+                # unless highlighter_agent
+                #     log(['No highlighter defined', fmt_name], :error)
+                #     return self
+                # end
+
                 if Deplate::Region.check_file(self, fout, fcode, @elt)
                     log(["Files exist! Using", fout], :anyway)
                     File.open(fout) {|io| @elt = io.readlines.collect {|l| l.chomp}}
                     return self
                 else
+                    highlighter_agent = nil
                     begin
                         specialized_highlighter = self.class.syntax_highlighter[@syntax]
                         if specialized_highlighter
                             specialized_highlighter.each do |fmt, agent|
                                 if @deplate.formatter.matches?(fmt)
+                                    highlighter_agent = agent
                                     e = send(agent, @syntax, @style, text)
                                     # p "DBG Code 1 #{e.class}"
                                     break if e
@@ -354,14 +388,15 @@ class Deplate::Regions::Code < Deplate::Regions::Native
                             end
                         end
                         unless e
-                            agent = self.class.general_highlighter[fmt_name]
+                            highlighter_agent = agent = self.class.general_highlighter[fmt_name]
                             e     = send(agent, @syntax, @style, text) if agent
                             # p "DBG Code 2 #{e.class}"
                         end
-                    rescue StandardError => e
-                        log("#Code: #{e}", :error)
+                    rescue StandardError => err
+                        log("#Code: #{err}", :error)
                     end
-                    if e
+                    # p "DBG", highlighter_agent, self.class.options[highlighter_agent], self.class.options[highlighter_agent][:no_cache]
+                    if e and !self.class.options[highlighter_agent][:no_cache]
                         File.open(fcode, "w") {|io| io.puts(text)} if fcode
                         File.open(fout, "w")  {|io| io.puts(e)}  if fout
                     end
@@ -861,7 +896,7 @@ class Deplate::Regions::R < Deplate::Region
             mode  = :pre
             for l in @accum
                 xtable_postprocess_text(l)
-                m = /^\<([^> ]+).*?\>(.*)?(\<\/(\S+)\>)?$/.match(l)
+                m = /^\s*\<([^> ]+).*?\>(.*)?(\<\/(\S+)\>)?\s*$/.match(l)
                 if m
                     case m[1]
                     when "!--"
@@ -871,11 +906,11 @@ class Deplate::Regions::R < Deplate::Region
                     when "/TABLE"
                         mode = :post
                     when "TR"
-                        row = l.scan(/\<TH.*?\>(\s+.*?)\<\/TH\>/).flatten
+                        row = l.scan(/\<TH.*?\>\s*(.*?)\s*<\/TH\>/).flatten
                         unless row.empty?
                             table << "|| #{row.join(" || ")} ||"
                         else
-                            row = l.scan(/\<TD.*?\>(\s+.*?)\<\/TD\>/).flatten
+                            row = l.scan(/\<TD.*?\>\s*(.*?)\s*\<\/TD\>/).flatten
                             table << "| #{row.join(" | ")} |" unless row.empty?
                         end
                         log(["R xtable: row", row], :debug)

data/lib/deplate/template.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-Aug-2004.
-# @Last Change: 2007-09-28.
-# @Revision:    0.550
+# @Last Change: 2008-07-06.
+# @Revision:    0.560
 # 
 # Description:
 # 
@@ -124,13 +124,17 @@ class Deplate::Template
             'DOC'        => Deplate::Command::VAR,
             'VAR'        => Deplate::Command::VAR,
             'OPT'        => Deplate::Command::OPT,
+            'PROP'       => Deplate::Command::OPT,
+            'PP'         => Deplate::Command::OPT,
             'PREMATTER'  => Deplate::Command::PREMATTER,
             'POSTMATTER' => Deplate::Command::POSTMATTER,
             'BODY'       => Deplate::Command::BODY,
+            'WITH'       => Deplate::Command::WITH,
         },
 
         :regions   => {
             'Foreach' => Deplate::Regions::Foreach,
+            'For'     => Deplate::Regions::Foreach,
             'Mingle'  => Deplate::Regions::Mingle,
             'Native'  => Deplate::Regions::Native,
             'Ruby'    => Deplate::Regions::Ruby,
@@ -156,6 +160,7 @@ class Deplate::Template
             'doc'  => Deplate::Macro::Var,
             'ruby' => Deplate::Macro::Ruby,
             'msg'  => Deplate::Macro::Msg,
+            'date' => Deplate::Macro::Date,
         },
     }
    

data/lib/deplate/themes/presentation.html/css/highstep.css

@@ -0,0 +1,29 @@
+body {
+    /* font-family: Georgia, Bookman, Times, Serif; */
+	font-family: Georgia, Minion Web, Palatino, "Book Antiqua", Utopia, "Times New Roman", serif;
+	/* font-size-adjust: .5; */
+    font-size: 14px;
+    line-height: 1.36em
+}
+
+span.steppreview {
+    background-color: #f5f5f5;
+    /* padding: 1px; */
+    /* border: 1px solid #e0e0e0; */
+    border: 1px solid #f0f0f0;
+}
+
+span.stephighlight {
+    background-color: #ffff60;
+    /* padding: 1px; */
+    border: 1px solid #e0e0e0;
+}
+
+span.steplast {
+    background-color: #ffff90;
+    border: 1px solid #e0540e;
+}
+
+/*
+vi: ft=css:tw=72:ts=4
+*/