asciidoctor-pdf 1.5.0.alpha.7 → 1.5.0.alpha.8

data/lib/asciidoctor-pdf/core_ext.rb

@@ -0,0 +1,2 @@
+require_relative 'core_ext/array'
+require_relative 'core_ext/numeric'

data/lib/asciidoctor-pdf/core_ext/array.rb

@@ -1,5 +1,11 @@
 class Array
-  def to_h
-    Hash[to_a]
-  end unless respond_to? :to_h
-end if RUBY_VERSION < '2.1.0'
+  if RUBY_VERSION < '2.1.0'
+    def to_h
+      Hash[to_a]
+    end unless respond_to? :to_h
+  end
+
+  def delete_all *entries
+    entries.map {|entry| delete entry }.compact
+  end unless respond_to? :delete_all
+end

data/lib/asciidoctor-pdf/core_ext/numeric.rb

@@ -0,0 +1,11 @@
+class Numeric
+  def with_precision precision
+    precision = precision.to_i
+    if precision > 0
+      factor = 10 ** precision
+      (self * factor).truncate / factor.to_f
+    else
+      self.truncate
+    end
+  end unless respond_to? :with_precision
+end

data/lib/asciidoctor-pdf/core_ext/ostruct.rb

@@ -6,4 +6,4 @@ class OpenStruct
   def []= key, val
     send %(#{key}=), val
   end unless respond_to? :[]=
-end if RUBY_VERSION < '2.0.0'
+end if RUBY_ENGINE == 'rbx' || RUBY_VERSION < '2.0.0'

data/lib/asciidoctor-pdf/formatted_text.rb

@@ -0,0 +1,8 @@
+require 'treetop'
+require 'set' unless defined? Set
+require_relative 'formatted_text/parser'
+require_relative 'formatted_text/transform'
+require_relative 'formatted_text/formatter'
+require_relative 'formatted_text/inline_destination_marker'
+require_relative 'formatted_text/inline_image_arranger'
+require_relative 'formatted_text/inline_image_renderer'

data/lib/asciidoctor-pdf/{prawn_ext/formatted_text → formatted_text}/formatter.rb

@@ -1,16 +1,12 @@
-require 'treetop'
-require 'set'
-require_relative 'parser'
-require_relative 'transform'
-
 module Asciidoctor
-module Prawn
-class FormattedTextFormatter
+module Pdf
+module FormattedText
+class Formatter
   FormattingSnifferPattern = /[<&]/
 
   def initialize options = {}
-    @parser = FormattedTextParser.new
-    @transform = FormattedTextTransform.new merge_adjacent_text_nodes: true, theme: options[:theme]
+    @parser = MarkupParser.new
+    @transform = Transform.new merge_adjacent_text_nodes: true, theme: options[:theme]
   end
 
   def format string, *args
@@ -27,3 +23,4 @@ class FormattedTextFormatter
 end
 end
 end
+end

data/lib/asciidoctor-pdf/formatted_text/inline_destination_marker.rb

@@ -0,0 +1,16 @@
+module Asciidoctor::Pdf::FormattedText
+module InlineDestinationMarker
+  module_function
+
+  # render_behind is called before the text is printed
+  def render_behind fragment
+    unless (pdf = fragment.document).scratch?
+      if (name = fragment.format_state[:name])
+        # get precise position of the reference (x, y)
+        dest_rect = fragment.absolute_bounding_box
+        pdf.add_dest name, (pdf.dest_xyz dest_rect.first, dest_rect.last)
+      end
+    end
+  end
+end
+end

data/lib/asciidoctor-pdf/formatted_text/inline_image_arranger.rb

@@ -0,0 +1,125 @@
+module Asciidoctor::Pdf::FormattedText
+module InlineImageArranger
+  #ImagePlaceholderChar = [0x00a0].pack 'U*'
+  ImagePlaceholderChar = '.'
+  begin
+    require 'thread_safe' unless defined? ::ThreadSafe
+    PlaceholderWidthCache = ::ThreadSafe::Cache.new
+  rescue
+    PlaceholderWidthCache = {}
+  end
+
+  if ::RUBY_MIN_VERSION_2
+    def wrap fragments
+      arrange_images fragments
+      super
+    end
+  else
+    class << self
+      def extended base
+        base.class.__send__ :alias_method, :_initial_wrap, :wrap
+      end
+    end
+
+    def wrap fragments
+      arrange_images fragments
+      _initial_wrap fragments
+    end
+  end
+
+  # Iterates over the fragments that represent inline images and prepares the
+  # image data to be embedded into the document.
+  #
+  # This method populates the image_width, image_height, image_obj and
+  # image_info (PNG only) keys on the fragment. The text is replaced with
+  # placeholder text that will be used to reserve enough room in the line to
+  # fit the image.
+  #
+  # The image height is scaled down to 75% of the specified width (px to pt
+  # conversion). If the image height is more than 1.5x the height of the
+  # surrounding line of text, the font size and line metrics of the fragment
+  # are modified to fit the image in the line.
+  #
+  # If this is the scratch document, the image renderer callback is removed so
+  # that the image is not embedded.
+  #
+  # This method is called each time the set of fragments overflow to another
+  # page, so it's necessary to short-circuit if that case is detected.
+  def arrange_images fragments
+    doc = @document
+    scratch = doc.scratch?
+    fragments.select {|f| (f.key? :image_path) && !(f.key? :image_obj) }.each do |fragment|
+      begin
+        image_path = fragment[:image_path]
+
+        if (image_w = fragment[:image_width])
+          image_w *= 0.75
+        end
+
+        # TODO make helper method to calculate width and height of image
+        if fragment[:image_type] == 'svg'
+          svg_obj = ::Prawn::Svg::Interface.new (::IO.read image_path), doc, at: doc.bounds.top_left, width: image_w
+          if image_w
+            fragment[:image_width] = svg_obj.document.sizing.output_width
+            fragment[:image_height] = svg_obj.document.sizing.output_height
+          else
+            fragment[:image_width] = svg_obj.document.sizing.output_width * 0.75
+            fragment[:image_height] = svg_obj.document.sizing.output_height * 0.75
+          end
+          fragment[:image_obj] = svg_obj
+        else
+          # TODO cache image info based on path (Prawn cached based on SHA1 of content)
+          image_obj, image_info = doc.build_image_object image_path
+          if image_w
+            fragment[:image_width], fragment[:image_height] = image_info.calc_image_dimensions width: image_w
+          else
+            fragment[:image_width] = image_info.width * 0.75
+            fragment[:image_height] = image_info.height * 0.75
+          end
+          fragment[:image_obj] = image_obj
+          fragment[:image_info] = image_info
+        end
+
+        spacer_w = nil
+        doc.fragment_font fragment do
+          # NOTE if image height exceeds line height by more than 1.5x, increase the line height
+          # HACK we could really use a nicer API from Prawn here; this is an ugly hack
+          if (f_height = fragment[:image_height]) > ((line_font = doc.font).height * 1.5)
+            fragment[:ascender] = f_height
+            fragment[:descender] = line_font.descender
+            doc.font_size(fragment[:size] = f_height * (doc.font_size / line_font.height))
+            fragment[:line_height_increased] = true
+          end
+
+          unless (spacer_w = PlaceholderWidthCache[f_info = doc.font_info])
+            spacer_w = PlaceholderWidthCache[f_info] = doc.width_of ImagePlaceholderChar
+          end
+        end
+
+        # NOTE make room for the image by repeating the image placeholder character
+        # TODO could use character spacing as an alternative to repeating characters
+        # HACK we could use a nicer API from Prawn here to reserve width in a line
+        fragment[:text] = ImagePlaceholderChar * (fragment[:image_width] / spacer_w).ceil
+        #fragment[:width] = fragment[:image_width]
+      ensure
+        # NOTE skip rendering image in scratch document
+        if scratch
+          fragment.delete :callback
+          fragment.delete :image_obj
+          fragment.delete :image_info
+          # NOTE in main document, tmp image path is unlinked by renderer
+          ::File.unlink image_path if fragment[:image_tmp]
+        end
+      end
+    end
+  end
+end
+
+if ::RUBY_MIN_VERSION_2
+  class ::Prawn::Text::Formatted::Box
+    prepend InlineImageArranger
+  end
+else
+  ::Prawn::Text::Formatted::Box.extensions << InlineImageArranger
+end
+end

data/lib/asciidoctor-pdf/formatted_text/inline_image_renderer.rb

@@ -0,0 +1,45 @@
+module Asciidoctor::Pdf::FormattedText
+module InlineImageRenderer
+  module_function
+
+  # Embeds the image object in this fragment into the document in place of the
+  # text that was previously used to reserve space for the image in the line.
+  #
+  # If the image height is less than 1.5x the height of the surrounding text,
+  # it is centered vertically in the line. If the image height is greater, then
+  # the image is aligned to the bottom of the text.
+  #
+  # Note that render_behind is called before the text is printed.
+  #
+  # This handler is only used on the main document (not the scratch document).
+  #
+  def render_behind fragment
+    pdf = fragment.document
+    data = fragment.format_state
+    image_top = if data.key? :line_height_increased
+      # align image to bottom of line (differs from fragment.top by descender value)
+      fragment.bottom + data[:image_height]
+    else
+      # center image in line
+      fragment.top - ((fragment.height - data[:image_height]) / 2.0)
+    end
+    image_left = fragment.left + ((fragment.width - data[:image_width]) / 2.0)
+    case data[:image_type]
+    when 'svg'
+      # prawn-svg messes with the cursor; use float as a workaround
+      pdf.float do
+        data[:image_obj].tap {|obj| obj.options[:at] = [image_left, image_top] }.draw
+      end
+    else
+      pdf.embed_image data[:image_obj], data[:image_info], at: [image_left, image_top], width: data[:image_width]
+    end
+    # ...or use the public interface, loading the image again
+    #pdf.image data[:image_path], at: [image_left, image_top], width: data[:image_width]
+
+    # prevent any text from being written
+    fragment.conceal
+  ensure
+    ::File.unlink data[:image_path] if data[:image_tmp]
+  end
+end
+end

data/lib/asciidoctor-pdf/{prawn_ext/formatted_text → formatted_text}/parser.rb

@@ -1,9 +1,11 @@
+# regenerate parser.rb using `tt parser.treetop`
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
 module Asciidoctor
-module Prawn
+module Pdf
 module FormattedText
+module Markup
   include Treetop::Runtime
 
   def root
@@ -15,7 +17,7 @@ module FormattedText
     if node_cache[:text].has_key?(index)
       cached = node_cache[:text][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:text][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -39,7 +41,7 @@ module FormattedText
     if node_cache[:complex].has_key?(index)
       cached = node_cache[:complex][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:complex][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -50,14 +52,17 @@ module FormattedText
       i1 = index
       r2 = _nt_cdata
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r1 = r2
       else
         r3 = _nt_element
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r1 = r3
         else
           r4 = _nt_entity
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r1 = r4
           else
             @index = i1
@@ -94,7 +99,7 @@ module FormattedText
   end
 
   module Element1
-    # NOTE content only applies to non-empty element
+    # NOTE content only applies to non-void elements (second part of rule)
     def content
       { type: :element, name: (tag_element = elements[0]).name.to_sym, attributes: tag_element.attributes, pcdata: elements[1].content }
     end
@@ -105,15 +110,16 @@ module FormattedText
     if node_cache[:element].has_key?(index)
       cached = node_cache[:element][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:element][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0 = index
-    r1 = _nt_empty_element
+    r1 = _nt_void_element
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
       i2, s2 = index, []
@@ -136,6 +142,7 @@ module FormattedText
         r2 = nil
       end
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
         @index = i0
@@ -148,91 +155,107 @@ module FormattedText
     r0
   end
 
-  module EmptyElement0
+  module VoidElement0
   end
 
-  module EmptyElement1
+  module VoidElement1
+    def void_tag_name
+      elements[1]
+    end
+
+    def attributes
+      elements[2]
+    end
+
   end
 
-  module EmptyElement2
+  module VoidElement2
     def content
-      { type: :element, name: :br, attributes: {} }
+      { type: :element, name: elements[1].text_value.to_sym, attributes: elements[2].content }
     end
   end
 
-  def _nt_empty_element
+  def _nt_void_element
     start_index = index
-    if node_cache[:empty_element].has_key?(index)
-      cached = node_cache[:empty_element][index]
+    if node_cache[:void_element].has_key?(index)
+      cached = node_cache[:void_element][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:void_element][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0, s0 = index, []
-    if has_terminal?('<br', false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 3))
-      @index += 3
+    if (match_len = has_terminal?('<', false, index))
+      r1 = true
+      @index += match_len
     else
-      terminal_parse_failure('<br')
+      terminal_parse_failure('<')
       r1 = nil
     end
     s0 << r1
     if r1
-      i3, s3 = index, []
-      r5 = _nt_spaces
-      if r5
-        r4 = r5
-      else
-        r4 = instantiate_node(SyntaxNode,input, index...index)
-      end
-      s3 << r4
-      if r4
-        if has_terminal?('/', false, index)
-          r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
-        else
-          terminal_parse_failure('/')
-          r6 = nil
-        end
-        s3 << r6
-      end
-      if s3.last
-        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-        r3.extend(EmptyElement0)
-      else
-        @index = i3
-        r3 = nil
-      end
-      if r3
-        r2 = r3
-      else
-        r2 = instantiate_node(SyntaxNode,input, index...index)
-      end
+      r2 = _nt_void_tag_name
       s0 << r2
       if r2
-        if has_terminal?('>', false, index)
-          r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
-        else
-          terminal_parse_failure('>')
-          r7 = nil
+        r3 = _nt_attributes
+        s0 << r3
+        if r3
+          i5, s5 = index, []
+          r7 = _nt_spaces
+          if r7
+            r6 = r7
+          else
+            r6 = instantiate_node(SyntaxNode,input, index...index)
+          end
+          s5 << r6
+          if r6
+            if (match_len = has_terminal?('/', false, index))
+              r8 = true
+              @index += match_len
+            else
+              terminal_parse_failure('/')
+              r8 = nil
+            end
+            s5 << r8
+          end
+          if s5.last
+            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+            r5.extend(VoidElement0)
+          else
+            @index = i5
+            r5 = nil
+          end
+          if r5
+            r4 = r5
+          else
+            r4 = instantiate_node(SyntaxNode,input, index...index)
+          end
+          s0 << r4
+          if r4
+            if (match_len = has_terminal?('>', false, index))
+              r9 = true
+              @index += match_len
+            else
+              terminal_parse_failure('>')
+              r9 = nil
+            end
+            s0 << r9
+          end
         end
-        s0 << r7
       end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(EmptyElement1)
-      r0.extend(EmptyElement2)
+      r0.extend(VoidElement1)
+      r0.extend(VoidElement2)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:empty_element][start_index] = r0
+    node_cache[:void_element][start_index] = r0
 
     r0
   end
@@ -263,16 +286,16 @@ module FormattedText
     if node_cache[:start_tag].has_key?(index)
       cached = node_cache[:start_tag][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:start_tag][index] = 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 + 1))
-      @index += 1
+    if (match_len = has_terminal?('<', false, index))
+      r1 = true
+      @index += match_len
     else
       terminal_parse_failure('<')
       r1 = nil
@@ -285,9 +308,9 @@ module FormattedText
         r3 = _nt_attributes
         s0 << r3
         if r3
-          if has_terminal?('>', false, index)
-            r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
+          if (match_len = has_terminal?('>', false, index))
+            r4 = true
+            @index += match_len
           else
             terminal_parse_failure('>')
             r4 = nil
@@ -315,170 +338,125 @@ module FormattedText
     if node_cache[:tag_name].has_key?(index)
       cached = node_cache[:tag_name][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:tag_name][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0 = index
-    if has_terminal?('a', false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-      @index += 1
+    if (match_len = has_terminal?('a', false, index))
+      r1 = true
+      @index += match_len
     else
       terminal_parse_failure('a')
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      if has_terminal?('b', false, index)
-        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-        @index += 1
+      if (match_len = has_terminal?('code', false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
       else
-        terminal_parse_failure('b')
+        terminal_parse_failure('code')
         r2 = nil
       end
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if has_terminal?('code', false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 4))
-          @index += 4
+        if (match_len = has_terminal?('color', false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
-          terminal_parse_failure('code')
+          terminal_parse_failure('color')
           r3 = nil
         end
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          if has_terminal?('color', false, index)
-            r4 = instantiate_node(SyntaxNode,input, index...(index + 5))
-            @index += 5
+          if (match_len = has_terminal?('del', false, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
           else
-            terminal_parse_failure('color')
+            terminal_parse_failure('del')
             r4 = nil
           end
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
-            if has_terminal?('del', false, index)
-              r5 = instantiate_node(SyntaxNode,input, index...(index + 3))
-              @index += 3
+            if (match_len = has_terminal?('em', false, index))
+              r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+              @index += match_len
             else
-              terminal_parse_failure('del')
+              terminal_parse_failure('em')
               r5 = nil
             end
             if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
-              if has_terminal?('em', false, index)
-                r6 = instantiate_node(SyntaxNode,input, index...(index + 2))
-                @index += 2
+              if (match_len = has_terminal?('font', false, index))
+                r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                @index += match_len
               else
-                terminal_parse_failure('em')
+                terminal_parse_failure('font')
                 r6 = nil
               end
               if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
-                if has_terminal?('font', false, index)
-                  r7 = instantiate_node(SyntaxNode,input, index...(index + 4))
-                  @index += 4
+                if (match_len = has_terminal?('span', false, index))
+                  r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                  @index += match_len
                 else
-                  terminal_parse_failure('font')
+                  terminal_parse_failure('span')
                   r7 = nil
                 end
                 if r7
+                  r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
                   r0 = r7
                 else
-                  if has_terminal?('i', false, index)
-                    r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                    @index += 1
+                  if (match_len = has_terminal?('strong', false, index))
+                    r8 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                    @index += match_len
                   else
-                    terminal_parse_failure('i')
+                    terminal_parse_failure('strong')
                     r8 = nil
                   end
                   if r8
+                    r8 = SyntaxNode.new(input, (index-1)...index) if r8 == true
                     r0 = r8
                   else
-                    if has_terminal?('link', false, index)
-                      r9 = instantiate_node(SyntaxNode,input, index...(index + 4))
-                      @index += 4
+                    if (match_len = has_terminal?('sub', false, index))
+                      r9 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                      @index += match_len
                     else
-                      terminal_parse_failure('link')
+                      terminal_parse_failure('sub')
                       r9 = nil
                     end
                     if r9
+                      r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
                       r0 = r9
                     else
-                      if has_terminal?('span', false, index)
-                        r10 = instantiate_node(SyntaxNode,input, index...(index + 4))
-                        @index += 4
+                      if (match_len = has_terminal?('sup', false, index))
+                        r10 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                        @index += match_len
                       else
-                        terminal_parse_failure('span')
+                        terminal_parse_failure('sup')
                         r10 = nil
                       end
                       if r10
+                        r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
                         r0 = r10
                       else
-                        if has_terminal?('strikethrough', false, index)
-                          r11 = instantiate_node(SyntaxNode,input, index...(index + 13))
-                          @index += 13
-                        else
-                          terminal_parse_failure('strikethrough')
-                          r11 = nil
-                        end
-                        if r11
-                          r0 = r11
-                        else
-                          if has_terminal?('strong', false, index)
-                            r12 = instantiate_node(SyntaxNode,input, index...(index + 6))
-                            @index += 6
-                          else
-                            terminal_parse_failure('strong')
-                            r12 = nil
-                          end
-                          if r12
-                            r0 = r12
-                          else
-                            if has_terminal?('sub', false, index)
-                              r13 = instantiate_node(SyntaxNode,input, index...(index + 3))
-                              @index += 3
-                            else
-                              terminal_parse_failure('sub')
-                              r13 = nil
-                            end
-                            if r13
-                              r0 = r13
-                            else
-                              if has_terminal?('sup', false, index)
-                                r14 = instantiate_node(SyntaxNode,input, index...(index + 3))
-                                @index += 3
-                              else
-                                terminal_parse_failure('sup')
-                                r14 = nil
-                              end
-                              if r14
-                                r0 = r14
-                              else
-                                if has_terminal?('u', false, index)
-                                  r15 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                                  @index += 1
-                                else
-                                  terminal_parse_failure('u')
-                                  r15 = nil
-                                end
-                                if r15
-                                  r0 = r15
-                                else
-                                  @index = i0
-                                  r0 = nil
-                                end
-                              end
-                            end
-                          end
-                        end
+                        @index = i0
+                        r0 = nil
                       end
                     end
                   end
@@ -495,6 +473,50 @@ module FormattedText
     r0
   end
 
+  def _nt_void_tag_name
+    start_index = index
+    if node_cache[:void_tag_name].has_key?(index)
+      cached = node_cache[:void_tag_name][index]
+      if cached
+        node_cache[:void_tag_name][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0 = index
+    if (match_len = has_terminal?('br', false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
+    else
+      terminal_parse_failure('br')
+      r1 = nil
+    end
+    if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
+      r0 = r1
+    else
+      if (match_len = has_terminal?('img', false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
+      else
+        terminal_parse_failure('img')
+        r2 = nil
+      end
+      if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
+        r0 = r2
+      else
+        @index = i0
+        r0 = nil
+      end
+    end
+
+    node_cache[:void_tag_name][start_index] = r0
+
+    r0
+  end
+
   module Attributes0
     def content
       attrs = {}
@@ -511,7 +533,7 @@ module FormattedText
     if node_cache[:attributes].has_key?(index)
       cached = node_cache[:attributes][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:attributes][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -552,7 +574,7 @@ module FormattedText
     if node_cache[:attribute].has_key?(index)
       cached = node_cache[:attribute][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:attribute][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -564,10 +586,11 @@ module FormattedText
     if r1
       s2, i2 = [], index
       loop do
-        if has_terminal?('\G[a-z_]', true, index)
+        if has_terminal?(@regexps[gr = '\A[a-z_]'] ||= Regexp.new(gr), :regexp, index)
           r3 = true
           @index += 1
         else
+          terminal_parse_failure('[a-z_]')
           r3 = nil
         end
         if r3
@@ -584,18 +607,18 @@ module FormattedText
       end
       s0 << r2
       if r2
-        if has_terminal?('=', false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?('=', false, index))
+          r4 = true
+          @index += match_len
         else
           terminal_parse_failure('=')
           r4 = nil
         end
         s0 << r4
         if r4
-          if has_terminal?('"', false, index)
-            r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
+          if (match_len = has_terminal?('"', false, index))
+            r5 = true
+            @index += match_len
           else
             terminal_parse_failure('"')
             r5 = nil
@@ -604,10 +627,11 @@ module FormattedText
           if r5
             s6, i6 = [], index
             loop do
-              if has_terminal?('\G[^"]', true, index)
+              if has_terminal?(@regexps[gr = '\A[^"]'] ||= Regexp.new(gr), :regexp, index)
                 r7 = true
                 @index += 1
               else
+                terminal_parse_failure('[^"]')
                 r7 = nil
               end
               if r7
@@ -619,9 +643,9 @@ module FormattedText
             r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
             s0 << r6
             if r6
-              if has_terminal?('"', false, index)
-                r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
+              if (match_len = has_terminal?('"', false, index))
+                r8 = true
+                @index += match_len
               else
                 terminal_parse_failure('"')
                 r8 = nil
@@ -664,16 +688,16 @@ module FormattedText
     if node_cache[:end_tag].has_key?(index)
       cached = node_cache[:end_tag][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:end_tag][index] = 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
+    if (match_len = has_terminal?('</', false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
       terminal_parse_failure('</')
       r1 = nil
@@ -683,9 +707,9 @@ module FormattedText
       r2 = _nt_tag_name
       s0 << r2
       if r2
-        if has_terminal?('>', false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?('>', false, index))
+          r3 = true
+          @index += match_len
         else
           terminal_parse_failure('>')
           r3 = nil
@@ -718,7 +742,7 @@ module FormattedText
     if node_cache[:cdata].has_key?(index)
       cached = node_cache[:cdata][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:cdata][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -726,10 +750,11 @@ module FormattedText
 
     s0, i0 = [], index
     loop do
-      if has_terminal?('\G[^<&]', true, index)
+      if has_terminal?(@regexps[gr = '\A[^<&]'] ||= Regexp.new(gr), :regexp, index)
         r1 = true
         @index += 1
       else
+        terminal_parse_failure('[^<&]')
         r1 = nil
       end
       if r1
@@ -775,16 +800,16 @@ module FormattedText
     if node_cache[:entity].has_key?(index)
       cached = node_cache[:entity][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:entity][index] = 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 + 1))
-      @index += 1
+    if (match_len = has_terminal?('&', false, index))
+      r1 = true
+      @index += match_len
     else
       terminal_parse_failure('&')
       r1 = nil
@@ -793,9 +818,9 @@ module FormattedText
     if r1
       i2 = index
       i3, s3 = index, []
-      if has_terminal?('#', false, index)
-        r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-        @index += 1
+      if (match_len = has_terminal?('#', false, index))
+        r4 = true
+        @index += match_len
       else
         terminal_parse_failure('#')
         r4 = nil
@@ -813,10 +838,12 @@ module FormattedText
         r3 = nil
       end
       if r3
+        r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
         r2 = r3
       else
         r6 = _nt_entity_name
         if r6
+          r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
           r2 = r6
         else
           @index = i2
@@ -825,9 +852,9 @@ module FormattedText
       end
       s0 << r2
       if r2
-        if has_terminal?(';', false, index)
-          r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        if (match_len = has_terminal?(';', false, index))
+          r7 = true
+          @index += match_len
         else
           terminal_parse_failure(';')
           r7 = nil
@@ -854,7 +881,7 @@ module FormattedText
     if node_cache[:entity_number].has_key?(index)
       cached = node_cache[:entity_number][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:entity_number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -862,10 +889,11 @@ module FormattedText
 
     s0, i0 = [], index
     loop do
-      if has_terminal?('\G[0-9]', true, index)
+      if has_terminal?(@regexps[gr = '\A[0-9]'] ||= Regexp.new(gr), :regexp, index)
         r1 = true
         @index += 1
       else
+        terminal_parse_failure('[0-9]')
         r1 = nil
       end
       if r1
@@ -894,61 +922,66 @@ module FormattedText
     if node_cache[:entity_name].has_key?(index)
       cached = node_cache[:entity_name][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:entity_name][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
     end
 
     i0 = index
-    if has_terminal?('amp', false, index)
-      r1 = instantiate_node(SyntaxNode,input, index...(index + 3))
-      @index += 3
+    if (match_len = has_terminal?('amp', false, index))
+      r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+      @index += match_len
     else
       terminal_parse_failure('amp')
       r1 = nil
     end
     if r1
+      r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      if has_terminal?('apos', false, index)
-        r2 = instantiate_node(SyntaxNode,input, index...(index + 4))
-        @index += 4
+      if (match_len = has_terminal?('apos', false, index))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+        @index += match_len
       else
         terminal_parse_failure('apos')
         r2 = nil
       end
       if r2
+        r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if has_terminal?('gt', false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
-          @index += 2
+        if (match_len = has_terminal?('gt', false, index))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
         else
           terminal_parse_failure('gt')
           r3 = nil
         end
         if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          if has_terminal?('lt', false, index)
-            r4 = instantiate_node(SyntaxNode,input, index...(index + 2))
-            @index += 2
+          if (match_len = has_terminal?('lt', false, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
           else
             terminal_parse_failure('lt')
             r4 = nil
           end
           if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
-            if has_terminal?('quot', false, index)
-              r5 = instantiate_node(SyntaxNode,input, index...(index + 4))
-              @index += 4
+            if (match_len = has_terminal?('quot', false, index))
+              r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+              @index += match_len
             else
               terminal_parse_failure('quot')
               r5 = nil
             end
             if r5
+              r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
               @index = i0
@@ -969,7 +1002,7 @@ module FormattedText
     if node_cache[:spaces].has_key?(index)
       cached = node_cache[:spaces][index]
       if cached
-        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:spaces][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -977,9 +1010,9 @@ module FormattedText
 
     s0, i0 = [], index
     loop do
-      if has_terminal?(' ', false, index)
-        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-        @index += 1
+      if (match_len = has_terminal?(' ', false, index))
+        r1 = true
+        @index += match_len
       else
         terminal_parse_failure(' ')
         r1 = nil
@@ -1004,9 +1037,10 @@ module FormattedText
 
 end
 
-class FormattedTextParser < Treetop::Runtime::CompiledParser
-  include FormattedText
+class MarkupParser < Treetop::Runtime::CompiledParser
+  include Markup
 end
 
 end
 end
+end