deplate 0.8 → 0.8.1

data/lib/deplate/fmt/null.rb

@@ -1,5 +1,5 @@
 # null.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.

data/lib/deplate/fmt/php.rb

@@ -1,5 +1,5 @@
 # php.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.

data/lib/deplate/fmt/phpsite.rb

@@ -1,5 +1,5 @@
 # phpsite.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.

data/lib/deplate/fmt/plain.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.3577
+# @Last Change: 2007-09-28.
+# @Revision:    0.3591
 
 require "deplate/formatter"
 
@@ -23,6 +23,7 @@ class Deplate::Formatter::Plain < Deplate::Formatter
         super
         @color        = deplate.variables['ansiColor'] && defined?(Deplate::Color)
         @list_counter = {}
+        @references   = {}
     end
 
     def read_bib(bibfiles)
@@ -275,6 +276,9 @@ class Deplate::Formatter::Plain < Deplate::Formatter
             if explicit or item.explicit and item.item
                 # and !item.item.empty?
                 i = item.item
+            elsif (itemize_markers = @deplate.variables['itemizeMarkers'])
+                itemize_markers = Deplate::Core.split_list(itemize_markers)
+                i = itemize_markers[(level % itemize_markers.size) - 1]
             else
                 i = LIST_ITEMIZE_MARKERS[level % LIST_ITEMIZE_MARKERS_N]
             end
@@ -372,15 +376,17 @@ class Deplate::Formatter::Plain < Deplate::Formatter
 
     # <+TBD+> [1] + urls at the bottom
     def format_url(invoker, name, dest, anchor, literal=false)
-        idx = @deplate.footnote_last_idx += 1
-        fn = "[#{idx}]"
-        # invoker.container.postponed_format << Proc.new do |container|
-            hlink = Deplate::HyperLink.url_anchor(dest, anchor)
+        hlink = Deplate::HyperLink.url_anchor(dest, anchor)
+        fn    = @references[hlink]
+        unless fn
+            idx = @deplate.footnote_last_idx += 1
+            fn  = "[#{idx}]"
+            @references[hlink] = fn
             if @color
                 hlink = Deplate::Color.underline(hlink)
             end
             output_at(:body, :footnotes, %{#{fn} #{hlink}})
-        # end
+        end
         if name and !(name.empty?)
             rv = [name, fn].join
         else
@@ -435,7 +441,8 @@ class Deplate::Formatter::Plain < Deplate::Formatter
 
     def format_ref(invoker)
         prefix = invoker.args['prefix'] || ' '
-        prefix + @deplate.labels[invoker.text]
+        text = (invoker.text && @deplate.labels[invoker.text]) || ''
+        prefix + text
     end
 
     def format_break(invoker)

data/lib/deplate/fmt/template.rb

@@ -1,5 +1,5 @@
 # template.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:     25-M�r-2005.

data/lib/deplate/fmt/xhtml10t.rb

@@ -1,5 +1,5 @@
 # fmt-xhtml.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:     03-Aug-2004.

data/lib/deplate/formatter-snippet.rb

@@ -1,5 +1,5 @@
 # formatter-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/formatter.rb

@@ -1,10 +1,10 @@
 # formatter.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:     31-Okt-2004.
-# @Last Change: 05-Jun-2006.
-# @Revision:    0.1443
+# @Last Change: 2007-10-21.
+# @Revision:    0.1574
 
 require 'deplate/abstract-class'
 require 'deplate/common'
@@ -76,6 +76,54 @@ class Deplate::Formatter < Deplate::CommonObject
                 end
             end
         end
+
+        def set_options_for_file(options, file=nil)
+            case file
+            when '-'
+                options.ext      = ''
+                options.srcdir ||= Dir.pwd
+                options.out    ||= '-'
+            else
+                options.suffix ||= self.suffix
+                unless file.nil?
+                    options.ext      = File.extname(file)
+                    options.srcdir ||= File.dirname(file)
+                end
+                if options.out
+                    options.out = Deplate::Core.file_join(options.dir, options.out)
+                    # if options.out != '-'
+                    #     options.out = options.dir ? Deplate::Core.file_join(options.dir, options.out) : options.out
+                    # end
+                elsif file.nil?
+                    options.out = '-'
+                else
+                    options.out = Deplate::Core.get_out_fullname(file, options.suffix, options)
+                end
+            end
+            options
+        end
+
+        def formatter_family_members(args={})
+            acc = []
+            formatter_names = args[:names] || []
+            formatter_class = fmt = self
+            myname = fmt.myname
+            while myname
+                acc << myname
+                yield(myname) if block_given?
+                fmt = fmt.superclass
+                myname = fmt.myname
+            end
+            (formatter_class.related + formatter_names).each do |myname|
+                acc << myname
+                yield(myname) if block_given?
+            end
+            acc
+        end
+
+        def formatter_related?(name)
+            formatter_family_members.include?(name)
+        end
     end
  
     @@custom_particles = {}
@@ -99,11 +147,29 @@ class Deplate::Formatter < Deplate::CommonObject
         reset!
     end
 
+    def formatter_related?(name)
+        self.class.formatter_related?(name)
+    end
+
     def reset!
         @bibentries      = {}
         @open_labels     = []
-        @consumed_labels = []
-        @consumed_ids    = []
+        # @consumed_labels = []
+        # @consumed_ids    = []
+    end
+
+    def consumed_labels
+        @deplate.output.attributes[:consumed_labels]
+    end
+    def consumed_labels=(arg)
+        @deplate.output.attributes[:consumed_labels] = arg
+    end
+
+    def consumed_ids
+        @deplate.output.attributes[:consumed_ids]
+    end
+    def consumed_ids=(arg)
+        @deplate.output.attributes[:consumed_ids] = arg
     end
 
     def retrieve_particle(id, body=nil, specific=false)
@@ -164,8 +230,8 @@ class Deplate::Formatter < Deplate::CommonObject
                 log(['Calling service failed', name, e], :error)
             end
         else
-            p "DBG"
-            puts @doc_services.keys.sort.join("\n")
+            # p "DBG"
+            # puts @doc_services.keys.sort.join("\n")
             log(['Unknown service', name], :error)
         end
     end
@@ -274,9 +340,11 @@ class Deplate::Formatter < Deplate::CommonObject
                 begin
                     inner = self.send(agent, *args)
                 rescue Exception => e
-                    puts "DBG: #{agent}"
+                    log("We shouldn't be here. If you can track down when this happens, please send an example to the author.", :error)
+                    puts "DBG: #{agent}: #{e}"
                     puts e.backtrace[0..10].join("\n")
-                    raise e
+                    # raise e
+                    return nil
                 end
                 prototype ||= inner.class
             end
@@ -292,7 +360,7 @@ class Deplate::Formatter < Deplate::CommonObject
             # return rv
             return inner
         else
-            invoker.log(["Unknown formatting agent", agent], :error)
+            invoker.log(['Unknown formatting agent', agent], :error)
             return nil
         end
     end
@@ -448,7 +516,7 @@ class Deplate::Formatter < Deplate::CommonObject
     end
     
     def encode_id(id)
-        id ? Deplate::Core.clean_file_name(id, "__") : id
+        id ? Deplate::Core.clean_name(id) : id
     end
     
     def label_mode
@@ -485,12 +553,15 @@ class Deplate::Formatter < Deplate::CommonObject
     end
 
     def matches?(text)
-        if text[0..0] == "~"
-            rv = (formatter_name =~ Regexp.new(text[1..-1]))
-        else
-            rv = (text =~ formatter_rx)
+        self.class.formatter_family_members.any? do |fmtname|
+            fmt = @deplate.get_formatter_class(fmtname)
+            if text[0..0] == '~'
+                rv = (fmt.myname =~ Regexp.new(text[1..-1]))
+            else
+                rv = (text =~ fmt.rx)
+            end
+            return rv ? true : false
         end
-        return rv ? true : false
     end
 
     def format_GET(invoker)
@@ -533,7 +604,21 @@ class Deplate::Formatter < Deplate::CommonObject
     def format_PAGEBREAK(invoker)
         format_pagebreak(invoker, nil, true)
     end
-    
+
+    def format_CAST(invoker)
+        return ''
+    end
+
+    def format_ACT(invoker)
+        return ''
+    end
+
+    def format_direct(invoker, text=nil)
+        # invoker.push_styles(['emphasized'])
+        invoker.push_styles(['play-direct'])
+        "(%s)" % (text || invoker.elt || invoker.text)
+    end
+
     def fill_in_template(invoker)
         invoker.elt
     end
@@ -542,11 +627,11 @@ class Deplate::Formatter < Deplate::CommonObject
     end
 
     def bib_entry(key)
-        b = @bibentries[key] || []
-        crossref = b.assoc('crossref')
+        b = @bibentries[key] || {}
+        crossref = b['crossref']
         if crossref
-            cb = @bibentries[crossref[1]]
-            b += cb if cb
+            cb = @bibentries[crossref]
+            b.update(cb) {|k, o, n| o} if cb
         end
         return b
     end
@@ -597,7 +682,11 @@ class Deplate::Formatter < Deplate::CommonObject
     def_abstract :format_index, :format_footnote, :format_ref, 
         :format_linebreak, :format_subscript, :format_superscript, :format_stacked, 
         :format_pagenumber
-    
+
+    def format_region(invoker)
+        invoker.elt.strip
+    end
+
     def format_cite(invoker)
         bib_styler.bib_cite(invoker)
     end
@@ -661,6 +750,11 @@ class Deplate::Formatter < Deplate::CommonObject
             rx = /\s+/
         end
         text.each do |text|
+            if text.kind_of?(Array)
+                log("We shouldn't be here. If you can track down when this happens, please send an example to the author.", :error)
+                puts caller[0..10].join("\n")
+                return ''
+            end
             m     = /^(\s*)(.*)$/.match(text)
             idt   = m[1] + moreIndent
             accum = [m[1]]
@@ -671,7 +765,7 @@ class Deplate::Formatter < Deplate::CommonObject
                 this, rest = break_line(rest, rx, imx, block)
                 accum << this
                 if rest
-                    accum << "\n"
+                    accum << " \n"
                     accum << idt
                     accum << hang_idt if hang_idt
                 end
@@ -714,8 +808,8 @@ class Deplate::Formatter < Deplate::CommonObject
     # Format the Inlatex region
     def format_inlatex(invoker)
         args   = invoker.args
-        inline = args["inline"]
-        args["h"] ||= (args["inlineLatexHeight"] || args["inlatexHeight"]) if inline
+        inline = args['inline']
+        args['h'] ||= (args['inlineLatexHeight'] || args['inlatexHeight']) if inline
         acc    = []
         elt    = invoker.elt
         if elt
@@ -732,9 +826,9 @@ class Deplate::Formatter < Deplate::CommonObject
     def format_ltx(invoker, other_args={})
         args = invoker.args
         acc  = []
-        args["h"]   ||= (args["inlineLatexHeight"] || other_args["h"])
-        args["alt"] ||= invoker.text
-        args["style"] = "latex"
+        args['h']   ||= (args['inlineLatexHeight'] || other_args['h'])
+        args['alt'] ||= invoker.text
+        args['style'] = 'latex'
         inlatex = invoker.elt
         if !inlatex or inlatex.empty?
             acc << invoker.text
@@ -755,27 +849,30 @@ class Deplate::Formatter < Deplate::CommonObject
     def inlatex(invoker)
         pkgs, body = inlatex_split(invoker.accum)
         id      = inlatex_id(invoker)
-        sfx     = invoker.args["sfx"] || @deplate.variables['ltxSfx'] || inlatex_sfx
+        sfx     = invoker.args['sfx'] || @deplate.variables['ltxSfx'] || inlatex_sfx
         currDir = Dir.pwd
         @deplate.in_working_dir do
-            ftex    = id + ".tex"
-            flog    = id + ".log"
-            faux    = id + ".aux"
-            fdvi    = id + ".dvi"
-            fps     = id + ".ps"
+            ftex    = id + '.tex'
+            flog    = id + '.log'
+            faux    = id + '.aux'
+            fdvi    = id + '.dvi'
+            fps     = id + '.ps'
             checkOW = true
 
             case sfx
-            when "ps"
+            when 'ps'
                 device  = nil
                 fout    = fps
                 checkOW = false
-            when "pdf"
-                device  = "pdfwrite"
-                fout    = id + ".*.pdf"
-            when "jpeg", "jpg"
-                device  = "jpeg"
-                fout    = id + ".*.jpeg"
+            when 'pdf'
+                device  = 'pdfwrite'
+                fout    = id + '.*.pdf'
+            when 'jpeg', 'jpg'
+                device  = 'jpeg'
+                fout    = id + '.*.jpeg'
+            when "png"
+                device  = "png"
+                fout    = id + ".png"
             else
                 raise "Unknown device/suffix: #{sfx}"
             end
@@ -787,6 +884,7 @@ class Deplate::Formatter < Deplate::CommonObject
                 "\\usepackage{amsmath}",
                 "\\usepackage{amsfonts}",
                 "\\usepackage{amssymb}",
+                # "\\usepackage{mathabx}",
             ]
             acc += pkgs
             acc << "\\begin{document}" << "\\pagestyle{empty}"
@@ -794,7 +892,7 @@ class Deplate::Formatter < Deplate::CommonObject
             acc << "\\end{document}"
 
             if Deplate::Region.check_file(invoker, fout, ftex, acc)
-                invoker.log(["Files exist! Using", fout], :anyway)
+                invoker.log(['Files exist! Using', fout], :anyway)
             else
                 if checkOW and !@deplate.options.force
                     for f in [ftex, flog, faux, fdvi, fout]
@@ -811,11 +909,16 @@ class Deplate::Formatter < Deplate::CommonObject
                 if block_given?
                     yield(invoker, device, fdvi, fps, fout)
                 else
-                    inlatex_process_dvi(invoker, fdvi, fps) if File.exist?(fdvi)
-                    if device
-                        inlatex_process_ps(invoker, device, fps, fout, invoker.args)
-                    elsif fps != fout
-                        File.rename(fps, fout)
+                    case device
+                    when "png"
+                        inlatex_process_dvi_png(invoker, fdvi, fout) if File.exist?(fdvi)
+                    else
+                        inlatex_process_dvi(invoker, fdvi, fps) if File.exist?(fdvi)
+                        if device
+                            inlatex_process_ps(invoker, device, fps, fout, invoker.args)
+                        elsif fps != fout
+                            File.rename(fps, fout)
+                        end
                     end
                 end
             end
@@ -848,6 +951,10 @@ class Deplate::Formatter < Deplate::CommonObject
         dvi2ps(invoker, fdvi, fps)
     end
 
+    def inlatex_process_dvi_png(invoker, fdvi, fout)
+        dvi2png(invoker, fdvi, fout)
+    end
+
     def inlatex_process_ps(invoker, device, fps, fout, args)
         ps2img(invoker, device, fps, fout, args) if File.exist?(fps)
     end
@@ -913,6 +1020,13 @@ class Deplate::Formatter < Deplate::CommonObject
         end
     end
 
+    def dvi2png(invoker, fdvi, fout, other_options=nil)
+        if Deplate::External.dvi2png(invoker, fdvi, fout, other_options) and @deplate.options.clean
+            File.delete(fdvi) if @deplate.options.clean
+            invoker.log(["Deleting", fdvi])
+        end
+    end
+
     def ps2img(invoker, device, fps, fout, args)
         if Deplate::External.ps2img(invoker, device, fps, fout, args) and @deplate.options.clean
             File.delete(fps)
@@ -1006,6 +1120,15 @@ class Deplate::Formatter < Deplate::CommonObject
     #     end
     # end
 
+    def stepwise_prepare
+        # @deplate.output.attributes[:stepwiseIdx] ||= 0
+    end
+
+    def stepwise_next
+        stepwise_prepare
+        @deplate.output.attributes[:stepwiseIdx] += 1
+    end
+
 
     private
     def initialize_services
@@ -1104,11 +1227,11 @@ class Deplate::Formatter < Deplate::CommonObject
     def consume_label(label, warn=false)
         if !label
             return false
-        elsif @consumed_labels.include?(label)
+        elsif consumed_labels.include?(label)
             log(['Duplicate label'], label, :error) if warn
             return false
         else
-            @consumed_labels << label
+            consumed_labels << label
             return true
         end
     end
@@ -1129,7 +1252,7 @@ class Deplate::Formatter < Deplate::CommonObject
         args   ||= {}
         labels   = labels ? labels.dup : []
         id = use_id(args, opts)
-        l  = args["label"]
+        l  = args['label']
         labels << l if l
         # i  = opts[:invoker]
         # if i
@@ -1140,11 +1263,11 @@ class Deplate::Formatter < Deplate::CommonObject
         elsif id
             labels.delete(id)
         end
-        labels.delete_if {|e| @consumed_labels.include?(e)}
+        labels.delete_if {|e| consumed_labels.include?(e)}
         labels.flatten!
         labels.compact!
         labels.uniq!
-        @consumed_labels += labels unless labels.empty?
+        self.consumed_labels += labels unless labels.empty?
         return labels
     end
 
@@ -1164,7 +1287,7 @@ class Deplate::Formatter < Deplate::CommonObject
         if kw.kind_of?(Array)
             kw
         elsif kw.kind_of?(String)
-            kw.split(/\s*[,;]\s*/)
+            Deplate::Core.split_list(kw, ';', ',')
         elsif kw
             log(["Shouldn't be here", kw, kw.class], :error)
         else
@@ -1177,14 +1300,14 @@ class Deplate::Formatter < Deplate::CommonObject
     def build_plain_text_rx
         @plain_text_rx = Regexp.new('(%s)' % @special_symbols.keys.collect {|x| Regexp.escape(x)}.join('|'))
     end
-    
+
 
     ################################################ Bibliography {{{1
     def bib_styler
         style = @deplate.variables['bibStyle']
         @deplate.bib_styler(style)
     end
-    
+   
     def simple_bibtex_reader(bibfiles)
         acc = []
         for b in bibfiles
@@ -1197,41 +1320,109 @@ class Deplate::Formatter < Deplate::CommonObject
             end
             File.open(b) {|io| acc << io.read}
         end
+        text = acc.join("\n")
+        @configuration   = self
+        @crossreferenced = []
+        entries, prelude = simple_bibtex_parser(text)
+        @bibentries.update(entries)
+    end
+
+    def simple_bibtex_parser(text, strings_expansion=true)
+        prelude = []
         strings = {}
-        acc     = acc.join("\n")
-        loop do
-            m = /^\s*@string\{\s*(\S+?)\s*=\s*(.+?)\s*\}/m.match(acc)
-            if m
-                r = m[2]
+        entries = {}
+        lineno  = 1
+        # m = /^\s*(@(\w+)\{(.*?)\})\s*(?=(^@|\z))/m.match(text)
+        while (m = /^\s*(@(\w+)\{(.*?))\s*(?=(^@|\z))/m.match(text))
+            text  = m.post_match
+            body  = m[0]
+            type  = m[2]
+            inner = m[3]
+            case type.downcase
+            when 'string'
+                prelude << body
+                mi = /^\s*(\S+?)\s*=\s*(.+?)\s*\}?\s*$/m.match(inner)
+                r = mi[2]
                 if r =~ /^(".*?"|'.*?'|\{.*?\})$/
                     r = r[1..-2]
                 end
-                strings[m[1]] = r
-                acc = m.post_match
-                next
-            end
-            m = /^\s*(@(\w+)\{\s*(\S+?)\s*,.*?)(?=(^@|\z))/m.match(acc)
-            if m
-                id = m[3]
-                e  = m[1]
-                arr = e.scan(/^\s*(\w+)\s*=\s*(\{.*?\}|\d+)\s*[,}]\s*$/m)
-                arr.collect! do |var, val, rest|
-                    n = /^\s*\{(.*?)\}\s*($|\}\s*\z)/m.match(val)
-                    if n
+                strings[mi[1]] = r
+            else
+                mi = /^\s*(\S+?)\s*,(.*)$/m.match(inner)
+                id = mi[1]
+                e  = mi[2]
+                # arr = e.scan(/^\s*(\w+)\s*=\s*(\{.*?\}|\d+)\s*[,}]\s*$/m)
+                arr = e.scan(/^\s*(\w+)\s*=\s*(\{.*?\}|".*?"|\d+)\s*[,}]\s*$/m)
+                entry = {}
+                arr.each do |var, val, rest|
+                    # EXPERIMENTAL: something like author={{Top Institute}} didn't work. I'm not sure though if this is able to deal with the last field in a bibtex entry correctly
+                    # n = /^\s*\{(.*?)\}\s*($|\}\s*\z)/m.match(val)
+                    if (n = /^\s*\{(.*?)\}\s*$/m.match(val))
+                        val = n[1]
+                    elsif (n = /^\s*"(.*?)"\s*$/m.match(val))
                         val = n[1]
                     end
-                    if strings[val]
+                    if strings_expansion and strings[val]
                         val = strings[val]
                     end
-                    [var, val]
+                    if (oldval = entry[var])
+                        if oldval != val
+                            meth = "duplicate_field_#{var}"
+                            if @configuration.respond_to?(meth)
+                                $stderr.puts "Resolve duplicate fields with mismatching values: #{id}.#{var}" if $VERBOSE
+                                val = @configuration.send(meth, oldval, val)
+                            else
+                                $stderr.puts "Cannot resolve duplicate fields with mismatching values: #{id}.#{var}"
+                            end
+                        end
+                    end
+                    entry[var] = val
+                    case var
+                    when 'crossref'
+                        @crossreferenced << val
+                    end
+                end
+                entry['_lineno'] = lineno.to_s
+                entry['_type']   = type
+                entry['_id']     = id
+                entry['_entry']  = body
+                if entries[id]
+                    if entries[id] != entry
+                        $stderr.puts "Duplicate key, mismatching entries: #{id}"
+                        if $DEBUG
+                            $stderr.puts entries[id]['_entry'].chomp
+                            $stderr.puts '<=>'
+                            $stderr.puts entry['_entry'].chomp
+                            $stderr.puts
+                        end
+                    end
+                    entries[id].update(entry)
+                else
+                    entries[id] = entry
                 end
-                arr << ['@type', m[2]] << ['@id', id]
-                @bibentries[id] = arr
-                acc = m.post_match
-            else
-                break
             end
+            lineno += (m.pre_match.scan(/\n/).size + body.scan(/\n/).size)
+        end
+        if text =~ /\S/
+            $stderr.puts "Trash in bibtex input: #{text}" if $VERBOSE
         end
+        return entries, prelude.join
+    end
+
+    def duplicate_field_author(oldval, val)
+        [oldval, val].join(' and ')
+    end
+
+    def duplicate_field_abstract(oldval, val)
+        [oldval, val].join("\n")
+    end
+
+    def duplicate_field_url(oldval, val)
+        [oldval, val].join(' ')
+    end
+
+    def duplicate_field_keywords(oldval, val)
+        (oldval.split(/[;,]\s*/) | val.split(/[;,]\s*/)).join(', ')
     end
 
     def cited_keys
@@ -1266,8 +1457,8 @@ class Deplate::Formatter < Deplate::CommonObject
         return @deplate.parse_and_format_without_wikinames(invoker, text)
     end
 
-    def simple_latex_reformat(text)
-        text.gsub!(/^\{(.*)\}$/, "\\1")
+    def simple_latex_reformat(text, remove_brackets=false)
+        text.gsub!(/^\{(.*)\}$/, "\\1") if remove_brackets
         text.gsub!(/\s+/m, " ")
         text.gsub!(/``/, %{"})
         text.gsub!(/''/, %{"})