softcover 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb3a8ac867feab04d85e376c1c07f1860b88cfc8
-  data.tar.gz: 544d163967fad019b93260917f56624b32514993
+  metadata.gz: 642f6e9fa8e34595d1d5811f2d843b072b78db25
+  data.tar.gz: 6d62ef63616c5fc96aaae8510a7460a2ab9f758c
 SHA512:
-  metadata.gz: 9a92960c2fa9fdbcd50c4ae68ab7b9454a7c0660dda62312f8d31e1c3096cd350085bc409dc17b5e92ee955238bd62bf2f3a177d7bf468ceaa97ea0ab9f908fa
-  data.tar.gz: 2cde2515a0144fc39b3995bda93e151db02b4641ae52705183adb8244724fffc9905cb4a64c98c6ac9f4956e45f8f906cb7fefe9147d35af99749a38964ec7b1
+  metadata.gz: ce330e42045af1b357e2816dcacb521905b6b698113eb482e5cbbb81464f258c12e29e605c76e2d0ebf9350aa330968db11522055d8ec30c88a6a1caefb4657f
+  data.tar.gz: dd2401d92cff7c84c7468c0ce7801adc001ede05815dd43fbfc0835572a3b738531a7a7bcefa196cf753a7b64e5408d1584857d6bbc4987163d0434e782e9d92

data/lib/softcover/book_manifest.rb

@@ -246,7 +246,7 @@ class Softcover::BookManifest < OpenStruct
   def source_files
     self.class.find_book_root!
     md_tex = /.*(?:\.md|\.tex)/
-    File.readlines(TXT_PATH).select { |path| path =~ md_tex }.map(&:strip)
+    book_txt_lines.select { |path| path =~ md_tex }.map(&:strip)
   end
 
   def basenames

data/lib/softcover/builders/pdf.rb

@@ -24,20 +24,6 @@ module Softcover
         if options[:debug]
           execute "#{xelatex} #{book_filename}"
           return    # only gets called in test env
-        elsif 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
 
         polytex_filenames = manifest.pdf_chapter_filenames << book_filename
@@ -56,6 +42,22 @@ 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)

data/lib/softcover/sanitizer.rb

