deplate 0.8.4 → 0.8.5

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # dbk-article.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-02-17.
-# @Revision:    0.2057
+# @Last Change: 2009-02-02.
+# @Revision:    0.2059
 
 require "deplate/docbook"
 require "deplate/fmt/dbk-article"

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # dbk-article.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-02-24.
-# @Revision:    0.2061
+# @Last Change: 2009-02-02.
+# @Revision:    0.2063
 
 require "deplate/docbook"
 

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # dbk-book.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-02-17.
-# @Revision:    0.2053
+# @Last Change: 2009-02-02.
+# @Revision:    0.2055
 
 require "deplate/docbook"
 

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # dbk-ref.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-06-30.
-# @Revision:    0.2127
+# @Last Change: 2009-02-02.
+# @Revision:    0.2129
 
 require "deplate/docbook"
 

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # dbk-slides.rb
 # @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: 2007-02-17.
-# @Revision:    0.14
+# @Last Change: 2009-02-02.
+# @Revision:    0.16
 
 require 'deplate/docbook'
 

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # docbook-snippet.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-Aug-2005.
-# @Last Change: 2007-02-17.
-# @Revision:    0.18
+# @Last Change: 2009-02-02.
+# @Revision:    0.20
 
 require 'deplate/fmt/dbk-article.rb'
 require 'deplate/formatter-snippet.rb'

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # html-snippet.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-Aug-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.12
+# @Last Change: 2009-02-02.
+# @Revision:    0.14
 
 require 'deplate/fmt/html.rb'
 require 'deplate/formatter-snippet.rb'

data/lib/deplate/fmt/html.rb

@@ -1,14 +1,15 @@
+# encoding: ASCII
 # fmt-html.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: 2008-07-18.
-# @Revision:    0.4333
+# @Last Change: 2009-02-05.
+# @Revision:    0.4381
 
 # require 'cgi'
 require 'uri'
-require 'parsedate'
+require 'deplate/compat/parsedate'
 require 'time'
 require 'pathname'
 
@@ -133,6 +134,11 @@ class Deplate::Formatter::HTML < Deplate::Formatter
 
         output_at(:post, :body_end, '</body>')
         output_at(:post, :doc_end,  '</html>')
+
+        @deplate.postponed_print << Proc.new do
+            ch = close_headings(0)
+            output_at(:body, :inner_body_end, ch)
+        end
     end
 
     def html_head
@@ -457,8 +463,6 @@ EOT
                     opts['class'] << 'plus'
                 when '*'
                     opts['class'] << 'asterisk'
-                when '�'
-                    opts['class'] << 'bullet'
                 end
             end
             li = open_tag(invoker, 'li', opts)
@@ -646,7 +650,7 @@ EOT
         end
     end
 
-    def include_image(invoker, file, args, inline=false)
+    def include_image_general(invoker, file, args, inline=false)
         acc  = []
        
         file = args['file'] if args['file']
@@ -871,6 +875,9 @@ EOJS
         if consume_label(id)
             html_args += %{ id="#{id}"}
         end
+        acc = [close_headings(level), '']
+        acc << @variables['htmlHeadingPre']
+        acc << @variables["htmlHeadingPre#{level}"]
         if level > 0 and level <= 6
             hd = "h#{level}"
             if invoker.plain_caption?
@@ -879,10 +886,24 @@ EOJS
                 ls  = invoker.level_as_string
                 ls += '&nbsp;' if ls
             end
