aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-10-22 18:33:15 -0400
committerRalph Amissah <ralph@amissah.com>2010-10-22 18:33:15 -0400
commitb2918451e29c81a80c5a4a8b016df5765096e35b (patch)
tree6d66ac73bca14a5906dc2aaa50164ca0cef3faab
parenthtml, internal link: remove space between link & parentheses or square brackets (diff)
epub, internal link: remove space between link & parentheses or square brackets
-rw-r--r--CHANGELOG_v21
-rw-r--r--data/doc/sisu/v2/CHANGELOG1
-rw-r--r--lib/sisu/v2/epub_tune.rb2
3 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 27820ea6..8a8bec53 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -27,6 +27,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
(requested fix, Ben Armstrong)
* html, remove space between link & parentheses or square brackets
* epub, remove space between link & following punctuation
+ * epub, remove space between link & parentheses or square brackets
%% 2.7.7.orig.tar.gz (2010-10-17:41/7)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 1b76710f..5aedaa94 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -27,6 +27,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz
(requested fix, Ben Armstrong)
* html, remove space between link & parentheses or square brackets
* epub, remove space between link & following punctuation
+ * epub, remove space between link & parentheses or square brackets
%% 2.7.7.orig.tar.gz (2010-10-17:41/7)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.7.orig.tar.gz
diff --git a/lib/sisu/v2/epub_tune.rb b/lib/sisu/v2/epub_tune.rb
index c47e78b4..90bf9575 100644
--- a/lib/sisu/v2/epub_tune.rb
+++ b/lib/sisu/v2/epub_tune.rb
@@ -333,7 +333,7 @@ module SiSU_EPUB_Tune
%{<img src="#{@env.url.images_epub}/\\1" naturalsizeflag="0" align="bottom" border="0" />})
end
if dob.obj =~/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}|image)/
- @word_mode=dob.obj.scan(/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}|image)[.,;:!?]?|(?:#{Mx[:gl_o]}\S+?#{Mx[:gl_c]})+|[^#{Mx[:lnk_o]}#{Mx[:lnk_c]}]+/mu)
+ @word_mode=dob.obj.scan(/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|#{Mx[:rel_o]}\S+?#{Mx[:rel_c]}|image)[.,;:!?)\]]?|(?:#{Mx[:gl_o]}\S+?#{Mx[:gl_c]})+|[^#{Mx[:lnk_o]}#{Mx[:lnk_c]}]+/mu)
words=urls(@word_mode)
dob.obj.gsub!(/.+/m,words)
end