polytexnic 0.9.10 → 1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d1357e1fdbafae6d29c54a966649109ceaef92f
-  data.tar.gz: a15026b6f6b37bc2c37fe9d9fa81571b62e3bf59
+  metadata.gz: 751a1b5ecbbcd95df78fdc4651d8ec270990abbb
+  data.tar.gz: b57645b0af7b1d4c1a3067f0a2d8d954937348fc
 SHA512:
-  metadata.gz: a38508985733c163261cd035a86d60c793b22c4027d737dee582431859163765ace742a67649599aba8225739f672f3018104e7c06f0225d899aa2e592cc95f3
-  data.tar.gz: da175c2ed00d3b95b8ff7c849123ec76dc6fb4980e3fb445a96fff73f93b75e93918ba461998605d121217a807bf8abad75fb0b7aef2220c0b91a324c2007413
+  metadata.gz: 44ca3dac0ba83a5089e4066f82ec3330010c3e4020bfee990225282530d52c72cc972842ea63386fd2419b9025579014b2545bc2c1b262809c18c43de449a78f
+  data.tar.gz: 053ea3fcf06caac0461614417ca3b856fea2632dcf28491608dfe01445a745cf45e011a2488caeed12ddd38c42ea2a77449aeabbabf9cd4e68790560e5c11d44

data/lib/polytexnic/postprocessors/html.rb

@@ -602,12 +602,26 @@ module Polytexnic
           end
         end
 
+        # Converts colored text to HTML.
         def coloredtext(doc)
+          # Handle \coloredtext{red}{text}
           doc.xpath('//coloredtext').each do |node|
             node.name  = 'span'
             node['style'] = "color: #{node['color']}"
             clean_node node, 'color'
           end
+
+          # Handle \coloredtexthtml{ff0000}{text}
+          doc.xpath('//coloredtexthtml').each do |node|
+            node.name  = 'span'
+            color = node['color']
+            # Catch common case of using lower-case hex.
+            if color =~ /[a-f]/
+              raise "RGB hex color must be upper-case (for LaTeX's sake)"
+            end
+            node['style'] = "color: ##{color}"
+            clean_node node, 'color'
+          end
         end
 
         # Converts filesystem path (\filepath) to the proper tag.

data/lib/polytexnic/preprocessors/polytex.rb

@@ -89,6 +89,7 @@ module Polytexnic
         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)
@@ -187,6 +188,14 @@ 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

@@ -113,6 +113,7 @@ module Polytexnic
 \newcommand{\sout}[1]{\xmlelt{sout}{#1}}
 \newcommand{\kode}[1]{\xmlelt{kode}{#1}}
 \newcommand{\coloredtext}[2]{\xmlelt{coloredtext}{\AddAttToCurrent{color}{#1}#2}}
+\newcommand{\coloredtexthtml}[2]{\xmlelt{coloredtexthtml}{\AddAttToCurrent{color}{#1}#2}}
 \newcommand{\filepath}[1]{\xmlelt{filepath}{#1}}
 \newcommand{\image}[1]{\xmlelt{image}{#1}}
 \newcommand{\imagebox}[1]{\xmlelt{imagebox}{#1}}

data/lib/polytexnic/version.rb

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

data/spec/markdown_to_polytex_spec.rb

@@ -528,5 +528,19 @@ def hello; puts 'hello'; end
         end
       end
     end
+
+    describe '\input command' do
+      let(:external_file) { 'foo.md' }
+      before { File.write(external_file, input) }
+      after { File.unlink(external_file) }
+
+      let(:input)  { 'lorem *ipsum* dolor sit amet' }
+      let(:output) do
+        Polytexnic::Pipeline.new(input, source: :markdown).polytex
+      end
+      let(:source) { "# Foo\n\n  \\input{foo}  " }
+
+      it { should include output }
+    end
   end
 end

data/spec/to_html/text_formatting_spec.rb

@@ -47,9 +47,24 @@ describe 'Polytexnic::Pipeline#to_html' do
       it { should resemble '<code>function_name</code>' }
     end
 
-    describe "color command" do
-      let(:polytex) { '\coloredtext{red}{text}' }
-      it { should resemble '<span style="color: red">text</span>' }
+    context "coloredtext" do
+      describe "coloredtext command" do
+        let(:polytex) { '\coloredtext{red}{text}' }
+        it { should resemble '<span style="color: red">text</span>' }
+      end
+
+      context "coloredtexthtml command" do
+        describe "with a lower-case hex color" do
+          let(:polytex) { '\coloredtexthtml{ff0000}{text}' }
+          it "should raise an error" do
+            expect { processed_text }.to raise_error
+          end
+        end
+        describe "with an upper-case hex color" do
+          let(:polytex) { '\coloredtexthtml{FF0000}{text}' }
+          it { should resemble '<span style="color: #FF0000">text</span>' }
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polytexnic
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 1.0.beta1
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -205,6 +205,7 @@ files:
 - .pull_requests/1388802190
 - .pull_requests/1389652617
 - .pull_requests/1395697424
+- .pull_requests/1403381407
 - .rspec
 - Gemfile
 - Guardfile
@@ -283,9 +284,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14