deplate 0.8 → 0.8.1

data/lib/deplate/metadata.rb

@@ -1,5 +1,5 @@
 # metadata.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     15-Aug-2005.

data/lib/deplate/metadata/marshal.rb

@@ -1,5 +1,5 @@
 # yaml.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     20-M�r-2005.

data/lib/deplate/metadata/xml.rb

@@ -1,5 +1,5 @@
 # xml.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     20-M�r-2005.

data/lib/deplate/metadata/yaml.rb

@@ -1,5 +1,5 @@
 # yaml.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     20-M�r-2005.

data/lib/deplate/mod/anyword.rb

@@ -1,15 +1,15 @@
 # anyword.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     11-Sep-2004.
-# @Last Change: 12-Nov-2005.
-# @Revision:    0.94
+# @Last Change: 2007-06-30.
+# @Revision:    0.96
 
 class Deplate::Core
     def module_initialize_anyword
         list = @variables["anyword_list"]
-        acc  = list ? list.split(/\s*,\s*/) : []
+        acc  = list ? Deplate::Core.split_list(list, ',', ';') : []
 
         cat  = @variables["anyword_catalog"]
         if cat

data/lib/deplate/mod/babelfish.rb

@@ -1,5 +1,5 @@
 # babelfish.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     05-Sep-2004.

data/lib/deplate/mod/code-gvim.rb

@@ -1,10 +1,10 @@
 # code-gvim.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     26-Feb-2005.
-# @Last Change: 23-Dez-2005.
-# @Revision:    0.97
+# @Last Change: 2007-08-28.
+# @Revision:    0.106
 # 
 # = Description
 # This module provides a specialized syntax highlighter using gvim. Adds 
@@ -18,15 +18,20 @@ require 'fileutils'
 require 'tmpdir'
 
 class Deplate::Regions::Code
-    add_highlighter(nil, "html",       :gvim_to_html)
-    add_highlighter(nil, "htmlslides", :gvim_to_html)
-    add_highlighter(nil, "htmlsite",   :gvim_to_html)
+    add_highlighter(nil, 'html',         :gvim_to_html)
+    add_highlighter(nil, 'htmlslides',   :gvim_to_html)
+    add_highlighter(nil, 'htmlsite',     :gvim_to_html)
+    add_highlighter(nil, 'html-snippet', :gvim_to_html)
+    add_highlighter(nil, 'xhtml10t',     :gvim_to_html)
+    add_highlighter(nil, 'php',          :gvim_to_html)
+    add_highlighter(nil, 'phpsite',      :gvim_to_html)
     
     def gvim_to_html(syntax, style, text)
         unless @deplate.allow_external
             return
         end
