polytexnic 1.5.14 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e4e57065af409b7eb58f284e648d5868d04fc7d207c77a823e2bcb8a7e84958
-  data.tar.gz: 19f51c672304bf134250ecb2ea485014c649d7f4741e230383afc88c60840c00
+  metadata.gz: 7811a66c9d17ae4c458e5ae584f9d5c7b5d967aa6c6405a34b3e5203c4923e2b
+  data.tar.gz: f50df8db56ef4f75072f4ae6fb094f5cc3e9165a0f982db1f09c4e4c01dd7619
 SHA512:
-  metadata.gz: 862fda861d2ef4c6afcc356478ca6d9ec7541c1670670611322c433aa7c669abbe924c4cb2452f124bf636a5241e24639df4fd466486368bea33222b29410c26
-  data.tar.gz: efdc9c5a4f1d2dac32e4c31321072270cd4bd3c0cbbf4486d38959df61d51dd8ec9a6b157c70410721386b74485e85a8091e98423ddd6f10741861a905d9c6d1
+  metadata.gz: b62df40cecb2a8c2e94a4afcbbb74c013f2395963a405c2f4a6bb7ae859d3325c458e6a1622e6a8aee0eafe72a9b34ecf4789bc8e90bcd65f4c17b6c13dfc4cd
+  data.tar.gz: 5d64cc55e439a0588090320c7911415e75d6267d2d00280fabfd06d92418431cb9cf829303de8b26604fc305a5a2decedd1bd354372559551d31c9e152cdd937

data/Gemfile

@@ -24,4 +24,4 @@ end
 group :development do
   gem 'guard-rspec'
   gem 'rake'
-end
+end

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    polytexnic (1.5.14)
-      json (~> 1.8.1)
-      kramdown (~> 1.17)
+    polytexnic (1.6.2)
+      json (~> 2.3.0)
+      kramdown (>= 1.17, < 3.0)
       msgpack (~> 1.2.0)
-      nokogiri (~> 1.10.8)
-      pygments.rb (~> 1.2.1)
+      nokogiri (>= 1.6.0, < 2.0)
+      pygments.rb (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
+    coderay (1.1.3)
     columnize (0.9.0)
     coveralls (0.7.2)
       multi_json (~> 1.3)
@@ -23,12 +23,12 @@ GEM
     debugger2 (1.0.0.beta2)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.1.5)
-    ffi (1.12.2)
+    ffi (1.14.2)
     formatador (0.2.5)
     growl (1.0.3)
-    guard (2.16.1)
+    guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -42,36 +42,37 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    json (1.8.6)
-    kramdown (1.17.0)
-    listen (3.2.1)
+    json (2.3.1)
+    kramdown (2.3.0)
+      rexml
+    listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.4)
-    method_source (0.9.2)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mini_portile2 (2.4.0)
+    mime-types-data (3.2021.0225)
     msgpack (1.2.10)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     nenv (0.3.0)
-    nokogiri (1.10.8)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.1-x86_64-darwin)
+      racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pygments.rb (1.2.1)
-      multi_json (>= 1.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.3)
+    pry (0.14.0)
+      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)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    rexml (3.2.4)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
@@ -92,7 +93,7 @@ GEM
     tins (0.13.2)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
   coveralls
@@ -105,4 +106,4 @@ DEPENDENCIES
   simplecov (~> 0.15.1)
 
 BUNDLED WITH
-   2.1.4
+   2.2.13

data/bin/polytexnic

@@ -1,19 +1,81 @@
 #!/usr/bin/env ruby
 require "polytexnic"
+require 'optparse'
+require 'fileutils'
 
