deplate 0.8.1 → 0.8.2

data/lib/deplate/macros.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     25-M�r-2004.
-# @Last Change: 2007-09-30.
-# @Revision:    0.1351
+# @Last Change: 2008-04-14.
+# @Revision:    0.1354
 
 require 'forwardable'
 
@@ -113,7 +113,7 @@ class Deplate::Macro::Unknown < Deplate::Macro
     def setup(text)
         text = @args[:match][0][1..-2]
         # @elt = plain_text(text)
-        @elt = @deplate.parse(@container, text, @alt, nil, :pcontainer => self)
+        @elt = @deplate.parse(@container, text, @alt, :pcontainer => self)
     end
     
     def process
@@ -254,7 +254,7 @@ class Deplate::Macro::Arg < Deplate::Argument
             end
             @text = Deplate::Core.escape_characters(@text, @args)
             if !@args['asString']
-                @elt = @deplate.parse(@container, @text, @alt, nil, :pcontainer => self)
+                @elt = @deplate.parse(@container, @text, @alt, :pcontainer => self)
             end
         end
     end
@@ -270,7 +270,7 @@ class Deplate::Macro::XArg < Deplate::Argument
         c = @deplate.variables[text] || @args["default"]
         if c
             c = Deplate::Core.escape_characters(c, @args)
-            @elt  = @deplate.parse(@container, c, @alt, nil, :pcontainer => self)
+            @elt  = @deplate.parse(@container, c, @alt, :pcontainer => self)
         else
             log(["Unknown variable", '{xarg}', text])
         end
@@ -293,7 +293,7 @@ class Deplate::Macro::Msg < Deplate::Macro
     register_as 'msg'
 
     def setup(text)
-        @elt  = @deplate.parse(@container, @deplate.msg(text), @alt, nil, :pcontainer => self)
+        @elt  = @deplate.parse(@container, @deplate.msg(text), @alt, :pcontainer => self)
         # @text = @deplate.msg(text)
     end
 end
@@ -352,7 +352,7 @@ class Deplate::Macro::Ruby < Deplate::Macro
             if @args['native'] or @args['ins']
                 @text = rv
             else
-                @elt = @deplate.parse(self, rv, @alt, nil, :pcontainer => self)
+                @elt = @deplate.parse(self, rv, @alt, :pcontainer => self)
             end
         end
     end
@@ -428,9 +428,14 @@ class Deplate::Macro::Math < Deplate::Macro::Latex
     
     def setup(text)
         prelude = @deplate.formatter.prelude('mathPrelude')
-        @text   = [prelude, "$%s$" % text].flatten.compact.join("\n")
+        fmt     = is_block? ? '\\[%s\\]' : '$%s$'
+        @text   = [prelude, fmt % text].flatten.compact.join("\n")
         super(@text)
     end
+
+    def is_block?
+        return @args['block']
+    end
 end
 
 class Deplate::Macro::List < Deplate::Macro
@@ -439,7 +444,7 @@ class Deplate::Macro::List < Deplate::Macro
     register_as 'list'
     
     def setup(text)
-        @elt = @deplate.parse(self, text, @alt, nil, :pcontainer => self)
+        @elt = @deplate.parse(self, text, @alt, :pcontainer => self)
         case @args['type']
         when 'dl'
             @type = 'Description'
@@ -469,7 +474,7 @@ class Deplate::Macro::Item < Deplate::Macro
     register_as 'item'
     
     def setup(text)
-        @elt = @deplate.parse(@container, text, @alt, nil, :pcontainer => self)
+        @elt = @deplate.parse(@container, text, @alt, :pcontainer => self)
     end
     
     def process
@@ -488,7 +493,7 @@ class Deplate::Macro::Term < Deplate::Macro
     register_as 'term'
     
     def setup(text)
-        @elt = @deplate.parse(@container, text, @alt, nil, :pcontainer => self)
+        @elt = @deplate.parse(@container, text, @alt, :pcontainer => self)
     end
 
     def process
