From 4f2d1d3fb3b7566d4434a2910491c780d26890b7 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 11 Oct 2010 22:28:51 -0400
Subject: shared_metadata, odf, url characters to not match
---
CHANGELOG_v2 | 2 ++
data/doc/sisu/v2/CHANGELOG | 2 ++
lib/sisu/v2/shared_metadata.rb | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 16fabd8a..3736a8ac 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -18,6 +18,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
sisu_2.7.6-1.dsc
sisu_2.7.6-1.diff.gz
+ * shared_metadata, odf, url characters to not match
+
* sisu_convert, basic conversion script (seldom used/tested) start to get it
working again
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index c70db845..2a9710b0 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -18,6 +18,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.6.orig.tar.gz
sisu_2.7.6-1.dsc
sisu_2.7.6-1.diff.gz
+ * shared_metadata, odf, url characters to not match
+
* sisu_convert, basic conversion script (seldom used/tested) start to get it
working again
diff --git a/lib/sisu/v2/shared_metadata.rb b/lib/sisu/v2/shared_metadata.rb
index e589c598..f27cf5ba 100644
--- a/lib/sisu/v2/shared_metadata.rb
+++ b/lib/sisu/v2/shared_metadata.rb
@@ -496,7 +496,7 @@ WOK
@inf.gsub!(/#{Mx[:url_o]}(\S+?)#{Mx[:url_c]}/,
%{#{url_brace.xml_open}<text:a xlink:type="simple" xlink:href="\\1">\\1</text:a>#{url_brace.xml_close}}) #http ftp matches with decoration
else
- @inf.gsub!(/(https?:\/\/[^<>'"\s]+)/,
+ @inf.gsub!(/(https?:\/\/[^<>()'"\s]+)/,
%{#{url_brace.xml_open}<text:a xlink:type="simple" xlink:href="\\1">\\1</text:a>#{url_brace.xml_close}}) #http ftp matches with decoration
end
@inf.gsub!(/([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+)/,
--
cgit v1.2.3