polytexnic 1.0.4 → 1.1.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e812469333e68109d96244adf80a48a7d4cc8781
-  data.tar.gz: e1ceeb948af7c61c87b82426e5d4d06bd302f81f
+  metadata.gz: de97a8848a323aaaa3558b8cac21a2273404b1f8
+  data.tar.gz: 3064c4792f08d5812d9ad45e699861e03377994e
 SHA512:
-  metadata.gz: c6361e2a8fa0a28b3ff4c3dcd1fdf8923c3c656fe46d1ab2efc20fe8043a83274f5375ad6bef87da5ead99ce9cf91cbec5c002f60951b024beaa8c830c4cd40b
-  data.tar.gz: 20e0983f8e029ce8d313913a72da0cda32bcffdd51cf5b420dcd7e55cdcf4d6aa61ec94c5a151b1d4b220cd6c03adcf3953d39cb860f09abc5ad18ccc13dc74e
+  metadata.gz: 4b617bb00aef112924e92c74e297d11a2375472b95b676f59792da1f973c1707ec2d6613872972e8f6353b2db0d2bbd2e9fc139bde84040c5dfdbdb2dcb1638d
+  data.tar.gz: c92ea88a740e56f74300246670e37777220a0e7e797ad84b0a98aa6832537b3ed06ef0388019bc8c845db7b4615ff33dceb03b1634f2a5bc62e8dc7e587f139b

data/lib/polytexnic/postprocessors/html.rb

@@ -390,6 +390,7 @@ module Polytexnic
         # so recursively search the parents to find it.
         # Then return the first number in the value, e.g., "1" in "1.2".
         def chapter_number(node)
+          return 0 if article?
           number = node['data-number']
           if number && !number.empty?
             number.split('.').first.to_i
@@ -410,12 +411,12 @@ module Polytexnic
 
         # Returns HTML for a nicely styled TeX logo.
         def tex
-          %(<span class="texhtml">T<span class="texhtmlE">E</span>X</span>)
+          %(<span class="texhtml" style="font-family: 'CMU Serif', cmr10, LMRoman10-Regular, 'Times New Roman', 'Nimbus Roman No9 L', Times, serif;">T<span style="text-transform: uppercase; vertical-align: -0.5ex; margin-left: -0.1667em; margin-right: -0.125em;">E</span>X</span>)
         end
 
         # Returns HTML for a nicely styled LaTeX logo.
         def latex
-          %(<span class="texhtml">L<span class="texhtmlA">A</span>T<span class="texhtmlE">E</span>X</span>)
+          %(<span class="texhtml" style="font-family: 'CMU Serif', cmr10, LMRoman10-Regular, 'Times New Roman', 'Nimbus Roman No9 L', Times, serif;">L<span style="text-transform: uppercase; font-size: 70%; margin-left: -0.36em; vertical-align: 0.3em; line-height: 0; margin-right: -0.15em;">A</span>T<span style="text-transform: uppercase; margin-left: -0.1667em; vertical-align: -0.5ex; line-height: 0; margin-right: -0.125em;">E</span>X</span>)
         end
 
         # Handles \begin{quote} ... \end{quote}.
@@ -494,11 +495,12 @@ module Polytexnic
               label = node.at_css('data-label')
               node['id'] = pipeline_label(label)
               unexpected.remove
+              clean_node node, %w{data-label}
             elsif label = node.at_css('data-label')
               node['id'] = pipeline_label(label)
               label.remove
+              clean_node node, %w{data-label}
             end
-            clean_node node, %w{data-label place}
           end
           doc.xpath('//table').each do |node|
             if unexpected = node.at_css('unexpected')
@@ -666,6 +668,7 @@ module Polytexnic
           heading['class'] = 'heading'
 
           number = heading.at_css('strong')
+          number.content = number.content.sub!('0.', '') if article?
           number.name = 'span'
           number['class'] = 'number'
           if css_class == 'codelisting'
@@ -896,7 +899,7 @@ module Polytexnic
             @equation = 0
             @figure = 0
             @table = 0
-            @cha = node['id-text']
+            @cha = article? ? nil : node['id-text']
           elsif node['class'] == 'section'
             @sec = node['id-text']
             label_number(@cha, @sec)
@@ -914,7 +917,8 @@ module Polytexnic
             end
             label_number(@cha, @equation)
           elsif node['class'] == 'codelisting'
-            node['id-text']
+            @listing = number_from_id(node['id-text'])
+            label_number(@cha, @listing)
           elsif node['class'] == 'aside'
             node['id-text']
           elsif node.name == 'table' && node['id-text']