@@ -12,7 +12,7 @@ module Softcover
 
       sanitize_options = {
         elements: %w{div span p a ul ol li h1 h2 h3 h4
-          pre em sup table tbody thead tr td img code},
+          pre em sup table tbody thead tr td img code strong},
         remove_contents: %w{script},
         attributes: {
           'div' => %w{id class data-tralics-id data-number data-chapter},
@@ -28,7 +28,8 @@ module Softcover
           'h4'   => %w{id class},
           'img'  => %w{id class src alt},
           'em'   => %w{id class},
-          'code' => %w{id class}
+          'code' => %w{id class},
+          'strong' => %w{id class}
         },
         protocols: {
           'a'   => {'href' => [:relative, 'http', 'https', 'mailto']},

data/lib/softcover/template/chapters/a_chapter.md

@@ -1,7 +1,7 @@
 # A chapter
 \label{cha:a_chapter}
 
-This is the first paragraph of the Softcover Markdown template. It shows how to write a document in Markdown, a lightweight markup language, augmented with the [kramdown](http://kramdown.rubyforge.org/) converter and some custom extensions, including support for embedded \PolyTeX, a subset of the powerful \LaTeX\ typesetting system.  For more information, see [*The Softcover Book*](http://manual.softcover.io/) (**link not live yet**). To learn how to easily publish (and optionally sell) documents produced with Softcover, visit [Softcover.io](http://softcover.io/). Softcover is currently in private beta; go to [Softcover.io](http://softcover.io/) to get an invitation.
+This is the first paragraph of the Softcover Markdown template. It shows how to write a document in Markdown, a lightweight markup language, augmented with the [kramdown](http://kramdown.rubyforge.org/) converter and some custom extensions, including support for embedded \PolyTeX, a subset of the powerful \LaTeX\ typesetting system.  For more information, see [*The Softcover Book*](http://manual.softcover.io/book). To learn how to easily publish (and optionally sell) documents produced with Softcover, visit [Softcover.io](http://softcover.io/). Softcover is currently in private beta; go to [Softcover.io](http://softcover.io/) to get an invitation.
 
 This is the *second* paragraph, showing how to emphasize text.[^sample-footnote] You can also make text **bold** or _emphasize a second way_.
 
@@ -115,7 +115,7 @@ Commands:
   softcover server                     # Run local server
 ```
 
-For additional help on a given command, run `softcover help <command>`:
+\noindent You can run `softcover help <command>` to get additional help on a given command:
 
 ```console
 $ softcover help build

data/lib/softcover/template/chapters/a_chapter.tex

@@ -1,7 +1,7 @@
 \chapter{A chapter}
 \label{cha:a_chapter}
 
-This is the first paragraph of the Softcover template. It shows how to write a document in \PolyTeX, a subset of the \LaTeX\ typesetting language optimized for ebooks. For more information, see \href{http://manual.softcover.org/book}{\emph{The Softcover Book}} and the \href{http://example.com}{\PolyTeX\ source of the book} (\textbf{links not live yet}). To learn how to easily publish (and optionally sell) documents produced with Softcover, visit \href{http://softcover.io/}{Softcover.io}. Softcover is currently in private beta; go to \href{http://softcover.io/}{Softcover.io} to get an invitation.
+This is the first paragraph of the Softcover template. It shows how to write a document in \PolyTeX, a subset of the \LaTeX\ typesetting language optimized for ebooks. For more information, see \href{http://manual.softcover.org/book}{\emph{The Softcover Book}} and the \href{http://example.com}{\PolyTeX\ source of the book}. To learn how to easily publish (and optionally sell) documents produced with Softcover, visit \href{http://softcover.io/}{Softcover.io}. Softcover is currently in private beta; go to \href{http://softcover.io/}{Softcover.io} to get an invitation.
 
 This is the \emph{second} paragraph, showing how to emphasize text.\footnote{This is a footnote. It is numbered automatically.} You can also make text \textbf{bold} or \textit{italicized} (which looks the same as emphasized text).
 
@@ -165,7 +165,8 @@ Commands:
   softcover server                     # Run local server
 \end{code}
 
-For additional help on a given command, run \kode{softcoverhelp <command>}:
+\noindent You can run \kode{softcover help <command>} to get additional help on a given command:
+
 %= lang:console
 \begin{code}
 $ softcoverhelp build

data/lib/softcover/template/epub/OEBPS/styles/epub.css

@@ -1,7 +1,7 @@
 /* Styles specific to EPUB books */
 
 body {
-  width: 34.5em;
+  width: auto;
   margin-left: 0.5em;
 }
 

data/lib/softcover/template/html/stylesheets/softcover.css

@@ -335,7 +335,6 @@ body #book {
 #book .aside {
   border: 1px solid #999;
   padding: 0.5em;
-  padding-right: 1.5em;
   background: #eee;
   width: 100%;
 }

data/lib/softcover/utils.rb

@@ -74,22 +74,25 @@ module Softcover::Utils
     "#{manifest.filename}.tex"
   end
 
-  # Returns the lines of Book.txt as an array.
+  # Returns the lines of Book.txt as an array, removing any commented-out lines.
   def book_txt_lines
+    comment = /^\s*#.*$/
+    raw_lines.reject { |line| line.match(comment) }
+  end
+
+  # Returns all the lines in Book.txt.
+  def raw_lines
     File.readlines(Softcover::BookManifest::TXT_PATH)
   end
 
   # Returns the content for the master LaTeX file.
   def master_content(manifest)
-    comment = /^\s*#.*$/
     front_or_mainmatter = /(.*):\s*$/
     source_file = /(.*)(?:\.md|\.tex)\s*$/
 
     tex_file = [master_latex_header(manifest)]
     book_txt_lines.each do |line|
-      if    line.match(comment)   # commented-out line
-        next
-      elsif line.match(source_file)
+      if line.match(source_file)
         tex_file << "\\include{#{manifest.polytex_dir}/#{$1}}"
       elsif line.match(front_or_mainmatter)  # frontmatter or mainmatter
         tex_file << "\\#{$1}"

data/lib/softcover/version.rb

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

data/spec/book_manifest_spec.rb

@@ -49,7 +49,6 @@ describe Softcover::BookManifest do
       end
     end
 
-
     context "with mixed Markdown & PolyTeX files" do
       before do
         manifest.stub(:source_files).and_return(['foo.md', 'bar.tex'])

data/spec/builders/html_spec.rb

@@ -139,12 +139,12 @@ describe Softcover::Builders::Html do
       end
 
       describe "commented-out lines of Book.txt" do
-        let(:lines) { ['chapters/foo.md', '# chapters/bar.md'] }
+        let(:lines) { ['foo.md', '# bar.md'] }
         let(:content) { builder.master_content(builder.manifest) }
         before { builder.stub(:book_txt_lines).and_return(lines) }
         it "should be ignored" do
-          expect(content).to     include 'chapters/foo'
-          expect(content).not_to include 'chapters/bar'
+          expect(content).to     include 'generated_polytex/foo'
+          expect(content).not_to include 'generated_polytex/bar'
         end
       end
     end

data/spec/utils_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Softcover::Utils do
+  context "book_txt_lines" do
+    before do
+      Softcover::Utils.stub(:raw_lines).and_return(['foo.md', '# bar.tex'])
+    end
+    subject { Softcover::Utils.book_txt_lines }
+    it { should     include 'foo.md' }
+    it { should_not include 'bar.tex' }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -373,6 +373,7 @@ files:
 - .pull_requests/1385862948
 - .pull_requests/1386099285
 - .pull_requests/1386115582
+- .pull_requests/1386448492
 - .rspec
 - Gemfile
 - LICENSE.txt
@@ -1007,6 +1008,7 @@ files:
 - spec/sanitizer_spec.rb
 - spec/spec_helper.rb
 - spec/support/exist_matcher.rb
+- spec/utils_spec.rb
 - spec/webmock_helpers.rb
 - tasks/run_specs.rake
 homepage: http://manual.softcover.io/
@@ -1056,4 +1058,5 @@ test_files:
 - spec/sanitizer_spec.rb
 - spec/spec_helper.rb
 - spec/support/exist_matcher.rb
+- spec/utils_spec.rb
 - spec/webmock_helpers.rb