deplate 0.7.3 → 0.8

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

@@ -3,10 +3,12 @@
 # @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.25
+# @Last Change: 07-Jun-2006.
+# @Revision:    0.31
+
+class Deplate::Symbols::Plain < Deplate::Symbols
+    self.myname = 'plain'
 
-module Deplate::Symbols::Plain
     def symbol_quote(invoker)
         "&#34;" #"&quot;"
     end
@@ -22,37 +24,5 @@ module Deplate::Symbols::Plain
     def symbol_amp(invoker)
         "&#38;" #"&amp;"
     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["plain"] = Deplate::Symbols::Plain
 end
 

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

@@ -3,10 +3,12 @@
 # @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.41
+# @Last Change: 26-Nov-2005.
+# @Revision:    0.45
 
-module Deplate::Symbols::SGML
+class Deplate::Symbols::SGML < Deplate::Symbols
+    self.myname = :sgml
+    
     def symbol_quote(invoker)
         "&#34;" #"&quot;"
     end
@@ -72,7 +74,8 @@ module Deplate::Symbols::SGML
         when "=="
             return "&#8801;" #"&equiv;"
         when "+++", "###", "???", "!!!"
-            m = formatted_inline("sidebar", formatted_inline("para", plain_text(sym)))
+            p = @formatter.formatted_inline("para", @formatter.plain_text(sym))
+            m = @formatter.formatted_inline("sidebar", p)
             if defined?(invoker.epilogue)
                 invoker.epilogue << m
                 return ""
@@ -86,12 +89,8 @@ module Deplate::Symbols::SGML
             # when "<~>"
             # return ""
         else
-            return plain_text(sym)
+            super
         end
     end
 end
 
-class Deplate::Core
-    @@symbols[:sgml] = Deplate::Symbols::SGML
-end
-

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

@@ -3,10 +3,12 @@
 # @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: 26-Nov-2005.
+# @Revision:    0.37
+
+class Deplate::Symbols::Utf8 < Deplate::Symbols
+    self.myname = "utf-8"
 
-module Deplate::Symbols::Utf8
     def doublequote_open(invoker)
         %{“}
     end
@@ -56,7 +58,8 @@ module Deplate::Symbols::Utf8
         when "=="
             return "≡"
         when "+++", "###", "???", "!!!"
-            m = formatted_inline("sidebar", formatted_inline("para", plain_text(sym)))
+            p = @formatter.formatted_inline("para", @formatter.plain_text(sym))
+            m = @formatter.formatted_inline("sidebar", p)
             if defined?(invoker.epilogue)
                 invoker.epilogue << m
                 return ""
@@ -70,12 +73,8 @@ module Deplate::Symbols::Utf8
             # when "<~>"
             # return ""
         else
-            return plain_text(sym)
+            super
         end
     end
 end
 
-class Deplate::Core
-    @@symbols["utf-8"] = Deplate::Symbols::Utf8
-end
-

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

@@ -3,14 +3,14 @@
 # @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.29
+# @Last Change: 26-Nov-2005.
+# @Revision:    0.31
 
 require "deplate/mod/symbols-utf-8"
 
-module Deplate::Symbols::XML
-    include Deplate::Symbols::Utf8
-
+class Deplate::Symbols::XML < Deplate::Symbols::Utf8
+    self.myname = :xml
+    
     def symbol_quote(invoker)
         "&quot;"
     end
@@ -28,7 +28,3 @@ module Deplate::Symbols::XML
     end
 end
 
-class Deplate::Core
-    @@symbols[:xml] = Deplate::Symbols::XML
-end
-

data/lib/deplate/mod/syntax-region-alt.rb

@@ -3,8 +3,8 @@
 # @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.15
+# @Last Change: 12-Nov-2005.
+# @Revision:    0.19
 # 
 # Description:
 # This module provides an alternative syntax for regions, like:
@@ -15,11 +15,11 @@
 # 
 
 class Deplate::Element::RegionSyntaxAlt < Deplate::Element::Region
-    @@elements << self
-    @rx = /^(\s*)(={4,})\s*([A-Z][A-Za-z]*)(.*)$/
+    register_element
+    set_rx(/^(\s*)(={4,})\s*([A-Z][A-Za-z]*)(.*)$/)
 
     def get_endrx
-        /^#{Regexp.escape(@match[1])}\s*\b.*$/
+        /^#{get_indent}#{Regexp.escape(@match[2])}(\s+.*)?$/
     end
 
     def get_name

data/lib/deplate/mod/zh-cn-autospace.rb

@@ -3,30 +3,30 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     01-Aug-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.222
+# @Last Change: 31-Mai-2006.
+# @Revision:    0.225
 
-require "deplate/zh-cn"
+require 'deplate/zh-cn'
 
 class Deplate::Formatter
     attr_reader :cjk_space, :cjk_nospace
     def hook_pre_setup_zh_cn_autospace
-        @cjk_space   = " "
-        @cjk_nospace = ""
+        @cjk_space   = ' '
+        @cjk_nospace = ''
     end
 end
 
 class Deplate::Formatter::LaTeX
     def hook_pre_setup_zh_cn_autospace
-        @cjk_space   = "~"
-        @cjk_nospace = " "
+        @cjk_space   = '~'
+        @cjk_nospace = ' '
     end
 end
 
 class Deplate::Core
-    @cjk_nonchars = "%c-%c" % [33, 0xA0]
-    @cjk_rx_C = Regexp.new("[^%s]" % @cjk_nonchars)
-    @cjk_rx_a = Regexp.new("[%s]" % @cjk_nonchars)
+    @cjk_nonchars = '%c-%c' % [33, 0xA0]
+    @cjk_rx_C = Regexp.new('[^%s]' % @cjk_nonchars)
+    @cjk_rx_a = Regexp.new('[%s]' % @cjk_nonchars)
     class << self
         attr_reader :cjk_nonchars, :cjk_rx_a, :cjk_rx_C
     end
@@ -35,13 +35,13 @@ class Deplate::Core
         class << self
             def join_particles(particles)
                 acc  = []
-                prev = ""
+                prev = ''
                 prev_cjk = false
-                particles.delete("")
+                particles.delete('')
                 particles.each_with_index do |e, i|
-                    if e == " "
+                    if e == ' '
                         enext = particles[i + 1]
-                        if prev == " " or enext == " "
+                        if prev == ' ' or enext == ' '
                         elsif @formatter.cjk_smart_blanks and prev =~ Deplate::Core.cjk_rx_C and enext =~ Deplate::Core.cjk_rx_C
                             acc << @formatter.cjk_nospace
                         else
@@ -70,21 +70,19 @@ end
 
 class Deplate::Element
     def join_lines(accum)
-        accum.join(" ")
+        accum.join(' ')
     end
 end
 
 class Deplate::Particle::Space < Deplate::Particle
-    # @@particles << self
-    @rx = /^ /
+    set_rx(/^ /)
     def setup
-        @elt = " "
+        @elt = ' '
     end
 end
 
 class Deplate::Particle::NonCJK < Deplate::Particle
