deplate 0.7.3 → 0.8

data/lib/deplate/messages.rb

@@ -3,8 +3,8 @@
 # @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.193
+# @Last Change: 23-Apr-2006.
+# @Revision:    0.195
 
 # The base class for localizations
 class Deplate::Messages
@@ -50,7 +50,8 @@ class Deplate::Messages
         # the formatter fmt (e.g., latex_lang instead of lang)
         def prop(key, fmt=nil)
             if fmt
-                af = [fmt.formatter_name, key].join('_')
+                fmt_name = fmt.kind_of?(String) ? fmt : fmt.formatter_name
+                af = [fmt_name, key].join('_')
                 if has_property?(af)
                     return @properties[af]
                 end
@@ -69,7 +70,8 @@ class Deplate::Messages
         # position. Comments can only occur in the head/key position as 
         # there is no message starting with #.
         def load_catalog(lang)
-            langs, catalogs = Deplate::Core.collect_deplate_options('locale', 'locale', '')
+            langs, catalogs = Deplate::Core.collect_deplate_options('locale', 'locale', 
+                                                                    :suffix => '')
             fname = catalogs[lang]
             if fname
                 cat = []

data/lib/deplate/mod/anyword.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     11-Sep-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.93
+# @Last Change: 12-Nov-2005.
+# @Revision:    0.94
 
 class Deplate::Core
     def module_initialize_anyword
@@ -34,7 +34,7 @@ class Deplate::Core
         
         rx  = acc.collect {|n| "(?i:\\b%s\\b)" % Regexp.escape(n)}.join("|")
         body = <<-EOR
