deplate 0.8 → 0.8.1

data/lib/deplate/etc.rb

@@ -1,10 +1,10 @@
 # etc.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @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: 29-Apr-2006.
-# @Revision:    0.308
+# @Last Change: 2007-09-29.
+# @Revision:    0.312
 
 require 'deplate/common'
 
@@ -85,10 +85,10 @@ module Deplate::Footnote
         if text
             @fnId = @args['id']
             if @fnId and text and !text.empty?
-                @regNote = @fnId
+                # @regNote = @fnId
                 @accum   = text
                 # @level   = @container.level
-                fn = Deplate::Regions::Footnote.new(@deplate, @source, @regNote, {}, self)
+                fn = Deplate::Regions::Footnote.new(@deplate, @source, @fnId, {}, self)
                 fn.finish
             else
                 @fnId ||= text
@@ -122,9 +122,7 @@ class Deplate::IndexEntry
     
     def initialize(container)
         @container = container
-        unless container
-            # p "DBG IndexEntry: container = nil"
-        end
+        # p "DBG IndexEntry: container = nil" unless container
         if block_given?
             yield(self)
         end

data/lib/deplate/external.rb

@@ -1,10 +1,10 @@
 # external.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @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: 08-Apr-2006.
-# @Revision:    0.206
+# @Last Change: 2007-09-02.
+# @Revision:    0.215
 
 require "ps2ppm"
 
@@ -39,7 +39,7 @@ module Deplate::External
     def log_popen(container, cmd)
         rv = []
         if container.deplate.allow_external
-            container.log(["PWD", Dir.pwd])
+            container.log(["CWD", Dir.pwd])
             container.log(["Exec", cmd])
             begin
                 IO.popen(cmd, "w+") do |io|
@@ -80,11 +80,15 @@ module Deplate::External
         bibfile = File.basename(bibfile)
         log_popen(instance, "#{get_app('kpsewhich')} #{bibfile}")
     end
-    
+
     def dvi2ps(instance, dvifile, psfile, other_options=nil)
         log_popen(instance, "#{get_app('dvips')} -E -Z -D 300 #{other_options} -o #{psfile} #{dvifile}")
     end
 
+    def dvi2png(instance, dvifile, outfile, other_options=nil)
+        log_popen(instance, "#{get_app('dvipng')} -T tight -bg Transparent -D 120  #{other_options} -o #{outfile} #{dvifile}")
+    end
+
     def ps2img(instance, device, psfile, outfile, args)
         # r = args["rx"] || instance.deplate.variables["ps2imgRes"] || 96
         r = args["rx"] || instance.deplate.variables["ps2imgRes"] || 120

data/lib/deplate/fmt/dbk-article-4.1.2.rb

@@ -1,10 +1,10 @@
 # dbk-article.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @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: 23-Okt-2005.
-# @Revision:    0.2056
+# @Last Change: 2007-02-17.
+# @Revision:    0.2057
 
 require "deplate/docbook"
 require "deplate/fmt/dbk-article"
@@ -12,6 +12,7 @@ require "deplate/fmt/dbk-article"
 class Deplate::Formatter::DbkArticle412 < Deplate::Formatter::DbkArticle
     self.myname = "dbk-article-4.1.2"
     self.rx     = /dbk|dbk-article|docbook/i
+    self.related = ['dbk']
 
     def setup
         @deplate.variables['dbkClass']   ||= 'article'

data/lib/deplate/fmt/dbk-article.rb

@@ -1,16 +1,17 @@
 # dbk-article.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @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: 23-Okt-2005.
-# @Revision:    0.2058
+# @Last Change: 2007-02-24.
+# @Revision:    0.2061
 
 require "deplate/docbook"
 
 class Deplate::Formatter::DbkArticle < Deplate::Formatter::Docbook
-    self.myname = "dbk-article"
+    self.myname = 'dbk-article'
     self.rx     = /dbk|dbk-article|docbook/i
+    self.related = ['dbk']
     
     def initialize(deplate, args)
         @headings = ['sect1', 'sect2', 'sect3', 'sect4', 'sect5', 'sect6']
@@ -28,19 +29,19 @@ class Deplate::Formatter::DbkArticle < Deplate::Formatter::Docbook
         if lang
             o << %{ lang="#{lang}"}
         end
-        return "<article%s>" % o.join
+        return '<article%s>' % o.join
     end
 
     def get_doc_close(args)
-        return "</article>"
+        return '</article>'
     end
 
     def get_doc_head_open(args)