-def latex_to_html(latex)
-  Polytexnic::Pipeline.new(latex, article: true).to_html
+# polytexnic command-line script
+# The polytexnic script converts Markdown to HTML or LaTeX
+# using the PolyTeXnic HTML pipeline.
+
+examples = %(
+The polytexnic script converts Markdown to HTML or LaTeX
+using the PolyTeXnic HTML pipeline.
+
+Examples:
+    polytexnic example.md example.html
+    polytexnic example.md > example.html
+    polytexnic < example.md > example.html
+    cat example.md | polytexnic > example.html
+    polytexnic -i example.md > example.html
+    polytexnic -i example.md -o example.tex
+    polytexnic -f tex example.md)
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: polytexnic [options]\n#{examples}\n\n"
+
+  opts.on("-i", "--input=INPUT", "Use file input") do |infile|
+    options[:infile] = infile
+  end
+
+  opts.on("-o", "--output=OUTPUT", "Use file output") do |outfile|
+    options[:outfile] = outfile
+  end
+
+  opts.on("-f", "--format", "Use output format [html, tex]") do |format|
+    options[:format] = format
+  end
+end.parse!
+
+# Returns the file format based on extension.
+# Should be 'html' or 'tex'.
+def format(filename)
+  puts '***********'
+  puts '***********'
+  puts '***********'
+  puts '***********'
+  puts '***********'
+  p filename.split('.')
+  filename.split('.').last
+rescue
+  nil
 end
 
-if ARGV.empty?
-  puts latex_to_html(STDIN.read)
+puts '$$$$$$$$$$$'
+puts '$$$$$$$$$$$'
+puts '$$$$$$$$$$$'
+puts '$$$$$$$$$$$'
+puts '$$$$$$$$$$$'
+p options
+if (infile = options[:infile] || ARGV.shift)
+puts infile
+  input = File.read(infile)
 else
-  filename = ARGV.shift
-  latex = File.read(filename)
-  html  = latex_to_html(latex)
-  if (outfile = ARGV.shift)
-    File.write(outfile, html)
-  else
-    puts html.strip
-  end
+  input = STDIN.read
+end
+outfile  = options[:outfile] || ARGV.shift
+puts outfile
+pipeline = Polytexnic::Pipeline.new(input, article: true)
+format   = options[:format] || format(outfile) || "html"
+if format == "html"
+  output = pipeline.to_html
+elsif format == "tex"
+  output = pipeline.to_polytex
+else
+  raise ArgumentError, "Invalid format: #{format}"
+end
+if outfile
+  File.write(outfile, output)
+else
+  puts output.strip
 end

data/lib/polytexnic/postprocessors/html.rb

@@ -55,7 +55,6 @@ module Polytexnic
         mainmatter(doc)
         footnotes(doc)
         table_of_contents(doc)
-        add_noindent(doc)
         convert_to_html(doc)
       end
 
@@ -96,7 +95,7 @@ module Polytexnic
         def small_caps(doc)
           doc.xpath('//hi[@rend="sc"]').each do |node|
             node.name = 'span'
-            node['class'] = 'sc'
+            node['class'] = 'smallcaps'
             node.remove_attribute('rend')
           end
         end
@@ -1399,27 +1398,34 @@ module Polytexnic
           html << open << link.to_xhtml << '</li>'
         end
 
+
+        # NOTE: The add_noindent method has been superseded by CSS rules as shown in the
+        # softcover gem's epub.css files.
+        # See div.chapter > p:first-of-type and related rules in
+        #   ./lib/softcover/article_template/epub/OEBPS/styles/epub.css
+        # of the softcover gem's source.
+
         # Adds a noindent class where appropriate.
         # The purpose is to give the designer the option to indent all paragraphs but the first
         # one after the beginning of a chapter or section. The method is to add a "noindent" class
         # in the first paragraph after each division (chapter, section, etc.).
-        def add_noindent(doc)
-          divisions = %w[chapter section subsection subsubsection]
-          divisions += divisions.map { |division| "#{division}-star"}
-          divisions.each do |type|
-            doc.css("div.#{type}").each do |node|
-              if (first_paragraph = node.at_css('p'))
-                if first_paragraph['class'] == 'noindent'
-                  next
-                elsif first_paragraph['class'].nil?
-                  first_paragraph['class'] = 'noindent'
-                else
-                  first_paragraph['class'] += ' noindent'
-                end
-              end
-            end
-          end
-        end
+        # def add_noindent(doc)
+        #   divisions = %w[chapter section subsection subsubsection]
+        #   divisions += divisions.map { |division| "#{division}-star"}
+        #   divisions.each do |type|
+        #     doc.css("div.#{type}").each do |node|
+        #       if (first_paragraph = node.at_css('p'))
+        #         if first_paragraph['class'] == 'noindent'
+        #           next
+        #         elsif first_paragraph['class'].nil?
+        #           first_paragraph['class'] = 'noindent'
+        #         else
+        #           first_paragraph['class'] += ' noindent'
+        #         end
+        #       end
+        #     end
+        #   end
+        # end
 
         # Cleans a node by removing all the given attributes.
         def clean_node(node, attributes)