-            %{\n<#{hd}#{html_args}>#{l}#{ls}#{elt}</#{hd}>\n}
+            acc << %{<#{hd}#{html_args}>#{l}#{ls}#{elt}</#{hd}>\n}
         else
             l += format_label(invoker, :string, [id]) if id
-            "\n#{l}#{elt}"
+            acc << "#{l}#{elt}"
+        end
+        acc.compact!
+        @deplate.options.headings << invoker
+        return join_blocks(acc)
+    end
+
+    def close_headings(level)
+        super(level) do |hlevel|
+            post = [@variables["htmlHeadingPost#{hlevel}"], @variables['htmlHeadingPost']].compact
+            if post.empty?
+                nil
+            else
+                join_blocks(post)
+            end
         end
     end
 
@@ -945,17 +966,19 @@ EOJS
     ################################################ Commands {{{1
     def format_title(invoker)
         acc = []
+        acc << @variables['htmlTitlePre']
         acc << %{<div class="title">}
-        for i, c in [["title",      %{<p class="title">%s</p>}],
-                     ["author",     %{<p class="author">%s</p>}], 
-                     ["authornote", %{<p class="authornote">%s</p>}],
-                     ["date",       %{<p class="date">%s</p>}]]
+        for i, c in [["title",      %{<#{@variables['htmlTagTitle'] || 'p class="title"'}>%s</p>}],
+                     ["author",     %{<#{@variables['htmlTagAuthor'] || 'p class="author"'}>%s</p>}], 
+                     ["authornote", %{<#{@variables['htmlTagAuthorNote'] || 'p class="authornote"'}>%s</p>}],
+                     ["date",       %{<#{@variables['htmlTagDate'] || 'p class="date"'}>%s</p>}]]
             ii = @deplate.get_clip(i)
             acc << c % ii.elt if ii
         end
         acc << %{</div>}
+        acc << @variables['htmlTitlePost']
         acc << format_pagebreak(invoker, 'title') if invoker.args['page']
-        join_blocks(acc)
+        join_blocks(acc.compact)
     end
 
     alias :format_IMG :format_figure
@@ -1186,16 +1209,6 @@ EOJS
 
     protected ######################################## private methods {{{1
     ################################################ General {{{1
-    def clean_tags(text)
-        if text
-            t = text.gsub(/\<[^>]*?\>/, '')
-            t.gsub!(/^\s*$/, '')
-            t.gsub!(/^\n\s*/, '')
-            t.gsub!(/\n\s*$/, '')
-            t
-        end
-    end
-
     def format_header_or_footer(invoker, type, slot, html_type, html_class)
         args = invoker.args
         acc  = []
@@ -1708,17 +1721,17 @@ EOJS
         acc = []
         start = navbar_guess_file_name(0, nil, :inline)
         if start and start != ''
-            title = @deplate.msg('Frontpage')
-            acc << head_link_tag(%{rel="start" href="#{start}" title="#{clean_tags(title)}"})
+            fp_title = @deplate.msg('Frontpage')
+            acc << head_link_tag(%{rel="start" href="#{start}" title="#{clean_tags(fp_title)}"})
         end
         tags = ['', 'chapter', 'section', 'subsection']
-        @deplate.each_heading(depth || @deplate.options.split_level) do |hd, title|
+        @deplate.each_heading(depth || @deplate.options.split_level) do |hd, hd_title|
             ref    = tags[hd.level]
             anchor = hd.args[:id] || hd.label.first
             file   = hd.output_file_name(:basename => true)
             file   = escape_filename(file)
             file   = [file, '#', anchor].join if anchor
-            acc << head_link_tag(%{rel="#{ref}" href="#{file}" title="#{clean_tags(title)}"})
+            acc << head_link_tag(%{rel="#{ref}" href="#{file}" title="#{clean_tags(hd_title)}"})
         end
         acc.join("\n")
     end

data/lib/deplate/fmt/htmlsite.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # htmlsite.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-28.
-# @Revision:    0.1026
+# @Last Change: 2009-02-02.
+# @Revision:    0.1028
 
 require "deplate/fmt/html"
 

data/lib/deplate/fmt/htmlslides.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # fmt-html.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: 23-Okt-2005.
-# @Revision:    0.809
+# @Last Change: 2009-02-02.
+# @Revision:    0.811
 
 require "deplate/fmt/htmlsite"
 

data/lib/deplate/fmt/htmlwebsite.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # fmt-html.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: 02-Apr-2006.
-# @Revision:    0.442
+# @Last Change: 2009-02-02.
+# @Revision:    0.444
 
 require "deplate/fmt/htmlslides"
 

data/lib/deplate/fmt/latex-dramatist.rb

@@ -1,5 +1,6 @@
+# encoding: ASCII
 # latex-dramatist.rb
-# @Last Change: 2007-09-30.
+# @Last Change: 2009-02-02.
 # Author::      Thomas Link (micathom AT gmail com)
 # License::     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # Created::     2007-08-09.

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

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # latex-snippet.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-Aug-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.14
+# @Last Change: 2009-02-02.
+# @Revision:    0.16
 
 require 'deplate/fmt/latex.rb'
 require 'deplate/formatter-snippet.rb'

data/lib/deplate/fmt/latex.rb

@@ -1,10 +1,11 @@
+# encoding: ASCII
 # latex.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: 2008-07-10.
-# @Revision:    0.2164
+# @Last Change: 2009-02-05.
+# @Revision:    0.2190
 
 require "deplate/formatter"
 
@@ -93,6 +94,10 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
 
         lco = lco.uniq.join(',')
         output_at(:pre, :doc_def, "\\documentclass[#{lco}]{#{@document_class}}")
+        if @deplate.options.pdftex
+            pdfcompresslevel = (@deplate.variables['pdfCompressLevel'] || 9).to_i
+            output_at(:pre, :doc_def, "\\pdfcompresslevel#{pdfcompresslevel}")
+        end
 
         set_document_encoding
         
@@ -378,7 +383,7 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
     
     ################################################ General {{{1
     def format_environment(invoker, env, text, opts=nil)
-        join_blocks(["\\begin{#{env}}", text.rstrip, "\\end{#{env}}\n"])
+        join_blocks(["\\begin{#{env}}", text.rstrip, "\\end{#{env}}#{block_postfix(invoker)}"])
     end
 
     def format_label(invoker, mode=nil, label=nil)
@@ -444,71 +449,75 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
             acc << "\\caption{#{caption.elt}}"
         end
         acc << format_label(invoker, :once)
-        acc << "\\end{figure}\n"
+        acc << "\\end{figure}#{block_postfix(invoker)}"
         join_blocks(acc)
     end
     
-    def include_image(invoker, file, args, inline=false)
-        file = args['file'] if args['file']
-        if file =~ Deplate::HyperLink::Url.rx
-            Deplate::Core.log([%{Cannot include remote images in current document}, file], :error)
-            file = File.basename(file)
-        end
-        ff = use_image_filename(file, args)
-        o  = []
-        bw, bh, bx, by, desc = nil
-        @deplate.in_working_dir do
-            bw = args['bw']
-            bh = args['bh']
-            desc = Deplate::External.image_dimension(ff)
-            unless (bw and bh) or @deplate.options.pdftex
-                bw, bh, bx, by = desc[:bw]
+    def include_image_general(invoker, file, args, inline=false)
+        if args[:verbatim]
+            rv = args[:verbatim]
+        else
+            file = args['file'] if args['file']
+            if file =~ Deplate::HyperLink::Url.rx
+                Deplate::Core.log([%{Cannot include remote images in current document}, file], :error)
+                file = File.basename(file)
             end
-        end
-        unless @deplate.options.pdftex
-            o << "bb=0 0 #{bw || "100"} #{bh || "100"}"
-        end
-        width = args['w'] || args['width']
-        if width
-            if width =~ /^\d+%$/
-                width = width.to_f / 100
-                o << "width=#{width}\\textwidth{}"
-            elsif width =~ /^[.\d]+(cm|mm|in|em|pt)$/
-                o << "width=#{width}"
-            else
-                o << "width=#{width}pt"
+            ff = use_image_filename(file, args)
+            o  = []
+            bw, bh, bx, by, desc = nil
+            @deplate.in_working_dir do
+                bw = args['bw']
+                bh = args['bh']
+                desc = Deplate::External.image_dimension(ff)
+                unless (bw and bh) or @deplate.options.pdftex
+                    bw, bh, bx, by = desc[:bw]
+                end
+            end
+            unless @deplate.options.pdftex
+                o << "bb=0 0 #{bw || "100"} #{bh || "100"}"
             end
-        elsif !inline
-            bb  = desc[:bw]
-            bw  = bb ? bb[0] : nil
-            res = desc[:res]
-            if desc and bb and res
-                estimated_width = bw.to_f / res
-                if estimated_width > 6
-                    o << "width=\\textwidth{}"
+            width = args['w'] || args['width']
+            if width
+                if width =~ /^\d+%$/
+                    width = width.to_f / 100
+                    o << "width=#{width}\\textwidth{}"
+                elsif width =~ /^[.\d]+(cm|mm|in|em|pt)$/
+                    o << "width=#{width}"
+                else
+                    o << "width=#{width}pt"
+                end
+            elsif !inline
+                bb  = desc[:bw]
+                bw  = bb ? bb[0] : nil
+                res = desc[:res]
+                if desc and bb and res
+                    estimated_width = bw.to_f / res
+                    if estimated_width > 6
+                        o << "width=\\textwidth{}"
+                    end
                 end
             end
-        end
-        height = args['h']
-        if height
-            if height =~ /^\d+%$/
-                height = height.to_f / 100
-                o << "height=#{height}\\textheight{}"
-            elsif height =~ /^\d+(cm|mm|in|em|pt)$/
-                o << "height=#{height}"
-            else
-                o << "height=#{height}pt"
+            height = args['h']
+            if height
+                if height =~ /^\d+%$/
+                    height = height.to_f / 100
+                    o << "height=#{height}\\textheight{}"
+                elsif height =~ /^\d+(cm|mm|in|em|pt)$/
+                    o << "height=#{height}"
+                else
+                    o << "height=#{height}pt"
+                end
+            end
+            o = o.join(',')
+            if !o.empty?
+                o = "[#{o}]"
+            end
+            add_package('graphicx')
+            rv  = "\\includegraphics#{o}{#{ff}}"
+            rot = args['rotate'] || @deplate.variables['imgRotate']
+            if rot
+                rv = %{\\rotatebox{#{rot}}{#{rv}}}
             end
-        end
-        o = o.join(',')
-        if !o.empty?
-            o = "[#{o}]"
-        end
-        add_package('graphicx')
-        rv  = "\\includegraphics#{o}{#{ff}}"
-        rot = args['rotate'] || @deplate.variables['imgRotate']
-        if rot
-            rv = %{\\rotatebox{#{rot}}{#{rv}}}
         end
         return rv
     end
@@ -670,7 +679,7 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
             acc << lab
         end
         acc << printable_list(invoker)
-        acc << ""
+        acc << "" unless invoker.inlay?
         join_blocks(acc)
     end
 
@@ -683,7 +692,7 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
 
     def format_paragraph(invoker)
         rv = wrap_text(invoker.elt)
-        if invoker.args[:minor]
+        if invoker.args[:minor] or invoker.inlay?
             return rv
         else
             return join_blocks([rv, ""])
@@ -756,10 +765,12 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
             acc << with_agent(:table_top, String, invoker, capAbove, nil)
             acc << elt
             acc << with_agent(:table_bottom, String, invoker, capAbove, nil)
-        else
+        elsif args["type"] == "fig"
             acc << with_agent(:figure_top, String, invoker)
             acc << elt
             acc << with_agent(:figure_bottom, String, invoker)
+        else
+            acc << elt
         end
         join_blocks(acc)
     end
@@ -791,7 +802,8 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
             acc << "\\maketitle\n" if elts.include?("title")
             # and elts.include?("author")
             kw = keywords
-            acc << %{#{@deplate.msg("Keywords:")} #{kw.join(", ")}} << "" if kw
+            acc << %{#{@deplate.msg("Keywords:")} #{kw.join(", ")}} if kw
+            acc << "" unless invoker.inlay?
         # end
         join_blocks(acc)
     end
@@ -836,7 +848,8 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
             # dest = "file://" + File.expand_path(dest)
         # end
         dest = Deplate::HyperLink.url_anchor(dest, anchor)
-        dest.gsub!(/([&%#])/, "\\\\\\1")
+        # dest.gsub!(/([&%#])/, "\\\\\\1")
+        dest.gsub!(/([%#])/, "\\\\\\1")
         "\\href{%s}{%s}" % [dest, name]
     end
 
@@ -980,7 +993,7 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
         elsif n
             o << "[]"
         end
-        o  = o.join unless o.empty?
+        o  = o.empty? ? '' : o.join
         if np
             cmd = if y then 'citeyear' else 'citealp' end
         elsif ip
@@ -1441,7 +1454,10 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
     
     def float_options(invoker)
         args = invoker.args
-        if args["here"] or @deplate.variables["floatHere"]
+        if args["here"] == "H" or @deplate.variables["floatHere"] == "H"
+            floatPos = "[H]"
+            add_package("float")
+        elsif args["here"] or @deplate.variables["floatHere"]
             floatPos = "[hptb]"
         else
             floatPos = nil
@@ -1460,6 +1476,11 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
         end
         return floatPos, alignCmd
     end
+
+    def block_postfix(invoker)
+        return invoker.inlay? ? "" : "\n"
+    end
+
 end