@@ -507,7 +512,7 @@ class Deplate::Macro::Subscript < Deplate::Macro
     register_as 'sub'
     
     def setup(text)
-        @elt = @deplate.parse(@container, text, @alt, nil, :pcontainer => self)
+        @elt = @deplate.parse(@container, text, @alt, :pcontainer => self)
     end
 
     def process
@@ -523,7 +528,7 @@ class Deplate::Macro::Superscript < Deplate::Macro
     register_as 'super'
     
     def setup(text)
-        @elt = @deplate.parse(@container, text, @alt, nil, :pcontainer => self)
+        @elt = @deplate.parse(@container, text, @alt, :pcontainer => self)
     end
 
     def process
@@ -538,7 +543,7 @@ class Deplate::Macro::Stacked < Deplate::Macro
     register_as 'stacked'
     
     def setup(text)
-        @elt = @deplate.parse(@container, text, @alt, nil, :pcontainer => self)
+        @elt = @deplate.parse(@container, text, @alt, :pcontainer => self)
     end
 
     def process
@@ -555,7 +560,7 @@ class Deplate::Macro::Text < Deplate::Macro
     register_as 'text'
     
     def setup(text)
-        @elt = @deplate.parse(@container, text, @alt, nil, :pcontainer => self)
+        @elt = @deplate.parse(@container, text, @alt, :pcontainer => self)
     end
 
     def process
@@ -630,7 +635,7 @@ end
 
 class Deplate::Macro::FormattedText < Deplate::Macro
     def setup(text)
-        @elt = @deplate.parse(@container, text, @alt, nil, :pcontainer => self)
+        @elt = @deplate.parse(@container, text, @alt, :pcontainer => self)
     end
 end
 
@@ -680,7 +685,7 @@ class Deplate::Macro::Pagenumber < Deplate::Macro
     register_as 'pagenum'
     
     def setup(text)
-        @elt = @deplate.parse(@container, text, @alt, nil, :pcontainer => self)
+        @elt = @deplate.parse(@container, text, @alt, :pcontainer => self)
     end
 
     def process
@@ -722,7 +727,7 @@ class Deplate::Macro::Let < Deplate::Macro
             args[key] = val1 || val
         end
         Deplate::Define.let_variables(@deplate, args) do
-            @elt = @deplate.parse(@container, text, @alt, nil, :pcontainer => self)
+            @elt = @deplate.parse(@container, text, @alt, :pcontainer => self)
         end
     end
 end

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

@@ -0,0 +1,45 @@
+# @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: 2008-04-15.
+# @Revision:    0.115
+# 
+# = Description
+# This module provides a specialized syntax highlighter using 
+# http://coderay.rubychan.de/
+
+require 'coderay'
+
+class Deplate::Regions::Code
+    langs = ['ruby', 'c', 'delphi', 'pascal', 'html', 'rhtml', 'xhtml']
+    add_highlighter(langs, 'html',         :coderay_to_html)
+    add_highlighter(langs, 'htmlslides',   :coderay_to_html)
+    add_highlighter(langs, 'htmlsite',     :coderay_to_html)
+    add_highlighter(langs, 'html-snippet', :coderay_to_html)
+    add_highlighter(langs, 'xhtml10t',     :coderay_to_html)
+    add_highlighter(langs, 'xhtml11m',     :coderay_to_html)
+    add_highlighter(langs, 'php',          :coderay_to_html)
+    add_highlighter(langs, 'phpsite',      :coderay_to_html)
+    highlighter_option(:coderay_to_html, :no_cache => true)
+    
+    def coderay_to_html(syntax, style, text)
+        unless @deplate.allow_external
+            return
+        end
+        tokens = CodeRay.scan text, syntax.intern
+        args = {}
+        # args[:css] = :class
+        if @args['lineNumers'] or @deplate.variables['codeLineNumbers']
+            args[:line_numbers] = :table
+        end
+        begin
+            rv = [tokens.div(args)]
+            return rv
+        rescue Exception => e
+            log(['Error in module', 'code-coderay', e], :error)
+        end
+        return nil
+    end
+end
+

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

