polytexnic 1.6.6 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e758ae9c4c23afe6aa06e9a916d9c41d207b8ded3da0c6e405e3e4b979c1864
-  data.tar.gz: 2e44dbade1df1aa4e573c87c10e5adf34c2939e8cfe3690234fa5404c9ebc679
+  metadata.gz: 6f107f6c8ed8c8ab715b2884c258ae3e8e2d723f2ee7ad38187df24d9b3ea760
+  data.tar.gz: 1c334bb78f696c00cb01c658b433b011fb5dcde1079a1f3526f9c342d346a31c
 SHA512:
-  metadata.gz: 3908f4a3795694c34c7c9443f475ca62662e9b6e3d8b0593641e8c42a5b99237fcc45e293704400eac7b243a813e814a898a560d4c9b6d51d08b0885afd77cc4
-  data.tar.gz: 7517c3f0636b7472568dbb0252c1ac1090c8554907868977a943b96b0ee5d689d81febbbefa4e6dba79536ce8c985bc406d47ddf5360f82b409e2dd80b20f33a
+  metadata.gz: c87e233ea55a9055fa682c9b1868cabf98a85b8c2e823b869aca8fdce5e77035a5d0f7999cafa56276becc48cdeb71c86a38b40160e00bed2cd948b54271fa4c
+  data.tar.gz: b0cda74d69d07212f9d0b928e851e1d2492d9838abc3484080539ecacb5a54a4e6772cfb730156edcd7e79ac99a2840a9173b2beb4bc8d2bd57833cad1ac32d6

data/Gemfile

@@ -16,7 +16,6 @@ Encoding.default_internal = Encoding::UTF_8
 gemspec
 
 group :test do
-  gem 'debugger2' unless RUBY_VERSION < "2.0"
   gem 'coveralls', require: false
   gem 'growl'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polytexnic (1.6.6)
+    polytexnic (1.7.2)
       json (~> 2.3.0)
       kramdown (>= 2.0, < 3.0)
       msgpack (~> 1.2.0)
@@ -12,21 +12,16 @@ GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.3)
-    columnize (0.9.0)
     coveralls (0.7.2)
       multi_json (~> 1.3)
       rest-client (= 1.6.7)
       simplecov (>= 0.7)
       term-ansicolor (= 1.2.2)
       thor (= 0.18.1)
-    debugger-linecache (1.2.0)
-    debugger2 (1.0.0.beta2)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.1.5)
-    ffi (1.15.3)
-    formatador (0.3.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
     growl (1.0.3)
     guard (2.18.0)
       formatador (>= 0.2.4)
@@ -43,20 +38,20 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     json (2.3.1)
-    kramdown (2.3.1)
+    kramdown (2.3.2)
       rexml
-    listen (3.7.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
+    mime-types-data (3.2022.0105)
     msgpack (1.2.10)
     multi_json (1.15.0)
     nenv (0.3.0)
-    nokogiri (1.12.4-x86_64-darwin)
+    nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -64,10 +59,10 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pygments.rb (2.2.0)
-    racc (1.5.2)
+    pygments.rb (2.3.0)
+    racc (1.6.0)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rest-client (1.6.7)
@@ -93,11 +88,10 @@ GEM
     tins (0.13.2)
 
 PLATFORMS
-  x86_64-darwin-20
+  x86_64-darwin-19
 
 DEPENDENCIES
   coveralls
-  debugger2
   growl
   guard-rspec
   polytexnic!
@@ -106,4 +100,4 @@ DEPENDENCIES
   simplecov (~> 0.15.1)
 
 BUNDLED WITH
-   2.2.17
+   2.3.10

data/lib/polytexnic/postprocessors/html.rb

@@ -792,7 +792,9 @@ module Polytexnic
           doc.xpath('//thinspace').each do |node|
             node.name  = 'span'
             node['class'] = 'thinspace'
-            node.inner_html = ' '
+            #   replaces  , which stopped working for some reason.
+            # Weirdly, it still works in the corresponding test.
+            node.inner_html = ' '
           end
           doc.xpath('//normalspace').each do |node|
             node.replace(' ')

data/lib/polytexnic/preprocessors/html.rb

@@ -28,11 +28,11 @@ module Polytexnic
             hyperrefs(output)
             title_fields(output)
             maketitle(output)
+            convert_longtable(output)
             label_names(output)
             image_names(output)
             restore_eq_labels(output)
             convert_float_centering(output)
-            convert_longtable(output)
             mark_environments(output)
             make_tabular_alignment_cache(output)
             cache_unicode(output)
@@ -279,8 +279,16 @@ module Polytexnic
         # 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\{longtable\}(\{.*?\})\n\s*((?:\\caption|\\label).*?)\\\\$/) do
+            "\\begin{table}\n#{$2}\n\\begin{tabular}#{$1}"
+          end
+          output.gsub!(/\\begin\{longtable\}(\{.*?\})/) do
+            "\\begin{table}\n\\begin{tabular}#{$1}"
+          end
+          output.gsub!(/((?:\\caption|\\label).*?$)\n\s*\\end\{longtable\}/) do
+            "\\end{tabular}#{$1}\n\\end{table}"
+          end
+          output.gsub!('\end{longtable}', "\\end{tabular}\n\\end{table}")
           output.gsub!(/\\begin\{tabularx\}\{.*?\}\{(.*)\}/) do
             alignment = $1.gsub('X', 'l')   # X becomes left-justified in HTML
             "\\begin{tabular}{#{alignment}}"

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "1.6.6"
+  VERSION = "1.7.2"
 end

data/spec/to_html/table_spec.rb

@@ -33,22 +33,6 @@ describe 'Polytexnic::Pipeline#to_html' do
       end
 
       it { should resemble output }
-
-      context "longtable" do
-
-        let(:polytex) do <<-'EOS'
-          \begin{longtable}{cc}
-          \hline
-          HTTP request & URL \\
-          \hline
-          GET & /users \\
-          GET & /users/1
-          \end{longtable}
-        EOS
-        end
-
-        it { should resemble output }
-      end
     end
 
     context "tabularx environments" do
@@ -194,6 +178,91 @@ describe 'Polytexnic::Pipeline#to_html' do
 
   describe "table environments" do
 
+    context "longtable" do
+
+      context "with caption on top" do
+
+        let(:polytex) do <<-'EOS'
+
+          \begin{longtable}{cc}
+          \caption{Test caption.\label{table:longtable}}\\
+          HTTP request & URL \\
+          GET & /users \\
+          GET & /users/1
+          \end{longtable}
+
+          Table~\ref{table:longtable}
+
+        EOS
+        end
+
+        let(:output) do <<-'EOS'
+<div id="table-longtable" data-tralics-id="uid1" data-number="1" class="table">
+  <table class="tabular">
+<tr><td class="align_center">HTTP request</td>
+<td class="align_center">URL</td>
+</tr><tr><td class="align_center">GET</td>
+<td class="align_center">/users</td>
+</tr><tr><td class="align_center">GET</td>
+<td class="align_center">/users/1</td>
+</tr></table>
+  <div class="caption">
+    <span class="header">Table 1: </span>
+    <span class="description">Test caption.
+</span>
+  </div>
+</div>
+<p>
+  <a href="#table-longtable" class="hyperref">Table <span class="ref">1</span></a>
+</p>
+          EOS
+        end
+
+        it { should resemble output }
+      end
+
+      context "with caption on bottom" do
+
+        let(:polytex) do <<-'EOS'
+
+          \begin{longtable}{cc}
+          HTTP request & URL \\
+          GET & /users \\
+          GET & /users/1
+          \caption{Test caption.\label{table:longtable}}
+          \end{longtable}
+
+          Table~\ref{table:longtable}
+
+        EOS
+        end
+
+        let(:output) do <<-'EOS'
+<div id="table-longtable" data-tralics-id="uid1" data-number="1" class="table">
+  <table class="tabular">
+<tr><td class="align_center">HTTP request</td>
+<td class="align_center">URL</td>
+</tr><tr><td class="align_center">GET</td>
+<td class="align_center">/users</td>
+</tr><tr><td class="align_center">GET</td>
+<td class="align_center">/users/1</td>
+</tr></table>
+  <div class="caption">
+    <span class="header">Table 1: </span>
+    <span class="description">Test caption.
+</span>
+  </div>
+</div>
+<p>
+  <a href="#table-longtable" class="hyperref">Table <span class="ref">1</span></a>
+</p>
+          EOS
+        end
+
+        it { should resemble output }
+      end
+    end
+
     context "with a label and a cross-reference" do
       let(:polytex) do <<-'EOS'
         \begin{table}
@@ -352,4 +421,4 @@ describe 'Polytexnic::Pipeline#to_html' do
 
     end
   end
-end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.7.2
 platform: ruby
 authors:
 - Michael Hartl
 - Nick Merwin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -293,7 +293,7 @@ homepage: https://github.com/softcover/polytexnic
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -308,8 +308,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Convert from PolyTeX & Markdown to HTML & LaTeX
 test_files: