polytexnic 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a1c7003b9fa43e3d490c92befeba4a3948f572a
-  data.tar.gz: 54c84b2a31f51ae4adf613b942aa636fecf46b7d
+  metadata.gz: 20eff55f552aa33edc42c9d1df10e80603e169a6
+  data.tar.gz: e9e75b8db8e6aa736b01c6cd4ceb3bc78c80a45c
 SHA512:
-  metadata.gz: 56509778d7a1d999ff55e388412dcabea687df7ced9b82f83be7ef8d5d0dddc4c18ecdbe98953b03f8af6da99a22637c96f28ba1b3cca4a88310368ecb9b2366
-  data.tar.gz: 3d54cc5bdd12b73d812a06c2fc17d2547886410ab86b3ecf690db5aeeabfd20a68f385e65f87990fb33458083a02fc73aa447d4877ca48f0cc1c32ef1873769e
+  metadata.gz: 6d70789193aad48f82922538bc32f057cff70196a8236299934eb23460ab261a0abd50a7235e77495f445c02ce16962688913ca435805ea5e2389bcfcbb776f5
+  data.tar.gz: 5ee52faf11ef19c52424795cb56dac1e7a9f746b97ee7f88ee969f0253f9e6ce1286ce34146a9f33f9ee210ce694e80e08b128590cb9ed6388da7e8c7b4cfde6

data/lib/polytexnic/postprocessors/html.rb

@@ -195,9 +195,11 @@ module Polytexnic
             # convention is not to indent paragraphs anyway, but we want to
             # support that case for completeness (mainly because Tralics does).
               next_paragraph = node.next_sibling
+              # Check to make sure it's a paragraph.
+              raise unless next_paragraph.name == 'p'
               next_paragraph['noindent'] = 'true'
             rescue
-              # We rescue nil in case the math isn't followed by any text.
+              # We rescue nil in case the math isn't followed by a paragraph.
               nil
             end
           end
@@ -949,6 +951,7 @@ module Polytexnic
             @equation = 0
             @figure = 0
             @table = 0
+            @aside = 0
             @cha = article? ? nil : node['id-text']
           elsif node['class'] == 'section'
             @sec = node['id-text']
@@ -960,34 +963,28 @@ module Polytexnic
             @ssubsec = node['id-text']
             label_number(@cha, @sec, @subsec, @ssubsec)
           elsif node['textype'] == 'equation'
-            if @cha.nil?
-              @equation = node['id-text']
-            else
-              @equation += 1
-            end
+            @equation = ref_number(node, @cha, @equation)
             label_number(@cha, @equation)
           elsif node['class'] == 'codelisting'
             @listing = number_from_id(node['id-text'])
             label_number(@cha, @listing)
           elsif node['class'] == 'aside'
-            node['id-text']
+            @aside = @cha.nil? ? number_from_id(node['id-text']) : @aside + 1
+            label_number(@cha, @aside)
           elsif node.name == 'table' && node['id-text']
-            if @cha.nil?
-              @table = node['id-text']
-            else
-              @table += 1
-            end
+            @table = ref_number(node, @cha, @table)
             label_number(@cha, @table)
           elsif node.name == 'figure'
-            if @cha.nil?
-              @figure = node['id-text']
-            else
-              @figure += 1
-            end
+            @figure = ref_number(node, @cha, @figure)
             label_number(@cha, @figure)
           end
         end
 
+        # Returns the reference number (i.e., the 'x' in '2.x').
+        def ref_number(node, chapter, object)
+          chapter.nil? ? node['id-text'] : object + 1
+        end
+
         # Extract the sequential number from the node id.
         # I.e., number_from_id('2.3') -> '3'
         def number_from_id(id)

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/spec/to_html/asides_spec.rb

@@ -50,4 +50,30 @@ describe 'Polytexnic::Pipeline#to_html' do
       it { should include 'Cajón 1.1' }
     end
   end
+
+  describe "aside cross-references" do
+    let(:aside) do <<-'EOS'
+        \begin{aside}
+        \heading{Lorem ipsum.}
+        \label{aside:lorem}
+
+        lorem ipsum
+
+        dolor sit amet
+
+        \end{aside}
+
+        Box~\ref{aside:lorem}
+      EOS
+    end
+    context "in a chapter" do
+      let(:polytex) { '\chapter{Foo bar}' + "\n" + aside}
+      it { should include ">1.1<" }
+    end
+
+    context "in an article" do
+      let(:polytex) { '\section{A section}' + "\n" + aside }
+      it { should include ">1<" }
+    end
+  end
 end

data/spec/to_html/literal_environments/math_spec.rb

@@ -158,6 +158,37 @@ describe Polytexnic::Pipeline do
       it { should resemble '<p class="noindent">ipsum' }
     end
 
+    context "followed by a code listing" do
+      let(:polytex) do <<-'EOS'
+author be technical. (If you know how to use a command line and have a favorite text editor, you are technical enough to use Softcover.)
+
+\begin{equation}
+\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}
+
+\begin{codelisting}
+\label{code:eval}
+\codecaption{The caption.}
+%= lang:scheme
+\begin{code}
+;; Implements Lisp in Lisp.
+;; Alan Kay called this feat "Maxwell's equations of software", because just as
+\end{code}
+\end{codelisting}
+
+        EOS
+      end
+      it { should_not resemble 'noindent="true"' }
+    end
+
     describe "align" do
       let(:equation) do <<-'EOS'
         \begin{align}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri