asciidoctor 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2de6beb8308df8a84bde4b59be99d0d9d41474735279c6aaf6e6e76821d4bb6
-  data.tar.gz: 709d4f1eb62a388ef5e1e5c7991c024c126112894d842185f7ae2fdc8fbe924d
+  metadata.gz: b387fa0771edae16b11f32ee1bf6024ecf631fb59fb3dc4835e96cd7a73627d4
+  data.tar.gz: 9d5d7513e9a45f12e642ed2d909f996c6105186b81d8f5ac9f074ec5e2adafd9
 SHA512:
-  metadata.gz: 5bac9d6c955c94dc8425ad7dc54706e3988e516cd156554d11ed1e1a85f4a8d77087bd2fbb407a630c547446dfbb6324c4a1babd226c144eee8df0c9ddd52e60
-  data.tar.gz: 7405db9ddcd871c6615862dc7bf0af440acca9b4120accdbd05493735b8de8c012a163dbaf731c074c8cfcc21c496d40e610e4aaaeb55aeba6613ef1941f06c6
+  metadata.gz: b8a178dbd99edc2076c7daa473096719b65076c50d9741b0f298b95b643a4c0f80a1b587f1f74afffb14af4698007231e4eda02a269dfe581e9c22095136c647
+  data.tar.gz: d7a65f4d9e6190ab23e7dc6b8fd09adedf4bc2eb8f45922930450b0fc05277b31eb9ee854bbbce92746d5f568b84cd3973381765ffba2016467d9738bf8305ff

data/CHANGELOG.adoc

@@ -13,6 +13,13 @@ endif::[]
 This document provides a high-level view of the changes introduced in Asciidoctor by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 2.0.3 (2019-03-28) - @mojavelinux
