deplate 0.8 → 0.8.1

data/lib/deplate/mod/imgurl.rb

@@ -1,5 +1,5 @@
 # imgurl.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:     05-Mai-2005.

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

@@ -1,5 +1,5 @@
 # inlatex-compound.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:     07-Apr-2005.

data/lib/deplate/mod/koma.rb

@@ -1,10 +1,10 @@
 # mod-koma.rb -- Module: use Koma-Script and friends as LaTeX class
-# @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:     07-Mai-2004.
-# @Last Change: 31-Okt-2005.
-# @Revision:    0.106
+# @Last Change: 2007-09-16.
+# @Revision:    0.110
 # 
 # Description:
 # 
@@ -16,7 +16,7 @@
 # 
 
 class Deplate::Formatter::LaTeX
-    @@latexDocClass = "scrartcl"
+    self.latexDocClass = "scrartcl"
 
     # def hook_pre_prepare_koma
     #     push_class_option('tablecaptionabove')

data/lib/deplate/mod/{de.rb → lang-de.rb}

@@ -1,5 +1,5 @@
 # mod-en.rb -- Standard messages
-# @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:     07-Mai-2004.

data/lib/deplate/mod/{en.rb → lang-en.rb}

@@ -1,5 +1,5 @@
 # mod-en.rb -- Standard messages
-# @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:     07-Mai-2004.

data/lib/deplate/mod/{ru_koi8-r.rb → lang-ru-koi8-r.rb}

@@ -1,5 +1,5 @@
 # ru_koi8-r.rb -- Standard messages
-# @Authors:     Maxim Komar (komar from ukr.net), Thomas Link (samul AT web.de)
+# @Authors:     Maxim Komar (komar from ukr.net), Thomas Link (micathom AT gmail com)
 # @Website:     http://komar.org.ua
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)

data/lib/deplate/mod/lang-ru.rb

@@ -0,0 +1,9 @@
+# lang-ru.rb
+# @Author:      Thomas Link (micathom AT gmail com)
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     2007-01-04.
+# @Last Change: 2007-01-04.
+# @Revision:    0.2
+
+require 'deplate/mod/lang-ru-koi8-r'
+

data/lib/deplate/mod/{zh-cn-autospace.rb → lang-zh_CN-autospace.rb}

@@ -3,10 +3,10 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     01-Aug-2004.
-# @Last Change: 31-Mai-2006.
-# @Revision:    0.225
+# @Last Change: 2006-12-31.
+# @Revision:    0.226
 
-require 'deplate/zh-cn'
+require 'deplate/zh_CN'
 
 class Deplate::Formatter
     attr_reader :cjk_space, :cjk_nospace

data/lib/deplate/mod/{zh-cn.rb → lang-zh_CN.rb}

@@ -3,15 +3,15 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     01-Aug-2004.
-# @Last Change: 12-Nov-2005.
-# @Revision:    0.163
+# @Last Change: 2007-01-04.
+# @Revision:    0.168
 
-require "deplate/zh-cn"
+require 'deplate/zh_CN'
 
 class Deplate::Element
     alias join_lines_re_zh_cn join_lines
     def join_lines(accum)
-        if @deplate.formatter.matches?("latex")
+        if @deplate.formatter.matches?('latex')
             return accum.join
         else
             return join_lines_re_zh_cn(accum)
@@ -23,7 +23,7 @@ class Deplate::Particle::SwallowedSpace < Deplate::Particle
     set_rx(/^ +/)
 
     def setup
-        @elt = @deplate.formatter.cjk_smart_blanks ? "" : " "
+        @elt = @deplate.formatter.cjk_smart_blanks ? '' : ' '
     end
 end
 
@@ -31,14 +31,14 @@ class Deplate::Particle::Space < Deplate::Particle
     set_rx(/^~/)
 
     def setup
-        @elt = "~"
+        @elt = '~'
     end
     
     def process
