deplate 0.8.4 → 0.8.5

data/lib/deplate/counters.rb

@@ -1,9 +1,10 @@
+# encoding: ASCII
 # counters.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     31-Dez-2005.
-# @Last Change: 2007-09-29.
-# @Revision:    0.15
+# @Last Change: 2009-02-02.
+# @Revision:    0.17
 
 class Deplate::Counters
     def initialize(deplate)

data/lib/deplate/css/article.css

@@ -1,8 +1,8 @@
 /* Layout and decoration */
 /* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 2007-11-04. */
-/* @Revision:    0.799 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.800 */
 
 @page { 
     size:portrait;

data/lib/deplate/css/doc.css

@@ -1,8 +1,9 @@
+# encoding: ISO-8859-1
 /* Layout and decoration */
 /* @Author:      Thomas Link (samul AT web.de) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 2008-07-10. */
-/* @Revision:    0.1217 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.1218 */
 
 body {
     padding: 1px;

data/lib/deplate/css/heading-navbar.css

@@ -1,8 +1,8 @@
 /* Layout and decoration */
 /* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 22-M�r-2005. */
-/* @Revision:    0.1064 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.1065 */
 
 table.navbar {
     border-top: 0;

data/lib/deplate/css/layout-deplate-print.css

@@ -1,8 +1,8 @@
 /* Layout and decoration */
 /* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 22-J�n-2005. */
-/* @Revision:    0.772 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.773 */
 
 @page { 
     size:portrait;

data/lib/deplate/css/layout-deplate.css

@@ -1,8 +1,8 @@
 /* Layout and decoration */
 /* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 19-Feb-2005. */
-/* @Revision:    0.982 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.983 */
 
 body {
     padding: 1px;

data/lib/deplate/css/presentation.css

@@ -1,8 +1,8 @@
 /* Text style: sans-serif */
 /* @Author:      Thomas Link (samul AT web.de) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 2008-07-08. */
-/* @Revision:    0.637 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.638 */
 
 body, table, div {
     /* font-family: Georgia, Bookman, Times, Serif; */

data/lib/deplate/css/sans-serif.css

@@ -1,8 +1,8 @@
 /* Text style: sans-serif */
 /* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 31-M�r-2005. */
-/* @Revision:    0.597 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.598 */
 
 body, table, div {
     /* font-family: Verdana, Geneva, Sans-Serif; */

data/lib/deplate/css/serif-e.css

@@ -1,8 +1,8 @@
 /* Text style: sans-serif */
 /* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 20-M�r-2005. */
-/* @Revision:    0.617 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.618 */
 
 body, table, div {
     /* font-family: Georgia, Bookman, Times, Serif; */

data/lib/deplate/css/serif-rel.css

@@ -1,8 +1,9 @@
+# encoding: ISO-8859-1
 /* Text style: sans-serif */
 /* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 20-M�r-2005. */
-/* @Revision:    0.632 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.633 */
 
 body, table, div {
 	font-family: Georgia, Minion Web, Palatino, Book Antiqua, Utopia, Times New Roman, serif;

data/lib/deplate/css/serif.css

@@ -1,8 +1,8 @@
 /* Text style: sans-serif */
 /* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 23-Apr-2006. */
-/* @Revision:    0.626 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.627 */
 
 body, table, div {
     /* font-family: Georgia, Bookman, Times, Serif; */

data/lib/deplate/css/slides.css

@@ -1,8 +1,9 @@
+# encoding: ISO-8859-1
 /* A  sample style sheet for use with deplate generated html files */
 /* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 18-Nov-2004. */
-/* @Revision:    0.550 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.551 */
 
 @import url(text-serif.css) print;
 @import url(text-sans-serif.css) screen;

data/lib/deplate/css/tabbar-top.css

@@ -52,8 +52,8 @@ table.tabBarTop {
     padding: 0;
     width: 80%;
     border-spacing: 0;
-    position: relative;
-    top: 1px;
+    /* position: relative; */
+    /* top: 1px; */
     text-align: center;
 }
 tr.tabBarTop {

data/lib/deplate/css/text-sans-serif.css

@@ -1,8 +1,9 @@
+# encoding: ISO-8859-1
 /* Text style: sans-serif */
 /* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 20-Feb-2005. */
-/* @Revision:    0.587 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.588 */
 
 body, table, div {
     /* font-family: Verdana, Geneva, Sans-Serif; */

data/lib/deplate/css/text-serif.css

@@ -1,8 +1,8 @@
 /* Text style: sans-serif */
 /* @Author:      Thomas Link (micathom AT gmail com) */
 /* @Created:     13-Apr-2004. */
-/* @Last Change: 21-Mai-2005. */
-/* @Revision:    0.585 */
+/* @Last Change: 2008-12-04. */
+/* @Revision:    0.586 */
 
 body, table, div {
     font-family : Serif;

data/lib/deplate/define.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # define.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     19-Okt-2004.
-# @Last Change: 2007-05-20.
-# @Revision:    0.546
+# @Last Change: 2009-02-02.
+# @Revision:    0.550
 
 require 'deplate/commands'
 require 'deplate/macros'

data/lib/deplate/deplate-string.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 #!/usr/bin/env ruby
 # deplate-string.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     31-Dez-2005.
-# @Last Change: 18-Aug-2006.
-# @Revision:    0.40
+# @Last Change: 2009-02-02.
+# @Revision:    0.42
 
 require 'deplate/converter'
 

data/lib/deplate/docbook.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # docbook.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: 2007-09-30.
-# @Revision:    0.2748
+# @Last Change: 2009-02-05.
+# @Revision:    0.2756
 
 require 'deplate/xml'
 
@@ -382,17 +383,6 @@ class Deplate::Formatter::Docbook < Deplate::Formatter::XML
         s
     end
 
-    def clean_tags(text, *tags)
-        if text
-            tags = tags.empty? ? '\w+' : tags.join('|')
-            t = text.gsub(/<(#{tags}).*?>.*?<\/\1>|<(#{tags}).*?\/>/, '')
-            t.gsub!(/^\s*$/, '')
-            t.gsub!(/^\n\s*/, '')
-            t.gsub!(/\n\s*$/, '')
-            t
-        end
-    end
-
     def get_item_paragraph(args, item, text)
         formatted_inline('para', text)
     end
@@ -540,7 +530,7 @@ class Deplate::Formatter::Docbook < Deplate::Formatter::XML
         acc = [img]
         alt = args['alt']
         if alt
-            acc << formatted_inline('textobject', formatted_inline('phrase', alt))
+            acc << formatted_inline('textobject', formatted_inline('phrase', plain_text(alt)))
         end
         img = join_blocks(acc)
         if inline

data/lib/deplate/elements.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # elements.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-M�r-2004.
-# @Last Change: 2008-07-09.
-# @Revision:    0.4539
+# @Last Change: 2009-02-02.
+# @Revision:    0.4603
 
 require "deplate/abstract-class"
 
@@ -43,6 +44,7 @@ class Deplate::Element < Deplate::BaseElement
 
     # class methods & variables
     class << self
+
         def match(text)
             return self.rx.match(text)
         end
@@ -97,6 +99,7 @@ class Deplate::Element < Deplate::BaseElement
                     i -= 1
                 end
             rescue Exception => e
+                # p e.backtrace
                 Deplate::Core.log(['Error when running command', e], :error, src)
             end
             run_accumulation_hooks(@@accumulate_post[self], src, array, deplate, text, *args)
@@ -293,6 +296,16 @@ class Deplate::Element < Deplate::BaseElement
         end
     end
 
+    def format_contained(container, *args)
+        unless @postponed_preformat.empty?
+            container.postponed_preformat |= @postponed_preformat
+        end
+        unless @postponed_format.empty?
+            container.postponed_format |= @postponed_format
+        end
+        format_current(*args)
+    end
+
     def format_current(formatting_method=nil)
         formatting_method ||= self.class.formatter
         if formatting_method
@@ -560,6 +573,27 @@ class Deplate::Element < Deplate::BaseElement
 end
 
 
+class Deplate::Element::PseudoElement < Deplate::Element
+
+    def initialize(deplate, src, container, &formatter)
+        super(deplate, src, text, [])
+        @formatter = formatter
+        @container = container
+    end
+
+    def process
+        @container.process_etc
+        # @container.process
+        self
+    end
+
+    def format_special
+        return @formatter.call(self)
+    end
+
+end
+
+
 # Don't register Paragraph in @@elements -- it's assigned if nothing else 
 # matches
 class Deplate::Element::Paragraph < Deplate::Element
@@ -808,7 +842,7 @@ end
 
 class Deplate::List::Itemize < Deplate::List
     register_element
-    set_rx(/^(([[:blank:]]+)([-�+*])[[:blank:]]+)(.+)$/)
+    set_rx(/^(([[:blank:]]+)([-+*])[[:blank:]]+)(.+)$/)
     self.listtype = "Itemize"
 end
 
@@ -859,7 +893,6 @@ class Deplate::List::Task < Deplate::List
             rv[:done] = true
         end
         if due =~ /^\s*x?([0-9-]+%?)/
-            # rv[:due] = ParseDate::parsedate($1, true)
             rv[:due] = $1
         end
 

data/lib/deplate/encoding.rb

@@ -0,0 +1,57 @@
+# encoding.rb
+# @Author:      Thomas Link (micathom AT gmail com)
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     2009-02-04.
+# @Last Change: 2009-02-05.
+# @Revision:    0.0.4
+
+# require ''
+
+module Deplate::Encoding
+
+    module_function
+
+    def ruby_enc_name(enc)
+        case enc.downcase
+        when 'latin-1', 'latin1', 'l1', 'isolat1', 'iso-8859-1'
+            cen = 'iso-8859-1'
+        when 'latin-9', 'latin9', 'l9', 'isolat9', 'iso-8859-15'
+            cen = 'iso-8859-15'
+        when 'gb2312', 'gbk'
+            cen = 'gb2312'
+        when 'koi8-r'
+            cen = 'koi8-r'
+        when 'utf8', 'utf-8'
+            cen = 'utf-8'
+        else
+            log(['Unsupported ruby encoding', enc], :anyway)
+            cen = enc
+        end
+        return cen
+    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 && table[cen]) || cen
+    end
+
+end
+
+
+# Local Variables:
+# revisionRx: REVISION\s\+=\s\+\'
+# End:

data/lib/deplate/etc.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # etc.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     16-Okt-2005.
-# @Last Change: 2008-07-09.
-# @Revision:    0.319
+# @Last Change: 2009-02-02.
+# @Revision:    0.327
 
 require 'deplate/common'
 
@@ -249,9 +250,10 @@ class Deplate::Symbols < Deplate::CommonObject
         %{ }
     end
 
-    def symbol_paragraph(invoker)
-        %{§}
-    end
+    # def symbol_paragraph(invoker)
+    #     # %{§}
+    #     %{�}
+    # end
 
     def format_symbol(invoker, sym)
         return @formatter.plain_text(sym)

data/lib/deplate/external.rb

@@ -1,21 +1,13 @@
+# encoding: ASCII
 # external.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     04-Sep-2004.
-# @Last Change: 2008-07-06.
-# @Revision:    0.217
-
-require "ps2ppm"
-
-# Description:
-# 
-# Usage:
-# 
-# TODO:
-# 
-# CHANGES:
-# 
+# @Last Change: 2009-02-02.
+# @Revision:    0.222
+
+require "deplate/ps2ppm"
 
 module Deplate::External
     @@apps = {}