+
+Bug Fixes::
+
+  * fix crash when attrlist is used on literal monospace phrase (#3216)
+  * update use of magic regexp variables to fix compatibility with Opal / Asciidoctor.js (#3214)
+
 == 2.0.2 (2019-03-26) - @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.2, 2019-03-26
+v2.0.3, 2019-03-28
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.2
+:release-version: 2.0.3
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

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.2, 2019-03-26
+v2.0.3, 2019-03-28
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.2
+:release-version: 2.0.3
 // 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.2, 2019-03-26
+v2.0.3, 2019-03-28
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.2
+:release-version: 2.0.3
 // 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.2, 2019-03-26
+v2.0.3, 2019-03-28
 // settings:
 :page-layout: base
 :idprefix:
@@ -18,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.2
+:release-version: 2.0.3
 // 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.2, 2019-03-26
+v2.0.3, 2019-03-28
 // settings:
 :idprefix:
 :idseparator: -
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.2
+:release-version: 2.0.3
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/lib/asciidoctor.rb

@@ -293,7 +293,8 @@ module Asciidoctor
   DELIMITED_BLOCK_HEADS = {}.tap {|accum| DELIMITED_BLOCKS.each_key {|k| accum[k.slice 0, 2] = true } }
   DELIMITED_BLOCK_TAILS = {}.tap {|accum| DELIMITED_BLOCKS.each_key {|k| accum[k] = k[k.length - 1] if k.length == 4 } }
 
-  CAPTION_ATTR_NAMES = { example: 'example-caption', image: 'figure-caption', listing: 'listing-caption', table: 'table-caption' }
+  # NOTE the 'figure' key as a string is historical and used by image blocks
+  CAPTION_ATTR_NAMES = { example: 'example-caption', 'figure' => 'figure-caption', listing: 'listing-caption', table: 'table-caption' }
 
   LAYOUT_BREAK_CHARS = {
     '\'' => :thematic_break,

data/lib/asciidoctor/abstract_block.rb

@@ -378,8 +378,7 @@ class AbstractBlock < AbstractNode
   def assign_caption value = nil, caption_context = @context
     unless @caption || !@title || (@caption = value || @document.attributes['caption'])
       if (attr_name = CAPTION_ATTR_NAMES[caption_context]) && (prefix = @document.attributes[attr_name])
-        counter_name = caption_context == :image ? 'figure-number' : %(#{caption_context}-number)
-        @caption = %(#{prefix} #{@numeral = @document.increment_and_store_counter counter_name, self}. )
+        @caption = %(#{prefix} #{@numeral = @document.increment_and_store_counter %(#{caption_context}-number), self}. )
         nil
       end
     end

data/lib/asciidoctor/converter/docbook5.rb

@@ -740,9 +740,10 @@ class Converter::DocBook5Converter < Converter::Base
       width_attr = ''
       depth_attr = ''
       if (cover_image.include? ':') && ImageMacroRx =~ cover_image
+        attrlist = $2
         cover_image = doc.image_uri $1
-        unless $2.empty?
-          attrs = (AttributeList.new $2).parse ['alt', 'width', 'height']
+        unless attrlist.empty?
+          attrs = (AttributeList.new attrlist).parse ['alt', 'width', 'height']
           if attrs.key? 'scaledwidth'
             # NOTE scalefit="1" is the default in this case
             width_attr = %( width="#{attrs['scaledwidth']}")

data/lib/asciidoctor/document.rb

@@ -1102,7 +1102,8 @@ class Document < AbstractBlock
   # Returns The String value with substitutions performed
   def apply_attribute_value_subs value
     if AttributeEntryPassMacroRx =~ value
-      value = $1 ? (apply_subs $2, (resolve_pass_subs $1)) : $2
+      value = $2
+      value = apply_subs value, (resolve_pass_subs $1) if $1
     else
       value = apply_header_subs value
     end

data/lib/asciidoctor/extensions.rb

@@ -197,7 +197,7 @@ module Extensions
       block = create_block parent, :image, nil, attrs, opts
       if title
         block.title = title
-        block.assign_caption (attrs.delete 'caption'), (opts[:caption_context] || :image)
+        block.assign_caption (attrs.delete 'caption'), 'figure'
       end
       block
     end

data/lib/asciidoctor/parser.rb

@@ -605,7 +605,7 @@ class Parser
                 end
                 if attributes['title']
                   block.title = block_title = attributes.delete 'title'
-                  block.assign_caption (attributes.delete 'caption')
+                  block.assign_caption (attributes.delete 'caption'), 'figure'
                 end
               end
               attributes['target'] = target

data/lib/asciidoctor/reader.rb

@@ -955,8 +955,11 @@ class PreprocessorReader < Reader
         if no_target
           # the text in brackets must match a conditional expression
           if text && EvalExpressionRx =~ text.strip
+            lhs = $1
+            op = $2
+            rhs = $3
             # regex enforces a restricted set of math-related operations (==, !=, <=, >=, <, >)
-            skip = ((resolve_expr_val $1).send $2, (resolve_expr_val $3)) ? false : true
+            skip = ((resolve_expr_val lhs).send op, (resolve_expr_val rhs)) ? false : true
           else
             logger.error message_with_context %(malformed preprocessor directive - #{text ? 'invalid expression' : 'missing expression'}: ifeval::[#{text}]), source_location: cursor
             return true

data/lib/asciidoctor/substitutors.rb

@@ -308,7 +308,7 @@ module Substitutors
       extensions.inline_macros.each do |extension|
         text = text.gsub extension.instance.regexp do
           # honor the escape
-          next $&.slice 1, $&.length if $&.start_with? RS
+          next $&.slice 1, $&.length if (match = $&).start_with? RS
           if $~.names.empty?
             target, content = $1, $2
           else
@@ -336,7 +336,7 @@ module Substitutors
             end
             replacement.convert
           elsif replacement
-            logger.info %(expected substitution value for custom inline macro to be of type Inline; got #{replacement.class}: #{$&})
+            logger.info %(expected substitution value for custom inline macro to be of type Inline; got #{replacement.class}: #{match})
             replacement
           else
             ''
@@ -691,11 +691,11 @@ module Substitutors
         # honor the escape
         next $1 == RS ? ($&.slice 1, $&.length) : $& if $1
 
-        target = 'mailto:' + $&
+        target = 'mailto:' + (address = $&)
         # QUESTION should this be registered as an e-mail address?
         doc.register(:links, target)
 
-        Inline.new(self, :anchor, $&, type: :link, target: target).convert
+        Inline.new(self, :anchor, address, type: :link, target: target).convert
       end
     end
 
@@ -906,7 +906,7 @@ module Substitutors
       # honor the escape
       if $2
         # use sub since it might be behind a line comment
-        $&.sub(RS, '')
+        $&.sub RS, ''
       else
         Inline.new(self, :callout, $4 == '.' ? (autonum += 1).to_s : $4, id: @document.callouts.read_next_id, attributes: { 'guard' => $1 }).convert
       end
@@ -1000,30 +1000,22 @@ module Substitutors
     text = text.gsub InlinePassMacroRx do
       if (boundary = $4) # $$, ++, or +++
         # skip ++ in compat mode, handled as normal quoted text
-        if compat_mode && boundary == '++'
-          content = extract_passthroughs $5
-          next $2 ? %(#{$1}[#{$2}]#{$3}++#{content}++) : %(#{$1}#{$3}++#{content}++)
-        end
-
-        attributes = $2
-        escape_count = $3.length
-        content = $5
+        next %(#{$2 ? "#{$1}[#{$2}]#{$3}" : "#{$1}#{$3}"}++#{extract_passthroughs $5}++) if compat_mode && boundary == '++'
 
-        if attributes
-          if escape_count > 0
+        if (attrlist = $2)
+          if (escape_count = $3.length) > 0
             # NOTE we don't look for nested unconstrained pass macros
-            next %(#{$1}[#{attributes}]#{RS * (escape_count - 1)}#{boundary}#{$5}#{boundary})
+            next %(#{$1}[#{attrlist}]#{RS * (escape_count - 1)}#{boundary}#{$5}#{boundary})
           elsif $1 == RS
-            preceding = %([#{attributes}])
-            attributes = nil
+            preceding = %([#{attrlist}])
           else
-            if boundary == '++' && (attributes.end_with? 'x-')
+            if boundary == '++' && (attrlist.end_with? 'x-')
               old_behavior = true
-              attributes = attributes.slice 0, attributes.length - 2
+              attrlist = attrlist.slice 0, attrlist.length - 2
             end
-            attributes = parse_quoted_text_attributes attributes
+            attributes = parse_quoted_text_attributes attrlist
           end
-        elsif escape_count > 0
+        elsif (escape_count = $3.length) > 0
           # NOTE we don't look for nested unconstrained pass macros
           next %(#{RS * (escape_count - 1)}#{boundary}#{$5}#{boundary})
         end
@@ -1031,18 +1023,22 @@ module Substitutors
 
         if attributes
           if old_behavior
-            passthrus[passthru_key = passthrus.size] = { text: content, subs: NORMAL_SUBS, type: :monospaced, attributes: attributes }
+            passthrus[passthru_key = passthrus.size] = { text: $5, subs: NORMAL_SUBS, type: :monospaced, attributes: attributes }
           else
-            passthrus[passthru_key = passthrus.size] = { text: content, subs: subs, type: :unquoted, attributes: attributes }
+            passthrus[passthru_key = passthrus.size] = { text: $5, subs: subs, type: :unquoted, attributes: attributes }
           end
         else
-          passthrus[passthru_key = passthrus.size] = { text: content, subs: subs }
+          passthrus[passthru_key = passthrus.size] = { text: $5, subs: subs }
         end
       else # pass:[]
         # NOTE we don't look for nested pass:[] macros
         # honor the escape
         next $&.slice 1, $&.length if $6 == RS
-        passthrus[passthru_key = passthrus.size] = { text: (normalize_text $8, nil, true), subs: ($7 ? (resolve_pass_subs $7) : nil) }
+        if (subs = $7)
+          passthrus[passthru_key = passthrus.size] = { text: (normalize_text $8, nil, true), subs: (resolve_pass_subs subs) }
+        else
+          passthrus[passthru_key = passthrus.size] = { text: (normalize_text $8, nil, true) }
+        end
       end
 
       %(#{preceding || ''}#{PASS_START}#{passthru_key}#{PASS_END})
@@ -1051,29 +1047,28 @@ module Substitutors
     pass_inline_char1, pass_inline_char2, pass_inline_rx = InlinePassRx[compat_mode]
     text = text.gsub pass_inline_rx do
       preceding = $1
-      attributes = $2
+      attrlist = $2
       escape_mark = RS if (quoted_text = $3).start_with? RS
       format_mark = $4
       content = $5
 
       if compat_mode
         old_behavior = true
-      elsif (old_behavior = attributes && (attributes.end_with? 'x-'))
-        attributes = attributes.slice 0, attributes.length - 2
+      elsif (old_behavior = attrlist && (attrlist.end_with? 'x-'))
+        attrlist = attrlist.slice 0, attrlist.length - 2
       end
 
-      if attributes
+      if attrlist
         if format_mark == '`' && !old_behavior
-          next extract_inner_passthrough content, %(#{preceding}[#{attributes}]#{escape_mark}), attributes
+          next extract_inner_passthrough content, %(#{preceding}[#{attrlist}]#{escape_mark})
         elsif escape_mark
           # honor the escape of the formatting mark
-          next %(#{preceding}[#{attributes}]#{quoted_text.slice 1, quoted_text.length})
+          next %(#{preceding}[#{attrlist}]#{quoted_text.slice 1, quoted_text.length})
         elsif preceding == RS
           # honor the escape of the attributes
-          preceding = %([#{attributes}])
-          attributes = nil
+          preceding = %([#{attrlist}])
         else
-          attributes = parse_quoted_text_attributes attributes
+          attributes = parse_quoted_text_attributes attrlist
         end
       elsif format_mark == '`' && !old_behavior
         next extract_inner_passthrough content, %(#{preceding}#{escape_mark})
@@ -1106,10 +1101,11 @@ module Substitutors
       if (type = $1.to_sym) == :stem
         type = STEM_TYPE_ALIASES[@document.attributes['stem']].to_sym
       end
+      subs = $2
       content = normalize_text $3, nil, true
       # NOTE drop enclosing $ signs around latexmath for backwards compatibility with AsciiDoc Python
       content = content.slice 1, content.length - 2 if type == :latexmath && (content.start_with? '$') && (content.end_with? '$')
-      subs = $2 ? (resolve_pass_subs $2) : ((@document.basebackend? 'html') ? BASIC_SUBS : nil)
+      subs = subs ? (resolve_pass_subs subs) : ((@document.basebackend? 'html') ? BASIC_SUBS : nil)
       passthrus[passthru_key = passthrus.size] = { text: content, subs: subs, type: type }
       %(#{PASS_START}#{passthru_key}#{PASS_END})
     end if (text.include? ':') && ((text.include? 'stem:') || (text.include? 'math:'))
@@ -1371,14 +1367,12 @@ module Substitutors
   end
 
   # Internal: Extract nested single-plus passthrough; otherwise return unprocessed
-  def extract_inner_passthrough text, pre, attributes = nil
+  def extract_inner_passthrough text, pre
     if (text.end_with? '+') && (text.start_with? '+', '\+') && SinglePlusInlinePassRx =~ text
       if $1
         %(#{pre}`+#{$2}+`)
       else
-        @passthroughs[passthru_key = @passthroughs.size] = attributes ?
-            { text: $2, subs: BASIC_SUBS, attributes: attributes, type: :unquoted } :
-            { text: $2, subs: BASIC_SUBS }
+        @passthroughs[passthru_key = @passthroughs.size] = { text: $2, subs: BASIC_SUBS }
         %(#{pre}`#{PASS_START}#{passthru_key}#{PASS_END}`)
       end
     else

data/lib/asciidoctor/version.rb

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

data/man/asciidoctor.1

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

data/man/asciidoctor.adoc

@@ -2,7 +2,7 @@
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
 :man manual: Asciidoctor Manual
-:man source: Asciidoctor 2.0.2
+:man source: Asciidoctor 2.0.3
 :page-layout: base
 
 == NAME

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Dan Allen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath