diff options
| -rw-r--r-- | CHANGELOG_v2 | 4 | ||||
| -rw-r--r-- | data/doc/sisu/v2/CHANGELOG | 4 | ||||
| -rw-r--r-- | lib/sisu/v2/epub_tune.rb | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 5b1eac70..23da40e1 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -20,9 +20,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz [debian freeze, fix] - * html, internal link remove space between link and following punctuation + * html, internal link: remove space between link & following punctuation (requested fix, Ben Armstrong) + * epub, internal link: remove space between link & following punctuation + %% 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 0a9befa48e6cfd62ecd7ee25febe1c4e1dc3f54eed8d89042f8d3519d3fff345 2747742 sisu_2.7.7.orig.tar.gz diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index 93c92b33..d69d2289 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -20,9 +20,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.8.orig.tar.gz [debian freeze, fix] - * html, internal link remove space between link and following punctuation + * html, internal link: remove space between link & following punctuation (requested fix, Ben Armstrong) + * epub, internal link: remove space between link & following punctuation + %% 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 0a9befa48e6cfd62ecd7ee25febe1c4e1dc3f54eed8d89042f8d3519d3fff345 2747742 sisu_2.7.7.orig.tar.gz diff --git a/lib/sisu/v2/epub_tune.rb b/lib/sisu/v2/epub_tune.rb index e0c1e029..c47e78b4 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 |