@@ -23,6 +23,8 @@ DEFAULT_OPTIONS = { :color => false, + :web_format => :png, + :paper => :letter, :orientation => :landscape, @@ -227,7 +229,7 @@ def jpeg_from_image_file( jpeg_file, image_file ) end def png_from_file( png_file, image_file, high_res, is_svg, &height_calc ) - temp_png_file = "#{ png_file }.temp" + temp_png_file = "#{ png_file }.uncrushed" file png_file => [ image_file ] do height = height_calc.call image_file @@ -488,7 +490,7 @@ EOS begin geometry = "#{ ( bbox[0].end - bbox[0].begin ).round }x#{ ( bbox[1].end - bbox[1].begin ).round }" # straightforward image -> eps conversion doesn't work for spreads, write to temp png to work around this - temp_png_image = "#{document}.temp" + temp_png_image = "#{document}.intermediate" sh "convert", "-crop", "#{geometry}+#{ bbox[0].begin.round }+#{ bbox[1].begin.round }", "+repage", document, "png:#{temp_png_image}" sh "convert", "png:#{temp_png_image}", "+repage", "eps:-" rm temp_png_image @@ -704,11 +706,11 @@ def initialize( dir, options={} ) task temp_page_png => [ scratch_dir ] case @options[:web_format] - when :png - web_page_image = File.join( web_dir, "#{ web_name }.png" ) - temp_page_png = web_page_image when :jpg, :jpeg web_page_image = File.join( web_dir, "#{ web_name }.jpeg" ) + else + web_page_image = File.join( web_dir, "#{ web_name }.png" ) + temp_page_png = web_page_image end task web_page_image => [ web_dir ] lib/minicomic.rb 26dec7365ea98b7a3020b049f27b7a59b5d10850 MenTaLguY mental@rydia.net http://github.com/mental/minicomic/commit/ecd7c88d128b680bac5e89fb490f3967078a2012 ecd7c88d128b680bac5e89fb490f3967078a2012 2007-10-14T11:05:37-07:00 2007-10-14T11:05:37-07:00 fix web png generation a434a5b50cc16b3a0168970d1fd3ce1ba13ace51 MenTaLguY mental@rydia.net