asciidoctor-pdf 1.5.0.alpha.16 → 1.5.0

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

@@ -1,9 +1,9 @@
-# regenerate parser.rb using `tt parser.treetop`
+# frozen_string_literal: true
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
 module Asciidoctor
-module Pdf
+module PDF
 module FormattedText
 module Markup
   include Treetop::Runtime
@@ -60,7 +60,7 @@ module Markup
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r1 = r3
         else
-          r4 = _nt_entity
+          r4 = _nt_charref
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r1 = r4
@@ -356,44 +356,44 @@ module Markup
       r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
       r0 = r1
     else
-      if (match_len = has_terminal?('code', false, index))
+      if (match_len = has_terminal?('strong', false, index))
         r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
         @index += match_len
       else
-        terminal_parse_failure('code')
+        terminal_parse_failure('strong')
         r2 = nil
       end
       if r2
         r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
         r0 = r2
       else
-        if (match_len = has_terminal?('color', false, index))
+        if (match_len = has_terminal?('em', false, index))
           r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('color')
+          terminal_parse_failure('em')
           r3 = nil
         end
         if r3
           r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
           r0 = r3
         else
-          if (match_len = has_terminal?('del', false, index))
+          if (match_len = has_terminal?('code', false, index))
             r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
             @index += match_len
           else
-            terminal_parse_failure('del')
+            terminal_parse_failure('code')
             r4 = nil
           end
           if r4
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
-            if (match_len = has_terminal?('em', false, index))
+            if (match_len = has_terminal?('color', false, index))
               r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('em')
+              terminal_parse_failure('color')
               r5 = nil
             end
             if r5
@@ -422,22 +422,22 @@ module Markup
                   r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
                   r0 = r7
                 else
-                  if (match_len = has_terminal?('strong', false, index))
+                  if (match_len = has_terminal?('button', false, index))
                     r8 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                     @index += match_len
                   else
-                    terminal_parse_failure('strong')
+                    terminal_parse_failure('button')
                     r8 = nil
                   end
                   if r8
                     r8 = SyntaxNode.new(input, (index-1)...index) if r8 == true
                     r0 = r8
                   else
-                    if (match_len = has_terminal?('sub', false, index))
+                    if (match_len = has_terminal?('key', false, index))
                       r9 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                       @index += match_len
                     else
-                      terminal_parse_failure('sub')
+                      terminal_parse_failure('key')
                       r9 = nil
                     end
                     if r9
@@ -455,8 +455,44 @@ module Markup
                         r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
                         r0 = r10
                       else
-                        @index = i0
-                        r0 = nil
+                        if (match_len = has_terminal?('sub', false, index))
+                          r11 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                          @index += match_len
+                        else
+                          terminal_parse_failure('sub')
+                          r11 = nil
+                        end
+                        if r11
+                          r11 = SyntaxNode.new(input, (index-1)...index) if r11 == true
+                          r0 = r11
+                        else
+                          if (match_len = has_terminal?('mark', false, index))
+                            r12 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                            @index += match_len
+                          else
+                            terminal_parse_failure('mark')
+                            r12 = nil
+                          end
+                          if r12
+                            r12 = SyntaxNode.new(input, (index-1)...index) if r12 == true
+                            r0 = r12
+                          else
+                            if (match_len = has_terminal?('del', false, index))
+                              r13 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                              @index += match_len
+                            else
+                              terminal_parse_failure('del')
+                              r13 = nil
+                            end
+                            if r13
+                              r13 = SyntaxNode.new(input, (index-1)...index) if r13 == true
+                              r0 = r13
+                            else
+                              @index = i0
+                              r0 = nil
+                            end
+                          end
+                        end
                       end
                     end
                   end
@@ -776,31 +812,39 @@ module Markup
     r0
   end
 
-  module Entity0
-    def entity_number
+  module Charref0
+    def character_decimal
       elements[1]
     end
   end
 