-        return "<articleinfo>"
+        return '<articleinfo>'
     end
 
     def get_doc_head_close(args)
-        return "</articleinfo>"
+        return '</articleinfo>'
     end
 end
 

data/lib/deplate/fmt/dbk-book.rb

@@ -1,16 +1,17 @@
 # dbk-book.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @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: 23-Okt-2005.
-# @Revision:    0.2052
+# @Last Change: 2007-02-17.
+# @Revision:    0.2053
 
 require "deplate/docbook"
 
 class Deplate::Formatter::DbkBook < Deplate::Formatter::Docbook
     self.myname = "dbk-book"
     self.rx     = /dbk|dbk-book|docbook/i
+    self.related = ['dbk']
 
     def initialize(deplate, args)
         @headings = ["chapter", "sect1", "sect2", "sect3", "sect4", "sect5", "sect6"]

data/lib/deplate/fmt/dbk-ref.rb

@@ -1,16 +1,17 @@
 # dbk-ref.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @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: 02-Apr-2006.
-# @Revision:    0.2125
+# @Last Change: 2007-06-30.
+# @Revision:    0.2127
 
 require "deplate/docbook"
 
 class Deplate::Formatter::DbkRef < Deplate::Formatter::Docbook
     self.myname = "dbk-ref"
     self.rx     = /dbk|dbk-ref|docbook/i
+    self.related = ['dbk']
 
     def initialize(deplate, args)
         @headings = ["refsect1", "refsect2", "refsect3"]
@@ -72,7 +73,7 @@ class Deplate::Formatter::DbkRef < Deplate::Formatter::Docbook
 
         yr = @deplate.variables["copyrightYear"] || dt
         if yr
-            year   = yr.split(/[\s,;]/).collect {|yr| formatted_inline("year", yr)}
+            year   = Deplate::Core.split_list(yr, ',', '; ').collect {|yr| formatted_inline("year", yr)}
             holder = @deplate.get_clip("author")
             holder = formatted_inline("holder", holder.elt) if holder
             copyright = formatted_block("copyright", [year, holder].flatten.compact.join("\n"))

data/lib/deplate/fmt/dbk-slides.rb

@@ -1,10 +1,10 @@
 # dbk-slides.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     29-Apr-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.13
+# @Last Change: 2007-02-17.
+# @Revision:    0.14
 
 require 'deplate/docbook'
 
@@ -12,6 +12,7 @@ require 'deplate/docbook'
 class Deplate::Formatter::DbkSlides < Deplate::Formatter::Docbook
     self.myname = 'dbk-slides'
     self.rx     = /dbk|dbk-slides|docbook/i
+    self.related = ['dbk']
     
     def initialize(deplate, args)
         @headings = ['foilgroup', 'foil']

data/lib/deplate/fmt/dbk-snippet.rb

@@ -1,16 +1,17 @@
 # docbook-snippet.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     11-Aug-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.17
+# @Last Change: 2007-02-17.
+# @Revision:    0.18
 
 require 'deplate/fmt/dbk-article.rb'
 require 'deplate/formatter-snippet.rb'
 
 class Deplate::Formatter::DbkSnippet < Deplate::Formatter::DbkArticle
     self.myname = "dbk-snippet"
+    self.related = ['dbk']
 
     include Deplate::Snippet
 

data/lib/deplate/fmt/html-snippet.rb

@@ -1,5 +1,5 @@
 # html-snippet.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     11-Aug-2005.

data/lib/deplate/fmt/html.rb

@@ -1,10 +1,10 @@
 # fmt-html.rb
-# @Author:      Thomas Link (samul AT web.de)
+# @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: 05-Jun-2006.
-# @Revision:    0.4111
+# @Last Change: 2007-10-12.
+# @Revision:    0.4287
 
 # require 'cgi'
 require 'uri'
@@ -41,7 +41,6 @@ class Deplate::Formatter::HTML < Deplate::Formatter
        
     attr_accessor :html_class
 
-
     ################################################ Setup {{{1
     def initialize(deplate, args)
         super
@@ -61,9 +60,11 @@ class Deplate::Formatter::HTML < Deplate::Formatter
         @encodings = {
             'latin1' => 'iso-8859-1',
         }
+        @deplate.output.attributes[:stepwiseIdx] ||= 0
     end
 
     def hook_post_write_file_html
+        return if @deplate.variables['cssInclude']
         @deplate.options.css.each do |name, anyway|
             begin
                 src = @deplate.collected_css[name]
