[DRE-commits] [SCM] ruby-prawn.git branch, master, updated. upstream/1.0.0_rc1-44-g6e97afc
Cédric Boutillier
cedric.boutillier at gmail.com
Thu Nov 24 23:12:04 UTC 2011
The following commit has been merged in the master branch:
commit 206eeac8d07f00f29636148e0a8f535f902d193e
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date: Tue Nov 22 10:16:53 2011 +0100
patching manual
diff --git a/debian/patches/0105_remove_rubygems_loadpath_stuff_manual.patch b/debian/patches/0105_remove_rubygems_loadpath_stuff_manual.patch
new file mode 100644
index 0000000..42f5a62
--- /dev/null
+++ b/debian/patches/0105_remove_rubygems_loadpath_stuff_manual.patch
@@ -0,0 +1,13 @@
+--- a/manual/example_helper.rb
++++ b/manual/example_helper.rb
+@@ -3,8 +3,8 @@
+ # Helper for organizing examples
+ #
+
+-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+-require 'rubygems'
++#$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
++#require 'rubygems'
+ require 'prawn'
+ require 'prawn/security'
+ require 'prawn/layout'
diff --git a/debian/patches/0205_replace_BASEDIR_data_by_DATADIR_manual.patch b/debian/patches/0205_replace_BASEDIR_data_by_DATADIR_manual.patch
new file mode 100644
index 0000000..6ccbfb3
--- /dev/null
+++ b/debian/patches/0205_replace_BASEDIR_data_by_DATADIR_manual.patch
@@ -0,0 +1,262 @@
+--- a/manual/manual/cover.rb
++++ b/manual/manual/cover.rb
+@@ -9,7 +9,7 @@
+ Prawn::Example.generate(filename) do
+ move_down 200
+
+- image "#{Prawn::BASEDIR}/data/images/prawn.png",
++ image "#{Prawn::DATADIR}/images/prawn.png",
+ :scale => 0.9,
+ :at => [10, cursor]
+
+--- a/manual/text/single_usage.rb
++++ b/manual/text/single_usage.rb
+@@ -17,7 +17,7 @@
+ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+ Prawn::Example.generate(filename) do
+ # Using a TTF font file
+- font "#{Prawn::BASEDIR}/data/fonts/Chalkboard.ttf" do
++ font "#{Prawn::DATADIR}/fonts/Chalkboard.ttf" do
+ text "Written with the Chalkboard TTF font."
+ end
+ move_down 20
+@@ -26,7 +26,7 @@
+ move_down 20
+
+ # Using an DFONT font file
+- font "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont" do
++ font "#{Prawn::DATADIR}/fonts/Action Man.dfont" do
+ text "Written with the Action Man DFONT font"
+ end
+ move_down 20
+--- a/manual/text/utf8.rb
++++ b/manual/text/utf8.rb
+@@ -21,7 +21,7 @@
+ text "Let's try them with another font."
+ move_down 20
+
+- font("#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf") do
++ font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf") do
+ text "ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει."
+ text "There you go."
+ end
+--- a/manual/document_and_page_options/background.rb
++++ b/manual/document_and_page_options/background.rb
+@@ -7,7 +7,7 @@
+ require File.expand_path(File.join(File.dirname(__FILE__),
+ %w[.. example_helper]))
+
+-img = "#{Prawn::BASEDIR}/data/images/letterhead.jpg"
++img = "#{Prawn::DATADIR}/images/letterhead.jpg"
+
+ Prawn::Document.generate("background.pdf",
+ :background => img,
+--- a/manual/example_helper.rb
++++ b/manual/example_helper.rb
+@@ -143,11 +143,11 @@
+
+ text(extract_introduction_text(data), :inline_format => true)
+
+- kai_file = "#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf"
++ kai_file = "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
+ font_families["Kai"] = {
+ :normal => { :file => kai_file, :font => "Kai" }
+ }
+- dejavu_file = "#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf"
++ dejavu_file = "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf"
+ font_families["DejaVu"] = {
+ :normal => { :file => dejavu_file, :font => "DejaVu" }
+ }
+--- a/manual/images/absolute_position.rb
++++ b/manual/images/absolute_position.rb
+@@ -17,7 +17,7 @@
+ y_position = cursor
+ text "The image won't go below this line of text."
+
+- image "#{Prawn::BASEDIR}/data/images/fractal.jpg", :at => [200, y_position]
++ image "#{Prawn::DATADIR}/images/fractal.jpg", :at => [200, y_position]
+
+ text "And this line of text will go just below the previous one."
+ end
+--- a/manual/images/fit.rb
++++ b/manual/images/fit.rb
+@@ -15,7 +15,7 @@
+
+ text "Using the fit option"
+ bounding_box([0, cursor], :width => size, :height => size) do
+- image "#{Prawn::BASEDIR}/data/images/pigs.jpg", :fit => [size, size]
++ image "#{Prawn::DATADIR}/images/pigs.jpg", :fit => [size, size]
+ stroke_bounds
+ end
+ end
+--- a/manual/images/horizontal.rb
++++ b/manual/images/horizontal.rb
+@@ -16,10 +16,10 @@
+
+ [:left, :center, :right].each do |position|
+ text "Image aligned to the #{position}."
+- image "#{Prawn::BASEDIR}/data/images/stef.jpg", :position => position
++ image "#{Prawn::DATADIR}/images/stef.jpg", :position => position
+ end
+
+ text "The next image has a 50 point offset from the left boundary"
+- image "#{Prawn::BASEDIR}/data/images/stef.jpg", :position => 50
++ image "#{Prawn::DATADIR}/images/stef.jpg", :position => 50
+ end
+ end
+--- a/manual/images/plain_image.rb
++++ b/manual/images/plain_image.rb
+@@ -14,5 +14,5 @@
+ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+ Prawn::Example.generate(filename) do
+ text "The image will go right below this line of text."
+- image "#{Prawn::BASEDIR}/data/images/pigs.jpg"
++ image "#{Prawn::DATADIR}/images/pigs.jpg"
+ end
+--- a/manual/images/scale.rb
++++ b/manual/images/scale.rb
+@@ -11,13 +11,13 @@
+ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+ Prawn::Example.generate(filename) do
+ text "Normal size"
+- image "#{Prawn::BASEDIR}/data/images/stef.jpg"
++ image "#{Prawn::DATADIR}/images/stef.jpg"
+ move_down 10
+
+ text "Scaled to 50%"
+- image "#{Prawn::BASEDIR}/data/images/stef.jpg", :scale => 0.5
++ image "#{Prawn::DATADIR}/images/stef.jpg", :scale => 0.5
+ move_down 10
+
+ text "Scaled to 200%"
+- image "#{Prawn::BASEDIR}/data/images/stef.jpg", :scale => 2
++ image "#{Prawn::DATADIR}/images/stef.jpg", :scale => 2
+ end
+--- a/manual/images/vertical.rb
++++ b/manual/images/vertical.rb
+@@ -15,13 +15,13 @@
+
+ [:top, :center, :bottom].each do |vposition|
+ text "Image vertically aligned to the #{vposition}.", :valign => vposition
+- image "#{Prawn::BASEDIR}/data/images/stef.jpg", :position => 250,
++ image "#{Prawn::DATADIR}/images/stef.jpg", :position => 250,
+ :vposition => vposition
+ end
+
+ text_box "The next image has a 100 point offset from the top boundary",
+ :at => [bounds.width - 110, bounds.top - 10], :width => 100
+- image "#{Prawn::BASEDIR}/data/images/stef.jpg", :position => :right,
++ image "#{Prawn::DATADIR}/images/stef.jpg", :position => :right,
+ :vposition => 100
+ end
+ end
+--- a/manual/images/width_and_height.rb
++++ b/manual/images/width_and_height.rb
+@@ -13,13 +13,13 @@
+ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+ Prawn::Example.generate(filename) do
+ text "Scale by setting only the width"
+- image "#{Prawn::BASEDIR}/data/images/pigs.jpg", :width => 150
++ image "#{Prawn::DATADIR}/images/pigs.jpg", :width => 150
+ move_down 10
+
+ text "Scale by setting only the height"
+- image "#{Prawn::BASEDIR}/data/images/pigs.jpg", :height => 100
++ image "#{Prawn::DATADIR}/images/pigs.jpg", :height => 100
+ move_down 10
+
+ text "Stretch to fit the width and height provided"
+- image "#{Prawn::BASEDIR}/data/images/pigs.jpg", :width => 500, :height => 100
++ image "#{Prawn::DATADIR}/images/pigs.jpg", :width => 500, :height => 100
+ end
+--- a/manual/table/image_cells.rb
++++ b/manual/table/image_cells.rb
+@@ -17,7 +17,7 @@
+
+ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+ Prawn::Example.generate(filename) do
+- image = "#{Prawn::BASEDIR}/data/images/prawn.png"
++ image = "#{Prawn::DATADIR}/images/prawn.png"
+
+ table [
+ ["Standard image cell", {:image => image}],
+--- a/manual/templates/full_template.rb
++++ b/manual/templates/full_template.rb
+@@ -11,7 +11,7 @@
+ require File.expand_path(File.join(File.dirname(__FILE__),
+ %w[.. example_helper]))
+
+-filename = "#{Prawn::BASEDIR}/data/pdfs/multipage_template.pdf"
++filename = "#{Prawn::DATADIR}/pdfs/multipage_template.pdf"
+
+ Prawn::Example.generate("full_template.pdf", :template => filename) do
+ go_to_page(page_count)
+--- a/manual/templates/page_template.rb
++++ b/manual/templates/page_template.rb
+@@ -22,7 +22,7 @@
+ url = "https://github.com/sandal/prawn/raw/master/data/pdfs/form.pdf"
+ formatted_text [{:text => url, :link => url}]
+
+- filename = "#{Prawn::BASEDIR}/data/pdfs/form.pdf"
++ filename = "#{Prawn::DATADIR}/pdfs/form.pdf"
+ start_new_page(:template => filename)
+
+ start_new_page(:template => filename, :template_page => 2)
+--- a/manual/text/fallback_fonts.rb
++++ b/manual/text/fallback_fonts.rb
+@@ -9,11 +9,11 @@
+
+ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+ Prawn::Example.generate(filename) do
+- file = "#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf"
++ file = "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
+ font_families["Kai"] = {
+ :normal => { :file => file, :font => "Kai" }
+ }
+- file = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
++ file = "#{Prawn::DATADIR}/fonts/Action Man.dfont"
+ font_families["Action Man"] = {
+ :normal => { :file => file, :font => "ActionMan" },
+ }
+--- a/manual/text/line_wrapping.rb
++++ b/manual/text/line_wrapping.rb
+@@ -29,7 +29,7 @@
+ "nearer your destination the more you're slip#{nbsp}sliding away."
+ move_down 20
+
+- font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf", :size => 16) do
++ font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf", :size => 16) do
+ long_text = "No word boundaries:\n更可怕的是，同质化竞争对手可以按照URL中后面这个ID来遍历您的DB中的内容，写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事，这样的话，你就非常被动了。更可怕的是，同质化竞争对手可以按照URL中后面这个ID来遍历您的DB中的内容，写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事，这样的话，你就非常被动了。"
+ text long_text
+ move_down 20
+--- a/manual/text/registering_families.rb
++++ b/manual/text/registering_families.rb
+@@ -15,7 +15,7 @@
+ Prawn::Example.generate(filename) do
+ # Registering a single TTF font
+ font_families.update("Chalkboard" => {
+- :normal => "#{Prawn::BASEDIR}/data/fonts/Chalkboard.ttf"
++ :normal => "#{Prawn::DATADIR}/fonts/Chalkboard.ttf"
+ })
+
+ font("Chalkboard") do
+@@ -24,7 +24,7 @@
+ move_down 20
+
+ # Registering a DFONT package
+- font_path = "#{Prawn::BASEDIR}/data/fonts/Action Man.dfont"
++ font_path = "#{Prawn::DATADIR}/fonts/Action Man.dfont"
+ font_families.update("Action Man" => {
+ :normal => { :file => font_path, :font => "ActionMan" },
+ :italic => { :file => font_path, :font => "ActionMan-Italic" },
+--- a/manual/text/right_to_left_text.rb
++++ b/manual/text/right_to_left_text.rb
+@@ -16,7 +16,7 @@
+ # set the direction document-wide
+ self.text_direction = :rtl
+
+- font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf", :size => 16) do
++ font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf", :size => 16) do
+ long_text = "写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事写个小"
+ text long_text
+ move_down 20
diff --git a/debian/patches/0405_use_system_fonts_manual.patch b/debian/patches/0405_use_system_fonts_manual.patch
new file mode 100644
index 0000000..808b8d7
--- /dev/null
+++ b/debian/patches/0405_use_system_fonts_manual.patch
@@ -0,0 +1,231 @@
+Description: use system fonts when possible
+ Upstream ships embedded copies of several truetype fonts. Some are available in Debian.
+ These copies have been removed from the Debian source package, and system
+ fonts are used instead.
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-11-21
+
+--- a/manual/text/single_usage.rb
++++ b/manual/text/single_usage.rb
+@@ -17,19 +17,21 @@
+ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+ Prawn::Example.generate(filename) do
+ # Using a TTF font file
+- 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
++ text "Written with the DejaVuSans TTF font."
+ end
+ move_down 20
+
+ text "Written with the default font."
+ move_down 20
+
+- # Using an DFONT font file
+- font "#{Prawn::DATADIR}/fonts/Action Man.dfont" do
+- text "Written with the Action Man DFONT font"
+- end
+- move_down 20
++# # Using an DFONT font file
++# # Debian: deactivated, because using non-free font removed from the Debian package
++# font "#{Prawn::DATADIR}/fonts/Action Man.dfont" do
++# text "Written with the Action Man DFONT font"
++# end
++# move_down 20
+
+ text "Written with the default font once more."
+ end
+--- a/manual/text/utf8.rb
++++ b/manual/text/utf8.rb
+@@ -21,7 +21,7 @@
+ text "Let's try them with another font."
+ move_down 20
+
+- font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf") do
++ font("/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf") do
+ text "ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει."
+ text "There you go."
+ end
+--- a/manual/text/line_wrapping.rb
++++ b/manual/text/line_wrapping.rb
+@@ -29,7 +29,7 @@
+ "nearer your destination the more you're slip#{nbsp}sliding away."
+ move_down 20
+
+- font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf", :size => 16) do
++ font("/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf", :size => 16) do
+ long_text = "No word boundaries:\n更可怕的是，同质化竞争对手可以按照URL中后面这个ID来遍历您的DB中的内容，写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事，这样的话，你就非常被动了。更可怕的是，同质化竞争对手可以按照URL中后面这个ID来遍历您的DB中的内容，写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事，这样的话，你就非常被动了。"
+ text long_text
+ move_down 20
+--- a/manual/example_helper.rb
++++ b/manual/example_helper.rb
+@@ -143,11 +143,11 @@
+
+ text(extract_introduction_text(data), :inline_format => true)
+
+- kai_file = "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
++ kai_file = "/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf"
+ font_families["Kai"] = {
+ :normal => { :file => kai_file, :font => "Kai" }
+ }
+- dejavu_file = "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf"
++ dejavu_file = "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
+ font_families["DejaVu"] = {
+ :normal => { :file => dejavu_file, :font => "DejaVu" }
+ }
+--- a/manual/text/fallback_fonts.rb
++++ b/manual/text/fallback_fonts.rb
+@@ -4,32 +4,35 @@
+ # be present in the desired font. Use the :fallback_fonts option with any of the
+ # text or text box methods, or set fallback_fonts document-wide.
+ #
++# The result of this example is not included because requires non-free fonts,
++# removed from the Debian package.
++
+ require File.expand_path(File.join(File.dirname(__FILE__),
+ %w[.. example_helper]))
+
+ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+ Prawn::Example.generate(filename) do
+- file = "#{Prawn::DATADIR}/fonts/gkai00mp.ttf"
+- font_families["Kai"] = {
+- :normal => { :file => file, :font => "Kai" }
+- }
+- file = "#{Prawn::DATADIR}/fonts/Action Man.dfont"
+- font_families["Action Man"] = {
+- :normal => { :file => file, :font => "ActionMan" },
+- }
+- font("Action Man") do
+- text("When fallback fonts are included, each glyph will be rendered using " +
+- "the first font that includes the glyph, starting with the current " +
+- "font and then moving through the fallback fonts from left to right." +
+- "\n\n" +
+- "hello ƒ 你好\n再见 ƒ goodbye",
+- :fallback_fonts => ["Times-Roman", "Kai"])
+- end
+- move_down 20
+-
+- formatted_text([
+- { :text => "Fallback fonts can even override" },
+- { :text => "fragment fonts (你好)", :font => "Times-Roman" },
+- ],
+- :fallback_fonts => ["Times-Roman", "Kai"])
++# file = "usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf"
++# font_families["Kai"] = {
++# :normal => { :file => file, :font => "Kai" }
++# }
++# file = "#{Prawn::DATADIR}/fonts/Action Man.dfont"
++# font_families["Action Man"] = {
++# :normal => { :file => file, :font => "ActionMan" },
++# }
++# font("Action Man") do
++# text("When fallback fonts are included, each glyph will be rendered using " +
++# "the first font that includes the glyph, starting with the current " +
++# "font and then moving through the fallback fonts from left to right." +
++# "\n\n" +
++# "hello ƒ 你好\n再见 ƒ goodbye",
++# :fallback_fonts => ["Times-Roman", "Kai"])
++# end
++# move_down 20
++#
++# formatted_text([
++# { :text => "Fallback fonts can even override" },
++# { :text => "fragment fonts (你好)", :font => "Times-Roman" },
++# ],
++# :fallback_fonts => ["Times-Roman", "Kai"])
+ end
+--- a/manual/text/right_to_left_text.rb
++++ b/manual/text/right_to_left_text.rb
+@@ -16,7 +16,7 @@
+ # set the direction document-wide
+ self.text_direction = :rtl
+
+- font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf", :size => 16) do
++ font("/usr/share/fonts/truetype/arphic-gkai00mp/gkai00mp.ttf", :size => 16) do
+ long_text = "写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事写个小"
+ text long_text
+ move_down 20
+--- a/manual/text/registering_families.rb
++++ b/manual/text/registering_families.rb
+@@ -8,43 +8,46 @@
+ # To register a font family update the <code>font_families</code>
+ # hash with the font path for each style you want to use.
+ #
++# The result of this example is not included because requires non-free fonts,
++# removed from the Debian package.
++
+ require File.expand_path(File.join(File.dirname(__FILE__),
+ %w[.. example_helper]))
+
+ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+ Prawn::Example.generate(filename) do
+- # Registering a single TTF font
+- font_families.update("Chalkboard" => {
+- :normal => "#{Prawn::DATADIR}/fonts/Chalkboard.ttf"
+- })
+-
+- font("Chalkboard") do
+- text "Using the Chalkboard font providing only its name to the font method"
+- end
+- move_down 20
+-
+- # Registering a DFONT package
+- font_path = "#{Prawn::DATADIR}/fonts/Action Man.dfont"
+- font_families.update("Action Man" => {
+- :normal => { :file => font_path, :font => "ActionMan" },
+- :italic => { :file => font_path, :font => "ActionMan-Italic" },
+- :bold => { :file => font_path, :font => "ActionMan-Bold" },
+- :bold_italic => { :file => font_path, :font => "ActionMan-BoldItalic" }
+- })
+-
+- font "Action Man"
+- text "Also using the Action Man by providing only its name"
+- move_down 20
+-
+- text "Taking <b>advantage</b> of the <i>inline formatting</i>",
+- :inline_format => true
+- move_down 20
+-
+- [:bold, :bold_italic, :italic, :normal].each do |style|
+- text "Using the #{style} style option.",
+- :style => style
+- move_down 10
+- end
+-
+- font "Helvetica" # Back to normal
++# # Registering a single TTF font
++# font_families.update("Chalkboard" => {
++# :normal => "#{Prawn::DATADIR}/fonts/Chalkboard.ttf"
++# })
++#
++# font("Chalkboard") do
++# text "Using the Chalkboard font providing only its name to the font method"
++# end
++# move_down 20
++#
++# # Registering a DFONT package
++# font_path = "#{Prawn::DATADIR}/fonts/Action Man.dfont"
++# font_families.update("Action Man" => {
++# :normal => { :file => font_path, :font => "ActionMan" },
++# :italic => { :file => font_path, :font => "ActionMan-Italic" },
++# :bold => { :file => font_path, :font => "ActionMan-Bold" },
++# :bold_italic => { :file => font_path, :font => "ActionMan-BoldItalic" }
++# })
++#
++# font "Action Man"
++# text "Also using the Action Man by providing only its name"
++# move_down 20
++#
++# text "Taking <b>advantage</b> of the <i>inline formatting</i>",
++# :inline_format => true
++# move_down 20
++#
++# [:bold, :bold_italic, :italic, :normal].each do |style|
++# text "Using the #{style} style option.",
++# :style => style
++# move_down 10
++# end
++#
++# font "Helvetica" # Back to normal
+ end
--
ruby-prawn.git
More information about the Pkg-ruby-extras-commits
mailing list