diff options
| -rw-r--r-- | CHANGELOG_v2 | 3 | ||||
| -rw-r--r-- | data/doc/sisu/v2/CHANGELOG | 3 | ||||
| -rw-r--r-- | lib/sisu/v2/html_tune.rb | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 67439f8a..8b30128d 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -26,6 +26,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz * odf:odt, incorporation and scaling of images, fix (requested fix) + * html (html_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 d2990379..82d931f9 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -26,6 +26,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz * odf:odt, incorporation and scaling of images, fix (requested fix) + * html (html_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/html_tune.rb b/lib/sisu/v2/html_tune.rb index d5f3f35e..f4ad532f 100644 --- a/lib/sisu/v2/html_tune.rb +++ b/lib/sisu/v2/html_tune.rb @@ -267,8 +267,8 @@ module SiSU_HTML_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] |