-    # @@particles << self
-    @rx = /^([#{Deplate::Core.cjk_nonchars}])/o
+    set_rx(/^([#{Deplate::Core.cjk_nonchars}])/o)
     @part = nil
     
     class << self

data/lib/deplate/mod/zh-cn.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     01-Aug-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.161
+# @Last Change: 12-Nov-2005.
+# @Revision:    0.163
 
 require "deplate/zh-cn"
 
@@ -20,8 +20,7 @@ class Deplate::Element
 end
 
 class Deplate::Particle::SwallowedSpace < Deplate::Particle
-    # @@particles << self
-    @rx = /^ +/
+    set_rx(/^ +/)
 
     def setup
         @elt = @deplate.formatter.cjk_smart_blanks ? "" : " "
@@ -29,8 +28,7 @@ class Deplate::Particle::SwallowedSpace < Deplate::Particle
 end
 
 class Deplate::Particle::Space < Deplate::Particle
-    # @@particles << self
-    @rx = /^~/
+    set_rx(/^~/)
 
     def setup
         @elt = "~"

data/lib/deplate/nukumi2.rb

@@ -0,0 +1,71 @@
+# nukumi2.rb
+# @Author:      Thomas Link (samul AT web de)
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     31-Dez-2005.
+# @Last Change: 31-Dez-2005.
+# @Revision:    0.33
+#
+# = Usage
+# Add require 'deplate/nukumi2' to your nukumi2 config.rb.
+# 
+# = TODO
+# - check inline latex etc. (set the directory for auxiliary files)
+
+require 'deplate/deplate-string'
+
+if Nukumi2::VERSION != '0.5'
+    Deplate::Core.log('deplate support was created for Nukumi2 0.5 and is not guaranteed to work with other versions', :anyway)
+end
+
+Nukumi2::Entry::DEFAULT_ENCODING.replace 'DeplateString'
+
+o = DeplateString.deplate_options
+o.variables['levelshift']   = '4'
+o.variables['headings']     = 'plain'
+o.variables['auxiliaryDir'] = 'data'
+o.variables['mandatoryID']  = true
+
+class FileBackend
+    class Parser
+        def self.parse(io)
+            entry = Nukumi2::Entry.new
+
+            metadata = []
+
+            while line = io.gets
+                break if line.chomp.empty?
+                metadata << line
+            end
+
+            meta = DeplateString.new(metadata.join)
+            meta.to_html
+        
+            date = meta.deplate_converter.get_clip('date')
+            entry.time = Time.parse(date.elt) if date
+
+            subject = meta.deplate_converter.get_clip('title')
+            entry.title = subject.elt if subject
+
+            meta.deplate_variables.each do |field, value|
+                if value
+                    case field
+                    when 'keywords'
+                        entry.categories.concat value.split(/\s*[,;]\s*/)
+                    when 'encoding'
+                    else
+                        if entry.respond_to? field + "="
+                            entry.send field + "=", value
+                        else
+                            entry.fields[field] = value
+                        end
+                    end
+                end
+            end
+
+            entry.content = io.read
+
+            entry
+        end
+    end
+end
+

data/lib/deplate/output.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     04-Dez-2004.
-# @Last Change: 02-Nov-2005.
-# @Revision:    0.245
+# @Last Change: 28-Apr-2006.
+# @Revision:    0.257
 
 require 'forwardable'
 require 'deplate/metadata'
@@ -24,6 +24,7 @@ class Deplate::Output
     attr_accessor :pre_matter, :body, :post_matter
     attr_accessor :top_heading, :index
     attr_accessor :destination
+    attr_reader :attributes
     # , :metadata
     
     def_delegator(:@deplate, :slot_by_name)
@@ -55,9 +56,11 @@ class Deplate::Output
         @variables   = deplate.variables
         @templates   = deplate.templates
         @meta        = Deplate::Metadata.new(deplate, self)
+        @attributes  = {}
         # @metadata    = {}
         @destination = nil
         @index       = nil
+        @output      = nil
         if inherited_output
             @pre_matter  = inherited_output.pre_matter.dup
             @body        = @@body_template.dup
@@ -74,15 +77,13 @@ class Deplate::Output
     def body_flush
         call_methods_matching(@formatter, /^hook_pre_body_flush_/)
         save!
-        log(["Flushing formatted elements", @destination], :debug)
+        log(['Flushing formatted elements', @destination], :debug)
         process
         call_methods_matching(@formatter, /^hook_post_body_flush_/)
     end
     
     def save!
-        if do_i_feel_empty?
-            @output = nil
-        else
+        unless do_i_feel_empty?
             call_methods_matching(@formatter, /^hook_pre_output_save_/)
             @index       ||= @top_heading.top_index
             @destination ||= @top_heading.destination
@@ -91,25 +92,24 @@ class Deplate::Output
             @post_matter   = @post_matter.dup
             call_methods_matching(@formatter, /^hook_post_output_save_/)
         end
-        log(["Save output", destination], :debug)
+        log(['Save output', destination], :debug)
     end
 
     def process
         if @options.included
             peel!
         else
-            tmpl = @options.template || @variables["template"]
+            tmpl = @options.template || @variables['template']
             if tmpl
-                @variables["@idx"] = @index[0].to_s
                 if File.exist?(tmpl)
                     fill_in_template(tmpl)
                 else
                     template_file = @templates[tmpl]
                     if template_file
-                        log(["Using template", template_file], :debug)
+                        log(['Using template', template_file], :debug)
                         fill_in_template(template_file)
                     else
-                        log(["Unknown template", tmpl], :error)
+                        log(['Unknown template', tmpl], :error)
                         flatten!
                     end
                 end
@@ -133,7 +133,7 @@ class Deplate::Output
             body_empty?
         end
     end
-    private :do_i_feel_empty?
+    # private :do_i_feel_empty?
   
     def peel!
         unless do_i_feel_empty?
@@ -148,14 +148,12 @@ class Deplate::Output
     end
 
     def fill_in_template(template_file)
-        @deplate.maintain_current_top(@top_heading) do
-            unless do_i_feel_empty?
-                t = Deplate::Template.new(:file => template_file)
-                @output = t.fill_in(@deplate, 
-                                    :pre  => @pre_matter,
-                                    :body => @body,
-                                    :post => @post_matter)
-            end
+        unless do_i_feel_empty?
+            t = Deplate::Template.new(:file => template_file)
+            @output = t.fill_in(@deplate, 
+                                :pre  => @pre_matter,
+                                :body => @body,
+                                :post => @post_matter)
         end
     end
 
@@ -170,7 +168,7 @@ class Deplate::Output
         else
             pos = slot_by_name(pos)
             unless pos or pos == 0
-                log(["Undefined slot", pos, type, text], :error) if pos.nil?
+                log(["Undefined slot", pos, type], :error) if pos.nil?
                 return
             end
             case type