@@ -80,7 +81,7 @@ class Deplate::Formatter::HTML < Deplate::Formatter
                     end
                 end
             rescue
-                log(["Can't copy css file", name], :error)
+                log(["Cannot copy css file", name], :error)
             end
         end
     end
@@ -163,7 +164,7 @@ class Deplate::Formatter::HTML < Deplate::Formatter
                     date = ParseDate.parsedate(date, true)
                     date = Time.local(*date)
                 rescue
-                    log(["Can't parse date", @deplate.get_clip("date").elt], :error)
+                    log(["Cannot parse date", @deplate.get_clip("date").elt], :error)
                     date = nil
                 end
             end
@@ -199,9 +200,34 @@ class Deplate::Formatter::HTML < Deplate::Formatter
         output_at(:pre, :head_meta, head_meta_tag(%{name="generator" content="deplate.rb #{Deplate::Core.version}"})) unless @variables['noGenerator']
         md = @variables['metaDataExtra']
         output_at(:pre, :head_meta, md) if md
-        
+
         output_at(:pre, :head_title, %{<title>%s</title>} % title) if title
         
+        news = @variables['newsFeed']
+        if news
+            news = [news] if news.kind_of?(String)
+            for feed in news
+                opts, text = @deplate.input.parse_args(feed, nil, false)
+                if (href = opts['rss'])
+                    opts['type'] = 'rss'
+                elsif (href = opts['atom'])
+                    opts['type'] = 'atom'
+                else
+                    href = opts['href'] || text
+                end
+                case opts['type']
+                when 'atom'
+                    type = 'application/atom+xml'
+                else
+                    type = 'application/rss+xml'
+                end
+                type  = %{type="#{type}"}
+                href  = %{href="#{href}"}
+                title = %{title="#{plain_text(opts['title'] || opts['type'])}"}
+                output_at(:pre, :head_meta, head_link_tag(['rel="alternate"', type, title, href].join(' ')))
+            end
+        end
+
         headExtra = @variables['headExtra']
         headExtra = headExtra.join("\n") if headExtra.kind_of?(Array)
         output_at(:pre, :head_extra, headExtra) if headExtra and !headExtra.empty?
@@ -337,8 +363,7 @@ EOT
 
     def wrap_formatted_element_zz_stepwise(invoker, value, args)
         if @variables['stepwiseDisplay']
-            @deplate.output.attributes[:stepwiseIdx] ||= 0
-            idx = @deplate.output.attributes[:stepwiseIdx] += 1
+            idx = stepwise_next
             beg = (@variables['stepwiseBegin'] || '1').to_i
             vis = idx > beg ? 'hidden' : 'visible'
             value.sub!(/\A(\s*)(.*?)(\s*)\Z/m) do |m|
@@ -363,7 +388,45 @@ EOT
         classes.flatten.compact.uniq.join(' ')
     end
 
-    
+    unless defined?(KEYS)
+        KEYS = {
+            'bs'        => '8', 'backspace'   => '8',
+            'tab'       => '9',
+            'enter'     => '13', 'cr'         => '13', 'return'     => '13',
+            'shift'     => '16',
+            'ctrl'      => '17',
+            'alt'       => '18', 'meta'       => '18',
+            'pause'     => '19',
+            'esc'       => '27', 'escape'     => '27',
+            'space'     => '32',
+            'pageup'    => '33',
+            'pagedown'  => '34',
+            'left'      => '37',
+            'right'     => '39',
+            'n'         => '78',
+            '-'         => '109', 'dash'      => '109',
+            'f1'        => '112',
+            'f2'        => '113',
+            'f3'        => '114',
+            'f4'        => '115',
+            'f5'        => '116',
+            'f6'        => '117',
+            'f7'        => '118',
+            'f8'        => '119',
+            'f9'        => '120',
+            'f10'       => '121',
+            'f11'       => '122',
+            'f12'       => '123',
+            ','         => '188', 'comma'     => '188',
+            '.'         => '190', 'period'    => '190',
+            '#'         => '191', 'sharp'     => '191',
+        }
+    end
+
+    def keys_name_to_id(keys)
+        Deplate::Core.split_list(keys, ',', '; ').collect {|key| KEYS[key.downcase] || key}.join(',')
+    end
+
     ################################################ Lists {{{1
     def format_list_item(invoker, type, level, item, args={})
         indent = format_indent(level, true)
@@ -615,7 +678,7 @@ EOT
         
         style = args['style']
         if style
