deplate 0.8.4 → 0.8.5

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

@@ -1,6 +1,7 @@
+# encoding: ASCII
 #!/usr/bin/env ruby
 # entities.rb
-# @Last Change: 2007-12-03.
+# @Last Change: 2009-02-02.
 # Author::      Thomas Link (micathom AT gmail com)
 # License::     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # Created::     2007-11-28.

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

@@ -1,6 +1,7 @@
+# encoding: ASCII
 #!/usr/bin/env ruby
 # entities.rb
-# @Last Change: 2007-12-04.
+# @Last Change: 2009-02-02.
 # Author::      Thomas Link (micathom AT gmail com)
 # License::     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # Created::     2007-11-28.

data/lib/deplate/mod/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: 2008-07-16.
-# @Revision:    0.1.77
+# @Last Change: 2009-02-02.
+# @Revision:    0.1.79
 
 require 'deplate/guesslanguage'
 

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # html-asciimath.rb -- Support for asciimath.js
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     30-Dez-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.43
+# @Last Change: 2009-02-02.
+# @Revision:    0.45
 
 class Deplate::Formatter::HTML
     def formatter_initialize_html_asciimath

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # html-deplate-button.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: 23-Okt-2005.
-# @Revision:    0.23
+# @Last Change: 2009-02-02.
+# @Revision:    0.25
 
 class Deplate::Formatter::HTML
     def prepare_html_deplate_button

data/lib/deplate/mod/html-headings-navbar.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # html-headings-navbar.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-Nov-2004.
-# @Last Change: 14-Apr-2006.
-# @Revision:    0.45
+# @Last Change: 2009-02-02.
+# @Revision:    0.47
 
 class Deplate::Formatter::HTML
     def formatter_initialize_headings_navbar

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

@@ -1,9 +1,10 @@
+# encoding: ASCII
 # html-highstep.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     2007-01-06.
-# @Last Change: 2007-01-12.
-# @Revision:    0.31
+# @Last Change: 2009-02-02.
+# @Revision:    0.33
 #
 # = Description
 # Provide the macro ''step'' to mark text for stepwise highlighting.

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # html-jsmath.rb -- Support for jsmath.js
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     30-Dez-2004.
-# @Last Change: 2008-04-14.
-# @Revision:    0.59
+# @Last Change: 2009-02-02.
+# @Revision:    0.61
 
 class Deplate::Formatter::HTML
     def prepare_html_jsmath

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

@@ -1,4 +1,5 @@
-# @Last Change: 2008-04-14.
+# encoding: ASCII
+# @Last Change: 2009-02-02.
 # Author::      Thomas Link (micathom AT gmail com)
 # License::     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # Created::     2008-04-13.

data/lib/deplate/mod/html-obfuscate-email.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # html-obfuscate-email.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     13-Jul-2005.
-# @Last Change: 25-Apr-2006.
-# @Revision:    0.34
+# @Last Change: 2009-02-02.
+# @Revision:    0.36
 
 class Deplate::Formatter::HTML
     alias :format_url_re_js_obfuscate_email :format_url

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # mod-html-sidebar.rb -- A popup-mini-toc for html output
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     19-Jul-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.50
+# @Last Change: 2009-02-02.
+# @Revision:    0.52
 # 
 # Description:
 # 

data/lib/deplate/mod/htmlslides-navbar-fh.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # htmlslides-navbar-fh.rb
 # @Author:      Thomas Link, Fritz Heinrichmeyer
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     17-M�r-2004.
-# @Last Change: 02-Apr-2006.
-# @Revision:    0.436
+# @Last Change: 2009-02-02.
+# @Revision:    0.438
 
 
 class Deplate::Formatter::HTML_Site

data/lib/deplate/mod/iconv.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # iconv.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-Apr-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.84
+# @Last Change: 2009-02-02.
+# @Revision:    0.86
 #
 # = Description
 # Recode text on-the-fly using +iconv+. The source encoding is 

data/lib/deplate/mod/imgurl.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # imgurl.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: 30-Mrz-2006.
-# @Revision:    0.28
+# @Last Change: 2009-02-02.
+# @Revision:    0.31
 #
 # = Description
 # Insert URLs to images as image
@@ -12,7 +13,7 @@
 require 'deplate/wiki-markup'
 
 # Insert URLs to images as image
-class Deplate::HyperLink::ImgUrl < Deplate::Input::Wiki::AbstractImgUrl
+class Deplate::HyperLink::ImgUrl < Deplate::Input::Wiki::ImgUrl
     insert_particle_before(Deplate::HyperLink::Url)
     set_rx(/^((file|https?|mailto|ftps?|www):(\S+?)\.(png|jpg|jpeg|gif|bmp))/)
 end

