diff options
| author | Ralph Amissah <ralph@amissah.com> | 2011-03-10 08:26:36 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2011-03-10 08:26:36 -0500 |
| commit | 78170753d8682c8ea9ae5f75232951d5b8043803 (patch) | |
| tree | feba220e3b80d65407783ae2fd6a779e3be9dd6b | |
| parent | v2, v3: 3.0.3 version & changelog "opened" (diff) | |
v2, v3: texpdf, url (regex) pattern match fix
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v2 | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG_v3 | 2 | ||||
| -rw-r--r-- | lib/sisu/v2/texpdf_format.rb | 4 | ||||
| -rw-r--r-- | lib/sisu/v3/texpdf_format.rb | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2 index bfb8728f..cecd65f0 100644 --- a/data/doc/sisu/CHANGELOG_v2 +++ b/data/doc/sisu/CHANGELOG_v2 @@ -18,6 +18,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.2.orig.tar.gz sisu_2.8.2-1.dsc sisu_2.8.2-1.diff.gz + * texpdf: url (regex) pattern match fix (/https?/) + %% 2.8.1.orig.tar.gz (2011-03-05:09/6) http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.1.orig.tar.gz sisu_2.8.1.orig.tar.gz diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index dd41da65..be20de8c 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -19,6 +19,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.3.orig.tar.gz sisu_3.0.3-1.dsc sisu_3.0.3-1.debian.tar.gz + * texpdf: url (regex) pattern match fix (/https?/) + %% 3.0.2.orig.tar.gz (2011-03-05:09/6) http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.2-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb index 732a903e..19e53d3b 100644 --- a/lib/sisu/v2/texpdf_format.rb +++ b/lib/sisu/v2/texpdf_format.rb @@ -7,7 +7,7 @@ * Author: Ralph Amissah - * Copyright: (C) 1997 - 2010, Ralph Amissah, All Rights Reserved. + * Copyright: (C) 1997 - 2011, Ralph Amissah, All Rights Reserved. * License: GPL 3 or later: @@ -970,7 +970,7 @@ WOK para_array=[] str=if word word.each do |w| # _ - / # | : ! ^ ~ - if w !~/http:/ \ + if w !~/https?:/ \ and w=~/\/\S+?\// \ and w.length > 6 w.gsub!(/([_.\/])/,'\1\-') diff --git a/lib/sisu/v3/texpdf_format.rb b/lib/sisu/v3/texpdf_format.rb index a1fb3e72..114c3cb6 100644 --- a/lib/sisu/v3/texpdf_format.rb +++ b/lib/sisu/v3/texpdf_format.rb @@ -972,7 +972,7 @@ WOK para_array=[] str=if word word.each do |w| # _ - / # | : ! ^ ~ - if w !~/http:/ \ + if w !~/https?:/ \ and w=~/\/\S+?\// \ and w.length > 6 w.gsub!(/([_.\/])/,'\1\-') |