data/lib/polytexnic/preprocessors/html.rb

@@ -140,7 +140,7 @@ module Polytexnic
         # Removes commented-out lines.
         # Contents of the special sequence `%=` are converted to literal HTML.
         def remove_comments(output)
-          output.gsub!(/[^\\]%[^=].*$/, '')
+          output.gsub!(/([^\\])(%[^=].*$)/, '\1')
           output.gsub!(/[^\\]%=(.*)$/) do
             key = digest($1)
             literal_html_cache[key] = $1

data/lib/polytexnic/utils.rb

@@ -206,9 +206,17 @@ module Polytexnic
         # Inline numbers look much better in HTML but are invalid in LaTeX.
         options['linenos'] = 'inline'
       end
-      highlight_cache[key] ||= Pygments.highlight(content, lexer: language,
+      if (lines = options['hl_lines'])
+        content_lines = content.split("\n")
+        if lines.max > content_lines.length
+          err  = "\nHighlight line(s) out of range: #{lines.inspect}\n"
+          err += content
+          raise err
+        end
+      end
+      highlight_cache[key] ||= Pygments.highlight(content, lexer:     language,
                                                            formatter: formatter,
-                                                           options: options)
+                                                           options:   options)
     end
 
     # Adds some verbatim font info (including size).

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "1.5.14"
+  VERSION = "1.6.2"
 end

data/polytexnic.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |gem|
   gem.version       = Polytexnic::VERSION
   gem.authors       = ["Michael Hartl", "Nick Merwin"]
   gem.email         = ["michael@softcover.io"]
-  gem.description   = %q{Core translation engine for the polytexnic gem}
+  gem.description   = %q{Core translation engine for the softcover gem}
   gem.summary       = %q{Convert from PolyTeX & Markdown to HTML & LaTeX}
-  gem.homepage      = "https://polytexnic.org/"
+  gem.homepage      = "https://github.com/softcover/polytexnic"
   gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
@@ -18,11 +18,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'nokogiri', '~> 1.10.8'
-  gem.add_dependency 'pygments.rb', '~> 1.2.1'
+  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'
-  gem.add_dependency 'json', '~> 1.8.1'
+  gem.add_dependency 'kramdown', '>= 1.17', '< 3.0'
+  gem.add_dependency 'json', '~> 2.3.0'
 
   gem.add_development_dependency 'rspec', '~> 2.14'
   gem.add_development_dependency 'simplecov', '~> 0.15.1'

data/spec/to_html/asides_spec.rb

@@ -32,7 +32,7 @@ describe 'Polytexnic::Pipeline#to_html' do
             <span class="number">Box 1.1.</span>
             <span class="description">Lorem ipsum.</span>
           </div>
-          <p class="noindent">lorem ipsum</p>
+          <p>lorem ipsum</p>
           <p>dolor sit amet</p>
         </div>
         <p><a href="#aside-lorem" class="hyperref">Box <span class="ref">1.1</span></a></p>
@@ -76,4 +76,4 @@ describe 'Polytexnic::Pipeline#to_html' do
       it { should include ">1<" }
     end
   end
-end
+end

data/spec/to_html/chapters_and_sections_spec.rb

@@ -202,7 +202,7 @@ describe 'Polytexnic::Pipeline#to_html' do
         <h2><a href="#foo_baz" class="heading">Foo: baz</a></h2>
         <div class="subsection-star">
           <h3><a class="heading">Bar</a></h3>
-          <p class="noindent">Lorem ipsum</p>
+          <p>Lorem ipsum</p>
         </div>
       </div>
       <div id="cid1" data-tralics-id="cid1" class="section" data-number="1">
@@ -233,7 +233,7 @@ describe 'Polytexnic::Pipeline#to_html' do
       should resemble <<-'EOS'
         <div id="cha-foo_bar" data-tralics-id="cid1" class="chapter" data-number="1">
           <h1><a href="#cha-foo_bar" class="heading"><span class="number">Chapter 1 </span>Foo</a></h1>
-          <p class="noindent"><a href="#cha-foo_bar" class="hyperref">Chapter <span class="ref">1</span></a>
+          <p><a href="#cha-foo_bar" class="hyperref">Chapter <span class="ref">1</span></a>
           and
           <a href="#cha-foo_baz" class="hyperref">Chapter <span class="ref">2</span></a>
           </p>
@@ -241,7 +241,7 @@ describe 'Polytexnic::Pipeline#to_html' do
 
         <div id="cha-foo_baz" data-tralics-id="cid2" class="chapter" data-number="2">
           <h1><a href="#cha-foo_baz" class="heading"><span class="number">Chapter 2 </span>Baz</a></h1>
-          <p class="noindent"><a href="#cha-foo_baz" class="hyperref">Chapter <span class="ref">2</span></a>
+          <p><a href="#cha-foo_baz" class="hyperref">Chapter <span class="ref">2</span></a>
           and
           <a href="#cha-foo_bar" class="hyperref">Chapter <span class="ref">1</span></a>
           </p>
@@ -270,13 +270,13 @@ describe 'Polytexnic::Pipeline#to_html' do
     it do
       should resemble <<-'EOS'
         <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>
-        <p class="noindent">
+        <p>
           <a href="#sec-bar" class="hyperref">Section <span class="ref">1.1</span></a>
           and
           <a href="#sec-baz" class="hyperref">Section <span class="ref">1.1.1</span></a>
         </p>
         <div id="sec-bar" data-tralics-id="uid1" class="subsection" data-number="1.1"><h3><a href="#sec-bar" class="heading"><span class="number">1.1 </span>Bar</a></h3>
-        <p class="noindent"><a href="#sec-foo" class="hyperref">Section <span class="ref">1</span></a>
+        <p><a href="#sec-foo" class="hyperref">Section <span class="ref">1</span></a>
         </p>
         <div id="sec-baz" data-tralics-id="uid2" class="subsubsection" data-number="1.1.1">
           <h4><a href="#sec-baz" class="heading">Baz</a></h4>
@@ -298,7 +298,7 @@ describe 'Polytexnic::Pipeline#to_html' do
       should resemble <<-'EOS'
         <div id="cha-foo" data-tralics-id="cid1" class="chapter" data-number="1">
         <h1><a href="#cha-foo" class="heading"><span class="number">Chapter 1 </span>Foo</a></h1>
-        <p class="noindent"><a href="#cha-bar" class="hyperref">Chapter <span class="undefined_ref">cha:bar</span></a>
+        <p><a href="#cha-bar" class="hyperref">Chapter <span class="undefined_ref">cha:bar</span></a>
         </p>
         </div>
       EOS
@@ -324,7 +324,7 @@ describe 'Polytexnic::Pipeline#to_html' do
       should resemble <<-'EOS'
 <div id="frontmatter" data-number="0">
        <div class="chapter-star" id="foo"><h1><a href="#foo" class="heading">Foo</a></h1>
-       <p class="noindent">Lorem ipsum.<sup id="cha-0_footnote-ref-1" class="footnote"><a href="#cha-0_footnote-1">1</a></sup></p>
+       <p>Lorem ipsum.<sup id="cha-0_footnote-ref-1" class="footnote"><a href="#cha-0_footnote-1">1</a></sup></p>
        </div></div>
 
        <div id="cha-0_footnotes">
@@ -332,7 +332,7 @@ describe 'Polytexnic::Pipeline#to_html' do
            <div id="cha-0_footnote-1" class="footnote"><a class="footnote-link" href="#cha-0_footnote-ref-1">1.</a> Foo bar.</div>
          </div>
        </div><div id="cha-bar" data-tralics-id="cid1" class="chapter" data-number="1"><h1><a href="#cha-bar" class="heading"><span class="number">Chapter 1 </span>Bar</a></h1>
-       <p class="noindent"><a href="#cha-bar" class="hyperref">Chapter <span class="ref">1</span></a>
+       <p><a href="#cha-bar" class="hyperref">Chapter <span class="ref">1</span></a>
 </p></div>
       EOS
     end

data/spec/to_html/codelistings_spec.rb

@@ -40,7 +40,7 @@ Listing~\ref{code:create_gemrc}
             </div>
           </div>
         </div>