-  module Entity1
+  module Charref1
+    def character_hex
+      elements[1]
+    end
+  end
+
+  module Charref2
   end
 
-  module Entity2
+  module Charref3
     def content
-      if (entity_value = elements[1]).terminal?
-        { type: :entity, name: entity_value.text_value.to_sym }
+      if (ref_data = elements[1]).terminal?
+        { type: :charref, reference_type: :name, value: ref_data.text_value.to_sym }
+      elsif ref_data.elements[0].text_value == '#'
+        { type: :charref, reference_type: :decimal, value: ref_data.elements[1].text_value.to_i }
       else
-        { type: :entity, number: entity_value.elements[1].text_value.to_i }
+        { type: :charref, reference_type: :hex, value: ref_data.elements[1].text_value }
       end
     end
   end
 
-  def _nt_entity
+  def _nt_charref
     start_index = index
-    if node_cache[:entity].has_key?(index)
-      cached = node_cache[:entity][index]
+    if node_cache[:charref].has_key?(index)
+      cached = node_cache[:charref][index]
       if cached
-        node_cache[:entity][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:charref][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -827,12 +871,12 @@ module Markup
       end
       s3 << r4
       if r4
-        r5 = _nt_entity_number
+        r5 = _nt_character_decimal
         s3 << r5
       end
       if s3.last
         r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-        r3.extend(Entity0)
+        r3.extend(Charref0)
       else
         @index = i3
         r3 = nil
@@ -841,47 +885,72 @@ module Markup
         r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
         r2 = r3
       else
-        r6 = _nt_entity_name
+        i6, s6 = index, []
+        if (match_len = has_terminal?('#x', false, index))
+          r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
+        else
+          terminal_parse_failure('#x')
+          r7 = nil
+        end
+        s6 << r7
+        if r7
+          r8 = _nt_character_hex
+          s6 << r8
+        end
+        if s6.last
+          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+          r6.extend(Charref1)
+        else
+          @index = i6
+          r6 = nil
+        end
         if r6
           r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
           r2 = r6
         else
-          @index = i2
-          r2 = nil
+          r9 = _nt_character_name
+          if r9
+            r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
+            r2 = r9
+          else
+            @index = i2
+            r2 = nil
+          end
         end
       end
       s0 << r2
       if r2
         if (match_len = has_terminal?(';', false, index))
-          r7 = true
+          r10 = true
           @index += match_len
         else
           terminal_parse_failure(';')
-          r7 = nil
+          r10 = nil
         end
-        s0 << r7
+        s0 << r10
       end
     end
     if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Entity1)
-      r0.extend(Entity2)
+      r0.extend(Charref2)
+      r0.extend(Charref3)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:entity][start_index] = r0
+    node_cache[:charref][start_index] = r0
 
     r0
   end
 
-  def _nt_entity_number
+  def _nt_character_decimal
     start_index = index
-    if node_cache[:entity_number].has_key?(index)
-      cached = node_cache[:entity_number][index]
+    if node_cache[:character_decimal].has_key?(index)
+      cached = node_cache[:character_decimal][index]
       if cached
-        node_cache[:entity_number][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:character_decimal][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -912,17 +981,58 @@ module Markup
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
     end
 
-    node_cache[:entity_number][start_index] = r0
+    node_cache[:character_decimal][start_index] = r0
 
     r0
   end
 
-  def _nt_entity_name
+  def _nt_character_hex
     start_index = index
-    if node_cache[:entity_name].has_key?(index)
-      cached = node_cache[:entity_name][index]
+    if node_cache[:character_hex].has_key?(index)
+      cached = node_cache[:character_hex][index]
       if cached
-        node_cache[:entity_name][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        node_cache[:character_hex][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    s0, i0 = [], index
+    loop do
+      if has_terminal?(@regexps[gr = '\A[0-9a-f]'] ||= Regexp.new(gr), :regexp, index)
+        r1 = true
+        @index += 1
+      else
+        terminal_parse_failure('[0-9a-f]')
+        r1 = nil
+      end
+      if r1
+        s0 << r1
+      else
+        break
+      end
+      if s0.size == 5
+        break
+      end
+    end
+    if s0.size < 2
+      @index = i0
+      r0 = nil
+    else
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+    end
+
+    node_cache[:character_hex][start_index] = r0
+
+    r0
+  end
+
+  def _nt_character_name
+    start_index = index
+    if node_cache[:character_name].has_key?(index)
+      cached = node_cache[:character_name][index]
+      if cached
+        node_cache[:character_name][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
         @index = cached.interval.end
       end
       return cached
@@ -973,26 +1083,38 @@ module Markup
             r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
             r0 = r4
           else
-            if (match_len = has_terminal?('quot', false, index))
+            if (match_len = has_terminal?('nbsp', false, index))
               r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('quot')
+              terminal_parse_failure('nbsp')
               r5 = nil
             end
             if r5
               r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
-              @index = i0
-              r0 = nil
+              if (match_len = has_terminal?('quot', false, index))
+                r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                @index += match_len
+              else
+                terminal_parse_failure('quot')
+                r6 = nil
+              end
+              if r6
+                r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
+                r0 = r6
+              else
+                @index = i0
+                r0 = nil
+              end
             end
           end
         end
       end
     end
 
-    node_cache[:entity_name][start_index] = r0
+    node_cache[:character_name][start_index] = r0
 
     r0
   end

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

@@ -1,6 +1,6 @@
-# regenerate parser.rb using `tt parser.treetop`
+# frozen_string_literal: true
 module Asciidoctor
-module Pdf
+module PDF
 module FormattedText
 grammar Markup
   rule text
@@ -8,7 +8,7 @@ grammar Markup
   end
 
   rule complex
-    (cdata / element / entity)* {
+    (cdata / element / charref)* {
       def content
         elements.map {|e| e.content }
       end
@@ -49,9 +49,8 @@ grammar Markup
 
   rule tag_name
     # QUESTION faster to do regex?
-    # QUESTION can we cut stuff we aren't using? what about supporting hr?
-    #'a' / 'b' / 'code' / 'color' / 'del' / 'em' / 'font' / 'i' / 'img' / 'link' / 'span' / 'strikethrough' / 'strong' / 'sub' / 'sup' / 'u'
-    'a' / 'code' / 'color' / 'del' / 'em' / 'font' / 'span' / 'strong' / 'sub' / 'sup'
+    # QUESTION what about supporting hr?
+    'a' / 'strong' / 'em' / 'code' / 'color' / 'font' / 'span' / 'button' / 'key' / 'sup' / 'sub' / 'mark' / 'del'
   end
 
   rule void_tag_name
@@ -95,25 +94,32 @@ grammar Markup
     }
   end
 
-  rule entity
-    '&' ('#' entity_number / entity_name) ';' {
+  rule charref
+    '&' ('#' character_decimal / '#x' character_hex / character_name) ';' {
       def content
-        if (entity_value = elements[1]).terminal?
-          { type: :entity, name: entity_value.text_value.to_sym }
+        if (ref_data = elements[1]).terminal?
+          { type: :charref, reference_type: :name, value: ref_data.text_value.to_sym }
+        elsif ref_data.elements[0].text_value == '#'
+          { type: :charref, reference_type: :decimal, value: ref_data.elements[1].text_value.to_i }
         else
-          { type: :entity, number: entity_value.elements[1].text_value.to_i }
+          { type: :charref, reference_type: :hex, value: ref_data.elements[1].text_value }
         end
       end
     }
   end
 
-  rule entity_number
+  rule character_decimal
     # NOTE 6 decimals only supported in Asciidoctor 1.5.5 and up
     [0-9] 2..6
   end
 
-  rule entity_name
-    'amp' / 'apos' / 'gt' / 'lt' / 'quot'
+  rule character_hex
+    # NOTE 5 hexadecimals only supported in Asciidoctor 1.5.5 and up
+    [0-9a-f] 2..5
+  end
+
+  rule character_name
+    'amp' / 'apos' / 'gt' / 'lt' / 'nbsp' / 'quot'
   end
 
   rule spaces

data/lib/asciidoctor/pdf/formatted_text/source_wrap.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Asciidoctor
+  module PDF
+    module FormattedText
+      module SourceWrap
+        NoBreakSpace = ?\u00a0
+
+        def wrap array
+          initialize_wrap array
+          stop = nil
+          highlight_line = nil
+          unconsumed = @arranger.unconsumed
+          if (linenum_fragment = unconsumed[0] || {})[:linenum]
+            linenum_spacer = { text: NoBreakSpace + (' ' * (linenum_fragment[:text].length - 1)) }
+          end
+          until stop
+            if linenum_spacer && (first_fragment = unconsumed[0])
+              if first_fragment[:linenum]
+                highlight_line = (second_fragment = unconsumed[1]) && (second_fragment[:highlight]) ? second_fragment.dup : nil
+              else
+                first_fragment[:text] = first_fragment[:text].lstrip
+                @arranger.unconsumed.unshift highlight_line if highlight_line
+                @arranger.unconsumed.unshift linenum_spacer.dup
+              end
+            end
+            @line_wrap.wrap_line document: @document, kerning: @kerning, width: available_width, arranger: @arranger, disable_wrap_by_char: @disable_wrap_by_char
+            if enough_height_for_this_line?
+              move_baseline_down
+              print_line
+            else
+              stop = true
+            end
+            stop ||= @single_line || @arranger.finished?
+          end
+          @text = @printed_lines.join ?\n
+          @everything_printed = @arranger.finished?
+          @arranger.unconsumed
+        end
+      end
+    end
+  end
+end

data/lib/asciidoctor/pdf/formatted_text/text_background_and_border_renderer.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Asciidoctor::Pdf::FormattedText
+  module TextBackgroundAndBorderRenderer
+    module_function
+
+    DummyText = ?\u0000
+
+    # render_behind is called before the text is printed
+    def render_behind fragment
+      return if (pdf = fragment.document).scratch?
+      data = fragment.format_state
+      if data[:inline_block]
+        padding = (height = fragment.line_height) - fragment.height
+        at = [fragment.left, fragment.top + padding * 0.5]
+        width = data[:extend] ? (pdf.bounds.width - fragment.left) : fragment.width
+        fragment.conceal if fragment.text == DummyText
+      elsif (border_offset = data[:border_offset])
+        at = [fragment.left, fragment.top + border_offset]
+        width = fragment.width
+        height = fragment.height + border_offset * 2
+      else
+        at = fragment.top_left
+        width = fragment.width
+        height = fragment.height
+      end
+      border_radius = data[:border_radius]
+      if (background_color = data[:background_color])
+        prev_fill_color = pdf.fill_color
+        pdf.fill_color background_color
+        if border_radius
+          pdf.fill_rounded_rectangle at, width, height, border_radius
+        else
+          pdf.fill_rectangle at, width, height
+        end
+        pdf.fill_color prev_fill_color
+      end
+      if (border_width = data[:border_width])
+        border_color = data[:border_color]
+        prev_stroke_color = pdf.stroke_color
+        prev_line_width = pdf.line_width
+        pdf.stroke_color border_color
+        pdf.line_width border_width
+        if border_radius
+          pdf.stroke_rounded_rectangle at, width, height, border_radius
+        else
+          pdf.stroke_rectangle at, width, height
+        end
+        pdf.stroke_color prev_stroke_color
+        pdf.line_width prev_line_width
+      end
+      nil
+    end
+  end
+end