@asciidoctor/core 3.0.0-rc.2 → 3.0.1

package/dist/node/asciidoctor.js

@@ -1386,7 +1386,7 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {/* Generated by Opal 1.7.3
   "use strict";
   var $module = Opal.module, $truthy = Opal.truthy, $eqeq = Opal.eqeq, $gvars = Opal.gvars, $def = Opal.def, $send = Opal.send, $neqeq = Opal.neqeq, $const_set = Opal.const_set, $hash2 = Opal.hash2, $to_ary = Opal.to_ary, $rb_times = Opal.rb_times, $eqeqeq = Opal.eqeqeq, $rb_plus = Opal.rb_plus, $Class = Opal.Class, $Object = Opal.Object, $nesting = [], nil = Opal.nil, $$$ = Opal.$$$;
 
-  Opal.add_stubs('module_function,require,include?,include,==,path,message,raise,warn,logger,chomp,empty?,slice,unpack,[],[]=,byteslice,bytesize,map,rstrip,encode,encoding,nil_or_empty?,!=,tap,each_line,<<,match?,gsub,rindex,index,basename,extname,!,length,directory?,dirname,mkdir_p,mkdir,private_constant,join,divmod,*,===,+,to_s,to_i,succ,class_for_name,const_get');
+  Opal.add_stubs('module_function,require,include?,include,==,path,message,raise,warn,logger,chomp,empty?,slice,unpack,[],[]=,byteslice,bytesize,map,rstrip,encode,encoding,nil_or_empty?,!=,tap,each_line,<<,!,start_with?,match?,gsub,rindex,index,basename,extname,length,directory?,dirname,mkdir_p,mkdir,private_constant,join,divmod,*,===,+,to_s,to_i,succ,class_for_name,const_get');
   return (function($base, $parent_nesting) {
     var self = $module($base, 'Asciidoctor');
 
@@ -1548,17 +1548,31 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {/* Generated by Opal 1.7.3
               return lines['$<<'](line.$chomp());});})
         };
       }, -2);
-      
-      $def(self, '$uriish?', function $Helpers_uriish$ques$13(str) {
-        var $ret_or_1 = nil;
+      if ($eqeq($$$('RUBY_ENGINE'), "jruby")) {
+        
+        $def(self, '$uriish?', function $Helpers_uriish$ques$13(str) {
+          var $ret_or_1 = nil, $ret_or_2 = nil;
 
-        if ($truthy(($ret_or_1 = str['$include?'](":")))) {
-          
-          return $$('UriSniffRx')['$match?'](str);
-        } else {
-          return $ret_or_1
-        }
-      });
+          if ($truthy(($ret_or_1 = ($truthy(($ret_or_2 = str['$include?'](":"))) ? (str['$start_with?']("uri:classloader:")['$!']()) : ($ret_or_2))))) {
+            
+            return $$('UriSniffRx')['$match?'](str);
+          } else {
+            return $ret_or_1
+          }
+        })
+      } else {
+        
+        $def(self, '$uriish?', function $Helpers_uriish$ques$14(str) {
+          var $ret_or_1 = nil;
+
+          if ($truthy(($ret_or_1 = str['$include?'](":")))) {
+            
+            return $$('UriSniffRx')['$match?'](str);
+          } else {
+            return $ret_or_1
+          }
+        })
+      };
       
       $def(self, '$encode_uri_component', function $$encode_uri_component(str) {
         
@@ -1606,7 +1620,7 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {/* Generated by Opal 1.7.3
         };
       }, -2);
       
-      $def(self, '$extname?', function $Helpers_extname$ques$14(path) {
+      $def(self, '$extname?', function $Helpers_extname$ques$15(path) {
         var $ret_or_1 = nil, last_dot_idx = nil;
 
         if ($truthy(($ret_or_1 = (last_dot_idx = path.$rindex("."))))) {
@@ -1684,7 +1698,7 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {/* Generated by Opal 1.7.3
       
       $def(self, '$int_to_roman', function $$int_to_roman(val) {
         
-        return $send($$('ROMAN_NUMERALS'), 'map', [], function $$15(l, i){var $a, $b, repeat = nil;
+        return $send($$('ROMAN_NUMERALS'), 'map', [], function $$16(l, i){var $a, $b, repeat = nil;
 
           
           if (l == null) l = nil;
@@ -2186,7 +2200,7 @@ Opal.modules["asciidoctor/rx"] = function(Opal) {/* Generated by Opal 1.7.3 */
     $const_set($nesting[0], 'ManpageNamePurposeRx', $regexp(["^(", $$('CC_ANY'), "+?) +- +(", $$('CC_ANY'), "+)$"]));
     $const_set($nesting[0], 'ConditionalDirectiveRx', $regexp(["^(\\\\)?(ifdef|ifndef|ifeval|endif)::(\\S*?(?:([,+])\\S*?)?)\\[(", $$('CC_ANY'), "+)?\\]$"]));
     $const_set($nesting[0], 'EvalExpressionRx', $regexp(["^(", $$('CC_ANY'), "+?) *([=!><]=|[><]) *(", $$('CC_ANY'), "+)$"]));
-    $const_set($nesting[0], 'IncludeDirectiveRx', $regexp(["^(\\\\)?include::([^\\[][^\\[]*)\\[(", $$('CC_ANY'), "+)?\\]$"]));
+    $const_set($nesting[0], 'IncludeDirectiveRx', $regexp(["^(\\\\)?include::([^\\s\\[](?:[^\\[]*[^\\s\\[])?)\\[(", $$('CC_ANY'), "+)?\\]$"]));
     $const_set($nesting[0], 'TagDirectiveRx', /\b(?:tag|(e)nd)::(\S+?)\[\](?=$|[ \r])/m);
     $const_set($nesting[0], 'AttributeEntryRx', $regexp(["^:(!?", $$('CG_WORD'), "[^:]*):(?:[ \\t]+(", $$('CC_ANY'), "*))?$"]));
     $const_set($nesting[0], 'InvalidAttributeNameCharsRx', $regexp(["[^", $$('CC_WORD'), "-]"]));
@@ -2244,14 +2258,13 @@ Opal.modules["asciidoctor/rx"] = function(Opal) {/* Generated by Opal 1.7.3 */
     $const_set($nesting[0], 'InlineImageMacroRx', $regexp(["\\\\?i(?:mage|con):([^:\\s\\[](?:[^\\n\\[]*[^\\s\\[])?)\\[(|", $$('CC_ALL'), "*?[^\\\\])\\]"], 'm'));
     $const_set($nesting[0], 'InlineIndextermMacroRx', $regexp(["\\\\?(?:(indexterm2?):\\[(", $$('CC_ALL'), "*?[^\\\\])\\]|\\(\\((", $$('CC_ALL'), "+?)\\)\\)(?!\\)))"], 'm'));
     $const_set($nesting[0], 'InlineKbdBtnMacroRx', $regexp(["(\\\\)?(kbd|btn):\\[(", $$('CC_ALL'), "*?[^\\\\])\\]"], 'm'));
-    $const_set($nesting[0], 'InlineLinkRx', $regexp(["(^|link:|", $$('CG_BLANK'), "|&lt;|[>\\(\\)\\[\\];\"'])(\\\\?(?:https?|file|ftp|irc)://[^\\s\\[\\]<]*([^\\s.,\\[\\]<]))(?:\\[(|", $$('CC_ALL'), "*?[^\\\\])\\])?"], 'm'));
+    $const_set($nesting[0], 'InlineLinkRx', $regexp(["(^|link:|", $$('CG_BLANK'), "|&lt;|[>\\(\\)\\[\\];\"'])(\\\\?(?:https?|file|ftp|irc)://)(?:([^\\s\\[\\]]+)\\[(|", $$('CC_ALL'), "*?[^\\\\])\\]|([^\\s\\[\\]<]*([^\\s,.?!\\[\\]<\\)])))"], 'm'));
     $const_set($nesting[0], 'InlineLinkMacroRx', $regexp(["\\\\?(?:link|(mailto)):(|[^:\\s\\[][^\\s\\[]*)\\[(|", $$('CC_ALL'), "*?[^\\\\])\\]"], 'm'));
     $const_set($nesting[0], 'MacroNameRx', $regexp(["^", $$('CG_WORD'), "[", $$('CC_WORD'), "-]*$"]));
     $const_set($nesting[0], 'InlineStemMacroRx', $regexp(["\\\\?(stem|(?:latex|ascii)math):([a-z]+(?:,[a-z-]+)*)?\\[(", $$('CC_ALL'), "*?[^\\\\])\\]"], 'm'));
     $const_set($nesting[0], 'InlineMenuMacroRx', $regexp(["\\\\?menu:(", $$('CG_WORD'), "|[", $$('CC_WORD'), "&][^\\n\\[]*[^\\s\\[])\\[ *(?:|(", $$('CC_ALL'), "*?[^\\\\]))\\]"], 'm'));
     $const_set($nesting[0], 'InlineMenuRx', $regexp(["\\\\?\"([", $$('CC_WORD'), "&][^\"]*?[ \\n]+&gt;[ \\n]+[^\"]*)\""]));
-    $const_set($nesting[0], 'InlinePassRx', $hash(false, ["+", "`", $regexp(["(^|[^", $$('CC_WORD'), ";:])(?:\\[([^\\]]+)\\])?(\\\\?(\\+|`)(\\S|\\S", $$('CC_ALL'), "*?\\S)\\4)(?!", $$('CG_WORD'), ")"], 'm')], true, ["`", nil, $regexp(["(^|[^`", $$('CC_WORD'), "])(?:\\[([^\\]]+)\\])?(\\\\?(`)([^`\\s]|[^`\\s]", $$('CC_ALL'), "*?\\S)\\4)(?![`", $$('CC_WORD'), "])"], 'm')]));
-    $const_set($nesting[0], 'SinglePlusInlinePassRx', $regexp(["^(\\\\)?\\+(\\S|\\S", $$('CC_ALL'), "*?\\S)\\+$"], 'm'));
+    $const_set($nesting[0], 'InlinePassRx', $hash(false, ["+", "-]", $regexp(["((?:^|[^", $$('CC_WORD'), ";:\\\\])(?=(\\[)|\\+)|\\\\(?=\\[)|(?=\\\\\\+))(?:\\2(x-|[^\\]]+ x-)\\]|(?:\\[([^\\]]+)\\])?(?=(\\\\)?\\+))(\\5?(\\+|`)(\\S|\\S", $$('CC_ALL'), "*?\\S)\\7)(?!", $$('CG_WORD'), ")"], 'm')], true, ["`", nil, $regexp(["(^|[^`", $$('CC_WORD'), "])(?:(\\Z)()|\\[([^\\]]+)\\](?=(\\\\))?)?(\\5?(`)([^`\\s]|[^`\\s]", $$('CC_ALL'), "*?\\S)\\7)(?![`", $$('CC_WORD'), "])"], 'm')]));
     $const_set($nesting[0], 'InlinePassMacroRx', $regexp(["(?:(?:(\\\\?)\\[([^\\]]+)\\])?(\\\\{0,2})(\\+\\+\\+?|\\$\\$)(", $$('CC_ALL'), "*?)\\4|(\\\\?)pass:([a-z]+(?:,[a-z-]+)*)?\\[(|", $$('CC_ALL'), "*?[^\\\\])\\])"], 'm'));
     $const_set($nesting[0], 'InlineXrefMacroRx', $regexp(["\\\\?(?:&lt;&lt;([", $$('CC_WORD'), "#/.:{]", $$('CC_ALL'), "*?)&gt;&gt;|xref:([", $$('CC_WORD'), "#/.:{]", $$('CC_ALL'), "*?)\\[(?:\\]|(", $$('CC_ALL'), "*?[^\\\\])\\]))"], 'm'));
     $const_set($nesting[0], 'HardLineBreakRx', $regexp(["^(", $$('CC_ANY'), "*) \\+$"], 'm'));
@@ -2272,7 +2285,7 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {/* Generated by Opal
   "use strict";
   var $module = Opal.module, $const_set = Opal.const_set, $hash2 = Opal.hash2, $hash = Opal.hash, $rb_plus = Opal.rb_plus, $regexp = Opal.regexp, $not = Opal.not, $truthy = Opal.truthy, $send = Opal.send, $def = Opal.def, $alias = Opal.alias, $gvars = Opal.gvars, $eqeq = Opal.eqeq, $to_ary = Opal.to_ary, $neqeq = Opal.neqeq, $to_a = Opal.to_a, $eqeqeq = Opal.eqeqeq, $rb_gt = Opal.rb_gt, $slice = Opal.slice, $rb_minus = Opal.rb_minus, $rb_lt = Opal.rb_lt, $rb_times = Opal.rb_times, $nesting = [], nil = Opal.nil, $$$ = Opal.$$$;
 
-  Opal.add_stubs('freeze,+,keys,!,empty?,===,[],join,include?,extract_passthroughs,each,sub_specialchars,sub_quotes,sub_attributes,sub_replacements,sub_macros,highlight_source,sub_callouts,sub_post_replacements,warn,logger,restore_passthroughs,clear,split,apply_subs,gsub,match?,compat_mode,convert_quoted_text,attributes,==,shift,store_attribute,!=,attribute_undefined,counter,key?,downcase,attribute_missing,info,squeeze,delete,reject,start_with?,do_replacement,inline_macros?,extensions,inline_macros,regexp,instance,slice,length,names,config,merge,[]=,normalize_text,parse_attributes,process_method,expand_subs,text=,text,convert,class,strip,index,min,compact,>,end_with?,map,chop,new,pop,rstrip,register,tr,basename,parse,lstrip,split_simple_csv,-,partition,extract_attributes_from_text,sub,encode_uri_component,style,extname?,rindex,catalog,info?,fetch,outfilesuffix,natural_xrefs,resolve_id,find,footnotes,id,<,size,<<,attr?,attr,to_s,read_next_id,callouts,highlight?,syntax_highlighter,sub_source,extract_callouts,name,to_i,to_sym,resolve_lines_to_highlight,highlight,nil_or_empty?,restore_callouts,count,to_a,|,sort,*,parse_quoted_text_attributes,resolve_pass_subs,extract_inner_passthrough,basebackend?,error,chr,drop,&,resolve_subs,resolve_block_subs,parse_into,private,=~,shorthand_property_syntax,each_char');
+  Opal.add_stubs('freeze,+,keys,!,empty?,===,[],join,include?,extract_passthroughs,each,sub_specialchars,sub_quotes,sub_attributes,sub_replacements,sub_macros,highlight_source,sub_callouts,sub_post_replacements,warn,logger,restore_passthroughs,clear,split,apply_subs,gsub,match?,compat_mode,convert_quoted_text,attributes,==,shift,store_attribute,!=,attribute_undefined,counter,key?,downcase,attribute_missing,info,squeeze,delete,reject,start_with?,do_replacement,inline_macros?,extensions,inline_macros,regexp,instance,slice,length,names,config,merge,[]=,normalize_text,parse_attributes,process_method,expand_subs,text=,text,convert,class,strip,index,min,compact,>,end_with?,map,chop,new,pop,rstrip,register,tr,basename,parse,lstrip,split_simple_csv,-,partition,extract_attributes_from_text,sub,encode_uri_component,style,extname?,rindex,catalog,info?,fetch,outfilesuffix,natural_xrefs,resolve_id,find,footnotes,id,<,size,<<,attr?,attr,to_s,read_next_id,callouts,highlight?,syntax_highlighter,sub_source,extract_callouts,name,to_i,to_sym,resolve_lines_to_highlight,highlight,nil_or_empty?,restore_callouts,count,to_a,|,sort,*,parse_quoted_text_attributes,resolve_pass_subs,basebackend?,error,chr,drop,&,resolve_subs,resolve_block_subs,parse_into,private,shorthand_property_syntax,each_char');
   return (function($base, $parent_nesting) {
     var self = $module($base, 'Asciidoctor');
 
@@ -2832,11 +2845,11 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {/* Generated by Opal
             }}, {$$s: self})
         };
         if (($truthy(found_colon) && ($truthy(text['$include?']("://"))))) {
-          text = $send(text, 'gsub', [$$('InlineLinkRx')], function $$25(){var $a, $b, self = $$25.$$s == null ? this : $$25.$$s, target = nil, prefix = nil, suffix = nil, link_text = nil, attrs = nil, link_opts = nil, new_link_text = nil, bare = nil;
+          text = $send(text, 'gsub', [$$('InlineLinkRx')], function $$25(){var $a, $b, self = $$25.$$s == null ? this : $$25.$$s, target = nil, rs_idx = nil, prefix = nil, suffix = nil, link_text = nil, attrs = nil, link_opts = nil, new_link_text = nil, bare = nil;
 
             
-            if ($truthy((target = (($a = $gvars['~']) === nil ? nil : $a['$[]'](2)))['$start_with?']($$('RS')))) {
-              return "" + ((($a = $gvars['~']) === nil ? nil : $a['$[]'](1))) + (target.$slice(1, target.$length())) + ((($a = $gvars['~']) === nil ? nil : $a['$[]'](4)))
+            if ($truthy((target = $rb_plus((($a = $gvars['~']) === nil ? nil : $a['$[]'](2)), ($truthy(($ret_or_1 = (($a = $gvars['~']) === nil ? nil : $a['$[]'](3)))) ? ($ret_or_1) : ((($a = $gvars['~']) === nil ? nil : $a['$[]'](5))))))['$start_with?']($$('RS')))) {
+              return $rb_plus((($a = $gvars['~']) === nil ? nil : $a['$[]'](0)).$slice(0, (rs_idx = (($a = $gvars['~']) === nil ? nil : $a['$[]'](1)).$length())), (($a = $gvars['~']) === nil ? nil : $a['$[]'](0)).$slice($rb_plus(rs_idx, 1), (($a = $gvars['~']) === nil ? nil : $a['$[]'](0)).$length()))
             };
             $a = [(($b = $gvars['~']) === nil ? nil : $b['$[]'](1)), ""], (prefix = $a[0]), (suffix = $a[1]), $a;
             if ($truthy((($a = $gvars['~']) === nil ? nil : $a['$[]'](4)))) {
@@ -2859,21 +2872,7 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {/* Generated by Opal
                   nil
               };
               
-              switch ((($a = $gvars['~']) === nil ? nil : $a['$[]'](3))) {
-                case ")":
-                case "?":
-                case "!":
-                  
-                  target = target.$chop();
-                  if (($eqeq((suffix = (($a = $gvars['~']) === nil ? nil : $a['$[]'](3))), ")") && ($truthy(target['$end_with?'](".", "?", "!"))))) {
-                    
-                    suffix = $rb_plus(target['$[]'](-1), suffix);
-                    target = target.$chop();
-                  };
-                  if ($truthy(target['$end_with?']("://"))) {
-                    return (($a = $gvars['~']) === nil ? nil : $a['$[]'](0))
-                  };
-                  break;
+              switch ((($a = $gvars['~']) === nil ? nil : $a['$[]'](6))) {
                 case ";":
                   
                   if (($truthy(prefix['$start_with?']("&lt;")) && ($truthy(target['$end_with?']("&gt;"))))) {
@@ -3096,7 +3095,7 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {/* Generated by Opal
             };
             if ($truthy(doc.$compat_mode())) {
               fragment = refid
-            } else if ($truthy((hash_idx = refid.$index("#")))) {
+            } else if (($truthy((hash_idx = refid.$index("#"))) && ($neqeq(refid['$[]']($rb_minus(hash_idx, 1)), "&")))) {
               if ($truthy($rb_gt(hash_idx, 0))) {
                 
                 if ($truthy($rb_gt((fragment_len = $rb_minus($rb_minus(refid.$length(), 1), hash_idx)), 0))) {
@@ -3384,14 +3383,20 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {/* Generated by Opal
                   return "" + ((($a = $gvars['~']) === nil ? nil : $a['$[]'](1))) + "[" + (attrlist) + "]" + ($rb_times($$('RS'), $rb_minus(escape_count, 1))) + (boundary) + ((($a = $gvars['~']) === nil ? nil : $a['$[]'](5))) + (boundary)
                 } else if ($eqeq((($a = $gvars['~']) === nil ? nil : $a['$[]'](1)), $$('RS'))) {
                   preceding = "[" + (attrlist) + "]"
-                } else {
-                  
-                  if (($eqeq(boundary, "++") && ($truthy(attrlist['$end_with?']("x-"))))) {
+                } else if ($eqeq(boundary, "++")) {
+                  if ($eqeq(attrlist, "x-")) {
                     
                     old_behavior = true;
-                    attrlist = attrlist.$slice(0, $rb_minus(attrlist.$length(), 2));
-                  };
-                  attributes = self.$parse_quoted_text_attributes(attrlist);
+                    attributes = $hash2([], {});
+                  } else if ($truthy(attrlist['$end_with?'](" x-"))) {
+                    
+                    old_behavior = true;
+                    attributes = self.$parse_quoted_text_attributes(attrlist.$slice(0, $rb_minus(attrlist.$length(), 3)));
+                  } else {
+                    attributes = self.$parse_quoted_text_attributes(attrlist)
+                  }
+                } else {
+                  attributes = self.$parse_quoted_text_attributes(attrlist)
                 }
               } else if ($truthy($rb_gt((escape_count = (($a = $gvars['~']) === nil ? nil : $a['$[]'](3)).$length()), 0))) {
                 return "" + ($rb_times($$('RS'), $rb_minus(escape_count, 1))) + (boundary) + ((($a = $gvars['~']) === nil ? nil : $a['$[]'](5))) + (boundary)
@@ -3421,35 +3426,40 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {/* Generated by Opal
         };
         $b = $$('InlinePassRx')['$[]'](compat_mode), $a = $to_ary($b), (pass_inline_char1 = ($a[0] == null ? nil : $a[0])), (pass_inline_char2 = ($a[1] == null ? nil : $a[1])), (pass_inline_rx = ($a[2] == null ? nil : $a[2])), $b;
         if (($truthy(text['$include?'](pass_inline_char1)) || (($truthy(pass_inline_char2) && ($truthy(text['$include?'](pass_inline_char2))))))) {
-          text = $send(text, 'gsub', [pass_inline_rx], function $$39(){var $c, self = $$39.$$s == null ? this : $$39.$$s, preceding = nil, attrlist = nil, quoted_text = nil, escape_mark = nil, format_mark = nil, content = nil, old_behavior = nil, $ret_or_1 = nil, attributes = nil, passthru_key = nil, subs = nil;
+          text = $send(text, 'gsub', [pass_inline_rx], function $$39(){var $c, self = $$39.$$s == null ? this : $$39.$$s, preceding = nil, attrlist = nil, $ret_or_1 = nil, escaped = nil, quoted_text = nil, format_mark = nil, content = nil, old_behavior = nil, old_behavior_forced = nil, attributes = nil, passthru_key = nil, subs = nil;
 
             
             preceding = (($c = $gvars['~']) === nil ? nil : $c['$[]'](1));
-            attrlist = (($c = $gvars['~']) === nil ? nil : $c['$[]'](2));
-            if ($truthy((quoted_text = (($c = $gvars['~']) === nil ? nil : $c['$[]'](3)))['$start_with?']($$('RS')))) {
-              escape_mark = $$('RS')
+            attrlist = ($truthy(($ret_or_1 = (($c = $gvars['~']) === nil ? nil : $c['$[]'](4)))) ? ($ret_or_1) : ((($c = $gvars['~']) === nil ? nil : $c['$[]'](3))));
+            if ($truthy((($c = $gvars['~']) === nil ? nil : $c['$[]'](5)))) {
+              escaped = true
             };
-            format_mark = (($c = $gvars['~']) === nil ? nil : $c['$[]'](4));
-            content = (($c = $gvars['~']) === nil ? nil : $c['$[]'](5));
+            quoted_text = (($c = $gvars['~']) === nil ? nil : $c['$[]'](6));
+            format_mark = (($c = $gvars['~']) === nil ? nil : $c['$[]'](7));
+            content = (($c = $gvars['~']) === nil ? nil : $c['$[]'](8));
             if ($truthy(compat_mode)) {
               old_behavior = true
-            } else if ($truthy((old_behavior = ($truthy(($ret_or_1 = attrlist)) ? (attrlist['$end_with?']("x-")) : ($ret_or_1))))) {
-              attrlist = attrlist.$slice(0, $rb_minus(attrlist.$length(), 2))
+            } else if (($truthy(attrlist) && (($eqeq(attrlist, "x-") || ($truthy(attrlist['$end_with?'](" x-"))))))) {
+              old_behavior = (old_behavior_forced = true)
             };
             if ($truthy(attrlist)) {
-              if (($eqeq(format_mark, "`") && ($not(old_behavior)))) {
-                return self.$extract_inner_passthrough(content, "" + (preceding) + "[" + (attrlist) + "]" + (escape_mark))
-              } else if ($truthy(escape_mark)) {
+              if ($truthy(escaped)) {
                 return "" + (preceding) + "[" + (attrlist) + "]" + (quoted_text.$slice(1, quoted_text.$length()))
               } else if ($eqeq(preceding, $$('RS'))) {
-                preceding = "[" + (attrlist) + "]"
+                
+                if (($truthy(old_behavior_forced) && ($eqeq(format_mark, "`")))) {
+                  return "" + (preceding) + "[" + (attrlist) + "]" + (quoted_text)
+                };
+                preceding = "[" + (attrlist) + "]";
+              } else if ($truthy(old_behavior_forced)) {
+                attributes = ($eqeq(attrlist, "x-") ? ($hash2([], {})) : (self.$parse_quoted_text_attributes(attrlist.$slice(0, $rb_minus(attrlist.$length(), 3)))))
               } else {
                 attributes = self.$parse_quoted_text_attributes(attrlist)
               }
-            } else if (($eqeq(format_mark, "`") && ($not(old_behavior)))) {
-              return self.$extract_inner_passthrough(content, "" + (preceding) + (escape_mark))
-            } else if ($truthy(escape_mark)) {
+            } else if ($truthy(escaped)) {
               return "" + (preceding) + (quoted_text.$slice(1, quoted_text.$length()))
+            } else if (($truthy(compat_mode) && ($eqeq(preceding, $$('RS'))))) {
+              return quoted_text
             };
             if ($truthy(compat_mode)) {
               passthrus['$[]=']((passthru_key = passthrus.$size()), $hash2(["text", "subs", "attributes", "type"], {"text": content, "subs": $$('BASIC_SUBS'), "attributes": attributes, "type": "monospaced"}))
@@ -3801,23 +3811,6 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {/* Generated by Opal
           };}, {$$s: self}).$join($$('LF')));
       }, -3);
       
-      $def(self, '$extract_inner_passthrough', function $$extract_inner_passthrough(text, pre) {
-        var $a, self = this, passthru_key = nil;
-        if (self.passthroughs == null) self.passthroughs = nil;
-
-        if ((($truthy(text['$end_with?']("+")) && ($truthy(text['$start_with?']("+", "\\+")))) && ($truthy($$('SinglePlusInlinePassRx')['$=~'](text))))) {
-          if ($truthy((($a = $gvars['~']) === nil ? nil : $a['$[]'](1)))) {
-            return "" + (pre) + "`+" + ((($a = $gvars['~']) === nil ? nil : $a['$[]'](2))) + "+`"
-          } else {
-            
-            self.passthroughs['$[]=']((passthru_key = self.passthroughs.$size()), $hash2(["text", "subs"], {"text": (($a = $gvars['~']) === nil ? nil : $a['$[]'](2)), "subs": $$('BASIC_SUBS')}));
-            return "" + (pre) + "`" + ($$('PASS_START')) + (passthru_key) + ($$('PASS_END')) + "`";
-          }
-        } else {
-          return "" + (pre) + "`" + (text) + "`"
-        }
-      });
-      
       $def(self, '$convert_quoted_text', function $$convert_quoted_text(match, type, scope) {
         var self = this, attrs = nil, unescaped_attrs = nil, attrlist = nil, id = nil, attributes = nil;
 
@@ -3981,7 +3974,7 @@ Opal.modules["asciidoctor/version"] = function(Opal) {/* Generated by Opal 1.7.3
 
     var $nesting = [self].concat($parent_nesting);
 
-    return $const_set($nesting[0], 'VERSION', "2.0.18")
+    return $const_set($nesting[0], 'VERSION', "2.0.20")
   })($nesting[0], $nesting)
 };
 
@@ -5296,7 +5289,11 @@ Opal.modules["asciidoctor/block"] = function(Opal) {/* Generated by Opal 1.7.3 *
             
             result = self.$apply_subs(self.lines, self.subs);
             if ($truthy($rb_lt(result.$size(), 2))) {
-              return result['$[]'](0)
+              if ($truthy(($ret_or_2 = result['$[]'](0)))) {
+                return $ret_or_2
+              } else {
+                return ""
+              }
             } else {
               
               while ($truthy(($truthy(($ret_or_2 = (first = result['$[]'](0)))) ? (first.$rstrip()['$empty?']()) : ($ret_or_2)))) {
@@ -7590,7 +7587,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {/* Generated by Opal 1.7.3
   "use strict";
   var $module = Opal.module, $klass = Opal.klass, $const_set = Opal.const_set, $send = Opal.send, $truthy = Opal.truthy, $hash2 = Opal.hash2, $to_ary = Opal.to_ary, $defs = Opal.defs, $eqeq = Opal.eqeq, $not = Opal.not, $gvars = Opal.gvars, $neqeq = Opal.neqeq, $rb_plus = Opal.rb_plus, $rb_lt = Opal.rb_lt, $rb_gt = Opal.rb_gt, $to_a = Opal.to_a, $eqeqeq = Opal.eqeqeq, $rb_minus = Opal.rb_minus, $rb_times = Opal.rb_times, $thrower = Opal.thrower, $nesting = [], nil = Opal.nil, $$$ = Opal.$$$;
 
-  Opal.add_stubs('include,new,proc,start_with?,match?,is_delimited_block?,private_class_method,parse_document_header,[],has_more_lines?,next_section,assign_numeral,<<,blocks,skip_blank_lines,parse_block_metadata_lines,attributes,is_next_line_doctitle?,[]=,finalize_header,nil_or_empty?,title=,sourcemap,cursor,parse_section_title,id=,include?,sub_specialchars,sub_attributes,source_location=,header,attribute_locked?,id,clear,delete,instance_variable_get,parse_header_metadata,==,!,register,process_authors,update,doctype,parse_manpage_header,=~,downcase,error,logger,message_with_context,cursor_at_line,backend,save,is_next_line_section?,initialize_section,join,map,read_lines_until,lstrip,split,title,restore_save,discard_save,header?,empty?,context,!=,attr?,attr,key?,document,+,level,special,sectname,to_i,<,>,warn,next_block,blocks?,style,context=,style=,parent=,size,content_model,shift,unwrap_standalone_preamble,source_location,merge,fetch,parse_block_metadata_line,extensions,block_macros?,mark,read_line,terminator,to_s,masq,to_sym,registered_for_block?,debug?,debug,cursor_at_mark,strict_verbatim_paragraphs,unshift_line,markdown_syntax,keys,chr,uniform?,length,end_with?,parse_attributes,attribute_missing,tr,basename,assign_caption,registered_for_block_macro?,config,process_method,replace,parse_callout_list,callouts,===,parse_list,parse_description_list,underline_style_section_titles,is_section_title?,peek_line,atx_section_title?,generate_id,level=,read_paragraph_lines,adjust_indentation!,map!,slice,pop,build_block,apply_subs,chop,catalog_inline_anchors,rekey,index,strip,-,parse_table,each,raise,title?,update_attributes,commit_subs,sub?,catalog_callouts,source,remove_sub,block_terminates_paragraph,to_proc,nil?,lines,parse_blocks,parse_list_item,items,scan,gsub,count,advance,dup,match,callout_ids,next_list,catalog_inline_anchor,marker=,catalog_inline_biblio_anchor,set_option,text=,resolve_ordered_list_marker,read_lines_for_list_item,skip_line_comments,unshift_lines,fold_first,text?,is_sibling_list_item?,concat,find,casecmp,sectname=,special=,numbered=,numbered,lineno,peek_lines,setext_section_title?,abs,cursor_at_prev_line,process_attribute_entries,next_line_empty?,apply_header_subs,rstrip,each_with_index,compact,to_h,squeeze,to_a,parse_style_attribute,process_attribute_entry,skip_comment_lines,store_attribute,sanitize_attribute_name,set_attribute,save_to,delete_attribute,ord,int_to_roman,resolve_list_marker,parse_colspecs,create_columns,has_header_option=,format,starts_with_delimiter?,close_open_cell,parse_cellspec,delimiter,match_delimiter,pre_match,post_match,buffer_has_unclosed_quotes?,skip_past_delimiter,buffer=,buffer,skip_past_escaped_delimiter,keep_cell_open,push_cellspec,close_cell,cell_open?,columns,assign_column_widths,partition_header_footer,upto,partition,shorthand_property_syntax,each_char,yield_buffered_attribute,any?,*,each_byte,%');
+  Opal.add_stubs('include,new,proc,start_with?,match?,is_delimited_block?,private_class_method,parse_document_header,[],has_more_lines?,next_section,assign_numeral,<<,blocks,skip_blank_lines,parse_block_metadata_lines,attributes,is_next_line_doctitle?,[]=,finalize_header,nil_or_empty?,title=,sourcemap,cursor,parse_section_title,id=,include?,sub_specialchars,sub_attributes,source_location=,header,attribute_locked?,id,clear,delete,instance_variable_get,parse_header_metadata,==,!,register,process_authors,update,doctype,parse_manpage_header,=~,downcase,error,logger,message_with_context,cursor_at_line,backend,save,is_next_line_section?,initialize_section,join,map,read_lines_until,lstrip,split,title,restore_save,discard_save,header?,empty?,context,!=,attr?,attr,key?,document,+,level,special,sectname,to_i,<,>,warn,next_block,blocks?,style,style=,parent=,content_model,content_model=,lines,subs,size,context=,shift,unwrap_standalone_preamble,source_location,merge,fetch,parse_block_metadata_line,extensions,block_macros?,mark,read_line,terminator,to_s,masq,to_sym,registered_for_block?,debug?,debug,cursor_at_mark,strict_verbatim_paragraphs,unshift_line,markdown_syntax,keys,chr,uniform?,length,end_with?,parse_attributes,attribute_missing,tr,basename,assign_caption,registered_for_block_macro?,config,process_method,replace,parse_callout_list,callouts,===,parse_list,parse_description_list,underline_style_section_titles,is_section_title?,peek_line,atx_section_title?,generate_id,level=,read_paragraph_lines,adjust_indentation!,map!,slice,pop,build_block,apply_subs,chop,catalog_inline_anchors,rekey,index,strip,-,parse_table,each,raise,title?,update_attributes,commit_subs,sub?,catalog_callouts,source,remove_sub,block_terminates_paragraph,to_proc,nil?,parse_blocks,parse_list_item,items,scan,gsub,count,advance,dup,match,callout_ids,next_list,catalog_inline_anchor,marker=,catalog_inline_biblio_anchor,set_option,text=,resolve_ordered_list_marker,read_lines_for_list_item,skip_line_comments,unshift_lines,fold_first,text?,is_sibling_list_item?,concat,find,casecmp,sectname=,special=,numbered=,numbered,lineno,peek_lines,setext_section_title?,abs,cursor_at_prev_line,process_attribute_entries,next_line_empty?,apply_header_subs,rstrip,each_with_index,compact,to_h,squeeze,to_a,parse_style_attribute,process_attribute_entry,skip_comment_lines,store_attribute,sanitize_attribute_name,set_attribute,save_to,delete_attribute,ord,int_to_roman,resolve_list_marker,parse_colspecs,create_columns,has_header_option=,format,starts_with_delimiter?,close_open_cell,parse_cellspec,delimiter,match_delimiter,pre_match,post_match,buffer_has_unclosed_quotes?,skip_past_delimiter,buffer=,buffer,skip_past_escaped_delimiter,keep_cell_open,push_cellspec,close_cell,cell_open?,columns,assign_column_widths,partition_header_footer,upto,partition,shorthand_property_syntax,each_char,yield_buffered_attribute,any?,*,each_byte,%');
   return (function($base, $parent_nesting) {
     var self = $module($base, 'Asciidoctor');
 
@@ -7926,16 +7923,20 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {/* Generated by Opal 1.7.3
               if ($truthy(part)) {
                 if ($not(section['$blocks?']())) {
                   if ($neqeq(new_block.$style(), "partintro")) {
-                    if ($eqeq(new_block.$context(), "paragraph")) {
-                      
-                      new_block['$context=']("open");
-                      new_block['$style=']("partintro");
+                    if (($eqeq(new_block.$style(), "open") && ($eqeq(new_block.$context(), "open")))) {
+                      new_block['$style=']("partintro")
                     } else {
                       
                       new_block['$parent=']((intro = $$('Block').$new(section, "open", $hash2(["content_model"], {"content_model": "compound"}))));
                       intro['$style=']("partintro");
                       section.$blocks()['$<<'](intro);
                     }
+                  } else if ($eqeq(new_block.$content_model(), "simple")) {
+                    
+                    new_block['$content_model=']("compound");
+                    new_block['$<<']($$('Block').$new(new_block, "paragraph", $hash2(["source", "subs"], {"source": new_block.$lines(), "subs": new_block.$subs()})));
+                    new_block.$lines().$clear();
+                    new_block.$subs().$clear();
                   }
                 } else if ($eqeq(section.$blocks().$size(), 1)) {
                   
@@ -7945,13 +7946,12 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {/* Generated by Opal 1.7.3
                   } else if ($neqeq(first_block.$content_model(), "compound")) {
                     
                     new_block['$parent=']((intro = $$('Block').$new(section, "open", $hash2(["content_model"], {"content_model": "compound"}))));
-                    intro['$style=']("partintro");
-                    section.$blocks().$shift();
-                    if ($eqeq(first_block.$style(), "partintro")) {
+                    if ($eqeq(first_block.$style(), ($a = ["partintro"], $send(intro, 'style=', $a), $a[$a.length - 1]))) {
                       
                       first_block['$context=']("paragraph");
                       first_block['$style='](nil);
                     };
+                    section.$blocks().$shift();
                     intro['$<<'](first_block);
                     section.$blocks()['$<<'](intro);
                   };
@@ -8767,8 +8767,10 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {/* Generated by Opal 1.7.3
                   if ($truthy(reftext['$include?']($$('ATTR_REF_HEAD')))) {
                     reftext = document.$sub_attributes(reftext)
                   };
-                } else if (($truthy(reftext['$include?']($$('ATTR_REF_HEAD'))) && ($truthy((reftext = document.$sub_attributes(reftext))['$empty?']())))) {
-                  return nil
+                } else if ($truthy(reftext['$include?']($$('ATTR_REF_HEAD')))) {
+                  if ($truthy((reftext = document.$sub_attributes(reftext))['$empty?']())) {
+                    reftext = nil
+                  }
                 }
               };
             };
@@ -8962,7 +8964,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {/* Generated by Opal 1.7.3
         };
       }, -5);
       $defs(self, '$read_lines_for_list_item', function $$read_lines_for_list_item(reader, list_type, sibling_trait, has_text) {
-        var $a, self = this, buffer = nil, continuation = nil, within_nested_list = nil, detached_continuation = nil, dlist = nil, this_line = nil, prev_line = nil, match = nil, nested_list_type = nil, $ret_or_1 = nil, last_line = nil;
+        var $a, self = this, buffer = nil, continuation = nil, within_nested_list = nil, detached_continuation = nil, dlist = nil, this_line = nil, prev_line = nil, match = nil, block_attribute_lines = nil, next_line = nil, interrupt = nil, ch0 = nil, nested_list_type = nil, $ret_or_1 = nil, last_line = nil;
 
         
         if (sibling_trait == null) sibling_trait = nil;
@@ -9001,16 +9003,36 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {/* Generated by Opal 1.7.3
             };
           };
           if ($truthy((match = self['$is_delimited_block?'](this_line, true)))) {
-            if ($eqeq(continuation, "active")) {
-              
-              buffer['$<<'](this_line);
-              buffer.$concat(reader.$read_lines_until($hash2(["terminator", "read_last_line", "context"], {"terminator": match.$terminator(), "read_last_line": true, "context": nil})));
-              continuation = "inactive";
-            } else {
+            
+            if (!$eqeq(continuation, "active")) {
               break
-            }
-          } else if ((($truthy(dlist) && ($neqeq(continuation, "active"))) && ($truthy($$('BlockAttributeLineRx')['$match?'](this_line))))) {
-            break
+            };
+            buffer['$<<'](this_line);
+            buffer.$concat(reader.$read_lines_until($hash2(["terminator", "read_last_line", "context"], {"terminator": match.$terminator(), "read_last_line": true, "context": nil})));
+            continuation = "inactive";
+          } else if (((($truthy(dlist) && ($neqeq(continuation, "active"))) && ($truthy(this_line['$start_with?']("[")))) && ($truthy($$('BlockAttributeLineRx')['$match?'](this_line))))) {
+            
+            block_attribute_lines = [this_line];
+            while ($truthy((next_line = reader.$peek_line()))) {
+            
+              if ($truthy(self['$is_delimited_block?'](next_line))) {
+                interrupt = true
+              } else if (($truthy(next_line['$empty?']()) || (($truthy(next_line['$start_with?']("[")) && ($truthy($$('BlockAttributeLineRx')['$match?'](next_line))))))) {
+                
+                block_attribute_lines['$<<'](reader.$read_line());
+                continue;
+              } else if (($truthy($$('AnyListRx')['$match?'](next_line)) && ($not(self['$is_sibling_list_item?'](next_line, list_type, sibling_trait))))) {
+                buffer.$concat(block_attribute_lines)
+              } else {
+                interrupt = true
+              };
+              break;
+            };
+            if ($truthy(interrupt)) {
+              
+              reader.$unshift_lines(block_attribute_lines);
+              break;
+            };
           } else if (($eqeq(continuation, "active") && ($not(this_line['$empty?']())))) {
             if ($truthy($$('LiteralParagraphRx')['$match?'](this_line))) {
               
@@ -9025,7 +9047,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {/* Generated by Opal 1.7.3
                 buffer.$concat(reader.$read_lines_until($hash2(["preserve_last_line", "break_on_blank_lines", "break_on_list_continuation"], {"preserve_last_line": true, "break_on_blank_lines": true, "break_on_list_continuation": true})))
               };
               continuation = "inactive";
-            } else if ((($truthy($$('BlockTitleRx')['$match?'](this_line)) || ($truthy($$('BlockAttributeLineRx')['$match?'](this_line)))) || ($truthy($$('AttributeEntryRx')['$match?'](this_line))))) {
+            } else if (((($eqeq((ch0 = this_line.$chr()), ".") && ($truthy($$('BlockTitleRx')['$match?'](this_line)))) || (($eqeq(ch0, "[") && ($truthy($$('BlockAttributeLineRx')['$match?'](this_line)))))) || (($eqeq(ch0, ":") && ($truthy($$('AttributeEntryRx')['$match?'](this_line))))))) {
               buffer['$<<'](this_line)
             } else {
               
@@ -10308,6 +10330,7 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {/* Generated by Opal
       $const_set($nesting[0], 'SLASH', "/");
       $const_set($nesting[0], 'BACKSLASH', "\\");
       $const_set($nesting[0], 'DOUBLE_SLASH', "//");
+      $const_set($nesting[0], 'URI_CLASSLOADER', "uri:classloader:");
       $const_set($nesting[0], 'WindowsRootRx', /^(?:[a-zA-Z]:)?[\\\/]/);
       self.$attr_accessor("file_separator");
       self.$attr_accessor("working_dir");
@@ -10351,21 +10374,33 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {/* Generated by Opal
             return path['$start_with?']("file://", "http://", "https://");
           }
         })
+      } else if ($eqeq($$$('RUBY_ENGINE'), "jruby")) {
+        
+        $def(self, '$root?', function $PathResolver_root$ques$3(path) {
+          var self = this, $ret_or_1 = nil;
+
+          if ($truthy(($ret_or_1 = self['$absolute_path?'](path)))) {
+            return $ret_or_1
+          } else {
+            
+            return path['$start_with?']($$('URI_CLASSLOADER'));
+          }
+        })
       } else {
         $alias(self, "root?", "absolute_path?")
       };
       
-      $def(self, '$unc?', function $PathResolver_unc$ques$3(path) {
+      $def(self, '$unc?', function $PathResolver_unc$ques$4(path) {
         
         return path['$start_with?']($$('DOUBLE_SLASH'))
       });
       
-      $def(self, '$web_root?', function $PathResolver_web_root$ques$4(path) {
+      $def(self, '$web_root?', function $PathResolver_web_root$ques$5(path) {
         
         return path['$start_with?']($$('SLASH'))
       });
       
-      $def(self, '$descends_from?', function $PathResolver_descends_from$ques$5(path, base) {
+      $def(self, '$descends_from?', function $PathResolver_descends_from$ques$6(path, base) {
         var $ret_or_1 = nil;
 
         if ($eqeq(base, path)) {
@@ -10431,7 +10466,7 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {/* Generated by Opal
         if ($truthy(path['$include?']($$('DOT_DOT')))) {
           
           resolved_segments = [];
-          $send(path_segments, 'each', [], function $$6(segment){
+          $send(path_segments, 'each', [], function $$7(segment){
             
             if (segment == null) segment = nil;
             if ($eqeq(segment, $$('DOT_DOT'))) {
@@ -10465,6 +10500,8 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {/* Generated by Opal
             root = $$('DOUBLE_SLASH')
           } else if ($truthy(posix_path['$start_with?']($$('SLASH')))) {
             root = $$('SLASH')
+          } else if ($truthy(posix_path['$start_with?']($$('URI_CLASSLOADER')))) {
+            root = posix_path.$slice(0, $$('URI_CLASSLOADER').$length())
           } else {
             root = posix_path.$slice(0, $rb_plus(posix_path.$index($$('SLASH')), 1))
           }
@@ -10573,7 +10610,7 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {/* Generated by Opal
               $b = self.$partition_path(jail), $a = $to_ary($b), (jail_segments = ($a[0] == null ? nil : $a[0])), $b
             };
             warned = false;
-            $send(unresolved_segments, 'each', [], function $$7(segment){var self = $$7.$$s == null ? this : $$7.$$s;
+            $send(unresolved_segments, 'each', [], function $$8(segment){var self = $$8.$$s == null ? this : $$8.$$s;
 
               
               if (segment == null) segment = nil;
@@ -10595,7 +10632,7 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {/* Generated by Opal
                 return resolved_segments['$<<'](segment)
               };}, {$$s: self});
           } else {
-            $send(unresolved_segments, 'each', [], function $$8(segment){
+            $send(unresolved_segments, 'each', [], function $$9(segment){
               
               if (segment == null) segment = nil;
               if ($eqeq(segment, $$('DOT_DOT'))) {
@@ -10637,7 +10674,7 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {/* Generated by Opal
         };
         $b = self.$partition_path(target, true), $a = $to_ary($b), (target_segments = ($a[0] == null ? nil : $a[0])), (target_root = ($a[1] == null ? nil : $a[1])), $b;
         resolved_segments = [];
-        $send(target_segments, 'each', [], function $$9(segment){
+        $send(target_segments, 'each', [], function $$10(segment){
           
           if (segment == null) segment = nil;
           if ($eqeq(segment, $$('DOT_DOT'))) {
@@ -10682,7 +10719,7 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {/* Generated by Opal 1.7.3
   "use strict";
   var $module = Opal.module, $klass = Opal.klass, $def = Opal.def, $rb_plus = Opal.rb_plus, $alias = Opal.alias, $hash2 = Opal.hash2, $not = Opal.not, $eqeqeq = Opal.eqeqeq, $to_ary = Opal.to_ary, $truthy = Opal.truthy, $rb_gt = Opal.rb_gt, $send = Opal.send, $rb_minus = Opal.rb_minus, $thrower = Opal.thrower, $eqeq = Opal.eqeq, $rb_times = Opal.rb_times, $neqeq = Opal.neqeq, $to_a = Opal.to_a, $assign_ivar_val = Opal.assign_ivar_val, $send2 = Opal.send2, $find_super = Opal.find_super, $rb_ge = Opal.rb_ge, $gvars = Opal.gvars, $rb_lt = Opal.rb_lt, $hash = Opal.hash, $nesting = [], nil = Opal.nil, $$$ = Opal.$$$;
 
-  Opal.add_stubs('include,attr_reader,+,line_info,attr_accessor,!,===,split,file,dir,dirname,path,basename,lineno,reverse,prepare_lines,empty?,nil_or_empty?,peek_line,>,slice,[],length,process_line,times,shift,read_line,<<,-,unshift_all,has_more_lines?,read_lines,join,unshift,unshift_line,unshift_lines,replace_next_line,start_with?,==,*,read_lines_until,size,clear,cursor,[]=,fetch,!=,cursor_at_mark,warn,logger,message_with_context,pop,push,respond_to?,reverse_each,new,tap,each,instance_variables,instance_variable_get,drop,instance_variable_set,class,object_id,inspect,private,prepare_source_array,prepare_source_string,chomp,valid_encoding?,to_s,raise,to_i,attributes,catalog,pop_include,parse,path=,dup,end_with?,keys,rindex,rootname,key?,attr,reverse!,>=,exceeds_max_depth?,nil?,include_processors?,extensions,extensions?,include_processors,map,skip_front_matter!,adjust_indentation!,include?,=~,preprocess_conditional_directive,preprocess_include_directive,downcase,error,none?,any?,all?,strip,send,resolve_expr_val,rstrip,sub_attributes,attribute_missing,info,parse_attributes,find,handles?,instance,process_method,safe,resolve_include_path,method,split_delimited_value,partition,<,to_a,uniq,sort,call,each_line,infinite?,push_include,delete,first,values,value?,create_include_cursor,delete_at,keep_if,read,uriish?,attr?,require_library,normalize_system_path,file?,relative_path,path_resolver,base_dir,to_f');
+  Opal.add_stubs('include,attr_reader,+,line_info,attr_accessor,!,===,split,file,dir,dirname,path,basename,lineno,reverse,prepare_lines,empty?,nil_or_empty?,peek_line,[],>,slice,length,process_line,times,shift,read_line,<<,-,unshift_all,has_more_lines?,read_lines,join,unshift,unshift_line,unshift_lines,replace_next_line,start_with?,==,*,read_lines_until,size,clear,cursor,[]=,fetch,!=,cursor_at_mark,warn,logger,message_with_context,pop,push,respond_to?,reverse_each,new,tap,each,instance_variables,instance_variable_get,drop,instance_variable_set,class,object_id,inspect,private,prepare_source_array,prepare_source_string,chomp,valid_encoding?,to_s,raise,to_i,attributes,catalog,pop_include,parse,path=,dup,end_with?,keys,rindex,rootname,key?,attr,reverse!,>=,exceeds_max_depth?,nil?,include_processors?,extensions,extensions?,include_processors,map,skip_front_matter!,adjust_indentation!,include?,=~,preprocess_conditional_directive,preprocess_include_directive,downcase,error,none?,any?,all?,strip,send,resolve_expr_val,rstrip,sub_attributes,attribute_missing,info,parse_attributes,find,handles?,instance,process_method,safe,resolve_include_path,method,split_delimited_value,partition,<,to_a,uniq,sort,call,each_line,infinite?,push_include,delete,first,values,value?,create_include_cursor,delete_at,keep_if,read,uriish?,attr?,require_library,normalize_system_path,file?,relative_path,path_resolver,base_dir,to_f');
   return (function($base, $parent_nesting) {
     var self = $module($base, 'Asciidoctor');
 
@@ -10809,25 +10846,24 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {/* Generated by Opal 1.7.3
       });
       
       $def(self, '$peek_line', function $$peek_line(direct) {
-        var self = this, line = nil, $ret_or_1 = nil;
+        var self = this, next_line = nil, line = nil;
 
         
         if (direct == null) direct = false;
-        if (($truthy(direct) || ($truthy($rb_gt(self.look_ahead, 0))))) {
-          if ($truthy(self.unescape_next_line)) {
-            
-            return (line = self.lines['$[]'](-1)).$slice(1, line.$length());
+        while ($truthy(true)) {
+        
+          next_line = self.lines['$[]'](-1);
+          if (($truthy(direct) || ($truthy($rb_gt(self.look_ahead, 0))))) {
+            return ($truthy(self.unescape_next_line) ? (next_line.$slice(1, next_line.$length())) : (next_line))
+          } else if ($truthy(next_line)) {
+            if ($truthy((line = self.$process_line(next_line)))) {
+              return line
+            }
           } else {
-            return self.lines['$[]'](-1)
-          }
-        } else if ($truthy(self.lines['$empty?']())) {
-          
-          self.look_ahead = 0;
-          return nil;
-        } else if ($truthy(($ret_or_1 = self.$process_line(self.lines['$[]'](-1))))) {
-          return $ret_or_1
-        } else {
-          return self.$peek_line()
+            
+            self.look_ahead = 0;
+            return nil;
+          };
         };
       }, -1);
       
@@ -11985,6 +12021,8 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {/* Generated by Opal 1.7.3
             };
           } else {
             
+            inc_content = nil;
+            
             try {
               
               inc_content = $send(reader, 'call', [inc_path, read_mode], function $$30(f){
@@ -11992,7 +12030,6 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {/* Generated by Opal 1.7.3
                 if (f == null) f = nil;
                 return f.$read();});
               self.$shift();
-              self.$push_include(inc_content, inc_path, relpath, 1, parsed_attrs);
             } catch ($err) {
               if (Opal.rescue($err, [$$('StandardError')])) {
                 try {
@@ -12001,7 +12038,8 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {/* Generated by Opal 1.7.3
                   return self.$replace_next_line("Unresolved directive in " + (self.path) + " - include::" + (expanded_target) + "[" + (attrlist) + "]");
                 } finally { Opal.pop_exception(); }
               } else { throw $err; }
-            };
+            };;
+            self.$push_include(inc_content, inc_path, relpath, 1, parsed_attrs);
           };
           return true;
         } else {
@@ -14745,7 +14783,7 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {/* Generated by Op
         };
         id_attribute = ($truthy(node.$id()) ? (" id=\"" + (node.$id()) + "\"") : (""));
         title_element = ($truthy(node['$title?']()) ? ("<div class=\"title\">" + (node.$captioned_title()) + "</div>\n") : (""));
-        return "<div" + (id_attribute) + " class=\"listingblock" + (($truthy((role = node.$role())) ? (" " + (role)) : (""))) + "\">\n" + (title_element) + "<div class=\"content\">\n" + (($truthy(syntax_hl) ? (syntax_hl.$format(node, lang, opts)) : ($rb_plus($rb_plus(pre_open, ($truthy(($ret_or_1 = node.$content())) ? ($ret_or_1) : (""))), pre_close)))) + "\n" + "</div>\n" + "</div>";
+        return "<div" + (id_attribute) + " class=\"listingblock" + (($truthy((role = node.$role())) ? (" " + (role)) : (""))) + "\">\n" + (title_element) + "<div class=\"content\">\n" + (($truthy(syntax_hl) ? (syntax_hl.$format(node, lang, opts)) : ($rb_plus($rb_plus(pre_open, node.$content()), pre_close)))) + "\n" + "</div>\n" + "</div>";
       });
       
       $def(self, '$convert_literal', function $$convert_literal(node) {
@@ -18006,7 +18044,7 @@ AbstractBlock.prototype.setStyle = function (style) {
 /**
  * Get the location in the AsciiDoc source where this block begins.
  *
- * @returns {string} - the style for this block
+ * @returns {Cursor} - the location in the AsciiDoc source where this block begins
  * @memberof AbstractBlock
  */
 AbstractBlock.prototype.getSourceLocation = function () {
@@ -22984,7 +23022,7 @@ Extensions.newBlockMacroProcessor = function (name, functions) {
 }
 
 
-var ASCIIDOCTOR_JS_VERSION = '3.0.0-rc.2';
+var ASCIIDOCTOR_JS_VERSION = '3.0.1';
 
   /**
    * Get Asciidoctor.js version number.