-        <p class="noindent"><a href="#code-create_gemrc" class="hyperref">Listing <span class="ref">1.1</span></a></p>
+        <p><a href="#code-create_gemrc" class="hyperref">Listing <span class="ref">1.1</span></a></p>
         </div>
       EOS
     end
@@ -121,4 +121,4 @@ Listing~\ref{code:create_gemrc}
       expect { processed_text }.not_to raise_error
     end
   end
-end
+end

data/spec/to_html/core_spec.rb

@@ -9,6 +9,15 @@ describe 'Polytexnic::Pipeline#to_html' do
     let(:polytex) { "% A LaTeX comment" }
     it { should eq '' }
 
+    context "occurring a the end of a line" do
+      let(:polytex) do <<-'EOS'
+        lorem ipsum
+        dolor sit amet.%this is a comment
+        EOS
+      end
+      it { should include("amet.") }
+    end
+
     context "with a section and label" do
       let(:polytex) do <<-'EOS'
         % \section{Foo}
@@ -108,6 +117,25 @@ describe 'Polytexnic::Pipeline#to_html' do
     it { should_not resemble '<unknown>' }
   end
 
+  describe "explicit noindent" do
+    let(:polytex) { '\noindent lorem ipsum' }
+    it { should resemble '<p class="noindent">lorem ipsum</p>' }
+  end
+
+  describe "free span" do
+    let(:polytex) do <<-'EOS'
+\chapter{Basics} % (fold)
+\label{cha:basics}
+
+%= <span class="free"></span>
+      EOS
+    end
+
+    it { should resemble('<span class="free"></span>') }
+    it { should_not resemble('<p><span class="free"></span></p>') }
+  end
+
+
   describe '\maketitle' do
 
     context "with all elements filled out explicitly" do

data/spec/to_html/footnote_spec.rb

@@ -26,14 +26,14 @@ describe 'Polytexnic::Pipeline#to_html' do
 <div id="cha-foo" data-tralics-id="cid1" class="chapter" data-number="1"><h1><a href="#cha-foo" class="heading"><span class="number">Chapter 1 </span>Foo <em>bar</em></a></h1>
        </div>
        <div id="sec-foobar" data-tralics-id="cid2" class="section" data-number="1.1"><h2><a href="#sec-foobar" class="heading"><span class="number">1.1 </span>Foobar</a></h2>
-       <p class="noindent">Lorem ipsum.<sup id="cha-1_footnote-ref-1" class="footnote"><a href="#cha-1_footnote-1">1</a></sup></p>
+       <p>Lorem ipsum.<sup id="cha-1_footnote-ref-1" class="footnote"><a href="#cha-1_footnote-1">1</a></sup></p>
        </div>
        <div id="cha-1_footnotes">
          <div class="footnotes">
            <div id="cha-1_footnote-1" class="footnote"><a class="footnote-link" href="#cha-1_footnote-ref-1">1.</a> Cicero</div>
          </div>
        </div><div id="cha-bar" data-tralics-id="cid3" class="chapter" data-number="2"><h1><a href="#cha-bar" class="heading"><span class="number">Chapter 2 </span>Bar</a></h1>
-       <p class="noindent">Dolor sit amet.
+       <p>Dolor sit amet.
        </p></div>
       EOS
     end
@@ -66,14 +66,14 @@ describe 'Polytexnic::Pipeline#to_html' do
 <div id="cha-foo" data-tralics-id="cid1" class="chapter" data-number="1"><h1><a href="#cha-foo" class="heading"><span class="number">Chapter 1 </span>Foo <em>bar</em></a></h1>
        </div>
        <div id="sec-foobar" data-tralics-id="cid2" class="section" data-number="1.1"><h2><a href="#sec-foobar" class="heading"><span class="number">1.1 </span>Foobar</a></h2>
-       <p class="noindent">Lorem ipsum.<sup id="cha-1_footnote-ref-1" class="footnote"><a href="#cha-1_footnote-1">1</a></sup></p>
+       <p>Lorem ipsum.<sup id="cha-1_footnote-ref-1" class="footnote"><a href="#cha-1_footnote-1">1</a></sup></p>
        </div>
        <div id="cha-1_footnotes">
          <div class="footnotes">
            <div id="cha-1_footnote-1" class="footnote"><a class="footnote-link" href="#cha-1_footnote-ref-1">1.</a> Cicero</div>
          </div>
        </div><div id="cha-bar" data-tralics-id="cid3" class="chapter" data-number="2"><h1><a href="#cha-bar" class="heading"><span class="number">Chapter 2 </span>Bar</a></h1>
