From a99e0de5885441989c2ae9ae6fad15fd35d0bb97 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 30 Jul 2007 09:06:51 +0100
Subject: url matching, semi-colon as possible terminator, in dal match https

---
 lib/sisu/v0/odf.rb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib/sisu/v0/odf.rb')

diff --git a/lib/sisu/v0/odf.rb b/lib/sisu/v0/odf.rb
index ff788116..6025dfb2 100644
--- a/lib/sisu/v0/odf.rb
+++ b/lib/sisu/v0/odf.rb
@@ -272,21 +272,21 @@ module SiSU_ODF
         end
         para
       end
-      def text_link_odf(txt,url)
+      def text_link_odf(txt,url,trail)
         txt.gsub!(/(\\\+)/,'+') #this is convoluted, and risky :-(
         url.gsub!(/(\\\+)/,'+') #this is convoluted, and risky :-(
-        %{<text:a xlink:type="simple" xlink:href="#{url}">#{txt}</text:a>}
+        %{<text:a xlink:type="simple" xlink:href="#{url}">#{txt.strip}</text:a>#{trail}}
       end
       def text_link(para)
         para.gsub!(@serial,'')
-        m=para.scan(/(\{([^}]+?)\}((?:https?|ftp)\S+))/) #sort
+        m=para.scan(/(\{([^}]+?)\}((?:https?|ftp)\S+?))([;.,]?$)/) #sort
         if m
           m.each do |i|
-            txt,url=i[1],i[2]
+            txt,url,trail=i[1],i[2]
             txt.gsub!(/([)(\]\[])/,"\\\\\\1")
             txt.gsub!(/([+?])/,"\\\\\\1") # problems with +
             url.gsub!(/([+?])/,"\\\\\\1") # problems with +
-            para.gsub!(/\{\s*#{txt}\}#{url}/m,text_link_odf(txt,url)) #make sure trailing ']' are not caught in url
+            para.gsub!(/\{\s*#{txt}\}#{url}/m,text_link_odf(txt,url,trail)) #make sure trailing ']' are not caught in url
             para.gsub!(/\\([)(\]\[?])/,'\1') #clumsy fix
           end
           m=nil
@@ -295,13 +295,13 @@ module SiSU_ODF
       end
       def normal(para)                                                           #P1 - P3
         para.gsub!(@serial,'')
-        para.gsub!(/\b[_\\]((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([.,]?(?:\s|$))/,
+        para.gsub!(/\b[_\\]((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/,
           %{<text:a xlink:type="simple" xlink:href="\\1">\\1</text:a>\\2}) #http ftp matches escaped, no decoration
-        para.gsub!(/((?:^|\s)[}])((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([.,]?(?:\s|$))/,
+        para.gsub!(/((?:^|\s)[}])((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/,
           %{\\1<text:a xlink:type="simple" xlink:href="\\2">\\2</text:a>\\3}) #special case \{ e.g. \}http://url
-        para.gsub!(/(^|\s)((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([.,]?(?=\s|$))/,
+        para.gsub!(/(^|\s)((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?=\s|$))/,
           %{\\1#{@url_brace.xml_open}<text:a xlink:type="simple" xlink:href="\\2">\\2</text:a>#{@url_brace.xml_close}\\3}) #http ftp matches with decoration
-        #para.gsub!(/\b((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([.,]?(?:\s|$))/, also works
+        #para.gsub!(/\b((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/, also works
           #%{#{@url_brace.xml_open}<text:a xlink:type="simple" xlink:href="\\1">\\1</text:a>#{@url_brace.xml_close}\\2}) #http ftp matches with decoration
         para.gsub!(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+)/,
           %{#{@url_brace.xml_open}<text:a xlink:type="simple" xlink:href="mailto:\\1">\\1</text:a>#{@url_brace.xml_close}})
@@ -377,7 +377,7 @@ module SiSU_ODF
         parray=[]
         para.split(/<:?br(?: \/)?>/).each do |parablock|
           parablock=group_clean(parablock)
-          parablock.gsub!(/\b[_\\]((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([.,]?(?:\s|$))/,
+          parablock.gsub!(/\b[_\\]((?:https?|ftp):\/\/\S+?\.[^'"><\s]+?)([;.,]?(?:\s|$))/,
             %{<text:a xlink:type="simple" xlink:href="\\1">\\1</text:a>\\2}) #http ftp matches escaped, no decoration
           parray << %{<text:p text:style-name="P5">#{parablock}</text:p>} if parablock =~/\S+/
         end
-- 
cgit v1.2.3