From 79ef5fd0725d0c92c18e73fa4a56b0a491d32544 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 7 Oct 2010 10:17:47 -0400
Subject: sha256 (2.7.3)
---
CHANGELOG_v2 | 6 +++---
data/doc/sisu/v2/CHANGELOG | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 0171699e..1b2fb3d5 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -14,9 +14,9 @@ Reverse Chronological:
%% 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
- sisu_2.7.3.orig.tar.gz
- sisu_2.7.3-1.dsc
- sisu_2.7.3-1.diff.gz
+ 01da42186d8b7381356739ef612221b55e93c9a4f94c431744f8bdb123fd8f15 2744721 sisu_2.7.3.orig.tar.gz
+ 8c258e23ca20c57a39023a9a7cff228f3ba0581bc27bfa39d61706d6517aadc1 1196 sisu_2.7.3-1.dsc
+ 3a914afade9b9057ed47f65731809031896687dbc1c63e519ba460761a20fb15 288337 sisu_2.7.3-1.diff.gz
[debian freeze, fix]
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 0fcd3be4..a0e291f0 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -14,9 +14,9 @@ Reverse Chronological:
%% 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
- sisu_2.7.3.orig.tar.gz
- sisu_2.7.3-1.dsc
- sisu_2.7.3-1.diff.gz
+ 01da42186d8b7381356739ef612221b55e93c9a4f94c431744f8bdb123fd8f15 2744721 sisu_2.7.3.orig.tar.gz
+ 8c258e23ca20c57a39023a9a7cff228f3ba0581bc27bfa39d61706d6517aadc1 1196 sisu_2.7.3-1.dsc
+ 3a914afade9b9057ed47f65731809031896687dbc1c63e519ba460761a20fb15 288337 sisu_2.7.3-1.diff.gz
[debian freeze, fix]
--
cgit v1.2.3
From c7f4ff94b232adac607f0a8ad4ca00ee619a4bec Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 8 Oct 2010 11:35:43 -0400
Subject: texpdf, scaling of images (below the set max size), fix (+changelog)
(requested fix)
---
CHANGELOG_v2 | 12 ++++++++++++
data/doc/sisu/v2/CHANGELOG | 12 ++++++++++++
lib/sisu/v2/texpdf_format.rb | 4 ++--
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 1b2fb3d5..d1fb5136 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,6 +12,17 @@ Reverse Chronological:
%% Development branch UNSTABLE
+%% 2.7.4.orig.tar.gz (2010-10-08:40/5)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
+ sisu_2.7.4.orig.tar.gz
+ sisu_2.7.4-1.dsc
+ sisu_2.7.4-1.diff.gz
+
+ [debian freeze, fix]
+
+ * texpdf, scaling of images (below the set maximum size), 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
@@ -27,6 +38,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
* dal_images, where image dimensions are set in an object, use those, (rather
than those determined by imagemagick or graphicsmagick). [note: all must be
set in an object, or none]
+ (requested fix)
* options, a few aliases added (long options)
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index a0e291f0..9c98d229 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,6 +12,17 @@ Reverse Chronological:
%% Development branch UNSTABLE
+%% 2.7.4.orig.tar.gz (2010-10-08:40/5)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
+ sisu_2.7.4.orig.tar.gz
+ sisu_2.7.4-1.dsc
+ sisu_2.7.4-1.diff.gz
+
+ [debian freeze, fix]
+
+ * texpdf, scaling of images (below the set maximum size), 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
@@ -27,6 +38,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
* dal_images, where image dimensions are set in an object, use those, (rather
than those determined by imagemagick or graphicsmagick). [note: all must be
set in an object, or none]
+ (requested fix)
* options, a few aliases added (long options)
diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb
index 8eff07b9..36366c9b 100644
--- a/lib/sisu/v2/texpdf_format.rb
+++ b/lib/sisu/v2/texpdf_format.rb
@@ -339,7 +339,7 @@ module SiSU_TeX_Pdf
image=z[/(\S+?\.(?:png|jpg|gif)\b)/m]
image.gsub!(/\\/,'')
width=if z =~ /\d+x\d*/
- w=(z[/(\d+)x\d*/,1]).to_i
+ w=(z[/\s(\d+)x\d*/,1]).to_i
w*0.8
else '100' #revisit, is bug for small images/icons
end
@@ -498,7 +498,7 @@ module SiSU_TeX_Pdf
and images_hash[ps]=~/\s+\d+x\d+(\s+|\s*#{Mx[:lnk_c]})/m
image,x,y=z.scan(/\S+/)
image.gsub!(/\\/,'')
- w=((z =~/(\d+)x\d*/) ? z[/(\d+)x\d*/,1] : 200)
+ w=((z =~/\s(\d+)x\d*/) ? z[/\s(\d+)x\d*/,1] : 200)
width={}
width['a4'] = ((w.to_i > @dm['a4']) ? @dm['a4'] : w)
width['letter'] = ((w.to_i > @dm['letter']) ? @dm['letter'] : w)
--
cgit v1.2.3
From 20d511b8b4113c76619875920f50a04758bfba00 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 8 Oct 2010 11:38:07 -0400
Subject: odf:odt, incorporation and scaling of images, fix (+changelog)
(requested fix)
---
CHANGELOG_v2 | 3 +++
data/doc/sisu/v2/CHANGELOG | 3 +++
lib/sisu/v2/odf.rb | 5 +++--
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index d1fb5136..67439f8a 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -23,6 +23,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
* texpdf, scaling of images (below the set maximum size), fix
(requested fix)
+ * odf:odt, incorporation and 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 9c98d229..d2990379 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -23,6 +23,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.4.orig.tar.gz
* texpdf, scaling of images (below the set maximum size), fix
(requested fix)
+ * odf:odt, incorporation and 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/odf.rb b/lib/sisu/v2/odf.rb
index bb071683..41229249 100644
--- a/lib/sisu/v2/odf.rb
+++ b/lib/sisu/v2/odf.rb
@@ -197,7 +197,7 @@ module SiSU_ODF
m,u=img[1],img[2]
i=/^(\S+?\.(?:png|jpg|gif))/.match(m).captures.join if m =~/^(\S+?\.(?:png|jpg|gif))/
c=/^\S+?\.(?:png|jpg|gif)\s+.+?"(.*?)"/.match(m).captures.join if m =~/^\S+?\.(?:png|jpg|gif)\s+.+?"(.*?)"/
- w,h=/(\d+)x(\d+)/.match(m).captures if m =~/\d+x\d+/
+ w,h=/\s(\d+)x(\d+)/.match(m).captures if m =~/\s\d+x\d+/
w=(w.to_i/37.79485).to_s
h=(h.to_i/37.79485).to_s
h=/([0-9]+\.\d{0,3})/.match(h).captures.join
@@ -225,7 +225,8 @@ module SiSU_ODF
cont.gsub!(/([)(\]\[])/,"\\\\\\1")
cont.gsub!(/([+?])/,"\\\\\\1") # incorrect handling of +
url.gsub!(/([+?])/,"\\\\\\1")
- dob.obj.sub!(/#{Mx[:lnk_o]}[ ]*#{cont}[ ]*#{Mx[:lnk_c]}#{Mx[:url_o]}#{url}#{Mx[:url_c]}/m,image_odf(i)) #watch
+ dob.obj.sub!(/#{Mx[:lnk_o]}[ ]*#{cont}[ ]*#{Mx[:lnk_c]}image/m,image_odf(i))
+ dob.obj.sub!(/#{Mx[:lnk_o]}[ ]*#{cont}[ ]*#{Mx[:lnk_c]}#{Mx[:url_o]}#{url}#{Mx[:url_c]}/m,image_odf(i))
dob.obj.gsub!(/\\([)(\]\[?])/,'\1') #clumsy fix
end
m=nil
--
cgit v1.2.3
From bbcd934bd6b3ca45816a26d8a27dd917caa29f2d Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 8 Oct 2010 11:39:51 -0400
Subject: html (html_tune) scaling of images, fix (+changelog)
(requested fix)
---
CHANGELOG_v2 | 3 +++
data/doc/sisu/v2/CHANGELOG | 3 +++
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]
--
cgit v1.2.3
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
From 2f0b6b2850019295b592acdb98f7fb8b7cf47aff Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 8 Oct 2010 11:42:48 -0400
Subject: update version (2.7.4)
---
data/sisu/v2/v/version.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 6ad9e890..adbdc2b4 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
---
-:version: 2.7.3
-:date_stamp: 2010w40/3
-:date: "2010-10-06"
+:version: 2.7.4
+:date_stamp: 2010w40/5
+:date: "2010-10-08"
:project: SiSU
--
cgit v1.2.3