deplate 0.8.4 → 0.8.5

data/lib/{ps2ppm.rb → deplate/ps2ppm.rb}

@@ -2,22 +2,22 @@
 # ps2ppm.rb
 # @Author:      Peter Kleiweg
 # @Created:     11-Nov-2004.
-# @Last Change: 30-Jul-2005.
-# @Revision:    0.101
+# @Last Change: 2008-12-15.
+# @Revision:    0.104
 #
 # Ruby translation of the ps2ppm script that can be found 
-# http://odur.let.rug.nl/~kleiweg/postscript/ps2ppm 
-# here. 
+# http://odur.let.rug.nl/~kleiweg/postscript/ps2ppm here. 
 #
 # Note that this is still very perlish.
 # 
 # The original perl script is by Peter Kleiweg.
 # Kaspar Schiess (eule AT space.ch) converted this script to ruby.
 # 
-# This is a slightly modified and de-perlished version of his converted script.
+# This is a slightly modified and de-perlished version of his converted 
+# script.
 #
 
-require 'getopts'
+# require 'getopts'
 # require 'pp'
 
 module Ps2ppm
@@ -231,9 +231,9 @@ LEV2HEAD
     module_function :run
 end
 
-if __FILE__ == $0
-    file = ARGV.pop
-    getopts('1f:ghm:oO:r:t')
-    Ps2ppm.run(file, $OPT)
-end
+# if __FILE__ == $0
+#     file = ARGV.pop
+#     getopts('1f:ghm:oO:r:t')
+#     Ps2ppm.run(file, $OPT)
+# end
 

data/lib/deplate/regions.rb

@@ -1,19 +1,12 @@
+# encoding: ASCII
 # regions.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     08-Mai-2004.
-# @Last Change: 2008-07-09.
-# @Revision:    0.1777
-
-# Description:
-# 
-# Usage:
-# 
-# TODO:
-# 
-# CHANGES:
-# 
+# @Last Change: 2009-02-02.
+# @Revision:    0.1849
+
 
 class Deplate::Region < Deplate::Element
     @@regions = {}
@@ -88,7 +81,7 @@ class Deplate::Region < Deplate::Element
     def setup(region=nil)
         if region
             @region = region
-            @args   = region.args
+            @args.merge!(region.args)
             update_args
         end
     end
@@ -121,12 +114,12 @@ class Deplate::Region < Deplate::Element
             e.match_expected(prototype, self) # if prototype
             # e.doc_type = doc_type
             # e.doc_slot = doc_slot
-            acc << e.format_current
+            acc << e.format_contained(self)
         end
         fmt = self.class.formatter2 || self.class.formatter
         if fmt
             @elt = @deplate.formatter.join_blocks(acc)
-            return format_current(fmt)
+            return format_contained(self, fmt)
         else
             return @deplate.formatter.join_blocks(acc)
         end
@@ -425,10 +418,12 @@ end
 class Deplate::Regions::Inlatex < Deplate::Region
     register_as 'Inlatex'
     register_as 'Ltx'
+    register_as 'Latex'
+    register_as 'LaTeX'
     set_formatter :format_inlatex
     self.label_mode = :once
 
-    attr_reader   :content_type
+    attr_reader :content_type
 
     def setup(region)
         super
@@ -453,7 +448,7 @@ class Deplate::Regions::Inlatex < Deplate::Region
             log("Cannot attach caption to a LaTeX fragment marked as inline", :error)
         elsif @content_type == "table"
             register_table
-        else
+        elsif @content_type == "fig"
             register_figure
         end
     end
@@ -471,7 +466,7 @@ class Deplate::Regions::Img < Deplate::Region
     
     def finish
         finish_accum
-        nt = @regNote.split(/ /)
+        nt = (@args['cmd'] || (!@regNote.empty? && @regNote) || @deplate.variables['imgCmd'] || '').split(/ /)
         @prg = nt[0]
         @cmdLineArgs = nt[1..-1]
         unless @prg
@@ -493,40 +488,61 @@ class Deplate::Regions::Img < Deplate::Region
     end
 
     def img
-        id  = @args["id"]
-        unless id
-            @@ImgAutoN += 1
-            id = @deplate.auxiliary_auto_filename('img', @@ImgAutoN, @accum)
-        end
-        sfx = @args["sfx"] || suffix
-        src = "#{id}.#{@prg}"
-        out = "#{id}.#{sfx}"
-        pwd = Dir.pwd
-        d   = @deplate.dest ? File.dirname(@deplate.dest) : "."
-        i   = nil
-        @deplate.in_working_dir do
-            accum = prepare(@accum, out, sfx)
-            if Deplate::Region.check_file(self, out, src, accum)
-                log(["Files exist! Using", out], :anyway)
-            else
-                unless @deplate.options.force
-                    for f in [src]
-                        if File.exist?(f)
-                            raise "Please delete '#{f}' or change the id before proceeding"
+        formatter_handler = "img_#@prg"
+        if @deplate.formatter.respond_to?(formatter_handler)
+
+            rv = Deplate::Element::PseudoElement.new(@deplate, @source, self) do |invoker|
+                @deplate.formatter.send(formatter_handler, self, @accum)
+            end
+
+            class << rv
+                def register_caption
+                    @container.register_caption
+                end
+
+                def set_caption(*args)
+                    @container.set_caption(*args)
+                end
+            end
+
+        else
+
+            id  = @args["id"]
+            unless id
+                @@ImgAutoN += 1
+                id = @deplate.auxiliary_auto_filename('img', @@ImgAutoN, @accum)
+            end
+            sfx = @args["sfx"] || suffix
+            src = "#{id}.#{@prg}"
+            out = "#{id}.#{sfx}"
+            pwd = Dir.pwd
+            d   = @deplate.dest ? File.dirname(@deplate.dest) : "."
+            rv  = nil
+            @deplate.in_working_dir do
+                accum = prepare(@accum, out, sfx)
+                if Deplate::Region.check_file(self, out, src, accum)
+                    log(["Files exist! Using", out], :anyway)
+                else
+                    unless @deplate.options.force
+                        for f in [src]
+                            if File.exist?(f)
+                                raise "Please delete '#{f}' or change the id before proceeding"
+                            end
                         end
                     end
+                    Deplate::External.write_file(self, src) {|io| io.puts(accum.join("\n"))}
+                    run(src, out, sfx)
+                end
+                if block_given?
+                    rv = yield(id, out)
+                else
+                    rv = Deplate::Command::IMG.new(@deplate, @source, out, @match, @args, "IMG")
+                    rv.finish
                 end
-                Deplate::External.write_file(self, src) {|io| io.puts(accum.join("\n"))}
-                run(src, out, sfx)
-            end
-            if block_given?
-                i = yield(id, out)
-            else
-                i = Deplate::Command::IMG.new(@deplate, @source, out, @match, @args, "IMG")
-                i.finish
             end
         end
-        return i
+        return rv
+
     end
 
     def suffix
@@ -850,11 +866,17 @@ class Deplate::Regions::R < Deplate::Region
 
     def finish
         finish_accum
-        begin
-            return do_R
-        rescue StandardError => e
-            log(["Program call failed", e, e.backtrace[0..10]], :error)
-            return nil
+        if @deplate.formatter.respond_to?(:region_R)
+            return Deplate::Element::PseudoElement.new(@deplate, @source, self) do |invoker|
+                @deplate.formatter.send(:region_R, self, @accum)
+            end
+        else
+            begin
+                return do_R
+            rescue StandardError => e
+                log(["Program call failed", e, e.backtrace[0..10]], :error)
+                return nil
+            end
         end
     end
 
@@ -873,7 +895,7 @@ class Deplate::Regions::R < Deplate::Region
         case @regNote.strip
         when "xtable"
             rOut = do_xtable(r, out)
-        when "drop"
+        when "drop", "swallow"
             rOut = do_drop(r, out)
         when "verb", "verbatim"
             rOut = do_verbatim(r, out)
@@ -1204,6 +1226,7 @@ end
 class Deplate::Regions::Swallow < Deplate::Region
     register_as 'Swallow'
     register_as 'Skip'
+    register_as 'Drop'
 
     def finish
         finish_accum

data/lib/deplate/skeletons.rb

@@ -1,9 +1,10 @@
+# encoding: ASCII
 # skeletons.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     28-Apr-2006.
-# @Last Change: 2007-02-24.
-# @Revision:    0.149
+# @Last Change: 2009-02-02.
+# @Revision:    0.151
 
 # Skeletons: 
 class Deplate::SkeletonExpander <  Deplate::CommonObject

data/lib/deplate/structured.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # structured.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     17-M�r-2004.
-# @Last Change: 2007-07-01.
-# @Revision:    0.2740
+# @Last Change: 2009-02-05.
+# @Revision:    0.2753
 # 
 # TODO:
 # - am Ende des Dokuments muss ein Stapel mit offenen tags abgearbeitet werden
@@ -191,7 +192,7 @@ class Deplate::Formatter::Structured < Deplate::Formatter
 
     def_abstract :get_figure_caption, :get_figure
 
-    def include_image(invoker, file, args, inline=false)
+    def include_image_general(invoker, file, args, inline=false)
         f    = File.basename(file, '*')
         file = use_image_filename(file, args)
         return get_image(args, file, f, inline)
@@ -282,7 +283,6 @@ class Deplate::Formatter::Structured < Deplate::Formatter
         acc = []
         acc << close_headings(invoker.level)
         acc << format_heading_open(invoker)
-        @deplate.options.headings = [] unless @deplate.options.headings
         @deplate.options.headings << invoker
         join_blocks(acc)
     end
@@ -581,11 +581,11 @@ class Deplate::Formatter::Structured < Deplate::Formatter
             y = e[:year]
             p = e[:pages] ? ": %s" % e[:pages] : ""
             if a and y
-                m = "%s %s" % [a, y]
+                m = "%s %s" % [a.join(', '), y].flatten
             else
                 m = a || y
             end
-            acc << [n, m, p].join
+            acc << [n, m, p].flatten.join
         end
         acc.join("; ")
     end
@@ -630,7 +630,7 @@ class Deplate::Formatter::Structured < Deplate::Formatter
             ee = bibdef[e]
             if ee
                 ee = simple_latex_reformat(ee)
-                ee = @deplate.parse_and_format(invoker, ee, false, [
+                ee = @deplate.parse_and_format(invoker, ee, false, :excluded => [
                                                Deplate::Particle::Macro,
                                                Deplate::Particle::CurlyBrace,
                                                Deplate::HyperLink::Extended,
@@ -666,23 +666,7 @@ class Deplate::Formatter::Structured < Deplate::Formatter
         # end
         get_heading_close(invoker.args, invoker.level)
     end
- 
-    def close_headings(level)
-        hds = @deplate.options.headings
-        if hds
-            acc = []
-            loop do
-                hd = hds.last
-                if hd and level <= hd.level
-                    acc << indent_text(format_heading_close(hd), :mult => hd.level - level)
-                    hds.pop
-                else
-                    break
-                end
-            end
-            return join_blocks(acc)
-        end
-    end
+
 
 
     ################################################ List of ... {{{1

data/lib/deplate/template.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # template.rb -- simple templates for deplate
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-Aug-2004.
-# @Last Change: 2008-07-20.
-# @Revision:    0.561
+# @Last Change: 2009-02-02.
+# @Revision:    0.563
 # 
 # Description:
 # 

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

@@ -1,8 +1,8 @@
 /* Text style: sans-serif */
 /* @Author:      Thomas Link (samul AT web.de) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 2008-07-08. */
-/* @Revision:    0.637 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.639 */
 
 body, table, div {
     /* font-family: Georgia, Bookman, Times, Serif; */

data/lib/deplate/themes/presentation.html/prelude.txt

@@ -13,7 +13,7 @@
 % #LIST plain! max=2: toc
 
 
-% 2007-01-12; @Last Change: 2008-07-06.
+% 2007-01-12; @Last Change: 2008-12-04.
 % vi: ft=viki:tw=72:ts=4
 % Local Variables:
 % End:

data/lib/deplate/themes/s5.xhtml/README.TXT

@@ -0,0 +1,2 @@
+This directory contains material based on http://meyerweb.com/eric/tools/s5/
+

data/lib/deplate/themes/s5.xhtml/templates/s5.xhtml

@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>{get: title}</title>
+<!-- metadata -->
+<meta name="generator" content="S5" />
+<meta name="version" content="S5 1.1" />
+<meta name="presdate" content="{get: date}" />
+<meta name="author" content="{get: author}" />
+<!-- configuration parameters -->
+<meta name="defaultView" content="slideshow" />
+<meta name="controlVis" content="hidden" />
+<!-- style sheet links -->
+<link rel="stylesheet" href="ui/{arg default="default": s5theme}/slides.css" type="text/css" media="projection" id="slideProj" />
+<link rel="stylesheet" href="ui/{arg default="default": s5theme}/outline.css" type="text/css" media="screen" id="outlineStyle" />
+<link rel="stylesheet" href="ui/{arg default="default": s5theme}/print.css" type="text/css" media="print" id="slidePrint" />
+<link rel="stylesheet" href="ui/{arg default="default": s5theme}/opera.css" type="text/css" media="projection" id="operaFix" />
+#PREMATTER: css
+<!-- S5 JS -->
+<script src="ui/{arg default="default": s5theme}/slides.js" type="text/javascript"></script>
+</head>
+<body>
+
+<div class="layout">
+<div id="controls"><!-- DO NOT EDIT --></div>
+<div id="currentSlide"><!-- DO NOT EDIT --></div>
+<div id="header"></div>
+<div id="footer">
+<h1>{arg: s5footer}</h1>
+<h2>{get: title}</h2>
+</div>
+</div>
+
+<div class="presentation">
+
+#BODY
+
+</div>
+
+</body>
+</html>

data/lib/deplate/themes/s5.xhtml/theme.ini

@@ -0,0 +1,11 @@
+--template=s5.xhtml
+--suffix=.html
+fmt xhtml10t
+htmlHeadingPre1=<div class="slide">
+htmlHeadingPost1=</div>
+htmlTitlePre=<div class="slide">
+htmlTitlePost=</div>
+htmlTagTitle=h1
+htmlTagAuthor=h3
+htmlTagAuthorNote=h4
+htmlTagDate=h4

data/lib/deplate/variables.rb

@@ -1,9 +1,13 @@
+# encoding: ASCII
 # variables.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     31-Dez-2005.
-# @Last Change: 2007-05-22.
-# @Revision:    0.75
+# @Last Change: 2009-02-04.
+# @Revision:    0.85
+
+require 'deplate/encoding'
+
 
 class Deplate::Variables < Hash
     attr_accessor :deplate
@@ -68,6 +72,12 @@ class Deplate::Variables < Hash
                 Deplate::Core.log(['Doc variable has wrong type', key, var.class], :error)
             end
         else
+            case name
+            when 'encoding'
+                if RUBY_VERSION >= '1.9.1'
+                    Encoding.default_external = Deplate::Encoding.ruby_enc_name(value)
+                end
+            end
             super(name, value)
         end
     end