octopress-printable 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dabc42f1f81dc131009d8dda9e5e1deac6d849f8
-  data.tar.gz: 05667df60b06ef89ff8d4139d40189a45f85861f
+  metadata.gz: 18667c9134b618d837b41f0ae2c4aab025c708f3
+  data.tar.gz: e339283272b25792de8ad79721dbd89f0761daf8
 SHA512:
-  metadata.gz: 65e5649dbd86fd3507bc245ccacaab7a2db8bfee4a35f1ac452af53cb504bbe7900c994b82e345f6e0da4e9cb4e689fa6c830bfd41c422b62cbd09758cbbe2d4
-  data.tar.gz: 40454e9b7907db985cf607df3109c16b6c076900be4d780dd1026a255660737c244dfb9fc5129217e1e18e2c09964d6d7ac74cf55739dd948104c621414cc1ca
+  metadata.gz: a1d08a1ece5339cc781547b2b12dff44c1ec348c671fb96dac836eb6408e42b41703c09b6d2ac55b7f52a68f44f03461dd0ce1d4f3b5ee376bcae4c84058423d
+  data.tar.gz: f6dc85996e47b9043b391cc0532a023befa27dde5df8436d9b82157cd865ad311bc945e854d6351cfe71ae824f7965d801dc2f1175835aa544e220f9cf40b22c

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.4 - 2015-07-31
+- Add support to \input for tex.
+
 ## 0.1.3 - 2015-07-29
 - Add 'tex2img' support
 

data/lib/octopress-printable/bib.rb

@@ -62,7 +62,7 @@ module Octopress
         end
         cmds
       end
-
+      
     end
   end
 end

data/lib/octopress-printable/converter.rb

@@ -16,6 +16,10 @@ module Octopress
         []
       end
 
+      def envs()
+        []
+      end
+
       def pandoc_args
         []
       end
@@ -31,6 +35,22 @@ module Octopress
       def last_xelatex(texfile)
         []
       end
+
+      def self.get_includes(post, source_dir)
+        []
+      end
+
+      # return the newest timestamp for included files
+      def self.timestamp(post, source_dir)
+        includes = get_includes(post, source_dir)
+        ts = Time.new(0)
+        includes.each { |f|
+          if File.exists?(f) && File.stat(f).mtime > ts
+            ts = File.stat(f).mtime
+          end
+        }
+        ts
+      end
     end
   end
 end

data/lib/octopress-printable/img.rb

@@ -54,6 +54,19 @@ module Octopress
         lines << '\\usepackage{graphicx}'
         lines << '\\usepackage[all]{hypcap}'
       end
+
+      def get_includes(post, source_dir)
+        includes = []
+        File.open(post, 'r') do |f|
+          while l = f.gets
+            if /{% img (?<markup>.*) %}/ =~ l
+              img = ImgConverter.get_img_label(markup)
+              includes << File.join(source_dir, img['src']) 
+            end
+          end
+        end
+        includes
+      end
     end
   end
 end

data/lib/octopress-printable/plugin.rb

