hemingway 0.0.2 → 0.0.3

data/lib/hemingway/latex.treetop

@@ -34,7 +34,7 @@ module Hemingway
     #   have to dig past to get at the list. elements[0] refers to the array of
     #   tags or texts here.
     rule paragraph
-      sequence:( content / footnote )* eop <ParagraphNode>
+      sequence:( content / footnote / !eop newline )* eop <ParagraphNode>
     end
 
     # The last paragraph in an entry need not end with \n\n. Because this
@@ -43,7 +43,7 @@ module Hemingway
     # to consume. The only time I can imagine this happening would be at
     # the end of an entry.
     rule last_paragraph
-      sequence:( content / footnote )+ eop? <ParagraphNode>
+      sequence:( content / footnote / !eop newline )+ eop? <ParagraphNode>
     end
 
     # Example: \tag{text} or just text or $\Delta$
@@ -58,7 +58,7 @@ module Hemingway
 
     # Treetop does not separate lexing from parsing. Must consume all input.
     rule whitespace
-      ( " " / newline )*
+      ( " " / newline )+ <WhitespaceNode>
     end
 
     rule spaces
@@ -74,7 +74,7 @@ module Hemingway
     end
 
     rule newline
-      "\n"
+      "\n" <NewlineNode>
     end
 
   end

data/lib/hemingway/latex_nodes.rb

@@ -22,6 +22,8 @@ module Hemingway
         if element.respond_to?(:footnote_html)
           footnote_seed += 1
           element.html(footnote_seed)
+        elsif element.respond_to?(:newline)
+          element.newline.html
         else
           element.html
         end
@@ -40,6 +42,20 @@ module Hemingway
         end
       end
     end
+  end
+
+  module NewlineNode
+    def html
+    end
+
+    def visible_html
+      "\n"
+    end
+  end
 
+  module WhitespaceNode
+    def html
+    end
   end
+
 end

data/lib/hemingway/math/math.rb

@@ -16,7 +16,7 @@ module Hemingway
         elements[0]
       end
 
-      def symbol
+      def content
         elements[1]
       end
 
@@ -40,11 +40,23 @@ module Hemingway
       r1 = _nt_math_start
       s0 << r1
       if r1
-        r2 = _nt_symbol
+        i2 = index
+        r3 = _nt_symbol
+        if r3
+          r2 = r3
+        else
+          r4 = _nt_exponent
+          if r4
+            r2 = r4
+          else
+            @index = i2
+            r2 = nil
+          end
+        end
         s0 << r2
         if r2
-          r3 = _nt_math_end
-          s0 << r3
+          r5 = _nt_math_end
+          s0 << r5
         end
       end
       if s0.last
@@ -78,6 +90,78 @@ module Hemingway
       r0
     end
 
+    module Exponent0
+      def value
+        elements[1]
+      end
+
+    end
+
+    def _nt_exponent
+      start_index = index
+      if node_cache[:exponent].has_key?(index)
+        cached = node_cache[:exponent][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0, s0 = index, []
+      if has_terminal?("^{", false, index)
+        r1 = instantiate_node(SyntaxNode,input, index...(index + 2))
+        @index += 2
+      else
+        terminal_parse_failure("^{")
+        r1 = nil
+      end
+      s0 << r1
+      if r1
+        i2 = index
+        if has_terminal?("\\circ", false, index)
+          r3 = instantiate_node(SyntaxNode,input, index...(index + 5))
+          @index += 5
+        else
+          terminal_parse_failure("\\circ")
+          r3 = nil
+        end
+        if r3
+          r2 = r3
+        else
+          r4 = _nt_text
+          if r4
+            r2 = r4
+          else
+            @index = i2
+            r2 = nil
+          end
+        end
+        s0 << r2
+        if r2
+          if has_terminal?("}", false, index)
+            r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure("}")
+            r5 = nil
+          end
+          s0 << r5
+        end
+      end
+      if s0.last
+        r0 = instantiate_node(ExponentNode,input, i0...index, s0)
+        r0.extend(Exponent0)
+      else
+        @index = i0
+        r0 = nil
+      end
+
+      node_cache[:exponent][start_index] = r0
+
+      r0
+    end
+
     def _nt_math_start
       start_index = index
       if node_cache[:math_start].has_key?(index)

data/lib/hemingway/math/math.treetop

@@ -5,7 +5,7 @@ module Hemingway
 
     # Example: $ \Pi = 3.14159 $
     rule math
-      math_start symbol math_end <MathNode>
+      math_start content:( symbol / exponent ) math_end <MathNode>
     end
 
     # Example : \Pi
@@ -17,6 +17,10 @@ module Hemingway
       math_symbol
     end
 
+    rule exponent
+      "^{" value:( "\\circ" / text ) "}" <ExponentNode>
+    end
+
     rule math_start
       "$"
     end

data/lib/hemingway/math/math_nodes.rb

@@ -1,7 +1,20 @@
 module Hemingway
   module MathNode
     def html
-      symbol.html
+      content.html
     end
   end
+
+  module ExponentNode
+  	def html
+      # Pretty bad hack, but I figure it ain't a big deal until I want to
+      # support more rebust syntax.
+      if value.text_value == "\\circ"
+        "°"
+      else
+        Build.tag("sup", value.html)
+      end
+    end
+  end
+
 end

data/lib/hemingway/special/special.rb

@@ -107,8 +107,19 @@ module Hemingway
                     if r9
                       r2 = r9
                     else
-                      @index = i2
-                      r2 = nil
+                      if has_terminal?("textbackslash{}", false, index)
+                        r10 = instantiate_node(SyntaxNode,input, index...(index + 15))
+                        @index += 15
+                      else
+                        terminal_parse_failure("textbackslash{}")
+                        r10 = nil
+                      end
+                      if r10
+                        r2 = r10
+                      else
+                        @index = i2
+                        r2 = nil
+                      end
                     end
                   end
                 end

data/lib/hemingway/special/special.treetop

@@ -6,7 +6,7 @@ module Hemingway
     # Special characters that need to be escaped in Latex.
     # Example: War \& Peace
     rule special
-      escape character:( "#" / "$" / "%" / "&" / "_" / "{" / "}" ) <SpecialNode>
+      escape character:( "#" / "$" / "%" / "&" / "_" / "{" / "}" / "textbackslash{}" ) <SpecialNode>
     end
 
     rule escape

data/lib/hemingway/special/special_nodes.rb

@@ -1,7 +1,11 @@
 module Hemingway
-  module SpecialNode
-    def html
-      character.text_value
-    end 
-  end
+	module SpecialNode
+		def html
+			if character.text_value == "textbackslash{}"
+				"\\"
+			else
+				character.text_value
+			end
+		end
+	end
 end

data/lib/hemingway/symbol/symbol.rb

@@ -408,8 +408,20 @@ module Hemingway
                                                                             r0 = r35
                                                                             r0.extend(SymbolNode)
                                                                           else
-                                                                            @index = i0
-                                                                            r0 = nil
+                                                                            if has_terminal?("\\rightarrow", false, index)
+                                                                              r36 = instantiate_node(SyntaxNode,input, index...(index + 11))
+                                                                              @index += 11
+                                                                            else
+                                                                              terminal_parse_failure("\\rightarrow")
+                                                                              r36 = nil
+                                                                            end
+                                                                            if r36
+                                                                              r0 = r36
+                                                                              r0.extend(SymbolNode)
+                                                                            else
+                                                                              @index = i0
+                                                                              r0 = nil
+                                                                            end
                                                                           end
                                                                         end
                                                                       end

data/lib/hemingway/symbol/symbol.treetop

@@ -39,7 +39,8 @@ module Hemingway
         "\\phi" /
         "\\chi" /
         "\\psi" /
-        "\\omega"
+        "\\omega" /
+        "\\rightarrow"
       ) <SymbolNode>
     end
 

