asciidoctor 2.0.6 → 2.0.11

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
@@ -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 (cell_style = column.style || attributes&.[]('style')) == :asciidoc || cell_style == :literal
+          @reinitialize_args = [column, cell_text, attributes&.merge, opts]
+        end
+        cell_style = nil
+      else
+        cell_style = column.style
+      end
       # REVIEW feels hacky to inherit all attributes from column
       update_attributes column.attributes
     end
@@ -306,8 +312,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 +326,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
@@ -339,7 +368,7 @@ class Table::Cell < AbstractBlock
 
   # 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

data/lib/asciidoctor/version.rb

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

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 2.0.6
-.\"      Date: 2019-04-04
+.\" Generator: Asciidoctor 2.0.11
+.\"      Date: 2020-11-02
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.6
+.\"    Source: Asciidoctor 2.0.11
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2019-04-04" "Asciidoctor 2.0.6" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2020-11-02" "Asciidoctor 2.0.11" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -28,13 +28,13 @@
 .  LINKSTYLE blue R < >
 .\}
 .SH "NAME"
-asciidoctor \- converts AsciiDoc source files to HTML, DocBook and other formats
+asciidoctor \- converts AsciiDoc source files to HTML, DocBook, and other formats
 .SH "SYNOPSIS"
 .sp
 \fBasciidoctor\fP [\fIOPTION\fP]... \fIFILE\fP...
 .SH "DESCRIPTION"
 .sp
-The asciidoctor(1) command converts the AsciiDoc source file(s) \fIFILE\fP to HTML5, DocBook 5, man(ual) page and other custom output formats.
+The asciidoctor(1) command converts the AsciiDoc source file(s) \fIFILE\fP to HTML5, DocBook 5, man(ual) page, and other custom output formats.
 .sp
 If \fIFILE\fP is \fI\-\fP then the AsciiDoc source is read from standard input.
 .SH "OPTIONS"
@@ -43,13 +43,13 @@ If \fIFILE\fP is \fI\-\fP then the AsciiDoc source is read from standard input.
 \fB\-B, \-\-base\-dir\fP=\fIDIR\fP
 .RS 4
 Base directory containing the document and resources.
-Defaults to the directory containing the source file, or the working directory if the source is read from a stream.
+Defaults to the directory containing the source file or, if the source is read from a stream, the working directory.
 When combined with the safe mode setting, can be used to chroot the execution of the program.
 .RE
 .sp
 \fB\-S, \-\-safe\-mode\fP=\fISAFE_MODE\fP
 .RS 4
-Set safe mode level: \fIunsafe\fP, \fIsafe\fP, \fIserver\fP or \fIsecure\fP.
+Set safe mode level: \fIunsafe\fP, \fIsafe\fP, \fIserver\fP, or \fIsecure\fP.
 Disables potentially dangerous macros in source files, such as \f(CRinclude::[]\fP.
 If not set, the safe mode level defaults to \fIunsafe\fP when Asciidoctor is invoked using this script.
 .RE
@@ -65,11 +65,11 @@ If not set, the safe mode level defaults to \fIunsafe\fP when Asciidoctor is inv
 .sp
 \fB\-a, \-\-attribute\fP=\fIATTRIBUTE\fP
 .RS 4
-Define, override or delete a document attribute.
-Command\-line attributes take precedence over attributes defined in the source file unless the value ends with \fI@\fP.
+Define, override, or unset a document attribute.
+Command\-line attributes take precedence over attributes defined in the source file unless either the name or value ends in \fI@\fP.
 .sp
 \fIATTRIBUTE\fP is normally formatted as a key\-value pair, in the form \fINAME=VALUE\fP.
-Alternate acceptable forms are \fINAME\fP (where the \fIVALUE\fP defaults to an empty string), \fINAME!\fP (unassigns the \fINAME\fP attribute) and \fINAME=VALUE@\fP (where \fIVALUE\fP does not override value of \fINAME\fP attribute if it\(cqs already defined in the source document).
+Alternate forms are \fINAME\fP (where the \fIVALUE\fP defaults to an empty string), \fINAME!\fP (unsets the \fINAME\fP attribute), and \fINAME=VALUE@\fP (or \fINAME@=VALUE\fP) (where \fIVALUE\fP does not override the \fINAME\fP attribute if it\(cqs already defined in the source document).
 Values containing spaces should be enclosed in quotes.
 .sp
 This option may be specified more than once.
@@ -77,7 +77,7 @@ This option may be specified more than once.
 .sp
 \fB\-b, \-\-backend\fP=\fIBACKEND\fP
 .RS 4
-Backend output file format: \fIhtml5\fP, \fIdocbook5\fP, \fIdocbook45\fP and \fImanpage\fP are supported out of the box.
+Backend output file format: \fIhtml5\fP, \fIdocbook5\fP, and \fImanpage\fP are supported out of the box.
 You can also use the backend alias names \fIhtml\fP (aliased to \fIhtml5\fP) or \fIdocbook\fP (aliased to \fIdocbook5\fP).
 Other values can be passed, but if Asciidoctor cannot resolve the backend to a converter, it will fail.
 Defaults to \fIhtml5\fP.
@@ -85,7 +85,7 @@ Defaults to \fIhtml5\fP.
 .sp
 \fB\-d, \-\-doctype\fP=\fIDOCTYPE\fP
 .RS 4
-Document type: \fIarticle\fP, \fIbook\fP, \fImanpage\fP or \fIinline\fP.
+Document type: \fIarticle\fP, \fIbook\fP, \fImanpage\fP, or \fIinline\fP.
 Sets the root element when using the \fIdocbook\fP backend and the style class on the HTML body element when using the \fIhtml\fP backend.
 The \fIbook\fP document type allows multiple level\-0 section titles in a single document.
 The \fImanpage\fP document type enables parsing of metadata necessary to produce a man page.
@@ -97,7 +97,7 @@ Defaults to \fIarticle\fP.
 \fB\-D, \-\-destination\-dir\fP=\fIDIR\fP
 .RS 4
 Destination output directory.
-Defaults to the directory containing the source file, or the working directory if the source is read from a stream.
+Defaults to the directory containing the source file or, if the source is read from a stream, the working directory.
 If specified, the directory is resolved relative to the working directory.
 .RE
 .sp
@@ -198,7 +198,7 @@ Turn on script warnings (applies to executed code).
 .sp
 \fB\-t, \-\-timings\fP
 .RS 4
-Print timings report to stderr (time to read, parse and convert).
+Print timings report to stderr (time to read, parse, and convert).
 .RE
 .SS "Program Information"
 .sp
@@ -239,7 +239,7 @@ Refer to the \fBAsciidoctor\fP issue tracker at \c
 .URL "https://github.com/asciidoctor/asciidoctor/issues?q=is%3Aopen" "" "."
 .SH "AUTHORS"
 .sp
-\fBAsciidoctor\fP was written by Dan Allen, Ryan Waldron, Jason Porter, Nick Hengeveld and other contributors.
+\fBAsciidoctor\fP was written by Dan Allen, Ryan Waldron, Jason Porter, Nick Hengeveld, and other contributors.
 .sp
 \fBAsciiDoc\fP was written by Stuart Rackham and has received contributions from many other individuals.
 .SH "RESOURCES"
@@ -257,7 +257,7 @@ Refer to the \fBAsciidoctor\fP issue tracker at \c
 .URL "http://discuss.asciidoctor.org" "" ""
 .SH "COPYING"
 .sp
-Copyright (C) 2012\-2019 Dan Allen, Ryan Waldron and the Asciidoctor Project.
+Copyright (C) 2012\-2020 Dan Allen, Ryan Waldron, and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.
 .SH "AUTHORS"
 .sp

data/man/asciidoctor.adoc

@@ -1,13 +1,14 @@
 = asciidoctor(1)
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
+:release-version: 2.0.11
 :man manual: Asciidoctor Manual
-:man source: Asciidoctor 2.0.6
+:man source: Asciidoctor {release-version}
 :page-layout: base
 
 == NAME
 
-asciidoctor - converts AsciiDoc source files to HTML, DocBook and other formats
+asciidoctor - converts AsciiDoc source files to HTML, DocBook, and other formats
 
 == SYNOPSIS
 
@@ -15,7 +16,7 @@ asciidoctor - converts AsciiDoc source files to HTML, DocBook and other formats
 
 == DESCRIPTION
 
-The asciidoctor(1) command converts the AsciiDoc source file(s) _FILE_ to HTML5, DocBook 5, man(ual) page and other custom output formats.
+The asciidoctor(1) command converts the AsciiDoc source file(s) _FILE_ to HTML5, DocBook 5, man(ual) page, and other custom output formats.
 
 If _FILE_ is _-_ then the AsciiDoc source is read from standard input.
 
@@ -25,11 +26,11 @@ If _FILE_ is _-_ then the AsciiDoc source is read from standard input.
 
 *-B, --base-dir*=_DIR_::
   Base directory containing the document and resources.
-  Defaults to the directory containing the source file, or the working directory if the source is read from a stream.
+  Defaults to the directory containing the source file or, if the source is read from a stream, the working directory.
   When combined with the safe mode setting, can be used to chroot the execution of the program.
 
 *-S, --safe-mode*=_SAFE_MODE_::
-  Set safe mode level: _unsafe_, _safe_, _server_ or _secure_.
+  Set safe mode level: _unsafe_, _safe_, _server_, or _secure_.
   Disables potentially dangerous macros in source files, such as `include::[]`.
   If not set, the safe mode level defaults to _unsafe_ when Asciidoctor is invoked using this script.
 
@@ -42,23 +43,23 @@ If _FILE_ is _-_ then the AsciiDoc source is read from standard input.
 === Document Settings
 
 *-a, --attribute*=_ATTRIBUTE_::
-  Define, override or delete a document attribute.
-  Command-line attributes take precedence over attributes defined in the source file unless the value ends with _@_.
+  Define, override, or unset a document attribute.
+  Command-line attributes take precedence over attributes defined in the source file unless either the name or value ends in _@_.
 +
 _ATTRIBUTE_ is normally formatted as a key-value pair, in the form _NAME=VALUE_.
-Alternate acceptable forms are _NAME_ (where the _VALUE_ defaults to an empty string), _NAME!_ (unassigns the _NAME_ attribute) and _NAME=VALUE@_ (where _VALUE_ does not override value of _NAME_ attribute if it's already defined in the source document).
+Alternate forms are _NAME_ (where the _VALUE_ defaults to an empty string), _NAME!_ (unsets the _NAME_ attribute), and _NAME=VALUE@_ (or _NAME@=VALUE_) (where _VALUE_ does not override the _NAME_ attribute if it's already defined in the source document).
 Values containing spaces should be enclosed in quotes.
 +
 This option may be specified more than once.
 
 *-b, --backend*=_BACKEND_::
-  Backend output file format: _html5_, _docbook5_, _docbook45_ and _manpage_ are supported out of the box.
+  Backend output file format: _html5_, _docbook5_, and _manpage_ are supported out of the box.
   You can also use the backend alias names _html_ (aliased to _html5_) or _docbook_ (aliased to _docbook5_).
   Other values can be passed, but if Asciidoctor cannot resolve the backend to a converter, it will fail.
   Defaults to _html5_.
 
 *-d, --doctype*=_DOCTYPE_::
-  Document type: _article_, _book_, _manpage_ or _inline_.
+  Document type: _article_, _book_, _manpage_, or _inline_.
   Sets the root element when using the _docbook_ backend and the style class on the HTML body element when using the _html_ backend.
   The _book_ document type allows multiple level-0 section titles in a single document.
   The _manpage_ document type enables parsing of metadata necessary to produce a man page.
@@ -69,7 +70,7 @@ This option may be specified more than once.
 
 *-D, --destination-dir*=_DIR_::
   Destination output directory.
-  Defaults to the directory containing the source file, or the working directory if the source is read from a stream.
+  Defaults to the directory containing the source file or, if the source is read from a stream, the working directory.
   If specified, the directory is resolved relative to the working directory.
 
 *-E, --template-engine*=_NAME_::
@@ -141,7 +142,7 @@ Matching templates found in subsequent directories override ones previously disc
   Turn on script warnings (applies to executed code).
 
 *-t, --timings*::
-  Print timings report to stderr (time to read, parse and convert).
+  Print timings report to stderr (time to read, parse, and convert).
 
 === Program Information
 
@@ -175,7 +176,7 @@ Refer to the *Asciidoctor* issue tracker at https://github.com/asciidoctor/ascii
 
 == AUTHORS
 
-*Asciidoctor* was written by Dan Allen, Ryan Waldron, Jason Porter, Nick Hengeveld and other contributors.
+*Asciidoctor* was written by Dan Allen, Ryan Waldron, Jason Porter, Nick Hengeveld, and other contributors.
 
 *AsciiDoc* was written by Stuart Rackham and has received contributions from many other individuals.
 
@@ -191,5 +192,5 @@ Refer to the *Asciidoctor* issue tracker at https://github.com/asciidoctor/ascii
 
 == COPYING
 
-Copyright \(C) 2012-2019 Dan Allen, Ryan Waldron and the Asciidoctor Project.
+Copyright \(C) 2012-2020 Dan Allen, Ryan Waldron, and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.11
 platform: ruby
 authors:
 - Dan Allen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -72,19 +72,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -147,14 +147,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.15.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +231,7 @@ files:
 - data/locale/attributes-id.adoc
 - data/locale/attributes-it.adoc
 - data/locale/attributes-ja.adoc
-- data/locale/attributes-kr.adoc
+- data/locale/attributes-ko.adoc
 - data/locale/attributes-nb.adoc
 - data/locale/attributes-nl.adoc
 - data/locale/attributes-nn.adoc
@@ -260,6 +260,7 @@ files:
 - lib/asciidoctor/cli.rb
 - lib/asciidoctor/cli/invoker.rb
 - lib/asciidoctor/cli/options.rb
+- lib/asciidoctor/convert.rb
 - lib/asciidoctor/converter.rb
 - lib/asciidoctor/converter/composite.rb
 - lib/asciidoctor/converter/docbook5.rb
@@ -277,11 +278,13 @@ files:
 - lib/asciidoctor/helpers.rb
 - lib/asciidoctor/inline.rb
 - lib/asciidoctor/list.rb
+- lib/asciidoctor/load.rb
 - lib/asciidoctor/logging.rb
 - lib/asciidoctor/parser.rb
 - lib/asciidoctor/path_resolver.rb
 - lib/asciidoctor/reader.rb
 - lib/asciidoctor/rouge_ext.rb
+- lib/asciidoctor/rx.rb
 - lib/asciidoctor/section.rb
 - lib/asciidoctor/stylesheets.rb
 - lib/asciidoctor/substitutors.rb
@@ -321,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: An implementation of the AsciiDoc text processor and publishing toolchain