deplate 0.8 → 0.8.1

data/lib/deplate/mod/markup-1-warn.rb

@@ -1,5 +1,5 @@
 # textstyles-warn-single.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-Okt-2004.

data/lib/deplate/mod/markup-1.rb

@@ -1,5 +1,5 @@
 # textstyles1.rb -- Re-enable text styles markup prior to version 0.6
-# @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-Okt-2004.

data/lib/deplate/mod/navbar-png.rb

@@ -1,10 +1,10 @@
 # mod-navbar1.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:     14-Aug-2004.
-# @Last Change: 04-Jun-2006.
-# @Revision:    0.73
+# @Last Change: 2007-04-04.
+# @Revision:    0.78
 # 
 # Description:
 # 
@@ -39,7 +39,8 @@ class Deplate::Formatter::HTML_Site
             hiimg = hi ? "hi-#{img}" : nil
             alt   = button.capitalize
             @deplate.variables["#{button}Button"] = include_image(nil, 
-                                                                  img_url(img), 
+                                                                  # img_url(img), 
+                                                                  img, 
                                                                   {'hi' => hiimg, 'alt' => alt, 'id' => btn, :raw => true},
                                                                   true
                                                                  )

data/lib/deplate/mod/noindent.rb

@@ -1,5 +1,5 @@
 # noindent.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-Aug-2004.

data/lib/deplate/mod/numpara.rb

@@ -1,5 +1,5 @@
 # numpara.rb -- add numbers to paragraphs
-# @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-Aug-2004.

data/lib/deplate/mod/particle-math.rb

@@ -1,5 +1,5 @@
 # particle-math.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/mod/php-extra.rb

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

@@ -1,5 +1,5 @@
 # pstoedit.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:     13-Apr-2005.

data/lib/deplate/mod/recode.rb

@@ -1,5 +1,5 @@
 # recode.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-Apr-2005.

data/lib/deplate/mod/smart-dash.rb

@@ -1,5 +1,5 @@
 # smart-dash.rb
-# @Author:      Thomas Link (samul AT web de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     15-Apr-2006.
 # @Last Change: 15-Apr-2006.

data/lib/deplate/mod/smiley.rb

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

data/lib/deplate/mod/soffice.rb

@@ -1,5 +1,5 @@
 # mod-soffice.rb - Some OpenOffice specific modifications to the html output
-# @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:     27-Jun-2004.

data/lib/deplate/mod/symbols-latin1.rb

@@ -1,5 +1,5 @@
 # symbols-latin1.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:     27-Aug-2004.

data/lib/deplate/mod/symbols-od-utf-8.rb

@@ -1,5 +1,5 @@
 # symbols-od-utf-8.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:     27-Aug-2004.

data/lib/deplate/mod/symbols-plain.rb

@@ -1,5 +1,5 @@
 # symbols-plain.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:     27-Aug-2004.

data/lib/deplate/mod/symbols-sgml.rb

@@ -1,5 +1,5 @@
 # symbols-sgml.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:     27-Aug-2004.

data/lib/deplate/mod/symbols-utf-8.rb

@@ -1,5 +1,5 @@
 # symbols-sgml.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:     27-Aug-2004.

data/lib/deplate/mod/symbols-xml.rb

@@ -1,5 +1,5 @@
 # symbols-sgml.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:     27-Aug-2004.

data/lib/deplate/mod/syntax-region-alt.rb

@@ -1,5 +1,5 @@
 # syntax-alt-region.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:     27-Aug-2004.

data/lib/deplate/mod/utf8.rb

@@ -1,5 +1,5 @@
 # utf8.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:     10-Apr-2005.

data/lib/deplate/mod/validate-html.rb

@@ -1,5 +1,5 @@
 # validate-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:     05-Sep-2004.

data/lib/deplate/mod/xmlrpc.rb

@@ -1,10 +1,10 @@
 # xmlrpc.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:     27-J�n-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.240
+# @Last Change: 2007-06-30.
+# @Revision:    0.247
 #
 # = Description
 # 
@@ -34,9 +34,9 @@ require 'xmlrpc/server'
 
 class Deplate::Core
     def go_now
-        @variables["xmlrpcID"] ||= "deplate"
+        @variables['xmlrpcID'] ||= 'deplate'
         @xmlrpc_converters = {}
-        @xmlrpc_timeout    = @variables["xmlrpcTimeout"]
+        @xmlrpc_timeout    = @variables['xmlrpcTimeout']
         if @xmlrpc_timeout
             @xmlrpc_timeout = @xmlrpc_timeout.to_i
         else
@@ -44,22 +44,22 @@ class Deplate::Core
         end
         
         xml_servlet = XMLRPC::WEBrickServlet.new
-        xml_servlet.add_handler("convert") do |format, text|
+        xml_servlet.add_handler('convert') do |format, text|
             xmlrpc_convert_string(format, text)
         end
-        xml_servlet.add_handler("shutdown") do |code|
+        xml_servlet.add_handler('shutdown') do |code|
             xmlrpc_shutdown(code)
         end
-        xml_servlet.add_handler("convert_string") do |format, text|
+        xml_servlet.add_handler('convert_string') do |format, text|
             xmlrpc_convert_string(format, text)
         end
-        xml_servlet.add_handler("convert_file") do |format, filename|
+        xml_servlet.add_handler('convert_file') do |format, filename|
             xmlrpc_convert_file(format, filename)
         end
-        xml_servlet.add_handler("string_to_fileset") do |format, filename, text|
+        xml_servlet.add_handler('string_to_fileset') do |format, filename, text|
             xmlrpc_string_to_fileset(format, filename, text)
         end
-        xml_servlet.add_handler("fileset_to_fileset") do |format, filename, fileset|
+        xml_servlet.add_handler('fileset_to_fileset') do |format, filename, fileset|
             xmlrpc_fileset_to_fileset(format, filename, fileset)
         end
         xml_servlet.add_multicall
@@ -67,18 +67,18 @@ class Deplate::Core
         uri  = URI.parse(@sources.first) || OpenStruct.new
         port = uri.port
         unless port
-            port = @variables["xmlrpcPort"]
+            port = @variables['xmlrpcPort']
             port = port ? port.to_i : 2000
         end
 
         path = uri.path
-        if !path or path == "-"
-            path = @variables["xmlrpcPath"] || "/deplate"
+        if !path or path == '-'
+            path = @variables['xmlrpcPath'] || '/deplate'
         end
 
-        valid_ips = @variables["xmlrpcAllow"]
+        valid_ips = @variables['xmlrpcAllow']
         if valid_ips
-            valid_ips = valid_ips.split(/\s+/)
+            valid_ips = Deplate::Core.split_list(valid_ips, ',', ' ')
             valid_ips.collect! do |s|
                 if s =~ /^\d+\.\d+\.\d+\.\d+\$/
                     s = Regexp.escape(s)
@@ -88,13 +88,13 @@ class Deplate::Core
             set_valid_ip(valid_ips)
         end
         
-        log("XMLRPC: Starting server", :anyway)
+        log('XMLRPC: Starting server', :anyway)
         # @@log_destination = File.open(@variables["logFile"] || "deplate.log", "w")
         begin
             @xmlrpc_server = WEBrick::HTTPServer.new(:Port => port)
             @xmlrpc_server.mount(path, xml_servlet)
             @xmlrpc_server.logger.level = 1
-            trap("INT") { @xmlrpc_server.shutdown }
+            trap('INT') { @xmlrpc_server.shutdown }
             @xmlrpc_server.start
         ensure
             # @@log_destination.close
@@ -138,7 +138,7 @@ class Deplate::Core
     def xmlrpc_fileset_to_fileset(format, filename, fileset)
         convert_to_fileset(filename) do
             definition = fileset.delete(filename)
-            text       = definition["contents"]
+            text       = definition['contents']
             convert_and_collect(format, filename, text) do
                 write_fileset(fileset)
             end
@@ -148,17 +148,17 @@ class Deplate::Core
     private
     def convert_to_fileset(fileset_id, &block)
         unless defined?(@tmpdir)
