polytexnic 1.1.14 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c6f6685e4e82555b337e848db33c77a772d5f90
-  data.tar.gz: 88de5d8700aac21bb873a6d0b6919370036cd581
+  metadata.gz: 889d526bb149a5216215bcc4aec2ed9454214c56
+  data.tar.gz: b78febaefb8e5c65b5e353d96e79791088970a94
 SHA512:
-  metadata.gz: db3e10b6e1bcad49d628637bfd00ccde8ea347db3d1543be2065c0b9532b6f922bb5f315c31622365127fd80f56634c6f5ca3951ede46120406c0a63fa7bfa49
-  data.tar.gz: 7d92261fdaa1607160bf36e2ac323c4827aadc1ed6b82e15ca2268b71620b40c3e23ab393e95ea5e1d6eb65b92f90f0cee7c80942a74bed950a64df7295028de
+  metadata.gz: a1830eef955e1288ca5d02cb3fc5e92894309f97094ee3882286fabcfb5b471f4f4e852a56b44a580601dc60b2f0f45e4e71688768eff75ee9cf1236c365682b
+  data.tar.gz: fc21b6e1e2daf2edf6e586433de3b0fd91b8840ccad145702576f473ff7f43ad0684495df566c2fe89ae15c69f4b3b45cda27bf1ec1baf59c2e430e5e18aa348

data/lib/polytexnic/postprocessors/html.rb

@@ -1238,18 +1238,31 @@ module Polytexnic
         # Trims empty paragraphs.
         # Sometimes a <p></p> creeps in due to idiosyncrasies of the
         # Tralics conversion.
-        def trim_empty_paragraphs(string)
-          string.gsub!(/<p>\s*<\/p>/, '')
+        def trim_empty_paragraphs!(string)
+          string.gsub!(/<p>\s*<\/p>/m, '')
         end
 
-        # Retores quotes or verse inside figure.
+        # Restores quotes or verse inside figure.
         # This is a terrible hack.
-        def restore_figure_quotes(string)
+        def restore_figure_quotes!(string)
           figure_quote_cache.each do |key, html|
             string.gsub!(/<p>\s*#{key}\s*<\/p>/m, html)
           end
         end
 
+        # Retores literal HTML included via %=.
+        # E.g., writing
+        #    %= </span>
+        # inserts a literal closing span tag into the HTML output.
+        def restore_literal_html!(string)
+          literal_html_cache.each do |key, html|
+            string.gsub!(/<p>\s*<literalhtml>#{key}<\/literalhtml>\s*<\/p>/m,
+                         html)
+            string.gsub!(/<literalhtml>#{key}<\/literalhtml>/, html)
+          end
+        end
+
+
         # Converts a document to HTML.
         # Because there's no way to know which elements are block-level
         # (and hence can't be nested inside a paragraph tag), we first extract
@@ -1266,8 +1279,9 @@ module Polytexnic
           end
           body = doc.at_css('document').children.to_xhtml
           Nokogiri::HTML.fragment(body).to_xhtml.tap do |html|
-            trim_empty_paragraphs(html)
-            restore_figure_quotes(html)
+            trim_empty_paragraphs!(html)
+            restore_figure_quotes!(html)
+            restore_literal_html!(html)
           end
         end
 

data/lib/polytexnic/preprocessors/html.rb

@@ -120,11 +120,13 @@ module Polytexnic
         end
 
         # Removes commented-out lines.
-        # Contents of the special sequence `%=` are converted to HTML comments.
+        # Contents of the special sequence `%=` are converted to literal HTML.
         def remove_comments(output)
           output.gsub!(/[^\\]%[^=].*$/, '')
           output.gsub!(/[^\\]%=(.*)$/) do
-            xmlelement('comment') { $1.gsub('_', underscore_digest) }
+            key = digest($1)
+            literal_html_cache[key] = $1
+            xmlelement('literalhtml') { key }
           end
         end
 

data/lib/polytexnic/utils.rb

@@ -241,7 +241,7 @@ module Polytexnic
     # because in Ruby '\\foo' is the same as '\\\\foo', '\}' is '}', etc.
     # I thought I escaped (heh) this problem with the `escape_backslashes`
     # method, but here the problem is extremely specific. In particular,
-    # \\\{\} is really \\ and \{ and \}, but Ruby doensn't know WTF to do
+    # \\\{\} is really \\ and \{ and \}, but Ruby doesn't know WTF to do
     # with it, and thinks that it's "\\{}", which is the same as '\{}'.
     # The solution is to replace '\\\\' with some number of backslashes.
     # How many? I literally had to just keep adding backslashes until

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "1.1.14"
+  VERSION = "1.2.0"
 end

data/lib/polytexnic.rb

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

data/spec/to_html/core_spec.rb

@@ -70,8 +70,16 @@ describe 'Polytexnic::Pipeline#to_html' do
     end
 
     context "with a percent-equals" do
-      let(:polytex) { '%= literal_text' }
-      it { should include '<!-- literal_text -->' }
+
+      context "with an opening tag" do
+        let(:polytex) { '%= <span id="foo" class="bar">' }
+        it { should eq '<span id="foo" class="bar">' }
+      end
+
+      context "with a closing tag" do
+        let(:polytex) { '%= </span>' }
+        it { should eq '</span>' }
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Convert from PolyTeX & Markdown to HTML & LaTeX