-        if @deplate.formatter.matches?("latex")
+        if @deplate.formatter.matches?('latex')
             super
         else
-            @elt = " "
+            @elt = ' '
         end
     end
 end

data/lib/deplate/mod/latex-emph-table-head.rb

@@ -1,5 +1,5 @@
 # latex-emph-table-head.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:     26-Nov-2004.

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

@@ -1,10 +1,10 @@
 # latex-emph-table-head.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:     26-Nov-2004.
-# @Last Change: 23-Mrz-2006.
-# @Revision:    0.350
+# @Last Change: 2007-06-30.
+# @Revision:    0.352
 # 
 # Description:
 # 
@@ -426,12 +426,12 @@ class Deplate::Formatter::LaTeX
                 styles = []
                 stylex_arg = invoker.args["stylex"]
                 if stylex_arg
-                    styles += stylex_arg.split(/\s*,\s*/)
+                    styles += Deplate::Core.split_list(stylex_arg, ',', ';')
                 else
                     style_arg = invoker.args["style"]
-                    styles += style_arg.split(/\s*,\s*/) if style_arg
+                    styles += Deplate::Core.split_list(style_arg, ',', ';') if style_arg
                     style_var = @deplate.variables["tableStyle"]
-                    styles += style_var.split(/\s*,\s*/) if style_var
+                    styles += Deplate::Core.split_list(style_var, ',', ';') if style_var
                 end
                 styles.compact!
                 style_arg = invoker.args["style"]

data/lib/deplate/mod/latex-verbatim-small.rb

@@ -1,5 +1,5 @@
 # latex-verbatim-small.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:     20-Nov-2004.

data/lib/deplate/mod/linkmap.rb

@@ -0,0 +1,128 @@
+# linkmap.rb
+# @Last Change: 2007-09-30.
+# Author::      Jeff Barczewski (jeff barczewski at gmail com)
+#               Minor modifications by Thomas Link.
+# License::     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# Created::     2007-09-27.
+#
+#
+# Syntax for map (uses a region)
+#
+# #LinkMap << ---
+#   key: url optional_title
+# ---
+#
+# Syntax for using links in map (any of following)
+# [[key]]
+# [[key][link name]]
+# [[key][link name]*] new window
+# [[key]$] no follow rel
+#
+# or to embed raw URL using macro
+# {ref: Example News}
+
+
+# Map by current_source_id (each source) of keys to link values
+class Deplate::LinkMap
+    class << self
+        def links(current_source_id)
+            @links ||= {}
+            @links[current_source_id] ||= {}
+        end
+
+        def set(current_source_id, label, href)
+            links(current_source_id)[label] = href
+        end
+
+        def get(current_source_id, label)
+            links(current_source_id)[label] || links(current_source_id)[:global]
+        end
+    end
+end
+
+
+# register links into a map for this source (each source has own map).
+# Use link macro to access a link by key. The LinkMap can exist anywhere
+# in the document, even at the end.
+#
+# #LinkMap <<---
+# Example: http://www.example.com
+# Example News: http://news.example.com
+# ---
+class Deplate::Regions::LinkMap < Deplate::Region
+    register_as 'LinkMap'
+    set_line_cont false
+
+    def finish
+        finish_accum
+        sid = @args['global'] ? :global : @deplate.current_source.object_id
+        log(['LinkMap', sid, @accum.inspect], :debug)
+        @accum.each do |line|
+            key, link = line.split(/:\s*/, 2).map {|e| e.strip}
+            if key and link
+                Deplate::LinkMap.set(sid, key, link)
+            else
+                log(['Malformed LinkMap entry', line.inspect], :error)
+            end
+        end
+        return nil
+    end
+
+end
+
+
+# access a link stored with LinkMap region
+#
+# {ref: Example News} == http://news.example.com/
+class Deplate::Macro::RefLinkMap < Deplate::Macro::Ref
+    register_as 'ref'
+
+    def setup(text)
+        @current_source_id = @deplate.current_source.object_id
+        super
+    end
+
+    def process
+        if @text
+            ref = Deplate::LinkMap.get(@current_source_id, @text)
+            if ref
+                prefix = @args['prefix'] || @deplate.formatter.plain_text(' ', true)
+                name = @args['p'] ? @deplate.formatter.plain_text(ref) : @deplate.parse_and_format(self, @args['name'] || @text)
+                url  = format_particle(:format_url, self, name, ref, nil)
+                # url  = @deplate.parse_and_format(self, ref)
+                return [prefix, url].join
+            end
+        end
+        super
+    end
+end
+
+
+# access a mapped link using extended hyperlink
+# [[link_key]]
+# [[link_key][link name]]
+class Deplate::HyperLink::ExtendedLinkMap < Deplate::HyperLink::Extended
+    replace_particle Deplate::HyperLink::Extended
+
+    def setup
+        # save id for this source since it will change by the time we process
+        @current_source_id = @deplate.current_source.object_id
+        super
+    end
+
+    def process
+        # use url from map if found for this source
+        link_url = Deplate::LinkMap.get(@current_source_id, @dest)
+        @dest = link_url if link_url
+        super
+    end
+end
+
+
+class Deplate::Core
+    def hook_late_require_linkmap
+        register_particle(Deplate::HyperLink::ExtendedLinkMap, :replace => Deplate::HyperLink::Extended)
+        register_region(Deplate::Regions::LinkMap)
+    end
+end
+