@@ -3,8 +3,8 @@
 # @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.106
+# @Last Change: 2008-04-15.
+# @Revision:    0.107
 # 
 # = Description
 # This module provides a specialized syntax highlighter using gvim. Adds 
@@ -23,6 +23,7 @@ class Deplate::Regions::Code
     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, 'xhtml11m',     :gvim_to_html)
     add_highlighter(nil, 'php',          :gvim_to_html)
     add_highlighter(nil, 'phpsite',      :gvim_to_html)
     

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

@@ -3,16 +3,12 @@
 # @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
+# @Last Change: 2008-04-15.
+# @Revision:    0.111
 # 
 # = Description
 # This module provides a specialized syntax highlighter using gvim. Adds 
 # Deplate::Regions::Code#gvim_to_html.
-# 
-# = Usage
-# = TODO
-# = CHANGES
 
 require 'fileutils'
 require 'tmpdir'
@@ -24,6 +20,7 @@ class Deplate::Regions::Code
     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, 'xhtml11m',     :gvim_to_html)
     add_highlighter(nil, 'php',          :gvim_to_html)
     add_highlighter(nil, 'phpsite',      :gvim_to_html)
     

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

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     27-Feb-2005.
-# @Last Change: 2007-09-30.
-# @Revision:    0.65
+# @Last Change: 2008-04-15.
+# @Revision:    0.66
 #
 # = Description
 # Highlight code regions using Andr� Simon's 
@@ -36,6 +36,7 @@ class Deplate::Regions::Code
     add_highlighter(nil, 'php',           :highlight)
     add_highlighter(nil, 'phpsite',       :highlight)
     add_highlighter(nil, 'xhtml10t',      :highlight)
+    add_highlighter(nil, 'xhtml11m',      :highlight)
     add_highlighter(nil, 'latex',         :highlight)
     add_highlighter(nil, 'latex-snippet', :highlight)
 