-            @tmpdir = @variables["tmpDir"]
+            @tmpdir = @variables['tmpDir']
             unless @tmpdir
                 if Dir.tmpdir
-                    @tmpdir = File.join(Dir.tmpdir, @variables["xmlrpcID"], fileset_id)
+                    @tmpdir = File.join(Dir.tmpdir, @variables['xmlrpcID'], fileset_id)
                 end
             end
-            @lockdir = File.join(Dir.tmpdir,"deplate_locks")
+            @lockdir = File.join(Dir.tmpdir,'deplate_locks')
         end
         if @tmpdir
             if File.exists?(@tmpdir)
-                FileUtils.rm(Dir[File.join(@tmpdir, "*")])
+                FileUtils.rm(Dir[File.join(@tmpdir, '*')])
             else
                 FileUtils.mkdir(@tmpdir)
             end
@@ -169,11 +169,11 @@ class Deplate::Core
             if File.exists?(lockfile)
                 timeout = File.mtime(lockfile) + @xmlrpc_timeout
                 if timeout > Time.now
-                    log(["XMLRPC: Fileset is locked", fileset_id, timeout], :error)
+                    log(['XMLRPC: Fileset is locked', fileset_id, timeout], :error)
                     raise FaultException
                 end
             end
-            File.open(lockfile, "w") {|io|}
+            File.open(lockfile, 'w') {|io|}
             begin
                 Dir.chdir(@tmpdir)
                 return block.call
@@ -182,7 +182,7 @@ class Deplate::Core
                 FileUtils.rm(lockfile)
             end
         else
-            log("XMLRPC: No writable temporary directory", :error)
+            log('XMLRPC: No writable temporary directory', :error)
             raise FaultException
         end
     end
@@ -197,33 +197,34 @@ class Deplate::Core
     def write_fileset(fileset)
         for fname, definition in fileset
             if File.exists?(fname)
-                changed = definition["changed"]
-                mtime   = definition["mtime"]
-                size    = definition["size"]
+                changed = definition['changed']
+                mtime   = definition['mtime']
+                size    = definition['size']
                 if !changed and mtime and size and mtime == File.mtime(fname) and size == File.size(fname)
                     next
                 end
             end
             fname    = @formatter.encode_id(fname)
-            contents = definition["contents"]
-            File.open(fname, "w") {|io| io.puts(contents)}
+            contents = definition['contents']
+            File.open(fname, 'w') {|io| io.puts(contents)}
         end
     end
     
     def collect_fileset(hash)
-        for f in Dir["*"]
+        for f in Dir['*']
             f = @formatter.encode_id(f)
             definition = {}
-            definition["mtime"]    = File.mtime(f)
-            definition["size"]     = File.size(f)
-            definition["contents"] = File.open(f) {|io| io.read}
+            definition['mtime']    = File.mtime(f)
+            definition['size']     = File.size(f)
+            definition['contents'] = File.open(f) {|io| io.read}
             hash[f] = definition
         end
     end
     
     def get_converter(format)
-        if @variables["xmlrpcReuseInterpreter"]
+        if @variables['xmlrpcReuseInterpreter']
             cvt = @xmlrpc_converters[format] ||= Deplate::Converter.new(format, :master => self)
+            # p "DBG deplate=#{cvt.object_id} #{@xmlrpc_converters[format].object_id}"
         else
             cvt = Deplate::Converter.new(format, :master => self)
         end

data/lib/deplate/nukumi2.rb

@@ -1,9 +1,9 @@
 # nukumi2.rb
-# @Author:      Thomas Link (samul AT web de)
+# @Author:      Thomas Link (micathom AT gmail com)
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     31-Dez-2005.
-# @Last Change: 31-Dez-2005.
-# @Revision:    0.33
+# @Last Change: 2007-06-30.
+# @Revision:    0.34
 #
 # = Usage
 # Add require 'deplate/nukumi2' to your nukumi2 config.rb.
@@ -50,7 +50,7 @@ class FileBackend
                 if value
                     case field
                     when 'keywords'
-                        entry.categories.concat value.split(/\s*[,;]\s*/)
+                        entry.categories.concat Deplate::Core.split_list(value, ';', ',')
                     when 'encoding'
                     else
                         if entry.respond_to? field + "="

