polytexnic 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ba6efd240014302b4f6f6f9afbf261d4b79f313
-  data.tar.gz: e55cd520a1d7efc0cdfd3fdaf121004f1678f0e5
+  metadata.gz: a292613f26b5df5bb474ef756294b4ff1a9b6069
+  data.tar.gz: f3925c8503988094dbc563cad18bc476a660b75e
 SHA512:
-  metadata.gz: 9e4dd24c85820df23be2dc3b974a06686e069cfb7294df1d5b4a11ac93126dd06a727a04160b1c7a5ebe3a9fe7ab63d9273a9c6eb185c66d3e771331360ad4f8
-  data.tar.gz: 2cbe3f2f7d571e8f0cb494b07ff7de5f2c36a2626a45790130085144f274587d6529647bcbb0367834e6740ed0adcf7730116ef29284e80e56e1752cbe91ccf2
+  metadata.gz: c3659cd17693bbd70c6a93b2aad80a27db49d3b580ca06dd98601b3f5878484bc800909ebee5e2f016e0d3ffb5a7880eedc139760bcf370027db5ef01e981c04
+  data.tar.gz: 6e8c25794bff35cb1874eedf6982bc25646d77a02d1519d07de05e4e1646d724de0bb3de59b497575313a6ca28229d7a6724934bbefa57d5574279d75086e91d

data/lib/polytexnic/postprocessors/html.rb

@@ -681,8 +681,10 @@ module Polytexnic
               if title_element
                 type = %w{title subtitle}.include?(field) ? 'h1' : 'h2'
                 el = Nokogiri::XML::Node.new(type, doc)
-                raw = Polytexnic::Pipeline.new(title_element).to_html
-                content = Nokogiri::HTML.fragment(raw).at_css('p')
+                pipe = Polytexnic::Pipeline.new(title_element,
+                                                literal_cache: literal_cache)
+                raw_html = pipe.to_html
+                content = Nokogiri::HTML.fragment(raw_html).at_css('p')
                 unless (content.nil? && field == 'date')
                   el.inner_html = content.inner_html.strip
                   el['class'] = field
@@ -753,7 +755,8 @@ module Polytexnic
             if (head = node.css('h1 a, h2 a, h3 a').first)
               el = doc.create_element 'span'
               number = node['data-number']
-              prefix = (@cha.nil? || number.match(/\./)) ? '' : 'Chapter '
+              is_section = number.match(/\./)
+              prefix = (@cha.nil? || is_section) ? '' : "#{chaptername} "
               el.content = prefix + node['data-number'] + ' '
               el['class'] = 'number'
               chapter_name = head.children.first
@@ -791,6 +794,15 @@ module Polytexnic
           end
         end
 
+        # Returns the name to use for chapters.
+        # The default is 'Chapter', of course, but this can be overriden
+        # using '\renewcommand', especially in books other than Engilsh.
+        def chaptername
+          name_regex = /\\renewcommand\{\\chaptername\}\{(.*?)\}/
+          name = custom_commands.scan(name_regex).flatten.last
+          name || 'Chapter'
+        end
+
         # Returns the formatted number appropriate for the node.
         # E.g., "2.1" for a section.
         # Note: sets @cha as a side-effect. Yes, this is gross.

data/lib/polytexnic/preprocessors/html.rb

@@ -122,10 +122,10 @@ module Polytexnic
           lines = []
           in_table = false
           string.split("\n").each do |line|
-            in_table ||= (line =~ /^\s*\\begin{(?:tabular|longtable)}/)
+            in_table ||= (line =~ /^\s*\\begin{(?:tabularx?|longtable)}/)
             line.gsub!('\\\\', xmlelement('backslashbreak')) unless in_table
             lines << line
-            in_table = (in_table && line !~ /^\s*\\end{tabular}/)
+            in_table = (in_table && line !~ /^\s*\\end{tabularx?}/)
           end
           lines.join("\n")
         end
@@ -216,13 +216,19 @@ module Polytexnic
           output.replace(centered)
         end
 
-        # Converts the longtable environment to simple tabular.
-        # This is mainly because kramdown outputs longtables by default,
+        # Converts the alt table environments to simple tabular.
+        # This is was originaly because kramdown outputs longtables by default,
         # but as a side-effect you can also use longtables in PolyTeX
