polytexnic 1.6.4 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d7799a38185640239ca691d3139570d4abbb14a35fbf9c900946bff62cc41eb
-  data.tar.gz: 513c2c37e46535fd6abdd66448f6593daee2329be52c4768146205d74c0f17e6
+  metadata.gz: 57e941e13dd5f01d451a691ddfe12b2c0aec374936b6d3ab7b3e87bbb40b0155
+  data.tar.gz: 8713119cd89cb0a3ed59c89fe75fef408b4e529b511759605fe10f37906e59bb
 SHA512:
-  metadata.gz: 79102ce8772b68e4a4d25a3b7ff3db533f06fff37804ba87ec347a5be785d5a290731232aa94849b17e725080f84863b1108a218550e70fffea224b2163993e4
-  data.tar.gz: 4f0dc0d6b4d507bdab09071011f3168043d27627fdbe030d6ad2046531d8a6b544284f7aede474d6c13dd0bd4a91b02a77bc7c4427348eebed0669e56d0f9987
+  metadata.gz: 9745a0ed12d9980abd3155373e12a8d34547346d75685a0c2e3ae2489a6a774e9e5804ad57eeebb545bc4a8bfe267704a069fc86995585cfa9907d4f78f96e8b
+  data.tar.gz: 2fa3da2933f7a818ffcb4e7ba34737b422ea26e4362fbf3263f0c2c3a57f986bc189b6af0b873e4f5ee5429bd0f22e6972b5af8656e546cf533c09e9b157fa81

data/Gemfile

@@ -22,6 +22,6 @@ group :test do
 end
 
 group :development do
-  gem 'guard-rspec'
+  gem 'guard-rspec', require: false
   gem 'rake'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    polytexnic (1.6.4)
+    polytexnic (1.7.1)
       json (~> 2.3.0)
       kramdown (>= 2.0, < 3.0)
       msgpack (~> 1.2.0)
@@ -23,18 +23,18 @@ GEM
     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.0)
-    formatador (0.2.5)
+    ffi (1.15.5)
+    formatador (1.1.0)
     growl (1.0.3)
-    guard (2.16.2)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -45,18 +45,18 @@ GEM
     json (2.3.1)
     kramdown (2.3.1)
       rexml
-    listen (3.5.1)
+    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.0225)
+    mime-types-data (3.2022.0105)
     msgpack (1.2.10)
     multi_json (1.15.0)
     nenv (0.3.0)
-    nokogiri (1.11.3-x86_64-darwin)
+    nokogiri (1.13.2-x86_64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -64,10 +64,10 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pygments.rb (2.2.0)
-    racc (1.5.2)
-    rake (13.0.3)
-    rb-fsevent (0.10.4)
+    pygments.rb (2.3.0)
+    racc (1.6.0)
+    rake (13.0.6)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rest-client (1.6.7)
@@ -94,6 +94,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-19
+  x86_64-darwin-20
 
 DEPENDENCIES
   coveralls
@@ -106,4 +107,4 @@ DEPENDENCIES
   simplecov (~> 0.15.1)
 
 BUNDLED WITH
-   2.2.13
+   2.2.17

data/Guardfile

@@ -1,15 +1,10 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
 
-guard :rspec do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { "spec" }
-  ## Uncomment & edit below (and comment out above) to watch particular specs.
-  # watch(%r{^lib/(.+)\.rb$}) do
-  #   [
-  #     "spec/to_html/asides_spec.rb",
-  #     "spec/to_html/codelistings_spec.rb"
-  #   ]
-  # end
   watch('spec/spec_helper.rb')  { "spec" }
 end

data/lib/polytexnic/literal.rb

@@ -209,8 +209,10 @@ module Polytexnic
     # For completeness, we handle the case where the author neglects to
     # use the nonbreak space ~.
     def hyperrefs(string)
+      part     = language_labels["part"]
       chapter  = language_labels["chapter"]["word"]
       section  = language_labels["section"]
+      appendix = language_labels["appendix"]
       table    = language_labels["table"]
       box      = language_labels["aside"]
       figure   = language_labels["figure"]
@@ -218,7 +220,7 @@ module Polytexnic
       listing  = language_labels["listing"]
       equation = language_labels["equation"]
       eq       = language_labels["eq"]
-      linked_item = "(#{chapter}|#{section}|#{table}|#{box}|#{figure}" +
+      linked_item = "(#{part}|#{chapter}|#{section}|#{appendix}|#{table}|#{box}|#{figure}" +
                     "|#{fig}\.|#{listing}|#{equation}|#{eq}\.)"
       ref = /(?:#{linked_item}(~| ))*(\\(?:eq)*ref){(.*?)}/i
       string.gsub!(ref) do

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.4"
+  VERSION = "1.7.1"
 end

data/lib/polytexnic.rb

@@ -54,7 +54,7 @@ module Polytexnic
                           else
                             default_language_labels.merge(labels)
                           end
-      tempdir = 'tmp'                          
+      tempdir = 'tmp'
       FileUtils.mkdir(tempdir) unless File.directory?(tempdir)
       @highlight_cache_filename = File.join(tempdir, '.highlight_cache')
       if File.exist?(@highlight_cache_filename)
@@ -109,9 +109,9 @@ module Polytexnic
 
       # Returns the default labels for 'Chapter', 'Figure', etc.
       def default_language_labels
-        {"chapter"=>{"word"=>"Chapter", "order"=>"standard"},
-        "section"=>"Section", "table"=>"Table", "figure"=>"Figure",
-        "fig"=>"Fig", "aside"=>"Box", "listing"=>"Listing",
+        {"part"=>"Part","chapter"=>{"word"=>"Chapter", "order"=>"standard"},
+        "section"=>"Section", "appendix"=>"Appendix", "table"=>"Table",
+        "figure"=>"Figure", "fig"=>"Fig", "aside"=>"Box", "listing"=>"Listing",
         "equation"=>"Equation", "eq"=>"Eq", "frontmatter"=>"Frontmatter",
         "contents"=>"Contents"}
       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

data/spec/to_latex_spec.rb

@@ -149,11 +149,20 @@ end
 
     describe "hyperref links" do
       let(:polytex) do <<-'EOS'
-        Chapter~\ref{cha:foo}
+        Part~\ref{prt:foo}
+        Chapter~\ref{cha:bar}
+        Section~\ref{sec:baz}
+        Appendix~\ref{cha:quux}
         EOS
       end
-      let(:output) { '\hyperref[cha:foo]{Chapter~\ref{cha:foo}' }
-      it { should resemble output }
+      let(:part_ref)     { '\hyperref[prt:foo]{Part~\ref{prt:foo}' }
+      let(:chapter_ref)  { '\hyperref[cha:bar]{Chapter~\ref{cha:bar}' }
+      let(:section_ref)  { '\hyperref[sec:baz]{Section~\ref{sec:baz}' }
+      let(:appendix_ref) { '\hyperref[cha:quux]{Appendix~\ref{cha:quux}' }
+      it { should resemble part_ref }
+      it { should resemble chapter_ref }
+      it { should resemble section_ref }
+      it { should resemble appendix_ref }
     end
 
     describe "asides" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.7.1
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-01 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -308,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Convert from PolyTeX & Markdown to HTML & LaTeX