deplate 0.8.4 → 0.8.5

data/lib/deplate/fmt/null.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # null.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: 08-Jan-2006.
-# @Revision:    0.3747
+# @Last Change: 2009-02-02.
+# @Revision:    0.3749
 
 require 'deplate/formatter'
 

data/lib/deplate/fmt/php.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # php.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: 21-Apr-2006.
-# @Revision:    0.914
+# @Last Change: 2009-02-02.
+# @Revision:    0.916
 
 require 'deplate/fmt/html'
 require 'deplate/mod/php-extra'

data/lib/deplate/fmt/phpsite.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # phpsite.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: 21-Apr-2006.
-# @Revision:    0.918
+# @Last Change: 2009-02-02.
+# @Revision:    0.920
 
 require 'deplate/fmt/htmlsite'
 require 'deplate/mod/php-extra'

data/lib/deplate/fmt/plain.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # fmt-html.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: 2008-05-14.
-# @Revision:    0.3594
+# @Last Change: 2009-02-02.
+# @Revision:    0.3597
 
 require "deplate/formatter"
 
@@ -65,7 +66,7 @@ class Deplate::Formatter::Plain < Deplate::Formatter
         end
     end
 
-    def include_image(invoker, file, args, inline=false)
+    def include_image_general(invoker, file, args, inline=false)
         file = args['file'] if args['file']
         if inline or !@deplate.variables['asciiArt']
             return "[#{args["alt"] || @deplate.variables['imgAlt'] || file}]"

data/lib/deplate/fmt/sweave.rb

@@ -0,0 +1,104 @@
+# encoding: ISO-8859-1
+#!/usr/bin/env ruby
+# @Last Change: 2009-01-17.
+# Author::      Thomas Link (micathom AT gmail com)
+# License::     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# Created::     2008-11-24.
+
+
+require 'deplate/fmt/latex.rb'
+
+
+class Deplate::Formatter::Sweave < Deplate::Formatter::LaTeX
+    self.myname = 'sweave'
+    self.rx     = /(la)?tex|sweave/i
+    self.related = ['latex']
+    self.suffix = ".Rnw"
+
+    self.latexDocClass  = 'article'
+    # self.latexVariables = ['11pt', 'a4paper']
+
+
+    def prepare
+        super
+        sweave = @deplate.variables['sweaveOpts']
+        if sweave
+            output_at(:pre, :doc_def, "\\SweaveOpts{#{sweave}}")
+        end
+        sweavePath = @deplate.variables['sweavePath']
+        if sweavePath
+            # add_package('Sweave')
+            add_package(sweavePath)
+        end
+    end
+
+
+    def img_R(invoker, body)
+        if invoker.args['noFloat']
+            pre = post = nil
+        else
+            pre = with_agent(:figure_top, String, invoker)
+            post = with_agent(:figure_bottom, String, invoker).strip
+        end
+        opts = sweave_options(invoker, 'fig=TRUE')
+        return join_blocks([pre, "<<#{opts}>>=", body, '@', post].compact)
+    end
+
+
+    def region_R(invoker, body)
+        opts = sweave_options(invoker)
+        return join_blocks(["<<#{opts}>>=", body, '@'])
+    end
+
+
+    private
+
+    def sweave_options(invoker, rest=nil)
+        opts = [invoker.args['sweave'], rest]
+        if (id = invoker.args[:id])
+            opts << "label=#{id}"
+        end
+        if invoker.args[:hide]
+            opts << 'results=hide'
+        end
+        ['print', 'echo', 'results', 'height', 'width', 'engine'].each do |arg|
+            if invoker.args.has_key?(arg)
+                opts << "#{arg}=#{sweave_value(invoker.args[arg])}"
+            end
+        end
+        if invoker.args['swallow'] or invoker.args['drop']
+            opts << 'echo=FALSE,print=FALSE,results=hide'
+        end
+        return opts.compact.join(',')
+    end
+
+
+    def sweave_value(value)
+        case value
+        when TrueClass
+            return 'TRUE'
+        when FalseClass
+            return 'FALSE'
+        else
+            return value
+        end
+    end
+
+end
+
+
+class Deplate::Macro::Sweave < Deplate::Macro::Insert
+    register_as 'sweave'
+    register_as 'r'
+
+    def setup(text)
+        super
+        @text = "\\Sexpr{#{@text}}"
+    end
+end
+
+
+
+# Local Variables:
+# revisionRx: REVISION\s\+=\s\+\'
+# End:

