deplate 0.8.1 → 0.8.2

data/lib/deplate/fmt/latex.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: 2007-09-30.
-# @Revision:    0.2110
+# @Last Change: 2008-07-06.
+# @Revision:    0.2138
 
 require "deplate/formatter"
 
@@ -529,10 +529,11 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
         else
             @packages[pkg] = options.dup
             case pkg
-            when 'hyperref', 'graphicx'
-                if @deplate.options.pdftex
-                    options << 'pdftex'
-                end
+            when 'hyperref'
+                options << 'pdftex'  if @deplate.options.pdftex
+                options << 'unicode' if canonic_encoding() == 'utf-8'
+            when 'graphicx'
+                options << 'pdftex'  if @deplate.options.pdftex
             end
             
             unless options.empty?
@@ -689,12 +690,15 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
     end
 
     def format_abstract(invoker)
-        format_environment(invoker, "abstract", wrap_text(invoker.elt))
+        format_environment(invoker, "abstract", invoker.elt)
     end
 
     def format_quote(invoker)
         env = invoker.args["long"] ? "quotation" : "quote"
-        elt = wrap_text(invoker.elt)
+        # +++TBD CHECK: Extra newlines in output.
+        # https://sourceforge.net/forum/message.php?msg_id=5041702
+        # elt = wrap_text(invoker.elt)
+        elt = invoker.elt
         format_environment(invoker, env, elt)
     end
 
@@ -1017,8 +1021,7 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
     protected ###################################### protected {{{1
     ################################################ General {{{1
     def set_document_encoding
-        enc = @deplate.variables["encoding"] || "latin1"
-        enc = canonic_enc_name(enc)
+        enc = document_encoding()
         output_at(:pre, :fmt_packages, "\\usepackage[#{enc}]{inputenc}")
     end
 
@@ -1308,13 +1311,13 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
             acc << "\\begin{minipage}{\\textwidth}"
             acc << alignCmd
         end
-        acc << "\\begin{tabular}{#{table_cols(invoker)}}"
+        acc << with_agent(:table_tabular_top, String, invoker)
         join_blocks(acc)
     end
 
     def table_table_bottom(invoker, capAbove)
         acc = []
-        acc << "\\end{tabular}"
+        acc << with_agent(:table_tabular_bottom, String, invoker)
         note = with_agent(:table_note, String, invoker)
         acc << "\\end{minipage}" if invoker.contains_footnotes or note
         acc << note if note
@@ -1323,6 +1326,14 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
         acc << "\\end{table}"
         join_blocks(acc)
     end
+    
+    def table_tabular_top(invoker)
+        "\\begin{tabular}{#{table_cols(invoker)}}"
+    end
+
+    def table_tabular_bottom(invoker)
+        "\\end{tabular}"
+    end
 
     def table_longtable_top(invoker, capAbove)
         add_package("longtable")
@@ -1351,7 +1362,7 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
             if invoker.contains_footnotes or invoker.args["note"]
                 acc << "\\begin{minipage}{\\textwidth}"
             end
-            acc << "\\begin{tabular}{#{table_cols(invoker)}}"
+            acc << with_agent(:table_tabular_top, String, invoker)
         end
         join_blocks(acc)
     end
@@ -1364,7 +1375,7 @@ class Deplate::Formatter::LaTeX < Deplate::Formatter
             acc << table_table_bottom(invoker, capAbove)
         else
             acc << format_label(invoker, :once)
-            acc << "\\end{tabular}"
+            acc << with_agent(:table_tabular_bottom, String, invoker)
             note = with_agent(:table_note, String, invoker)
             acc << "\\end{minipage}" if invoker.contains_footnotes or note
             acc << note if note

data/lib/deplate/fmt/plain.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: 2007-09-28.
-# @Revision:    0.3591
+# @Last Change: 2008-05-14.
+# @Revision:    0.3594
 
 require "deplate/formatter"
 
@@ -267,10 +267,9 @@ class Deplate::Formatter::Plain < Deplate::Formatter
                 else
                     i = i.to_s
                 end
+                i += '.' unless i.empty?
             end
-            unless i.empty?
-                i += ". "
-            end
+            i += ' ' unless i.empty?
             return wrap_text([indent, i, item.body].join, :hanging => 2), :none
         when "Itemize"
             if explicit or item.explicit and item.item

data/lib/deplate/fmt/xhtml11m.rb