@@ -46,7 +46,7 @@ module Octopress
           pdf = pdf.gsub(/\//, "-")
           pdf = "#{printables_dir}/#{pdf}.pdf"
 
-          if !File.exists?(pdf) || File.stat(post).mtime > File.stat(pdf).mtime
+          if !File.exists?(pdf) || timestamp(post, source_dir) > File.stat(pdf).mtime
             puts "Converting #{post} to #{pdf}"
             gen_pdf(post, pdf, source_dir, posts_dir, blog_url,
                     bib_dir, bib, p.url)
@@ -188,17 +188,23 @@ module Octopress
           cmds << cmd
         end
 
+        envs = []
+        for converter in converters
+          envs += converter.envs
+        end
+        File.open("#{base}.sh", 'w') { |f|
+          f.write(envs.join("\n"))
+          f.write("\n")
+          f.write(cmds.join("\n"))
+        }
+        FileUtils.chmod(0755, "#{base}.sh")
+
         if ! @conf['dry_run']
-          for cmd in cmds
-            system cmd
-          end
+          system "#{base}.sh"
         end
 
-        if @conf['dump_cmds']
-          File.open("#{base}.sh", 'w') { |f|
-            f.write(cmds.join("\n"))
-          }
-          FileUtils.chmod(0755, "#{base}.sh")
+        if ! @conf['dump_cmds']
+      	  FileUtils.rm_f("#{base}.sh")
         end
 
         if File.exists?("#{File.basename(base)}.pyg")
@@ -234,6 +240,18 @@ module Octopress
           bib.cleanup
         end
       end
+
+      def timestamp(post, source_dir)
+        ts = [ File.stat(post).mtime ]
+        ts << MathConverter.timestamp(post, source_dir)
+        ts << ImgConverter.timestamp(post, source_dir)
+        ts << Tex2imgConverter.timestamp(post, source_dir)
+        ts << BibConverter.timestamp(post, source_dir)
+        ts << GistConverter.timestamp(post, source_dir)
+        ts << PostLinkConverter.timestamp(post, source_dir)
+        ts << LatexConverter.timestamp(post, source_dir)
+        ts.max
+      end
       
     end
   end

data/lib/octopress-printable/tex2img.rb

@@ -11,6 +11,7 @@ module Octopress
 
         @source_dir = source_dir
         @headers = []
+        @inputs = []
       end
 
       def convert(line)
@@ -19,18 +20,19 @@ module Octopress
         if /{% tex2img (?<markup>.*) %}/ =~ str
           @match = true
 
-          @texpath, *params = markup.strip.split(/\s/)
-          @texpath = File.join(@source_dir, @texpath)
-          if !File.exists?(@texpath)
-            raise ArgumentError.new("texfile[#{@texpath}] does not exist!")
+          texpath, *params = markup.strip.split(/\s/)
+          texpath = File.join(@source_dir, texpath)
+          if !File.exists?(texpath)
+            raise ArgumentError.new("texfile[#{texpath}] does not exist!")
           end
 
           img = Octopress::Printable::ImgConverter.get_img_label(params.join(" "))
-          str="\\begin{figure}[h]\\centering\\input{#{@texpath}}\\caption{#{img['title']}}\\label{#{img['alt']}}\\end{figure}"
+          str="\\begin{figure}[h]\\centering\\input{#{texpath}}\\caption{#{img['title']}}\\label{#{img['alt']}}\\end{figure}"
 
-          @headers += open(@texpath) { |f| f.grep(/\\usepackage/) }
+          @headers += open(texpath) { |f| f.grep(/\\usepackage/) }
+
+          add_envs(texpath)
         end
- 
         str
       end
 
@@ -40,6 +42,45 @@ module Octopress
         @headers.each {|a| a.strip!if a.respond_to? :strip! }
         @headers.uniq!
       end
+
+      def add_envs(texpath)
+        File.open(texpath, 'r') do |ff|
+          while ll = ff.gets
+            if /\\input{(?<inputfile>.*)}/ =~ ll
+               @inputs << File.dirname(texpath)
+            end
+          end
+        end
+      end
+
+      def envs
+        ["export TEXINPUTS+='#{@inputs.join(':')}:'"]
+      end
+
+      def self.get_includes(post, source_dir)
+        includes = []
+        File.open(post, 'r') do |f|
+          while l = f.gets
+            if /{% tex2img (?<markup>.*) %}/ =~ l
+              texpath, *params = markup.strip.split(/\s/)
+              texpath = File.join(source_dir, texpath)
+              if !File.exists?(texpath)
+                next
+              end
+              includes << texpath
+
+              File.open(texpath, 'r') do |ff|
+                while ll = ff.gets
+                  if /\\input{(?<inputfile>.*)}/ =~ ll
+                    includes << File.join(File.dirname(texpath), inputfile)
+                  end
+                end
+              end
+            end
+          end
+        end
+        includes
+      end
     end
   end
 end

data/lib/octopress-printable/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Printable
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-printable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Wang Jian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler