polytexnic 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e32b34fc0d486225db6bb18c5457718e9cd8a3e
-  data.tar.gz: aa209cf0b57e84058935229ccdc4eb00669ead80
+  metadata.gz: 03e62fa6b490d41676bdfa9726742aea94016aff
+  data.tar.gz: afbdc88da5dd5971e08d4e117254bca05908e2fb
 SHA512:
-  metadata.gz: 2e292a89c3dfd6b5f0941093a4e1a11e327b4d3134ce3fecfd5ad0af0b063c558379009b9691df816a133e4e0a52206749ef7066244682bf34b556489a394968
-  data.tar.gz: c4638cb9a16135fc999b720b82bbe8bc262efd2d68f94fd993a100a6b5427fa7d50a2cc13653a94d3ff028058cf4e37c59c489f313775e75e76b765aa91970fe
+  metadata.gz: 58b473266813ba1e121f9bf9691d5d49236ac834e2e3de7a2880078e5e0830d9131b22fd9b041670a9a4a43694909edb255f8acdbb20f8f0171183461dfa24e6
+  data.tar.gz: 8c9f0555371af7f274dfa301b23e037a1d10b27303a0c506186112761524a37cc3c8e03ed2a3c1cb716e2d32fa9964f4ff6af0574846a7cc5d3cdc4b9f41d38a

data/lib/polytexnic/preprocessors/polytex.rb

@@ -39,8 +39,12 @@ module Polytexnic
         # Override the header ordering, which starts with 'section' by default.
         lh = 'chapter,section,subsection,subsubsection,paragraph,subparagraph'
         kramdown = Kramdown::Document.new(cleaned_markdown, latex_headers: lh)
-        @source = restore_inclusion(restore_math(kramdown.to_latex, math_cache))
-        restore_raw_latex(@source, cache)
+        @source = kramdown.to_latex.tap do |polytex|
+                    convert_tt(polytex)
+                    restore_math(polytex, math_cache)
+                    restore_inclusion(polytex)
+                    restore_raw_latex(polytex, cache)
+                  end
       end
 
       # Adds support for <<(path/to/code) inclusion.
@@ -49,7 +53,7 @@ module Polytexnic
         text.gsub!(/^\s*<<(\(.*?\))/) { "<!-- inclusion= <<#{$1}-->" }
       end
       def restore_inclusion(text)
-        text.gsub(/% <!-- inclusion= (.*?)-->/) { "%= #{$1}" }
+        text.gsub!(/% <!-- inclusion= (.*?)-->/) { "%= #{$1}" }
       end
 
       # Caches literal LaTeX environments.
@@ -84,9 +88,16 @@ module Polytexnic
                           )
                         /x
         markdown.gsub!(command_regex) do
-          key = digest($1)
-          cache[key] = $1
-          key
+          content = $1
+          key = digest(content)
+          cache[key] = content
+
+          if content =~ /\{table\}|\\caption\{/
+            # Pad tables & captions with newlines for kramdown compatibility.
+            "\n#{key}\n"
+          else
+            key
+          end
         end
       end
 
@@ -140,6 +151,14 @@ module Polytexnic
         output.join("\n")
       end
 
+      # Converts {tt ...} to \kode{...}
+      # This effectively converts `inline code`, which kramdown sets as
+      # {\tt inline code}, to PolyTeX's native \kode command, which in
+      # turns allows inline code to be separately styled.
+      def convert_tt(text)
+        text.gsub!(/\{\\tt (.*?)\}/, '\kode{\1}')
+      end
+
       # Caches math.
       # Leanpub uses the notation {$$}...{/$$} for both inline and block math,
       # with the only difference being the presences of newlines:
@@ -178,7 +197,6 @@ module Polytexnic
           end
           text.gsub!(key, open + value + close)
         end
-        text
       end
     end
   end

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/spec/markdown_to_polytex_spec.rb

@@ -59,8 +59,40 @@ x^2
 
         it { should resemble '\[ x^2 \]' }
       end
+
+      describe "tables" do
+        let(:markdown) do <<-'EOS'
+\begin{table}
+
+|**option**|**size**|**actual size**|
+| k | kilobytes | (1024 bytes) |
+| M | megabytes | (1024 kilobytes) |
+| G | gigabytes | (1024 megabytes) |
+| T | terabytes | (1024 gigabytes) |
+| P | petabytes | (1024 terabytes) |
+\end{table}
+
+\begin{table}
+
+|**option**|**size**|**actual size**|
+| k | kilobytes | (1024 bytes) |
+| M | megabytes | (1024 kilobytes) |
+| G | gigabytes | (1024 megabytes) |
+| T | terabytes | (1024 gigabytes) |
+| P | petabytes | (1024 terabytes) |
+\caption{A caption.}
+\end{table}
+
+          EOS
+        end
+        it { should include '\begin{table}' }
+        it { should include '\begin{longtable}' }
+        it { should_not include '\textbar' }
+      end
     end
 
+
+
     describe "footnotes" do
       subject do
         Polytexnic::Pipeline.new(markdown, source: :markdown).polytex
@@ -198,6 +230,12 @@ def foo; "bar"; end
     end
 
     describe "source code" do
+
+      context "inline" do
+        let(:source) { '`foo bar`' }
+        it { should include '\kode{foo bar}' }
+      end
+
       context "without highlighting" do
         let(:source) do <<-EOS
     def foo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -167,6 +167,7 @@ files:
 - .pull_requests/1384446851
 - .pull_requests/1384800466
 - .pull_requests/1384811507
+- .pull_requests/1385061501
 - .rspec
 - .ruby-gemset
 - .ruby-version