@@ -0,0 +1,25 @@
+# @Author:      Thomas Link (micathom AT gmail com)
+# @Website:     http://deplate.sf.net/
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     2008-04-14.
+# @Last Change: 2008-04-14.
+# @Revision:    0.42
+
+require "deplate/fmt/xhtml10t"
+
+# An uninformed hack to enable mathml.
+class Deplate::Formatter::XHTML11m < Deplate::Formatter::XHTML10transitional
+    self.myname   = "xhtml11m"
+    self.rx     = /x?html?/i
+    self.suffix = ".xhtml"
+
+    def head_doctype
+        enc = canonic_encoding(nil, 'latin1' => 'ISO-8859-1')
+        return <<HEADER
+<?xml version="1.0" encoding="#{enc}"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/xhtml-math11-f.dtd">
+HEADER
+    end
+
+end
+

data/lib/deplate/formatter.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     31-Okt-2004.
-# @Last Change: 2007-10-21.
-# @Revision:    0.1574
+# @Last Change: 2008-07-06.
+# @Revision:    0.1658
 
 require 'deplate/abstract-class'
 require 'deplate/common'
@@ -135,15 +135,18 @@ class Deplate::Formatter < Deplate::CommonObject
     attr_accessor :bibentries
     # A hash holding all known document services (names => method).
     attr_accessor :doc_services
+    attr_reader   :entities_table
 
     def initialize(deplate, args={})
-        @deplate      = deplate
-        @variables    = deplate.variables
-        @advices      = args[:advices]      || {}
-        @doc_services = args[:doc_services] || initialize_services
-        @inlatex_idx  = 0
-        @encodings    = {}
-        @symbol_proxy = nil
+        @deplate         = deplate
+        @variables       = deplate.variables
+        @advices         = args[:advices]      || {}
+        @doc_services    = args[:doc_services] || initialize_services
+        @inlatex_idx     = 0
+        @encodings       = {}
+        @symbol_proxy    = nil
+        @entities_table  = nil
+        @format_advice_backlist = []
         reset!
     end
 
@@ -239,7 +242,16 @@ class Deplate::Formatter < Deplate::CommonObject
     def log(*args)
         Deplate::Core.log(*args)
     end
-   
+  
+    # def canonic_encoding(default=nil, table=@encodings)
+    def canonic_encoding(default=nil, table={})
+        canonic_enc_name(@variables['encoding'] || default || 'latin1', table)
+    end
+
+    def document_encoding(table=@encodings)
+        canonic_enc_name(@variables['encoding'] || 'latin1', table)
+    end
+
     def canonic_enc_name(enc, table=@encodings)
         case enc.downcase
         when 'latin-1', 'latin1', 'l1', 'isolat1', 'iso-8859-1'
@@ -272,16 +284,20 @@ class Deplate::Formatter < Deplate::CommonObject
     end
 
     def format_particle(agent, invoker, *args)
-        # rv = with_agent(agent, Array, invoker, *args)
-        # rv.empty? ? format_unknown_particle(invoker) : rv.join
-        rv = with_agent(agent, Array, invoker, *args)
-        if rv and !rv.empty? and !self.class.naked_agents.include?(agent)
-            wa = {}
-            wa[:styles] = invoker.styles if invoker.respond_to?(:styles)
-            rv = methods.find_all {|m| m =~ /^wrap_formatted_particle_/ }.
-                inject(rv) {|rv, m| send(m, invoker, rv, wa)}
+        if @format_advice_backlist.include?(agent)
+            send(agent, invoker, *args)
+        else
+            # rv = with_agent(agent, Array, invoker, *args)
+            # rv.empty? ? format_unknown_particle(invoker) : rv.join
+            rv = with_agent(agent, Array, invoker, *args)
+            if rv and !rv.empty? and !self.class.naked_agents.include?(agent)
+                wa = {}
+                wa[:styles] = invoker.styles if invoker.respond_to?(:styles)
+                rv = methods.find_all {|m| m =~ /^wrap_formatted_particle_/ }.
+                    inject(rv) {|rv, m| send(m, invoker, rv, wa)}
+            end
+            rv
         end
-        rv    
     end
 
     def format_particle_as_string(agent, invoker, *args)
@@ -289,16 +305,20 @@ class Deplate::Formatter < Deplate::CommonObject
     end
 
     def format_element(agent, invoker, *args)
-        # rv = with_agent(agent, Array, invoker, *args)
-        # rv.empty? ? format_unknown(invoker) : join_blocks(rv)
-        rv = with_agent(agent, Array, invoker, *args)
-        if rv and !rv.empty? and !self.class.naked_agents.include?(agent)
-            wa = {}
-            wa[:styles] = invoker.styles if invoker.respond_to?(:styles)
-            rv = methods.find_all {|m| m =~ /^wrap_formatted_element_/ }.
-                inject(rv) {|rv, m| send(m, invoker, rv, wa)}
+        if @format_advice_backlist.include?(agent)
+            send(agent, invoker, *args)
+        else
+            # rv = with_agent(agent, Array, invoker, *args)
+            # rv.empty? ? format_unknown(invoker) : join_blocks(rv)
+            rv = with_agent(agent, Array, invoker, *args)
+            if rv and !rv.empty? and !self.class.naked_agents.include?(agent)
+                wa = {}
+                wa[:styles] = invoker.styles if invoker.respond_to?(:styles)
+                rv = methods.find_all {|m| m =~ /^wrap_formatted_element_/ }.
+                    inject(rv) {|rv, m| send(m, invoker, rv, wa)}
+            end
+            rv    
         end
-        rv    
     end
 
     def format_element_as_string(agent, invoker, *args)
@@ -439,6 +459,44 @@ class Deplate::Formatter < Deplate::CommonObject
         end
     end
 
+    def setup_entities
+        unless @entities_table
+            @entities_table = []
+            enc  = canonic_encoding()
+            ents = Deplate::Core.split_list(@deplate.variables['entities'] || 'general')
+            for d in Deplate::Core.library_directories(@deplate.vanilla, true, ['ents'])
+                for pre in self.class.formatter_family_members << nil
+                    for ent in ents
+                        f = File.join(d, '%s-%s.entities' % [ent, [pre, enc].compact.join('_')])
+                        if File.readable?(f)
+                            @entities_table = File.readlines(f).map do |line|
+                                line.chomp.split(/\t/)
+                            end
+                        end
+                    end
+                end
+            end
+        end
+    end
+
+    def char_by_number(number)
+        @entities_table.each do |char, named, numbered|
+            if numbered == number
+                return char
+            end
+        end
+        return number
+    end
+    
+    def char_by_name(name)
+        @entities_table.each do |char, named, numbered|
+            if named == name
+                return char
+            end
+        end
+        return name
+    end
+
     def check_symbol_proxy
         unless @symbol_proxy
             pre_process
@@ -736,9 +794,15 @@ class Deplate::Formatter < Deplate::CommonObject
     # Takes an optional block that takes a string as argument and returns 
     # true if we shouldn't wrap the text at this position
     def wrap_text(text, args={})
+        outerMargin = args[:maxmargin] || (wm = @deplate.variables['wrapMargin'] && wm.to_i) || 72
+        innerMargin = args[:margin]    || (wm = @deplate.variables['wrapMarginInner'] && wm.to_i) || 52
+        return text if outerMargin == 0 and innerMargin == 0
+        if outerMargin == 0
+            outerMargin = innerMargin + 20
+        else
+            innerMargin = outerMargin - 20
+        end
         moreIndent  = args[:indent]    || ''
-        innerMargin = args[:margin]    || 66
-        outerMargin = args[:maxmargin] || 72
         hanging     = args[:hanging]   || nil
         hang_idt    = hanging ? ' ' * hanging : nil
         acc         = []
@@ -843,7 +907,17 @@ class Deplate::Formatter < Deplate::CommonObject
 
     # Format the math macro
     alias :format_math :format_ltx
-   
+  
+    def bare_latex_formula(text)
+        m = /^(\\\[|\$)(.*?)(\\\]|\$)$/.match(text)
+        if m
+            return [m[1] == '\\[', m[2]]
+        else
+            log(['Internal error', text], :error)
+            return nil
+        end
+    end
+
     # Process inline latex. The file names of the output are saved as an 
     # array in <tt>invoker.elt</tt>.
     def inlatex(invoker)
@@ -990,7 +1064,7 @@ class Deplate::Formatter < Deplate::CommonObject
 
     def inlatex_clean(line)
         line = line.chomp
-        unless @deplate.options.allow.include?('t')
+        unless @deplate.is_allowed?('t')
             line.gsub!(INLATEX_RX, '+++disabled+++')
         end
         line

data/lib/deplate/input.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 2007-09-30.
-# @Revision:    0.809
+# @Last Change: 2008-01-30.
+# @Revision:    0.825
 #
 # = Description
 # = Usage
@@ -542,13 +542,13 @@ class Deplate::Input < Deplate::CommonObject
         parse_using(container, text, get_particles(:rx, alt), particles, alt)
     end
 
-    def parse_with_source(source, text, alt=true, excluded=[])
+    def parse_with_source(source, text, alt=true, excluded=nil)
         container = Deplate::PseudoContainer.new(@deplate, :source => source)
-        parse(container, text, alt, excluded)
+        parse(container, text, alt, :excluded => excluded)
     end
 
-    def parse(container, text, alt=true, excluded=nil, args={})
-        excluded ||= []
+    def parse(container, text, alt=true, args={})
+        excluded = args[:excluded] || []
         rx, particles = get_particles(:both, alt)
         for p in excluded
             case p
@@ -568,7 +568,8 @@ class Deplate::Input < Deplate::CommonObject
     # @@rxsrc_argval       = %{(\\\\=|\\\\:|[^=:]*)+?}
     # @@rxsrc_argval = %{("(\\\\"|[^"])*?"|(\\\\ |\\\\=|\\\\:|\\\\!|[%s]+)+?)}
     # @@rxsrc_argval = %{("(\\\\"|[^"])*"|\\\\.|[%s"]+)+?}
-    @@rxsrc_argval = %{("(\\\\"|[^"])*"|\\([^)]+\\)|\\\\.|[^%s"]+)+?}
+    # @@rxsrc_argval = %{("(\\\\"|[^"])*"|\\([^)]+\\)|\\\\.|[^%s"]+)+?}
+    @@rxsrc_argval = %{("(\\\\"|[^"])*"|\\([^)]+\\)|\\\\.|[^%s"]+)*?}
 
     # @@rxsrc_key    = %{[$@\\w]+(\\[\\S*?\\])?}
     # @@rxsrc_args1  = %{(#{@@rxsrc_key})(!|=(#{@@rxsrc_argval}))\\s*} % "=!:"

data/lib/deplate/lib/Makefile.config

@@ -4,12 +4,17 @@ OTHER={arg: files}
 
 DEPLATE=deplate
 
+OFLAGS=
 DFLAGS={arg: options}
 
 HTML_DIR=html
 HTML_PLUS=
 HTML_DFLAGS=$\{HTML_PLUS\} -d $\{HTML_DIR\} -f html
 
+XHTML_DIR=$\{HTML_DIR\}
+XHTML_PLUS=$\{HTML_PLUS\}
+XHTML_DFLAGS=$\{XHTML_PLUS\} -d $\{XHTML_DIR\} -f xhtml11m
+
 WEBSITE_DIR=website
 WEBSITE_DFLAGS=$\{HTML_PLUS\} -d $\{WEBSITE_DIR\} -f htmlsite
 
@@ -37,7 +42,7 @@ copy_css=if ls *.css 2> /dev/null; then cp -vu *.css $(1); fi
 
 .PHONY: view show cleantex website makefile pdfclean dviclean \
 	dbk html pdf tex text man \
-	prepare_website prepare_html prepare_text prepare_php prepare_dbk \
+	prepare_website prepare_html prepare_xhtml prepare_text prepare_php prepare_dbk \
 	prepare_tex prepare_ref prepare_dvi prepare_pdf
 
 default: html
@@ -52,6 +57,11 @@ prepare_html:
 	$(call copy_images,"$\{HTML_DIR\}")
 	$(call copy_css,"$\{HTML_DIR\}")
 
+prepare_xhtml:
+	mkdir -p $\{XHTML_DIR\}
+	$(call copy_images,"$\{XHTML_DIR\}")
+	$(call copy_css,"$\{XHTML_DIR\}")
+
 prepare_text:
 	mkdir -p $\{TEXT_DIR\}
 

data/lib/deplate/locale/de.latin1

@@ -319,6 +319,9 @@ Leerer Textk
 ENDIF without IF
 ENDIF ohne IF
 
+Error in module
+Fehler in Modul
+
 Error in ruby code
 Fehler in Ruby Fragment
 
@@ -394,6 +397,9 @@ ID bereits vorhanden
 Imprint
 Impressum
 
+Inadequate formatter
+Unpassendes Ausgabeformat
+
 Including from STDIN
 Lese von STDIN
 
@@ -840,6 +846,9 @@ Unbekannte Dateiendung
 Unknown template
 Unbekannte Schablone
 
+Unknown theme
+Unbekanntes Thema
+
 Unknown variable
 Unbekannte Variable