-            @rx = /^#{rx}/
+            set_rx(/^#{rx}/)
             def setup_element
                 @inter   = nil
                 @literal = nil

data/lib/deplate/mod/babelfish.rb

@@ -3,8 +3,8 @@
 # @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.21
+# @Last Change: 25-Apr-2006.
+# @Revision:    0.22
 # 
 # Description:
 # 
@@ -18,8 +18,8 @@
 class Deplate::Formatter::HTML
     def prepare_babelfish
         if @deplate.formatter.matches?("html")
-            babel = %{<script type="text/javascript" language="JavaScript1.2" src="http://www.altavista.com/r?entr"></script>}
-            # babel = %{<script type="text/javascript" language="JavaScript1.2" src="http://www.altavista.com/r?inc_translate"></script>}
+            babel = %{<script type="text/javascript" src="http://www.altavista.com/r?entr"></script>}
+            # babel = %{<script type="text/javascript" src="http://www.altavista.com/r?inc_translate"></script>}
             output_at(:post, :pre_body_end, %{<div align="right" class="pageicons">%s</div>} % babel)
         end
     end

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

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     26-Feb-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.93
+# @Last Change: 23-Dez-2005.
+# @Revision:    0.97
 # 
 # = Description
 # This module provides a specialized syntax highlighter using gvim. Adds 
@@ -23,7 +23,7 @@ class Deplate::Regions::Code
     add_highlighter(nil, "htmlsite",   :gvim_to_html)
     
     def gvim_to_html(syntax, style, text)
-        unless @deplate.options.allow_external
+        unless @deplate.allow_external
             return
         end
         gvim = %{#{Deplate::External.get_app('gvim')} -f +"syn on" +"let use_xhtml = 1" +"setf #{syntax}" +"colorscheme #{style || "default"}" +"run! syntax/2html.vim" +"wq" +"q" deplateGvim}
@@ -37,7 +37,11 @@ class Deplate::Regions::Code
                     until io.eof?
                         line = io.gets
                         line.chomp!
-                        rv << line if line =~ /^<pre>$/ .. line =~ /^<\/pre\>$/
+                        if line =~ /^<pre>$/ .. line =~ /^<\/pre\>$/
+                            line.gsub!(/<font (\w+)="(.+?)">(.*?)<\/font>/,
+                                       '<span style="\\1: \\2;">\\3</span>')
+                            rv << line
+                        end
                     end
                 end
                 rv << %{</div>}

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

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     27-Feb-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.41
+# @Last Change: 23-Dez-2005.
+# @Revision:    0.42
 #
 # = Description
 # Highlight code regions using Andr� Simon's 
@@ -41,7 +41,7 @@ class Deplate::Regions::Code
     end
     
     def highlight(syntax, style, text)
-        unless @deplate.options.allow_external
+        unless @deplate.allow_external
             return
         end
         formatter = @deplate.formatter

data/lib/deplate/mod/de.rb

@@ -3,8 +3,8 @@
 # @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.79
+# @Last Change: 23-Apr-2006.
+# @Revision:    0.80
 
 require 'deplate/messages'
 

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

@@ -3,18 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     15-Nov-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.43
-# 
-# Description:
-# 
-# Usage:
-# 
-# TODO:
-# 
-# CHANGES:
-# 
-
+# @Last Change: 14-Apr-2006.
+# @Revision:    0.45
 
 class Deplate::Formatter::HTML
     def formatter_initialize_headings_navbar
@@ -27,7 +17,9 @@ class Deplate::Formatter::HTML
                         max_level = 1
                     end
                     if invoker.level <= max_level
-                        nb = @deplate.invoke_service("navigation_bar", {:invoker => invoker, 'noNavButtons' => true})
+                        nb = invoke_service("navigation_bar",
+                                            :invoker => invoker,
+                                            'noNavButtons' => true)
                         join_blocks([nb, rv])
                     else
                         rv

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

@@ -0,0 +1,39 @@
+# html-jsmath.rb -- Support for jsmath.js
+# @Author:      Thomas Link (samul AT web.de)
+# @Website:     http://deplate.sf.net/
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     30-Dez-2004.
+# @Last Change: 25-Apr-2006.
+# @Revision:    0.58
+
+class Deplate::Formatter::HTML
+    def prepare_html_jsmath
+        output_at(:pre, :body_pre, <<END_OF_HTML
+<script type="text/javascript" src="jsMath/jsMath.js"></script>
+<noscript>
+<div style="color:#CC0000; text-align:center">
+  <b>Warning: <a href="http://www.math.union.edu/locate/jsMath">jsMath</a>
+  requires JavaScript to process the mathematics on this page.<br/>
+  If your browser supports JavaScript, be sure it is enabled.</b>
+</div>
+<hr/>
+</noscript>
+END_OF_HTML
+                 )
+        output_at(:post, :body_post, <<END_OF_HTML
+<script> jsMath.Process() </script>
+END_OF_HTML
+                 )
+    end
+
+    alias :format_math_re_jsmath :format_math
+    def format_math(invoker)
+        m = /\$(.*?)\$/.match(invoker.text)
+        if m
+            %{<span class="math">#{m[1]}</span>}
+        else
+            invoker.log(['Internal error', invoker.text], :error)
+        end
+    end
+end
+

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

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     13-Jul-2005.
-# @Last Change: 27-Okt-2005.
-# @Revision:    0.33
+# @Last Change: 25-Apr-2006.
+# @Revision:    0.34
 
 class Deplate::Formatter::HTML
     alias :format_url_re_js_obfuscate_email :format_url
@@ -36,7 +36,7 @@ class Deplate::Formatter::HTML
                     end
                 end
             end
-            js = %{<script type="text/javascript" language="javascript"><!--
+            js = %{<script type="text/javascript"><!--
 document.write(String.fromCharCode(#{encoded}))
 --></script><noscript>#{noscript}</noscript>}
         else

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

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     17-M�r-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.435
+# @Last Change: 02-Apr-2006.
+# @Revision:    0.436
 
 
 class Deplate::Formatter::HTML_Site
@@ -13,7 +13,7 @@ class Deplate::Formatter::HTML_Site
       navmenu  = []
       doctitle = @deplate.get_clip("title")
       doctitle = if doctitle then  doctitle.elt.to_s else "" end
-      @deplate.each_heading(1) do |section, title|
+      @deplate.each_heading(:top) do |section, title|
         unless section.args["noList"]
           f = section.output_file_name
           v = section.description.gsub(/<\/?[^>]*>/, "")

data/lib/deplate/mod/imgurl.rb

@@ -3,8 +3,8 @@
 # @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.26
+# @Last Change: 30-Mrz-2006.
+# @Revision:    0.28
 #
 # = Description
 # Insert URLs to images as image
@@ -14,14 +14,14 @@ require 'deplate/wiki-markup'
 # Insert URLs to images as image
 class Deplate::HyperLink::ImgUrl < Deplate::Input::Wiki::AbstractImgUrl
     insert_particle_before(Deplate::HyperLink::Url)
-    @rx = /^((file|https?|mailto|ftps?|www):(\S+?)\.(png|jpg|jpeg|gif|bmp))/
+    set_rx(/^((file|https?|mailto|ftps?|www):(\S+?)\.(png|jpg|jpeg|gif|bmp))/)
 end
 
 class Deplate::HyperLink::Extended
     alias :process_re_imgurl :process
     def process
         if @dest =~ /\.(png|jpg|jpeg|gif|bmp)$/
-            @elt = @deplate.formatter.include_image(encode_path(@dest), @args, true)
+            @elt = @deplate.formatter.include_image(self, encode_path(@dest), @args, true)
         else
             process_re_imgurl
         end

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

@@ -3,12 +3,10 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     07-Apr-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.39
+# @Last Change: 02-Jan-2006.
+# @Revision:    0.49
 #
 # = Description
-# This doesn't work yet.
-#
 # This module changes the way deplate processes inline latex fragments. 
 # By default, deplate converts each fragment for its own. When using 
 # this module, the latex fragments are collected in one file, are 
@@ -41,12 +39,11 @@ class Deplate::Formatter
         inlatex_compound(pseudo)
         fnames = pseudo.elt
         if fnames.size != @inlatex_container.size
-            log("Conversion if compound Inline LaTeX failed", :error)
-        else
-            @inlatex_container.each_with_index do |o, i|
-                e = fnames[i]
-                o.elt = [e]
-            end
+            log(['Unexpected number of output files',
+                "#{fnames.size} (#{@inlatex_container.size})"], :error)
+        end
+        if @inlatex_container.kind_of?(Array) and fnames.kind_of?(Array)
+            @inlatex_container.each_with_index {|o, i| o.elt = [fnames[i]]}
         end
     end
 

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

@@ -3,8 +3,8 @@
 # @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.345
+# @Last Change: 23-Mrz-2006.
+# @Revision:    0.350
 # 
 # Description:
 # 
@@ -18,7 +18,6 @@
 
 # The dummy base style
 class Deplate::Formatter::LaTeX::Styles
-    
     def initialize(deplate)
         @deplate   = deplate
         @formatter = deplate.formatter
@@ -435,9 +434,13 @@ class Deplate::Formatter::LaTeX
                     styles += style_var.split(/\s*,\s*/) if style_var
                 end
                 styles.compact!
+                style_arg = invoker.args["style"]
                 for style in styles
                     styler = @style_engines[style] || setup_styler(style)
-                    rv = styler.send(agent, rv, invoker, *args)
+                    if styler
+                        style_arg.delete(style) if style_arg
+                        rv = styler.send(agent, rv, invoker, *args)
+                    end
                 end
                 rv
             end

data/lib/deplate/mod/makefile.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     28-Aug-2005.
-# @Last Change: 31-Okt-2005.
-# @Revision:    0.143
+# @Last Change: 25-Apr-2006.
+# @Revision:    0.156
 #
 # = Description
 # Create a standard makefile.
@@ -47,7 +47,7 @@ class Deplate::Core
             genericViewer = 'gnome-open'
         elsif ENV['KDEDIR']
             genericViewer = 'kfmclient'
-        elsif ENV['CYGWIN'] || ENV['CYGWIN_PATH']
+        elsif ENV['CYGWIN'] || ENV['CYGWIN_PATH'] || ENV['CYGWIN_HOME']
             genericViewer = 'cygstart'
         else
             genericViewer = 'echo Not supported: genericViewer '
@@ -111,7 +111,7 @@ makefile:
 website:
 	mkdir -p ${WEBSITE_DIR}
 	${DEPLATE} ${DFLAGS} ${WEBSITE_DFLAGS} ${FILE} ${OTHER}
-	echo ${website_dir}/${BASE}.html > .last_output
+	echo ${WEBSITE_DIR}/${BASE}.html > .last_output
 
 %.html: %#{suffix}
 	mkdir -p ${HTML_DIR}
@@ -148,7 +148,7 @@ website:
 	latex $<; \\
 	bibtex $*; \\
 	latex $<; \\
-	latex $<; \\
+	latex $<;
 	echo ${TEX_DIR}/$@ > .last_output
 
 %.pdf: %.tex
@@ -177,14 +177,30 @@ cleantex:
 MAKEFILE
 
         log('Writing Makefile', :anyway)
-        File.open(File.join(@options.dir, 'Makefile'), 'w') do |io|
+        File.open(Deplate::Core.file_join(@options.dir, 'Makefile'), 'w') do |io|
             io.puts makefile
         end
         if File.exist?('Makefile.config')
             log('Makefile.config already exists', :anyway)
         else
             log('Writing Makefile.config', :anyway)
-            File.open(File.join(@options.dir, 'Makefile.config'), 'w') do |io|
+            fname = find_in_lib('Makefile.config', :pwd => true)
+            if fname
+                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(' '),
+                }
+                Deplate::Define.let_variables(self, args) do
+                    config = tmpl.fill_in(self, :source => @source)
+                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