polytexnic 0.7.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a292613f26b5df5bb474ef756294b4ff1a9b6069
-  data.tar.gz: f3925c8503988094dbc563cad18bc476a660b75e
+  metadata.gz: f04fe1c74528b59323dcdceedb4f2ab42eed546e
+  data.tar.gz: 0f1971101aea1434ee769d1e788b2a68fdd658b3
 SHA512:
-  metadata.gz: c3659cd17693bbd70c6a93b2aad80a27db49d3b580ca06dd98601b3f5878484bc800909ebee5e2f016e0d3ffb5a7880eedc139760bcf370027db5ef01e981c04
-  data.tar.gz: 6e8c25794bff35cb1874eedf6982bc25646d77a02d1519d07de05e4e1646d724de0bb3de59b497575313a6ca28229d7a6724934bbefa57d5574279d75086e91d
+  metadata.gz: ebb92b98f47b6ac972556c4b04e6a61f1501efa266899061487918005a8f513a162c6b589991d755c15a3f27429b928e90c8f67c8286e53200b6c0465019d665
+  data.tar.gz: 30c0bcb1dacaf9b90c3dd8294273288591158c04e9288edacdc6eb9d6390b1d4b4c5aa8a1f7d46543eaf72e1bb236a488e0930d1df69aeccf78650cc94d6d5db

data/lib/polytexnic/postprocessors/html.rb

@@ -212,6 +212,14 @@ module Polytexnic
             node['class'] = 'inline_math'
             clean_node node, ['textype', 'type']
           end
+
+          # using \ensuremath
+          doc.xpath('//texmath[@textype="inline"]').each do |node|
+            node.name = 'span'
+            node.content = "\\( #{node.content} \\)"
+            node['class'] = 'inline_math'
+            clean_node node, ['textype', 'type']
+          end
         end
 
         # Handles frontmatter (if any).
@@ -531,6 +539,9 @@ module Polytexnic
               heading = 'h2'
             end
             if node['rend'] == 'nonumber'
+              # Add an id for linking based on the text of the section.
+              text = node.children.first.text
+              node['id'] = text.downcase.gsub(' ', '_')
               node['class'] += '-star'
             end
             clean_node node, %w{type rend}
@@ -885,8 +896,8 @@ module Polytexnic
         # Processes a graphic, including the description.
         def process_graphic(node, options={})
           klass = options[:klass]
-          node.name = 'div'
           raw_graphic = (node['rend'] == 'inline')
+          node.name = raw_graphic ? 'span' : 'div'
           unless raw_graphic
             if node['class']
               node['class'] += " #{klass}"
@@ -901,7 +912,7 @@ module Polytexnic
             filename = png_for_pdf(node['file'], node['extension'])
             alt = File.basename(node['file'])
             img = %(<img src="#{filename}" alt="#{alt}" />)