data/lib/deplate/fmt/template.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # template.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     25-M�r-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.21
+# @Last Change: 2009-02-02.
+# @Revision:    0.23
 #
 # = Description
 # The formatter for templates

data/lib/deplate/fmt/xhtml10t.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # fmt-xhtml.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     03-Aug-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.35
+# @Last Change: 2009-02-02.
+# @Revision:    0.48
 
 require "deplate/fmt/html"
 
@@ -37,5 +38,84 @@ class Deplate::Formatter::XHTML10transitional <  Deplate::Formatter::HTML
     def head_link_tag(text)
         return %Q{<link #{text} />}
     end
+
+    def include_image_svg(invoker, file, args, inline=false)
+        if args['include']
+
+            svg = File.read(file)
+            svg.sub!(/^.*?<\?xml .*?\?>[^<]*/, '')
+            svg.sub!(/^<!DOCTYPE .*?>[^<]*/, '')
+            return svg
+
+        else
+
+            acc  = ['type="image/svg+xml"']
+
+            file = args['file'] if args['file']
+            file = img_url(use_image_filename(file, args))
+            acc << %{data="#{file}"}
+
+            w = args['w'] || args['width']
+            acc << %{width="#{w}"} if w
+            h = args['h'] || args['heigth']
+            acc << %{height="#{h}"} if h
+
+            # b = args['border'] || '0'
+            # acc << %{border="#{b}"}
+
+            # # f = file[0..-(File.extname(file).size + 1)]
+            # alt = args['alt']
+            # if alt
+            #     alt.gsub!(/[\\"&<>]/) do |s|
+            #         case s
+            #         when '\\'
+            #             ''
+            #         else
+            #             plain_text(s).gsub(/\\([0-9&`'+])/, '\\1')
+            #         end
+            #     end
+            # else
+            #     alt = File.basename(file, '.*')
+            # end
+            # acc << %{alt="#{alt}"}
+
+            style = args['style']
+            if style
+                style = Deplate::Core.split_list(style, ',', '; ', invoker.source)
+            else
+                style = []
+            end
+            style << (inline ? 'inline' : 'figure')
+            acc << %{class="#{class_attr(style)}"}
+
+            img_id = args['id']
+            unless img_id
+                fbase  = Deplate::Core.clean_name(File.basename(fbase || 'imgid'))
+                img_id = @deplate.auto_numbered(fbase, :inc => 1, :fmt => %{#{fbase}_%s})
+            end
+            acc << %{id="#{img_id}" name="#{img_id}"}
+
+            # hi = args['hi']
+            # if hi
+            #     case hi
+            #     when String
+            #         hi_img = img_url(use_image_filename(hi, args))
+            #     else
+            #         hi_img = [File.dirname(file), %{hi-#{File.basename(file)}}]
+            #         hi_img = File.join(hi_img.compact)
+            #     end
+            #     
+            #     setup_highlight_image
+            #     acc << %{onMouseover="HighlightImage('%s', '%s')" onMouseout="HighlightImage('%s', '%s')"} % [
+            #         img_id, img_url(hi_img, args), 
+            #         img_id, file
+            #     ]
+            # end
+
+            return %{<object #{acc.join(' ')} ></object>}
+
+        end
+    end
+
 end
 

data/lib/deplate/fmt/xhtml11m.rb

@@ -1,9 +1,10 @@
+# encoding: ASCII
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     2008-04-14.
-# @Last Change: 2008-04-14.
-# @Revision:    0.42
+# @Last Change: 2009-02-02.
+# @Revision:    0.44
 
 require "deplate/fmt/xhtml10t"
 

data/lib/deplate/formatter-snippet.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # formatter-snippet.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     11-Aug-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.3
+# @Last Change: 2009-02-02.
+# @Revision:    0.5
 
 module Deplate::Snippet
     def formatter_initialize_snippet

data/lib/deplate/formatter.rb

@@ -1,13 +1,15 @@
+# encoding: ASCII
 # formatter.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     31-Okt-2004.
-# @Last Change: 2008-07-10.
-# @Revision:    0.2017
+# @Last Change: 2009-02-05.
+# @Revision:    0.2062
 
 require 'deplate/abstract-class'
 require 'deplate/common'
+require 'deplate/encoding'
 require 'strscan'
 
 # Description:
@@ -98,7 +100,7 @@ class Deplate::Formatter < Deplate::CommonObject
                 elsif file.nil?
                     options.out = '-'
                 else
-                    options.out = Deplate::Core.get_out_fullname(file, options.suffix, options)
+                    options.out = Deplate::Core.get_out_fullname(file, options.suffix, options, :raw => true)
                 end
             end
             options
@@ -254,22 +256,7 @@ class Deplate::Formatter < Deplate::CommonObject
     end
 
     def canonic_enc_name(enc, table=@encodings)
-        case enc.downcase
-        when 'latin-1', 'latin1', 'l1', 'isolat1', 'iso-8859-1'
-            cen = 'latin1'
-        when 'latin-9', 'latin9', 'l9', 'isolat9', 'iso-8859-15'
-            cen = 'latin9'
-        when 'gb2312', 'gbk'
-            cen = 'gb2312'
-        when 'koi8-r'
-            cen = 'koi8-r'
-        when 'utf8', 'utf-8'
-            cen = 'utf-8'
-        else
-            log(['Unsupported encoding', enc], :anyway)
-            cen = enc
-        end
-        return table[cen] || cen
+        Deplate::Encoding.canonic_enc_name(enc, table)
     end
     
     def output_destination
@@ -445,6 +432,8 @@ class Deplate::Formatter < Deplate::CommonObject
                 else
                     r = @special_symbols[e]
                     case r
+                    when :identity
+                        acc << e
                     when String
                         acc << r
                     when Proc
@@ -549,10 +538,10 @@ class Deplate::Formatter < Deplate::CommonObject
         @symbol_proxy.nonbreakingspace(invoker)
     end
 
-    def symbol_paragraph(invoker)
-        check_symbol_proxy
-        @symbol_proxy.symbol_paragraph(invoker)
-    end
+    # def symbol_paragraph(invoker)
+    #     check_symbol_proxy
+    #     @symbol_proxy.symbol_paragraph(invoker)
+    # end
 
     def format_symbol(invoker, sym)
         check_symbol_proxy
@@ -716,9 +705,166 @@ class Deplate::Formatter < Deplate::CommonObject
         return %{#{plain_text("{")}#{invoker.elt}#{plain_text("}")}}
     end
 
+    def format_heading_close(invoker)
+    end
+ 
+    def close_headings(level, &block)
+        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)
+                    if block
+                        acc << block.call(hd.level)
+                    end
+                    hds.pop
+                else
+                    break
+                end
+            end
+            if acc.empty?
+                return nil
+            else
+                return join_blocks(acc)
+            end
+        end
+    end
+
+
+    def canonic_mime(type)
+        case type
+        when 'image/cgm'
+        when 'image/g3fax'
+        when 'image/gif', 'gif'
+            return 'image/gif'
+        when 'image/ief', 'ief'
+        when 'image/jpeg', 'jpeg', 'jpg', 'jpe'
+            return 'image/jpeg'
+        when 'image/naplps'
+        when 'image/pcx', 'pcx'
+        when 'image/png', 'png'
+            return 'image/png'
+        when 'image/prs.btif'
+        when 'image/prs.pti'
+        when 'image/svg'+'xml', 'svg', 'svgz'
+            return 'image/svg+xml'
+        when 'image/tiff', 'tiff', 'tif'
+            return 'image/tiff'
+        when 'image/vnd.cns.inf2'
+        when 'image/vnd.djvu', 'djvu', 'djv'
+        when 'image/vnd.dwg'
+        when 'image/vnd.dxf'
+        when 'image/vnd.fastbidsheet'
+        when 'image/vnd.fpx'
+        when 'image/vnd.fst'
+        when 'image/vnd.fujixerox.edmics-mmr'
+        when 'image/vnd.fujixerox.edmics-rlc'
+        when 'image/vnd.mix'
+        when 'image/vnd.net-fpx'
+        when 'image/vnd.svf'
+        when 'image/vnd.wap.wbmp', 'wbmp'
+        when 'image/vnd.xiff'
+        when 'image/x-cmu-raster', 'ras'
+        when 'image/x-coreldraw', 'cdr'
+        when 'image/x-coreldrawpattern', 'pat'
+        when 'image/x-coreldrawtemplate', 'cdt'
+        when 'image/x-corelphotopaint', 'cpt'
+        when 'image/x-icon', 'ico'
+        when 'image/x-jg', 'art'
+        when 'image/x-jng', 'jng'
+        when 'image/x-ms-bmp', 'bmp'
+            return 'image/x-ms-bmp'
+        when 'image/x-photoshop', 'psd'
+        when 'image/x-portable-anymap', 'pnm'
+        when 'image/x-portable-bitmap', 'pbm'
+        when 'image/x-portable-graymap', 'pgm'
+        when 'image/x-portable-pixmap', 'ppm'
+        when 'image/x-rgb', 'rgb'
+        when 'image/x-xbitmap', 'xbm'
+        when 'image/x-xpixmap', 'xpm'
+        when 'image/x-xwindowdump', 'xwd'
+            # wmf
+            # ps, eps
+            # pdf
+        end
+    end
+
+
+    def canonic_image_type(type)
+        case type
+        when 'image/cgm'
+        when 'image/g3fax'
+        when 'image/gif', 'gif'
+            return 'gif'
+        when 'image/ief', 'ief'
+        when 'image/jpeg', 'jpeg', 'jpg', 'jpe'
+            return 'jpg'
+        when 'image/naplps'
+        when 'image/pcx', 'pcx'
+        when 'image/png', 'png'
+            return 'png'
+        when 'image/prs.btif'
+        when 'image/prs.pti'
+        when 'image/svg'+'xml', 'svg', 'svgz'
+            return 'svg'
+        when 'image/tiff', 'tiff', 'tif'
+            return 'tif'
+        when 'image/vnd.cns.inf2'
+        when 'image/vnd.djvu', 'djvu', 'djv'
+        when 'image/vnd.dwg'
+        when 'image/vnd.dxf'
+        when 'image/vnd.fastbidsheet'
+        when 'image/vnd.fpx'
+        when 'image/vnd.fst'
+        when 'image/vnd.fujixerox.edmics-mmr'
+        when 'image/vnd.fujixerox.edmics-rlc'
+        when 'image/vnd.mix'
+        when 'image/vnd.net-fpx'
+        when 'image/vnd.svf'
+        when 'image/vnd.wap.wbmp', 'wbmp'
+        when 'image/vnd.xiff'
+        when 'image/x-cmu-raster', 'ras'
+        when 'image/x-coreldraw', 'cdr'
+        when 'image/x-coreldrawpattern', 'pat'
+        when 'image/x-coreldrawtemplate', 'cdt'
+        when 'image/x-corelphotopaint', 'cpt'
+        when 'image/x-icon', 'ico'
+        when 'image/x-jg', 'art'
+        when 'image/x-jng', 'jng'
+        when 'image/x-ms-bmp', 'bmp'
+            return 'bmp'
+        when 'image/x-photoshop', 'psd'
+        when 'image/x-portable-anymap', 'pnm'
+        when 'image/x-portable-bitmap', 'pbm'
+        when 'image/x-portable-graymap', 'pgm'
+        when 'image/x-portable-pixmap', 'ppm'
+        when 'image/x-rgb', 'rgb'
+        when 'image/x-xbitmap', 'xbm'
+        when 'image/x-xpixmap', 'xpm'
+        when 'image/x-xwindowdump', 'xwd'
+            # wmf
+            # ps, eps
+            # pdf
+        end
+    end
+
+
+    def include_image(invoker, file, args, *other_args)
+        type = args['type'] || File.extname(file).sub(/^\./, '')
+        type = canonic_image_type(type)
+        meth = "include_image_#{type}"
+        if respond_to?(meth)
+            return send(meth, invoker, file, args, *other_args)
+        else
+            include_image_general(invoker, file, args, *other_args)
+        end
+    end
+
 
     ### General
-    def_abstract :format_label, :format_figure, :include_image, :image_suffixes
+    def_abstract :format_label, :format_figure, :include_image_general, :image_suffixes
     
     ### Elements
     def_abstract :format_note, :format_table, :format_heading, :format_list, 
@@ -804,7 +950,7 @@ class Deplate::Formatter < Deplate::CommonObject
         break_at   = args[:break_at]
         acc = []
         rx = /(\n|[[:space:]#{break_at}]+)/
-        text.each do |text|
+        text.each_line do |text|
             # if text.kind_of?(Array)
             #     log("We shouldn't be here. If you can track down when this happens, please send an example to the author.", :error)
             #     puts caller[0..10].join("\n")
@@ -1145,7 +1291,8 @@ class Deplate::Formatter < Deplate::CommonObject
             shift   = args[:shift]
             hanging = args[:hanging]
             indent  = args[:indent] || format_indent(mult, shift)
-            return text.collect do |l|
+            acc = []
+            text.each_line do |l|
                 rv = '%s%s' % [indent, l.chomp]
                 if hanging
                     indent = args[:indenttail] || \
@@ -1162,8 +1309,9 @@ class Deplate::Formatter < Deplate::CommonObject
                         end
                     hanging = false
                 end
-                rv
-            end.join("\n")
+                acc << rv
+            end
+            return acc.join("\n")
         end
     end
 
@@ -1220,12 +1368,38 @@ class Deplate::Formatter < Deplate::CommonObject
     end
 
 
-    private
+    protected
     def initialize_services
         services = {}
         return services
     end
 
+    # def clean_tags(text)
+    #     if text
+    #         t = text.gsub(/\<[^>]*?\>/, '')
+    #         t.gsub!(/^\s*$/, '')
+    #         t.gsub!(/^\n\s*/, '')
+    #         t.gsub!(/\n\s*$/, '')
+    #         t
+    #     end
+    # end
+
+    def clean_tags(text, *tags)
+        if text
+            if tags.empty?
+                t = text.gsub(/\<[^>]*?\>/, '')
+            else
+                # tags = tags.empty? ? '\w+' : tags.join('|')
+                tags = tags.join('|')
+                t = text.gsub(/<(#{tags}).*?\/>|<(#{tags}).*?>.*?<\/\1>/, '')
+            end
+            t.gsub!(/^\s*$/, '')
+            t.gsub!(/^\n\s*/, '')
+            t.gsub!(/\n\s*$/, '')
+            t
+        end
+    end
+
     def format_custom_list(invoker, elt)
         listing = @deplate.options.listings.get(elt, true)
         props   = listing[:props]