deplate 0.7.3 → 0.8

data/lib/deplate/mod/mark-external-urls.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     16-Nov-2004.
-# @Last Change: 01-Nov-2005.
-# @Revision:    0.36
+# @Last Change: 30-Mrz-2006.
+# @Revision:    0.37
 # 
 # Description:
 # 
@@ -27,7 +27,7 @@ class Deplate::Formatter
                             icon = @variables["urlIcon"] || "url.png"
                             # invoker.args['alt'] ||= 'url'
                         end
-                        rv + format_particle(:include_image, icon, {}, true)
+                        rv + format_particle(:include_image, invoker, icon, {}, true)
                     else
                         rv
                     end

data/lib/deplate/mod/markup-1-warn.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.8
+# @Last Change: 12-Nov-2005.
+# @Revision:    0.9
 
 class Deplate::Particle::DeprecatedTextStyleMarkup < Deplate::DeprecatedParticle
     def get_text(match)
@@ -16,22 +16,22 @@ class Deplate::Particle::DeprecatedTextStyleMarkup < Deplate::DeprecatedParticle
 end
 
 class Deplate::Particle::EmphasizeDeprecated < Deplate::Particle::DeprecatedTextStyleMarkup
-    @@particles << self
-    @rx = /^(\*\*)(.+?)(\*\*)/
+    register_particle
+    set_rx(/^(\*\*)(.+?)(\*\*)/)
 end
 
 class Deplate::Particle::CodeDeprecated < Deplate::Particle::DeprecatedTextStyleMarkup
-    @@particles << self
-    @rx = /^(==)(.+?)(==)/
+    register_particle
+    set_rx(/^(==)(.+?)(==)/)
 end
 
 class Deplate::Particle::EmphasizeSingleDeprecated < Deplate::Particle::DeprecatedTextStyleMarkup
-    @@particles << self
-    @rx = /^(\*)((\w|\\[*\s])+?)(\*)/
+    register_particle
+    set_rx(/^(\*)((\w|\\[*\s])+?)(\*)/)
 end
 
 class Deplate::Particle::CodeSingleDeprecated < Deplate::Particle::DeprecatedTextStyleMarkup
-    @@particles << self
-    @rx = /^(=)((\w|\\[=\s])+?)(=)/
+    register_particle
+    set_rx(/^(=)((\w|\\[=\s])+?)(=)/)
 end
 

data/lib/deplate/mod/navbar-png.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     14-Aug-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.25
+# @Last Change: 04-Jun-2006.
+# @Revision:    0.73
 # 
 # Description:
 # 
@@ -17,17 +17,33 @@
 
 class Deplate::Formatter::HTML_Site
     def prepare_navbar_png
-        type = @deplate.variables["buttonsColour"]
-        fileformat = @deplate.variables["buttonsFileFormat"] || "png"
+        type = @deplate.variables['buttonsColour']
+        fileformat = @deplate.variables['buttonsFileFormat'] || 'png'
         if type
             type = "-%s.%s" % [type, fileformat]
         else
             type = ".%s" % fileformat
         end
-        @deplate.variables["prevButton"] = %{<img src="prev#{type}" border="0" alt="Prev" />}
-        @deplate.variables["homeButton"] = %{<img src="home#{type}" border="0" alt="Home" />} 
-        @deplate.variables["nextButton"] = %{<img src="next#{type}" border="0" alt="Next" />}
-        @deplate.variables["goButton"]   = %{<img src="go#{type}"   border="0" alt="Go" />}
+        hi = @deplate.variables['buttonsHighlight']
+        if hi
+            setup_highlight_image
+        end
+        [
+            'prev',
+            'home',
+            'next',
+            'go'
+        ].each do |button|
+            btn   = "navbar_#{button}"
+            img   = "#{button}#{type}"
+            hiimg = hi ? "hi-#{img}" : nil
+            alt   = button.capitalize
+            @deplate.variables["#{button}Button"] = include_image(nil, 
+                                                                  img_url(img), 
+                                                                  {'hi' => hiimg, 'alt' => alt, 'id' => btn, :raw => true},
+                                                                  true
+                                                                 )
+        end
     end
 end
 

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

@@ -3,15 +3,15 @@
 # @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.19
+# @Last Change: 12-Nov-2005.
+# @Revision:    0.20
 #
 # = Description
 # This provides a math markup as known from LaTeX: $\latexmarkup$
 
 class Deplate::Particle::Math < Deplate::Particle
-    @@particles << self
-    @rx = /^\$(\S.*?)\$/
+    register_particle
+    set_rx(/^\$(\S.*?)\$/)
 
     def setup
         @proxy = Deplate::Macro::Math.new(@deplate, @container, @context, {}, @alt, get_text)

data/lib/deplate/mod/php-extra.rb

@@ -3,14 +3,54 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     05-Mai-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.5
+# @Last Change: 28-Mai-2006.
+# @Revision:    0.28
 #
 # = Description
 # Provide some php specific elements/particles/macros ...
 
+class Deplate::Formatter::HTML
+    def initialize_page_comments(invoker)
+        unless @deplate.options.page_comments
+            file = 'page-comment.inc.php'
+            fn   = @deplate.find_in_lib(file, :pwd => true)
+            dir  = File.dirname(output_destination)
+            dest = File.join(dir, file)
+            unless File.exist?(dest)
+                Deplate::Template.copy(@deplate, fn, dest, invoker) do |args|
+                    unless @variables['commentLocale']
+                        args['commentLocale'] = @deplate.options.messages.prop('lang', 'php')
+                    end
+                end
+                # tpl = File.open(fn) {|io| io.read}
+                # src = invoker ? invoker.source : nil
+                # tpl = Deplate::Template.new(:template  => tpl,
+                #                             :source => src,
+                #                             :container => self)
+                # args = {}
+                # unless @variables['commentLocale']
+                #     args['commentLocale'] = @deplate.options.messages.prop('lang', 'php')
+                # end
+                # Deplate::Define.let_variables(@deplate, args) do
+                #     tpl = tpl.fill_in(@deplate, :source => src)
+                # end
+                # tpl = tpl.join("\n")
+                # File.open(dest, 'w') {|io| io.puts(tpl)}
+            end
+            # @deplate.copy_file(fn, dest)
+            @deplate.options.page_comments = true
+        end
+    end
+
+    def_service('page_comment') do |args, text|
+        initialize_page_comments(args[:invoker])
+        pc = invoke_service('outputBasename', 'sfx' => '.*').inspect
+        %{<?php require_once('page-comment.inc.php'); page_comment(#{pc}); ?>}
+    end
+end
+
 class Deplate::Regions::Php < Deplate::Regions::Native
-    @@regions["Php"] = self
+    register_as 'Php'
     def process
         @elt = ['<?php', @elt, '?>'].join("\n")
         self
@@ -18,14 +58,14 @@ class Deplate::Regions::Php < Deplate::Regions::Native
 end
 
 class Deplate::Command::PHP < Deplate::Command
-    @@commands["PHP"] = self
+    register_as 'PHP'
     def format_special
         ['<?php', @elt, '?>'].join(' ')
     end
 end
 
 class Deplate::Macro::Php < Deplate::Macro::Insert
-    @@macros['php'] = self
+    register_as 'php'
 
     def setup(text)
         super
@@ -34,7 +74,7 @@ class Deplate::Macro::Php < Deplate::Macro::Insert
 end
 
 class Deplate::Macro::PhpValue < Deplate::Macro::Insert
-    @@macros['='] = self
+    register_as '='
 
     def setup(text)
         super

data/lib/deplate/mod/smart-dash.rb

@@ -0,0 +1,26 @@
+# smart-dash.rb
+# @Author:      Thomas Link (samul AT web de)
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     15-Apr-2006.
+# @Last Change: 15-Apr-2006.
+# @Revision:    0.25
+
+class Deplate::Particle::Symbol
+    @@symbols_table.delete(['--'])
+    @@symbols_table << ['`--', '--']
+    @@symbols_table << ['-', lambda do
+        chars = Deplate::HyperLink.chars
+        text  = if @last =~ /\d$/ or
+                    @rest =~ /^\d/ or
+                    (@last =~ /[#{chars}]$/ and @rest =~ /^[#{chars}]/)
+                    '-'
+                else
+                    format_particle(:format_symbol, self, '--')
+                end
+        text
+    end
+    ]
+
+    reset_symbols
+end
+

data/lib/deplate/mod/smiley.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     16-Nov-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.58
+# @Last Change: 02-Apr-2006.
+# @Revision:    0.68
 # 
 # Description:
 # 
@@ -16,15 +16,15 @@
 # 
 
 class Deplate::Particle::Smiley < Deplate::Particle
-    @@particles << self
+    register_particle
+    set_rx(nil)
     @smileys = {}
-    @rx      = nil
     
     class << self
         attr_reader :smileys
         def def_smiley(text, img, deplate=nil)
             @smileys[text] = img
-            @rx = Regexp.new(%{^(%s)} % @smileys.keys.collect{|t| Regexp.escape(t)}.join('|'))
+            set_rx Regexp.new(%{^(%s)} % @smileys.keys.collect{|t| Regexp.escape(t)}.join('|'))
             if deplate
                 deplate.register_particle(self.class)
             end
@@ -32,16 +32,78 @@ class Deplate::Particle::Smiley < Deplate::Particle
     end
 
     def_smiley(':-)', 'smiley')
+    # def_smiley(':-(', 'smiley_sad')
+    # def_smiley(';-)', 'smiley_blink')
+    #
+    # http://en.wikipedia.org/wiki/Emoticon
+    # :-) 	smile
+    # :-( 	frown: sadness or sympathy
+    # :-/ or :-\ 	somewhat unhappy/discontent, undecided, or mild 
+    # anger
+    # :-| 	unsure, deadpan or indifferent
+    # ;-) 	wink
+    # :-D 	wide grin
+    # :-P or :-p 	tongue sticking out: joke, sarcasm or disgusting
+    # B-) or 8-) 	has sunglasses: looking cool
+    # :-o or :-O or =-o or :-0 	surprised
+    # :-s or :-S 	confused
+    # :-8 or :-B 	buck teeth
+    # :-x 	"I shouldn't have said that"
+    # :'-( or :~-( 	shedding a tear
+    # :o) 	larger nose, can mean 'tongue-in-cheek', more often just 
+    # 'clowning around'
+    # >:-) or }:-) 	lowered eyebrows, evil or mean, a devil
+    # 0:-) 	halo over the head, an angel, innocent
+    #
+    # Anime Style:
+    # (^_^) 	smiley
+    # (^.^) 	see above, but rather than a wide, closed mouth, a small 
+    # mouth is present (the dot can also be a nose)
+    # (~_~) 	annoyed or sleepy
+    # (`_^) or (^_~) 	wink
+    # (>_<) 	angry, frustrated
+    # (^o^) 	singing, or laughing maniacally
+    # \(^o^)/ 	very excited (raising hands)
+    # (-_-) or (=_=) 	trying to hide annoyance, or sleeping (eyes 
+    # shut), grumpy
+    # (-_-;) or (^_^') or (^_^);; 	nervousness, or sweatdrop 
+    # (embarrassed. semicolon can be repeated)
+    # (-_-¤) 	vein (used to show frustration)
+    # (¬_¬) 	focused at a particular person, or sometimes used after 
+    # a joking comment as a sort of "shifty eyes" smiley
+    # \m/>_<\m/ 	Rockin' out.
+    # (<_<) 	"yeah, right...", looking around suspiciously
+    # (;_;) 	crying
+    # (T_T) 	crying a LOT, or deadpan stare
+    # (T0T) 	crying a lot, and wailing
+    # (@_@) 	dazed
+    # (@_o) 	black eye from left hook
+    # (o_O) or (ô_O) 	Confused Surprise
+    # (o.0); 	You Scare Me
+    # (ô_ô) 	Surprised
+    # (0_<) 	Flinch, nervous wink
+    # (O_O) 	Shocked
+    # (._.) 	intimidated, sad, ashamed
+    # ($_$) 	Money Eyes; Thinking about Money
+    # (x_x) or (+_+) 	Dead or Knocked Out
+    # (n_n) 	Pleased
+    # (9_9) 	Eye Rolling
+    # (*_*) 	Star-Struck
+    # t(-_-t) 	Flipping off
+    # (",) 	Smirk
+    # ("o) 	Side Shocked
+    # ~~(=_=)~~ 	Break-dance
 
     def setup
         @elt = @match[1]
     end
 
     def process
-        sfx = @deplate.variables["smileySfx"] || @deplate.variables["imgSfx"] || "png"
+        # sfx = @deplate.variables["smileySfx"] || @deplate.variables["imgSfx"] || "png"
         img = self.class.smileys[@elt]
         if img
-            @elt = @deplate.formatter.include_image("#{img}.#{sfx}", {"alt" => @elt}, true)
+            # @elt = @deplate.formatter.include_image(self, "#{img}.#{sfx}", {"alt" => @elt}, true)
+            @elt = @deplate.formatter.include_image(self, img, {"alt" => @elt}, true)
         else
             log(["Unknown smiley", @elt], :error)
         end

data/lib/deplate/mod/symbols-latin1.rb

@@ -3,10 +3,13 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     27-Aug-2004.
-# @Last Change: 01-Nov-2005.
-# @Revision:    0.35
+# @Last Change: 07-Jun-2006.
+# @Revision:    0.45
 
-module Deplate::Symbols::Latin1
+class Deplate::Symbols::Latin1 < Deplate::Symbols
+    self.myname = 'ISO-8859-1'
+    register_as 'latin1'
+    
     def symbol_quote(invoker)
         "&#34;" #"&quot;"
     end
@@ -24,35 +27,23 @@ module Deplate::Symbols::Latin1
     end
 
     def doublequote_open(invoker)
-        %{�}
+        # %{�}
+        %{"}
     end
 
     def doublequote_close(invoker)
-        %{�}
+        # %{�}
+        %{"}
     end
 
     def singlequote_open(invoker)
-        %{�}
+        # %{�}
+        %{'}
     end
 
     def singlequote_close(invoker)
-        %{�}
+        # %{�}
+        %{'}
     end
-
-    def nonbreakingspace(invoker)
-        %{�}
-    end
-
-    def symbol_paragraph(invoker)
-        %{�}
-    end
-
-    def format_symbol(invoker, sym)
-        return plain_text(sym)
-    end
-end
-
-class Deplate::Core
-    @@symbols["ISO-8859-1"] = Deplate::Symbols::Latin1
 end
 

data/lib/deplate/mod/symbols-od-utf-8.rb

@@ -3,12 +3,14 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     27-Aug-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.36
+# @Last Change: 26-Nov-2005.
+# @Revision:    0.44
 
 require 'deplate/mod/symbols-utf-8'
 
-module Deplate::Symbols::Utf8
+class Deplate::Symbols::Utf8_Od < Deplate::Symbols::Utf8
+    self.myname = 'od-utf-8'
+
     def nonbreakingspace(invoker)
         %{<text:s/>}
     end