softcover 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 642f6e9fa8e34595d1d5811f2d843b072b78db25
-  data.tar.gz: 6d62ef63616c5fc96aaae8510a7460a2ab9f758c
+  metadata.gz: a83ba9f61643640f01082c09127c294477feef73
+  data.tar.gz: a12fcfb63d60b4df9d323e8353d7439ebac6a0aa
 SHA512:
-  metadata.gz: ce330e42045af1b357e2816dcacb521905b6b698113eb482e5cbbb81464f258c12e29e605c76e2d0ebf9350aa330968db11522055d8ec30c88a6a1caefb4657f
-  data.tar.gz: dd2401d92cff7c84c7468c0ce7801adc001ede05815dd43fbfc0835572a3b738531a7a7bcefa196cf753a7b64e5408d1584857d6bbc4987163d0434e782e9d92
+  metadata.gz: 05bac2e39591b47a03eb6d53844e2d677c31a77cc273af9e51bb30105be2d55a7192362d066fc088b38c5afc96cff9c2fbe87667f705251e8a9fd7df4de3732b
+  data.tar.gz: b395d5d2bfe447838c9031cc7444a42541c41670e482b08af20476f5cb1784112e3bb25e2517827ad265df3c0f9d97cbff02777b30734aeef6f9d1f6f3ab15d8

data/lib/softcover/builders/pdf.rb

@@ -42,40 +42,21 @@ module Softcover
         write_pygments_file(:latex)
         copy_polytexnic_sty
 
-        if options[:'find-overfull']
-          tmp_name = book_filename.sub('.tex', '.tmp.tex')
-          # The way we do things, code listings show up as "Overfull", but
-          # they're actually fine, so filter them out.
-          filter_out_listings = "grep -v 3.22281pt"
-          # Because each chapter typically lives in a separate file, it's
-          # hard to correlate Overfull line numbers with lines in the source,
-          # so we use grep's -A flag to provide some context instead. Authors
-          # can then use their text editors' search function to find the
-          # corresponding place in the text.
-          show_context = 'grep -A 3 "Overfull \\\\\\\\hbox"'
-          cmd = "xelatex #{tmp_name} | #{filter_out_listings} | #{show_context}"
-          silence_stream(STDERR) { execute cmd }
-          return
-        end
-
-        tmp_filename = Softcover::Utils.tmpify(manifest, book_filename)
-        build_pdf = "#{xelatex} #{tmp_filename}"
-        # Run the command twice (to guarantee up-to-date cross-references)
-        # unless explicitly overriden.
         # Renaming the PDF in the command is necessary because `execute`
         # below uses `exec` (except in tests, where it breaks). Since `exec`
         # causes the Ruby process to end, any Ruby code after `exec`
         # is ignored.
         # (The reason for using `exec` is so that LaTeX errors get emitted to
         # the screen rather than just hanging the process.)
-        pdf_cmd = options[:once] ? build_pdf : "#{build_pdf} ; #{build_pdf}"
-        cmd = "#{pdf_cmd} ; #{rename_pdf(basename)}"
+        cmd = "#{pdf_cmd(book_filename, options)} ; #{rename_pdf(basename)}"
         # Here we use `system` when making a preview because the preview command
         # needs to run after the main PDF build.
         if options[:quiet] || options[:silent]
           silence_stream(STDERR) do
             silence { options[:preview] ? system(cmd) : execute(cmd) }
           end
+        elsif options[:'find-overfull']
+          silence_stream(STDERR) { execute(cmd) }
         else
           options[:preview] ? system(cmd) : execute(cmd)
         end
@@ -92,6 +73,35 @@ module Softcover
           @xelatex ||= executable(filename, message)
         end
 
+        # Returns the command to build the PDF (once).
+        def build_pdf(book_filename, options={})
+          tmp_filename = Softcover::Utils.tmpify(manifest, book_filename)
+          "#{xelatex} #{tmp_filename} #{options[:filters]}"
+        end
+
+        # Returns the full command to build the PDF.
+        def pdf_cmd(book_filename, options={})
+          if options[:once]
+            build_pdf(book_filename)
+          elsif options[:'find-overfull']
+            # The way we do things, code listings show up as "Overfull", but
+            # they're actually fine, so filter them out.
+            filter_out_listings = "grep -v 3.22281pt"
+            # Because each chapter typically lives in a separate file, it's
+            # hard to correlate Overfull line numbers with lines in the source,
+            # so we use grep's -A flag to provide some context instead. Authors
+            # can then use their text editors' search function to find the
+            # corresponding place in the text.
+            show_context = 'grep -A 3 "Overfull \\\\\\\\hbox"'
+            build_pdf(book_filename,
+                      filters: "| #{filter_out_listings} | #{show_context}" )
+          else
+            # Run the command twice (to guarantee up-to-date cross-references).
+            cmd = build_pdf(book_filename)
+            "#{cmd} ; #{cmd}"
+          end
+        end
+
         # Returns the command to rename the temp PDF.
         # The purpose is to match the original filename.
         # For example, foo_bar.tex should produce foo_bar.pdf.

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Michael Hartl