-        # input documents.
+        # input documents. The latest update includes support for the tabularx
+        # environment
         def convert_longtable(output)
           output.gsub!('\begin{longtable}', '\begin{tabular}')
           output.gsub!('\end{longtable}',   '\end{tabular}')
+          output.gsub!(/\\begin\{tabularx\}\{.*?\}\{(.*)\}/) do
+            alignment = $1.gsub('X', 'l')   # X becomes left-justified in HTML
+            "\\begin{tabular}{#{alignment}}"
+          end
+          output.gsub!('\end{tabularx}', '\end{tabular}')
         end
 
         # Marks environments with their types.
@@ -287,7 +293,7 @@ module Polytexnic
         # I've tried in vain to figure out WTF is going on in the Tralics
         # source, but it's easy enough in Ruby so I'm throwing it in here.
         def make_tabular_alignment_cache(output)
-          alignment_regex = /^\s*\\begin{tabular}{((?:\|*[lcr]+\|*)+)}/
+          alignment_regex = /^\s*\\begin{tabular}{\s*((?:\|*[lcr]+\|*)+)\s*}/
           @tabular_alignment_cache = output.scan(alignment_regex).flatten
         end
 

data/lib/polytexnic/preprocessors/polytex.rb

@@ -26,7 +26,7 @@ module Polytexnic
         require 'kramdown'
         cache = {}
         math_cache = {}
-        cleaned_markdown = cache_code_environments
+        cleaned_markdown = cache_code_environments(@source)
         puts cleaned_markdown if debug?
         cleaned_markdown.tap do |markdown|
           convert_code_inclusion(markdown, cache)
@@ -63,7 +63,9 @@ module Polytexnic
 
       # Caches literal LaTeX environments.
       def cache_latex_literal(markdown, cache)
