polytexnic 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93f94c2e4866339d2cea4731e55fa4963774d985
-  data.tar.gz: f15a6846bd39ba6d567d40cf6060910698640d38
+  metadata.gz: 8e73721e69c72ece6549257bb3c30295b6892992
+  data.tar.gz: 4a6936bfdc80f5d203a261c37acf351214d6b4b0
 SHA512:
-  metadata.gz: bca25d2db6b2d84918031fe1dfe32da9dd929eefffc892654486930d554bc631da22910d662026796892b64f4b8e86cfb44d67786f29b14bde312bd34d933860
-  data.tar.gz: 332fc4c67051c89e0c3854a4d02a4d60314f5b0ff28f77c7647b520ef30a236c17a8dcc9d085cad3512fd59864f6ca48b3ca2d9023fecaeb97b110eb9b8d3967
+  metadata.gz: 4e498b2a6d0c5cb8f4ab9d682541c34ea29aef319ff539516f94bc1b2508edd99f6c3a5e0298c453ce6ea4f781ee5743a16aa5d8385c1b9d6e71ed3b752fac45
+  data.tar.gz: 336b3755b1cbbd435310dce8285cac31b17120f7ff4425288cf093cc96bf660912a298dae4585ad310b20a378eee084d50b44aaa9305c13bc463d72dbf0f8f25

data/lib/polytexnic/preprocessors/polytex.rb

@@ -216,10 +216,14 @@ module Polytexnic
             output << key
             output << line
           elsif line =~ /^```(\w*)(,\s*options:.*)?$/  # highlighted fences
+            count = 1
             language = $1.empty? ? 'text' : $1
             options  = $2
             code = []
-            while (line = lines.shift) && !line.match(/^```\s*$/) do
+            while (line = lines.shift) do
+              count += 1 if line =~ /^```.+$/
+              count -= 1 if line.match(/^```\s*$/)
+              break if count.zero?
               code << line
             end
             code = code.join("\n")

data/lib/polytexnic/utils.rb

@@ -171,11 +171,18 @@ module Polytexnic
     # includes a required override of the default commandchars.
     # Since the substitution is only important in the context of a PDF book,
     # it only gets made if there's a style in the 'softcover.sty' file.
+    # We also support custom overrides in 'custom_pdf.sty'.
     def add_font_info(string)
-      softcover_sty = File.join('latex_styles', 'softcover.sty')
-      if File.exist?(softcover_sty)
-        regex = '{code}{Verbatim}{(.*)}'
-        styles = File.read(softcover_sty).scan(/#{regex}/).flatten.first
+      softcover_sty  = File.join('latex_styles', 'softcover.sty')
+      custom_pdf_sty = File.join('latex_styles', 'custom_pdf.sty')
+      regex = '{code}{Verbatim}{(.*)}'
+      styles = nil
+      [softcover_sty, custom_pdf_sty].reverse.each do |filename|
+        if File.exist?(filename)
+          styles ||= File.read(filename).scan(/#{regex}/).flatten.first
+        end
+      end
+      unless styles.nil?
         string.gsub!("\\begin{Verbatim}[",
                      "\\begin{Verbatim}[#{styles},")
       end

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/lib/polytexnic.rb

@@ -44,7 +44,11 @@ module Polytexnic
       if File.exist?(@highlight_cache_filename)
         content = File.read(@highlight_cache_filename)
                       .force_encoding('ASCII-8BIT')
-        @highlight_cache = MessagePack.unpack(content) unless content.empty?
+        begin
+          @highlight_cache = MessagePack.unpack(content) unless content.empty?
+        rescue MessagePack::UnpackError
+          FileUtils.rm @highlight_cache_filename
+        end
       end
       @highlight_cache ||= {}
       @math_label_cache = {}

data/spec/markdown_to_polytex_spec.rb

@@ -492,8 +492,6 @@ lorem
           it { should resemble output }
         end
 
-
-
         context "with a code listing from Urbit that broke" do
           let(:source) do <<-'EOS'
 ```text
@@ -506,6 +504,28 @@ foo
           end
           it { should_not include "\\begin{code}\n'Foo \n"}
         end
+
+        context "with nested fencing" do
+          let(:source) do <<-'EOS'
+```text
+```ruby, options: "hl_lines": [1, 2], "linenos": true
+def hello; puts 'hello'; end
+```
+```
+            EOS
+          end
+
+          let(:output) do <<-'EOS'
+%= lang:text
+\begin{code}
+```ruby, options: "hl_lines": [1, 2], "linenos": true
+def hello; puts 'hello'; end
+```
+\end{code}
+            EOS
+          end
+          it { should resemble output }
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -203,6 +203,7 @@ files:
 - .pull_requests/1388430185
 - .pull_requests/1388440664
 - .pull_requests/1388802190
+- .pull_requests/1389652617
 - .rspec
 - Gemfile
 - Guardfile