data/lib/deplate/mod/makefile.rb

@@ -1,10 +1,10 @@
 # makefile.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:     28-Aug-2005.
-# @Last Change: 25-Apr-2006.
-# @Revision:    0.156
+# @Last Change: 2007-07-17.
+# @Revision:    0.164
 #
 # = Description
 # Create a standard makefile.
@@ -88,15 +88,13 @@ MAKEFILE
         makefile = <<MAKEFILE
 include Makefile.config
 
-PHONY: html
-
 all: dbk html pdf tex text man
 
 dvi: ${BASE}.dvi
 dbk: ${BASE}.dbk
 html: ${BASE}.html
 pdf:
-	make DFLAGS="${DFLAGS} --pdf" ${BASE}.pdf
+	make DFLAGS="${DFLAGS} --pdf" "${BASE}.pdf"
 php: ${BASE}.php
 tex: ${BASE}.tex
 text: ${BASE}.text
@@ -109,54 +107,56 @@ makefile:
 	${DEPLATE} -m makefile ${DFLAGS} ${BASE}#{suffix} ${OTHER}
 
 website:
-	mkdir -p ${WEBSITE_DIR}
+	make prepare_website
 	${DEPLATE} ${DFLAGS} ${WEBSITE_DFLAGS} ${FILE} ${OTHER}
 	echo ${WEBSITE_DIR}/${BASE}.html > .last_output
 
 %.html: %#{suffix}
-	mkdir -p ${HTML_DIR}
+	make prepare_html
 	${DEPLATE} ${DFLAGS} ${HTML_DFLAGS} $< ${OTHER}
 	echo ${HTML_DIR}/$@ > .last_output
 
 %.text: %#{suffix}
-	mkdir -p ${TEXT_DIR}
+	make prepare_text
 	${DEPLATE} ${DFLAGS} ${TEXT_DFLAGS} $< ${OTHER}
 	echo ${TEXT_DIR}/$@ > .last_output
 
 %.php: %#{suffix}
-	mkdir -p ${PHP_DIR}
+	make prepare_php
 	${DEPLATE} ${DFLAGS} ${PHP_DFLAGS} $< ${OTHER}
 	echo ${PHP_DIR}/$@ > .last_output
 
 %.dbk: %#{suffix}
-	mkdir -p ${DBK_DIR}
+	make prepare_dbk
 	${DEPLATE} ${DFLAGS} ${DBK_DFLAGS} $< ${OTHER}
 	echo ${DBK_DIR}/$@ > .last_output
 
 %.tex: %#{suffix}
