asciidoctor 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ef189b83754a55b816f7a460e35f774c88caaad9ff226ce55c1c52cbc412164
-  data.tar.gz: d1df841d432830e57c6e09fd01d3dd862e8d15f4e3f5c6c18dcb1ee5ce837ae2
+  metadata.gz: 7d06b9c81c6dd7e6df2024477e3142589c7723c745558780ba22417b6a473153
+  data.tar.gz: 13bdf319bef92feec8faca9750d2a946a08afbae2046b97bffd6cf2cc3e96c10
 SHA512:
-  metadata.gz: 0166e0df2ecdfef13e74befcdcc30bc4eaf52a0df358438350a5891c8f4ffa1346bc2d5d2c8be76d40fa931e88017be6748dd34cbd9184583ad631cfc91aa205
-  data.tar.gz: 2eaf29c5ac50b229214da2bf11f933767fc9bf43d3ff6b86d859501e1b1c446945d2845825cb4f5010e891a1c5af47e552f170533d3f4c48eaa19d7f1e30ff30
+  metadata.gz: c10d1ac31e307c48d0b370cfcea8d4aac04eed0a02d916dea23253cee30214fd2ffb63e22ae9c273f64ec82f44c7b8c94b6d41077ea21bf221b80916f52ca9d6
+  data.tar.gz: 063437b88020715aebd3388ec6e9c68971b404a4441466b4c2e16546bbbeb7aa7dbb4b29714790f1559b9b277b679cafd0f60633483448b5d140603e949c3d0b

data/CHANGELOG.adoc

@@ -14,6 +14,18 @@ This document provides a high-level view of the changes introduced in Asciidocto
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
 // tag::compact[]
+== 2.0.9 (2019-04-30) - @mojavelinux
+
+Bug Fixes::
+
+  * process multiple single-item menu macros in same line (#3279)
+  * register images in catalog correctly (#3283)
+  * rename AbstractNode#options method to AbstractNode#enabled_options so it doesn't get shadowed by Document#options (#3282)
+  * don't fail to convert document if alt attribute is not set on block or inline image (typically by an extension)
+  * fix lineno of source location on blocks that follow a detached list continuation (#3281)
+  * assume inline image type is "image" if not set (typically by an extension)
+
+// end::compact[]
 == 2.0.8 (2019-04-22) - @mojavelinux
 
 Bug Fixes::
@@ -31,7 +43,6 @@ Improvements::
   * use module_function keyword to define methods in Helpers
   * move regular expression definitions to separate source file (internal change)
 
-// end::compact[]
 == 2.0.7 (2019-04-13) - @mojavelinux
 
 Bug Fixes::

data/README-de.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.8, 2019-04-22
+v2.0.9, 2019-04-30
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.8
+:release-version: 2.0.9
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
@@ -460,7 +460,7 @@ Siehe die {uri-license}[LIZENZ] für den vollen Lizenztext.
 
 == Authoren
 
-*Asciidoctor* wird von https://github.com/mojavelinux[Dan Allen] und https://github.com/graphitefriction[Sarah White] geleitet und hat Beiträge von {uri-contributors}[vielen Personen} in Asciidoctors großartiger Gemeinschaft erhalten.
+*Asciidoctor* wird von https://github.com/mojavelinux[Dan Allen] und https://github.com/graphitefriction[Sarah White] geleitet und hat Beiträge von {uri-contributors}[vielen Personen] in Asciidoctors großartiger Gemeinschaft erhalten.
 Das Projekt wurde 2012 von https://github.com/erebor[Ryan Waldron] initiiert und basiert auf einem {uri-prototype}[Prototyp] von https://github.com/nickh[Nick Hengeveld].
 
 *AsciiDoc* wurde von Stuart Rackham gegründet und hat Beiträge von vielen Personen aus der AsciiDoc-Community erhalten.

data/README-fr.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.8, 2019-04-22
+v2.0.9, 2019-04-30
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.8
+:release-version: 2.0.9
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-jp.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.8, 2019-04-22
+v2.0.9, 2019-04-30
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.8
+:release-version: 2.0.9
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-zh_CN.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.8, 2019-04-22
+v2.0.9, 2019-04-30
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.8
+:release-version: 2.0.9
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
-v2.0.8, 2019-04-22
+v2.0.9, 2019-04-30
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.8
+:release-version: 2.0.9
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/lib/asciidoctor/abstract_block.rb

@@ -223,6 +223,8 @@ class AbstractBlock < AbstractNode
         text = sub_specialchars text
         (ReplaceableTextRx.match? text) ? (sub_replacements text) : text
       end
+    else
+      ''
     end
   end
 
@@ -370,13 +372,13 @@ class AbstractBlock < AbstractNode
   # The parts of a complete caption are: <prefix> <number>. <title>
   # This partial caption represents the part the precedes the title.
   #
-  # value           - The explicit String caption to assign to this block (default: nil).
-  # caption_context - The Symbol context to use when resolving caption-related attributes.
-  #                   If not provided, the name of the context for this block is used.
+  # value           - The String caption to assign to this block or nil to use document attribute.
+  # caption_context - The Symbol context to use when resolving caption-related attributes. If not provided, the name of
+  #                   the context for this block is used. Only certain contexts allow the caption to be looked up.
   #                   (default: @context)
   #
   # Returns nothing.
-  def assign_caption value = nil, caption_context = @context
+  def assign_caption value, caption_context = @context
     unless @caption || !@title || (@caption = value || @document.attributes['caption'])
       if (attr_name = CAPTION_ATTR_NAMES[caption_context]) && (prefix = @document.attributes[attr_name])
         @caption = %(#{prefix} #{@numeral = @document.increment_and_store_counter %(#{caption_context}-number), self}. )

data/lib/asciidoctor/abstract_node.rb

@@ -161,10 +161,10 @@ class AbstractNode
     nil
   end
 
-  # Public: Retrieve the Set of option names that are set on this node
+  # Public: Retrieve the Set of option names that are enabled on this node
   #
   # Returns a [Set] of option names
-  def options
+  def enabled_options
     ::Set.new.tap {|accum| @attributes.each_key {|k| accum << (k.slice 0, k.length - 7) if k.to_s.end_with? '-option' } }
   end
 

data/lib/asciidoctor/converter/html5.rb

@@ -1163,7 +1163,7 @@ Your browser does not support the video tag.
   end
 
   def convert_inline_image node
-    if (type = node.type) == 'icon' && (node.document.attr? 'icons', 'font')
+    if (type = node.type || 'image') == 'icon' && (node.document.attr? 'icons', 'font')
       class_attr_val = %(fa fa-#{node.target})
       { 'size' => 'fa-', 'rotate' => 'fa-rotate-', 'flip' => 'fa-flip-' }.each do |key, prefix|
         class_attr_val = %(#{class_attr_val} #{prefix}#{node.attr key}) if node.attr? key

data/lib/asciidoctor/document.rb

@@ -606,11 +606,10 @@ class Document < AbstractBlock
     when :refs
       @catalog[:refs][value[0]] ||= (ref = value[1])
       ref
-    #when :footnotes, :indexterms
     when :footnotes
       @catalog[type] << value
     else
-      @catalog[type] << (type == :images ? (ImageReference.new value[0], value[1]) : value) if @options[:catalog_assets]
+      @catalog[type] << (type == :images ? (ImageReference.new value, @attributes['imagesdir']) : value) if @options[:catalog_assets]
     end
   end
 

data/lib/asciidoctor/inline.rb

@@ -39,7 +39,7 @@ class Inline < AbstractNode
   #
   # Returns the [String] value of the alt attribute.
   def alt
-    attr 'alt'
+    (attr 'alt') || ''
   end
 
   # For a reference node (:ref or :bibref), the text is the reftext (and the reftext attribute is not set).

data/lib/asciidoctor/parser.rb

@@ -596,7 +596,8 @@ class Parser
                 end
               end
               if blk_ctx == :image
-                document.register :images, [target, (attributes['imagesdir'] = doc_attrs['imagesdir'])]
+                document.register :images, target
+                attributes['imagesdir'] = doc_attrs['imagesdir']
                 # NOTE style is the value of the first positional attribute in the block attribute line
                 attributes['alt'] ||= style || (attributes['default-alt'] = Helpers.basename(target, true).tr('_-', ' '))
                 unless (scaledwidth = attributes.delete 'scaledwidth').nil_or_empty?
@@ -1532,7 +1533,7 @@ class Parser
 
     reader.unshift_line this_line if this_line
 
-    buffer.delete_at detached_continuation if detached_continuation
+    buffer[detached_continuation] = '' if detached_continuation
 
     until buffer.empty?
       # strip trailing blank lines to prevent empty blocks

data/lib/asciidoctor/rx.rb

@@ -547,10 +547,11 @@ module Asciidoctor
   # Examples
   #
   #   menu:File[Save As...]
+  #   menu:Edit[]
   #   menu:View[Page Style > No Style]
   #   menu:View[Page Style, No Style]
   #
-  InlineMenuMacroRx = /\\?menu:(#{CG_WORD}|[#{CC_WORD}&][^\n\[]*[^\s\[])\[ *(#{CC_ALL}*?[^\\])?\]/m
+  InlineMenuMacroRx = /\\?menu:(#{CG_WORD}|[#{CC_WORD}&][^\n\[]*[^\s\[])\[ *(?:|(#{CC_ALL}*?[^\\]))?\]/m
 
   # Matches an implicit menu inline macro.
   #

data/lib/asciidoctor/substitutors.rb

@@ -422,7 +422,10 @@ module Substitutors
         end
         target = $1
         attrs = parse_attributes $2, posattrs, unescape_input: true
-        doc.register :images, [target, (attrs['imagesdir'] = doc_attrs['imagesdir'])] unless type == 'icon'
+        unless type == 'icon'
+          doc.register :images, target
+          attrs['imagesdir'] = doc_attrs['imagesdir']
+        end
         attrs['alt'] ||= (attrs['default-alt'] = Helpers.basename(target, true).tr('_-', ' '))
         Inline.new(self, :image, nil, type: type, target: target, attributes: attrs).convert
       end

data/lib/asciidoctor/version.rb

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

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 2.0.8
-.\"      Date: 2019-04-22
+.\" Generator: Asciidoctor 2.0.9
+.\"      Date: 2019-04-30
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.8
+.\"    Source: Asciidoctor 2.0.9
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2019-04-22" "Asciidoctor 2.0.8" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2019-04-30" "Asciidoctor 2.0.9" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0

data/man/asciidoctor.adoc

@@ -1,7 +1,7 @@
 = asciidoctor(1)
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
-:release-version: 2.0.8
+:release-version: 2.0.9
 :man manual: Asciidoctor Manual
 :man source: Asciidoctor {release-version}
 :page-layout: base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Dan Allen