deplate 0.8.4 → 0.8.5

data/lib/deplate/guesslanguage.rb

@@ -1,9 +1,10 @@
+# encoding: ASCII
 # 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-01-06.
-# @Revision:    0.1.22
+# @Last Change: 2009-02-02.
+# @Revision:    0.1.24
 
 require 'zlib'
 

data/lib/deplate/input.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # input.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 2008-07-20.
-# @Revision:    0.827
+# @Last Change: 2009-02-05.
+# @Revision:    0.833
 #
 # = Description
 # = Usage
@@ -268,7 +269,7 @@ class Deplate::Input < Deplate::CommonObject
     def include_string(string, acc_array, linenumber)
         accum  = []
         string = @skeleton_expander.expand(string) if @skeleton_expander
-        for line in string
+        string.each_line do |line|
             linenumber += 1
             line.chomp!
             unless accum.empty?
@@ -497,7 +498,7 @@ class Deplate::Input < Deplate::CommonObject
                             unless pc && !pc.call(mx)
                                 pre = mx.pre_match
                                 unless pre.empty?
-                                    rt << as_text(container, rt, mx.pre_match, alt, last)
+                                    rt << as_text(container, rt, mx.pre_match, alt, last, args)
                                 end
                                 txt = last + mx.pre_match
                                 begin
@@ -513,11 +514,11 @@ class Deplate::Input < Deplate::CommonObject
                         end
                     end
                     txt = mx.pre_match + mx[0]
-                    rt << as_text(container, rt, txt, alt, last, rest)
+                    rt << as_text(container, rt, txt, alt, last, rest, args)
                 end
                 last = mx[0]
             else
-                rt << as_text(container, rt, rest, alt, last, "")
+                rt << as_text(container, rt, rest, alt, last, "", args)
                 break
             end
         end
@@ -530,12 +531,12 @@ class Deplate::Input < Deplate::CommonObject
         return rt
     end
 
-    def as_text(container, context, match, alt, last="", rest="")
+    def as_text(container, context, match, alt, last="", rest="", args={})
         case match
         when String
             match = Deplate::Particle::Text.pseudo_match(match)
         end
-        Deplate::Particle::Text.new(@deplate, container, context, match, alt, last, rest)
+        Deplate::Particle::Text.new(@deplate, container, context, match, alt, last, rest, args)
     end
     
     def parse_with_particles(container, text, particles, alt=true)

data/lib/deplate/input/deplate-headings.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # deplate-headings.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 2007-03-31.
-# @Revision:    0.42
+# @Last Change: 2009-02-02.
+# @Revision:    0.44
 
 # require 'deplate/input/deplate.rb'
 

data/lib/deplate/input/deplate-restricted.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # deplate-restricted.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 2007-03-31.
-# @Revision:    0.44
+# @Last Change: 2009-02-02.
+# @Revision:    0.46
 
 # Deplate: Standard input
 class Deplate::Input::DeplateRestricted < Deplate::Input

data/lib/deplate/input/deplate.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # deplate.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 20-Nov-2005.
-# @Revision:    0.16
+# @Last Change: 2009-02-02.
+# @Revision:    0.18
 #
 # = Description
 # = Usage

data/lib/deplate/input/play.rb

@@ -1,9 +1,10 @@
+# encoding: ASCII
 # play.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     2007-03-31.
-# @Last Change: 2007-09-30.
-# @Revision:    0.213
+# @Last Change: 2009-02-02.
+# @Revision:    0.215
 
 # require 'deplate/input/deplate.rb'
 

data/lib/deplate/input/rdoc.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # rdoc.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 2007-09-01.
-# @Revision:    0.298
+# @Last Change: 2009-02-02.
+# @Revision:    0.300
 #
 # = Description
 # Based upon Programming Ruby 2, 190ff

data/lib/deplate/input/template.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # template.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 2007-09-01.
-# @Revision:    0.125
+# @Last Change: 2009-02-02.
+# @Revision:    0.127
 
 class Deplate::Input::Template < Deplate::Input
     self.myname = 'template'

data/lib/deplate/lib/Makefile.config

@@ -37,6 +37,9 @@ LATEX_FLAGS=-interaction=nonstopmode
 PDFLATEX_FLAGS=$\{LATEX_FLAGS\}
 BIBTEX_FLAGS=
 
+SWEAVE_DIR=$\{TEX_DIR\}
+SWEAVE_DFLAGS=-d $\{TEX_DIR\} -f sweave
+
 copy_images=if ls *.{jpg,jpeg,png,gif} 2> /dev/null; then cp -uv *.{jpg,jpeg,png,gif} $(1); fi
 copy_css=if ls *.css 2> /dev/null; then cp -vu *.css $(1); fi
 
@@ -85,4 +88,9 @@ prepare_dvi:
 
 prepare_pdf:
 
+prepare_sweave: prepare_tex
+
+define postprocess_sweave
+if [ "$\{CYGWIN\}" ]; then dos2unix $1; fi
+endef
 

data/lib/deplate/locale/de.latin1

@@ -610,6 +610,12 @@ Ausgabedatei muss erneuert werden
 Output not found
 Ausgabedatei nicht gefunden
 