-            graphic = %(<div class="graphics">#{img}</div>)
+            graphic = %(<span class="graphics">#{img}</span>)
             graphic_node = Nokogiri::HTML.fragment(graphic)
             if description_node = node.children.first
               description_node.add_previous_sibling(graphic_node)
@@ -962,8 +973,10 @@ module Polytexnic
           full_caption['class'] = 'caption'
           n = node['data-number']
           if description_node = node.at_css('head')
-            h = %(<span class="header">#{name} #{n}: </span>)
-            d = %(<span class="description">#{description_node.inner_html}</span>)
+            content = description_node.inner_html
+            separator = content.empty? ? '' : ':'
+            h = %(<span class="header">#{name} #{n}#{separator} </span>)
+            d = %(<span class="description">#{content}</span>)
             description_node.remove
             full_caption.inner_html = Nokogiri::HTML.fragment(h + d)
           else
@@ -1126,6 +1139,14 @@ module Polytexnic
               end
               current_depth = 1
               insert_li(html, node)
+            when 'chapter-star'
+              html << '<ul>' if current_depth == 0
+              while current_depth > 1
+                close_list(html)
+                current_depth -= 1
+              end
+              current_depth = 1
+              insert_li(html, node)
             when 'section'
               open_list(html) if current_depth == 1
               while current_depth > 2

data/lib/polytexnic/preprocessors/polytex.rb

@@ -1,4 +1,65 @@
 # encoding=utf-8
+
+require 'kramdown'
+require 'securerandom'
+
+$cache = {}
+$label_salt = SecureRandom.hex
+
+module Kramdown
+  module Converter
+    class Latex < Base
+
+      # Converts `inline codespan`.
+      # This overrides kramdown's default to use `\kode` instead of `\tt`.
+      def convert_codespan(el, opts)
+        "\\kode{#{latex_link_target(el)}#{escape(el.value)}}"
+      end
+
+      # Overrides default convert_a.
+      # Unfortunately, kramdown is too aggressive in escaping characters
+      # in hrefs, converting
+      #     [foo bar](http://example.com/foo%20bar)
+      # into
+      #     \href{http://example.com/foo\%20bar}{foo bar}
+      # The '\%20' in the href then won't work properly.
+      def convert_a(el, opts)
+        url = el.attr['href']
+        if url =~ /^#/
+          "\\hyperlink{#{escape(url[1..-1])}}{#{inner(el, opts)}}"
+        else
+          "\\href{#{url}}{#{inner(el, opts)}}"
+        end
+      end
+
+      alias_method :original_convert_standalone_image, :convert_standalone_image
+
+      # Uses figures for images only when label is present.
+      # This allows users to put raw (centered) images in their documents.
+      # The default behavior of kramdown is to wrap such images in a figure
+      # environment, which causes LaTeX to (a) treat them as floats and (b)
+      # include a caption. This may not be what the user wants, and it's also
+      # nonstandard Markdown. On the other hand, it is really nice to be
+      # able to include captions using the default image syntax, so as a
+      # compromise we use Markdown behavior by default and kramdown behavior
+      # if the alt text contains a '\label' element.
+      def convert_standalone_image(el, opts, img)
+        alt_text = el.children.first.attr['alt']
+        if has_label?(alt_text)
+          original_convert_standalone_image(el, opts, img)
+        else
+          img.gsub('\includegraphics', '\image') + "\n"
+        end
+      end
+
+      # Detects if text has a label.
+      def has_label?(text)
+        text.include?($label_salt)
+      end
+    end
+  end
+end
+
 module Polytexnic
   module Preprocessor
     module Polytex
@@ -23,16 +84,14 @@ module Polytexnic
       # At this point, I fear that "Markdown" has become little more than a
       # marketing term.</rant>
       def to_polytex
-        require 'kramdown'
-        cache = {}
         math_cache = {}
         cleaned_markdown = cache_code_environments(@source)
         puts cleaned_markdown if debug?
         cleaned_markdown.tap do |markdown|
-          convert_code_inclusion(markdown, cache)
-          cache_latex_literal(markdown, cache)
-          cache_raw_latex(markdown, cache)
-          cache_image_locations(markdown, cache)
+          convert_code_inclusion(markdown)
+          cache_latex_literal(markdown)
+          cache_raw_latex(markdown)
+          cache_image_locations(markdown)
           puts markdown if debug?
           cache_math(markdown, math_cache)
         end
@@ -44,25 +103,24 @@ module Polytexnic
         puts kramdown.to_html if debug?
         puts kramdown.to_latex if debug?
         @source = kramdown.to_latex.tap do |polytex|
-                    remove_comments(polytex)
+                    remove_kramdown_comments(polytex)
                     convert_includegraphics(polytex)
-                    convert_tt(polytex)
                     restore_math(polytex, math_cache)
-                    restore_hashed_content(polytex, cache)
+                    restore_hashed_content(polytex)
                   end
       end
 
       # Adds support for <<(path/to/code) inclusion.
-      def convert_code_inclusion(text, cache)
+      def convert_code_inclusion(text)
         text.gsub!(/^\s*(<<\(.*?\))/) do
           key = digest($1)
-          cache[key] = "%= #{$1}"  # reduce to a previously solved case
+          $cache[key] = "%= #{$1}"  # reduce to a previously solved case
           key
         end
       end
 
       # Caches literal LaTeX environments.
-      def cache_latex_literal(markdown, cache)
+      def cache_latex_literal(markdown)
         # Add tabular and tabularx support.
         literal_types = Polytexnic::Literal.literal_types + %w[tabular tabularx]
         literal_types.each do |literal|
@@ -71,15 +129,16 @@ module Polytexnic
                   \\end\{#{Regexp.escape(literal)}\})
                   /xm
           markdown.gsub!(regex) do
-            key = digest($1)
-            cache[key] = $1
+            content = $1
+            key = digest(content)
+            $cache[key] = content
             key
           end
         end
       end
 
       # Caches raw LaTeX commands to be passed through the pipeline.
-      def cache_raw_latex(markdown, cache)
+      def cache_raw_latex(markdown)
         command_regex = /(
                           ^[ \t]*\\\w+.*\}[ \t]*$ # Command on line with arg
                           |
@@ -102,7 +161,9 @@ module Polytexnic
           content = $1
           puts content.inspect if debug?
           key = digest(content)
-          cache[key] = content
+          # Used to speed up has_label? in convert_standalone_image.
+          key += $label_salt if content.include?('\label')
+          $cache[key] = content
 
           if content =~ /\{table\}|\\caption\{/
             # Pad tables & captions with newlines for kramdown compatibility.
@@ -116,18 +177,18 @@ module Polytexnic
       # Caches the locations of images to be passed through the pipeline.
       # This works around a Kramdown bug, which fails to convert images
       # properly when their location includes a URL.
-      def cache_image_locations(text, cache)
+      def cache_image_locations(text)
         # Matches '![Image caption](/path/to/image)'
         text.gsub!(/^\s*(!\[.*?\])\((.*?)\)/) do
           key = digest($2)
-          cache[key] = $2
+          $cache[key] = $2
           "\n#{$1}(#{key})"
         end
       end
 
-      # Restores raw code from the cache
-      def restore_hashed_content(text, cache)
-        cache.each do |key, value|
+      # Restores raw code from the cache.
+      def restore_hashed_content(text)
+        $cache.each do |key, value|
           # Because of the way backslashes get interpolated, we need to add
           # some extra ones to cover all the cases of hashed LaTeX.
           text.gsub!(key, value.gsub(/\\/, '\\\\\\'))
@@ -177,20 +238,29 @@ module Polytexnic
         output.join("\n")
       end
 
-      # Converts \includegraphics to \image.
+      # Removes comments produced by kramdown.
+      # These have the special form of always being at the beginning of the
+      # line.
+      def remove_kramdown_comments(text)
+        text.gsub!(/^% (.*)$/, '')
+      end
+
+      # Converts \includegraphics to \image inside figures.
       # The reason is that raw \includegraphics is almost always too wide
       # in the PDF. Instead, we use the custom-defined \image command, which
       # is specifically designed to fix this issue.
       def convert_includegraphics(text)
-        text.gsub!('\includegraphics', '\image')
-      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}')
+        in_figure = false
+        newtext = text.split("\n").map do |line|
+          line.gsub!('\includegraphics', '\image') if in_figure
+          if line =~ /^\s*\\begin\{figure\}/
+            in_figure = true
+          elsif line =~ /^\s*\\end\{figure\}/
+            in_figure = false
+          end
+          line
+        end.join("\n")
+        text.replace(newtext)
       end
 
       # Caches math.
@@ -204,12 +274,12 @@ module Polytexnic
       # I personally hate this notation and convention, so we also support
       # LaTeX-style \( x \) and \[ x^2 - 2 = 0 \] notation.
       def cache_math(text, cache)
-        text.gsub!(/(?:\{\$\$\}\n(.*?)\n\{\/\$\$\}|\\\[(.*?)\\\])/) do
+        text.gsub!(/(?:\{\$\$\}\n(.*?)\n\{\/\$\$\}|\\\[(.*?)\\\])/m) do
           key = digest($1 || $2)
           cache[[:block, key]] = $1 || $2
           key
         end
-        text.gsub!(/(?:\{\$\$\}(.*?)\{\/\$\$\}|\\\((.*?)\\\))/) do
+        text.gsub!(/(?:\{\$\$\}(.*?)\{\/\$\$\}|\\\((.*?)\\\))/m) do
           key = digest($1 || $2)
           cache[[:inline, key]] = $1 || $2
           key
@@ -226,8 +296,8 @@ module Polytexnic
             open  = '\('
             close =  '\)'
           when :block
-            open  = '\[' + "\n"
-            close = "\n" + '\]'
+            open  = '\['
+            close = '\]'
           end
           text.gsub!(key, open + value + close)
         end

data/lib/polytexnic/utils.rb

@@ -164,12 +164,12 @@ module Polytexnic
     # We prepend rather than replace the styles because the Pygments output
     # 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 'softcover.sty' in the
-    # current directory
+    # it only gets made if there's a style in the 'softcover.sty' file.
     def add_font_info(string)
-      if File.exist?('softcover.sty')
+      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
+        styles = File.read(softcover_sty).scan(/#{regex}/).flatten.first
         string.gsub!("\\begin{Verbatim}[",
                      "\\begin{Verbatim}[#{styles},")
       end

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "0.7.7"
+  VERSION = "0.8.0"
 end

data/lib/polytexnic.rb

@@ -14,13 +14,17 @@ module Polytexnic
     'polytexnic_commands.sty'
   end
 
+  # Returns style file (including absolute path) within the gem.
+  def self.core_style_file
+    File.join(File.dirname(__FILE__), '..', style_file)
+  end
+
   # Writes the contents of the custom polytexnic style file.
   # This is used by the `generate` method in the `softcover` gem.
-  # We put it here because `custom.sty` lives inside `polytexnic`
+  # We put it here because `polytexnic_commands.sty` lives inside `polytexnic`
   # so that core can support, e.g., '\PolyTeXnic'.
   def self.write_polytexnic_style_file(dir)
-    csf = File.join(File.dirname(__FILE__), '..', style_file)
-    File.write(File.join(dir, style_file), File.read(csf))
+    File.write(File.join(dir, style_file), File.read(self.core_style_file))
   end
 
   class Pipeline
@@ -45,7 +49,7 @@ module Polytexnic
       @highlight_cache ||= {}
       @math_label_cache = {}
       @source_format = options[:source] || :polytex
-      @custom_commands = File.read(Polytexnic.style_file) rescue ''
+      @custom_commands = File.read(Polytexnic.core_style_file) rescue ''
       @custom_commands += "\n" + (options[:custom_commands] || '')
       @source = source
       if markdown?

data/spec/markdown_to_polytex_spec.rb

@@ -45,6 +45,18 @@ Lorem ipsum
       it { should include source }
     end
 
+    context "links" do
+      context "with normal text" do
+        let(:source) { '[foo](http://example.com/)' }
+        it { should include '\href{http://example.com/}{foo}' }
+      end
+
+      context "with a percent" do
+        let(:source) { '[foo bar](http://example.com/foo%20bar)' }
+        it { should include '\href{http://example.com/foo%20bar}{foo bar}' }
+      end
+    end
+
     describe "with math" do
 
       context "inline math" do
@@ -65,7 +77,7 @@ x^2
           EOS
         end
 
-        it { should resemble '\[ x^2 \]' }
+        it { should resemble '\[x^2\]' }
       end
     end
 
@@ -147,14 +159,39 @@ That is it.  You can keep writing your text after the footnote content.
         Polytexnic::Pipeline.new(markdown, source: :markdown).polytex
       end
 
+      context "inline" do
+        let(:markdown) { 'Inline ![Caption](img.png) image' }
+        it { should     include '\includegraphics{img.png}' }
+        it { should_not include '\image' }
+      end
+
+      context "with only a label" do
+        let(:markdown) do <<-'EOS'
+![\label{fig:softcover_server}](images/figures/softcover_server.png)
+          EOS
+        end
+        it { should include '\caption'  }
+      end
+
+      context "with alt text but no label" do
+        let(:markdown) do <<-'EOS'
+![Running the Softcover server in a separate tab.](images/figures/softcover_server.png)
+          EOS
+        end
+
+        it { should_not include '\begin{figure}' }
+        it { should_not include '\caption' }
+        it { should     include '\image' }
+      end
+
       context "with a caption and a label" do
         let(:markdown) do <<-'EOS'
 ![Running the Softcover server in a separate tab.\label{fig:softcover_server}](images/figures/softcover_server.png)
           EOS
         end
 
-        it { should include '\caption{Running the Softcover server in a separate tab.\label{fig:softcover_server}}' }
-        it { should include '\image' }
+        it { should     include '\caption{Running the Softcover server in a separate tab.\label{fig:softcover_server}}' }
+        it { should     include '\image' }
         it { should_not include '\includegraphics' }
       end
 
@@ -163,14 +200,14 @@ That is it.  You can keep writing your text after the footnote content.
 a screenshot from [Lowdown](http://lowdownapp.com/), a web
 application that developers use for organizing user stories.
 
-![Lowdown for user stories](https://tutorials.railsapps.org/assets/learn-rails-lowdown-partial.png)
+![Lowdown for user stories\label{fig:lowdown}](https://tutorials.railsapps.org/assets/learn-rails-lowdown-partial.png)
 
 Just like Rails provides a structure for building a web application,
 user stories provide a structure for organizing your product plan.
           EOS
         end
 
-        it { should include '\caption{Lowdown for user stories}' }
+        it { should include '\caption{Lowdown for user stories' }
         it { should include '\image{https://tutorials.railsapps.org' }
       end
 
@@ -215,11 +252,26 @@ Chapter~\ref{cha:one}
         it { should include source }
       end
 
+      context "an inline equation with a newline" do
+        let(:source) { '\( x' + "\n" + ' + y \) is a sum' }
+        it { should include source }
+      end
+
       context "a centered equation" do
         let(:source) { '\[ x^2 - 2 = 0 \] is an equation' }
         it { should resemble source }
       end
 
+      context "a centered equation with a newline" do
+        let(:source) do <<-'EOS'
+\[
+\left(\frac{p}{q}\right) \left(\frac{q}{p}\right) = (-1)^{[(p-1)/2][(q-1)/2]} \quad\text{($p$, $q$ distinct odd primes)}
+\]
+          EOS
+        end
+        it { should include source.chomp }
+      end
+
       context "an equation environment" do
         let(:source) do <<-'EOS'
 foo
@@ -274,7 +326,7 @@ def foo; "bar"; end
           EOS
         end
         it { should include '%= foo:bar' }
-        it { should_not resemble '\begin{codelisting}' }
+        it { should_not match /^\\begin\{code\}/ }
       end
 
       context "code inclusion inside codelisting" do
@@ -322,6 +374,11 @@ def foo; "bar"; end
         it { should include '\kode{foo bar}' }
       end
 
+      context "inline with a newline" do
+        let(:source) { "`foo\nbar`" }
+        it { should include "\\kode{foo\nbar}" }
+      end
+
       context "without highlighting" do
         let(:source) do <<-EOS
     def foo
@@ -337,7 +394,7 @@ end
 \end{verbatim}
           EOS
         end
-        it { should eq output }
+        it { should resemble output }
       end
 
       context "with highlighting" do

data/spec/to_html/chapters_and_sections_spec.rb

@@ -129,11 +129,11 @@ describe 'Polytexnic::Pipeline#to_html' do
 
   describe '\chapter*' do
     let(:polytex) do <<-'EOS'
-        \chapter*{Preface}
+        \chapter*{A preface}
         Lorem ipsum
       EOS
     end
-    it { should resemble '<div class="chapter-star">' }
+    it { should resemble '<div class="chapter-star" id="a_preface">' }
   end
 
   describe '\section*, etc.' do
@@ -148,8 +148,8 @@ describe 'Polytexnic::Pipeline#to_html' do
       EOS
     end
     let(:output) do <<-'EOS'
-      <div class="section-star">
-        <h2><a class="heading">Foo</a></h2>
+      <div class="section-star" id="foo">
+        <h2><a href="#foo" class="heading">Foo</a></h2>
         <div class="subsection-star">
           <h3><a class="heading">Bar</a></h3>
           <p>Lorem ipsum</p>
@@ -273,7 +273,7 @@ describe 'Polytexnic::Pipeline#to_html' do
     it do
       should resemble <<-'EOS'
 <div id="frontmatter" data-number="0">
-<div class="chapter-star"><h1><a class="heading">Foo</a></h1>
+<div class="chapter-star" id="foo"><h1><a href="#foo" class="heading">Foo</a></h1>
 <p>Lorem ipsum.<sup id="cha-0_footnote-ref-1" class="footnote"><a href="#cha-0_footnote-1">1</a></sup></p>
 </div></div>
 <div id="cha-0_footnotes">

data/spec/to_html/graphics_and_figures_spec.rb

@@ -7,15 +7,15 @@ describe 'Polytexnic::Pipeline#to_html' do
 
   describe "graphics" do
     let(:polytex) do <<-'EOS'
-      \includegraphics{foo.png}
+      foo \includegraphics{foo.png} bar
       EOS
     end
 
     it do
       should resemble <<-'EOS'
-        <div class="graphics">
-        <img src="foo.png" alt="foo" />
-        </div>
+        foo <span><span class="graphics">
+        <img src="foo.png" alt="foo" /></span>
+        </span>
       EOS
     end
     it { should_not resemble 'class="figure"' }
@@ -29,9 +29,9 @@ describe 'Polytexnic::Pipeline#to_html' do
 
       it do
         should resemble <<-'EOS'
-          <div class="graphics">
+          <span class="graphics">
           <img src="foo.png" alt="foo" />
-          </div>
+          </span>
         EOS
       end
     end
@@ -116,9 +116,9 @@ describe 'Polytexnic::Pipeline#to_html' do
       it do
         should resemble <<-'EOS'
           <div id="fig-foo" data-tralics-id="uid1" data-number="1" class="figure">
-          <div class="graphics">
+          <span class="graphics">
             <img src="images/foo.png" alt="foo" />
-          </div>
+          </span>
           <div class="caption">
             <span class="header">Figure 1</span>
           </div>
@@ -151,18 +151,18 @@ describe 'Polytexnic::Pipeline#to_html' do
             <span class="number">Chapter 1 </span>The chapter</a>
           </h1>
           <div id="uid1" data-tralics-id="uid1" data-number="1.1" class="figure">
-            <div class="graphics">
+            <span class="graphics">
               <img src="foo.png" alt="foo" />
-            </div>
+            </span>
             <div class="caption">
               <span class="header">Figure 1.1: </span>
               <span class="description">This is a <em>caption</em> with <span class="inline_math">\( x \)</span>.</span>
             </div>
           </div>
           <div id="uid2" data-tralics-id="uid2" data-number="1.2" class="figure">
-            <div class="graphics">
+            <span class="graphics">
               <img src="bar.png" alt="bar" />
-            </div>
+            </span>
             <div class="caption">
               <span class="header">Figure 1.2: </span>
               <span class="description">This is another caption.</span>
@@ -173,7 +173,21 @@ describe 'Polytexnic::Pipeline#to_html' do
       end
     end
 
-    context "with labels and cross-reference" do
+    context "with a caption containing only a label" do
+      let(:polytex) do <<-'EOS'
+        \chapter{The chapter}
+
+        \begin{figure}
+        \includegraphics{foo.png}
+        \caption{\label{fig:foo}}
+        \end{figure}
+         EOS
+       end
+       it { should     include 'Figure 1.1' }
+       it { should_not include 'Figure 1.1:' }
+     end
+
+    context "with labels and cross-references" do
       let(:polytex) do <<-'EOS'
         \chapter{The chapter}
         \label{cha:lorem_ipsum}
@@ -210,18 +224,18 @@ describe 'Polytexnic::Pipeline#to_html' do
             <span class="number">Chapter 1 </span>The chapter</a>
           </h1>
           <div id="fig-foo" data-tralics-id="uid1" data-number="1.1" class="figure">
-            <div class="graphics">
+            <span class="graphics">
               <img src="foo.png" alt="foo" />
-            </div>
+            </span>
             <div class="caption">
               <span class="header">Figure 1.1: </span>
               <span class="description">This is a caption.</span>
             </div>
           </div>
           <div id="fig-bar" data-tralics-id="uid2" data-number="1.2" class="figure">
-            <div class="graphics">
+            <span class="graphics">
               <img src="bar.png" alt="bar" />
-            </div>
+            </span>
             <div class="caption">
               <span class="header">Figure 1.2: </span>
               <span class="description">This is another caption.</span>
@@ -237,9 +251,9 @@ describe 'Polytexnic::Pipeline#to_html' do
             <span class="number">Chapter 2 </span>A second chapter</a>
           </h1>
           <div id="fig-baz" data-tralics-id="uid3" data-number="2.1" class="figure">
-            <div class="graphics">
+            <span class="graphics">
               <img src="baz.png" alt="baz" />
-            </div>
+            </span>
             <div class="caption">
               <span class="header">Figure 2.1: </span>
               <span class="description">Yet another.</span>
@@ -275,9 +289,9 @@ describe 'Polytexnic::Pipeline#to_html' do
               <span class="number">Chapter 1 </span>The chapter</a>
             </h1>
             <div class="center figure" id="fig-foo" data-tralics-id="uid1" data-number="1.1">
-              <div class="graphics">
+              <span class="graphics">
                 <img src="foo.png" alt="foo" />
-              </div>
+              </span>
               <div class="caption">
                 <span class="header">Figure 1.1: </span>
                 <span class="description">This is a caption.</span>

data/spec/to_html/literal_environments/math_spec.rb

@@ -61,9 +61,9 @@ describe Polytexnic::Pipeline do
     end
 
     context "LaTeX inline" do
-      let(:equation) { "\\( #{math} \\)"}
+      let(:equation) { "\\( #{math} \\)" }
       let(:polytex)  { equation }
-      let(:contents) { "\\( #{result} \\)"}
+      let(:contents) { "\\( #{result} \\)" }
 
       it { should resemble contents }
     end
@@ -73,6 +73,14 @@ describe Polytexnic::Pipeline do
       let(:contents) { "<p>foo <span class=\"inline_math\">\\( x \\)</span> bar" }
       it { should include contents }
     end
+
+    context 'using \ensuremath' do
+      let(:math) { 'x^2 + y' }
+      let(:equation) { "\\ensuremath{#{math}}" }
+      let(:polytex)  { equation }
+      let(:contents) { "\\( #{math} \\)" }
+      it { should include contents }
+    end
   end
 
   describe "multiple occurrences of inline math on one line" do

data/spec/to_html/table_of_contents_spec.rb

@@ -8,6 +8,9 @@ describe 'Polytexnic::Pipeline#to_html' do
   describe '\chapter' do
     let(:polytex) do <<-'EOS'
         \tableofcontents
+
+        \chapter*{A preface}
+
         \chapter{Foo}
         \label{cha:foo}
 
@@ -33,6 +36,7 @@ describe 'Polytexnic::Pipeline#to_html' do
 <h1 class="contents">Contents</h1>
 <div id="table_of_contents">
 <ul>
+  <li class="chapter-star"><a href="#a_preface" class="heading hyperref">A preface</a></li>
   <li class="chapter"><a href="#cha-foo" class="heading hyperref"><span class="number">Chapter 1 </span>Foo</a></li>
   <li>
     <ul>
@@ -61,28 +65,28 @@ describe 'Polytexnic::Pipeline#to_html' do
 
       it { should_not be_empty }
 
-      it "should have a 'depth' attribute" do
+      it "should have a nil 'depth' attribute" do
         expect(toc.first['depth']).to be_nil
       end
 
       it "should have a link to the first chapter" do
-        expect(toc.css('li>a')[0]['href']).to eq '#cha-foo'
+        expect(toc.css('li>a')[1]['href']).to eq '#cha-foo'
       end
 
       it "should have a link to the first section" do
-        expect(toc.css('li>a')[1]['href']).to eq '#sec-bar'
+        expect(toc.css('li>a')[2]['href']).to eq '#sec-bar'
       end
 
       it "should have a link to the first subsection" do
-        expect(toc.css('li>a')[2]['href']).to eq '#sec-baz'
+        expect(toc.css('li>a')[3]['href']).to eq '#sec-baz'
       end
 
       it "should have a link to the second section" do
-        expect(toc.css('li>a')[3]['href']).to eq '#sec-quux'
+        expect(toc.css('li>a')[4]['href']).to eq '#sec-quux'
       end
 
       it "should have a link to the second chapter" do
-        expect(toc.css('li>a')[4]['href']).to eq '#cha-lorem'
+        expect(toc.css('li>a')[5]['href']).to eq '#cha-lorem'
       end
 
       it "should have the right number of lists" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -195,6 +195,13 @@ files:
 - .pull_requests/1387316123
 - .pull_requests/1387337421
 - .pull_requests/1387418273
+- .pull_requests/1387507486
+- .pull_requests/1387590643
+- .pull_requests/1387944167
+- .pull_requests/1388090414
+- .pull_requests/1388112504
+- .pull_requests/1388430185
+- .pull_requests/1388440664
 - .rspec
 - Gemfile
 - Guardfile