hemingway 0.0.2 → 0.0.3

data/lib/hemingway/block/block.treetop

@@ -2,6 +2,7 @@ require "hemingway/block/block_nodes"
 require "hemingway/block/list/list"
 require "hemingway/block/verbatim/verbatim"
 require "hemingway/block/quote/quote"
+require "hemingway/block/center/center"
 
 module Hemingway
   grammar Block
@@ -9,6 +10,7 @@ module Hemingway
     include List
     include Verbatim
     include Quote
+    include Center
 
     # Example:
     #   \begin{itemize}
@@ -18,9 +20,10 @@ module Hemingway
     #   \end{itemize}
     rule block
       (
-        block_start type:list_type "}" whitespace content:list whitespace block_end list_type "}" &{ |seq| seq[1].text_value == seq[7].text_value } /
-        block_start type:verbatim_type "}" whitespace content:verbatim whitespace block_end verbatim_type "}" /
-        block_start type:quote_type "}" whitespace content:quote_entry whitespace block_end quote_type "}"
+        block_start type:list_type "}" whitespace? content:list whitespace? block_end list_type "}" &{ |seq| seq[1].text_value == seq[7].text_value } /
+        block_start type:verbatim_type "}" whitespace? content:verbatim whitespace? block_end verbatim_type "}" /
+        block_start type:quote_type "}" whitespace? content:quote_entry whitespace? block_end quote_type "}" /
+        block_start type:center_type "}" whitespace? content:center whitespace? block_end center_type "}"
       ) <BlockNode>
     end
 

data/lib/hemingway/block/center/center.rb

