polytexnic 1.0.beta1 → 1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 751a1b5ecbbcd95df78fdc4651d8ec270990abbb
-  data.tar.gz: b57645b0af7b1d4c1a3067f0a2d8d954937348fc
+  metadata.gz: 313a786bc9e773eff07b9930cf84c7afa76bd4dc
+  data.tar.gz: 0544d7a35b333d101098aa1dce3e9fed8e164d2f
 SHA512:
-  metadata.gz: 44ca3dac0ba83a5089e4066f82ec3330010c3e4020bfee990225282530d52c72cc972842ea63386fd2419b9025579014b2545bc2c1b262809c18c43de449a78f
-  data.tar.gz: 053ea3fcf06caac0461614417ca3b856fea2632dcf28491608dfe01445a745cf45e011a2488caeed12ddd38c42ea2a77449aeabbabf9cd4e68790560e5c11d44
+  metadata.gz: 62213c15e21b7058a80b825fe4c52e11dd0b367ee3bbf325621e50f5ed02715027882c1ab6723af1f63dff15394dbaa242de889cf0ee1dd5685035c70d54f090
+  data.tar.gz: 6bc8b4967092469ec5dd83799001db23afe8b70fa03d2e676e89a618ff386c40103d2c2693c732f70f5fb00b66e25f836704b921640d5910b866ebf3f46509aa

data/lib/polytexnic/preprocessors/html.rb

@@ -48,6 +48,7 @@ module Polytexnic
           doc = cache_literal(add_commands(polytex))
           inline_verbatim(doc)
           cache_hrefs(doc)
+          expand_input!(doc, Proc.new { |source| cache_literal(source) }, 'tex')
           remove_comments(doc)
           double_backslashes(cache_display_inline_math(doc))
         end

data/lib/polytexnic/preprocessors/latex.rb

@@ -12,7 +12,11 @@ module Polytexnic
       # Literal environments are hashed and passed through the pipeline
       # so that we can process things like refs and hyperrefs using gsubs.
       def clean_latex_document
-        cache_literal(@polytex, :latex)
+        cache_literal(@polytex, :latex).tap do |doc|
+          expand_input!(doc,
+                        Proc.new { |source| cache_literal(source, :latex) },
+                        'tex')
+        end
       end
 
       # Convert GIFs to PNGs.

data/lib/polytexnic/preprocessors/polytex.rb

@@ -86,10 +86,12 @@ module Polytexnic
       def to_polytex
         math_cache = {}
         cleaned_markdown = cache_code_environments(@source)
+        expand_input!(cleaned_markdown,
+                      Proc.new { |source| cache_code_environments(source) })
+
         puts cleaned_markdown if debug?
         cleaned_markdown.tap do |markdown|
           convert_code_inclusion(markdown)
-          expand_input(markdown)
           cache_latex_literal(markdown)
           cache_raw_latex(markdown)
           cache_image_locations(markdown)
@@ -188,14 +190,6 @@ module Polytexnic
         end
       end
 
-      # Expands '\input' command by processing & inserting the target source.
-      def expand_input(text)
-        text.gsub!(/^[ \t]*\\input\{(.*?)\}[ \t]*$/) do
-          source = File.read("#{$1}.md")
-          Polytexnic::Pipeline.new(source, source: :markdown).polytex
-        end
-      end
-
       # Restores raw code from the cache.
       def restore_hashed_content(text)
         $cache.each do |key, value|

data/lib/polytexnic/utils.rb

@@ -31,6 +31,18 @@ module Polytexnic
       @tralics ||= executable
     end
 
+
+    # Expands '\input' command by processing & inserting the target source.
+    def expand_input!(text, code_function, ext = 'md')
+      text.gsub!(/^[ \t]*\\input\{(.*?)\}[ \t]*$/) do
+        included_text = File.read("#{$1}.#{ext}")
+        code_function.call(included_text).tap do |clean_text|
+          # Recursively substitute '\input' in included text.
+          expand_input!(clean_text, code_function, ext)
+        end
+      end
+    end
+
     # Returns true for OS X Mountain Lion (10.8) and later.
     def os_x_newer?
       os_x? && !os_x_older?

data/lib/polytexnic/version.rb

@@ -1,3 +1,3 @@
 module Polytexnic
-  VERSION = "1.0.beta1"
+  VERSION = "1.0.beta2"
 end

data/spec/markdown_to_polytex_spec.rb

@@ -531,10 +531,33 @@ def hello; puts 'hello'; end
 
     describe '\input command' do
       let(:external_file) { 'foo.md' }
-      before { File.write(external_file, input) }
-      after { File.unlink(external_file) }
+      let(:nested_external_file) { 'bar.md' }
+      let(:input) do <<-'EOS'
+Lorem ipsum
+```ruby
+def foo; 'foo'; end
+```
+Lorem *ipsum* dolor sit amet
+
+\input{bar}
+        EOS
+      end
+      let(:nested_input) do <<-'EOS'
+Lorem ipsum
+```python
+def bar(): return "bar"
+```
+        EOS
+      end
+      before do
+        File.write(external_file, input)
+        File.write(nested_external_file, nested_input)
+      end
+      after do
+        File.unlink(external_file)
+        File.unlink(nested_external_file)
+      end
 
-      let(:input)  { 'lorem *ipsum* dolor sit amet' }
       let(:output) do
         Polytexnic::Pipeline.new(input, source: :markdown).polytex
       end

data/spec/to_html/input_spec.rb

@@ -0,0 +1,51 @@
+# encoding=utf-8
+require 'spec_helper'
+
+describe 'Polytexnic::Pipeline#to_html' do
+
+  let(:pipeline) { Polytexnic::Pipeline.new(polytex) }
+  subject(:processed_text) { pipeline.to_html }
+
+ describe '\input command' do
+    let(:external_file) { 'foo.tex' }
+    let(:nested_external_file) { 'bar.tex' }
+    let(:input) do <<-'EOS'
+Lorem ipsum
+%= lang:ruby
+\begin{code}
+def foo; 'foo'; end
+\end{code}
+Lorem \emph{ipsum} dolor sit amet
+
+\input{bar}
+      EOS
+    end
+    let(:nested_input) do <<-'EOS'
+Lorem ipsum
+%= lang:python
+\begin{code}
+def bar(): return "bar"
+\end{code}
+      EOS
+    end
+    before do
+      File.write(external_file, input)
+      File.write(nested_external_file, nested_input)
+    end
+    after do
+      File.unlink(external_file)
+      File.unlink(nested_external_file)
+    end
+
+    let(:polytex) { "\\chapter{Foo}\n\n  \\input{foo}  " }
+    let(:foo_html) do
+      '<div class="code"><div class="highlight"><pre><span class="k">def</span> <span class="nf">foo</span>'
+    end
+    let(:bar_html) do
+      '<div class="code"><div class="highlight"><pre><span class="k">def</span> <span class="nf">bar</span><span class="p">():'
+    end
+
+    it { should include foo_html }
+    it { should include bar_html }
+  end
+end

data/spec/to_latex_spec.rb

@@ -217,5 +217,49 @@ end
       it { should include '\image{bar.png}' }
       it { should include '\imagebox{baz.png}' }
     end
+
+   describe '\input command' do
+      let(:external_file) { 'foo.tex' }
+      let(:nested_external_file) { 'bar.tex' }
+      let(:input) do <<-'EOS'
+  Lorem ipsum
+  %= lang:ruby
+  \begin{code}
+  def foo; 'foo'; end
+  \end{code}
+  Lorem \emph{ipsum} dolor sit amet
+
+  \input{bar}
+        EOS
+      end
+      let(:nested_input) do <<-'EOS'
+  Lorem ipsum
+  %= lang:python
+  \begin{code}
+  def bar(): return "bar"
+  \end{code}
+        EOS
+      end
+      before do
+        File.write(external_file, input)
+        File.write(nested_external_file, nested_input)
+      end
+      after do
+        File.unlink(external_file)
+        File.unlink(nested_external_file)
+      end
+
+      let(:polytex) { "\\chapter{Foo}\n\n  \\input{foo}  " }
+      let(:foo_latex) do
+        '\PY{k}{def} \PY{n+nf}{foo}\PY{p}{;}'
+      end
+      let(:bar_latex) do
+        '\PY{k}{def} \PY{n+nf}{bar}\PY{p}{(}\PY{p}{)}\PY{p}{:}'
+      end
+
+      it { should include foo_latex }
+      it { should include bar_latex }
+      it { should_not include 'xmlelement' }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 1.0.beta1
+  version: 1.0.beta2
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -256,6 +256,7 @@ files:
 - spec/to_html/eqref_spec.rb
 - spec/to_html/footnote_spec.rb
 - spec/to_html/graphics_and_figures_spec.rb
+- spec/to_html/input_spec.rb
 - spec/to_html/lists_spec.rb
 - spec/to_html/literal_environments/code_spec.rb
 - spec/to_html/literal_environments/math_spec.rb
@@ -318,6 +319,7 @@ test_files:
 - spec/to_html/eqref_spec.rb
 - spec/to_html/footnote_spec.rb
 - spec/to_html/graphics_and_figures_spec.rb
+- spec/to_html/input_spec.rb
 - spec/to_html/lists_spec.rb
 - spec/to_html/literal_environments/code_spec.rb
 - spec/to_html/literal_environments/math_spec.rb