polytexnic 1.6.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5019c283b39dc25f4f2ff80cda181c78c5d77e37b7245faf92c51cfee93bc35
-  data.tar.gz: 2c8d5e978e45e28ec12f0b0010ad6f701d5982e15469fedc3291861b09132d2a
+  metadata.gz: d40834bb8a0205105739c3c347480faf14ddb63f64afeab9197e165d8b92bf5d
+  data.tar.gz: c8571137c2be72affefe7ff6f4b40770e1e4fc52a4c67b6b7e1ea1e0cddf45a5
 SHA512:
-  metadata.gz: 127fb2ef04c1d0a1d6848f0c8ad540cccc23c7bb7c680b9ea2460e63b74e699af5cf30b10f594d039f3464b43da088b9aa098c9274ba6f5ac020e50e85779e19
-  data.tar.gz: 6ed16fb665fdba858cce00d8c420dffc3f02284384ddd5830c7e3caccdf0b189c569c40c949dca7f85a060f239c9f4642261166d65cbd5612416ccb1088fe21c
+  metadata.gz: 8d2d76d36ba1dcbb41f5db7bde576cccc23c8db83886ce9146885a0abee32be8827e172fe3f5670d160d2ca29d2e0d39ecca22464cb49c7c05ad666dd72f50e9
+  data.tar.gz: 28688818b0a7ba361ad24c6e6cd7b807671e294cc0e8253e15b75c75bde1bfcf08e7401c258a3e1f80ccfbacf0e0dd7f338b17520bbe1f75bd00e8ee7c764379

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,9 +1,9 @@
 PATH
   remote: .
   specs:
-    polytexnic (1.6.3)
+    polytexnic (1.7.0)
       json (~> 2.3.0)
-      kramdown (>= 1.17, < 3.0)
+      kramdown (>= 2.0, < 3.0)
       msgpack (~> 1.2.0)
       nokogiri (>= 1.6.0, < 2.0)
       pygments.rb (~> 2.1)
@@ -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)
@@ -43,36 +43,36 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     json (2.3.1)
-    kramdown (2.3.0)
+    kramdown (2.3.1)
       rexml
-    listen (3.4.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.1-x86_64-darwin)
+    nokogiri (1.13.2-x86_64-darwin)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pygments.rb (2.1.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)
       mime-types (>= 1.16)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
@@ -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,13 +279,23 @@ 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((?:\\caption|\\label)\S*?$)/m) do
+            "\\begin{table}\n#{$2}\n\\begin{tabular}#{$1}"
+          end
+          output.gsub!(/\\begin\{longtable\}(\{.*?\})/m) do
+            "\\begin{table}\n\\begin{tabular}#{$1}"
+          end
+          output.gsub!(/((?:\\caption|\\label)\S*?$)\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}}"
           end
           output.gsub!('\end{tabularx}', '\end{tabular}')
+          # puts output
+          # puts '+' * 50
         end
 
         # Marks environments with their types.

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "1.6.3"
+  VERSION = "1.7.0"
 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/polytexnic.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'nokogiri', '>= 1.6.0', '< 2.0'
   gem.add_dependency 'pygments.rb', '~> 2.1'
   gem.add_dependency 'msgpack', '~> 1.2.0'
-  gem.add_dependency 'kramdown', '>= 1.17', '< 3.0'
+  gem.add_dependency 'kramdown', '>= 2.0', '< 3.0'
   gem.add_dependency 'json', '~> 2.3.0'
 
   gem.add_development_dependency 'rspec', '~> 2.14'

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,42 @@ describe 'Polytexnic::Pipeline#to_html' do
 
   describe "table environments" do
 
+      context "longtable" do
+
+        let(:polytex) do <<-'EOS'
+
+          \begin{longtable}{cc}
+          \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>
+            </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 a label and a cross-reference" do
       let(:polytex) do <<-'EOS'
         \begin{table}
@@ -352,4 +372,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.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -65,7 +65,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -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