Wiki2Go 1.17.5 → 1.22.0

data/lib/Wiki2Go/Install/wiki/style.css

@@ -10,76 +10,77 @@ body
     text-align: justify;
 }
 
-ul 
-{
-    margin-left:0.5em; 
-    padding-top : 0.5em ;
-    padding-left : 0em ;
-    padding-right : 0em ;
-    padding-bottom : 0.5em ;
-    margin-right:1em
+/* Main structure */
+#container {
+    margin: 0;
+    margin-left: 2em;
+    margin-right: 2em;
+    background: #fff;
+    border-left: 1px solid #ccc;
+    border-right: 1px solid #ccc; 
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc; 
 }
 
-li 
+#menu
 {
-    margin-left:0.5em; 
-    margin-right:1em ;
-    padding : 0em 0em 0em 0em ;
+	border-right: black thin solid;
+	background-color: #F8F7F0;
+	padding-right : 0.5em ;
+
 }
 
-h1
+#body
 {
-    font-weight: bold;
-    font-size: 28pt;
-    color: black;
-    margin : 0em ;
+	padding-left : 0.5em ;
+	padding-right : 0.5em ;
+	width: 100%;
+	background-color: #FFFFFF;
 }
 
-h2,h3,h4,h5,h6 
+#header
 {
-    color:black 
+	padding-right: 1em;
+	padding-left: 1em;
+	padding-bottom: 0.5em;
+	margin: 0px;
+	padding-top: 0px;
+	background-color: #B82619;
+	border-bottom: grey thin solid;
+	color : White ;
 }
 
-h2,h3.frontpage {
-    text-align: center ;
-} 
-
-table.Header
+#header a:link
 {
-    padding-right: 0.1em;
-    padding-left: 0.5em;
-    padding-bottom: 0.1em;
-    padding-top: 0em;
-    color: black;
-    background-color: white;
-    text-align: left;
-    border-bottom: 1px solid #ccc;
+    color: White;
+    font-weight: bolder ;
+    text-decoration: none;
 }
 
-table.Footer 
-{
- 
-    clear: both;
-    margin: 100px 0 0 0;
-    padding: 6px;
-    color: #000;
-    background: #fff;
-    border-top: 1px solid #ccc;
+#header a:visited {
+    color: White;
+    text-decoration: none;
+    font-weight: normal ;
 }
 
-hr {
-    color: #ccc;
+#header a:hover
+{
+	color: cornsilk;
 }
 
-table.Body
+#header h1
 {
-    text-align: left;
+	color : White ;
 }
 
-td[class=search] {
-    text-align: right;
+#footer
+{
+	border-top: grey thin solid;
+	background-color : silver;
 }
 
+/* Links */
+
 a:link
 {
     color: #a50a11;
@@ -97,28 +98,76 @@ a:hover {
     text-decoration: underline;
 }
 
-#container {
-    margin-left: 2em;
-    margin-right: 2em;
-    margin-bottom: 40px;
-    margin-top: 5px;
-    padding-left: 15px;
-    padding-right: 15px;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    background: #fff;
-    border-left: 1px solid #ccc;
-    border-right: 1px solid #ccc; 
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc; 
+/* Headers */
+
+h1
+{
+    font-weight: bold;
+    font-size: 28pt;
+    color: black;
+    margin : 0em ;
+}
+
+h2,h3,h4,h5,h6 
+{
+    color:black 
+}
+
+h2,h3.frontpage {
+    text-align: center ;
+} 
+
+/* Style for tables drawn with --- and | in wiki markup */
+
+table.wikitable
+{
+	border-collapse: collapse;
+}
+
+table.wikitable tr
+{
+	padding-right: 0.4em;
+	padding-left: 0.4em;
+	padding-bottom: 0.4em;
+	margin: 0em;
+	padding-top: 0.4em;
 }
-    
+
+table.wikitable td
+{
+	border-right: 1px solid;
+	padding-right: 0.5em;
+	border-top: 1px solid;
+	padding-left: 0.5em;
+	padding-bottom: 0.5em;
+	border-left: 1px solid;
+	padding-top: 0.5em;
+	border-bottom: 1px solid;
+}
+
+/* Menu items */
+
+#menu ul
+{
+	margin-left : 0 ;
+	padding-left : 0.5em ;
+}
+
+#menu li
+{
+	list-style-type: none;
+	margin-left : 0 ;
+	padding-left : 0 ;
+}
+
+/* Style for lists of pages or versions (recent changes, search, versions */
+
 table.topiclist
 {
     width: 100%;
 }
 
-table.topiclist tr.date
+table.topiclist td.date
 {
     font-weight: bold;
 }
@@ -131,3 +180,24 @@ table.topiclist tr.odd
 table.topiclist tr.even
 {
 }
+
+/* Style for the display of differences */
+div.diff_kept
+{
+	display : block ;
+	font-family: 'Courier New';
+}
+
+div.diff_added
+{
+	background-color: #ffffcc;
+	display : block ;
+	font-family: 'Courier New';
+}
+
+div.diff_deleted
+{
+	background-color: #ffcc33;
+	display : block ;
+	font-family: 'Courier New';
+}

data/lib/Wiki2Go/LineFormatter.rb

@@ -8,9 +8,9 @@ require 'English'
 module Wiki2Go
 
   class LineFormatter
-
+  
     attr_reader :config
-
+    
     def initialize(web,storage,config,generate_html,editable)
       @web = web
       @storage = storage
@@ -23,36 +23,47 @@ module Wiki2Go
       @editable      = editable
       @absolute_urls = false
     end
-
+    
     public
-
+    
+    # Format one line with wiki formatting
     def format_line(line)
       @added_bullets = false
       line = escape_wiki_markers(line)
-      line = format_wiki_markup(line)
+      line = format_tags(line)
+      line = format_bullets(line)
+      line = format_markup(line)
       line = format_table(line)
       line = remove_markers(line)
       if !@added_bullets then
         emit_bullets
       end
-
+      
       return formatted_output(line)
     end
-
+    
+    # Call when the last line has been formatted. We may need to close lists.
     def formatting_done
       emit_bullets
       result =@pre_line 
       @pre_line = ''
       result
     end
-
+    
     # Return the path to the script verb, with the right extension and parameters
     # * verb = name of the verb (view, edit,...)
     # * parameters = further parameters: web.name, web.current_page, ...
     def make_verb_url(verb,*parameters)
       make_url(@web.script_prefix,verb + @web.script_extension,*parameters)
     end
-
+    
+    # Return the path to the script verb, with the right extension and parameters
+    # * verb = name of the verb (view, edit,...)
+    # Adds current subwiki and page name
+    def verb_url(verb)
+      return make_verb_url(verb,@web.name,@web.current_page)
+    end
+    
     # Return the path to the given resource. Nil and empty parameters are ignored
     # The generated url is relative to the root of the site
     def make_url(*parameters)
@@ -65,15 +76,30 @@ module Wiki2Go
       end
       result.squeeze('/')
     end
-
+    
+    # Return an <a> tag filled in.
+    def link_to(url,label,follow=true)
+      nofollow = (follow ? '' : " rel=\"nofollow\"")
+      return "<a href=\"#{url}\"#{nofollow}>#{label}</a>"
+    end
+    
+    # Return an <a target="_blank"> tag filled in.
+    def link_to_new_page(url,label)
+      return "<a href=\"#{url}\" target=\"_blank\">#{label}</a>"
+    end
+    
+    # Return absolute URL to current page
     def absolute_url
       absolute_url_of_topic(@web.current_page)
     end
-
+    
+    # Return absolute URL of given page
     def absolute_url_of_topic(topic)
       return @web.base_url.chop + view_page_url(@web.name,topic)
     end
-
+    
+    # Return a link suitable for creating a new page with the rich editor, if editing is allowed
+    # Return the name of the page, otherwise
     def edit_link(subwiki,page,name)
       if @editable then
         return name + edit_this_link(subwiki,page,"?")
@@ -81,51 +107,115 @@ module Wiki2Go
         return name 
       end
     end
-
+    
+    # Return a link suitable for editing a page with the rich editor, if editing is allowed
+    # Return empty string, otherwise
     def edit_this_link(subwiki,page,name)
       if @editable then
-        return "<a href=\"#{make_verb_url('edit',subwiki,page)}\">#{name}</a>"
+        return link_to(make_verb_url('edit',subwiki,page),name,false)
       else
         return "" 
       end
     end
-
-    def save_this_link(subwiki,page)
+    
+    # Return a link suitable for creating a new page with the wiki editor, if editing is allowed
+    # Return the name of the page, otherwise
+    def wikiedit_link(subwiki,page,name)
       if @editable then
-        return make_verb_url('save',subwiki,page) 
+        return name + wikiedit_this_link(subwiki,page,"?")
       else
-        return page 
+        return name 
       end
     end
-
-    def verb_url(verb)
-      return make_verb_url(verb,@web.name,@web.current_page)
+    
+    # Return a link suitable for editing a page with the wiki editor, if editing is allowed
+    # Return empty string, otherwise
+    def wikiedit_this_link(subwiki,page,name)
+      if @editable then
+        return link_to(make_verb_url('wikiedit',subwiki,page),name,false)
+      else
+        return "" 
+      end
     end
-
-    def removespam_url(user)
-      return make_verb_url('removespam',@web.name,'') + '?user=' + user
+    
+    # Return a link suitable for creating a new page with the confgured editor, if editing is allowed
+    # Return the name of the page, otherwise
+    def editor_link(subwiki,page,name)
+      if @editable then
+        return editor_this_link(subwiki,page,name)
+      else
+        return name 
+      end
     end
-
-    def version_url(page)
-      return make_verb_url('versions',@web.name,page)
+    
+        # Return a link suitable for creating a new page with the confgured editor, if editing is allowed
+    # Return the name of the page, otherwise
+    def editor_link2(subwiki,page,name)
+      if @editable then
+        return name + editor_this_link(subwiki,page,"?")
+      else
+        return name 
+      end
     end
-
+    
+    # Return a link suitable for editing a page with the configured editor, if editing is allowed
+    # Return empty string, otherwise
+    def editor_this_link(subwiki,page,name)
+      if @editable then
+        return link_to(make_verb_url(@config.editor,subwiki,page),name,false)
+      else
+        return "" 
+      end
+    end
+    
+    # URL to save current page in current subwiki
     def save_url
-      verb_url('save')
+      make_verb_url('save',@web.name,@web.current_page)
     end
-
-    def search_link(desc)
-      return "<a href=\"#{search_url + "?text="+desc}\">#{desc}</a>"
+    
+    # Return a link suitable for saving a page, if editing is allowed
+    # Return page name, otherwise
+    #   def save_this_link(subwiki,page)
+    #       if @editable then
+    #           return make_verb_url('save',subwiki,page) 
+    #else
+    #return page 
+    #end
+    #end
+    
+    # URL to remove spam by user
+    def removespam_url(user)
+      return make_verb_url('removespam',@web.name,'') 
     end
-
-    def search_link2(desc,name)
-      return "<a href=\"#{search_url + "?text="+desc}\">#{name}</a>"
+    
+    # URL to display the different versions of a page
+    def versions_url(page)
+      return make_verb_url('versions',@web.name,page)
     end
-
-    def search_url
-      return make_verb_url('search',@web.name)
+    
+    # Link to display the different versions of a page
+    def versions_link(page,label)
+      return link_to(versions_url(page),label,false)
     end
-
+    
+    alias :version_url :versions_url
+    alias :version_link :versions_link
+    
+    # URL to search for (optional) text
+    def search_url(for_text=nil)
+      parameter = for_text.nil? ? '' :  '?text=' + CGI::escape(for_text)
+      return make_verb_url('search',@web.name) + parameter
+    end
+    
+    # Link to search for given text, with (optional) label to display within link
+    def search_link(for_text,label=nil)
+      label ||= for_text
+      return link_to(search_url(for_text),label,false)
+    end
+    
+    alias :search_link2 :search_link
+    
+    # URL of 'recent changes' page
     def changes_url
       if @generate_html then 
         return make_url(@web.name,'recent_changes.html') 
@@ -133,114 +223,159 @@ module Wiki2Go
         return make_verb_url('changes',@web.name)
       end
     end
-
-    def changes_link(desc)
-      return "<a href=\"#{changes_url}\">#{desc}</a>"
-    end
-
-    def view_page_url(subwiki,page)
-      if @generate_html then 
-        return make_url(subwiki,page + ".html") 
-      else
-        return make_verb_url('view',subwiki,page)
-      end
+    
+    # Link to 'recent changes' page
+    def changes_link(label)
+      return link_to(changes_url,label,false)
     end
-
-     def view_url(subwiki,page)
+    
+    # URL to the given page in the given subwiki
+    # URL is relative or absolute depending on @absolute_urls setting
+    def view_url(subwiki,page)
       if @absolute_urls then
         return @web.base_url.chop + view_page_url(subwiki,page)
       else
         return view_page_url(subwiki,page)
       end
     end
-
     
-
+    # Link to view a page 
     def view_link(subwiki,page,name)
       if subwiki == @web.name then
-        return "<a href=\"#{view_url(subwiki,page)}\">#{name}</a>"
+        return link_to(view_url(subwiki,page),name)
       else
-        return "<a href=\"#{view_url(subwiki,page)}\">#{subwiki}:#{name}</a>"
+        if page == name then
+          return link_to(view_url(subwiki,page),"#{subwiki}:#{name}")
+        else 
+          return link_to(view_url(subwiki,page),name)
+        end
       end
     end
-
-    def perform_link(subwiki,page,name)
-      if @storage.exists?(File.join(subwiki,page)) then
-        url = make_verb_url('view',subwiki,page)
-        if subwiki == @web.name then
-          return "<a href=\"#{url}\">#{name}</a>"
+    
+    # Link to a non-wikipages
+    # Images are rendered inline
+    # .rbl pages are performed
+    # HTML files are linked to
+    # Other files are opened in a new browser window
+    def resource_link(subwiki,page,name)
+      if page =~ /^(.+)\.(gif|jpg|jpeg|png)$/i then
+        filename = $1
+        alt_label = name
+        if page == name || url?(name) then
+          alt_label = filename
+        end
+        image_link = "<img src=\"#{resource_url(page)}\" border=0 alt=\"#{alt_label}\" >"
+        if url?(name) then
+          return redirect_link(image_link,name)
         else
-          return "<a href=\"#{url}\">#{subwiki}:#{name}</a>"
+          return image_link
         end
-      else 
-        return edit_link(subwiki,page,name)
+      elsif page =~ /^(.*)\.rbl$/i then
+        page_name = $1
+        if page == name then
+          name = page_name
+        end
+        return perform_link(subwiki,page,name)
+      elsif page =~ /^(.+)\.html?$/i then
+        return link_to(resource_url(page),name)
+      else
+        return link_to_new_page(resource_url(page),name)
       end
     end
     
-    def view_version_link(subwiki,page,name,parameters=nil)
-      return "<a href=\"#{view_version_url(subwiki,page)+query_string(parameters)}\">#{name}</a>"
+    # URL to a specific version of a page    
+    def view_version_url(subwiki,page,version)
+      return make_verb_url('view',subwiki,page)+query_string( 'version' => version )
     end
-
-    def view_version_url(subwiki,page)
-      return make_verb_url('view',subwiki,page)
+    
+    # Link to a specific version of a page
+    def view_version_link(subwiki,page,name,version)
+      return link_to(view_version_url(subwiki,page,version),name)
     end
-
-    def query_string(parameters)
-      return "" if parameters.nil?
-      return "?" + parameters.collect { |key,value| key + '=' + value}.sort.join('&')
+    
+    # URL to diff page versions
+    def diff_url(subwiki,page,from,to)
+      params = Hash.new
+      params['from'] = from if from >= 0
+      params['to'] = to if to >= 0
+      return make_verb_url('diff',subwiki,page)+query_string( params )
     end
-
-    def version_link(page,name)
-      return "<a href=\"#{version_url(page)}\">#{name}</a>"
+    
+    # Link to page version
+    def diff_link(subwiki,page,name,from,to)
+      return link_to(diff_url(subwiki,page,from,to),name,false) if from == -1 && to == -1
+      return '' if from < 0
+      return '' if from >= to
+      
+      return link_to(diff_url(subwiki,page,from,to),name,false)
     end
-
+    
+    # URL to side by side view of two page versions
+    def sidebyside_url(subwiki,page,from,to)
+      params = Hash.new
+      params['from'] = from if from >= 0
+      params['to'] = to if to >= 0
+      return make_verb_url('sidebyside',subwiki,page)+query_string( params )
+    end
+    
+    # Link to side by side view of two page versions
+    def sidebyside_link(subwiki,page,name,from,to)
+      return link_to(sidebyside_url(subwiki,page,from,to),name,false) if from == -1 && to == -1
+      return '' if from < 0
+      return '' if from >= to
+      
+      return link_to(sidebyside_url(subwiki,page,from,to),name,false)
+    end
+    
+    # Link to admin page
     def admin_link(page,name)
-      return "<a href=\"#{make_verb_url('admin',page)}\">#{name}</a>"
+      return link_to(make_verb_url('admin',page),name)
     end
-
-
+    
+    
     def redirect_url(url)
       if @config.redirect_url?(@web,url) then
-        redirected_url = make_verb_url('redirect',@web.name) + "?url=" + CGI::escape(url) 
-        return redirected_url
+        return make_verb_url('redirect',@web.name) + "?url=" + CGI::escape(url) 
       else
         return url
       end
     end
-
+    
     def redirect_link(label,url)
       if @config.redirect_url?(@web,url) then
-        redirected_url = redirect_url(url)
-        return "<a href=\"#{redirected_url}\" rel=\"nofollow\" target=\"_blank\">#{label}</a>"
+        return "<a href=\"#{redirect_url(url)}\" rel=\"nofollow\" target=\"_blank\">#{label}</a>"
       else
-        return "<a href=\"#{url}\" target=\"_blank\">#{label}</a>"
+        return link_to_new_page(url,label)
       end
-
+      
+    end
+    
+    def escape_spaces(name)
+      name.gsub(/ /,'%20')
     end
 
-
+    # URL to a static resource (under the html subdirectory of the site)
     def resource_url(name)
       if @absolute_urls then
-        @web.base_url.chop + make_url('html',@web.name,name)
+        @web.base_url.chop + make_url('html',@web.name,escape_spaces(name))
       else
-        make_url('html',@web.name,name)
+        make_url('html',@web.name,escape_spaces(name))
       end
     end
-
+    
+    # Encode a mail address with javascript, so that it isn't harvestable
     def encode_mail_to(addr) 
-
       addr =~ /(.*)@(.*)/ ;
       name = $1 ;
       site = $2 ;
-
-      return  "<a href=\"#{view_url(@web.name,"MailFormattingRules")}\" onmouseover=\"this.href='mai' + 'lto:' + '#{name}' + '&#64;' + '#{site}'\">#{name}</a>" 
+      return  "<a href=\"#{view_url(@web.name,"MailFormattingRules")}\" rel=\"nofollow\" onmouseover=\"this.href='mai' + 'lto:' + '#{name}' + '&#64;' + '#{site}'\">#{name}</a>" 
     end
-
+    
     alias :encodeMailTo :encode_mail_to
-
+    
     private
-
-
+    
+    
     def append(before,match,after)
       result = ''
       result += before if !before.nil?
@@ -248,21 +383,67 @@ module Wiki2Go
       result += after if !after.nil?
       result
     end
-
+    
+    def format_tags(text)
+      original = text.dup
+      fragments = []      
+      while ! text.nil? && text.length > 0
+        if text =~ /<(\S[^>]*)\>/ then
+          before,match,text = $`,$1,$'
+          fragments << format_wiki_markup(before)
+          fragments << escape_url_markers(format_tag(match))
+        else
+          fragments << format_wiki_markup(text)
+          break
+        end
+      end
+      
+      fragments.join
+    end
+    
     def format_tag(text)
-      text = text.gsub(/"((http|ftp|gopher|news|https)\:[^"]*)"/) { externalUrl($1) }
-
+      text = text.gsub(/ target="_blank"/,'')
+      text = text.gsub(/^a (.*)"((http|ftp|gopher|news|https)\:[^"]*)"(.*)/i) { "a " + $1 + external_url($2) + $4 } 
+      
       return '<' + text + '>'
     end
-
-
+    
+    # Relative URL to the given page in the given subwiki
+    def view_page_url(subwiki,page)
+      if @generate_html && !Page.is_dynamic?(page) then 
+        return make_url(subwiki,page + ".html") 
+      else
+        return make_verb_url('view',subwiki,page)
+      end
+    end
+    
+    def perform_link(subwiki,page,name)
+      if @storage.exists?(File.join(subwiki,page)) then
+        url = make_verb_url('view',subwiki,page)
+        if subwiki == @web.name then
+          return link_to(url,name)
+        else
+          return link_to(url,"#{subwiki}:#{name}")
+        end
+      else 
+        return editor_link2(subwiki,page,name)
+      end
+    end
+    
+    def query_string(parameters)
+      return "" if parameters.nil? || parameters.size == 0
+      return "?" + parameters.collect { |key,value| key.to_s + '=' + CGI::escape(value.to_s)}.sort.join('&amp;')
+    end
+    
+    
+    
     def format_wiki_markup(line)
       if line =~ /^(.*)\{\!(.*)\!\}(.*)$/im then
         before,match,after = $1,$2,$3
         return append(format_wiki_markup(before),match,format_wiki_markup(after))
-      elsif line =~ /^(.*)<(\S.*)\>(.*)$/ then
-        before,match,after = $1,$2,$3
-        line =  append(format_wiki_markup(before),escape_url_markers(format_tag(match)),format_wiki_markup(after))
+        #      elsif line =~ /^(.*)<(\S.*)\>(.*)$/ then
+        #        before,match,after = $1,$2,$3
+        #        line =  append(format_wiki_markup(before),escape_url_markers(format_tag(match)),format_wiki_markup(after))
       elsif line =~ /^(.*)\{\%([^\}]*)\%\}(.*)$/ then
         before,match,after = $1,$2,$3
         line = append(format_wiki_markup(before),escape_url_markers(format_dynamic_link(match)),format_wiki_markup(after))
@@ -274,34 +455,32 @@ module Wiki2Go
         line = append(format_wiki_markup(before),escape_url_markers(format_forced_link(match)),format_wiki_markup(after))
       elsif line =~ /^(.*)((http|ftp|gopher|news|https)\:\/\/(\w|\/|\.|_|-|\?|\=|&|;|\~|#|,)+)(.*)$/ then
         before,match,after = $1,$2,$5
-        line = append(format_wiki_markup(before),escape_url_markers(external_link(match)),format_wiki_markup(after))
+        line = append(format_wiki_markup(before),escape_url_markers(external_link(nil,match)),format_wiki_markup(after))
       elsif line =~ /^(.*)mailto\:([a-zA-Z0-9\-\_\.]+@[a-zA-Z0-9\-\_\.]+)(.*)$/ then
         before,match,after = $1,$2,$3
         line = append(format_wiki_markup(before),escape_url_markers(encode_mail_to(match)),format_wiki_markup(after))          
       else
         line = format_brackets(line)
         line = format_entities(line)
-        line = recognize_wiki_words(line)
+        line = format_wiki_words(line)
       end
-      line = format_bullets(line)
-      line = format_markup(line)
       return line
     end    
-
+    
     def formatted_output(line)
       output = @pre_line + line + @post_line
       @pre_line = ""
       @post_line = ""
       return output
     end
-
-
+    
+    
     def escape_wiki_markers(line)
       line = line.gsub(/%%/,"&percent;")
       line = line.gsub(/\{\{/,"&openingbrace;")
       line = line.gsub(/\}\}/,"&closingbrace;")
     end
-
+    
     def escape_url_markers(line)
       line = line.gsub(/%/ ,'&percent;')
       line = line.gsub(/\{/,'&openingbrace;')
@@ -311,7 +490,7 @@ module Wiki2Go
       line = line.gsub(/_/ ,'&underscore;')
       return line
     end
-
+    
     def remove_markers(line)
       line = line.gsub(/&percent;/,"%")
       line = line.gsub(/&openingbrace;/,"{")
@@ -321,14 +500,14 @@ module Wiki2Go
       line = line.gsub(/&underscore;/,"_")
       return line
     end
-
-
+    
+    
     def format_brackets(line)
       line = line.gsub(/</,"&lt\;") ;
       line = line.gsub(/>/,"&gt\;") ;
       return line
     end
-
+    
     def format_entities(line)
       line = line.gsub(/\~/,"&tilde;") ;
       line = line.gsub(/&(\w+)\;/,"~\\1\;") ;
@@ -338,7 +517,7 @@ module Wiki2Go
       line = line.gsub(/\t/,"   ") ;
       return line
     end
-
+    
     def format_markup(line)
       line = line.gsub(/\*\*([^\*]*)\*\*/,"<h2>\\1<\/h2>")
       line = line.gsub(/\*([^\*]+)\*/,"<STRONG>\\1<\/STRONG>")
@@ -346,13 +525,13 @@ module Wiki2Go
       line = line.gsub(/^---+/,"<hr>")
       return line
     end
-
+    
     def format_bullets(line)
       line = line.gsub(/^([\s]{3,99})\*(.*)$/) { add_bullet($1,$2,'u') } 
       line = line.gsub(/^([\s]{3,99})(\d)+\.?(.*)$/) { add_bullet($1,$3,'o') } 
       return line
     end
-
+    
     def format_table(line)
       if @in_table then
         replacement = "</table>"
@@ -370,59 +549,52 @@ module Wiki2Go
         line = line.gsub(/\|/,"<\/td><td>")
       end
       return line
-
+      
     end
-
-    def recognize_wiki_words(line)
-      line = line.gsub(/(^|[^\w\.])([A-Z]+[a-z0-9]+[A-Z]+[a-zA-Z0-9]*)/) { $1 + internalLink($2) }
-
+    
+    def format_wiki_words(line)
+      line = line.gsub(/(^|[^\w\.])([A-Z]+[a-z0-9]+[A-Z]+[a-zA-Z0-9]*)/) { $1 + format_wiki_word($2) }
+      
     end
-
-    def external_link(url)
+    
+    def external_link(label,url)
       if url =~ /([^\/]+)\.(gif|jpg|jpeg|png)$/i then
-        alt = $1
+        alt = label || $1
         return "<img src=\"#{url}\" alt=\"#{alt}\">"
       else
-        return redirect_link(url,url)
+        return redirect_link(label || url,url)
       end
     end      
-
-    def externalUrl(url)
+    
+    def external_url(url)
       return '"' + redirect_url(url) + (@config.redirect_url?(@web,url) ? '" rel="nofollow"' : '"') +' target="_blank"'
     end      
-
+    
     def format_forced_link(link)
-      if ! link.gsub!(/^([^%@]+)@(http[^%]+)$/) { labelLink($1,$2) } then
-        link.gsub!(/^(([^\%@]+)@)?(([^\%:]+):)?([^%]+)$/) { mega_link($2,$4,$5,@web.name) }
+      if ! link.gsub!(/^([^@]+)@(http.+)$/) { external_link($1,$2) } then
+        link.gsub!(/^(([^@]+)@)?(([^:]+):)?(.+)$/) { internal_link($2,$4,$5) }
       end
       link
     end
-
-    def format_dynamic_link(link)
-      return link.gsub(/^(([^\%@]+)@)?(([^\%:]+):)?([^%]+)$/) { dynamic_link($2,$4,$5,@web.name) }
-    end
-
-    def labelLink(label,url)
-      return redirect_link(label,url)
-    end
-
-    def internalLink(page)
-      return internalSubwikiNamedLink(@web.name,page,page) 
+    
+    def format_wiki_word(word)
+      internal_link(word,@web.name,word)
     end
-
-    def mega_link(name,subwiki,page,default_wiki)
-      name = page if name.nil? || name.empty?
-      subwiki = default_wiki if subwiki.nil? || subwiki.empty?
-      internalSubwikiNamedLink(subwiki,page,name)
+    
+    def format_dynamic_link(link)
+      return link.gsub(/^(([^\%@]+)@)?(([^\%:]+):)?([^%]+)$/) { dynamic_link($2,$4,$5) }
     end
-
-    def dynamic_link(name,subwiki,page,default_wiki)
-      name = page if name.nil? || name.empty?
-      subwiki = default_wiki if subwiki.nil? || subwiki.empty?
-      perform_link(subwiki,page+'.rbl',name)
+    
+    def dynamic_link(label,subwiki,page)
+      label = page if label.nil? || label.empty?
+      subwiki = @web.name if subwiki.nil? || subwiki.empty?
+      perform_link(subwiki,page+'.rbl',label)
     end
-
-    def internalSubwikiNamedLink(subwiki,page,name)
+    
+    def internal_link(label,subwiki,page)
+      label = page if label.nil? || label.empty?
+      subwiki = @web.name if subwiki.nil? || subwiki.empty?
+      
       if subwiki == "xpnl" then
         return "<a href=\"http://www.xpnl.org/Wiki/#{page}\" target=\"_blank\">xpnl:#{page}</a>"
       elsif subwiki == 'xpbe' then
@@ -431,49 +603,25 @@ module Wiki2Go
         return "<a href=\"http://c2.com/cgi/wiki?#{page}\" target=\"_blank\">wiki:#{page}</a>"
       elsif subwiki == "book" then
         return "<a href=\"http://bookshelved.org/cgi-bin/wiki.pl?#{page}\" target=\"_blank\">book:#{page}</a>"
+      elsif subwiki == 'technorati' then
+        return "<a href=\"http://technorati.com/tag/#{page}\" target=\"_blank\" rel=\"tag\">#{label}</a>"
       elsif subwiki == "wiki2go" then
         return "<a href=\"http://wiki2go.nayima.be/Wiki2Go/#{page}.html\" target=\"_blank\">wiki2go:#{page}</a>"
       elsif subwiki =~ /^isbn$/i then
-        name = "ISBN " + page if page == name
-        return "<a href=\"http://www.amazon.co.uk/exec/obidos/ASIN/#{page}/#{@config.amazon_affiliate}\" target=\"_blank\">#{name}</a>"
+        label = "ISBN " + page if page == label
+        return "<a href=\"http://www.amazon.co.uk/exec/obidos/ASIN/#{page}/#{@config.amazon_affiliate}\" target=\"_blank\">#{label}</a>"
       elsif page =~ /^isbn(.+)$/i then
-        name = "ISBN " + $1 if page == name
-        return "<a href=\"http://www.amazon.co.uk/exec/obidos/ASIN/#{$1}/#{@config.amazon_affiliate}\" target=\"_blank\">#{name}</a>"
+        label = "ISBN " + $1 if page == label
+        return "<a href=\"http://www.amazon.co.uk/exec/obidos/ASIN/#{$1}/#{@config.amazon_affiliate}\" target=\"_blank\">#{label}</a>"
       elsif page =~ /\./ then
-        return resource_link(subwiki,page,name)
+        return resource_link(subwiki,page,label)
       elsif @storage.exists?(File.join(subwiki,page)) then
-        return view_link(subwiki,page,name)
-      else
-        return edit_link(subwiki,page,name)
-      end
-    end
-
-    def resource_link(subwiki,page,name)
-      if page =~ /^(.+)\.(gif|jpg|jpeg|png)$/i then
-        filename = $1
-        alt_label = name
-        if page == name || url?(name) then
-          alt_label = filename
-        end
-        image_link = "<img src=\"#{resource_url(page)}\" border=0 alt=\"#{alt_label}\" >"
-        if url?(name) then
-          return redirect_link(image_link,name)
-        else
-          return image_link
-        end
-      elsif page =~ /^(.*)\.rbl$/i then
-        page_name = $1
-        if page == name then
-          name = page_name
-        end
-        return perform_link(subwiki,page,name)
-      elsif page =~ /^(.+)\.html?$/i then
-        return "<a href=\"#{resource_url(page)}\">#{name}</a>"
+        return view_link(subwiki,page,label)
       else
-        return "<a href=\"#{resource_url(page)}\" target=\"_blank\">#{name}</a>"
+        return editor_link2(subwiki,page,label)
       end
     end
-
+    
     def add_bullet(prefix,text,code)
       @added_bullets = true
       depth = prefix.length / 3
@@ -497,18 +645,18 @@ module Wiki2Go
       end
       return result + "<li>#{text}"
     end
-
+    
     def emit_bullets
       while ! @bullets.empty?
         bullet = @bullets.pop
         @pre_line += "</#{bullet}l>" 
       end
     end
-
+    
     def url?(name)
       name =~ /(http|ftp|gopher|news|https)\:(\w|\/|\.|_|-|\?|\=|&|;|\~|#|,)+/
     end    
-
+    
   end
-
+  
 end