asciidoctor-pdf 1.6.1 → 2.0.0.alpha.2

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

@@ -99,7 +99,7 @@ module Markup
   end
 
   module Element1
-    # NOTE content only applies to non-void elements (second part of rule)
+    # 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
@@ -191,7 +191,7 @@ module Markup
       r1 = true
       @index += match_len
     else
-      terminal_parse_failure('<')
+      terminal_parse_failure('\'<\'')
       r1 = nil
     end
     s0 << r1
@@ -215,7 +215,7 @@ module Markup
               r8 = true
               @index += match_len
             else
-              terminal_parse_failure('/')
+              terminal_parse_failure('\'/\'')
               r8 = nil
             end
             s5 << r8
@@ -238,7 +238,7 @@ module Markup
               r9 = true
               @index += match_len
             else
-              terminal_parse_failure('>')
+              terminal_parse_failure('\'>\'')
               r9 = nil
             end
             s0 << r9
@@ -297,7 +297,7 @@ module Markup
       r1 = true
       @index += match_len
     else
-      terminal_parse_failure('<')
+      terminal_parse_failure('\'<\'')
       r1 = nil
     end
     s0 << r1
@@ -312,7 +312,7 @@ module Markup
             r4 = true
             @index += match_len
           else
-            terminal_parse_failure('>')
+            terminal_parse_failure('\'>\'')
             r4 = nil
           end
           s0 << r4
@@ -349,7 +349,7 @@ module Markup
       r1 = true
       @index += match_len
     else
-      terminal_parse_failure('a')
+      terminal_parse_failure('\'a\'')
       r1 = nil
     end
     if r1
@@ -360,7 +360,7 @@ module Markup
         r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
         @index += match_len
       else
-        terminal_parse_failure('strong')
+        terminal_parse_failure('\'strong\'')
         r2 = nil
       end
       if r2
@@ -371,7 +371,7 @@ module Markup
           r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('em')
+          terminal_parse_failure('\'em\'')
           r3 = nil
         end
         if r3
@@ -382,95 +382,95 @@ module Markup
             r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
             @index += match_len
           else
-            terminal_parse_failure('code')
+            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?('color', false, index))
+            if (match_len = has_terminal?('font', false, index))
               r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('color')
+              terminal_parse_failure('\'font\'')
               r5 = nil
             end
             if r5
               r5 = SyntaxNode.new(input, (index-1)...index) if r5 == true
               r0 = r5
             else
-              if (match_len = has_terminal?('font', false, index))
+              if (match_len = has_terminal?('span', false, index))
                 r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                 @index += match_len
               else
-                terminal_parse_failure('font')
+                terminal_parse_failure('\'span\'')
                 r6 = nil
               end
               if r6
                 r6 = SyntaxNode.new(input, (index-1)...index) if r6 == true
                 r0 = r6
               else
-                if (match_len = has_terminal?('span', false, index))
+                if (match_len = has_terminal?('button', false, index))
                   r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                   @index += match_len
                 else
-                  terminal_parse_failure('span')
+                  terminal_parse_failure('\'button\'')
                   r7 = nil
                 end
                 if r7
                   r7 = SyntaxNode.new(input, (index-1)...index) if r7 == true
                   r0 = r7
                 else
-                  if (match_len = has_terminal?('button', false, index))
+                  if (match_len = has_terminal?('kbd', false, index))
                     r8 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                     @index += match_len
                   else
-                    terminal_parse_failure('button')
+                    terminal_parse_failure('\'kbd\'')
                     r8 = nil
                   end
                   if r8
                     r8 = SyntaxNode.new(input, (index-1)...index) if r8 == true
                     r0 = r8
                   else
-                    if (match_len = has_terminal?('key', false, index))
+                    if (match_len = has_terminal?('sup', false, index))
                       r9 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                       @index += match_len
                     else
-                      terminal_parse_failure('key')
+                      terminal_parse_failure('\'sup\'')
                       r9 = nil
                     end
                     if r9
                       r9 = SyntaxNode.new(input, (index-1)...index) if r9 == true
                       r0 = r9
                     else
-                      if (match_len = has_terminal?('sup', false, index))
+                      if (match_len = has_terminal?('sub', false, index))
                         r10 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                         @index += match_len
                       else
-                        terminal_parse_failure('sup')
+                        terminal_parse_failure('\'sub\'')
                         r10 = nil
                       end
                       if r10
                         r10 = SyntaxNode.new(input, (index-1)...index) if r10 == true
                         r0 = r10
                       else
-                        if (match_len = has_terminal?('sub', false, index))
+                        if (match_len = has_terminal?('mark', false, index))
                           r11 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                           @index += match_len
                         else
-                          terminal_parse_failure('sub')
+                          terminal_parse_failure('\'mark\'')
                           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))
+                          if (match_len = has_terminal?('menu', false, index))
                             r12 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                             @index += match_len
                           else
-                            terminal_parse_failure('mark')
+                            terminal_parse_failure('\'menu\'')
                             r12 = nil
                           end
                           if r12
@@ -481,7 +481,7 @@ module Markup
                               r13 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                               @index += match_len
                             else
-                              terminal_parse_failure('del')
+                              terminal_parse_failure('\'del\'')
                               r13 = nil
                             end
                             if r13
@@ -525,7 +525,7 @@ module Markup
       r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
       @index += match_len
     else
-      terminal_parse_failure('br')
+      terminal_parse_failure('\'br\'')
       r1 = nil
     end
     if r1
@@ -536,7 +536,7 @@ module Markup
         r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
         @index += match_len
       else
-        terminal_parse_failure('img')
+        terminal_parse_failure('\'img\'')
         r2 = nil
       end
       if r2
@@ -647,7 +647,7 @@ module Markup
           r4 = true
           @index += match_len
         else
-          terminal_parse_failure('=')
+          terminal_parse_failure('\'=\'')
           r4 = nil
         end
         s0 << r4
@@ -656,7 +656,7 @@ module Markup
             r5 = true
             @index += match_len
           else
-            terminal_parse_failure('"')
+            terminal_parse_failure('\'"\'')
             r5 = nil
           end
           s0 << r5
@@ -683,7 +683,7 @@ module Markup
                 r8 = true
                 @index += match_len
               else
-                terminal_parse_failure('"')
+                terminal_parse_failure('\'"\'')
                 r8 = nil
               end
               s0 << r8
@@ -735,7 +735,7 @@ module Markup
       r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
       @index += match_len
     else
-      terminal_parse_failure('</')
+      terminal_parse_failure('\'</\'')
       r1 = nil
     end
     s0 << r1
@@ -747,7 +747,7 @@ module Markup
           r3 = true
           @index += match_len
         else
-          terminal_parse_failure('>')
+          terminal_parse_failure('\'>\'')
           r3 = nil
         end
         s0 << r3
@@ -855,7 +855,7 @@ module Markup
       r1 = true
       @index += match_len
     else
-      terminal_parse_failure('&')
+      terminal_parse_failure('\'&\'')
       r1 = nil
     end
     s0 << r1
@@ -866,7 +866,7 @@ module Markup
         r4 = true
         @index += match_len
       else
-        terminal_parse_failure('#')
+        terminal_parse_failure('\'#\'')
         r4 = nil
       end
       s3 << r4
@@ -890,7 +890,7 @@ module Markup
           r7 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('#x')
+          terminal_parse_failure('\'#x\'')
           r7 = nil
         end
         s6 << r7
@@ -925,7 +925,7 @@ module Markup
           r10 = true
           @index += match_len
         else
-          terminal_parse_failure(';')
+          terminal_parse_failure('\';\'')
           r10 = nil
         end
         s0 << r10
@@ -978,6 +978,9 @@ module Markup
       @index = i0
       r0 = nil
     else
+      if s0.size < 6
+        @terminal_failures.pop
+      end
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
     end
 
@@ -999,11 +1002,11 @@ module Markup
 
     s0, i0 = [], index
     loop do
-      if has_terminal?(@regexps[gr = '\A[0-9a-f]'] ||= Regexp.new(gr), :regexp, index)
+      if has_terminal?(@regexps[gr = '\A[0-9a-fA-F]'] ||= Regexp.new(gr), :regexp, index)
         r1 = true
         @index += 1
       else
-        terminal_parse_failure('[0-9a-f]')
+        terminal_parse_failure('[0-9a-fA-F]')
         r1 = nil
       end
       if r1
@@ -1019,6 +1022,9 @@ module Markup
       @index = i0
       r0 = nil
     else
+      if s0.size < 5
+        @terminal_failures.pop
+      end
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
     end
 
@@ -1043,7 +1049,7 @@ module Markup
       r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
       @index += match_len
     else
-      terminal_parse_failure('amp')
+      terminal_parse_failure('\'amp\'')
       r1 = nil
     end
     if r1
@@ -1054,7 +1060,7 @@ module Markup
         r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
         @index += match_len
       else
-        terminal_parse_failure('apos')
+        terminal_parse_failure('\'apos\'')
         r2 = nil
       end
       if r2
@@ -1065,7 +1071,7 @@ module Markup
           r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
-          terminal_parse_failure('gt')
+          terminal_parse_failure('\'gt\'')
           r3 = nil
         end
         if r3
