polytexnic 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 892dfff956c8768a5699346b9fa25dc69ff75f18
-  data.tar.gz: ba8dd328779f0a4d004cb51eb2a3c80f3cecbb57
+  metadata.gz: 3e32b34fc0d486225db6bb18c5457718e9cd8a3e
+  data.tar.gz: aa209cf0b57e84058935229ccdc4eb00669ead80
 SHA512:
-  metadata.gz: 1801e0852177628915042d8fc3e3044f5463ca108ba3fc738012a70ad4fce74338d62ba08c9aec6ebeda2279bc54bcd8329463d74633353a93f63014b4aea2bb
-  data.tar.gz: dccbd899157e2d9fa56110ee283aa1681807bc93db003d3f1c80dea9ed97974417018fd6560a57e240006b4d67b35605c547cffdc6dd568325b5e961c1461150
+  metadata.gz: 2e292a89c3dfd6b5f0941093a4e1a11e327b4d3134ce3fecfd5ad0af0b063c558379009b9691df816a133e4e0a52206749ef7066244682bf34b556489a394968
+  data.tar.gz: c4638cb9a16135fc999b720b82bbe8bc262efd2d68f94fd993a100a6b5427fa7d50a2cc13653a94d3ff028058cf4e37c59c489f313775e75e76b765aa91970fe

data/lib/polytexnic/preprocessors/polytex.rb

@@ -27,12 +27,15 @@ module Polytexnic
         cache = {}
         math_cache = {}
         cleaned_markdown = cache_code_environments
+        puts cleaned_markdown if debug?
         cleaned_markdown.tap do |markdown|
           convert_code_inclusion(markdown)
           cache_latex_literal(markdown, cache)
           cache_raw_latex(markdown, cache)
+          puts markdown if debug?
           cache_math(markdown, math_cache)
         end
+        puts cleaned_markdown if debug?
         # 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)
@@ -67,13 +70,13 @@ module Polytexnic
       # Caches raw LaTeX commands to be passed through the pipeline.
       def cache_raw_latex(markdown, cache)
         command_regex = /(
-                          ^\s*\\\w+.*\}\s*$ # Command on line with arg
+                          ^\s*\\\w+.*\}[ \t]*$ # Command on line with arg
                           |
                           ~\\ref\{.*?\}     # reference with a tie
                           |
                           ~\\eqref\{.*?\}   # eq reference with a tie
                           |
-                          \\\w+\{.*?\}      # command with one arg
+                          \\[^\s]+\{.*?\}   # command with one arg
                           |
                           \\\w+             # normal command
                           |
@@ -90,13 +93,9 @@ module Polytexnic
       # Restores raw LaTeX from the cache
       def restore_raw_latex(text, cache)
         cache.each do |key, value|
-          if value == '\&'
-            # Bizarrely, the default code doesn't work for '\&'.
-            # I actually suspect it may be a bug in Ruby. This hacks around it.
-            text.gsub!(key, value.sub(/\\/, '\\\\\\'))
-          else
-            text.gsub!(key, value)
-          end
+          # Because of the way backslashes get interpolated, we need to add
+          # some extra ones to cover all the cases.
+          text.gsub!(key, value.gsub(/\\/, '\\\\\\'))
         end
       end
 

data/lib/polytexnic/version.rb

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

data/spec/markdown_to_polytex_spec.rb

@@ -104,6 +104,11 @@ That is it.  You can keep writing your text after the footnote content.
         it { should include source }
       end
 
+      context "an accented character" do
+        let(:source) { "\\`{e}" }
+        it { should include source }
+      end
+
       context "a label and cross-reference" do
         let(:source) do <<-'EOS'
 # Chapter One
@@ -131,8 +136,15 @@ Chapter~\ref{cha:one}
 foo
 
 \begin{equation}
-\label{eq:phi}
-\phi = \frac{1+\sqrt{5}}{2}
+\label{eq:maxwell}
+\left.\begin{aligned}
+\nabla\cdot\mathbf{E} & = \rho \\
+\nabla\cdot\mathbf{B} & = 0 \\
+\nabla\times\mathbf{E} & = -\dot{\mathbf{B}} \\
+\nabla\times\mathbf{B} & = \mathbf{J} + \dot{\mathbf{E}}
+\end{aligned}
+\right\}
+\quad\text{Maxwell equations}
 \end{equation}
 
 bar
@@ -169,6 +181,20 @@ def foo; "bar"; end
         end
         it { should resemble '%= <<(/path/to/code)' }
       end
+
+      context "codelisting followed by a section" do
+        let(:source) do <<-'EOS'
+\begin{codelisting}
+\codecaption{Lorem ipsum.}
+\label{code:lorem}
+<<(/path/to/code)
+\end{codelisting}
+
+# Foo
+          EOS
+        end
+        it { should resemble '\chapter{Foo}' }
+      end
     end
 
     describe "source code" do

metadata

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