+Please contact us
+Kontaktieren Sie bitte den Autor
+
+Please consider contributing a message catalog for your language
+Sie k�nnten selbst einen Nachrichtenkatalog f�r Ihre Sprache beisteuern
+
 Please refer to slots by their names
 Die Ausgabeposition sollte per Namen angesprochen werden
 

data/lib/deplate/macros.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # macros.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     25-M�r-2004.
-# @Last Change: 2008-04-14.
-# @Revision:    0.1354
+# @Last Change: 2009-02-02.
+# @Revision:    0.1357
 
 require 'forwardable'
 
@@ -404,6 +405,7 @@ end
 
 class Deplate::Macro::Latex < Deplate::Macro
     register_as 'ltx'
+    register_as 'latex'
     set_formatter :format_ltx
 
     attr_reader :accum, :caption

data/lib/deplate/messages.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # mod-en.rb -- Standard messages
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     07-Mai-2004.
-# @Last Change: 2007-09-15.
-# @Revision:    0.206
+# @Last Change: 2009-02-05.
+# @Revision:    0.213
 
 # The base class for localizations
 class Deplate::Messages
@@ -109,9 +110,12 @@ class Deplate::Messages
 
     def initialize(deplate)
         @deplate = deplate
-        if (encoding = prop('encoding'))
-            if (vencoding = @deplate.variables['encoding'])
-                if @deplate.canonic_enc_name(vencoding) != @deplate.canonic_enc_name(encoding)
+        encoding = prop('encoding')
+        if encoding
+            vencoding = @deplate.variables['encoding']
+            if vencoding
+                encoder = @deplate.formatter || Deplate::Encoding
+                if encoder.canonic_enc_name(vencoding) != encoder.canonic_enc_name(encoding)
                     @deplate.log(['Document encoding does not match message encoding', vencoding, encoding], :error)
                 end
             else

data/lib/deplate/metadata.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # metadata.rb
 # @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.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.6
+# @Last Change: 2009-02-02.
+# @Revision:    0.8
 #
 # = Description
 # = Usage

data/lib/deplate/metadata/marshal.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # yaml.rb
 # @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.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.13
+# @Last Change: 2009-02-02.
+# @Revision:    0.15
 #
 # = Description
 # = Usage

data/lib/deplate/metadata/xml.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # xml.rb
 # @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.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.29
+# @Last Change: 2009-02-02.
+# @Revision:    0.31
 #
 # = Description
 # = Usage

data/lib/deplate/metadata/yaml.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # yaml.rb
 # @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.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.10
+# @Last Change: 2009-02-02.
+# @Revision:    0.12
 #
 # = Description
 # = Usage

data/lib/deplate/mod/anyword.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # anyword.rb
 # @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: 2007-06-30.
-# @Revision:    0.96
+# @Last Change: 2009-02-02.
+# @Revision:    0.98
 
 class Deplate::Core
     def module_initialize_anyword

data/lib/deplate/mod/babelfish.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # babelfish.rb
 # @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.
-# @Last Change: 25-Apr-2006.
-# @Revision:    0.22
+# @Last Change: 2009-02-02.
+# @Revision:    0.24
 # 
 # Description:
 # 

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

@@ -1,9 +1,10 @@
+# encoding: ASCII
 # @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
+# @Last Change: 2009-02-02.
+# @Revision:    0.117
 # 
 # = Description
 # This module provides a specialized syntax highlighter using 

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # 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: 2008-04-15.
-# @Revision:    0.107
+# @Last Change: 2009-02-02.
+# @Revision:    0.109
 # 
 # = Description
 # This module provides a specialized syntax highlighter using gvim. Adds 

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # 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: 2008-04-15.
-# @Revision:    0.111
+# @Last Change: 2009-02-02.
+# @Revision:    0.113
 # 
 # = Description
 # This module provides a specialized syntax highlighter using gvim. Adds 

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # code-highlight.rb
 # @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: 2008-04-15.
-# @Revision:    0.66
+# @Last Change: 2009-02-02.
+# @Revision:    0.68
 #
 # = Description
 # Highlight code regions using Andr� Simon's 

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # colored-log.rb
 # @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.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.2
+# @Last Change: 2009-02-02.
+# @Revision:    0.4
 #
 # = Description
 # Enable colored log output

data/lib/deplate/mod/encode.rb

@@ -0,0 +1,33 @@
+# encode.rb
+# @Author:      Thomas Link (micathom AT gmail com)
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     2009-02-03.
+# @Last Change: 2009-02-03.
+# @Revision:    0.0.5
+
+
+raise 'mod/encode requires Ruby 1.9.1 or higher' unless RUBY_VERSION >= '1.9.1'
+
+class Deplate::Formatter
+
+    def plain_text_recode(text)
+        enc = @deplate.variables['encoding']
+        if enc
+            begin
+                return text.encode(enc)
+            rescue Exception => e
+                p e
+                p Encoding.default_internal
+                p Encoding.default_external
+                p enc, text, text.encoding
+            end
+        end
+        return text
+    end
+
+end
+
+
+# Local Variables:
+# revisionRx: REVISION\s\+=\s\+\'
+# End:

data/lib/deplate/mod/endnotes.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # endnotes.rb -- display endnotes instead of footnotes
 # @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.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.85
+# @Last Change: 2009-02-02.
+# @Revision:    0.87
 
 
 class Deplate::Formatter