@@ -0,0 +1,134 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+require "hemingway/block/center/center_nodes"
+
+module Hemingway
+  module Block
+    module Center
+      include Treetop::Runtime
+
+      def root
+        @root ||= :center
+      end
+
+      module Center0
+        def block_end
+          elements[0]
+        end
+
+        def center_type
+          elements[1]
+        end
+      end
+
+      module Center1
+        def content
+          elements[1]
+        end
+      end
+
+      def _nt_center
+        start_index = index
+        if node_cache[:center].has_key?(index)
+          cached = node_cache[:center][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        s0, i0 = [], index
+        loop do
+          i1 = index
+          i2, s2 = index, []
+          i3 = index
+          i4, s4 = index, []
+          r5 = _nt_block_end
+          s4 << r5
+          if r5
+            r6 = _nt_center_type
+            s4 << r6
+          end
+          if s4.last
+            r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+            r4.extend(Center0)
+          else
+            @index = i4
+            r4 = nil
+          end
+          if r4
+            r3 = nil
+          else
+            @index = i3
+            r3 = instantiate_node(SyntaxNode,input, index...index)
+          end
+          s2 << r3
+          if r3
+            r7 = _nt_content
+            s2 << r7
+          end
+          if s2.last
+            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+            r2.extend(Center1)
+          else
+            @index = i2
+            r2 = nil
+          end
+          if r2
+            r1 = r2
+          else
+            r8 = _nt_newline
+            if r8
+              r1 = r8
+            else
+              @index = i1
+              r1 = nil
+            end
+          end
+          if r1
+            s0 << r1
+          else
+            break
+          end
+        end
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+
+        node_cache[:center][start_index] = r0
+
+        r0
+      end
+
+      def _nt_center_type
+        start_index = index
+        if node_cache[:center_type].has_key?(index)
+          cached = node_cache[:center_type][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        if has_terminal?("center", false, index)
+          r0 = instantiate_node(CenterNode,input, index...(index + 6))
+          @index += 6
+        else
+          terminal_parse_failure("center")
+          r0 = nil
+        end
+
+        node_cache[:center_type][start_index] = r0
+
+        r0
+      end
+
+    end
+
+    class CenterParser < Treetop::Runtime::CompiledParser
+      include Center
+    end
+
+  end
+end

data/lib/hemingway/block/center/center.treetop

@@ -0,0 +1,17 @@
+require "hemingway/block/center/center_nodes"
+
+module Hemingway
+  module Block
+    grammar Center
+
+      rule center
+        ( !( block_end center_type ) content / newline )*
+      end
+
+      rule center_type
+        "center" <CenterNode>
+      end
+
+    end
+  end
+end

data/lib/hemingway/block/center/center_nodes.rb

@@ -0,0 +1,17 @@
+module Hemingway
+
+  module CenterNode
+    def html(block_content)
+      content = block_content.elements.map do |e|
+        if e.respond_to?(:content)
+          e.content.html
+        else
+          e.visible_html
+        end
+      end.join
+
+      Build.tag("div", content , class: "center")
+    end
+  end
+
+end

data/lib/hemingway/block/list/list.rb

@@ -98,10 +98,6 @@ module Hemingway
       end
 
       module Item0
-        def whitespace1
-          elements[1]
-        end
-
         def label
           elements[2]
         end
@@ -109,10 +105,6 @@ module Hemingway
         def sequence
           elements[3]
         end
-
-        def whitespace2
-          elements[4]
-        end
       end
 
       def _nt_item
@@ -136,32 +128,45 @@ module Hemingway
         end
         s0 << r1
         if r1
-          r2 = _nt_whitespace
+          r3 = _nt_whitespace
+          if r3
+            r2 = r3
+          else
+            r2 = instantiate_node(SyntaxNode,input, index...index)
+          end
           s0 << r2
           if r2
-            r4 = _nt_label
-            if r4
-              r3 = r4
+            r5 = _nt_label
+            if r5
+              r4 = r5
             else
-              r3 = instantiate_node(SyntaxNode,input, index...index)
+              r4 = instantiate_node(SyntaxNode,input, index...index)
             end
-            s0 << r3
-            if r3
-              s5, i5 = [], index
+            s0 << r4
+            if r4
+              s6, i6 = [], index
               loop do
-                r6 = _nt_content
-                if r6
-                  s5 << r6
+                i7 = index
+                r8 = _nt_content
+                if r8
+                  r7 = r8
+                else
+                  r9 = _nt_whitespace
+                  if r9
+                    r7 = r9
+                  else
+                    @index = i7
+                    r7 = nil
+                  end
+                end
+                if r7
+                  s6 << r7
                 else
                   break
                 end
               end
-              r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-              s0 << r5
-              if r5
-                r7 = _nt_whitespace
-                s0 << r7
-              end
+              r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+              s0 << r6
             end
           end
         end

data/lib/hemingway/block/list/list.treetop

@@ -17,7 +17,7 @@ module Hemingway
       end
 
       rule item
-       "\\item" whitespace label:label? sequence:content* whitespace <ItemNode>
+       "\\item" whitespace? label:label? sequence:( content / whitespace )* <ItemNode>
       end
 
       rule label

data/lib/hemingway/build.rb

@@ -5,13 +5,15 @@ module Hemingway
   class Build
     def self.tag(html_attribute, html_content=nil, options={})
       String.new.tap do |t|
-        t << "<" + html_attribute
-        t << " id='" + options[:id] + "'" if options[:id]
-        t << " class='" + options[:class] + "'" if options[:class]
-        t << " href='" + options[:href] + "'" if options[:href]
+        t << "<#{html_attribute}"
+
+        options.select { |k, v| k != :close_tag }.each do |k, v|
+          t << " #{k}='#{v}'"
+        end
+
         t << ">"
         t << html_content if html_content
-        t << "</" + html_attribute + ">" unless options[:close_tag] == false
+        t << "</#{html_attribute}>" unless options[:close_tag] == false
       end
     end
 
@@ -19,6 +21,11 @@ module Hemingway
       latex_sym_to_html[symbol]
     end
 
+    # return the accented character or just the character if no match.
+    def self.accent(character, accent)
+      character_accent_to_html[character] and character_accent_to_html[character][accent] or character
+    end
+
     private
     def self.latex_sym_to_html
       {
@@ -56,7 +63,98 @@ module Hemingway
         "\\phi" =>  "&phi;",
         "\\chi" =>  "&chi;",
         "\\psi" =>  "&psi;",
-        "\\omega" =>  "&omega;"
+        "\\omega" =>  "&omega;",
+        "\\rightarrow" => "&rArr;"
+      }
+    end
+
+    def self.character_accent_to_html
+      {
+        "A" => {
+          "`" => "&Agrave;",
+          "'" => "&Aacute;",
+          "c" => "&Acirc;",
+          "~" => "&Atilde;",
+          '"' => "&Auml;",
+          "r" => "&Aring;"
+        },
+        "C" => {
+          "c" => "&Ccedil;"
+        },
+        "E" => {
+          "`" => "&Egrave;",
+          "'" => "&Eacute;",
+          "c" => "&Ecirc;",
+          '"' => "&Euml;"
+        },
+        "I" => {
+          "`" => "&Igrave;",
+          "'" => "&Iacute;",
+          "c" => "&Icirc;",
+          '"' => "&Iuml;"
+        },
+        "N" => {
+          "~" => "&Ntilde;"
+        },
+        "O" => {
+          "`" => "&Ograve;",
+          "'" => "&Oacute;",
+          "c" => "&Ocirc;",
+          "~" => "&Otilde;",
+          '"' => "&Ouml;"
+        },
+        "U" => {
+          "`" => "&Ugrave;",
+          "'" => "&Uacute;",
+          "c" => "&Ucirc;",
+          '"' => "&Uuml;"
+        },
+        "Y" => {
+          "'" => "&Yacute;"
+        },
+        "a" => {
+          "`" => "&agrave;",
+          "'" => "&aacute;",
+          "c" => "&acirc;",
+          "~" => "&atilde;",
+          '"' => "&auml;",
+          "r" => "&aring;"
+        },
+        "c" => {
+          "c" => "&ccedil;"
+        },
+        "e" => {
+          "`" => "&egrave;",
+          "'" => "&eacute;",
+          "c" => "&ecirc;",
+          '"' => "&euml;"
+        },
+        "i" => {
+          "`" => "&igrave;",
+          "'" => "&iacute;",
+          "c" => "&icirc;",
+          '"' => "&iuml;"
+        },
+        "n" => {
+          "~" => "&ntilde;"
+        },
+        "o" => {
+          "`" => "&ograve;",
+          "'" => "&oacute;",
+          "c" => "&ocirc;",
+          "~" => "&otilde;",
+          '"' => "&ouml;"
+        },
+        "u" => {
+          "`" => "&ugrave;",
+          "'" => "&uacute;",
+          "c" => "&ucirc;",
+          '"' => "&uuml;"
+        },
+        "y" => {
+          "'" => "&yacute;",
+          '"' => "&yuml;"
+        }
       }
     end
 

data/lib/hemingway/latex.rb

@@ -91,6 +91,12 @@ module Hemingway
     end
 
     module Paragraph0
+      def newline
+        elements[1]
+      end
+    end
+
+    module Paragraph1
       def sequence
         elements[0]
       end
@@ -123,8 +129,33 @@ module Hemingway
           if r4
             r2 = r4
           else
-            @index = i2
-            r2 = nil
+            i5, s5 = index, []
+            i6 = index
+            r7 = _nt_eop
+            if r7
+              r6 = nil
+            else
+              @index = i6
+              r6 = instantiate_node(SyntaxNode,input, index...index)
+            end
+            s5 << r6
+            if r6
+              r8 = _nt_newline
+              s5 << r8
+            end
+            if s5.last
+              r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+              r5.extend(Paragraph0)
+            else
+              @index = i5
+              r5 = nil
+            end
+            if r5
+              r2 = r5
+            else
+              @index = i2
+              r2 = nil
+            end
           end
         end
         if r2
@@ -136,12 +167,12 @@ module Hemingway
       r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
       s0 << r1
       if r1
-        r5 = _nt_eop
-        s0 << r5
+        r9 = _nt_eop
+        s0 << r9
       end
       if s0.last
         r0 = instantiate_node(ParagraphNode,input, i0...index, s0)
-        r0.extend(Paragraph0)
+        r0.extend(Paragraph1)
       else
         @index = i0
         r0 = nil
@@ -153,6 +184,12 @@ module Hemingway
     end
 
     module LastParagraph0
+      def newline
+        elements[1]
+      end
+    end
+
+    module LastParagraph1
       def sequence
         elements[0]
       end
@@ -182,8 +219,33 @@ module Hemingway
           if r4
             r2 = r4
           else
-            @index = i2
-            r2 = nil
+            i5, s5 = index, []
+            i6 = index
+            r7 = _nt_eop
+            if r7
+              r6 = nil
+            else
+              @index = i6
+              r6 = instantiate_node(SyntaxNode,input, index...index)
+            end
+            s5 << r6
+            if r6
+              r8 = _nt_newline
+              s5 << r8
+            end
+            if s5.last
+              r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+              r5.extend(LastParagraph0)
+            else
+              @index = i5
+              r5 = nil
+            end
+            if r5
+              r2 = r5
+            else
+              @index = i2
+              r2 = nil
+            end
           end
         end
         if r2
@@ -200,17 +262,17 @@ module Hemingway
       end
       s0 << r1
       if r1
-        r6 = _nt_eop
-        if r6
-          r5 = r6
+        r10 = _nt_eop
+        if r10
+          r9 = r10
         else
-          r5 = instantiate_node(SyntaxNode,input, index...index)
+          r9 = instantiate_node(SyntaxNode,input, index...index)
         end
-        s0 << r5
+        s0 << r9
       end
       if s0.last
         r0 = instantiate_node(ParagraphNode,input, i0...index, s0)
-        r0.extend(LastParagraph0)
+        r0.extend(LastParagraph1)
       else
         @index = i0
         r0 = nil
@@ -304,7 +366,12 @@ module Hemingway
           break
         end
       end
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      if s0.empty?
+        @index = i0
+        r0 = nil
+      else
+        r0 = instantiate_node(WhitespaceNode,input, i0...index, s0)
+      end
 
       node_cache[:whitespace][start_index] = r0
 
@@ -388,7 +455,7 @@ module Hemingway
       end
 
       if has_terminal?("\n", false, index)
-        r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        r0 = instantiate_node(NewlineNode,input, index...(index + 1))
         @index += 1
       else
         terminal_parse_failure("\n")