@@ -934,6 +938,17 @@ module Polytexnic
           end
         end
 
+        # Extract the sequential number from the node id.
+        # I.e., number_from_id('2.3') -> '3'
+        def number_from_id(id)
+          id.split('.')[1]
+        end
+
+        # Returns true if pipeline was called on an article document.
+        def article?
+          !!article
+        end
+
         # Returns a label number for use in headings.
         # For example, label_number("1", "2") returns "1.2".
         def label_number(*args)

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "1.0.4"
+  VERSION = "1.1.beta1"
 end

data/lib/polytexnic.rb

@@ -38,13 +38,15 @@ module Polytexnic
 
     attr_accessor :literal_cache, :code_cache, :polytex, :xml, :html,
                   :math_label_cache, :highlight_cache, :maketitle_elements,
-                  :custom_commands, :language_labels, :unicode_cache
+                  :custom_commands, :language_labels, :unicode_cache,
+                  :article
 
     def initialize(source, options = {})
       @literal_cache = options[:literal_cache] || {}
       @unicode_cache = {}
       @code_cache = {}
       @maketitle_elements = {}
+      @article = options[:article]
       @language_labels = if (labels = options[:language_labels]).nil?
                             default_language_labels
                           else

data/spec/articles_spec.rb

@@ -0,0 +1,90 @@
+# encoding=utf-8
+require 'spec_helper'
+
+describe "articles" do
+  let(:pipeline) { Polytexnic::Pipeline.new(polytex, article: true) }
+  subject(:processed_text) { pipeline.to_html }
+
+  let(:polytex) do <<-'EOS'
+      Lorem ipsum
+      \section{Foo}
+      \label{sec:foo}
+
+      \begin{figure}
+      lorem
+      \label{fig:foo}
+      \end{figure}
+
+      \begin{table}
+      \begin{tabular}{cc}
+      HTTP request & URL \\
+      GET & /users \\
+      GET & /users/1
+      \end{tabular}
+      \label{table:foo}
+      \end{table}
+
+      \begin{codelisting}
+      \codecaption{Creating a \texttt{gem} configuration file. \\ \filepath{path/to/file}}
+      \label{code:create_gemrc}
+      %= lang:console
+      \begin{code}
+$ subl .gemrc
+      \end{code}
+      \end{codelisting}
+
+      Listing~\ref{code:create_gemrc}\footnote{asdfasdf}
+
+      Section~\ref{sec:foo}
+
+      Figure~\ref{fig:foo}
+    EOS
+  end
+  let(:section)   { '<a href="#sec-foo" class="heading"><span class="number">1 </span>' }
+  let(:figure)    { '<span class="header">Figure 1</span>' }
+  let(:table)     { '<span class="header">Table 1</span>' }
+  let(:listing)   { '<span class="number">Listing 1:</span>' }
+  let(:footnote)  { '<sup id="cha-0_footnote-ref-1" class="footnote"><a href="#cha-0_footnote-1">1</a></sup>' }
+
+  let(:sref) { 'Section <span class="ref">1</span>' }
+  let(:fref) { 'Figure <span class="ref">1</span>' }
+  let(:lref) { 'Listing <span class="ref">1</span>' }
+  let(:fntext) { 'asdfasdf' }
+
+  describe "section" do
+    describe "numbering" do
+      it { should include section }
+    end
+    describe "xref" do
+      it { should resemble sref }
+    end
+  end
+
+  describe "figure" do
+    describe "numbering" do
+      it { should include figure }
+    end
+    describe "xref" do
+      it { should resemble fref }
+    end
+  end
+
+  describe "listing" do
+    describe "numbering" do
+      it { should include listing }
+    end
+    describe "xref" do
+      it { should resemble lref }
+    end
+  end
+
+  describe "footnote" do
+    it { should include '<ol class="footnotes">' }
+    describe "numbering" do
+      it { should include footnote }
+    end
+    describe "footnote text" do
+      it { should include fntext }
+    end
+  end
+end

data/spec/to_html/chapters_and_sections_spec.rb

@@ -108,11 +108,13 @@ describe 'Polytexnic::Pipeline#to_html' do
 
   describe '\section' do
     let(:polytex) do <<-'EOS'
+        Lorem ipsum
         \section{Foo}
         \label{sec:foo}
       EOS
     end
     let(:output) do <<-'EOS'
+      <p>Lorem ipsum</p>
       <div id="sec-foo" data-tralics-id="cid1" class="section" data-number="1">
         <h2><a href="#sec-foo" class="heading"><span class="number">1 </span>Foo</a></h2>
       </div>
@@ -333,4 +335,4 @@ describe 'Polytexnic::Pipeline#to_html' do
       EOS
     end
   end
-end
+end

data/spec/to_html/characters_and_punctuation_spec.rb

@@ -116,7 +116,7 @@ describe 'Polytexnic::Pipeline#to_html' do
     describe "TeX logo" do
       let(:polytex) { '\TeX' }
       let(:output) do
-        %(<span class="texhtml">T<span class="texhtmlE">E</span>X</span>)
+        %(<span class="texhtml" style="font-family: 'CMU Serif', cmr10, LMRoman10-Regular, 'Times New Roman', 'Nimbus Roman No9 L', Times, serif;">T<span style="text-transform: uppercase; vertical-align: -0.5ex; margin-left: -0.1667em; margin-right: -0.125em;">E</span>X</span>)
       end
       it { should include(output) }
     end
@@ -124,7 +124,7 @@ describe 'Polytexnic::Pipeline#to_html' do
     describe "LaTeX logo" do
       let(:polytex) { '\LaTeX' }
       let(:output) do
-        %(<span class="texhtml">L<span class="texhtmlA">A</span>T<span class="texhtmlE">E</span>X</span>)
+        %(<span class="texhtml" style="font-family: 'CMU Serif', cmr10, LMRoman10-Regular, 'Times New Roman', 'Nimbus Roman No9 L', Times, serif;">L<span style="text-transform: uppercase; font-size: 70%; margin-left: -0.36em; vertical-align: 0.3em; line-height: 0; margin-right: -0.15em;">A</span>T<span style="text-transform: uppercase; margin-left: -0.1667em; vertical-align: -0.5ex; line-height: 0; margin-right: -0.125em;">E</span>X</span>)
       end
       it { should include(output) }
     end
@@ -132,7 +132,7 @@ describe 'Polytexnic::Pipeline#to_html' do
     describe "PolyTeX logo" do
       let(:polytex) { '\PolyTeX' }
       let(:output) do
-        %(Poly<span class="texhtml">T<span class="texhtmlE">E</span>X</span>)
+        %(Poly<span class="texhtml" style="font-family: 'CMU Serif', cmr10, LMRoman10-Regular, 'Times New Roman', 'Nimbus Roman No9 L', Times, serif;">T<span style="text-transform: uppercase; vertical-align: -0.5ex; margin-left: -0.1667em; margin-right: -0.125em;">E</span>X</span>)
       end
       it { should include(output) }
     end
@@ -140,7 +140,7 @@ describe 'Polytexnic::Pipeline#to_html' do
     describe "PolyTeXnic logo" do
       let(:polytex) { '\PolyTeXnic' }
       let(:output) do
-        %(Poly<span class="texhtml">T<span class="texhtmlE">E</span>X</span>nic)
+        %(Poly<span class="texhtml" style="font-family: 'CMU Serif', cmr10, LMRoman10-Regular, 'Times New Roman', 'Nimbus Roman No9 L', Times, serif;">T<span style="text-transform: uppercase; vertical-align: -0.5ex; margin-left: -0.1667em; margin-right: -0.125em;">E</span>X</span>nic)
       end
       it { should include(output) }
     end

data/spec/to_html/graphics_and_figures_spec.rb

@@ -84,7 +84,7 @@ describe 'Polytexnic::Pipeline#to_html' do
 
     context "with a label and a cross-reference" do
       let(:polytex) do <<-'EOS'
-        \begin{figure}[h]
+        \begin{figure}
         lorem
         \label{fig:foo}
         \end{figure}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.beta1
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -232,6 +232,7 @@ files:
 - precompiled_binaries/tralics-os-x-newer
 - precompiled_binaries/tralics-os-x-older
 - precompiled_binaries/tralics-x86_64-linux
+- spec/articles_spec.rb
 - spec/fixtures/code_listing.tex
 - spec/fixtures/figures.tex
 - spec/fixtures/inline_math.html
@@ -286,9 +287,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -296,6 +297,7 @@ signing_key:
 specification_version: 4
 summary: Convert from PolyTeX & Markdown to HTML & LaTeX
 test_files:
+- spec/articles_spec.rb
 - spec/fixtures/code_listing.tex
 - spec/fixtures/figures.tex
 - spec/fixtures/inline_math.html