-       <p class="noindent">Dolor sit amet.<sup id="cha-2_footnote-ref-1" class="footnote"><a href="#cha-2_footnote-1">1</a></sup></p>
+       <p>Dolor sit amet.<sup id="cha-2_footnote-ref-1" class="footnote"><a href="#cha-2_footnote-1">1</a></sup></p>
        <p>Hey Jude.<sup id="cha-2_footnote-ref-2" class="footnote"><a href="#cha-2_footnote-2">2</a></sup>
        </p></div><div id="cha-2_footnotes">
          <div class="footnotes">
@@ -120,14 +120,14 @@ describe 'Polytexnic::Pipeline#to_html' do
 <div id="cha-foo" data-tralics-id="cid1" class="chapter" data-number="1"><h1><a href="#cha-foo" class="heading"><span class="number">Chapter 1 </span>Foo <em>bar</em></a></h1>
        </div>
        <div id="sec-foobar" data-tralics-id="cid2" class="section" data-number="1.1"><h2><a href="#sec-foobar" class="heading"><span class="number">1.1 </span>Foobar</a></h2>
-       <p class="noindent">Lorem ipsum.<sup id="cha-1_footnote-ref-1" class="footnote"><a href="#cha-1_footnote-1">*</a></sup></p>
+       <p>Lorem ipsum.<sup id="cha-1_footnote-ref-1" class="footnote"><a href="#cha-1_footnote-1">*</a></sup></p>
        </div>
        <div id="cha-1_footnotes">
          <div class="footnotes nonumbers">
            <div id="cha-1_footnote-1" class="footnote"><sup><a class="footnote-link" href="#cha-1_footnote-ref-1">*</a></sup> Cicero</div>
          </div>
        </div><div id="cha-bar" data-tralics-id="cid3" class="chapter" data-number="2"><h1><a href="#cha-bar" class="heading"><span class="number">Chapter 2 </span>Bar</a></h1>
-       <p class="noindent">Dolor sit amet.<sup id="cha-2_footnote-ref-1" class="footnote"><a href="#cha-2_footnote-1">*</a></sup></p>
+       <p>Dolor sit amet.<sup id="cha-2_footnote-ref-1" class="footnote"><a href="#cha-2_footnote-1">*</a></sup></p>
        <p>Hey Jude!<sup id="cha-2_footnote-ref-2" class="footnote intersentence"><a href="#cha-2_footnote-2">†</a></sup><span class="intersentencespace"></span> Be afraid.<span class="intersentencespace"></span> </p></div>
        <div id="cha-2_footnotes">
          <div class="footnotes nonumbers">

data/spec/to_html/graphics_and_figures_spec.rb

@@ -250,7 +250,7 @@ describe 'Polytexnic::Pipeline#to_html' do
               <span class="description">This is another caption.</span>
             </div>
           </div>
-          <p class="noindent">
+          <p>
             <a href="#fig-baz" class="hyperref">Figure <span class="ref">2.1</span></a>
           </p>
           </div>
@@ -268,7 +268,7 @@ describe 'Polytexnic::Pipeline#to_html' do
               <span class="description">Yet another.</span>
             </div>
           </div>
-          <p class="noindent">
+          <p>
             <a href="#fig-foo" class="hyperref">Figure <span class="ref">1.1</span></a>
             and
             <a href="#fig-bar" class="hyperref">Figure <span class="ref">1.2</span></a>
@@ -378,4 +378,4 @@ describe 'Polytexnic::Pipeline#to_html' do
       end
     end
   end
-end
+end

data/spec/to_html/literal_environments/code_spec.rb

@@ -98,7 +98,7 @@ describe Polytexnic::Pipeline do
         <div class="code">
           <div class="highlight">
             <pre>
-              <span></span>            
+              <span></span>
               <span class="k">def</span> <span class="nf">foo</span>
               <span class="s2">"bar"</span>
               <span class="k">end</span>
@@ -126,15 +126,15 @@ describe Polytexnic::Pipeline do
           <div class="highlight">
             <pre>
               <span></span>