-	mkdir -p ${TEX_DIR}
+	make prepare_tex
 	${DEPLATE} ${DFLAGS} ${TEX_DFLAGS} $< ${OTHER}
 	echo ${TEX_DIR}/$@ > .last_output
 
 %.ref: %#{suffix}
-	mkdir -p ${REF_DIR}
+	make prepare_ref
 	${DEPLATE} ${DFLAGS} ${REF_DFLAGS} -o $@ $< ${OTHER}
 	echo ${REF_DIR}/$@ > .last_output
 
 %.dvi: %.tex
+	make prepare_dvi
 	cd ${TEX_DIR}; \\
-	latex $<; \\
-	bibtex $*; \\
-	latex $<; \\
-	latex $<;
+	latex ${LATEX_FLAGS} $<; \\
+	bibtex ${BIBTEX_FLAGS} $*; \\
+	latex ${LATEX_FLAGS} $<; \\
+	latex ${LATEX_FLAGS} $<;
 	echo ${TEX_DIR}/$@ > .last_output
 
 %.pdf: %.tex
+	make prepare_pdf
 	cd ${TEX_DIR}; \\
-	pdflatex $<; \\
-	bibtex $*; \\
-	pdflatex $<; \\
-	pdflatex $<
+	pdflatex ${PDFLATEX_FLAGS} $<; \\
+	bibtex ${BIBTEX_FLAGS} $*; \\
+	pdflatex ${PDFLATEX_FLAGS} $<; \\
+	pdflatex ${PDFLATEX_FLAGS} $<
 	echo ${TEX_DIR}/$@ > .last_output
 
 %.1: %.ref
@@ -186,6 +186,7 @@ MAKEFILE
             log('Writing Makefile.config', :anyway)
             fname = find_in_lib('Makefile.config', :pwd => true)
             if fname
+                log(['Makefile.config', fname])
                 cfg  = File.open(fname) {|io| io.read}
                 tmpl = Deplate::Template.new(:template  => cfg)
                 args = {
@@ -195,7 +196,7 @@ MAKEFILE
                     'options' => options.join(' '),
                 }
                 Deplate::Define.let_variables(self, args) do
-                    config = tmpl.fill_in(self, :source => @source)
+                    config = tmpl.fill_in(self)
                 end
             else
                 log(['File not found', 'Makefile.config'], :error)

data/lib/deplate/mod/mark-external-urls.rb

@@ -1,10 +1,10 @@
 # mark-urls.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-Nov-2004.
-# @Last Change: 30-Mrz-2006.
-# @Revision:    0.37
+# @Last Change: 2007-09-24.
+# @Revision:    0.41
 # 
 # Description:
 # 
@@ -17,17 +17,23 @@
 
 class Deplate::Formatter
     def formatter_initialize_mark_urls
-        def_advice("mark-external-urls", :format_url,
+        def_advice('mark-external-urls', :format_url,
                   :wrap => Proc.new do |agent, rv, invoker, name, dest, *args|
                     if dest =~ Deplate::HyperLink::Url.rx
                         if dest =~ /^mailto:/
-                            icon = @variables["mailtoIcon"] || "mailto.png"
+                            icon = @variables['mailtoIcon'] || 'mailto.png'
                             invoker.args['alt'] ||= 'e-mail'
                         else
-                            icon = @variables["urlIcon"] || "url.png"
+                            icon = @variables['urlIcon'] || 'url.png'
                             # invoker.args['alt'] ||= 'url'
                         end
-                        rv + format_particle(:include_image, invoker, icon, {}, true)
+                        args = {'style' => 'remote'}
+                        img  = format_particle(:include_image, invoker, icon, args, true)
+                        if @variables['markerInFrontOfURL']
+                            img + rv
+                        else
+                            rv + img
+                        end
                     else
                         rv
                     end