[DRE-commits] [ruby-prawn] 03/10: update dejavu font path in 040* patches
Cédric Boutillier
boutil at alioth.debian.org
Thu Aug 8 22:46:10 UTC 2013
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch master
in repository ruby-prawn.
commit 6b3c2f3008f0bcc9936349f67c321b795fd2d994
Author: Cédric Boutillier <boutil at debian.org>
Date: Thu Aug 8 08:26:16 2013 +0200
update dejavu font path in 040* patches
---
debian/patches/0400_use_system_fonts.patch | 30 ++++++++++-----------
debian/patches/0405_use_system_fonts_manual.patch | 6 ++---
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/debian/patches/0400_use_system_fonts.patch b/debian/patches/0400_use_system_fonts.patch
index c5c332d..d8a80c2 100644
--- a/debian/patches/0400_use_system_fonts.patch
+++ b/debian/patches/0400_use_system_fonts.patch
@@ -12,7 +12,7 @@ Last-Update: 2013-06-22
it "should break on zero-width space" do
- @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
-+ @pdf.font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf")
++ @pdf.font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
array = [{ :text => "hello#{Prawn::Text::ZWSP}world" }]
@arranger.format_array = array
string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -21,7 +21,7 @@ Last-Update: 2013-06-22
it "should not display zero-width space" do
- @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
-+ @pdf.font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf")
++ @pdf.font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
array = [{ :text => "hello#{Prawn::Text::ZWSP}world" }]
@arranger.format_array = array
string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -30,7 +30,7 @@ Last-Update: 2013-06-22
string.should == expected
- @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
-+ @pdf.font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf")
++ @pdf.font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
@line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
string = "hello#{Prawn::Text::SHY}world"
@@ -39,7 +39,7 @@ Last-Update: 2013-06-22
string.should == "helloworld"
- @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
-+ @pdf.font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf")
++ @pdf.font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
@line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
string = "hello#{Prawn::Text::SHY}world"
@@ -48,7 +48,7 @@ Last-Update: 2013-06-22
string.should == "hello"
- @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
-+ @pdf.font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf")
++ @pdf.font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
@line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
enough_width_for_hello_world = 68
@@ -57,7 +57,7 @@ Last-Update: 2013-06-22
string.should == expected
- @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
-+ @pdf.font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf")
++ @pdf.font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
@line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
string = "hello#{Prawn::Text::SHY}-"
@@ -72,7 +72,7 @@ Last-Update: 2013-06-22
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/ttf-dejavu/DejaVuSans.ttf")
++ @pdf.font Pathname.new("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
}.should_not raise_error(Prawn::Errors::UnknownFont)
end
@@ -81,7 +81,7 @@ Last-Update: 2013-06-22
it "should correctly render a utf-8 string when using a TTF font" do
str = "©" # copyright symbol
- @pdf.font "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf"
-+ @pdf.font "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
++ @pdf.font "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
@pdf.text str
# grab the text from the rendered PDF and ensure it matches
@@ -170,7 +170,7 @@ Last-Update: 2013-06-22
- font = @pdf.find_font("#{Prawn::DATADIR}/fonts/Activa.ttf")
+ # replace non-free Activa.ttf by system DejaVuSans.ttf (Debian patch)
+ # font = @pdf.find_font("#{Prawn::DATADIR}/fonts/Activa.ttf")
-+ font = @pdf.find_font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf")
++ font = @pdf.find_font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
font.glyph_present?("H").should be_true
end
@@ -178,7 +178,7 @@ Last-Update: 2013-06-22
- font = @pdf.find_font("#{Prawn::DATADIR}/fonts/Activa.ttf")
+ # replace non-free Activa.ttf by system DejaVuSans.ttf (Debian patch)
+ # font = @pdf.find_font("#{Prawn::DATADIR}/fonts/Activa.ttf")
-+ font = @pdf.find_font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf")
++ font = @pdf.find_font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf")
font.glyph_present?("再").should be_false
- font = @pdf.find_font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
@@ -193,7 +193,7 @@ Last-Update: 2013-06-22
- @activa = @pdf.find_font "#{Prawn::DATADIR}/fonts/Activa.ttf"
+ # replace non-free Activa.ttf by system DejaVuSans.ttf (Debian patch)
+ # @activa = @pdf.find_font "#{Prawn::DATADIR}/fonts/Activa.ttf"
-+ @activa = @pdf.find_font "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
++ @activa = @pdf.find_font "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
end
it "should calculate string width taking into account accented characters" do
@@ -202,7 +202,7 @@ Last-Update: 2013-06-22
lambda {
Prawn::Document.new do
- font "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf"
-+ font "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
++ font "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
text "Hi there"
transaction { text "Nice, thank you" }
end
@@ -211,7 +211,7 @@ Last-Update: 2013-06-22
pdf = Prawn::Document.new do
transaction do
- font "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf"
-+ font "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
++ font "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
text "Hi there"
end
end
@@ -253,7 +253,7 @@ Last-Update: 2013-06-22
- @pdf.font "#{Prawn::DATADIR}/fonts/Chalkboard.ttf"
+ # replace non-free Chalkboard.ttf by system DejaVuSans.ttf (Debian patch)
+ # @pdf.font "#{Prawn::DATADIR}/fonts/Chalkboard.ttf"
-+ @pdf.font "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
++ @pdf.font "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
@pdf.move_down(40)
@pdf.text "Hi There"
@@ -264,7 +264,7 @@ Last-Update: 2013-06-22
- @pdf.font "#{Prawn::DATADIR}/fonts/Chalkboard.ttf"
+ # replace non-free Chalkboard.ttf by system DejaVuSans.ttf (Debian patch)
+ # @pdf.font "#{Prawn::DATADIR}/fonts/Chalkboard.ttf"
-+ @pdf.font "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
++ @pdf.font "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
@pdf.move_down(40)
@pdf.text "Hi There"
diff --git a/debian/patches/0405_use_system_fonts_manual.patch b/debian/patches/0405_use_system_fonts_manual.patch
index 67f3b25..bc766f5 100644
--- a/debian/patches/0405_use_system_fonts_manual.patch
+++ b/debian/patches/0405_use_system_fonts_manual.patch
@@ -14,7 +14,7 @@ Last-Update: 2013-06-22
- font("#{Prawn::DATADIR}/fonts/Chalkboard.ttf") do
- text "Written with the Chalkboard TTF font."
+ # Debian: non-free Chalkboard replaced by system DejaVuSans"
-+ font "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf" do
++ font "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf" do
+ text "Written with the DejaVuSans TTF font."
end
move_down 20
@@ -43,7 +43,7 @@ Last-Update: 2013-06-22
move_down 20
- font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf") do
-+ font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf") do
++ font("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf") do
text "ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει."
text "There you go."
end
@@ -82,7 +82,7 @@ Last-Update: 2013-06-22
}
- dejavu_file = "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf"
-+ dejavu_file = "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
++ dejavu_file = "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
font_families["DejaVu"] = {
:normal => { :file => dejavu_file, :font => "DejaVu" }
}
--
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