[DRE-commits] [ruby-prawn] 03/03: Refresh patches
Gunnar Wolf
gwolf at moszumanska.debian.org
Thu Jan 16 19:48:44 UTC 2014
This is an automated email from the git hooks/post-receive script.
gwolf pushed a commit to branch master
in repository ruby-prawn.
commit 928ecbdd53901d35948ad5c4ef165296881e4ed8
Author: Gunnar Wolf <gwolf at debian.org>
Date: Thu Jan 16 13:47:10 2014 -0600
Refresh patches
---
.../0100_remove_bundler_rubygems_stuff.patch | 10 +-
debian/patches/0102_simply_require_ttfunk.patch | 23 +--
...105_remove_rubygems_loadpath_stuff_manual.patch | 8 +-
.../0200_replace_BASEDIR_data_by_DATADIR.patch | 20 +-
.../0210_change_spec_data_to_datadir_pdfs.patch | 32 ++--
debian/patches/0300_fix_paths.patch | 10 +-
debian/patches/0400_use_system_fonts.patch | 203 ++++++++++++---------
debian/patches/0405_use_system_fonts_manual.patch | 44 +++--
.../0500_disable_tests_using_removed_files.patch | 124 +++++++------
9 files changed, 274 insertions(+), 200 deletions(-)
diff --git a/debian/patches/0100_remove_bundler_rubygems_stuff.patch b/debian/patches/0100_remove_bundler_rubygems_stuff.patch
index d44a1ee..a1aa7d1 100644
--- a/debian/patches/0100_remove_bundler_rubygems_stuff.patch
+++ b/debian/patches/0100_remove_bundler_rubygems_stuff.patch
@@ -1,9 +1,11 @@
Description: remove rubygems and bundler stuff from specs
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-06-22
+Last-Update: 2014-01-16
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
+Index: ruby-prawn/spec/spec_helper.rb
+===================================================================
+--- ruby-prawn.orig/spec/spec_helper.rb 2014-01-16 11:58:49.000000000 -0600
++++ ruby-prawn/spec/spec_helper.rb 2014-01-16 11:59:18.000000000 -0600
@@ -2,10 +2,10 @@
puts "Prawn specs: Running on Ruby Version: #{RUBY_VERSION}"
@@ -13,7 +15,7 @@ Last-Update: 2013-06-22
+#require "bundler"
+#Bundler.setup
--$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+#$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
require "prawn"
diff --git a/debian/patches/0102_simply_require_ttfunk.patch b/debian/patches/0102_simply_require_ttfunk.patch
index 5c67e88..3a757b1 100644
--- a/debian/patches/0102_simply_require_ttfunk.patch
+++ b/debian/patches/0102_simply_require_ttfunk.patch
@@ -2,19 +2,16 @@ Description: replace complicated statements by a simple require 'ttfunk'
ttfunk is available as a Debian package. We do not need $LOAD_PATH
manipulations and rescues to load this library.
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2011-11-24
+Last-Update: 2014-01-16
---- a/lib/prawn/core.rb
-+++ b/lib/prawn/core.rb
-@@ -6,19 +6,7 @@
- # This is free software. Please see the LICENSE and COPYING files for details.
+Index: ruby-prawn/lib/prawn.rb
+===================================================================
+--- ruby-prawn.orig/lib/prawn.rb 2014-01-16 13:08:10.000000000 -0600
++++ ruby-prawn/lib/prawn.rb 2014-01-16 13:08:57.000000000 -0600
+@@ -8,14 +8,7 @@
+ $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../../vendor/#{dep}")
+ end
- require "set"
--
--%w[ttfunk/lib].each do |dep|
-- $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../../vendor/#{dep}")
--end
--
-begin
- require 'ttfunk'
-rescue LoadError
@@ -25,5 +22,5 @@ Last-Update: 2011-11-24
-end
+require 'ttfunk'
- module Prawn
- extend self
+ require "set"
+
diff --git a/debian/patches/0105_remove_rubygems_loadpath_stuff_manual.patch b/debian/patches/0105_remove_rubygems_loadpath_stuff_manual.patch
index 32ee080..46e36b6 100644
--- a/debian/patches/0105_remove_rubygems_loadpath_stuff_manual.patch
+++ b/debian/patches/0105_remove_rubygems_loadpath_stuff_manual.patch
@@ -1,9 +1,11 @@
Description: remove LOAD_PATH manipulation from manual sources
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-06-22
+Last-Update: 2014-01-16
---- a/manual/example_helper.rb
-+++ b/manual/example_helper.rb
+Index: ruby-prawn/manual/example_helper.rb
+===================================================================
+--- ruby-prawn.orig/manual/example_helper.rb 2014-01-16 12:02:05.000000000 -0600
++++ ruby-prawn/manual/example_helper.rb 2014-01-16 12:02:05.000000000 -0600
@@ -3,7 +3,7 @@
# Helper for organizing examples
#
diff --git a/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch b/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
index 7dff138..65b42e0 100644
--- a/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
+++ b/debian/patches/0200_replace_BASEDIR_data_by_DATADIR.patch
@@ -1,19 +1,19 @@
Description: redefine BASEDIR and DATADIR
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-06-22
+Last-Update: 2014-01-16
---- a/lib/prawn/core.rb
-+++ b/lib/prawn/core.rb
-@@ -18,8 +18,10 @@
- # The base source directory for Prawn as installed on the system
+Index: ruby-prawn/lib/prawn.rb
+===================================================================
+--- ruby-prawn.orig/lib/prawn.rb 2014-01-16 13:04:52.000000000 -0600
++++ ruby-prawn/lib/prawn.rb 2014-01-16 13:05:29.000000000 -0600
+@@ -32,7 +32,9 @@
#
- #
-- BASEDIR = File.expand_path(File.join(dir, '..','..'))
-- DATADIR = File.expand_path(File.join(dir, '..', '..', 'data'))
-+ BASEDIR = File.expand_path(File.join(dir, '..'))
+ #
+ BASEDIR = File.expand_path(File.join(dir, '..'))
+- DATADIR = File.expand_path(File.join(dir, '..', 'data'))
+ # Definition of a data directory that may be not in BASEDIR/data (Debian patch)
+ # /usr/lib/ruby/vendor_ruby/prawn -> /usr/share/ruby-prawn/
-+ DATADIR = File.expand_path(File.join(dir, '..', '..', '..', '..', 'share', 'ruby-prawn'))
++ DATADIR = File.expand_path(File.join(dir, '..', '..', '..', 'share', 'ruby-prawn'))
# Whe set to true, Prawn will verify hash options to ensure only valid keys
# are used. Off by default.
diff --git a/debian/patches/0210_change_spec_data_to_datadir_pdfs.patch b/debian/patches/0210_change_spec_data_to_datadir_pdfs.patch
index ffeace5..08b3ade 100644
--- a/debian/patches/0210_change_spec_data_to_datadir_pdfs.patch
+++ b/debian/patches/0210_change_spec_data_to_datadir_pdfs.patch
@@ -4,37 +4,41 @@ Description: reflect the fact that spec/data moved to data/spec
that they can be installed too (see debian/ruby-prawn.install).
The code of the specs has to be modified to find correctly the files which moved away.
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-08-08
+Last-Update: 2014-01-16
---- a/spec/object_store_spec.rb
-+++ b/spec/object_store_spec.rb
+Index: ruby-prawn/spec/object_store_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/object_store_spec.rb 2014-01-16 12:09:40.000000000 -0600
++++ ruby-prawn/spec/object_store_spec.rb 2014-01-16 12:11:00.000000000 -0600
@@ -16,20 +16,20 @@
end
it "should import objects from an existing PDF" do
- filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
+ filename = "#{Prawn::DATADIR}/spec/curves.pdf"
- store = Prawn::Core::ObjectStore.new(:template => filename)
+ store = PDF::Core::ObjectStore.new(:template => filename)
store.size.should == 5
end
it "should point to existing roots when importing objects from an existing PDF" do
- filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
+ filename = "#{Prawn::DATADIR}/spec/curves.pdf"
- store = Prawn::Core::ObjectStore.new(:template => filename)
- store.info.class.should == Prawn::Core::Reference
- store.root.class.should == Prawn::Core::Reference
+ store = PDF::Core::ObjectStore.new(:template => filename)
+ store.info.class.should == PDF::Core::Reference
+ store.root.class.should == PDF::Core::Reference
end
it "should initialize with pages when importing objects from an existing PDF" do
- filename = "#{Prawn::BASEDIR}/spec/data/curves.pdf"
+ filename = "#{Prawn::DATADIR}/spec/curves.pdf"
- store = Prawn::Core::ObjectStore.new(:template => filename)
+ store = PDF::Core::ObjectStore.new(:template => filename)
store.pages.data[:Count].should == 1
end
---- a/spec/template_spec.rb
-+++ b/spec/template_spec.rb
-@@ -2,7 +2,7 @@
+Index: ruby-prawn/spec/template_spec_obsolete.rb
+===================================================================
+--- ruby-prawn.orig/spec/template_spec_obsolete.rb 2014-01-16 12:09:40.000000000 -0600
++++ ruby-prawn/spec/template_spec_obsolete.rb 2014-01-16 12:09:40.000000000 -0600
+@@ -3,7 +3,7 @@
describe "Document built from a template" do
it "should have the same page count as the source document" do
@@ -43,7 +47,7 @@ Last-Update: 2013-08-08
@pdf = Prawn::Document.new(:template => filename)
page_counter = PDF::Inspector::Page.analyze(@pdf.render)
-@@ -17,14 +17,14 @@
+@@ -18,14 +18,14 @@
it "should have start with the Y cursor at the top of the document" do
@@ -60,7 +64,7 @@ Last-Update: 2013-08-08
@pdf = Prawn::Document.new(:template => filename, :margin => 0)
@pdf.page.margins.should == { :left => 0,
-@@ -51,7 +51,7 @@
+@@ -52,7 +52,7 @@
end
it "should not add an extra restore_graphics_state operator to the end of any content stream" do
@@ -69,7 +73,7 @@ Last-Update: 2013-08-08
@pdf = Prawn::Document.new(:template => filename)
output = StringIO.new(@pdf.render)
-@@ -195,7 +195,7 @@
+@@ -196,7 +196,7 @@
end
describe "Document#start_new_page with :template option" do
diff --git a/debian/patches/0300_fix_paths.patch b/debian/patches/0300_fix_paths.patch
index 43f057c..fc574d7 100644
--- a/debian/patches/0300_fix_paths.patch
+++ b/debian/patches/0300_fix_paths.patch
@@ -1,10 +1,12 @@
Description: fix fonts path to use only prawn's fonts directory
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-06-22
+Last-Update: 2014-01-16
---- a/lib/prawn/font/afm.rb
-+++ b/lib/prawn/font/afm.rb
-@@ -26,9 +26,7 @@
+Index: ruby-prawn/lib/prawn/font/afm.rb
+===================================================================
+--- ruby-prawn.orig/lib/prawn/font/afm.rb 2014-01-16 12:11:23.000000000 -0600
++++ ruby-prawn/lib/prawn/font/afm.rb 2014-01-16 12:11:23.000000000 -0600
+@@ -25,9 +25,7 @@
@metrics_path ||= m.split(':')
else
@metrics_path ||= [
diff --git a/debian/patches/0400_use_system_fonts.patch b/debian/patches/0400_use_system_fonts.patch
index 2728f1e..5fe7112 100644
--- a/debian/patches/0400_use_system_fonts.patch
+++ b/debian/patches/0400_use_system_fonts.patch
@@ -3,10 +3,12 @@ Description: use system fonts when possible
available in Debian. These copies have been removed from the Debian source
package, and system fonts are used instead.
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-08-08
+Last-Update: 2014-01-16
---- a/spec/line_wrap_spec.rb
-+++ b/spec/line_wrap_spec.rb
+Index: ruby-prawn/spec/line_wrap_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/line_wrap_spec.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/spec/line_wrap_spec.rb 2014-01-16 13:31:26.000000000 -0600
@@ -51,7 +51,7 @@
end
@@ -26,12 +28,12 @@ Last-Update: 2013-08-08
@arranger.format_array = array
string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -116,7 +116,7 @@
- expected.force_encoding("utf-8") if "".respond_to?(:force_encoding)
+ expected.force_encoding(Encoding::UTF_8)
string.should == expected
- @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
+ @pdf.font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
- @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+ @line_wrap = Prawn::Text::Formatted::LineWrap.new
string = "hello#{Prawn::Text::SHY}world"
@@ -137,7 +137,7 @@
@@ -40,7 +42,7 @@ Last-Update: 2013-08-08
- @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
+ @pdf.font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
- @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+ @line_wrap = Prawn::Text::Formatted::LineWrap.new
string = "hello#{Prawn::Text::SHY}world"
@@ -166,7 +166,7 @@
@@ -49,34 +51,35 @@ Last-Update: 2013-08-08
- @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
+ @pdf.font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
- @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+ @line_wrap = Prawn::Text::Formatted::LineWrap.new
enough_width_for_hello_world = 68
@@ -205,7 +205,7 @@
- expected.force_encoding("utf-8") if "".respond_to?(:force_encoding)
+ expected.force_encoding(Encoding::UTF_8)
string.should == expected
- @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
+ @pdf.font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
- @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
+ @line_wrap = Prawn::Text::Formatted::LineWrap.new
string = "hello#{Prawn::Text::SHY}-"
---- a/spec/text_spec.rb
-+++ b/spec/text_spec.rb
-@@ -261,9 +261,11 @@
+Index: ruby-prawn/spec/text_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/text_spec.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/spec/text_spec.rb 2014-01-16 13:37:23.000000000 -0600
+@@ -256,8 +256,10 @@
lambda { @pdf.font "Pao bu" }.should raise_error(Prawn::Errors::UnknownFont)
end
-
+
+ # replace non-free comicsans.ttf by system DejaVuSans.ttf (Debian patch)
it "should_not raise_error an exception when providing Pathname instance as font" do
- lambda {
-- @pdf.font Pathname.new("#{Prawn::DATADIR}/fonts/comicsans.ttf")
-+ # @pdf.font Pathname.new("#{Prawn::DATADIR}/fonts/comicsans.ttf")
-+ @pdf.font Pathname.new("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
- }.should_not raise_error(Prawn::Errors::UnknownFont)
+- @pdf.font Pathname.new("#{Prawn::DATADIR}/fonts/comicsans.ttf")
++ # @pdf.font Pathname.new("#{Prawn::DATADIR}/fonts/comicsans.ttf")
++ @pdf.font Pathname.new("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
end
-@@ -278,7 +280,7 @@
+ it "should correctly render a utf-8 string when using a built-in font" do
+@@ -271,7 +273,7 @@
it "should correctly render a utf-8 string when using a TTF font" do
str = "©" # copyright symbol
@@ -85,17 +88,37 @@ Last-Update: 2013-08-08
@pdf.text str
# grab the text from the rendered PDF and ensure it matches
-@@ -321,7 +323,7 @@
- it "should_not raise_error an exception when a shift-jis string is rendered" do
- datafile = "#{Prawn::DATADIR}/shift_jis_text.txt"
- sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets }
-- @pdf.font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
-+ @pdf.font("/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf")
- lambda { @pdf.text sjis_str }.should_not raise_error(
- Prawn::Errors::IncompatibleStringEncoding)
- end
---- a/spec/text_spacing_spec.rb
-+++ b/spec/text_spacing_spec.rb
+@@ -282,7 +284,7 @@
+ it "subsets mixed low-ASCII and non-ASCII characters when they can be " +
+ "subsetted together" do
+ str = "It’s super effective!"
+- @pdf.font "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf"
++ @pdf.font "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
+ @pdf.text str
+
+ text = PDF::Inspector::Text.analyze(@pdf.render)
+@@ -323,7 +325,7 @@
+ it "should_not raise_error an exception when a shift-jis string is rendered" do
+ datafile = "#{Prawn::DATADIR}/shift_jis_text.txt"
+ sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets }
+- @pdf.font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
++ @pdf.font("/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf")
+
+ # Expect that the call to text will not raise an encoding error
+ @pdf.text(sjis_str)
+@@ -425,7 +427,7 @@
+
+
+ def add_unicode_fonts(pdf)
+- dejavu = "#{::Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf"
++ dejavu = "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
+ pdf.font_families.update("dejavu" => {
+ :normal => dejavu,
+ :italic => dejavu,
+Index: ruby-prawn/spec/text_spacing_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/text_spacing_spec.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/spec/text_spacing_spec.rb 2014-01-16 13:31:26.000000000 -0600
@@ -42,7 +42,7 @@
#
it "should calculate character spacing widths by characters, not bytes" do
@@ -105,18 +128,20 @@ Last-Update: 2013-08-08
str = "こんにちは世界"
@pdf.character_spacing(0) do
---- a/spec/formatted_text_box_spec.rb
-+++ b/spec/formatted_text_box_spec.rb
-@@ -21,7 +21,7 @@
- it "should_not raise_error Encoding::CompatibilityError when keeping a TTF and an " +
+Index: ruby-prawn/spec/formatted_text_box_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/formatted_text_box_spec.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/spec/formatted_text_box_spec.rb 2014-01-16 13:31:26.000000000 -0600
+@@ -20,7 +20,7 @@
+
+ it "should not raise an Encoding::CompatibilityError when keeping a TTF and an " +
"AFM font together" do
- ruby_19 do
-- file = "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
-+ file = "/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf"
- @pdf.font_families["Kai"] = {
- :normal => { :file => file, :font => "Kai" }
- }
-@@ -121,7 +121,7 @@
+- file = "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
++ file = "/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf"
+ @pdf.font_families["Kai"] = {
+ :normal => { :file => file, :font => "Kai" }
+ }
+@@ -109,7 +109,7 @@
"a Chinese font and set of Chinese glyphs not in the current font" do
it "should change the font to the Chinese font for the Chinese glyphs" do
create_pdf
@@ -125,7 +150,7 @@ Last-Update: 2013-08-08
@pdf.font_families["Kai"] = {
:normal => { :file => file, :font => "Kai" }
}
-@@ -149,7 +149,7 @@
+@@ -137,7 +137,7 @@
"an AFM font and Win-Ansi glyph not in the current Chinese font" do
it "should change the font to the AFM font for the Win-Ansi glyph" do
create_pdf
@@ -134,7 +159,7 @@ Last-Update: 2013-08-08
@pdf.font_families["Kai"] = {
:normal => { :file => file, :font => "Kai" }
}
-@@ -178,7 +178,7 @@
+@@ -166,7 +166,7 @@
"level font" do
it "should use the fragment level font except for glyphs not in that font" do
create_pdf
@@ -143,7 +168,7 @@ Last-Update: 2013-08-08
@pdf.font_families["Kai"] = {
:normal => { :file => file, :font => "Kai" }
}
-@@ -205,7 +205,7 @@
+@@ -193,7 +193,7 @@
describe "Text::Formatted::Box" do
before(:each) do
create_pdf
@@ -152,9 +177,11 @@ Last-Update: 2013-08-08
@pdf.font_families["Kai"] = {
:normal => { :file => file, :font => "Kai" }
}
---- a/spec/font_spec.rb
-+++ b/spec/font_spec.rb
-@@ -24,7 +24,7 @@
+Index: ruby-prawn/spec/font_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/font_spec.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/spec/font_spec.rb 2014-01-16 13:40:02.000000000 -0600
+@@ -50,7 +50,7 @@
it "should exclude newlines" do
create_pdf
# Use a TTF font that has a non-zero width for \n
@@ -163,7 +190,7 @@ Last-Update: 2013-08-08
@pdf.width_of("\nhello world\n").should ==
@pdf.width_of("hello world")
-@@ -114,18 +114,18 @@
+@@ -146,18 +146,18 @@
end
it "should accept Pathname objects for font files" do
@@ -187,7 +214,7 @@ Last-Update: 2013-08-08
end
end
-@@ -269,15 +269,19 @@
+@@ -301,15 +301,19 @@
end
it "should return true when present in a TTF font" do
@@ -210,8 +237,8 @@ Last-Update: 2013-08-08
font.glyph_present?("€").should be_false
end
end
-@@ -286,7 +290,9 @@
-
+@@ -318,7 +322,9 @@
+
before do
create_pdf
- @activa = @pdf.find_font "#{Prawn::DATADIR}/fonts/Activa.ttf"
@@ -219,9 +246,9 @@ Last-Update: 2013-08-08
+ # @activa = @pdf.find_font "#{Prawn::DATADIR}/fonts/Activa.ttf"
+ @activa = @pdf.find_font "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
end
-
+
it "should calculate string width taking into account accented characters" do
-@@ -354,7 +360,7 @@
+@@ -386,7 +392,7 @@
it "should allow TTF fonts to be used alongside document transactions" do
lambda {
Prawn::Document.new do
@@ -230,7 +257,7 @@ Last-Update: 2013-08-08
text "Hi there"
transaction { text "Nice, thank you" }
end
-@@ -364,7 +370,7 @@
+@@ -396,7 +402,7 @@
it "should allow TTF fonts to be used inside transactions" do
pdf = Prawn::Document.new do
transaction do
@@ -239,7 +266,7 @@ Last-Update: 2013-08-08
text "Hi there"
end
end
-@@ -421,7 +427,7 @@
+@@ -453,7 +459,7 @@
describe "#character_count(text)" do
it "should work on TTF fonts" do
create_pdf
@@ -248,8 +275,10 @@ Last-Update: 2013-08-08
@pdf.font.character_count("こんにちは世界").should == 7
@pdf.font.character_count("Hello, world!").should == 13
end
---- a/spec/text_box_spec.rb
-+++ b/spec/text_box_spec.rb
+Index: ruby-prawn/spec/text_box_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/text_box_spec.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/spec/text_box_spec.rb 2014-01-16 13:40:02.000000000 -0600
@@ -74,7 +74,7 @@
@pdf.text_direction(:rtl)
@pdf.text_direction = :rtl
@@ -259,7 +288,7 @@ Last-Update: 2013-08-08
@pdf.text "写个小"
end
text = PDF::Inspector::Text.analyze(@pdf.render)
-@@ -831,7 +831,7 @@
+@@ -832,7 +832,7 @@
:height => 162.0,
:document => @pdf
}
@@ -268,9 +297,37 @@ Last-Update: 2013-08-08
@options[:overflow] = :truncate
text_box = Prawn::Text::Box.new(@text, @options)
text_box.render
---- a/spec/template_spec.rb
-+++ b/spec/template_spec.rb
-@@ -148,7 +148,9 @@
+Index: ruby-prawn/spec/document_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/document_spec.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/spec/document_spec.rb 2014-01-16 13:31:26.000000000 -0600
+@@ -261,7 +261,7 @@
+ doc_uncompressed = Prawn::Document.new
+ doc_compressed = Prawn::Document.new(:compress => true)
+ [doc_compressed, doc_uncompressed].each do |pdf|
+- pdf.font "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
++ pdf.font "/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf"
+ pdf.text "更可怕的是，同质化竞争对手可以按照URL中后面这个ID来遍历" * 10
+ end
+
+Index: ruby-prawn/spec/text_at_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/text_at_spec.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/spec/text_at_spec.rb 2014-01-16 13:31:26.000000000 -0600
+@@ -108,7 +108,7 @@
+ it "should not raise an exception when a shift-jis string is rendered" do
+ datafile = "#{Prawn::DATADIR}/shift_jis_text.txt"
+ sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets }
+- @pdf.font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
++ @pdf.font("/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf")
+
+ @pdf.draw_text(sjis_str, :at => [0, 0])
+ end
+Index: ruby-prawn/spec/template_spec_obsolete.rb
+===================================================================
+--- ruby-prawn.orig/spec/template_spec_obsolete.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/spec/template_spec_obsolete.rb 2014-01-16 13:31:26.000000000 -0600
+@@ -149,7 +149,9 @@
it "should correctly add a TTF font to a template that has existing fonts" do
filename = "#{Prawn::DATADIR}/pdfs/contains_ttf_font.pdf"
@pdf = Prawn::Document.new(:template => filename)
@@ -281,7 +338,7 @@ Last-Update: 2013-08-08
@pdf.move_down(40)
@pdf.text "Hi There"
-@@ -300,7 +302,9 @@
+@@ -301,7 +303,9 @@
filename = "#{Prawn::DATADIR}/pdfs/contains_ttf_font.pdf"
@pdf = Prawn::Document.new()
@pdf.start_new_page(:template => filename)
@@ -292,25 +349,3 @@ Last-Update: 2013-08-08
@pdf.move_down(40)
@pdf.text "Hi There"
---- a/spec/document_spec.rb
-+++ b/spec/document_spec.rb
-@@ -235,7 +235,7 @@
- doc_uncompressed = Prawn::Document.new
- doc_compressed = Prawn::Document.new(:compress => true)
- [doc_compressed, doc_uncompressed].each do |pdf|
-- pdf.font "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
-+ pdf.font "/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf"
- pdf.text "更可怕的是，同质化竞争对手可以按照URL中后面这个ID来遍历" * 10
- end
-
---- a/spec/text_at_spec.rb
-+++ b/spec/text_at_spec.rb
-@@ -109,7 +109,7 @@
- it "should_not raise_error an exception when a shift-jis string is rendered" do
- datafile = "#{Prawn::DATADIR}/shift_jis_text.txt"
- sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets }
-- @pdf.font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
-+ @pdf.font("/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf")
- lambda { @pdf.draw_text(sjis_str, :at => [0, 0]) }.should_not raise_error(
- Prawn::Errors::IncompatibleStringEncoding)
- end
diff --git a/debian/patches/0405_use_system_fonts_manual.patch b/debian/patches/0405_use_system_fonts_manual.patch
index bc766f5..b475178 100644
--- a/debian/patches/0405_use_system_fonts_manual.patch
+++ b/debian/patches/0405_use_system_fonts_manual.patch
@@ -3,10 +3,12 @@ Description: use system fonts when possible
These copies have been removed from the Debian source package, and system
fonts are used instead.
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-06-22
+Last-Update: 2014-01-16
---- a/manual/text/single_usage.rb
-+++ b/manual/text/single_usage.rb
+Index: ruby-prawn/manual/text/single_usage.rb
+===================================================================
+--- ruby-prawn.orig/manual/text/single_usage.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/manual/text/single_usage.rb 2014-01-16 13:31:26.000000000 -0600
@@ -19,19 +19,21 @@
filename = File.basename(__FILE__).gsub('.rb', '.pdf')
Prawn::Example.generate(filename) do
@@ -36,8 +38,10 @@ Last-Update: 2013-06-22
text "Written with the default font once more."
end
---- a/manual/text/utf8.rb
-+++ b/manual/text/utf8.rb
+Index: ruby-prawn/manual/text/utf8.rb
+===================================================================
+--- ruby-prawn.orig/manual/text/utf8.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/manual/text/utf8.rb 2014-01-16 13:31:26.000000000 -0600
@@ -21,7 +21,7 @@
text "Let's try them with another font."
move_down 20
@@ -47,8 +51,10 @@ Last-Update: 2013-06-22
text "ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει."
text "There you go."
end
---- a/manual/text/line_wrapping.rb
-+++ b/manual/text/line_wrapping.rb
+Index: ruby-prawn/manual/text/line_wrapping.rb
+===================================================================
+--- ruby-prawn.orig/manual/text/line_wrapping.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/manual/text/line_wrapping.rb 2014-01-16 13:31:26.000000000 -0600
@@ -29,7 +29,7 @@
"nearer your destination the more you're slip#{nbsp}sliding away."
move_down 20
@@ -58,8 +64,10 @@ Last-Update: 2013-06-22
long_text = "No word boundaries:\n更可怕的是，同质化竞争对手可以按照URL中后面这个ID来遍历您的DB中的内容，写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事，这样的话，你就非常被动了。更可怕的是，同质化竞争对手可以按照URL中后面这个ID来遍历您的DB中的内容，写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事，这样的话，你就非常被动了。"
text long_text
move_down 20
---- a/manual/text/right_to_left_text.rb
-+++ b/manual/text/right_to_left_text.rb
+Index: ruby-prawn/manual/text/right_to_left_text.rb
+===================================================================
+--- ruby-prawn.orig/manual/text/right_to_left_text.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/manual/text/right_to_left_text.rb 2014-01-16 13:31:26.000000000 -0600
@@ -17,7 +17,7 @@
# set the direction document-wide
self.text_direction = :rtl
@@ -69,8 +77,10 @@ Last-Update: 2013-06-22
long_text = "写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事写个小"
text long_text
move_down 20
---- a/manual/example_helper.rb
-+++ b/manual/example_helper.rb
+Index: ruby-prawn/manual/example_helper.rb
+===================================================================
+--- ruby-prawn.orig/manual/example_helper.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/manual/example_helper.rb 2014-01-16 13:31:26.000000000 -0600
@@ -172,12 +172,12 @@
# Register fonts used on the manual
#
@@ -86,8 +96,10 @@ Last-Update: 2013-06-22
font_families["DejaVu"] = {
:normal => { :file => dejavu_file, :font => "DejaVu" }
}
---- a/manual/text/fallback_fonts.rb
-+++ b/manual/text/fallback_fonts.rb
+Index: ruby-prawn/manual/text/fallback_fonts.rb
+===================================================================
+--- ruby-prawn.orig/manual/text/fallback_fonts.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/manual/text/fallback_fonts.rb 2014-01-16 13:31:26.000000000 -0600
@@ -4,34 +4,36 @@
# be present in the desired font. Use the <code>:fallback_fonts</code> option
# with any of the text or text box methods, or set fallback_fonts document-wide.
@@ -149,8 +161,10 @@ Last-Update: 2013-06-22
+# ],
+# :fallback_fonts => ["Times-Roman", "Kai"])
end
---- a/manual/text/registering_families.rb
-+++ b/manual/text/registering_families.rb
+Index: ruby-prawn/manual/text/registering_families.rb
+===================================================================
+--- ruby-prawn.orig/manual/text/registering_families.rb 2014-01-16 13:31:26.000000000 -0600
++++ ruby-prawn/manual/text/registering_families.rb 2014-01-16 13:31:26.000000000 -0600
@@ -8,41 +8,44 @@
# To register a font family update the <code>font_families</code>
# hash with the font path for each style you want to use.
diff --git a/debian/patches/0500_disable_tests_using_removed_files.patch b/debian/patches/0500_disable_tests_using_removed_files.patch
index 6569b4a..66b0fc0 100644
--- a/debian/patches/0500_disable_tests_using_removed_files.patch
+++ b/debian/patches/0500_disable_tests_using_removed_files.patch
@@ -3,11 +3,13 @@ Description: disable some specs after removal of some files from the source pack
non-free fonts. These are disabled because they cannot be run since these
files have been removed from the Debian source package.
Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-08-08
+Last-Update: 2014-01-16
---- a/spec/font_spec.rb
-+++ b/spec/font_spec.rb
-@@ -95,7 +95,8 @@
+Index: ruby-prawn/spec/font_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/font_spec.rb 2014-01-16 13:45:54.000000000 -0600
++++ ruby-prawn/spec/font_spec.rb 2014-01-16 13:45:54.000000000 -0600
+@@ -127,7 +127,8 @@
:Courier, :Helvetica]
end
@@ -17,17 +19,17 @@ Last-Update: 2013-08-08
file = "#{Prawn::DATADIR}/fonts/Action Man.dfont"
@pdf.font_families["Action Man"] = {
:normal => { :file => file, :font => "ActionMan" },
-@@ -299,7 +300,8 @@
+@@ -331,7 +332,8 @@
@activa.compute_width_of("é", :size => 12).should == @activa.compute_width_of("e", :size => 12)
end
-
+
- it "should calculate string width taking into account kerning pairs" do
+ # spec disabled since relies on numeric values for a particular font, which has been removed (Debian patch)
+ xit "should calculate string width taking into account kerning pairs" do
@activa.compute_width_of("To", :size => 12).should == 15.228
@activa.compute_width_of("To", :size => 12, :kerning => true).should == 12.996
end
-@@ -318,7 +320,8 @@
+@@ -350,7 +352,8 @@
@activa.encode_text("Teχnology...").should == [[0, "Te"], [1, "!"], [0, "nology..."]]
end
@@ -37,7 +39,7 @@ Last-Update: 2013-08-08
@activa.encode_text("To", :kerning => true).should == [[0, ["T", 186.0, "o"]]]
@activa.encode_text("To", :kerning => true).should == [[0, ["T", 186.0, "o"]]]
@activa.encode_text("Technology", :kerning => true).should == [[0, ["T", 186.0, "echnology"]]]
-@@ -326,7 +329,8 @@
+@@ -358,7 +361,8 @@
@activa.encode_text("Teχnology...", :kerning => true).should == [[0, ["T", 186.0, "e"]], [1, "!"], [0, ["nology", 88.0, "..."]]]
end
@@ -47,7 +49,7 @@ Last-Update: 2013-08-08
# These metrics are relative to the font's own bbox. They should not be
# scaled with font size.
ref = @pdf.ref!({})
-@@ -391,31 +395,37 @@
+@@ -423,31 +427,37 @@
@file = "#{Prawn::DATADIR}/fonts/Action Man.dfont"
end
@@ -91,9 +93,11 @@ Last-Update: 2013-08-08
f1 = @pdf.find_font(@file, :font => "ActionMan")
f2 = @pdf.find_font(@file, :font => "ActionMan-Bold")
f2.object_id.should_not == f1.object_id
---- a/spec/text_box_spec.rb
-+++ b/spec/text_box_spec.rb
-@@ -658,12 +658,12 @@
+Index: ruby-prawn/spec/text_box_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/text_box_spec.rb 2014-01-16 13:45:54.000000000 -0600
++++ ruby-prawn/spec/text_box_spec.rb 2014-01-16 13:45:54.000000000 -0600
+@@ -659,13 +659,13 @@
@text_box = Prawn::Text::Box.new(@text, options)
end
describe "when using a TTF font" do
@@ -103,25 +107,17 @@ Last-Update: 2013-08-08
remaining_text = @text_box.render
remaining_text.should == @text
end
+
- it "subsequent calls to Text::Box need not include the" +
+ xit "subsequent calls to Text::Box need not include the" +
" :skip_encoding => true option" do
@pdf.font("Action Man")
remaining_text = @text_box.render
---- a/spec/jpg_spec.rb
-+++ b/spec/jpg_spec.rb
-@@ -12,7 +12,7 @@
- @filename = "#{Prawn::DATADIR}/images/pigs.jpg"
- @img_data = File.open(@filename, "rb") { |f| f.read }
- end
--
-+
- it "should read the basic attributes correctly" do
- jpg = Prawn::Images::JPG.new(@img_data)
-
---- a/spec/images_spec.rb
-+++ b/spec/images_spec.rb
-@@ -52,16 +52,19 @@
+Index: ruby-prawn/spec/images_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/images_spec.rb 2014-01-16 13:45:54.000000000 -0600
++++ ruby-prawn/spec/images_spec.rb 2014-01-16 13:46:21.000000000 -0600
+@@ -69,21 +69,24 @@
end
it "should raise_error an UnsupportedImageType if passed a BMP" do
@@ -136,36 +132,37 @@ Last-Update: 2013-08-08
lambda { @pdf.image filename, :at => [100,100] }.should raise_error(Prawn::Errors::UnsupportedImageType)
end
- it "should bump PDF version to 1.5 or greater on embedding 16-bit PNGs" do
+- it "should bump PDF version to 1.5 or greater on embedding 16-bit PNGs" do
++ xit "should bump PDF version to 1.5 or greater on embedding 16-bit PNGs" do
+ pending "spec disabled since 16bit.png removed from source package (Debian patch)"
@pdf.image "#{Prawn::DATADIR}/images/16bit.png"
@pdf.state.version.should >= 1.5
end
-@@ -70,7 +73,8 @@
- # channels. Verified experimentally [BE] but not confirmed in documentation
- # or anything. OS X Preview handles those files just fine.
- #
-- it "should embed 8-bit alpha channels for 16-bit PNGs" do
-+ # spec disabled since 16bit.png removed from source package (Debian patch)
-+ xit "should embed 8-bit alpha channels for 16-bit PNGs" do
+
+- it "should embed 16-bit alpha channels for 16-bit PNGs" do
++ xit "should embed 16-bit alpha channels for 16-bit PNGs" do
@pdf.image "#{Prawn::DATADIR}/images/16bit.png"
output = @pdf.render
---- a/spec/object_store_spec.rb
-+++ b/spec/object_store_spec.rb
+Index: ruby-prawn/spec/object_store_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/object_store_spec.rb 2014-01-16 13:45:54.000000000 -0600
++++ ruby-prawn/spec/object_store_spec.rb 2014-01-16 13:45:54.000000000 -0600
@@ -46,8 +46,9 @@
- lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should raise_error(ArgumentError)
+ lambda { PDF::Core::ObjectStore.new(:template => filename) }.should raise_error(ArgumentError)
end
+ # replace dice.png by pigs.jpg as dice.png has been removed from the source package. (Debian patch)
- it "should raise_error Prawn::Errors::TemplateError when given a non PDF as a template" do
+ it "should raise_error PDF::Core::Errors::TemplateError when given a non PDF as a template" do
- filename = "#{Prawn::DATADIR}/images/dice.png"
+ filename = "#{Prawn::DATADIR}/images/pigs.jpg"
- lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should raise_error(Prawn::Errors::TemplateError)
+ lambda { PDF::Core::ObjectStore.new(:template => filename) }.should raise_error(PDF::Core::Errors::TemplateError)
end
---- a/spec/png_spec.rb
-+++ b/spec/png_spec.rb
+Index: ruby-prawn/spec/png_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/png_spec.rb 2014-01-16 13:45:54.000000000 -0600
++++ ruby-prawn/spec/png_spec.rb 2014-01-16 13:45:54.000000000 -0600
@@ -17,7 +17,7 @@
@img_data = File.binread(@filename)
end
@@ -182,7 +179,7 @@ Last-Update: 2013-08-08
- it "should read the image data chunk correctly" do
+ xit "should read the image data chunk correctly" do
png = Prawn::Images::PNG.new(@img_data)
- data = File.binread(@data_filename)
+ data = Zlib::Inflate.inflate(File.binread(@data_filename))
png.img_data.should == data
@@ -47,7 +47,7 @@
# that indicates the color that should be interpreted as transparent.
@@ -209,7 +206,7 @@ Last-Update: 2013-08-08
- it "should read the image data chunk correctly" do
+ xit "should read the image data chunk correctly" do
png = Prawn::Images::PNG.new(@img_data)
- data = File.binread(@data_filename)
+ data = Zlib::Inflate.inflate(File.binread(@data_filename))
png.img_data.should == data
@@ -92,7 +92,7 @@
# case it's green.
@@ -228,7 +225,7 @@ Last-Update: 2013-08-08
+ xit "should read the attributes from the header chunk correctly" do
png = Prawn::Images::PNG.new(@img_data)
- png.width.should == 50
+ png.width.should == 150
@@ -120,7 +120,7 @@
png.interlace_method.should == 0
end
@@ -236,7 +233,7 @@ Last-Update: 2013-08-08
- it "should read the image data chunk correctly" do
+ xit "should read the image data chunk correctly" do
png = Prawn::Images::PNG.new(@img_data)
- data = File.binread(@data_filename)
+ data = Zlib::Inflate.inflate(File.binread(@data_filename))
png.img_data.should == data
@@ -136,7 +136,7 @@
@img_data = File.binread(@filename)
@@ -255,7 +252,7 @@ Last-Update: 2013-08-08
+ xit "should correctly return the raw image data (with no alpha channel) from the image data chunk" do
png = Prawn::Images::PNG.new(@img_data)
png.split_alpha_channel!
- data = File.binread(@data_filename)
+ data = File.binread(@color_data_filename)
png.img_data.should == data
end
@@ -273,7 +270,7 @@ Last-Update: 2013-08-08
png = Prawn::Images::PNG.new(@img_data)
png.width.should == 320
-@@ -184,7 +184,7 @@
+@@ -184,14 +184,14 @@
png.interlace_method.should == 0
end
@@ -281,9 +278,8 @@ Last-Update: 2013-08-08
+ xit "should correctly return the raw image data (with no alpha channel) from the image data chunk" do
png = Prawn::Images::PNG.new(@img_data)
png.split_alpha_channel!
- data = File.binread(@data_filename)
-@@ -194,7 +194,7 @@
- Zlib::Inflate.inflate(png.img_data).should == Zlib::Inflate.inflate(data)
+ data = File.binread(@color_data_filename)
+ png.img_data.should == data
end
- it "should correctly extract the alpha channel data from the image data chunk" do
@@ -291,7 +287,7 @@ Last-Update: 2013-08-08
png = Prawn::Images::PNG.new(@img_data)
png.split_alpha_channel!
data = File.binread(@alpha_data_filename)
-@@ -212,7 +212,7 @@
+@@ -209,7 +209,7 @@
@img_data = File.binread(@filename)
end
@@ -300,7 +296,7 @@ Last-Update: 2013-08-08
png = Prawn::Images::PNG.new(@img_data)
png.width.should == 32
-@@ -224,14 +224,14 @@
+@@ -221,14 +221,14 @@
png.interlace_method.should == 0
end
@@ -308,7 +304,7 @@ Last-Update: 2013-08-08
+ xit "should correctly return the raw image data (with no alpha channel) from the image data chunk" do
png = Prawn::Images::PNG.new(@img_data)
png.split_alpha_channel!
- data = File.binread(@data_filename)
+ data = File.binread(@color_data_filename)
png.img_data.should == data
end
@@ -317,3 +313,25 @@ Last-Update: 2013-08-08
png = Prawn::Images::PNG.new(@img_data)
png.split_alpha_channel!
data = File.binread(@alpha_data_filename)
+Index: ruby-prawn/spec/cell_spec.rb
+===================================================================
+--- ruby-prawn.orig/spec/cell_spec.rb 2014-01-16 13:45:54.000000000 -0600
++++ ruby-prawn/spec/cell_spec.rb 2014-01-16 13:45:54.000000000 -0600
+@@ -469,7 +469,7 @@
+ c.draw
+ end
+
+- it "supports variant styles of the current font" do
++ xit "supports variant styles of the current font" do
+ font_path = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
+ @pdf.font_families.merge!("Action Man" => {
+ :normal => { :file => font_path, :font => "ActionMan" },
+@@ -490,7 +490,7 @@
+ end
+
+
+- it "uses the style of the current font if none given" do
++ xit "uses the style of the current font if none given" do
+ font_path = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
+ @pdf.font_families.merge!("Action Man" => {
+ :normal => { :file => font_path, :font => "ActionMan" },
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-prawn.git
More information about the Pkg-ruby-extras-commits
mailing list