data/lib/deplate/mod/inlatex-compound.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # inlatex-compound.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     07-Apr-2005.
-# @Last Change: 02-Jan-2006.
-# @Revision:    0.49
+# @Last Change: 2009-02-02.
+# @Revision:    0.51
 #
 # = Description
 # This module changes the way deplate processes inline latex fragments. 

data/lib/deplate/mod/koma.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # mod-koma.rb -- Module: use Koma-Script and friends as LaTeX class
 # @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-16.
-# @Revision:    0.110
+# @Last Change: 2009-02-02.
+# @Revision:    0.112
 # 
 # Description:
 # 

data/lib/deplate/mod/lang-de.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: 23-Apr-2006.
-# @Revision:    0.80
+# @Last Change: 2009-02-02.
+# @Revision:    0.82
 
 require 'deplate/messages'
 

data/lib/deplate/mod/lang-en.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: 23-Okt-2005.
-# @Revision:    0.44
+# @Last Change: 2009-02-02.
+# @Revision:    0.46
 
 require 'deplate/messages'
 

data/lib/deplate/mod/lang-ru-koi8-r.rb

@@ -1,11 +1,12 @@
+# encoding: ASCII
 # ru_koi8-r.rb -- Standard messages
 # @Authors:     Maxim Komar (komar from ukr.net), Thomas Link (micathom AT gmail com)
 # @Website:     http://komar.org.ua
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     01-Sep-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.61
+# @Last Change: 2009-02-02.
+# @Revision:    0.63
 
 require 'deplate/messages'
 

data/lib/deplate/mod/lang-ru.rb

@@ -1,9 +1,10 @@
+# encoding: ISO-8859-1
 # lang-ru.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     2007-01-04.
-# @Last Change: 2007-01-04.
-# @Revision:    0.2
+# @Last Change: 2008-12-04.
+# @Revision:    0.3
 
 require 'deplate/mod/lang-ru-koi8-r'
 

data/lib/deplate/mod/lang-zh_CN-autospace.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # zh-cn-autospace.rb
 # @Author:      Thomas Link
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     01-Aug-2004.
-# @Last Change: 2006-12-31.
-# @Revision:    0.226
+# @Last Change: 2009-02-02.
+# @Revision:    0.228
 
 require 'deplate/zh_CN'
 

data/lib/deplate/mod/lang-zh_CN.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # zh-cn.rb
 # @Author:      Thomas Link
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     01-Aug-2004.
-# @Last Change: 2007-01-04.
-# @Revision:    0.168
+# @Last Change: 2009-02-02.
+# @Revision:    0.170
 
 require 'deplate/zh_CN'
 

data/lib/deplate/mod/latex-emph-table-head.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # latex-emph-table-head.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-Nov-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.39
+# @Last Change: 2009-02-02.
+# @Revision:    0.41
 # 
 # Description:
 # 

data/lib/deplate/mod/latex-styles.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # latex-emph-table-head.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-Nov-2004.
-# @Last Change: 2008-01-30.
-# @Revision:    0.363
+# @Last Change: 2009-02-02.
+# @Revision:    0.365
 # 
 # Description:
 # 

data/lib/deplate/mod/latex-verbatim-small.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # latex-verbatim-small.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-Nov-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.27
+# @Last Change: 2009-02-02.
+# @Revision:    0.29
 # 
 # Description:
 # 

data/lib/deplate/mod/linkmap.rb

@@ -1,5 +1,6 @@
+# encoding: ASCII
 # linkmap.rb
-# @Last Change: 2007-09-30.
+# @Last Change: 2009-02-02.
 # Author::      Jeff Barczewski (jeff barczewski at gmail com)
 #               Minor modifications by Thomas Link.
 # License::     GPL (see http://www.gnu.org/licenses/gpl.txt)

data/lib/deplate/mod/makefile.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # makefile.rb
 # @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     28-Aug-2005.
-# @Last Change: 2008-04-13.
-# @Revision:    0.168
+# @Last Change: 2009-02-05.
+# @Revision:    0.209
 #
 # = Description
 # Create a standard makefile.
@@ -37,7 +38,7 @@ class Deplate::Core
 
         base, *files = @options.files
         base0        = File.basename(base, '.*')
-        suffix       = File.extname(base)
+        suffix       = clean_makefile_name(File.extname(base))
 
         if @variables['genericViewer']
             genericViewer = @variables['genericViewer']
@@ -53,42 +54,6 @@ class Deplate::Core
             genericViewer = 'echo Not supported: genericViewer '
         end
 