data/lib/hemingway/tag/tag.rb

@@ -75,6 +75,21 @@ module Hemingway
       end
     end
 
+    module Tag5
+      def tag_start
+        elements[0]
+      end
+
+      def accent
+        elements[1]
+      end
+
+      def character
+        elements[3]
+      end
+
+    end
+
     def _nt_tag
       start_index = index
       if node_cache[:tag].has_key?(index)
@@ -249,8 +264,56 @@ module Hemingway
             if r23
               r0 = r23
             else
-              @index = i0
-              r0 = nil
+              i26, s26 = index, []
+              r27 = _nt_tag_start
+              s26 << r27
+              if r27
+                r28 = _nt_accent
+                s26 << r28
+                if r28
+                  if has_terminal?("{", false, index)
+                    r29 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                    @index += 1
+                  else
+                    terminal_parse_failure("{")
+                    r29 = nil
+                  end
+                  s26 << r29
+                  if r29
+                    if index < input_length
+                      r30 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                      @index += 1
+                    else
+                      terminal_parse_failure("any character")
+                      r30 = nil
+                    end
+                    s26 << r30
+                    if r30
+                      if has_terminal?("}", false, index)
+                        r31 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                        @index += 1
+                      else
+                        terminal_parse_failure("}")
+                        r31 = nil
+                      end
+                      s26 << r31
+                    end
+                  end
+                end
+              end
+              if s26.last
+                r26 = instantiate_node(AccentNode,input, i26...index, s26)
+                r26.extend(Tag5)
+              else
+                @index = i26
+                r26 = nil
+              end
+              if r26
+                r0 = r26
+              else
+                @index = i0
+                r0 = nil
+              end
             end
           end
         end
@@ -481,6 +544,103 @@ module Hemingway
       r0
     end
 
+    def _nt_accent
+      start_index = index
+      if node_cache[:accent].has_key?(index)
+        cached = node_cache[:accent][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0 = index
+      if has_terminal?('`', false, index)
+        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        terminal_parse_failure('`')
+        r1 = nil
+      end
+      if r1
+        r0 = r1
+      else
+        if has_terminal?("'", false, index)
+          r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure("'")
+          r2 = nil
+        end
+        if r2
+          r0 = r2
+        else
+          if has_terminal?('^', false, index)
+            r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure('^')
+            r3 = nil
+          end
+          if r3
+            r0 = r3
+          else
+            if has_terminal?('"', false, index)
+              r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure('"')
+              r4 = nil
+            end
+            if r4
+              r0 = r4
+            else
+              if has_terminal?("c", false, index)
+                r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure("c")
+                r5 = nil
+              end
+              if r5
+                r0 = r5
+              else
+                if has_terminal?("~", false, index)
+                  r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                  @index += 1
+                else
+                  terminal_parse_failure("~")
+                  r6 = nil
+                end
+                if r6
+                  r0 = r6
+                else
+                  if has_terminal?("r", false, index)
+                    r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                    @index += 1
+                  else
+                    terminal_parse_failure("r")
+                    r7 = nil
+                  end
+                  if r7
+                    r0 = r7
+                  else
+                    @index = i0
+                    r0 = nil
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
+      node_cache[:accent][start_index] = r0
+
+      r0
+    end
+
     def _nt_tag_start
       start_index = index
       if node_cache[:tag_start].has_key?(index)