-        gvim = %{#{Deplate::External.get_app('gvim')} -f +"syn on" +"let use_xhtml = 1" +"setf #{syntax}" +"colorscheme #{style || "default"}" +"run! syntax/2html.vim" +"wq" +"q" deplateGvim}
+        gvim = %{#{Deplate::External.get_app('gvim')} -f +"syn on" +"let use_xhtml = 1" +"set ft=#{syntax}" +"colorscheme #{style || "default"}" +"run! syntax/2html.vim" +"wq" +"q" deplateGvim}
+        # p "DBG #{gvim}"
         @deplate.in_working_dir(Dir.tmpdir) do
             FileUtils.rm("deplateGvim.html") if File.exist?("deplateGvim.html")
             Deplate::External.write_file(self, "deplateGvim") {|io| io.puts(text)}
@@ -45,7 +50,8 @@ class Deplate::Regions::Code
                     end
                 end
                 rv << %{</div>}
-                return rv.join("\n")
+                # return rv.join("\n")
+                return rv
             else
                 log("Error when running gvim", :error)
             end

data/lib/deplate/mod/code-gvim71.rb

@@ -0,0 +1,52 @@
+# code-gvim.rb
+# @Author:      Thomas Link (micathom AT gmail com)
+# @Website:     http://deplate.sf.net/
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     26-Feb-2005.
+# @Last Change: 2007-08-28.
+# @Revision:    0.109
+# 
+# = Description
+# This module provides a specialized syntax highlighter using gvim. Adds 
+# Deplate::Regions::Code#gvim_to_html.
+# 
+# = Usage
+# = TODO
+# = CHANGES
+
+require 'fileutils'
+require 'tmpdir'
+require 'hpricot'
+
+class Deplate::Regions::Code
+    add_highlighter(nil, 'html',         :gvim_to_html)
+    add_highlighter(nil, 'htmlslides',   :gvim_to_html)
+    add_highlighter(nil, 'htmlsite',     :gvim_to_html)
+    add_highlighter(nil, 'html-snippet', :gvim_to_html)
+    add_highlighter(nil, 'xhtml10t',     :gvim_to_html)
+    add_highlighter(nil, 'php',          :gvim_to_html)
+    add_highlighter(nil, 'phpsite',      :gvim_to_html)
+    
+    def gvim_to_html(syntax, style, text)
+        unless @deplate.allow_external
+            return
+        end
+        gvim = %{#{Deplate::External.get_app('gvim')} -f +"syn on" +"let use_xhtml = 1" +"set ft=#{syntax}" +"colorscheme #{style || "default"}" +"run! syntax/2html.vim" +"wq" +"q" deplateGvim}
+        # p "DBG #{gvim}"
+        @deplate.in_working_dir(Dir.tmpdir) do
+            FileUtils.rm("deplateGvim.html") if File.exist?("deplateGvim.html")
+            Deplate::External.write_file(self, "deplateGvim") {|io| io.puts(text)}
+            IO.popen(gvim) {|io| puts io.gets until io.eof }
+            if File.exist?("deplateGvim.html")
+                html = File.read('deplateGvim.html')
+                doc  = Hpricot(html).at('body')
+                doc  = doc.inner_html
+                return [%{<div class="code">\n#{doc}\n</div>}]
+            else
+                log("Error when running gvim", :error)
+            end
+        end
+        return nil
+    end
+end
+

data/lib/deplate/mod/code-highlight.rb

@@ -1,10 +1,10 @@
 # code-highlight.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     27-Feb-2005.
-# @Last Change: 23-Dez-2005.
-# @Revision:    0.42
+# @Last Change: 2007-09-30.
+# @Revision:    0.65
 #
 # = Description
 # Highlight code regions using Andr� Simon's 
@@ -29,10 +29,15 @@ class Deplate::Formatter::LaTeX
 end
 
 class Deplate::Regions::Code
-    add_highlighter(nil, "html",       :highlight)
-    add_highlighter(nil, "htmlslides", :highlight)
-    add_highlighter(nil, "xhtml",      :highlight)
-    add_highlighter(nil, "latex",      :highlight)
+    add_highlighter(nil, 'html',          :highlight)
+    add_highlighter(nil, 'htmlslides',    :highlight)
+    add_highlighter(nil, 'htmlsite',      :highlight)
+    add_highlighter(nil, 'html-snippet',  :highlight)
+    add_highlighter(nil, 'php',           :highlight)
+    add_highlighter(nil, 'phpsite',       :highlight)
+    add_highlighter(nil, 'xhtml10t',      :highlight)
+    add_highlighter(nil, 'latex',         :highlight)
+    add_highlighter(nil, 'latex-snippet', :highlight)
 
     class << self
         def get_style_ext(style)
@@ -46,44 +51,55 @@ class Deplate::Regions::Code
         end
         formatter = @deplate.formatter
         style_ext = Deplate::Regions::Code::get_style_ext(style)
-        if defined?(Deplate::Formatter::XHTML10transitional) and formatter.kind_of?(Deplate::Formatter::XHTML10transitional)
+        args      = []
+        # if defined?(Deplate::Formatter::XHTML10transitional) and formatter.kind_of?(Deplate::Formatter::XHTML10transitional)
+        if formatter.formatter_related?('xhtml')
             mode      = :xhtml
-            args      = "--xhtml"
+            args      << "--xhtml"
             style_out = "highlight#{style_ext}.css"
-        elsif defined?(Deplate::Formatter::HTML) and formatter.kind_of?(Deplate::Formatter::HTML)
+        # elsif defined?(Deplate::Formatter::HTML) and formatter.kind_of?(Deplate::Formatter::HTML)
+        elsif formatter.formatter_related?('html')
             mode      = :html
-            args      = "--css-outfile=highlight#{style_ext}.css"
+            # args      << "--css-outfile=highlight#{style_ext}.css"
+            # args      << "--style-outfile=highlight#{style_ext}.css"
             style_out = "highlight#{style_ext}.css"
             css       = formatter.head_link_tag(%{rel="stylesheet" type="text/css" href="#{style_out}"})
             log(["Code: You need to copy highlight's style definition", "highlight#{style_ext}.css"], :anyway)
             @postponed_format << Proc.new do |container|
                 container.deplate.formatter.union_at(:pre, :css, css)
             end
-        elsif defined?(Deplate::Formatter::LaTeX) and formatter.kind_of?(Deplate::Formatter::LaTeX)
+        # elsif defined?(Deplate::Formatter::LaTeX) and formatter.kind_of?(Deplate::Formatter::LaTeX)
+        elsif formatter.formatter_related?('latex')
             mode      = :latex
-            args      = "--latex"
+            args      << "--latex"
+            if @deplate.options.messages.prop('lang', formatter) == 'german'
+                args << '-r'
+            end
             style_out = "highlight#{style_ext}.sty"
             log(["Code: You need to copy highlight's style definition", "highlight#{style_ext}.sty"], :anyway)
-        elsif defined?(Deplate::Formatter::Docbook) and formatter.kind_of?(Deplate::Formatter::Docbook)
-            log("Code: ''highlight'' doesn't support docbook!", :error)
+        # elsif defined?(Deplate::Formatter::Docbook) and formatter.kind_of?(Deplate::Formatter::Docbook)
+        elsif formatter.formatter_related?('dbk')
+            log("Code: 'highlight' doesn't support docbook!", :error)
             return nil
         else
-            log("Code: ''highlight'' can't create output for this formatter!", :error)
+            log("Code: 'highlight' cannot create output for this formatter!", :error)
             return nil
         end
         if style
             style = %{--style=#{style}}
         end
         tw  = @deplate.variables["tabwidth"] || 4
-        cmd = "#{Deplate::External.get_app('highlight')} --fragment --wrap --replace-tabs=#{tw} --syntax #{syntax} --style-outfile=#{style_out} #{style} #{args}"
+        cmd = "#{Deplate::External.get_app('highlight')} --fragment --wrap --replace-tabs=#{tw} --syntax #{syntax} --style-outfile=#{style_out} #{style} #{args.join(' ')}"
         Deplate::External.log_popen(self, cmd) do |io|
             io.puts(text)
             io.close_write
-            text = io.read
+            # text = io.read
+            text = io.readlines.collect {|l| l.chomp}
         end
         case mode
         when :html, :xhtml
-            text = [%{<div class="code">}, "<pre>", text, "</pre>", %{</div>}].join
+            # text = [%{<div class="code">}, "<pre>", text, "</pre>", %{</div>}].join
+            text = [%{<div class="code">}, "<pre>", text, "</pre>", %{</div>}]
         end
         return text
     end

data/lib/deplate/mod/colored-log.rb

@@ -1,5 +1,5 @@
 # colored-log.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     05-Mai-2005.

data/lib/deplate/mod/endnotes.rb

@@ -1,5 +1,5 @@
 # endnotes.rb -- display endnotes instead of footnotes
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     20-Aug-2004.

data/lib/deplate/mod/guesslanguage.rb

@@ -0,0 +1,75 @@
+# guesslanguage.rb
+# @Author:      Thomas Link (micathom AT gmail com)
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     2006-12-29.
+# @Last Change: 2007-09-29.
+# @Revision:    0.1.72
+
+require 'deplate/guesslanguage'
+
+class Deplate::Core
+    def deplate_initialize_guesslanguage
+        @options.guesslanguage = Guesslanguage.new
+        @options.guesslanguage_once = false
+        @options.guesslanguage_collected = {}
+        for dir in Deplate::Core.library_directories(true, 'locale')
+            for file in Dir[File.join(dir, '*_data')]
+                lang = File.basename(file, '.*')
+                text = File.read(file)
+                @options.guesslanguage.register(lang, text)
+                log(['Guesslanguage', lang, file])
+            end
+        end
+    end
+
+    def guesslanguage(text)
+        unless text.empty? or @formatter.kind_of?(Deplate::Formatter::Template)
+            text0 = text.gsub(/^\s*#.*$|^\s*%.*$|\{.*?\}/, '')
+            if text0 =~ /\w/
+                diff, lang = @options.guesslanguage.guess_with_diff(text0)
+                if lang
+                    lang0 = @options.guesslanguage_collected[:best]
+                    diff0 = lang0 ? @options.guesslanguage_collected[lang0] : nil
+                    if !diff0 or diff < diff0
+                        log(['Guesslanguage: Switch to', lang])
+                        if lang0 and lang0 != lang
+                            log(['Guesslanguage: Possible conflict', lang, '%1.2f' % diff, lang0, '%1.2f' % diff0], :anyway)
+                        end
+                        @options.guesslanguage_collected[:best] = lang
+                        @options.guesslanguage_collected[lang] = diff
+                        @options.guesslanguage_once = true
+                        set_lang(lang)
+                    else
+                        if lang != lang0
+                            log(['Guesslanguage: Ignore switch', lang, '%1.2f' % diff, lang0, '%1.2f' % diff0])
+                            log(text, :debug)
+                            # p "DBG", text, text0
+                        end
+                    end
+                end
+            end
+        end
+    end
+
+    alias :guesslanguage_include_each :include_each
+    def include_each(enum, array, sourcename=nil)
+        case enum
+        when Array
+            enum = enum.join("\n")
+        end
+        rv = nil
+        lang = @@message_object.prop('lang')
+        begin
+            guesslanguage(enum) unless @options.guesslanguage_once
+            rv = guesslanguage_include_each(enum, array, sourcename)
+        ensure
+            # TBD: Temporarily switch languages
+            # if lang != @@message_object.prop('lang')
+            #     log(['Guesslanguage: Switch to', lang])
+            #     set_lang(lang)
+            # end
+        end
+        return rv
+    end
+end
+

data/lib/deplate/mod/html-asciimath.rb

@@ -1,5 +1,5 @@
 # html-asciimath.rb -- Support for asciimath.js
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     30-Dez-2004.

data/lib/deplate/mod/html-deplate-button.rb

@@ -1,5 +1,5 @@
 # html-deplate-button.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     05-Sep-2004.

data/lib/deplate/mod/html-headings-navbar.rb

@@ -1,5 +1,5 @@
 # html-headings-navbar.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     15-Nov-2004.

data/lib/deplate/mod/html-highstep.rb

@@ -0,0 +1,43 @@
+# html-highstep.rb
+# @Author:      Thomas Link (micathom AT gmail com)
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     2007-01-06.
+# @Last Change: 2007-01-12.
+# @Revision:    0.31
+#
+# = Description
+# Provide the macro ''step'' to mark text for stepwise highlighting.
+
+class Deplate::Macro::HighStep < Deplate::Macro::FormattedText
+    attr_reader :step_index
+    register_as 'step'
+    def setup(text)
+        @step_index = @deplate.formatter.stepwise_next
+        super
+    end
+    def process
+        format_particle(:format_highstep, self, super)
+    end
+end
+
+class Deplate::Formatter
+    def format_highstep(invoker, txt=nil)
+        format_emphasize(invoker, txt)
+    end
+end
+
+class Deplate::Formatter::HTML
+    def format_highstep(invoker, txt=nil)
+        txt ||= invoker.elt || invoker.text
+        idx = invoker.step_index
+        beg = (@variables['stepwiseBegin'] || '0').to_i
+        cls = (beg == 0 or idx > beg) ? 'steppreview' : 'stephighlight'
+        args = {
+            # 'style' => "visibility:#{vis};"
+            'class' => cls,
+            'id' => "HighStep#{idx}",
+        }
+        inline_tag(invoker, 'span', txt, args)
+    end
+end
+

data/lib/deplate/mod/html-jsmath.rb

@@ -1,5 +1,5 @@
 # html-jsmath.rb -- Support for jsmath.js
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     30-Dez-2004.

data/lib/deplate/mod/html-obfuscate-email.rb

@@ -1,5 +1,5 @@
 # html-obfuscate-email.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     13-Jul-2005.

data/lib/deplate/mod/html-sidebar.rb

@@ -1,5 +1,5 @@
 # mod-html-sidebar.rb -- A popup-mini-toc for html output
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     19-Jul-2004.

data/lib/deplate/mod/iconv.rb

@@ -1,5 +1,5 @@
 # iconv.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     11-Apr-2005.