jekyll-pseudo 0.1.4 → 0.1.6

data/lib/jekyll-pseudo/brush.rb

@@ -12,7 +12,7 @@ module Jekyll
       end
 
       # format a variable
-      def var(txt)
+      def var(txt, sub)
         raise 'not implemented'
       end
 

data/lib/jekyll-pseudo/grammar.rb

@@ -1,7 +1,7 @@
 module Jekyll
   module Pseudo
     class Grammar
-      # format a block of text, giving html as output
+      # parse a block of text, using the given brush to format output (works in a single pass)
       def format(txt, brush)
         results = []
 
@@ -10,14 +10,28 @@ module Jekyll
           [/\b([A-Z]\w+)/, :sym],
           [/(\w+)(?=[({\[])/, :fn],
           [/(\".*?\")/, :string],
-          [/(<-|->|\+\+|<=|>=|--)/, :op], # try these operations first
+          [/(<-|->|\+\+|<=|>=|--)/, :op],  # try these operators first
           [/([-()\[\]{}=<>+*])/, :op],     # and these second
+          [/\b([a-z][a-zA-Z0-9]*)(_[a-zA-Z0-9]+)?/, :var],
           [/^(\s+)/, :indent]
         ]
-        
-        txt.strip!
 
-        # lazy man's parser (we don't do that backtracking business)
+        # replace tabs with three spaces
+        txt.gsub! /^\t/, '   '
+
+        # count leading whitespace
+        ws = txt.scan(/^ */).map do |leading|
+          leading.size
+        end
+        leading = (ws.min or 0)
+
+        # remove leading whitespace of the given length
+        if leading > 0
+          r = /^ {#{leading}}/
+          txt.gsub! r, ''
+        end
+
+        # lazy man's parser (we don't do any of that silly backtracking)
         cursor = 0
         while true
           matches = mappings.map do |pair|
@@ -36,10 +50,10 @@ module Jekyll
           if upto[0] != nil
             results << brush.plain(txt.slice(cursor, upto[0].begin(0)-cursor))
 
-            match = upto[0][1]
             # which match?
-            results << brush.method(upto[1]).call(match)
-            cursor = upto[0].end(1)
+            captures = upto[0].captures
+            results << brush.method(upto[1]).call(*captures)
+            cursor = upto[0].end(0)
           else
             # no matches remaining
             results << brush.plain(txt.slice(cursor, txt.size))
@@ -47,8 +61,6 @@ module Jekyll
           end
         end
 
-        # puts "FINAL: #{results.inspect}"
-        # puts "     = #{results.join('').inspect}"
         return results.join('')
       end
     end

data/lib/jekyll-pseudo/html_brush.rb

@@ -11,8 +11,12 @@ module Jekyll
         "<span class='function'>#{txt}</span>"
       end
 
-      def var(txt)
-        "<span class='variable'>#{var}</span>"
+      def var(txt, sub)
+        if sub
+          "#{txt}<sub>#{sub.slice(1,sub.size)}</sub>"
+        else
+          "#{txt}"
+        end
       end
 
       def comment(txt)
@@ -37,6 +41,8 @@ module Jekyll
         when '<-' then '&larr;'
         when '->' then '&rarr;'
         when '*' then '&times;'
+        when '[' then '&#65339;'
+        when ']' then '&#65341;'
         else txt
         end
         # FIXME: html conversion for some operators

data/lib/jekyll-pseudo/mock_brush.rb

@@ -11,8 +11,12 @@ module Jekyll
         "fn(#{txt})"
       end
 
-      def var(txt)
-        "var(#{var})"
+      def var(txt, sub)
+        if sub
+          "#{txt}sub(#{sub.slice(1,sub.size)})"
+        else
+          txt
+        end
       end
 
       def comment(txt)

data/lib/jekyll-pseudo/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Pseudo
-    VERSION = "0.1.4"
+    VERSION = "0.1.6"
   end
 end

data/spec/grammar_spec.rb

@@ -1,6 +1,5 @@
 require_relative '../lib/jekyll-pseudo.rb'
 require_relative '../lib/jekyll-pseudo/mock_brush.rb'
-# require 'spec_helper'
 
 include Jekyll::Pseudo
 
@@ -34,10 +33,21 @@ describe Grammar do
       format('oh "what" a world!').should eql 'oh str("what") a world!'
     end
 
+    it 'formats variables' do
+      format('x_0').should eql ('xsub(0)')
+      format('x_i').should eql ('xsub(i)')
+    end    
+
     it 'formats functions' do
       format('fn(b,c)').should eql('fn(fn)op(()b,cop())')
       format('fn[b,c]').should eql('fn(fn)op([)b,cop(])')
       format('fn{b,c}').should eql('fn(fn)op({)b,cop(})')
     end
+
+    it 'strips leading whitespace' do
+      format("\thi\n\tthere").should eql("hi\nthere")
+      format("\thi\n\t\tthere").should eql("hi\ni(\t)there")
+      format("\t\thi\n\tthere").should eql("i(\t)hi\nthere")
+    end
   end
 end

data/spec/html_spec.rb

@@ -23,6 +23,10 @@ describe HtmlBrush do
       format("# hi!").should eql "<span class='comment'>/* hi! */</span>"
     end
 
+    it "variable span" do
+      format("a_b").should eql "a<sub>b</sub>"
+    end
+
     it "operator converstions" do
       format("<").should eql "<span class='op'>&#12296;</span>"
       format("*").should eql "<span class='op'>&times;</span>"

metadata

@@ -1,36 +1,44 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jekyll-pseudo
-version: !ruby/object:Gem::Version
-  version: 0.1.4
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 6
+  version: 0.1.6
 platform: ruby
-authors:
+authors: 
 - Wiktor Macura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-01 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: jekyll
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: jekyll-pseudo helps typeset pseudocode with minimal formatting
-email:
+email: 
 - wmacura@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .ruby-version
 - Gemfile
@@ -46,29 +54,36 @@ files:
 - lib/jekyll-pseudo/version.rb
 - spec/grammar_spec.rb
 - spec/html_spec.rb
+has_rdoc: true
 homepage: http://github.com/wkm/jekyll-pseudo
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A trivial jekyll plugin for formatting pseudocode
-test_files:
+test_files: 
 - spec/grammar_spec.rb
 - spec/html_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 6675c1135d5bedd8f3fc925ba10e589246d04d63
-  data.tar.gz: 81f4f5f0b5e2dd9c79cc373140cb08a3fffe52d8
-SHA512:
-  metadata.gz: 3042a6d5ec4c71a0ac59162aad2d80eb3430ca85c2183876e1763d939db509de8e563a2c65c377f2d1b1f2f737b92e947660aeb02442a82968aa1d83a65612d7
-  data.tar.gz: 3db7b240dbc2f0832f0770c51f345912a1d4c0be5e2aeac454162e063c199bc8a2b0754600734442836167c02076f7a6efe742f18569a99176bb6ab337edd28c