publishr 0.7.8 → 0.7.9

data/lib/publishr/html_processor.rb

@@ -45,7 +45,7 @@ module Publishr
       make_uppercase
       change_footnote_references
       mark_merge_conflicts
-      add_image_captions
+      add_image_captions if @line.include?('<img')
       change_resources_url_for_rails unless @rails_resources_url.to_s.empty?
       process_footnotes if @process_footnotes == true
       add_footnote if @add_footnote == true and @line.include?('<p>')
@@ -117,7 +117,11 @@ module Publishr
     end
 
     def add_image_captions
-      @line.gsub /<p.*width="(.*?)".*?>.*?<img src="(.*?)" alt="(.*?)"(.*? \/>)<\/p>/, '<p class="image"><img src="\2" width="\1"\4<br /><code>\3/code></p>'
+      # @line  = "<p class=\"H\"><img src=\"image.jpg\" alt=\"Image description\" /></p>"
+      # @line  = "<p width=\"50\" class=\"H\"><img src=\"image.jpg\" alt=\"Image description\" /></p>"
+      @line.gsub! /<p.*?width="(.*?)".*?><img src="(.*?)" alt="(.*?)".*?\/><\/p>/, '<p class="image"><img src="\2" width="\1%" style="width: \1%"/><br /><code>\3</code></p>'
+      @line.gsub! /<p.*?class="(.*?)".*?><img src="(.*?)" alt="(.*?)".*?\/><\/p>/, '<p class="image"><img src="\2" /><br /><code>\3</code></p>'
+      @line.gsub! /<p><img src="(.*?)" alt="(.*?)".*?\/><\/p>/, '<p class="image"><img src="\1" /><br /><code>\2</code></p>'
     end
   end
 end

data/lib/publishr/latex_renderer.rb

@@ -33,6 +33,7 @@ module Publishr
     def make_tex_directory_structure
       FileUtils.mkdir_p @outpath
       FileUtils.cp Dir[File.join(@inpath,'images','*.jpg')], @outpath
+      FileUtils.cp Dir[File.join(@inpath,'images','*.eps')], @outpath
       FileUtils.cp_r File.join(@gempath,'lib','tex_templates','book.tex'), @outpath
       FileUtils.cp_r Dir[File.join(@inpath,'*.tex')], @outpath
     end

data/lib/publishr/project.rb

@@ -52,15 +52,22 @@ module Publishr
       pdf.render
 
       outpath = File.join(@inpath,'latex')
-      binaryfile = File.join(@converterspath,'jpeg2ps 2>&1')
-      Dir[File.join(outpath,'*.jpg')].each do |infilepath|
-        outfilepath = File.join(outpath, File.basename(infilepath).gsub(/(.*).jpg/, '\1.eps'))
-        `#{ binaryfile } -r 0 -o #{ outfilepath } #{ infilepath }`
-      end
 
-      FileUtils.cp Dir[File.join(@inpath,'images','*.eps')], @outpath # overwrite converted eps files with user provided ones. this allows for true and sharp vector graphics, hardware rendered by the printer itself.
+      # pdflatex handles jpg files directly, so the following is commented out
+      # binaryfile = File.join(@converterspath,'jpeg2ps 2>&1')
+      # Dir[File.join(outpath,'*.jpg')].each do |infilepath|
+      #   outfilepath = File.join(outpath, File.basename(infilepath).gsub(/(.*).jpg/, '\1.eps'))
+      #   `#{ binaryfile } -r 0 -o #{ outfilepath } #{ infilepath }`
+      # end
 
       Dir.chdir outpath
+      Dir['*.eps'].each do |f|
+        `perl /usr/bin/epstopdf #{ f }`
+        jpg_to_delete = File.basename(f).gsub(/(.*).eps/, '\1.jpg')
+        FileUtils.rm jpg_to_delete if File.exists? jpg_to_delete
+        FileUtils.rm f
+      end
+
       `makeindex preamble.idx`
       lines = []
       IO.popen('pdflatex -interaction=nonstopmode preamble.tex 2>&1') do |io|

data/lib/publishr/version.rb

@@ -1,3 +1,3 @@
 module Publishr
-  VERSION = "0.7.8"
+  VERSION = "0.7.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: publishr
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webgen
-  requirement: &12013900 !ruby/object:Gem::Requirement
+  requirement: &22384740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12013900
+  version_requirements: *22384740
 - !ruby/object:Gem::Dependency
   name: webgen
-  requirement: &12013480 !ruby/object:Gem::Requirement
+  requirement: &22384320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12013480
+  version_requirements: *22384320
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &12062760 !ruby/object:Gem::Requirement
+  requirement: &22383900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12062760
+  version_requirements: *22383900
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &12062340 !ruby/object:Gem::Requirement
+  requirement: &22383480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12062340
+  version_requirements: *22383480
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &12061920 !ruby/object:Gem::Requirement
+  requirement: &22383060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12061920
+  version_requirements: *22383060
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &12061500 !ruby/object:Gem::Requirement
+  requirement: &22382640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12061500
+  version_requirements: *22382640
 description: Fast publishing for ebooks and paper
 email:
 - michael@billgastro.com