Wiki2Go 1.14.0 → 1.14.1

data/lib/Wiki2Go/Install/make_site.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 require 'optparse'
 
 require 'rubygems'
-WIKI2GO_VERSION = '0.1.14'
+WIKI2GO_VERSION = '1.14'
 require_gem "Wiki2Go","=#{WIKI2GO_VERSION}"
 
 require 'Wiki2Go/PublicWikiConfig'

data/lib/Wiki2Go/WikiFormatter.rb

@@ -348,36 +348,34 @@ module Wiki2Go
     end     
 
     def format_wiki_markup(line)
+      line = escape_wiki_markers(line)
+
       if line =~ /^(.*)<(\S.*)\>(.*)$/ then
         before,match,after = $1,$2,$3
-        return append(format_wiki_markup(before),format_tag(match),format_wiki_markup(after))
+        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_forced_link(match)),format_wiki_markup(after))
+      elsif line =~ /^(.*)\%([^\%]*)\%(.*)$/ then
+        before,match,after = $1,$2,$3
+        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))
+      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 = escape_wiki_markers(line)
-
-        if line =~ /^(.*)\{([^\}]*)\}(.*)$/ then
-          before,match,after = $1,$2,$3
-          line = append(format_wiki_markup(before),format_forced_link(match),format_wiki_markup(after))
-        elsif line =~ /^(.*)\%([^\%]*)\%(.*)$/ then
-          before,match,after = $1,$2,$3
-          line = append(format_wiki_markup(before),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),external_link(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),encode_mail_to(match),format_wiki_markup(after))          
-        else
-          line = format_brackets(line)
-          line = format_entities(line)
-          line = format_bullets(line)
-          line = formatMarkup(line)
-          line = format_table(line)
-          line = recognize_wiki_words(line)
-        end
-        line = remove_markers(line)
-        return line
-      end    
-    end
+        line = format_brackets(line)
+        line = format_entities(line)
+        line = recognize_wiki_words(line)
+      end
+      line = format_bullets(line)
+      line = format_markup(line)
+      line = format_table(line)
+      line = remove_markers(line)
+      return line
+    end    
 
     def formatted_output(line)
       output = @pre_line + line + @post_line
@@ -401,6 +399,16 @@ module Wiki2Go
       line = line.gsub(/\}\}/,"&closingbrace;")
     end
     
+    def escape_url_markers(line)
+      line = line.gsub(/%/ ,'&percent;')
+      line = line.gsub(/\{/,'&openingbrace;')
+      line = line.gsub(/\}/,'&closingbrace;')
+      line = line.gsub(/~/ ,'&tilde;')
+      line = line.gsub(/\*/,'&asterisk;')
+      line = line.gsub(/_/ ,'&underscore;')
+      return line
+    end
+
     def remove_markers(line)
       line = line.gsub(/&percent;/,"%")
       line = line.gsub(/&openingbrace;/,"{")
@@ -428,7 +436,7 @@ module Wiki2Go
       return line
     end
 
-    def formatMarkup(line)
+    def format_markup(line)
       line = line.gsub(/\*\*([^\*]*)\*\*/,"<h2>\\1<\/h2>")
       line = line.gsub(/\*([^\*]+)\*/,"<STRONG>\\1<\/STRONG>")
       line = line.gsub(/\b_([^_]*)_/,"<EM>\\1<\/EM>")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.3
 specification_version: 1
 name: Wiki2Go
 version: !ruby/object:Gem::Version 
-  version: 1.14.0
-date: 2005-06-05
+  version: 1.14.1
+date: 2005-06-08
 summary: Wiki2Go is a Ruby Wiki
 require_paths: 
   - lib