data/lib/deplate/once-method.rb

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

@@ -1,10 +1,10 @@
 # output.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-Dez-2004.
-# @Last Change: 28-Apr-2006.
-# @Revision:    0.257
+# @Last Change: 2007-09-01.
+# @Revision:    0.265
 
 require 'forwardable'
 require 'deplate/metadata'
@@ -72,8 +72,16 @@ class Deplate::Output
         end
         @top_heading     = nil
         @body_empty_done = false
+        reset
     end
 
+    def reset
+        @attributes[:stepwiseIdx] = 0
+        @attributes[:consumed_labels] = []
+        @attributes[:consumed_ids] = []
+    end
+    alias :simulate_reset :reset
+
     def body_flush
         call_methods_matching(@formatter, /^hook_pre_body_flush_/)
         save!
@@ -149,7 +157,7 @@ class Deplate::Output
 
     def fill_in_template(template_file)
         unless do_i_feel_empty?
-            t = Deplate::Template.new(:file => template_file)
+            t = Deplate::Template.new(:file => template_file, :master => @deplate)
             @output = t.fill_in(@deplate, 
                                 :pre  => @pre_matter,
                                 :body => @body,

data/lib/deplate/particles.rb

@@ -1,10 +1,10 @@
 # particles.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:     24-M�r-2004.
-# @Last Change: 05-Jun-2006.
-# @Revision:    0.1847
+# @Last Change: 2007-09-29.
+# @Revision:    0.1922
 
 require "uri"
 require "deplate/common"
@@ -47,6 +47,15 @@ class Deplate::Particle < Deplate::BaseParticle
             @@particles << c
         end
 
+        def replace_particle(other, c=self)
+            i = @@particles.index(other)
+            if i
+                @@particles[i] = c
+            else
+                register_particle c
+            end
+        end
+
         def disable_particle(*particles)
             particles.each {|p| @@particles.delete(p)}
         end
@@ -171,9 +180,11 @@ class Deplate::Particle::Text < Deplate::Particle
             [text]
         end
     end
+
     def process
         @elt = plain_text(get_text)
     end
+
     def get_text
         @match[0]
     end
@@ -433,8 +444,13 @@ class Deplate::HyperLink < Deplate::Particle
     # 
     # +++ the heuristic is fragile and sometimes gives wrong results
     def complete_wiki_ref(inter, name, dest, anchor)
+        src = @container.source.file || ''
         sfx = @deplate.variables['suffix']
-        sfx = '.%s' % sfx if sfx
+        if sfx
+            sfx = '.%s' % sfx
+        elsif @deplate.variables['useParentSuffix']
+            sfx = File.extname(src)
+        end
         if dest.empty?
             label = guess_label(dest, anchor)
             if label
@@ -472,7 +488,6 @@ class Deplate::HyperLink < Deplate::Particle
             return :wiki, name, dest, label
         end
         # Fallback heuristic
-        src      = @container.source.file || ''
         dest_sfx = File.extname(dest)
         dest_abs = File.expand_path(dest, File.basename(src))
         dest_is_dir = (File.exist?(dest_abs) and File.stat(dest_abs).directory?)
@@ -488,35 +503,31 @@ class Deplate::HyperLink < Deplate::Particle
     def indexing(idx)
         idx = idx.compact
         unless @deplate.variables['indexwiki'] == 'no' or idx.empty?
-            auto = @deplate.variables['autoindex']
-            for i in idx
-                Deplate::Particle.auto_indexing(@deplate, i) if auto
+            if @deplate.variables['autoindex']
+                for i in idx
+                    Deplate::Particle.auto_indexing(@deplate, i)
+                end
             end
             @idx = idx
         else
             @idx = nil
         end
     end
-    
+   
     def process
         type, name, dest, anchor = complete_wiki_ref(@inter, *@elt)
         if type
             dest.gsub!(/\\/, '/')
             dest   = encode_dest(dest)
             anchor = encode_anchor(anchor)
-            if dest =~ Deplate::HyperLink::Url.rx
-                if dest =~ /^mailto:/
-                    @styles << 'mailto'
-                else
-                    @styles << 'remote'
-                end
-            end
+            set_style(dest)
             case type
             when :wiki
                 @elt = format_particle(:format_wiki, self, name, dest, anchor)
             when :url
                 @elt = format_particle(:format_url, self, name, dest, anchor)
             end
+            # p "DBG", dest, type, @styles, @elt
             if @idx
                 @idx.collect! do |idx|
                     format_particle(:format_index, self, idx)
@@ -527,6 +538,16 @@ class Deplate::HyperLink < Deplate::Particle
     end
 
     protected
+    def set_style(dest)
+        if dest =~ Deplate::HyperLink::Url.rx
+            if dest =~ /^mailto:/
+                @styles << 'mailto'
+            else
+                @styles << 'remote'
+            end
+        end
+    end
+
     # Escape special characters from path
     def encode_path(path)
         path = path.split(Regexp.new(Regexp.escape(File::SEPARATOR)))
@@ -569,7 +590,7 @@ class Deplate::HyperLink::Extended < Deplate::HyperLink
         def setup
             # @rx  = /^\[\[([^\]#]*)(#(#{@@bc}))?\](\[(.+?)\])?([-!~*]*)\]/
             # @rx  = /^\[\[([^\]#]*)(#([^\]]*))?\](\[(.+?)\])?([-!~*]*)\]/
-            set_rx(/^\[\[(([#{@@uc}]+?)::)?([^\]#]*)(#([^\]]*))?\](\[(.+?)\])?([-!~*]*)\]/)
+            set_rx(/^\[\[(([#{@@uc}]+?)::)?([^\]#]*)(#([^\]]*))?\](\[(.+?)\])?([-!~*$]*)\]/)
         end
     end
     
@@ -590,14 +611,18 @@ class Deplate::HyperLink::Extended < Deplate::HyperLink
                 id = @name
             else
                 if !@dest or @dest.empty?
-                    @name = @anchor
-                    id    = @anchor
+                    @name = @anchor || @inter
+                    id    = @anchor || @inter
                 else
                     @name = @dest
                     id    = File.basename(@dest)
                 end
             end
-            idx = [@deplate.add_index(self, id)]
+            if id
+                idx = [@deplate.add_index(self, id)]
+            else
+                idx = []
+            end
         else
             idx = []
         end
@@ -609,6 +634,9 @@ class Deplate::HyperLink::Extended < Deplate::HyperLink
         if @modifier.include?('*')
             @args['target'] = '_blank'
         end
+        if @modifier.include?('$')
+            @args['rel'] = 'nofollow'
+        end
     end
     
     def process
@@ -733,6 +761,7 @@ class Deplate::HyperLink::Url < Deplate::HyperLink
     
     def process
         @name = plain_text(@name)
+        set_style(@dest)
         @elt  = format_particle(:format_url, self, @name, @dest, @anchor)
     end
 end
@@ -763,6 +792,7 @@ class Deplate::Particle::Macro < Deplate::Particle
                 @elt = plain_text(@match[0], false)
             else
                 @macro, args, text = split_name_args(macro)
+                args = args.merge(deplate.variables["args@#{@macro}"] || {})
                 # args[:macro] = macro
                 if @macro
                     @elt = Deplate::Macro.exec(@deplate, @container, @context, @macro, args, @alt, text)
@@ -803,7 +833,7 @@ class Deplate::Particle::Macro < Deplate::Particle
             nil
         end
     end
-                        
+
     def process
         @elt = case @elt
                when String
@@ -825,7 +855,7 @@ class Deplate::Particle::CurlyBrace < Deplate::Particle
     def process
         sample_pre  = @last[-10..-1]
         sample_post = @rest[0..9]
-        Deplate::Core.log(["Curly brace should be preceded by a backslash", "%s>>%s<<%s" % [sample_pre, @match[0], sample_post]], :error, @container.source)
+        Deplate::Core.log(["Character should be preceded by a backslash", "%s>>%s<<%s" % [sample_pre, @match[0], sample_post]], :error, @container.source)
         @elt = plain_text(@match[0], false)
     end
 end