-            style = style.split(/[ ,]/)
+            style = Deplate::Core.split_list(style, ',', '; ', invoker.source)
         else
             style = []
         end
@@ -624,7 +687,7 @@ EOT
 
         img_id = args['id']
         unless img_id
-            fbase  = Deplate::Core.clean_file_name(File.basename(fbase || 'imgid'))
+            fbase  = Deplate::Core.clean_name(File.basename(fbase || 'imgid'))
             img_id = @deplate.auto_numbered(fbase, :inc => 1, :fmt => %{#{fbase}_%s})
         end
         acc << %{id="#{img_id}" name="#{img_id}"}
@@ -951,6 +1014,10 @@ EOJS
         if target
             args['target'] = target
         end
+        rel = invoker.args['rel']
+        if rel
+            args['rel'] = rel
+        end
         return args
     end
     private :href_args
@@ -1146,7 +1213,7 @@ EOJS
     def head_css
         csso = @variables['css']
         if csso
-            csss = csso.split(/\s+/)
+            csss = Deplate::Core.split_list(csso, ',', ' ;', nil, nil)
         else
             csss = []
         end
@@ -1155,6 +1222,9 @@ EOJS
             csss << cls + '.css'
         end
         acc = []
+        if @deplate.variables['cssInclude']
+            acc << %{<style type="text/css">} << %{<!--}
+        end
         csss.each_with_index do | f, i |
             css, media = f.split(/\|/)
             if css =~ /^\+/
@@ -1167,16 +1237,28 @@ EOJS
             unless @deplate.options.css.find {|c, anyway| cssName == c}
                 @deplate.options.css << [cssName]
             end
-            cssFile = @deplate.auxiliary_filename(css)
-            cssFmt  = @deplate.variables['htmlCssUrl'] || @deplate.variables['htmlAuxUrl']
-            cssFile = cssFmt % cssFile if cssFmt
-            opts = [%{rel="stylesheet" type="text/css" href="#{URI.escape(cssFile)}"}]
-            opts << %{title="#{cssName}"} if with_title
-            opts << %{media="#{media}"}  if media
-            acc << head_link_tag(opts.join(' '))
+            if @deplate.variables['cssInclude']
+                cssFile = @deplate.collected_css[css]
+                if cssFile and File.readable?(cssFile)
+                    acc << File.read(cssFile)
+                else
+                    log(['File not found', 'Cannot include CSS', css], :error)
+                end
+            else
+                cssFile = @deplate.auxiliary_filename(css)
+                cssFmt  = @deplate.variables['htmlCssUrl'] || @deplate.variables['htmlAuxUrl']
+                cssFile = cssFmt % cssFile if cssFmt
+                opts = [%{rel="stylesheet" type="text/css" href="#{URI.escape(cssFile)}"}]
+                opts << %{title="#{cssName}"} if with_title
+                opts << %{media="#{media}"}  if media
+                acc << head_link_tag(opts.join(' '))
+            end
         end
         cssExtra = @variables['cssExtra']
         acc << cssExtra if cssExtra
+        if @deplate.variables['cssInclude']
+            acc << %{-->} << %{</style>}
+        end
         return acc.join("\n")
     end
 
@@ -1307,24 +1389,29 @@ EOJS
             for i in arr
                 ff = @deplate.dest
                 xf = i.file(invoker)
-                xl = i.level_as_string
+                xc = i.container
+                xl = xc && xc.heading_level
                 if xf or xl
-                    f = xf || invoker.output_file_name(:level_as_string => xl, 
-                                                       :relative => invoker)
-                    if f == ff
-                        f = ''
-                        l = xl
-                        if l and !l.empty?
-                            t = l
-                        elsif @deplate.options.multi_file_output
-                            t = @variables['refButton'] || '[&rArr;]'
+                    begin
+                        f = xf || invoker.output_file_name(:level_as_string => xl, 
+                                                           :relative => invoker)
+                        if f == ff
+                            f = ''
+                            l = xl
+                            if l and !l.empty?
+                                t = l
+                            elsif @deplate.options.multi_file_output
+                                t = @variables['refButton'] || '[&rArr;]'
+                            else
+                                t = 'I'
+                            end
                         else
-                            t = 'I'
+                            t = @deplate.file_with_suffix(f, '', true)
                         end
-                    else
-                        t = @deplate.file_with_suffix(f, '', true)
+                        acc << format_url(invoker, t, f, i.label, true)
+                    rescue Exception => e
+                        invoker.log(['Internal error: No output file', n, i.label, ff, xf, xl, invoker.class, e], :error)
                     end
-                    acc << format_url(invoker, t, f, i.label, true)
                 else
                     invoker.log(['Index: Neither file nor level defined: dropping', n, i.label], :error)
                 end
@@ -1351,7 +1438,7 @@ EOJS
     end
 
     def format_index_hd_label(char)
-        return "hdIdx#{char}"
+        return "hdIdx#{Deplate::Core.clean_name(char, :chars => '^a-zA-Z0-9')}"
     end
    
 
@@ -1400,7 +1487,13 @@ EOJS
             when :ruler, :noruler
                 return nil
             else
-                c = cell.cell
+                if cell.class == Array
+                    puts caller[0..10].join("\n")
+                    log(["We shouldn't be here. If you can track down when this happens, please send an example to the author.", cell[0].get_text], :error)
+                    return []
+                else
+                    c = cell.cell
+                end
                 if thistag
                     tag = thistag
                 else
@@ -1650,10 +1743,10 @@ EOJS
         return f
     end
 
-    def handle_key(key, function)
-        key = ',%s,' % key.split(/\s*,\s*/).join(',')
+    def handle_key(keys, function)
+        keys = ',%s,' % keys_name_to_id(keys)
         @deplate.output.attributes[:handle_keys] ||= {}
-        @deplate.output.attributes[:handle_keys][key] = function
+        @deplate.output.attributes[:handle_keys][keys] = function
     end
 
     def_service('navigation_links') do |args, text|
@@ -1768,30 +1861,64 @@ EOJS
     
     def_service('stepwise_display') do |args, text|
         stepKey = @variables['stepwiseKey'] || '34'
-        if @variables['stepwiseDisplay'] and stepKey
+        # if @variables['stepwiseDisplay'] and stepKey
+        if stepKey
             handle_key(stepKey, 'StepwiseDisplayNext();')
-            stepInit = @variables['stepwiseBegin'] || '1'
+            stepInit = @variables['stepwiseBegin'] || '0'
+            unless defined?(@nextPage)
+                catch(:exit) do
+                    # files = ['StepWiseNextPage.js']
+                    style = args['style'] || @variables['stepwiseStyle']
+                    files = [style ? "StepWiseNextPage_#{style}.js" : 'StepWiseNextPage.js']
+                    for file in files
+                        @nextPage = get_javascript(file, args)
+                        throw :exit if @nextPage
+                    end
+                    @nextPage = ''
+#                 <<EOJS
+# function StepwiseNextPage(Msg) {
+#     return confirm(Msg);
+# }
+# EOJS
+                end
+            end
             acc = []
             acc << <<EOJS
+#{@nextPage}
 <script type="text/javascript">
     <!--
         var StepwiseCounter = #{stepInit};
+
         function StepwiseDisplayNext() {
             StepwiseCounter = StepwiseCounter + 1;
             var Elt = document.getElementById('Step' + StepwiseCounter);
+            var HighStep = document.getElementById('HighStep' + StepwiseCounter);
+            var NextHighStep = document.getElementById('HighStep' + (StepwiseCounter + 1));
             if (Elt)
                 Elt.style.visibility = 'visible';
+            else if (HighStep)
+                if (NextHighStep)
+                    HighStep.className = 'stephighlight';
+                else
+                    HighStep.className = 'steplast';
 EOJS
-            if @variables['stepwiseContinous']
-            acc << <<EOJS
+            case @variables['stepwiseContinous']
+            when 'confirm', 'query', 'ask', 'yn'
+                acc << <<EOJS
+            else
+                if (StepwiseNextPage("#{@deplate.msg('Next page?')}"))
+                    NavigationNextPage();
+EOJS
+            when true, 1, '1'
+                acc << <<EOJS
             else
                 NavigationNextPage();
 EOJS
             end
             acc << <<EOJS
         }
-        //-->
-    </script>
+    //-->
+</script>
 EOJS
             acc.join
         else
@@ -1836,7 +1963,20 @@ EOJS
         end
         @html_navigation_note
     end
-    
+
+    def get_javascript(file, args)
+        file = @deplate.find_in_lib(file, :formatters => ['javascript'])
+        if file
+            tmpl = Deplate::Template.new(:template  => File.read(file))
+            Deplate::Define.let_variables(@deplate, args) do
+                return tmpl.fill_in(@deplate).join("\n")
+            end
+        else
+            log(['File not found', file])
+        end
+        return nil
+    end
+
 
     private
     def navbar_begin(type, slot, idx)