@@ -1076,7 +1082,7 @@ module Markup
             r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
             @index += match_len
           else
-            terminal_parse_failure('lt')
+            terminal_parse_failure('\'lt\'')
             r4 = nil
           end
           if r4
@@ -1087,7 +1093,7 @@ module Markup
               r5 = instantiate_node(SyntaxNode,input, index...(index + match_len))
               @index += match_len
             else
-              terminal_parse_failure('nbsp')
+              terminal_parse_failure('\'nbsp\'')
               r5 = nil
             end
             if r5
@@ -1098,7 +1104,7 @@ module Markup
                 r6 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                 @index += match_len
               else
-                terminal_parse_failure('quot')
+                terminal_parse_failure('\'quot\'')
                 r6 = nil
               end
               if r6
@@ -1136,7 +1142,7 @@ module Markup
         r1 = true
         @index += match_len
       else
-        terminal_parse_failure(' ')
+        terminal_parse_failure('\' \'')
         r1 = nil
       end
       if r1

data/lib/asciidoctor/pdf/formatted_text/parser.treetop

@@ -20,7 +20,7 @@ grammar Markup
     # void_element / start_tag complex end_tag &{|seq| seq[0].name == seq[2].name } {
 
     void_element / start_tag complex end_tag {
-      # NOTE content only applies to non-void elements (second part of rule)
+      # 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
@@ -48,9 +48,9 @@ grammar Markup
   end
 
   rule tag_name
-    # QUESTION faster to do regex?
-    # QUESTION what about supporting hr?
-    'a' / 'strong' / 'em' / 'code' / 'color' / 'font' / 'span' / 'button' / 'key' / 'sup' / 'sub' / 'mark' / 'del'
+    # QUESTION: faster to do regex?
+    # QUESTION: what about supporting hr?
+    'a' / 'strong' / 'em' / 'code' / 'font' / 'span' / 'button' / 'kbd' / 'sup' / 'sub' / 'mark' / 'menu' / 'del'
   end
 
   rule void_tag_name
@@ -109,13 +109,11 @@ grammar Markup
   end
 
   rule character_decimal
-    # NOTE 6 decimals only supported in Asciidoctor 1.5.5 and up
     [0-9] 2..6
   end
 
   rule character_hex
-    # NOTE 5 hexadecimals only supported in Asciidoctor 1.5.5 and up
-    [0-9a-f] 2..5
+    [0-9a-fA-F] 2..5
   end
 
   rule character_name

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

@@ -6,23 +6,23 @@ module Asciidoctor
       module SourceWrap
         NoBreakSpace = ?\u00a0
 
+        # Override Prawn::Text::Formatted::Box#wrap method to add line numbers in source blocks.
+        # Note that this implementation assumes that the :single_line option is falsy.
         def wrap array
+          return super unless array[0][:linenum] # sanity check
           initialize_wrap array
-          stop = nil
-          highlight_line = nil
+          highlight_line = stop = 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
+            if (first_fragment = unconsumed[0])[:linenum]
+              linenum_text = first_fragment[:text]
+              linenum_spacer ||= { text: (NoBreakSpace.encode linenum_text.encoding) + (' ' * (linenum_text.length - 1)) }
+              highlight_line = (second_fragment = unconsumed[1])[:highlight] ? second_fragment.dup : nil
+            else
+              # NOTE: a wrapped line
+              first_fragment[:text] = first_fragment[:text].lstrip
+              @arranger.unconsumed.unshift highlight_line if highlight_line
+              @arranger.unconsumed.unshift linenum_spacer.dup
             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?
@@ -31,7 +31,7 @@ module Asciidoctor
             else
               stop = true
             end
-            stop ||= @single_line || @arranger.finished?
+            stop ||= @arranger.finished?
           end
           @text = @printed_lines.join ?\n
           @everything_printed = @arranger.finished?

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

@@ -13,8 +13,9 @@ module Asciidoctor::PDF::FormattedText
       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
+        #width = data[:extend] ? (pdf.bounds.width - fragment.left) : fragment.width
+        width = pdf.bounds.width - fragment.left
+        fragment.conceal true # if fragment.text == DummyText
       elsif (border_offset = data[:border_offset])
         at = [fragment.left, fragment.top + border_offset]
         width = fragment.width
@@ -41,11 +42,7 @@ module Asciidoctor::PDF::FormattedText
         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
+        border_radius ? (pdf.stroke_rounded_rectangle at, width, height, border_radius) : (pdf.stroke_rectangle at, width, height)
         pdf.stroke_color prev_stroke_color
         pdf.line_width prev_line_width
       end