polytexnic 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90967a11604447f1c48b3016f4f7dde1f082fdd6
-  data.tar.gz: 5567505edfd23e041e228a835ab1b07ea60d752b
+  metadata.gz: de6a446d78432685757904722522835e26505704
+  data.tar.gz: 3a39439ee2a40bcf52f9ca967332feaa65af4941
 SHA512:
-  metadata.gz: 18b33ec18fc3a248ddc7d60b4b2fe6492bcc7a01b5dca944683989290e9dcc49c48d570a601c3c250d455330807f2930187eb235b875fc18092e5ac745502ff5
-  data.tar.gz: b748f0a571d6a60f389fd5b99691f2bed3b620bfe18a52e7f14fb2af31e61f524e49066ff6ffbd5be65dce310bcae0cc371c223009675183915e0713a2df395a
+  metadata.gz: a587872ddd1612030e5e3ccbe006daa6cf0782a07762e496858f05b556d62db003a0cec403f3239b66baa19fc533e4b44ef1b164ce1a38727142f64d6ad78661
+  data.tar.gz: 982fd0d2bcf7d04e92b69a06f805e58cf5dd321a793bb3c7eee8e8e6eb061f0a999499705ab840083b82b925d4fcb2ddb84caef0d65b1ca568a5f41ae9f991b1

data/lib/polytexnic/preprocessors/polytex.rb

@@ -29,7 +29,7 @@ module Polytexnic
         cleaned_markdown = cache_code_environments
         puts cleaned_markdown if debug?
         cleaned_markdown.tap do |markdown|
-          convert_code_inclusion(markdown)
+          convert_code_inclusion(markdown, cache)
           cache_latex_literal(markdown, cache)
           cache_raw_latex(markdown, cache)
           puts markdown if debug?
@@ -40,20 +40,20 @@ module Polytexnic
         lh = 'chapter,section,subsection,subsubsection,paragraph,subparagraph'
         kramdown = Kramdown::Document.new(cleaned_markdown, latex_headers: lh)
         @source = kramdown.to_latex.tap do |polytex|
+                    remove_comments(polytex)
                     convert_tt(polytex)
                     restore_math(polytex, math_cache)
-                    restore_inclusion(polytex)
-                    restore_raw_latex(polytex, cache)
+                    restore_hashed_content(polytex, cache)
                   end
       end
 
       # Adds support for <<(path/to/code) inclusion.
-      # Yes, this is a bit of a hack, but it works.
-      def convert_code_inclusion(text)
-        text.gsub!(/^\s*<<(\(.*?\))/) { "<!-- inclusion= <<#{$1}-->" }
-      end
-      def restore_inclusion(text)
-        text.gsub!(/% <!-- inclusion= (.*?)-->/) { "%= #{$1}" }
+      def convert_code_inclusion(text, cache)
+        text.gsub!(/^\s*(<<\(.*?\))/) do
+          key = digest($1)
+          cache[key] = "%= #{$1}"  # reduce to a previously solved case
+          key
+        end
       end
 
       # Caches literal LaTeX environments.
@@ -101,11 +101,11 @@ module Polytexnic
         end
       end
 
-      # Restores raw LaTeX from the cache
-      def restore_raw_latex(text, cache)
+      # Restores raw code from the cache
+      def restore_hashed_content(text, cache)
         cache.each do |key, value|
           # Because of the way backslashes get interpolated, we need to add
-          # some extra ones to cover all the cases.
+          # some extra ones to cover all the cases of hashed LaTeX.
           text.gsub!(key, value.gsub(/\\/, '\\\\\\'))
         end
       end
@@ -151,6 +151,14 @@ module Polytexnic
         output.join("\n")
       end
 
+      # # Removes comments.
+      # # The main reason for doing this is so that commented-out cached objects,
+      # # such as '% <hash of a code sample>', get removed.
+      # # Code like '%= lang:ruby' gets preserved.
+      # def strip_comments(text)
+      #   text.gsub!(/^%.*$/, '')
+      # end
+
       # Converts {tt ...} to \kode{...}
       # This effectively converts `inline code`, which kramdown sets as
       # {\tt inline code}, to PolyTeX's native \kode command, which in

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

data/spec/markdown_to_polytex_spec.rb

@@ -185,7 +185,7 @@ bar
         it { should resemble source }
       end
 
-      context "a codelisting environment, including a nested command." do
+      context "a codelisting environment, including a nested command" do
         let(:source) do <<-'EOS'
 \begin{codelisting}
 \codecaption{Lorem \emph{ipsum}.}
@@ -202,6 +202,24 @@ def foo; "bar"; end
         it { should resemble '\end{codelisting}' }
       end
 
+      context "a commented-out codelisting" do
+        let(:source) do <<-'EOS'
+%= foo:bar
+<!--
+\begin{codelisting}
+\codecaption{Lorem \emph{ipsum}.}
+\label{code:lorem}
+```ruby
+def foo; "bar"; end
+```
+\end{codelisting}
+-->
+          EOS
+        end
+        it { should include '%= foo:bar' }
+        it { should_not resemble '\begin{codelisting}' }
+      end
+
       context "code inclusion inside codelisting" do
         let(:source) do <<-'EOS'
 \begin{codelisting}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -168,6 +168,7 @@ files:
 - .pull_requests/1384800466
 - .pull_requests/1384811507
 - .pull_requests/1385061501
+- .pull_requests/1385598040
 - .rspec
 - .ruby-gemset
 - .ruby-version