asciidoctor 2.0.10 → 2.0.17

data/lib/asciidoctor/syntax_highlighter/coderay.rb

@@ -32,7 +32,7 @@ class SyntaxHighlighter::CodeRayAdapter < SyntaxHighlighter::Base
   end
 
   def docinfo? location
-    @requires_stylesheet && location == :footer
+    @requires_stylesheet && location == :head
   end
 
   def docinfo location, doc, opts
@@ -78,7 +78,8 @@ class SyntaxHighlighter::CodeRayAdapter < SyntaxHighlighter::Base
   end
 
   extend Styles # exports static methods
-  include Loader, Styles # adds methods to instance
+  include Styles # adds methods to instance
+  include Loader # adds methods to instance
 
   CodeCellStartTagCs = '<td class="code"><pre>'
 

data/lib/asciidoctor/syntax_highlighter/highlightjs.rb

@@ -9,18 +9,26 @@ class SyntaxHighlighter::HighlightJsAdapter < SyntaxHighlighter::Base
   end
 
   def format node, lang, opts
-    super node, lang, (opts.merge transform: proc {|_, code| code['class'] = %(language-#{lang || 'none'} hljs) } )
+    super node, lang, (opts.merge transform: proc {|_, code| code['class'] = %(language-#{lang || 'none'} hljs) })
   end
 
   def docinfo? location
-    location == :footer
+    true
   end
 
   def docinfo location, doc, opts
     base_url = doc.attr 'highlightjsdir', %(#{opts[:cdn_base_url]}/highlight.js/#{HIGHLIGHT_JS_VERSION})
-    %(<link rel="stylesheet" href="#{base_url}/styles/#{doc.attr 'highlightjs-theme', 'github'}.min.css"#{opts[:self_closing_tag_slash]}>
-<script src="#{base_url}/highlight.min.js"></script>
-#{(doc.attr? 'highlightjs-languages') ? ((doc.attr 'highlightjs-languages').split ',').map {|lang| %[<script src="#{base_url}/languages/#{lang.lstrip}.min.js"></script>\n] }.join : ''}<script>hljs.initHighlighting()</script>)
+    if location == :head
+      %(<link rel="stylesheet" href="#{base_url}/styles/#{doc.attr 'highlightjs-theme', 'github'}.min.css"#{opts[:self_closing_tag_slash]}>)
+    else # :footer
+      %(<script src="#{base_url}/highlight.min.js"></script>
+#{(doc.attr? 'highlightjs-languages') ? ((doc.attr 'highlightjs-languages').split ',').map {|lang| %[<script src="#{base_url}/languages/#{lang.lstrip}.min.js"></script>\n] }.join : ''}<script>
+if (!hljs.initHighlighting.called) {
+  hljs.initHighlighting.called = true
+  ;[].slice.call(document.querySelectorAll('pre.highlight > code')).forEach(function (el) { hljs.highlightBlock(el) })
+}
+</script>)
+    end
   end
 end
 end

data/lib/asciidoctor/syntax_highlighter/prettify.rb

@@ -14,14 +14,17 @@ class SyntaxHighlighter::PrettifyAdapter < SyntaxHighlighter::Base
   end
 
   def docinfo? location
-    location == :footer
+    true
   end
 
   def docinfo location, doc, opts
     base_url = doc.attr 'prettifydir', %(#{opts[:cdn_base_url]}/prettify/r298)
-    prettify_theme_url = ((prettify_theme = doc.attr 'prettify-theme', 'prettify').start_with? 'http://', 'https://') ? prettify_theme : %(#{base_url}/#{prettify_theme}.min.css)
-    %(<link rel="stylesheet" href="#{prettify_theme_url}"#{opts[:self_closing_tag_slash]}>
-<script src="#{base_url}/run_prettify.min.js"></script>)
+    if location == :head
+      prettify_theme_url = ((prettify_theme = doc.attr 'prettify-theme', 'prettify').start_with? 'http://', 'https://') ? prettify_theme : %(#{base_url}/#{prettify_theme}.min.css)
+      %(<link rel="stylesheet" href="#{prettify_theme_url}"#{opts[:self_closing_tag_slash]}>)
+    else # :footer
+      %(<script src="#{base_url}/run_prettify.min.js"></script>)
+    end
   end
 end
 end

data/lib/asciidoctor/syntax_highlighter/pygments.rb

@@ -5,8 +5,7 @@ class SyntaxHighlighter::PygmentsAdapter < SyntaxHighlighter::Base
 
   def initialize *args
     super
-    @requires_stylesheet = nil
-    @style = nil
+    @requires_stylesheet = @style = nil
   end
 
   def highlight?
@@ -34,13 +33,19 @@ class SyntaxHighlighter::PygmentsAdapter < SyntaxHighlighter::Base
         highlighted = highlighted.sub WrapperTagRx, PreTagCs
         opts[:callouts] ? [highlighted, (idx = highlighted.index CodeCellStartTagCs) ? idx + CodeCellStartTagCs.length : nil] : highlighted
       else
-        node.sub_specialchars source # handles nil response from ::Pygments::Lexer#highlight
+        node.sub_source source, false # handles nil response from ::Pygments::Lexer#highlight
       end
     elsif (highlighted = lexer.highlight source, options: highlight_opts)
-      highlighted = highlighted.gsub StyledLinenoSpanTagRx, LinenoSpanTagCs if linenos && noclasses
+      if linenos
+        if noclasses
+          highlighted = highlighted.gsub StyledLinenoSpanTagRx, LinenoSpanTagCs
+        elsif highlighted.include? LegacyLinenoSpanStartTagCs
+          highlighted = highlighted.gsub LegacyLinenoSpanTagRx, LinenoSpanTagCs
+        end
+      end
       highlighted.sub WrapperTagRx, '\1'
     else
-      node.sub_specialchars source # handles nil response from ::Pygments::Lexer#highlight
+      node.sub_source source, false # handles nil response from ::Pygments::Lexer#highlight
     end
   end
 
@@ -53,7 +58,7 @@ class SyntaxHighlighter::PygmentsAdapter < SyntaxHighlighter::Base
   end
 
   def docinfo? location
-    @requires_stylesheet && location == :footer
+    @requires_stylesheet && location == :head
   end
 
   def docinfo location, doc, opts
@@ -115,6 +120,7 @@ class SyntaxHighlighter::PygmentsAdapter < SyntaxHighlighter::Base
     end
     @@stylesheet_cache = ::Hash.new do |cache, key|
       if (stylesheet = ::Pygments.css BASE_SELECTOR, classprefix: TOKEN_CLASS_PREFIX, style: key)
+        stylesheet = stylesheet.slice (stylesheet.index BASE_SELECTOR), stylesheet.length unless stylesheet.start_with? BASE_SELECTOR
         @@stylesheet_cache = cache.merge key => stylesheet
         stylesheet
       end
@@ -123,27 +129,29 @@ class SyntaxHighlighter::PygmentsAdapter < SyntaxHighlighter::Base
     DEFAULT_STYLE = 'default'
     BASE_SELECTOR = 'pre.pygments'
     TOKEN_CLASS_PREFIX = 'tok-'
-
     BaseStyleRx = /^#{BASE_SELECTOR.gsub '.', '\\.'} +\{([^}]+?)\}/
 
     private_constant :BASE_SELECTOR, :TOKEN_CLASS_PREFIX, :BaseStyleRx
   end
 
   extend Styles # exports static methods
-  include Loader, Styles # adds methods to instance
+  include Styles # adds methods to instance
+  include Loader # adds methods to instance
 
   CodeCellStartTagCs = '<td class="code">'
+  LegacyLinenoSpanStartTagCs = '<span class="lineno">'
+  LegacyLinenoSpanTagRx = %r(#{LegacyLinenoSpanStartTagCs}( *\d+) ?</span>)
   LinenoColumnStartTagsCs = '<td class="linenos"><div class="linenodiv"><pre>'
-  LinenoSpanTagCs = '<span class="lineno">\1</span>'
+  LinenoSpanTagCs = '<span class="linenos">\1</span>'
   PreTagCs = '<pre>\1</pre>'
   StyledLinenoColumnStartTagsRx = /<td><div class="linenodiv" style="[^"]+?"><pre style="[^"]+?">/
-  StyledLinenoSpanTagRx = %r(<span style="background-color: #f0f0f0; padding: 0 5px 0 5px">( *\d+ )</span>)
+  StyledLinenoSpanTagRx = %r((?<=^|<span></span>)<span style="[^"]+">( *\d+) ?</span>)
   WRAPPER_CLASS = 'lineno' # doesn't appear in output; Pygments appends "table" to this value to make nested table class
   # NOTE <pre> has style attribute when pygments-css=style
   # NOTE <div> has trailing newline when pygments-linenums-mode=table
   # NOTE initial <span></span> preserves leading blank lines
   WrapperTagRx = %r(<div class="#{WRAPPER_CLASS}"><pre\b[^>]*?>(.*)</pre></div>\n*)m
 
-  private_constant :CodeCellStartTagCs, :LinenoColumnStartTagsCs, :LinenoSpanTagCs, :PreTagCs, :StyledLinenoColumnStartTagsRx, :StyledLinenoSpanTagRx, :WrapperTagRx, :WRAPPER_CLASS
+  private_constant :CodeCellStartTagCs, :LegacyLinenoSpanStartTagCs, :LegacyLinenoSpanTagRx, :LinenoColumnStartTagsCs, :LinenoSpanTagCs, :PreTagCs, :StyledLinenoColumnStartTagsRx, :StyledLinenoSpanTagRx, :WrapperTagRx, :WRAPPER_CLASS
 end
 end

data/lib/asciidoctor/syntax_highlighter/rouge.rb

@@ -13,40 +13,30 @@ class SyntaxHighlighter::RougeAdapter < SyntaxHighlighter::Base
   end
 
   def highlight node, source, lang, opts
-    lexer = (::Rouge::Lexer.find_fancy lang) || ::Rouge::Lexers::PlainText
-    lexer_opts = lexer.tag == 'php' && !(node.option? 'mixed') ? { start_inline: true } : {}
     @style ||= (style = opts[:style]) && (style_available? style) || DEFAULT_STYLE
-    if opts[:css_mode] == :class
-      @requires_stylesheet = true
-      formatter = ::Rouge::Formatters::HTML.new inline_theme: @style
+    @requires_stylesheet = true if opts[:css_mode] == :class
+    lexer = create_lexer node, source, lang, opts
+    formatter = create_formatter node, source, lang, opts
+    highlighted = formatter.format lexer.lex source
+    if opts[:number_lines] && opts[:callouts]
+      [highlighted, (idx = highlighted.index CodeCellStartTagCs) ? idx + CodeCellStartTagCs.length : nil]
     else
-      formatter = ::Rouge::Formatters::HTMLInline.new (::Rouge::Theme.find @style).new
+      highlighted
     end
-    if (highlight_lines = opts[:highlight_lines])
-      formatter = RougeExt::Formatters::HTMLLineHighlighter.new formatter, lines: highlight_lines
-    end
-    if opts[:number_lines]
-      formatter = RougeExt::Formatters::HTMLTable.new formatter, start_line: opts[:start_line_number]
-      if opts[:callouts]
-        return [(highlighted = formatter.format lexer.lex source, lexer_opts), (idx = highlighted.index CodeCellStartTagCs) ? idx + CodeCellStartTagCs.length : nil]
-      end
-    end
-    formatter.format lexer.lex source, lexer_opts
   end
 
   def format node, lang, opts
     if (query_idx = lang && (lang.index '?'))
       lang = lang.slice 0, query_idx
     end
-    if opts[:css_mode] != :class && (@style = (style = opts[:style]) && (style_available? style) || DEFAULT_STYLE) &&
-        (pre_style_attr_val = base_style @style)
+    if opts[:css_mode] != :class && (@style = (style = opts[:style]) && (style_available? style) || DEFAULT_STYLE) && (pre_style_attr_val = base_style @style)
       opts[:transform] = proc {|pre| pre['style'] = pre_style_attr_val }
     end
     super
   end
 
   def docinfo? location
-    @requires_stylesheet && location == :footer
+    @requires_stylesheet && location == :head
   end
 
   def docinfo location, doc, opts
@@ -67,6 +57,30 @@ class SyntaxHighlighter::RougeAdapter < SyntaxHighlighter::Base
     ::File.write (::File.join to_dir, (stylesheet_basename @style)), (read_stylesheet @style), mode: FILE_WRITE_MODE
   end
 
+  def create_lexer node, source, lang, opts
+    if lang.include? '?'
+      # NOTE cgi-style options only properly supported in Rouge >= 2.1
+      if (lexer = ::Rouge::Lexer.find_fancy lang)
+        unless lexer.tag != 'php' || (node.option? 'mixed') || ((lexer_opts = lexer.options).key? 'start_inline')
+          lexer = lexer.class.new lexer_opts.merge 'start_inline' => true
+        end
+      end
+    elsif (lexer = ::Rouge::Lexer.find lang)
+      lexer = lexer.tag == 'php' && !(node.option? 'mixed') ? (lexer.new start_inline: true) : lexer.new
+    end if lang
+    lexer || ::Rouge::Lexers::PlainText.new
+  end
+
+  def create_formatter node, source, lang, opts
+    formatter = opts[:css_mode] == :class ?
+      (::Rouge::Formatters::HTML.new inline_theme: @style) :
+      (::Rouge::Formatters::HTMLInline.new (::Rouge::Theme.find @style).new)
+    if (highlight_lines = opts[:highlight_lines])
+      formatter = RougeExt::Formatters::HTMLLineHighlighter.new formatter, lines: highlight_lines
+    end
+    opts[:number_lines] ? (RougeExt::Formatters::HTMLTable.new formatter, start_line: opts[:start_line_number]) : formatter
+  end
+
   module Loader
     private
 
@@ -119,7 +133,8 @@ class SyntaxHighlighter::RougeAdapter < SyntaxHighlighter::Base
   end
 
   extend Styles # exports static methods
-  include Loader, Styles # adds methods to instance
+  include Styles # adds methods to instance
+  include Loader # adds methods to instance
 
   CodeCellStartTagCs = '<td class="code">'
 

data/lib/asciidoctor/syntax_highlighter.rb

@@ -20,7 +20,7 @@ module SyntaxHighlighter
   end
 
   # Public: Indicates whether this syntax highlighter has docinfo (i.e., markup) to insert into the output document at
-  # the specified location.
+  # the specified location. Should be called by converter after main content has been converted.
   #
   # location - The Symbol representing the location slot (:head or :footer).
   #
@@ -28,6 +28,7 @@ module SyntaxHighlighter
   def docinfo? location; end
 
   # Public: Generates docinfo markup for this syntax highlighter to insert at the specified location in the output document.
+  # Should be called by converter after main content has been converted.
   #
   # location - The Symbol representing the location slot (:head or :footer).
   # doc      - The Document in which this syntax highlighter is being used.
@@ -98,9 +99,10 @@ module SyntaxHighlighter
     raise ::NotImplementedError, %(#{SyntaxHighlighter} subclass #{self.class} must implement the ##{__method__} method since #write_stylesheet? returns true)
   end
 
-  private_class_method def self.included into
+  def self.included into
     into.extend Config
-  end || :included
+  end
+  private_class_method :included # use separate declaration for Ruby 2.0.x
 
   module Config
     # Public: Statically register the current class in the registry for the specified names.
@@ -139,7 +141,7 @@ module SyntaxHighlighter
     # name    - The String name of the syntax highlighter to create.
     # backend - The String name of the backend for which this syntax highlighter is being used (default: 'html5').
     # opts    - A Hash of options providing information about the context in which this syntax highlighter is used:
-    #           :doc - The Document for which this syntax highlighter was created.
+    #           :document - The Document for which this syntax highlighter was created.
     #
     # Returns a [SyntaxHighlighter] instance for the specified name.
     def create name, backend = 'html5', opts = {}
@@ -151,7 +153,7 @@ module SyntaxHighlighter
     end
 
     private
-    
+
     def registry
       raise ::NotImplementedError, %(#{Factory} subclass #{self.class} must implement the ##{__method__} method)
     end
@@ -165,19 +167,17 @@ module SyntaxHighlighter
     end
 
     private
-    
-    def registry
-      @registry
-    end
+
+    attr_reader :registry
   end
 
   module DefaultFactory
     include Factory
 
-    private
-
     @@registry = {}
 
+    private
+
     def registry
       @@registry
     end
@@ -215,8 +215,6 @@ module SyntaxHighlighter
         'rouge' => %(#{__dir__}/syntax_highlighter/rouge),
       }
 
-      private
-
       @@mutex = ::Mutex.new
     end
   end
@@ -235,9 +233,11 @@ module SyntaxHighlighter
     def format node, lang, opts
       class_attr_val = opts[:nowrap] ? %(#{@pre_class} highlight nowrap) : %(#{@pre_class} highlight)
       if (transform = opts[:transform])
-        pre = { 'class' => class_attr_val }
-        code = lang ? { 'data-lang' => lang } : {}
-        transform[pre, code]
+        transform[(pre = { 'class' => class_attr_val }), (code = lang ? { 'data-lang' => lang } : {})]
+        # NOTE: make sure data-lang is the last attribute on the code tag to remain consistent with 1.5.x
+        if (lang = code.delete 'data-lang')
+          code['data-lang'] = lang
+        end
         %(<pre#{pre.map {|k, v| %[ #{k}="#{v}"] }.join}><code#{code.map {|k, v| %[ #{k}="#{v}"] }.join}>#{node.content}</code></pre>)
       else
         %(<pre class="#{class_attr_val}"><code#{lang ? %[ data-lang="#{lang}"] : ''}>#{node.content}</code></pre>)

data/lib/asciidoctor/table.rb

@@ -58,7 +58,7 @@ class Table < AbstractBlock
     @rows = Rows.new
     @columns = []
 
-    @has_header_option = attributes['header-option'] ? true : false
+    @has_header_option = false
 
     # smells like we need a utility method here
     # to resolve an integer width from potential bogus input
@@ -78,10 +78,10 @@ class Table < AbstractBlock
     @attributes['orientation'] = 'landscape' if attributes['rotate-option']
   end
 
-  # Internal: Returns whether the current row being processed is
-  # the header row
+  # Internal: Returns the current state of the header option (true or :implicit) if
+  # the row being processed is (or is assumed to be) the header row, otherwise nil
   def header_row?
-    @has_header_option && @rows.body.empty?
+    (val = @has_header_option) && @rows.body.empty? ? val : nil
   end
 
   # Internal: Creates the Column objects from the column spec
@@ -154,22 +154,19 @@ class Table < AbstractBlock
   # returns nothing
   def partition_header_footer(attrs)
     # set rowcount before splitting up body rows
-    @attributes['rowcount'] = @rows.body.size
-
-    num_body_rows = @rows.body.size
-    if num_body_rows > 0 && @has_header_option
-      head = @rows.body.shift
-      num_body_rows -= 1
-      # styles aren't applied to header row
-      head.each {|c| c.style = nil }
-      # QUESTION why does AsciiDoc use an array for head? is it
-      # possible to have more than one based on the syntax?
-      @rows.head = [head]
+    num_body_rows = @attributes['rowcount'] = (body = @rows.body).size
+
+    if num_body_rows > 0
+      if @has_header_option
+        @rows.head = [body.shift.map {|cell| cell.reinitialize true }]
+        num_body_rows -= 1
+      elsif @has_header_option.nil?
+        @has_header_option = false
+        body.unshift(body.shift.map {|cell| cell.reinitialize false })
+      end
     end
 
-    if num_body_rows > 0 && attrs['footer-option']
-      @rows.foot = [@rows.body.pop]
-    end
+    @rows.foot = [body.pop] if num_body_rows > 0 && attrs['footer-option']
 
     nil
   end
@@ -232,14 +229,23 @@ class Table::Cell < AbstractBlock
   # Public: An alias to the parent block (which is always a Column)
   alias column parent
 
-  # Internal: Returns the nested Document in an AsciiDoc table cell (only set when style is :asciidoc)
+  # Public: Returns the nested Document in an AsciiDoc table cell (only set when style is :asciidoc)
   attr_reader :inner_document
 
   def initialize column, cell_text, attributes = {}, opts = {}
     super column, :table_cell
+    @cursor = @reinitialize_args = nil
     @source_location = opts[:cursor].dup if @document.sourcemap
+    # NOTE: column is always set when parsing; may not be set when building table from the API
     if column
-      cell_style = column.attributes['style'] unless (in_header_row = column.table.header_row?)
+      if (in_header_row = column.table.header_row?)
+        if in_header_row == :implicit && (cell_style = column.style || (attributes && attributes['style']))
+          @reinitialize_args = [column, cell_text, attributes && attributes.merge, opts] if cell_style == :asciidoc || cell_style == :literal
+          cell_style = nil
+        end
+      else
+        cell_style = column.style
+      end
       # REVIEW feels hacky to inherit all attributes from column
       update_attributes column.attributes
     end
@@ -253,7 +259,8 @@ class Table::Cell < AbstractBlock
         cell_style = attributes['style'] || cell_style unless in_header_row
         update_attributes attributes
       end
-      if cell_style == :asciidoc
+      case cell_style
+      when :asciidoc
         asciidoc = true
         inner_document_cursor = opts[:cursor]
         if (cell_text = cell_text.rstrip).start_with? LF
@@ -264,7 +271,7 @@ class Table::Cell < AbstractBlock
         else
           cell_text = cell_text.lstrip
         end
-      elsif cell_style == :literal
+      when :literal
         literal = true
         cell_text = cell_text.rstrip
         # QUESTION should we use same logic as :asciidoc cell? strip leading space if text doesn't start with newline?
@@ -306,8 +313,12 @@ class Table::Cell < AbstractBlock
       @content_model = :verbatim
       @subs = BASIC_SUBS
     else
-      if normal_psv && (cell_text.start_with? '[[') && LeadingInlineAnchorRx =~ cell_text
-        Parser.catalog_inline_anchor $1, $2, self, opts[:cursor], @document
+      if normal_psv
+        if in_header_row
+          @cursor = opts[:cursor] # used in deferred catalog_inline_anchor call
+        else
+          catalog_inline_anchor cell_text, opts[:cursor]
+        end
       end
       @content_model = :simple
       @subs = NORMAL_SUBS
@@ -316,6 +327,25 @@ class Table::Cell < AbstractBlock
     @style = cell_style
   end
 
+  def reinitialize has_header
+    if has_header
+      @reinitialize_args = nil
+    elsif @reinitialize_args
+      return Table::Cell.new(*@reinitialize_args)
+    else
+      @style = @attributes['style']
+    end
+    catalog_inline_anchor if @cursor
+    self
+  end
+
+  def catalog_inline_anchor cell_text = @text, cursor = nil
+    cursor, @cursor = @cursor, nil unless cursor
+    if (cell_text.start_with? '[[') && LeadingInlineAnchorRx =~ cell_text
+      Parser.catalog_inline_anchor $1, $2, self, cursor, @document
+    end
+  end
+
   # Public: Get the String text of this cell with substitutions applied.
   #
   # Used for cells in the head row as well as text-only (non-AsciiDoc) cells in
@@ -328,18 +358,14 @@ class Table::Cell < AbstractBlock
     apply_subs @text, @subs
   end
 
-  # Public: Set the String text.
+  # Public: Set the String text for this cell.
   #
   # This method shouldn't be used for cells that have the AsciiDoc style.
-  #
-  # Returns the new String text assigned to this Cell
-  def text= val
-    @text = val
-  end
+  attr_writer :text
 
   # Public: Handles the body data (tbody, tfoot), applying styles and partitioning into paragraphs
   #
-  # This method should not be used for cells in the head row or that have the literal or verse style.
+  # This method should not be used for cells in the head row or that have the literal style.
   #
   # Returns the converted String for this Cell
   def content
@@ -377,7 +403,7 @@ class Table::Cell < AbstractBlock
   end
 
   def to_s
-    "#{super.to_s} - [text: #@text, colspan: #{@colspan || 1}, rowspan: #{@rowspan || 1}, attributes: #@attributes]"
+    %(#{super} - [text: #{@text}, colspan: #{@colspan || 1}, rowspan: #{@rowspan || 1}, attributes: #{@attributes}])
   end
 end
 
@@ -385,7 +411,7 @@ end
 # class are primarily responsible for tracking the buffer of a cell as the parser
 # moves through the lines of the table using tail recursion. When a cell boundary
 # is located, the previous cell is closed, an instance of Table::Cell is
-# instantiated, the row is closed if the cell satisifies the column count and,
+# instantiated, the row is closed if the cell satisfies the column count and,
 # finally, a new buffer is allocated to track the next cell.
 class Table::ParserContext
   include Logging
@@ -505,12 +531,13 @@ class Table::ParserContext
   #
   # returns true if the buffer has unclosed quotes, false if it doesn't or it
   # isn't quoted data
-  def buffer_has_unclosed_quotes? append = nil
-    if (record = append ? (@buffer + append).strip : @buffer.strip) == '"'
+  def buffer_has_unclosed_quotes? append = nil, q = '"'
+    if (record = append ? (@buffer + append).strip : @buffer.strip) == q
       true
-    elsif record.start_with? '"'
-      if ((trailing_quote = record.end_with? '"') && (record.end_with? '""')) || (record.start_with? '""')
-        ((record = record.gsub '""', '').start_with? '"') && !(record.end_with? '"')
+    elsif record.start_with? q
+      qq = q + q
+      if ((trailing_quote = record.end_with? q) && (record.end_with? qq)) || (record.start_with? qq)
+        ((record = record.gsub qq, '').start_with? q) && !(record.end_with? q)
       else
         !trailing_quote
       end
@@ -603,20 +630,20 @@ class Table::ParserContext
       @buffer = ''
       cellspec = nil
       repeat = 1
-      if @format == 'csv' && !cell_text.empty? && cell_text.include?('"')
+      if @format == 'csv' && !cell_text.empty? && (cell_text.include? (q = '"'))
         # this may not be perfect logic, but it hits the 99%
-        if cell_text.start_with?('"') && cell_text.end_with?('"')
+        if (cell_text.start_with? q) && (cell_text.end_with? q)
           # unquote
           if (cell_text = cell_text.slice(1, cell_text.length - 2))
             # trim whitespace and collapse escaped quotes
-            cell_text = cell_text.strip.squeeze('"')
+            cell_text = cell_text.strip.squeeze q
           else
             logger.error message_with_context 'unclosed quote in CSV data; setting cell to empty', source_location: @reader.cursor_at_prev_line
             cell_text = ''
           end
         else
           # collapse escaped quotes
-          cell_text = cell_text.squeeze('"')
+          cell_text = cell_text.squeeze q
         end
       end
     end
@@ -635,7 +662,7 @@ class Table::ParserContext
         # QUESTION is this right for cells that span columns?
         unless (column = @table.columns[@current_row.size])
           logger.error message_with_context 'dropping cell because it exceeds specified number of columns', source_location: @reader.cursor_before_mark
-          return
+          return nil
         end
       end
 

data/lib/asciidoctor/timings.rb

@@ -49,9 +49,9 @@ module Asciidoctor
 
     def print_report to = $stdout, subject = nil
       to.puts %(Input file: #{subject}) if subject
-      to.puts %(  Time to read and parse source: #{'%05.5f' % read_parse.to_f})
-      to.puts %(  Time to convert document: #{'%05.5f' % convert.to_f})
-      to.puts %(  Total time (read, parse and convert): #{'%05.5f' % read_parse_convert.to_f})
+      to.puts %(  Time to read and parse source: #{sprintf '%05.5f', read_parse.to_f})
+      to.puts %(  Time to convert document: #{sprintf '%05.5f', convert.to_f})
+      to.puts %(  Total time (read, parse and convert): #{sprintf '%05.5f', read_parse_convert.to_f})
     end
 
     private

data/lib/asciidoctor/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Asciidoctor
-  VERSION = '2.0.10'
+  VERSION = '2.0.17'
 end