-        config = <<MAKEFILE
-BASE=#{base0}
-FILE=#{base}
-OTHER=#{files.join(' ') if files}
-
-DEPLATE=deplate
-
-OFLAGS=
-DFLAGS=#{options.join(' ')}
-
-HTML_DIR=html
-HTML_DFLAGS=-d ${HTML_DIR} -f html
-
-XHTML_DIR=html
-XHTML_DFLAGS=-d ${XHTML_DIR} -f xhtml10t
-
-WEBSITE_DIR=website
-WEBSITE_DFLAGS=-d ${WEBSITE_DIR} -f htmlsite
-
-PHP_DIR=php
-PHP_DFLAGS=-d ${PHP_DIR} -f phpsite
-
-TEX_DIR=tex
-TEX_DFLAGS=-d ${TEX_DIR} -f latex
-
-TEXT_DIR=plain
-TEXT_DFLAGS=-d ${TEXT_DIR} -f plain
-
-DBK_DIR=docbook
-DBK_DFLAGS=-d ${DBK_DIR} -f dbk-article
-
-REF_DIR=${DBK_DIR}
-REF_DFLAGS=-d ${REF_DIR} -f dbk-ref
-
-MAKEFILE
-        
         makefile = <<MAKEFILE
 include Makefile.config
 
@@ -101,6 +66,7 @@ xhtml: ${BASE}.xhtml
 pdf:
 	make DFLAGS="${DFLAGS} ${OFLAGS} --pdf" "${BASE}.pdf"
 php: ${BASE}.php
+sweave: ${BASE}.Rnw
 tex: ${BASE}.tex
 text: ${BASE}.text
 man: ${BASE}.1
@@ -126,6 +92,11 @@ website:
 	${DEPLATE} ${DFLAGS} ${OFLAGS} ${XHTML_DFLAGS} $< ${OTHER}
 	echo ${XHTML_DIR}/$@ > .last_output
 
+%.Rnw: %#{suffix}
+	make prepare_sweave
+	${DEPLATE} ${DFLAGS} ${OFLAGS} ${SWEAVE_DFLAGS} $< ${OTHER}
+	echo ${TEX_DIR}/$@ > .last_output
+
 %.text: %#{suffix}
 	make prepare_text
 	${DEPLATE} ${DFLAGS} ${OFLAGS} ${TEXT_DFLAGS} $< ${OTHER}
@@ -160,6 +131,20 @@ website:
 	latex ${LATEX_FLAGS} $<;
 	echo ${TEX_DIR}/$@ > .last_output
 
+# %.pdf: %.Rnw
+sweavepdf:
+	make DFLAGS="${DFLAGS} --pdf" sweave
+	cd ${TEX_DIR}; \\
+	R CMD Sweave ${BASE}.Rnw; \\
+	$(call postprocess_sweave, ${BASE}.tex)
+	make prepare_pdf
+	cd ${TEX_DIR}; \\
+	pdflatex ${PDFLATEX_FLAGS} ${BASE}.tex; \\
+	bibtex ${BIBTEX_FLAGS} ${BASE}; \\
+	pdflatex ${PDFLATEX_FLAGS} ${BASE}.tex; \\
+	pdflatex ${PDFLATEX_FLAGS} ${BASE}.tex
+	echo ${TEX_DIR}/${BASE}.pdf > .last_output
+
 %.pdf: %.tex
 	make prepare_pdf
 	cd ${TEX_DIR}; \\
@@ -200,22 +185,30 @@ MAKEFILE
                 cfg  = File.open(fname) {|io| io.read}
                 tmpl = Deplate::Template.new(:template  => cfg)
                 args = {
-                    'base0'   => base0,
-                    'base'    => base,
-                    'files'   => files ? files.join(' ') : nil,
-                    'options' => options.join(' '),
+                    'base0'   => clean_makefile_name(base0, 2),
+                    'base'    => clean_makefile_name(base, 2),
+                    'files'   => files ? clean_makefile_name(files.join(' '), 2) : nil,
+                    'options' => clean_makefile_name(options.join(' '), 2),
                 }
+                config = nil
                 Deplate::Define.let_variables(self, args) do
                     config = tmpl.fill_in(self)
                 end
+                File.open(Deplate::Core.file_join(@options.dir, 'Makefile.config'), 'w') do |io|
+                    io.puts config
+                end
             else
                 log(['File not found', 'Makefile.config'], :error)
             end
-            File.open(Deplate::Core.file_join(@options.dir, 'Makefile.config'), 'w') do |io|
-                io.puts config
-            end
         end
         exit 0
     end
+
+
+    def clean_makefile_name(text, multiplier=1)
+        backslash = '\\\\' * multiplier
+        text.gsub(/[$]/, "#{backslash}\\0")
+    end
+
 end