data/lib/deplate/mod/entities-decode.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+# entities.rb
+# @Last Change: 2007-12-03.
+# Author::      Thomas Link (micathom AT gmail com)
+# License::     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# Created::     2007-11-28.
+
+require 'singleton'
+
+
+class Deplate::EntityDecode
+    include Singleton
+    class << self
+        def with_deplate(deplate)
+            ent = self.instance
+            deplate.formatter.setup_entities
+            ent.deplate = deplate
+            ent
+        end
+    end
+
+    attr_accessor :deplate
+
+    def char_by_number(number)
+        @deplate.formatter.entities_table.each do |char, named, numbered|
+            if numbered == number
+                return char
+            end
+        end
+        return number
+    end
+
+    
+    def char_by_name(name)
+        @deplate.formatter.entities_table.each do |char, named, numbered|
+            if named == name
+                return char
+            end
+        end
+        return name
+    end
+
+end
+
+
+class Deplate::Particle::EntityDecode < Deplate::Particle
+    register_particle
+    set_rx(/^&#\d+;/)
+    def_get :text, 0
+
+    def process
+        @elt = Deplate::EntityDecode.with_deplate(@deplate).char_by_number(get_text)
+    end
+
+end
+
+
+class Deplate::Particle::NamedEntityDecode < Deplate::Particle
+    register_particle
+    set_rx(/^&\w+?;/)
+    def_get :text, 0
+
+    def process
+        @elt = Deplate::EntityDecode.with_deplate(@deplate).char_by_name(get_text)
+    end
+
+end
+
+
+# Local Variables:
+# revisionRx: REVISION\s\+=\s\+\'
+# End:

data/lib/deplate/mod/entities-encode.rb

@@ -0,0 +1,50 @@
+#!/usr/bin/env ruby
+# entities.rb
+# @Last Change: 2007-12-04.
+# Author::      Thomas Link (micathom AT gmail com)
+# License::     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# Created::     2007-11-28.
+
+
+class Deplate::Core
+    def module_initialize_entities_encode
+        @formatter.setup_entities
+    end
+end
+
+class Deplate::Formatter
+    alias :entities_encode_plain_text :plain_text
+    def plain_text(text, escaped=false)
+        if escaped
+            entities_encode_plain_text(text, escaped)
+        else
+            ntxt = []
+            max  = text.size
+            idx  = 0
+            while idx < max
+                catch(:next) do
+                    # This probably is the most inefficient way to do this. 
+                    # On the other hand, "char" could be about any byte 
+                    # sequence you want.
+                    @deplate.formatter.entities_table.each do |char, named, numbered|
+                        i = idx + char.size
+                        j = i - 1
+                        if text[idx..j] == char
+                            ntxt << (named.nil? || named.empty? ? numbered : named)
+                            idx = i
+                            throw :next
+                        end
+                    end
+                    ntxt << text[idx..idx]
+                    idx += 1
+                end
+            end
+            return ntxt.join
+        end
+    end
+end
+
+
+# Local Variables:
+# revisionRx: REVISION\s\+=\s\+\'
+# End:

data/lib/deplate/mod/guesslanguage.rb

@@ -2,8 +2,8 @@
 # @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
+# @Last Change: 2008-07-05.
+# @Revision:    0.1.74
 
 require 'deplate/guesslanguage'
 
@@ -12,7 +12,7 @@ class Deplate::Core
         @options.guesslanguage = Guesslanguage.new
         @options.guesslanguage_once = false
         @options.guesslanguage_collected = {}
-        for dir in Deplate::Core.library_directories(true, 'locale')
+        for dir in Deplate::Core.library_directories(@vanilla, true, ['locale'])
             for file in Dir[File.join(dir, '*_data')]
                 lang = File.basename(file, '.*')
                 text = File.read(file)

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

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     30-Dez-2004.
-# @Last Change: 25-Apr-2006.
-# @Revision:    0.58
+# @Last Change: 2008-04-14.
+# @Revision:    0.59
 
 class Deplate::Formatter::HTML
     def prepare_html_jsmath
@@ -28,9 +28,9 @@ END_OF_HTML
 
     alias :format_math_re_jsmath :format_math
     def format_math(invoker)
-        m = /\$(.*?)\$/.match(invoker.text)
-        if m
-            %{<span class="math">#{m[1]}</span>}
+        block, formula = bare_latex_formula(invoker.text)
+        if formula
+            %{<span class="math">#{formula}</span>}
         else
             invoker.log(['Internal error', invoker.text], :error)
         end

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

@@ -0,0 +1,40 @@
+# @Last Change: 2008-04-14.
+# Author::      Thomas Link (micathom AT gmail com)
+# License::     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# Created::     2008-04-13.
+
+
+require 'math_ml/string'
+
+
+class Deplate::Formatter::HTML
+    alias :inlatex_re_mathml :inlatex
+    def inlatex(invoker)
+        case invoker
+        when Deplate::Macro::Math
+        else
+            inlatex_re_mathml(invoker)
+        end
+    end
+
+    alias :format_math_re_mathml :format_math
+    def format_math(invoker)
+        case @deplate.formatter.class.myname
+        when 'xhtml11m'
+        else
+            invoker.log(['Inadequate formatter', @deplate.formatter.class.myname], :error)
+        end
+        block, formula = bare_latex_formula(invoker.text)
+        if formula
+            begin
+                mathml = formula.to_mathml(block)
+                return mathml.to_s
+            rescue Exception => e
+                invoker.log(['Error in module', 'mathml', e], :error)
+            end
+        else
+            invoker.log(['Internal error', invoker.text], :error)
+        end
+    end
+end
+