From 50137a3afe66bc2f3604e3495a4290fd04348489 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 8 Oct 2010 11:41:03 -0400
Subject: epub (epub_tune) scaling of images, fix (+changelog)
(requested fix)
---
CHANGELOG_v2 | 3 +++
data/doc/sisu/v2/CHANGELOG | 3 +++
lib/sisu/v2/epub_tune.rb | 4 ++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 8b30128d..130973c5 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -29,6 +29,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
* html (html_tune) scaling of images, fix
(requested fix)
+ * epub (epub_tune) scaling of images, fix
+ (requested fix)
+
%% 2.7.3.orig.tar.gz (2010-10-06:40/3)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
01da42186d8b7381356739ef612221b55e93c9a4f94c431744f8bdb123fd8f15 2744721 sisu_2.7.3.orig.tar.gz
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 82d931f9..ce051c23 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -29,6 +29,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
* html (html_tune) scaling of images, fix
(requested fix)
+ * epub (epub_tune) scaling of images, fix
+ (requested fix)
+
%% 2.7.3.orig.tar.gz (2010-10-06:40/3)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
01da42186d8b7381356739ef612221b55e93c9a4f94c431744f8bdb123fd8f15 2744721 sisu_2.7.3.orig.tar.gz
diff --git a/lib/sisu/v2/epub_tune.rb b/lib/sisu/v2/epub_tune.rb
index 83e718aa..e0c1e029 100644
--- a/lib/sisu/v2/epub_tune.rb
+++ b/lib/sisu/v2/epub_tune.rb
@@ -269,8 +269,8 @@ module SiSU_EPUB_Tune
m,u=/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}(image)/.match(word).captures
end
case m
- when /\.png|\.jpg|\.gif|c=|\d+x\d+/
- w,h=/(\d+)x(\d+)/.match(m).captures if m =~/\d+x\d+/
+ when /\.png|\.jpg|\.gif|c=|\s\d+x\d+/
+ w,h=/\s(\d+)x(\d+)/.match(m).captures if m =~/\s\d+x\d+/
w=%{width="#{w}"} if w
h=%{height="#{h}"} if h
c=m[/"(.+?)"/m,1]
--
cgit v1.2.3