-        Polytexnic::Literal.literal_types.each do |literal|
+        # Add tabular and tabularx support.
+        literal_types = Polytexnic::Literal.literal_types + %w[tabular tabularx]
+        literal_types.each do |literal|
           regex = /(\\begin\{#{Regexp.escape(literal)}\}
                   .*?
                   \\end\{#{Regexp.escape(literal)}\})
@@ -135,9 +137,9 @@ module Polytexnic
       # Caches Markdown code environments.
       # Included are indented environments, Leanpub-style indented environments,
       # and GitHub-style code fencing.
-      def cache_code_environments
+      def cache_code_environments(source)
         output = []
-        lines = @source.split("\n")
+        lines = source.split("\n")
         indentation = ' ' * 4
         while (line = lines.shift)
           if line =~ /\{lang="(.*?)"\}/

data/lib/polytexnic/version.rb

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

data/lib/polytexnic.rb

@@ -33,7 +33,7 @@ module Polytexnic
                   :custom_commands
 
     def initialize(source, options = {})
-      @literal_cache = {}
+      @literal_cache = options[:literal_cache] || {}
       @code_cache = {}
       @maketitle_elements = {}
       @highlight_cache_filename = '.highlight_cache'

data/spec/markdown_to_polytex_spec.rb

@@ -40,7 +40,7 @@ Lorem ipsum
       it { should_not include '\hypertarget' }
     end
 
-    describe "hyphenation" do
+    context "hyphenation" do
       let(:source) { 'profes\-sional' }
       it { should include source }
     end
@@ -302,6 +302,17 @@ def foo; "bar"; end
         end
         it { should resemble '\chapter{Foo}' }
       end
+
+      context "a tabular LaTeX environment" do
+        let(:source) do <<-'EOS'
+  \begin{tabularx}
+  a & b \\
+  c & d
+  \end{tabularx}
+          EOS
+        end
+        it { should resemble source }
+      end
     end
 
     describe "source code" do

data/spec/to_html/chapters_and_sections_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 
 describe 'Polytexnic::Pipeline#to_html' do
 
-  subject(:processed_text) { Polytexnic::Pipeline.new(polytex).to_html }
+  let(:pipeline) { Polytexnic::Pipeline.new(polytex) }
+  subject(:processed_text) { pipeline.to_html }
 
   describe '\chapter' do
     context "with a name" do
@@ -36,6 +37,25 @@ describe 'Polytexnic::Pipeline#to_html' do
       it { should resemble output }
     end
 
+    context "with an alternate to 'Chapter'" do
+      before do
+        pipeline.stub(:custom_commands).
+                 and_return('\renewcommand{\chaptername}{Chapitre}')
+      end
+      let(:polytex) do <<-'EOS'
+          \chapter{Foo \emph{bar}}
+          \label{cha:foo}
+        EOS
+      end
+      let(:output) do <<-'EOS'
+        <div id="cha-foo" data-tralics-id="cid1" class="chapter" data-number="1">
+          <h1><a href="#cha-foo" class="heading"><span class="number">Chapitre 1 </span>Foo <em>bar</em></a></h1>
+        </div>
+        EOS
+      end
+      it { should resemble output }
+    end
+
   end
 
   describe '\section' do

data/spec/to_html/core_spec.rb

@@ -96,7 +96,7 @@ describe 'Polytexnic::Pipeline#to_html' do
 
   describe '\maketitle' do
 
-    context "with all element filled out explicitly" do
+    context "with all elements filled out explicitly" do
       let(:polytex) do <<-'EOS'
           \title{Foo \\ \emph{Bar}}
           \subtitle{Baz}
@@ -124,6 +124,30 @@ describe 'Polytexnic::Pipeline#to_html' do
       end
     end
 
+    context "with Unicode" do
+      let(:polytex) do <<-'EOS'
+          \title{A könyv címe}
+          \subtitle{Alcím - itt lesz az alcím}
+          \author{Árvíztűrő fúrógép}
+          \date{January 1, 2013}
+          \begin{document}
+            \maketitle
+          \end{document}
+        EOS
+      end
+
+      it do
+        should resemble <<-'EOS'
+          <div id="title_page">
+            <h1 class="title">A k<span class="unicode">ö</span>nyv c<span class="unicode">í</span>me</h1>
+            <h1 class="subtitle">Alc<span class="unicode">í</span>m - itt lesz az alc<span class="unicode">í</span>m</h1>
+            <h2 class="author"><span class="unicode">Á</span>rv<span class="unicode">í</span>zt<span class="unicode">ű</span>r<span class="unicode">ő</span> f<span class="unicode">ú</span>r<span class="unicode">ó</span>g<span class="unicode">é</span>p</h2>
+            <h2 class="date">January 1, 2013</h2>
+          </div>
+        EOS
+      end
+    end
+
     context "when date is blank" do
       let(:polytex) do <<-'EOS'
           \title{Foo \\ \emph{Bar}}

data/spec/to_html/table_spec.rb

@@ -51,6 +51,35 @@ describe 'Polytexnic::Pipeline#to_html' do
       end
     end
 
+    context "tabularx environments" do
+      let(:polytex) do <<-'EOS'
+\begin{tabularx}{\textwidth}{ |l|l|l|l| }
+  \hline
+  label 1 & label 2 & label 3 & label 4 \\
+  \hline
+  item 1  & item 2  & item 3  & item 4  \\
+  \hline
+\end{tabularx}
+        EOS
+      end
+      let(:output) do <<-'EOS'
+<table class="tabular">
+  <tr class="top_border bottom_border"><td class="left_border align_left right_border">label 1</td>
+<td class="align_left right_border">label 2</td>
+<td class="align_left right_border">label 3</td>
+<td class="align_left right_border">label 4</td>
+</tr>
+  <tr class="bottom_border"><td class="left_border align_left right_border">item 1</td>
+<td class="align_left right_border">item 2</td>
+<td class="align_left right_border">item 3</td>
+<td class="align_left right_border">item 4</td>
+</tr>
+</table>
+        EOS
+      end
+      it { should resemble output }
+    end
+
     context "more complicated left-aligned cells with lines" do
       let(:polytex) do <<-'EOS'
         \begin{tabular}{|l|lll|}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -194,6 +194,7 @@ files:
 - .pull_requests/1386936855
 - .pull_requests/1387316123
 - .pull_requests/1387337421
+- .pull_requests/1387418273
 - .rspec
 - Gemfile
 - Guardfile