-              <span class="lineno">1</span>
               <span class="hll">
+              <span class="linenos">1</span>
                 <span class="k">def</span> <span class="nf">foo</span>
               </span>
-              <span class="lineno">2</span>
               <span class="hll">
+              <span class="linenos">2</span>
                 <span class="s2">"bar"</span>
               </span>
-              <span class="lineno">3</span>
+              <span class="linenos">3</span>
               <span class="k">end</span>
             </pre>
           </div>
@@ -143,9 +143,25 @@ describe Polytexnic::Pipeline do
     end
   end
 
+  context "when highlighting HTML" do
+    let(:polytex) do <<-'EOS'
+      %= lang:html, options: "hl_lines": [3], "linenos": true
+      \begin{code}
+      ---
+      layout: default
+      title: Gallery for Learn Enough JavaScript to Be Dangerous
+      ---
+
+      <div class="gallery col-three">
+        <div class="col col-nav gallery-thumbs" id="gallery-thumbs">
+      \end{code}
+    end
+    it should include('class="linenos"')
+  end
+
   context "with highlight line out of range" do
     let(:polytex) do <<-'EOS'
-      %= lang:ruby, options: "hl_lines": [17], "linenos": true
+      %= lang:ruby, options: "hl_lines": [4], "linenos": true
       \begin{code}
       def foo
         "bar"
@@ -155,7 +171,7 @@ describe Polytexnic::Pipeline do
     end
 
     it "should emit a warning" do
-
+      expect { processed_text }.to raise_error
     end
   end
 
@@ -238,7 +254,7 @@ describe Polytexnic::Pipeline do
 
       context "with custom options" do
         let(:polytex) do <<-'EOS'
-          %= <<(polytexnic_commands.sty, lang: tex, options: "hl_lines": [5])
+          %= <<(polytexnic_commands.sty, lang: tex, options: "hl_lines": [1])
           EOS
         end
         let(:output) do <<-'EOS'
@@ -377,7 +393,17 @@ describe Polytexnic::Pipeline do
 
           context "with repo, tag, lang and options" do
             let(:polytex) do <<-'EOS'
-              %= <<(tagged_file.rb, git: {tag: v0.9.4, repo:"repo_path/.git"}, lang: tex, options: "hl_lines": [5])
+              %= <<(tagged_file.rb, git: {tag: v0.9.4, repo:"repo_path/.git"}, lang: tex, options: "hl_lines": [2])
+              EOS
+            end
+            let(:output) do <<-'EOS'
+              <div class="code">
+                <div class="highlight">
+                  <pre><span></span>Fake data
+                  <span class="hll">second line
+                  </span></pre>
+                </div>
+              </div>
               EOS
             end
             it_behaves_like "an inclusion"

data/spec/to_html/text_formatting_spec.rb

@@ -29,7 +29,7 @@ describe 'Polytexnic::Pipeline#to_html' do
 
     describe "small caps" do
       let(:polytex) { '\textsc{small caps}' }
-      it { should resemble '<span class="sc">small caps</span>' }
+      it { should resemble '<span class="smallcaps">small caps</span>' }
     end
 
     describe "small text" do

data/spec/to_latex_spec.rb

@@ -29,7 +29,7 @@ Make a code listing as in Listing~\ref{code:hello}.
 \begin{codelisting}
 \label{code:hello}
 \codecaption{A hello program in Ruby.}
-%= lang:ruby, options: "hl_lines": [17]
+%= lang:ruby, options: "hl_lines": [2]
 \begin{code}
 def hello
   "hello, world!"
@@ -262,4 +262,4 @@ end
       it { should_not include 'xmlelement' }
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 1.5.14
+  version: 1.6.2
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,36 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -57,30 +63,36 @@ dependencies:
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +121,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.1
-description: Core translation engine for the polytexnic gem
+description: Core translation engine for the softcover gem
 email:
 - michael@softcover.io
 executables:
@@ -277,7 +289,7 @@ files:
 - tasks/bin/ruby_tests
 - tasks/run_tests_with_both_rubies.rake
 - tmp/.gitkeep
-homepage: https://polytexnic.org/
+homepage: https://github.com/softcover/polytexnic
 licenses:
 - MIT
 metadata: {}
@@ -296,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Convert from PolyTeX & Markdown to HTML & LaTeX