@asciidoctor/core 2.2.6 → 2.2.8

package/dist/node/asciidoctor.js

@@ -1295,6 +1295,30 @@ Opal.modules["asciidoctor/js/opal_ext/string"] = function(Opal) {
   })($nesting[0], null, $nesting)
 };
 
+/* Generated by Opal 0.11.99.dev */
+Opal.modules["asciidoctor/js/opal_ext/array"] = function(Opal) {
+  var self = Opal.top, $nesting = [], nil = Opal.nil, $$$ = Opal.const_get_qualified, $$ = Opal.const_get_relative, $breaker = Opal.breaker, $slice = Opal.slice, $klass = Opal.klass;
+
+  Opal.add_stubs(['$==', '$strict_encode64', '$_original_pack']);
+  return (function($base, $super, $parent_nesting) {
+    var self = $klass($base, $super, 'Array');
+
+    var $nesting = [self].concat($parent_nesting), $Array_pack$1;
+
+    
+    Opal.alias(self, "_original_pack", "pack");
+    return (Opal.def(self, '$pack', $Array_pack$1 = function $$pack(format) {
+      var self = this;
+
+      if (format['$==']("m0")) {
+        return $$$('::', 'Base64').$strict_encode64(self)
+      } else {
+        return self.$_original_pack(self)
+      }
+    }, $Array_pack$1.$$arity = 1), nil) && 'pack';
+  })($nesting[0], null, $nesting)
+};
+
 /* Generated by Opal 0.11.99.dev */
 Opal.modules["asciidoctor/js/opal_ext/uri"] = function(Opal) {
   var self = Opal.top, $nesting = [], nil = Opal.nil, $$$ = Opal.const_get_qualified, $$ = Opal.const_get_relative, $breaker = Opal.breaker, $slice = Opal.slice, $module = Opal.module;
@@ -1434,6 +1458,7 @@ Opal.modules["asciidoctor/js/opal_ext"] = function(Opal) {
   self.$require("asciidoctor/js/opal_ext/file");
   self.$require("asciidoctor/js/opal_ext/match_data");
   self.$require("asciidoctor/js/opal_ext/string");
+  self.$require("asciidoctor/js/opal_ext/array");
   self.$require("asciidoctor/js/opal_ext/uri");
   self.$require("asciidoctor/js/opal_ext/base64");
   self.$require("asciidoctor/js/opal_ext/number");
@@ -2043,7 +2068,7 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
   }
   var self = Opal.top, $nesting = [], nil = Opal.nil, $$$ = Opal.const_get_qualified, $$ = Opal.const_get_relative, $breaker = Opal.breaker, $slice = Opal.slice, $module = Opal.module, $truthy = Opal.truthy, $gvars = Opal.gvars, $send = Opal.send, $hash2 = Opal.hash2;
 
-  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');
 
@@ -2052,7 +2077,7 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
     (function($base, $parent_nesting) {
       var self = $module($base, 'Helpers');
 
-      var $nesting = [self].concat($parent_nesting), $Helpers_require_library$1, $Helpers_prepare_source_array$2, $Helpers_prepare_source_string$11, $Helpers_uriish$ques$16, $Helpers_encode_uri_component$17, $Helpers_encode_spaces_in_uri$18, $Helpers_rootname$19, $Helpers_basename$20, $Helpers_extname$ques$21, $Helpers_extname$22, $Helpers_extname$23, $Helpers_mkdir_p$24, $Helpers_int_to_roman$25, $Helpers_nextval$27, $Helpers_resolve_class$28, $Helpers_class_for_name$29;
+      var $nesting = [self].concat($parent_nesting), $Helpers_require_library$1, $Helpers_prepare_source_array$2, $Helpers_prepare_source_string$11, $Helpers_uriish$ques$16, $Helpers_uriish$ques$17, $Helpers_encode_uri_component$18, $Helpers_encode_spaces_in_uri$19, $Helpers_rootname$20, $Helpers_basename$21, $Helpers_extname$ques$22, $Helpers_extname$23, $Helpers_extname$24, $Helpers_mkdir_p$25, $Helpers_int_to_roman$26, $Helpers_nextval$28, $Helpers_resolve_class$29, $Helpers_class_for_name$30;
 
       
       self.$module_function();
@@ -2281,15 +2306,24 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
               return lines['$<<'](line.$chomp());}, $$15.$$s = self, $$15.$$arity = 1, $$15));}, $$14.$$s = self, $$14.$$arity = 1, $$14))
         };
       }, $Helpers_prepare_source_string$11.$$arity = -2);
-      
-      Opal.def(self, '$uriish?', $Helpers_uriish$ques$16 = function(str) {
-        var $a, self = this;
+      if ($$$('::', 'RUBY_ENGINE')['$==']("jruby")) {
+        
+        Opal.def(self, '$uriish?', $Helpers_uriish$ques$16 = function(str) {
+          var $a, $b, self = this;
+
+          return ($truthy($a = ($truthy($b = str['$include?'](":")) ? str['$start_with?']("uri:classloader:")['$!']() : $b)) ? $$($nesting, 'UriSniffRx')['$match?'](str) : $a)
+        }, $Helpers_uriish$ques$16.$$arity = 1)
+      } else {
+        
+        Opal.def(self, '$uriish?', $Helpers_uriish$ques$17 = function(str) {
+          var $a, self = this;
 
-        return ($truthy($a = str['$include?'](":")) ? $$($nesting, 'UriSniffRx')['$match?'](str) : $a)
-      }, $Helpers_uriish$ques$16.$$arity = 1);
+          return ($truthy($a = str['$include?'](":")) ? $$($nesting, 'UriSniffRx')['$match?'](str) : $a)
+        }, $Helpers_uriish$ques$17.$$arity = 1)
+      };
       if ($$($nesting, 'RUBY_ENGINE')['$==']("opal")) {
         
-        Opal.def(self, '$encode_uri_component', $Helpers_encode_uri_component$17 = function $$encode_uri_component(str) {
+        Opal.def(self, '$encode_uri_component', $Helpers_encode_uri_component$18 = function $$encode_uri_component(str) {
           var self = this;
 
           
@@ -2297,12 +2331,12 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
           return m === '%20' ? '+' : '%' + m.charCodeAt(0).toString(16)
         })
       
-        }, $Helpers_encode_uri_component$17.$$arity = 1)
+        }, $Helpers_encode_uri_component$18.$$arity = 1)
       } else {
         nil
       };
       
-      Opal.def(self, '$encode_spaces_in_uri', $Helpers_encode_spaces_in_uri$18 = function $$encode_spaces_in_uri(str) {
+      Opal.def(self, '$encode_spaces_in_uri', $Helpers_encode_spaces_in_uri$19 = function $$encode_spaces_in_uri(str) {
         var self = this;
 
         if ($truthy(str['$include?'](" "))) {
@@ -2311,9 +2345,9 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
         } else {
           return str
         }
-      }, $Helpers_encode_spaces_in_uri$18.$$arity = 1);
+      }, $Helpers_encode_spaces_in_uri$19.$$arity = 1);
       
-      Opal.def(self, '$rootname', $Helpers_rootname$19 = function $$rootname(filename) {
+      Opal.def(self, '$rootname', $Helpers_rootname$20 = function $$rootname(filename) {
         var self = this, last_dot_idx = nil;
 
         if ($truthy((last_dot_idx = filename.$rindex(".")))) {
@@ -2326,9 +2360,9 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
         } else {
           return filename
         }
-      }, $Helpers_rootname$19.$$arity = 1);
+      }, $Helpers_rootname$20.$$arity = 1);
       
-      Opal.def(self, '$basename', $Helpers_basename$20 = function $$basename(filename, drop_ext) {
+      Opal.def(self, '$basename', $Helpers_basename$21 = function $$basename(filename, drop_ext) {
         var self = this;
 
         
@@ -2346,16 +2380,16 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
         } else {
           return $$$('::', 'File').$basename(filename)
         };
-      }, $Helpers_basename$20.$$arity = -2);
+      }, $Helpers_basename$21.$$arity = -2);
       
-      Opal.def(self, '$extname?', $Helpers_extname$ques$21 = function(path) {
+      Opal.def(self, '$extname?', $Helpers_extname$ques$22 = function(path) {
         var $a, self = this, last_dot_idx = nil;
 
         return ($truthy($a = (last_dot_idx = path.$rindex("."))) ? path.$index("/", last_dot_idx)['$!']() : $a)
-      }, $Helpers_extname$ques$21.$$arity = 1);
+      }, $Helpers_extname$ques$22.$$arity = 1);
       if ($truthy($$$($$$('::', 'File'), 'ALT_SEPARATOR'))) {
         
-        Opal.def(self, '$extname', $Helpers_extname$22 = function $$extname(path, fallback) {
+        Opal.def(self, '$extname', $Helpers_extname$23 = function $$extname(path, fallback) {
           var $a, self = this, last_dot_idx = nil;
 
           
@@ -2373,10 +2407,10 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
           } else {
             return fallback
           };
-        }, $Helpers_extname$22.$$arity = -2)
+        }, $Helpers_extname$23.$$arity = -2)
       } else {
         
-        Opal.def(self, '$extname', $Helpers_extname$23 = function $$extname(path, fallback) {
+        Opal.def(self, '$extname', $Helpers_extname$24 = function $$extname(path, fallback) {
           var self = this, last_dot_idx = nil;
 
           
@@ -2394,10 +2428,10 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
           } else {
             return fallback
           };
-        }, $Helpers_extname$23.$$arity = -2)
+        }, $Helpers_extname$24.$$arity = -2)
       };
       
-      Opal.def(self, '$mkdir_p', $Helpers_mkdir_p$24 = function $$mkdir_p(dir) {
+      Opal.def(self, '$mkdir_p', $Helpers_mkdir_p$25 = function $$mkdir_p(dir) {
         var self = this, parent_dir = nil;
 
         if ($truthy($$$('::', 'File')['$directory?'](dir))) {
@@ -2423,14 +2457,14 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
             } else { throw $err; }
           };;
         }
-      }, $Helpers_mkdir_p$24.$$arity = 1);
+      }, $Helpers_mkdir_p$25.$$arity = 1);
       Opal.const_set($nesting[0], 'ROMAN_NUMERALS', $hash2(["M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I"], {"M": 1000, "CM": 900, "D": 500, "CD": 400, "C": 100, "XC": 90, "L": 50, "XL": 40, "X": 10, "IX": 9, "V": 5, "IV": 4, "I": 1}));
       self.$private_constant("ROMAN_NUMERALS");
       
-      Opal.def(self, '$int_to_roman', $Helpers_int_to_roman$25 = function $$int_to_roman(val) {
-        var $$26, self = this;
+      Opal.def(self, '$int_to_roman', $Helpers_int_to_roman$26 = function $$int_to_roman(val) {
+        var $$27, self = this;
 
-        return $send($$($nesting, 'ROMAN_NUMERALS'), 'map', [], ($$26 = function(l, i){var self = $$26.$$s || this, $a, $b, repeat = nil;
+        return $send($$($nesting, 'ROMAN_NUMERALS'), 'map', [], ($$27 = function(l, i){var self = $$27.$$s || this, $a, $b, repeat = nil;
 
         
           
@@ -2442,10 +2476,10 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
             i = nil;
           };
           $b = val.$divmod(i), $a = Opal.to_ary($b), (repeat = ($a[0] == null ? nil : $a[0])), (val = ($a[1] == null ? nil : $a[1])), $b;
-          return $rb_times(l, repeat);}, $$26.$$s = self, $$26.$$arity = 2, $$26)).$join()
-      }, $Helpers_int_to_roman$25.$$arity = 1);
+          return $rb_times(l, repeat);}, $$27.$$s = self, $$27.$$arity = 2, $$27)).$join()
+      }, $Helpers_int_to_roman$26.$$arity = 1);
       
-      Opal.def(self, '$nextval', $Helpers_nextval$27 = function $$nextval(current) {
+      Opal.def(self, '$nextval', $Helpers_nextval$28 = function $$nextval(current) {
         var self = this, intval = nil;
 
         if ($truthy($$$('::', 'Integer')['$==='](current))) {
@@ -2455,9 +2489,9 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
         } else {
           return current.$succ()
         }
-      }, $Helpers_nextval$27.$$arity = 1);
+      }, $Helpers_nextval$28.$$arity = 1);
       
-      Opal.def(self, '$resolve_class', $Helpers_resolve_class$28 = function $$resolve_class(object) {
+      Opal.def(self, '$resolve_class', $Helpers_resolve_class$29 = function $$resolve_class(object) {
         var self = this;
 
         if ($truthy($$$('::', 'Class')['$==='](object))) {
@@ -2471,9 +2505,9 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
             return nil
           };
         }
-      }, $Helpers_resolve_class$28.$$arity = 1);
+      }, $Helpers_resolve_class$29.$$arity = 1);
       
-      Opal.def(self, '$class_for_name', $Helpers_class_for_name$29 = function $$class_for_name(qualified_name) {
+      Opal.def(self, '$class_for_name', $Helpers_class_for_name$30 = function $$class_for_name(qualified_name) {
         var self = this, resolved = nil;
 
         try {
@@ -2490,7 +2524,7 @@ Opal.modules["asciidoctor/helpers"] = function(Opal) {
             } finally { Opal.pop_exception() }
           } else { throw $err; }
         }
-      }, $Helpers_class_for_name$29.$$arity = 1);
+      }, $Helpers_class_for_name$30.$$arity = 1);
     })($nesting[0], $nesting)
   })($nesting[0], $nesting)
 };
@@ -2860,9 +2894,11 @@ Opal.modules["asciidoctor/logging"] = function(Opal) {
       self.$attr_reader("messages");
       
       Opal.def(self, '$initialize', $MemoryLogger_initialize$6 = function $$initialize() {
-        var self = this, $writer = nil;
+        var $iter = $MemoryLogger_initialize$6.$$p, $yield = $iter || nil, self = this, $writer = nil;
 
+        if ($iter) $MemoryLogger_initialize$6.$$p = null;
         
+        $send(self, Opal.find_super_dispatcher(self, 'initialize', $MemoryLogger_initialize$6, false), [nil], null);
         
         $writer = [$$($nesting, 'WARN')];
         $send(self, 'level=', Opal.to_a($writer));
@@ -2930,12 +2966,15 @@ Opal.modules["asciidoctor/logging"] = function(Opal) {
       self.$attr_reader("max_severity");
       
       Opal.def(self, '$initialize', $NullLogger_initialize$12 = function $$initialize() {
-        var self = this, $writer = nil;
+        var $iter = $NullLogger_initialize$12.$$p, $yield = $iter || nil, self = this, $writer = nil;
 
+        if ($iter) $NullLogger_initialize$12.$$p = null;
+        
+        $send(self, Opal.find_super_dispatcher(self, 'initialize', $NullLogger_initialize$12, false), [nil], null);
         
         $writer = [$$($nesting, 'WARN')];
         $send(self, 'level=', Opal.to_a($writer));
-        return $writer[$rb_minus($writer["length"], 1)];
+        return $writer[$rb_minus($writer["length"], 1)];;
       }, $NullLogger_initialize$12.$$arity = 0);
       return (Opal.def(self, '$add', $NullLogger_add$13 = function $$add(severity, message, progname) {
         var $a, self = this;
@@ -3064,7 +3103,7 @@ Opal.modules["asciidoctor/rx"] = function(Opal) {
     Opal.const_set($nesting[0], 'ManpageNamePurposeRx', new RegExp("" + "^(" + ($$($nesting, 'CC_ANY')) + "+?) +- +(" + ($$($nesting, 'CC_ANY')) + "+)$"));
     Opal.const_set($nesting[0], 'ConditionalDirectiveRx', new RegExp("" + "^(\\\\)?(ifdef|ifndef|ifeval|endif)::(\\S*?(?:([,+])\\S*?)?)\\[(" + ($$($nesting, 'CC_ANY')) + "+)?\\]$"));
     Opal.const_set($nesting[0], 'EvalExpressionRx', new RegExp("" + "^(" + ($$($nesting, 'CC_ANY')) + "+?) *([=!><]=|[><]) *(" + ($$($nesting, 'CC_ANY')) + "+)$"));
-    Opal.const_set($nesting[0], 'IncludeDirectiveRx', new RegExp("" + "^(\\\\)?include::([^\\[][^\\[]*)\\[(" + ($$($nesting, 'CC_ANY')) + "+)?\\]$"));
+    Opal.const_set($nesting[0], 'IncludeDirectiveRx', new RegExp("" + "^(\\\\)?include::([^\\s\\[](?:[^\\[]*[^\\s\\[])?)\\[(" + ($$($nesting, 'CC_ANY')) + "+)?\\]$"));
     Opal.const_set($nesting[0], 'TagDirectiveRx', /\b(?:tag|(e)nd)::(\S+?)\[\](?=$|[ \r])/m);
     Opal.const_set($nesting[0], 'AttributeEntryRx', new RegExp("" + "^:(!?" + ($$($nesting, 'CG_WORD')) + "[^:]*):(?:[ \\t]+(" + ($$($nesting, 'CC_ANY')) + "*))?$"));
     Opal.const_set($nesting[0], 'InvalidAttributeNameCharsRx', new RegExp("" + "[^" + ($$($nesting, 'CC_WORD')) + "-]"));
@@ -3150,14 +3189,17 @@ Opal.modules["asciidoctor/rx"] = function(Opal) {
     Opal.const_set($nesting[0], 'InlineImageMacroRx', new RegExp("" + "\\\\?i(?:mage|con):([^:\\s\\[](?:[^\\n\\[]*[^\\s\\[])?)\\[(|" + ($$($nesting, 'CC_ALL')) + "*?[^\\\\])\\]", 'm'));
     Opal.const_set($nesting[0], 'InlineIndextermMacroRx', new RegExp("" + "\\\\?(?:(indexterm2?):\\[(" + ($$($nesting, 'CC_ALL')) + "*?[^\\\\])\\]|\\(\\((" + ($$($nesting, 'CC_ALL')) + "+?)\\)\\)(?!\\)))", 'm'));
     Opal.const_set($nesting[0], 'InlineKbdBtnMacroRx', new RegExp("" + "(\\\\)?(kbd|btn):\\[(" + ($$($nesting, 'CC_ALL')) + "*?[^\\\\])\\]", 'm'));
-    Opal.const_set($nesting[0], 'InlineLinkRx', new RegExp("" + "(^|link:|" + ($$($nesting, 'CG_BLANK')) + "|&lt;|[>\\(\\)\\[\\];\"'])(\\\\?(?:https?|file|ftp|irc)://[^\\s\\[\\]<]*([^\\s.,\\[\\]<]))(?:\\[(|" + ($$($nesting, 'CC_ALL')) + "*?[^\\\\])\\])?", 'm'));
+    if ($$($nesting, 'RUBY_ENGINE')['$==']("opal")) {
+      Opal.const_set($nesting[0], 'InlineLinkRx', new RegExp("" + "(^|link:|" + ($$($nesting, 'CG_BLANK')) + "|\\\\?&lt;(?=\\\\?(?:https?|file|ftp|irc)(:))|[>\\(\\)\\[\\];\"'])(\\\\?(?:https?|file|ftp|irc)://)(?:([^\\s\\[\\]]+)\\[(|" + ($$($nesting, 'CC_ALL')) + "*?[^\\\\])\\]|(?!\\2)([^\\s]+?)&gt;|([^\\s\\[\\]<]*([^\\s,.?!\\[\\]<\\)])))"))
+    } else {
+      nil
+    };
     Opal.const_set($nesting[0], 'InlineLinkMacroRx', new RegExp("" + "\\\\?(?:link|(mailto)):(|[^:\\s\\[][^\\s\\[]*)\\[(|" + ($$($nesting, 'CC_ALL')) + "*?[^\\\\])\\]", 'm'));
     Opal.const_set($nesting[0], 'MacroNameRx', new RegExp("" + "^" + ($$($nesting, 'CG_WORD')) + "[" + ($$($nesting, 'CC_WORD')) + "-]*$"));
     Opal.const_set($nesting[0], 'InlineStemMacroRx', new RegExp("" + "\\\\?(stem|(?:latex|ascii)math):([a-z]+(?:,[a-z-]+)*)?\\[(" + ($$($nesting, 'CC_ALL')) + "*?[^\\\\])\\]", 'm'));
     Opal.const_set($nesting[0], 'InlineMenuMacroRx', new RegExp("" + "\\\\?menu:(" + ($$($nesting, 'CG_WORD')) + "|[" + ($$($nesting, 'CC_WORD')) + "&][^\\n\\[]*[^\\s\\[])\\[ *(?:|(" + ($$($nesting, 'CC_ALL')) + "*?[^\\\\]))\\]", 'm'));
     Opal.const_set($nesting[0], 'InlineMenuRx', new RegExp("" + "\\\\?\"([" + ($$($nesting, 'CC_WORD')) + "&][^\"]*?[ \\n]+&gt;[ \\n]+[^\"]*)\""));
-    Opal.const_set($nesting[0], 'InlinePassRx', $hash(false, ["+", "`", new RegExp("" + "(^|[^" + ($$($nesting, 'CC_WORD')) + ";:])(?:\\[([^\\]]+)\\])?(\\\\?(\\+|`)(\\S|\\S" + ($$($nesting, 'CC_ALL')) + "*?\\S)\\4)(?!" + ($$($nesting, 'CG_WORD')) + ")", 'm')], true, ["`", nil, new RegExp("" + "(^|[^`" + ($$($nesting, 'CC_WORD')) + "])(?:\\[([^\\]]+)\\])?(\\\\?(`)([^`\\s]|[^`\\s]" + ($$($nesting, 'CC_ALL')) + "*?\\S)\\4)(?![`" + ($$($nesting, 'CC_WORD')) + "])", 'm')]));
-    Opal.const_set($nesting[0], 'SinglePlusInlinePassRx', new RegExp("" + "^(\\\\)?\\+(\\S|\\S" + ($$($nesting, 'CC_ALL')) + "*?\\S)\\+$", 'm'));
+    Opal.const_set($nesting[0], 'InlinePassRx', $hash(false, ["+", "-]", new RegExp("" + "((?:^|[^" + ($$($nesting, 'CC_WORD')) + ";:\\\\])(?=(\\[)|\\+)|\\\\(?=\\[)|(?=\\\\\\+))(?:\\2(x-|[^\\]]+ x-)\\]|(?:\\[([^\\]]+)\\])?(?=(\\\\)?\\+))(\\5?(\\+|`)(\\S|\\S" + ($$($nesting, 'CC_ALL')) + "*?\\S)\\7)(?!" + ($$($nesting, 'CG_WORD')) + ")", 'm')], true, ["`", nil, new RegExp("" + "(^|[^`" + ($$($nesting, 'CC_WORD')) + "])(?:(\\Z)()|\\[([^\\]]+)\\](?=(\\\\))?)?(\\5?(`)([^`\\s]|[^`\\s]" + ($$($nesting, 'CC_ALL')) + "*?\\S)\\7)(?![`" + ($$($nesting, 'CC_WORD')) + "])", 'm')]));
     Opal.const_set($nesting[0], 'InlinePassMacroRx', new RegExp("" + "(?:(?:(\\\\?)\\[([^\\]]+)\\])?(\\\\{0,2})(\\+\\+\\+?|\\$\\$)(" + ($$($nesting, 'CC_ALL')) + "*?)\\4|(\\\\?)pass:([a-z]+(?:,[a-z-]+)*)?\\[(|" + ($$($nesting, 'CC_ALL')) + "*?[^\\\\])\\])", 'm'));
     Opal.const_set($nesting[0], 'InlineXrefMacroRx', new RegExp("" + "\\\\?(?:&lt;&lt;([" + ($$($nesting, 'CC_WORD')) + "#/.:{]" + ($$($nesting, 'CC_ALL')) + "*?)&gt;&gt;|xref:([" + ($$($nesting, 'CC_WORD')) + "#/.:{]" + ($$($nesting, 'CC_ALL')) + "*?)\\[(?:\\]|(" + ($$($nesting, 'CC_ALL')) + "*?[^\\\\])\\]))", 'm'));
     if ($$($nesting, 'RUBY_ENGINE')['$==']("opal")) {
@@ -3173,7 +3215,11 @@ Opal.modules["asciidoctor/rx"] = function(Opal) {
     Opal.const_set($nesting[0], 'SpaceDelimiterRx', /([^\\])[ \t\n]+/);
     Opal.const_set($nesting[0], 'SubModifierSniffRx', /[+-]/);
     Opal.const_set($nesting[0], 'TrailingDigitsRx', /\d+$/);
-    Opal.const_set($nesting[0], 'UriSniffRx', new RegExp("" + "^" + ($$($nesting, 'CG_ALPHA')) + "[" + ($$($nesting, 'CC_ALNUM')) + ".+-]+:/{0,2}"));
+    if ($$($nesting, 'RUBY_ENGINE')['$==']("opal")) {
+      Opal.const_set($nesting[0], 'UriSniffRx', new RegExp("" + "^" + ($$($nesting, 'CG_ALPHA')) + "[" + ($$($nesting, 'CC_ALNUM')) + ".+-]+:/{0,2}"))
+    } else {
+      nil
+    };
     Opal.const_set($nesting[0], 'XmlSanitizeRx', /<[^>]+>/);
   })($nesting[0], $nesting)
 };
@@ -3197,7 +3243,7 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
   }
   var self = Opal.top, $nesting = [], nil = Opal.nil, $$$ = Opal.const_get_qualified, $$ = Opal.const_get_relative, $breaker = Opal.breaker, $slice = Opal.slice, $module = Opal.module, $hash2 = Opal.hash2, $hash = Opal.hash, $truthy = Opal.truthy, $send = Opal.send, $gvars = Opal.gvars;
 
-  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', '$extensions', '$inline_macros?', '$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', '$info?', '$catalog', '$fetch', '$outfilesuffix', '$natural_xrefs', '$resolve_id', '$find', '$footnotes', '$id', '$<', '$size', '$<<', '$attr?', '$attr', '$to_s', '$read_next_id', '$callouts', '$syntax_highlighter', '$highlight?', '$sub_source', '$extract_callouts', '$name', '$to_sym', '$to_i', '$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', '$extensions', '$inline_macros?', '$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', '$sub', '$extract_attributes_from_text', '$encode_uri_component', '$style', '$extname?', '$rindex', '$info?', '$catalog', '$fetch', '$outfilesuffix', '$natural_xrefs', '$resolve_id', '$find', '$footnotes', '$id', '$<', '$size', '$attr?', '$attr', '$to_s', '$read_next_id', '$callouts', '$syntax_highlighter', '$highlight?', '$sub_source', '$extract_callouts', '$name', '$to_sym', '$to_i', '$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');
 
@@ -3206,7 +3252,7 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
     (function($base, $parent_nesting) {
       var self = $module($base, 'Substitutors');
 
-      var $nesting = [self].concat($parent_nesting), $Substitutors_apply_subs$1, $Substitutors_apply_normal_subs$3, $Substitutors_apply_header_subs$4, $Substitutors_apply_reftext_subs$5, $Substitutors_sub_specialchars$6, $Substitutors_sub_quotes$7, $Substitutors_sub_attributes$10, $Substitutors_sub_replacements$16, $Substitutors_sub_macros$19, $Substitutors_sub_post_replacements$42, $Substitutors_sub_source$45, $Substitutors_sub_callouts$46, $Substitutors_highlight_source$48, $Substitutors_resolve_lines_to_highlight$49, $Substitutors_extract_passthroughs$52, $Substitutors_restore_passthroughs$56, $Substitutors_resolve_subs$58, $Substitutors_resolve_block_subs$60, $Substitutors_resolve_pass_subs$61, $Substitutors_expand_subs$62, $Substitutors_commit_subs$64, $Substitutors_parse_attributes$65, $Substitutors_extract_attributes_from_text$66, $Substitutors_extract_callouts$67, $Substitutors_restore_callouts$70, $Substitutors_extract_inner_passthrough$73, $Substitutors_convert_quoted_text$74, $Substitutors_do_replacement$75, $Substitutors_parse_quoted_text_attributes$76, $Substitutors_normalize_text$77, $Substitutors_split_simple_csv$78;
+      var $nesting = [self].concat($parent_nesting), $Substitutors_apply_subs$1, $Substitutors_apply_normal_subs$3, $Substitutors_apply_header_subs$4, $Substitutors_apply_reftext_subs$5, $Substitutors_sub_specialchars$6, $Substitutors_sub_quotes$7, $Substitutors_sub_attributes$10, $Substitutors_sub_replacements$16, $Substitutors_sub_macros$19, $Substitutors_sub_post_replacements$42, $Substitutors_sub_source$45, $Substitutors_sub_callouts$46, $Substitutors_highlight_source$48, $Substitutors_resolve_lines_to_highlight$49, $Substitutors_extract_passthroughs$52, $Substitutors_restore_passthroughs$56, $Substitutors_resolve_subs$58, $Substitutors_resolve_block_subs$60, $Substitutors_resolve_pass_subs$61, $Substitutors_expand_subs$62, $Substitutors_commit_subs$64, $Substitutors_parse_attributes$65, $Substitutors_extract_attributes_from_text$66, $Substitutors_extract_callouts$67, $Substitutors_restore_callouts$70, $Substitutors_convert_quoted_text$73, $Substitutors_do_replacement$74, $Substitutors_parse_quoted_text_attributes$75, $Substitutors_normalize_text$76, $Substitutors_split_simple_csv$77;
 
       
       Opal.const_set($nesting[0], 'SpecialCharsRx', /[<&>]/);
@@ -3702,7 +3748,7 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
             ($truthy($c = attrs['$[]']("alt")) ? $c : (($writer = ["alt", (($writer = ["default-alt", $$($nesting, 'Helpers').$basename(target, true).$tr("_-", " ")]), $send(attrs, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)])]), $send(attrs, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]));
             return $$($nesting, 'Inline').$new(self, "image", nil, $hash2(["type", "target", "attributes"], {"type": type, "target": target, "attributes": attrs})).$convert();}, $$30.$$s = self, $$30.$$arity = 0, $$30))};
         if ($truthy(($truthy($a = ($truthy($b = text['$include?']("((")) ? text['$include?']("))") : $b)) ? $a : ($truthy($b = found_macroish_short) ? text['$include?']("dexterm") : $b)))) {
-          text = $send(text, 'gsub', [$$($nesting, 'InlineIndextermMacroRx')], ($$31 = function(){var self = $$31.$$s || this, $c, $$32, $d, $$33, $case = nil, attrlist = nil, primary = nil, attrs = nil, $writer = nil, see_also = nil, term = nil, encl_text = nil, visible = nil, before = nil, after = nil, _ = nil, see = nil, subbed_term = nil, terms = nil;
+          text = $send(text, 'gsub', [$$($nesting, 'InlineIndextermMacroRx')], ($$31 = function(){var self = $$31.$$s || this, $c, $$32, $d, $$33, $case = nil, attrlist = nil, primary = nil, attrs = nil, terms = nil, secondary = nil, tertiary = nil, $writer = nil, see_also = nil, term = nil, encl_text = nil, visible = nil, before = nil, after = nil, _ = nil, see = nil, subbed_term = nil;
 
           return (function() {$case = (($c = $gvars['~']) === nil ? nil : $c['$[]'](1));
             if ("indexterm"['$===']($case)) {
@@ -3711,8 +3757,14 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
             if ($truthy((attrlist = self.$normalize_text((($c = $gvars['~']) === nil ? nil : $c['$[]'](2)), true, true))['$include?']("="))) {
               if ($truthy((primary = (attrs = $$($nesting, 'AttributeList').$new(attrlist, self).$parse())['$[]'](1)))) {
                 
+                terms = [primary];
+                if ($truthy((secondary = attrs['$[]'](2)))) {
+                  
+                  terms['$<<'](secondary);
+                  if ($truthy((tertiary = attrs['$[]'](3)))) {
+                    terms['$<<'](tertiary)};};
                 
-                $writer = ["terms", [primary]];
+                $writer = ["terms", terms];
                 $send(attrs, '[]=', Opal.to_a($writer));
                 $writer[$rb_minus($writer["length"], 1)];;
                 if ($truthy((see_also = attrs['$[]']("see-also")))) {
@@ -3825,78 +3877,94 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
               return subbed_term
             };}})()}, $$31.$$s = self, $$31.$$arity = 0, $$31))};
         if ($truthy(($truthy($a = found_colon) ? text['$include?']("://") : $a))) {
-          text = $send(text, 'gsub', [$$($nesting, 'InlineLinkRx')], ($$34 = function(){var self = $$34.$$s || this, $c, $d, target = nil, prefix = nil, suffix = nil, link_text = nil, $case = nil, attrs = nil, link_opts = nil, new_link_text = nil, $writer = nil, bare = nil;
+          text = $send(text, 'gsub', [$$($nesting, 'InlineLinkRx')], ($$34 = function(){var self = $$34.$$s || this, $c, $d, $e, target = nil, link_text = nil, prefix = nil, suffix = nil, $case = nil, link_opts = nil, new_link_text = nil, attrs = nil, $writer = nil, bare = nil;
 
-          
-            if ($truthy((target = (($c = $gvars['~']) === nil ? nil : $c['$[]'](2)))['$start_with?']($$($nesting, 'RS')))) {
-              return "" + ((($c = $gvars['~']) === nil ? nil : $c['$[]'](1))) + (target.$slice(1, target.$length())) + ((($c = $gvars['~']) === nil ? nil : $c['$[]'](4)));};
-            $c = [(($d = $gvars['~']) === nil ? nil : $d['$[]'](1)), ""], (prefix = $c[0]), (suffix = $c[1]), $c;
-            if ($truthy((($c = $gvars['~']) === nil ? nil : $c['$[]'](4)))) {
+          if ($truthy(($truthy($c = (($d = $gvars['~']) === nil ? nil : $d['$[]'](2))) ? (($d = $gvars['~']) === nil ? nil : $d['$[]'](5))['$!']() : $c))) {
               
-              if (prefix['$==']("link:")) {
-                prefix = ""};
-              if ($truthy((link_text = (($c = $gvars['~']) === nil ? nil : $c['$[]'](4)))['$empty?']())) {
-                link_text = nil};
-            } else {
-              
-              $case = prefix;
-              if ("link:"['$===']($case) || "\""['$===']($case) || "'"['$===']($case)) {return (($c = $gvars['~']) === nil ? nil : $c['$[]'](0));};
-              $case = (($c = $gvars['~']) === nil ? nil : $c['$[]'](3));
-              if (")"['$===']($case) || "?"['$===']($case) || "!"['$===']($case)) {
-              target = target.$chop();
-              if ($truthy((($c = (suffix = (($d = $gvars['~']) === nil ? nil : $d['$[]'](3)))['$=='](")")) ? target['$end_with?'](".", "?", "!") : (suffix = (($d = $gvars['~']) === nil ? nil : $d['$[]'](3)))['$=='](")")))) {
-                
-                suffix = $rb_plus(target['$[]'](-1), suffix);
-                target = target.$chop();};
-              if ($truthy(target['$end_with?']("://"))) {
-                return (($c = $gvars['~']) === nil ? nil : $c['$[]'](0));};}
-              else if (";"['$===']($case)) {
-              if ($truthy(($truthy($c = prefix['$start_with?']("&lt;")) ? target['$end_with?']("&gt;") : $c))) {
-                
-                prefix = prefix.$slice(4, prefix.$length());
-                target = target.$slice(0, $rb_minus(target.$length(), 4));
-              } else if ($truthy((target = target.$chop())['$end_with?'](")"))) {
-                
-                target = target.$chop();
-                suffix = ");";
+              if ($truthy((($c = $gvars['~']) === nil ? nil : $c['$[]'](1))['$start_with?']($$($nesting, 'RS')))) {
+                return (($c = $gvars['~']) === nil ? nil : $c['$[]'](0)).$slice(1, (($c = $gvars['~']) === nil ? nil : $c['$[]'](0)).$length());};
+              if ($truthy((($c = $gvars['~']) === nil ? nil : $c['$[]'](3))['$start_with?']($$($nesting, 'RS')))) {
+                return "" + ((($c = $gvars['~']) === nil ? nil : $c['$[]'](1))) + ((($c = $gvars['~']) === nil ? nil : $c['$[]'](0)).$slice($rb_plus((($c = $gvars['~']) === nil ? nil : $c['$[]'](1)).$length(), 1), (($c = $gvars['~']) === nil ? nil : $c['$[]'](0)).$length()));};
+              if ($truthy((($c = $gvars['~']) === nil ? nil : $c['$[]'](6)))) {
               } else {
-                suffix = ";"
+                return (($c = $gvars['~']) === nil ? nil : $c['$[]'](0));
               };
-              if ($truthy(target['$end_with?']("://"))) {
-                return (($c = $gvars['~']) === nil ? nil : $c['$[]'](0));};}
-              else if (":"['$===']($case)) {
-              if ($truthy((target = target.$chop())['$end_with?'](")"))) {
+              doc.$register("links", (target = $rb_plus((($c = $gvars['~']) === nil ? nil : $c['$[]'](3)), (($c = $gvars['~']) === nil ? nil : $c['$[]'](6)))));
+              link_text = (function() {if ($truthy(doc_attrs['$key?']("hide-uri-scheme"))) {
                 
-                target = target.$chop();
-                suffix = "):";
+                return target.$sub($$($nesting, 'UriSniffRx'), "");
               } else {
-                suffix = ":"
-              };
-              if ($truthy(target['$end_with?']("://"))) {
-                return (($c = $gvars['~']) === nil ? nil : $c['$[]'](0));};};
-            };
-            $c = [nil, $hash2(["type"], {"type": "link"})], (attrs = $c[0]), (link_opts = $c[1]), $c;
-            if ($truthy(link_text)) {
+                return target
+              }; return nil; })();
+              return $$($nesting, 'Inline').$new(self, "anchor", link_text, $hash2(["type", "target", "attributes"], {"type": "link", "target": target, "attributes": $hash2(["role"], {"role": "bare"})})).$convert();
+            } else {
               
-              if ($truthy(link_text['$include?']($$($nesting, 'R_SB')))) {
-                new_link_text = (link_text = link_text.$gsub($$($nesting, 'ESC_R_SB'), $$($nesting, 'R_SB')))};
-              if ($truthy(($truthy($c = doc.$compat_mode()['$!']()) ? link_text['$include?']("=") : $c))) {
-                
-                $d = self.$extract_attributes_from_text(link_text, ""), $c = Opal.to_ary($d), (link_text = ($c[0] == null ? nil : $c[0])), (attrs = ($c[1] == null ? nil : $c[1])), $d;
-                new_link_text = link_text;
+              if ($truthy((($c = $gvars['~']) === nil ? nil : $c['$[]'](3))['$start_with?']($$($nesting, 'RS')))) {
+                return "" + ((($c = $gvars['~']) === nil ? nil : $c['$[]'](1))) + ((($c = $gvars['~']) === nil ? nil : $c['$[]'](0)).$slice($rb_plus((($c = $gvars['~']) === nil ? nil : $c['$[]'](1)).$length(), 1), (($c = $gvars['~']) === nil ? nil : $c['$[]'](0)).$length()));};
+              $c = [(($d = $gvars['~']) === nil ? nil : $d['$[]'](1)), $rb_plus((($d = $gvars['~']) === nil ? nil : $d['$[]'](3)), ($truthy($d = (($e = $gvars['~']) === nil ? nil : $e['$[]'](4))) ? $d : (($e = $gvars['~']) === nil ? nil : $e['$[]'](7)))), ""], (prefix = $c[0]), (target = $c[1]), (suffix = $c[2]), $c;
+              if ($truthy((($c = $gvars['~']) === nil ? nil : $c['$[]'](5)))) {
                 
-                $writer = ["id", attrs['$[]']("id")];
-                $send(link_opts, '[]=', Opal.to_a($writer));
-                $writer[$rb_minus($writer["length"], 1)];;};
-              if ($truthy(link_text['$end_with?']("^"))) {
+                if (prefix['$==']("link:")) {
+                  prefix = ""};
+                if ($truthy((link_text = (($c = $gvars['~']) === nil ? nil : $c['$[]'](5)))['$empty?']())) {
+                  link_text = nil};
+              } else {
                 
-                new_link_text = (link_text = link_text.$chop());
-                if ($truthy(attrs)) {
-                  ($truthy($c = attrs['$[]']("window")) ? $c : (($writer = ["window", "_blank"]), $send(attrs, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]))
+                $case = prefix;
+                if ("link:"['$===']($case) || "\""['$===']($case) || "'"['$===']($case)) {return (($c = $gvars['~']) === nil ? nil : $c['$[]'](0));};
+                $case = (($c = $gvars['~']) === nil ? nil : $c['$[]'](8));
+                if (";"['$===']($case)) {
+                if ($truthy((target = target.$chop())['$end_with?'](")"))) {
+                  
+                  target = target.$chop();
+                  suffix = ");";
                 } else {
-                  attrs = $hash2(["window"], {"window": "_blank"})
-                };};
-              if ($truthy(($truthy($c = new_link_text) ? new_link_text['$empty?']() : $c))) {
+                  suffix = ";"
+                };
+                if (target['$==']((($c = $gvars['~']) === nil ? nil : $c['$[]'](3)))) {
+                  return (($c = $gvars['~']) === nil ? nil : $c['$[]'](0));};}
+                else if (":"['$===']($case)) {
+                if ($truthy((target = target.$chop())['$end_with?'](")"))) {
+                  
+                  target = target.$chop();
+                  suffix = "):";
+                } else {
+                  suffix = ":"
+                };
+                if (target['$==']((($c = $gvars['~']) === nil ? nil : $c['$[]'](3)))) {
+                  return (($c = $gvars['~']) === nil ? nil : $c['$[]'](0));};};
+              };
+              link_opts = $hash2(["type"], {"type": "link"});
+              if ($truthy(link_text)) {
+                
+                if ($truthy(link_text['$include?']($$($nesting, 'R_SB')))) {
+                  new_link_text = (link_text = link_text.$gsub($$($nesting, 'ESC_R_SB'), $$($nesting, 'R_SB')))};
+                if ($truthy(($truthy($c = doc.$compat_mode()['$!']()) ? link_text['$include?']("=") : $c))) {
+                  
+                  $d = self.$extract_attributes_from_text(link_text, ""), $c = Opal.to_ary($d), (link_text = ($c[0] == null ? nil : $c[0])), (attrs = ($c[1] == null ? nil : $c[1])), $d;
+                  new_link_text = link_text;
+                  
+                  $writer = ["id", attrs['$[]']("id")];
+                  $send(link_opts, '[]=', Opal.to_a($writer));
+                  $writer[$rb_minus($writer["length"], 1)];;};
+                if ($truthy(link_text['$end_with?']("^"))) {
+                  
+                  new_link_text = (link_text = link_text.$chop());
+                  if ($truthy(attrs)) {
+                    ($truthy($c = attrs['$[]']("window")) ? $c : (($writer = ["window", "_blank"]), $send(attrs, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]))
+                  } else {
+                    attrs = $hash2(["window"], {"window": "_blank"})
+                  };};
+                if ($truthy(($truthy($c = new_link_text) ? new_link_text['$empty?']() : $c))) {
+                  
+                  link_text = (function() {if ($truthy(doc_attrs['$key?']("hide-uri-scheme"))) {
+                    
+                    return target.$sub($$($nesting, 'UriSniffRx'), "");
+                  } else {
+                    return target
+                  }; return nil; })();
+                  bare = true;};
+              } else {
                 
                 link_text = (function() {if ($truthy(doc_attrs['$key?']("hide-uri-scheme"))) {
                   
@@ -3904,37 +3972,29 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
                 } else {
                   return target
                 }; return nil; })();
-                bare = true;};
-            } else {
-              
-              link_text = (function() {if ($truthy(doc_attrs['$key?']("hide-uri-scheme"))) {
-                
-                return target.$sub($$($nesting, 'UriSniffRx'), "");
-              } else {
-                return target
-              }; return nil; })();
-              bare = true;
-            };
-            if ($truthy(bare)) {
+                bare = true;
+              };
+              if ($truthy(bare)) {
+                if ($truthy(attrs)) {
+                  
+                  $writer = ["role", (function() {if ($truthy(attrs['$key?']("role"))) {
+                    return "" + "bare " + (attrs['$[]']("role"))
+                  } else {
+                    return "bare"
+                  }; return nil; })()];
+                  $send(attrs, '[]=', Opal.to_a($writer));
+                  $writer[$rb_minus($writer["length"], 1)];
+                } else {
+                  attrs = $hash2(["role"], {"role": "bare"})
+                }};
+              doc.$register("links", (($writer = ["target", target]), $send(link_opts, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]));
               if ($truthy(attrs)) {
                 
-                $writer = ["role", (function() {if ($truthy(attrs['$key?']("role"))) {
-                  return "" + "bare " + (attrs['$[]']("role"))
-                } else {
-                  return "bare"
-                }; return nil; })()];
-                $send(attrs, '[]=', Opal.to_a($writer));
-                $writer[$rb_minus($writer["length"], 1)];
-              } else {
-                attrs = $hash2(["role"], {"role": "bare"})
-              }};
-            doc.$register("links", (($writer = ["target", target]), $send(link_opts, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]));
-            if ($truthy(attrs)) {
-              
-              $writer = ["attributes", attrs];
-              $send(link_opts, '[]=', Opal.to_a($writer));
-              $writer[$rb_minus($writer["length"], 1)];};
-            return "" + (prefix) + ($$($nesting, 'Inline').$new(self, "anchor", link_text, link_opts).$convert()) + (suffix);}, $$34.$$s = self, $$34.$$arity = 0, $$34))};
+                $writer = ["attributes", attrs];
+                $send(link_opts, '[]=', Opal.to_a($writer));
+                $writer[$rb_minus($writer["length"], 1)];};
+              return "" + (prefix) + ($$($nesting, 'Inline').$new(self, "anchor", link_text, link_opts).$convert()) + (suffix);
+            }}, $$34.$$s = self, $$34.$$arity = 0, $$34))};
         if ($truthy(($truthy($a = found_macroish) ? ($truthy($b = text['$include?']("link:")) ? $b : text['$include?']("ilto:")) : $a))) {
           text = $send(text, 'gsub', [$$($nesting, 'InlineLinkMacroRx')], ($$35 = function(){var self = $$35.$$s || this, $c, $d, mailto = nil, target = nil, mailto_text = nil, attrs = nil, link_opts = nil, link_text = nil, $writer = nil;
 
@@ -4072,7 +4132,7 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
             };
             if ($truthy(doc.$compat_mode())) {
               fragment = refid
-            } else if ($truthy((hash_idx = refid.$index("#")))) {
+            } else if ($truthy(($truthy($c = (hash_idx = refid.$index("#"))) ? refid['$[]']($rb_minus(hash_idx, 1))['$!=']("&") : $c))) {
               if ($truthy($rb_gt(hash_idx, 0))) {
                 
                 if ($truthy($rb_gt((fragment_len = $rb_minus($rb_minus(refid.$length(), 1), hash_idx)), 0))) {
@@ -4423,13 +4483,20 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
                   return "" + ((($c = $gvars['~']) === nil ? nil : $c['$[]'](1))) + "[" + (attrlist) + "]" + ($rb_times($$($nesting, 'RS'), $rb_minus(escape_count, 1))) + (boundary) + ((($c = $gvars['~']) === nil ? nil : $c['$[]'](5))) + (boundary);
                 } else if ((($c = $gvars['~']) === nil ? nil : $c['$[]'](1))['$==']($$($nesting, 'RS'))) {
                   preceding = "" + "[" + (attrlist) + "]"
-                } else {
-                  
-                  if ($truthy((($c = boundary['$==']("++")) ? attrlist['$end_with?']("x-") : boundary['$==']("++")))) {
+                } else if (boundary['$==']("++")) {
+                  if (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 = (($c = $gvars['~']) === nil ? nil : $c['$[]'](3)).$length()), 0))) {
                 return "" + ($rb_times($$($nesting, 'RS'), $rb_minus(escape_count, 1))) + (boundary) + ((($c = $gvars['~']) === nil ? nil : $c['$[]'](5))) + (boundary);};
@@ -4475,33 +4542,42 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
             return "" + (($truthy($c = preceding) ? $c : "")) + ($$($nesting, 'PASS_START')) + (passthru_key) + ($$($nesting, 'PASS_END'));}, $$53.$$s = self, $$53.$$arity = 0, $$53))};
         $b = $$($nesting, 'InlinePassRx')['$[]'](compat_mode), $a = Opal.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(($truthy($a = text['$include?'](pass_inline_char1)) ? $a : ($truthy($b = pass_inline_char2) ? text['$include?'](pass_inline_char2) : $b)))) {
-          text = $send(text, 'gsub', [pass_inline_rx], ($$54 = function(){var self = $$54.$$s || this, $c, preceding = nil, attrlist = nil, quoted_text = nil, escape_mark = nil, format_mark = nil, content = nil, old_behavior = nil, attributes = nil, $writer = nil, passthru_key = nil, subs = nil;
+          text = $send(text, 'gsub', [pass_inline_rx], ($$54 = function(){var self = $$54.$$s || this, $c, $d, preceding = nil, attrlist = nil, escaped = nil, quoted_text = nil, format_mark = nil, content = nil, old_behavior = nil, old_behavior_forced = nil, attributes = nil, $writer = 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?']($$($nesting, 'RS')))) {
-              escape_mark = $$($nesting, 'RS')};
-            format_mark = (($c = $gvars['~']) === nil ? nil : $c['$[]'](4));
-            content = (($c = $gvars['~']) === nil ? nil : $c['$[]'](5));
+            attrlist = ($truthy($c = (($d = $gvars['~']) === nil ? nil : $d['$[]'](4))) ? $c : (($d = $gvars['~']) === nil ? nil : $d['$[]'](3)));
+            if ($truthy((($c = $gvars['~']) === nil ? nil : $c['$[]'](5)))) {
+              escaped = true};
+            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($c = attrlist) ? attrlist['$end_with?']("x-") : $c)))) {
-              attrlist = attrlist.$slice(0, $rb_minus(attrlist.$length(), 2))};
+            } else if ($truthy(($truthy($c = attrlist) ? ($truthy($d = attrlist['$==']("x-")) ? $d : attrlist['$end_with?'](" x-")) : $c))) {
+              old_behavior = (old_behavior_forced = true)};
             if ($truthy(attrlist)) {
-              if ($truthy((($c = format_mark['$==']("`")) ? old_behavior['$!']() : format_mark['$==']("`")))) {
-                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 (preceding['$==']($$($nesting, 'RS'))) {
-                preceding = "" + "[" + (attrlist) + "]"
+                
+                if ($truthy(($truthy($c = old_behavior_forced) ? format_mark['$==']("`") : $c))) {
+                  return "" + (preceding) + "[" + (attrlist) + "]" + (quoted_text);};
+                preceding = "" + "[" + (attrlist) + "]";
+              } else if ($truthy(old_behavior_forced)) {
+                attributes = (function() {if (attrlist['$==']("x-")) {
+                  return $hash2([], {})
+                } else {
+                  
+                  return self.$parse_quoted_text_attributes(attrlist.$slice(0, $rb_minus(attrlist.$length(), 3)));
+                }; return nil; })()
               } else {
                 attributes = self.$parse_quoted_text_attributes(attrlist)
               }
-            } else if ($truthy((($c = format_mark['$==']("`")) ? old_behavior['$!']() : format_mark['$==']("`")))) {
-              return self.$extract_inner_passthrough(content, "" + (preceding) + (escape_mark));
-            } else if ($truthy(escape_mark)) {
-              return "" + (preceding) + (quoted_text.$slice(1, quoted_text.$length()));};
+            } else if ($truthy(escaped)) {
+              return "" + (preceding) + (quoted_text.$slice(1, quoted_text.$length()));
+            } else if ($truthy(($truthy($c = compat_mode) ? preceding['$==']($$($nesting, 'RS')) : $c))) {
+              return quoted_text;};
             if ($truthy(compat_mode)) {
               
               $writer = [(passthru_key = passthrus.$size()), $hash2(["text", "subs", "attributes", "type"], {"text": content, "subs": $$($nesting, 'BASIC_SUBS'), "attributes": attributes, "type": "monospaced"})];
@@ -4935,27 +5011,7 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
           };}, $$71.$$s = self, $$71.$$arity = 1, $$71)).$join($$($nesting, 'LF')));
       }, $Substitutors_restore_callouts$70.$$arity = -3);
       
-      Opal.def(self, '$extract_inner_passthrough', $Substitutors_extract_inner_passthrough$73 = function $$extract_inner_passthrough(text, pre) {
-        var $a, $b, self = this, $writer = nil, passthru_key = nil;
-        if (self.passthroughs == null) self.passthroughs = nil;
-
-        if ($truthy(($truthy($a = ($truthy($b = text['$end_with?']("+")) ? text['$start_with?']("+", "\\+") : $b)) ? $$($nesting, 'SinglePlusInlinePassRx')['$=~'](text) : $a))) {
-          if ($truthy((($a = $gvars['~']) === nil ? nil : $a['$[]'](1)))) {
-            return "" + (pre) + "`+" + ((($a = $gvars['~']) === nil ? nil : $a['$[]'](2))) + "+`"
-          } else {
-            
-            
-            $writer = [(passthru_key = self.passthroughs.$size()), $hash2(["text", "subs"], {"text": (($a = $gvars['~']) === nil ? nil : $a['$[]'](2)), "subs": $$($nesting, 'BASIC_SUBS')})];
-            $send(self.passthroughs, '[]=', Opal.to_a($writer));
-            $writer[$rb_minus($writer["length"], 1)];;
-            return "" + (pre) + "`" + ($$($nesting, 'PASS_START')) + (passthru_key) + ($$($nesting, 'PASS_END')) + "`";
-          }
-        } else {
-          return "" + (pre) + "`" + (text) + "`"
-        }
-      }, $Substitutors_extract_inner_passthrough$73.$$arity = 2);
-      
-      Opal.def(self, '$convert_quoted_text', $Substitutors_convert_quoted_text$74 = function $$convert_quoted_text(match, type, scope) {
+      Opal.def(self, '$convert_quoted_text', $Substitutors_convert_quoted_text$73 = function $$convert_quoted_text(match, type, scope) {
         var $a, self = this, attrs = nil, unescaped_attrs = nil, attrlist = nil, id = nil, attributes = nil;
 
         
@@ -4986,9 +5042,9 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
               type = "unquoted"};};
           return $$($nesting, 'Inline').$new(self, "quoted", match['$[]'](2), $hash2(["type", "id", "attributes"], {"type": type, "id": id, "attributes": attributes})).$convert();
         };
-      }, $Substitutors_convert_quoted_text$74.$$arity = 3);
+      }, $Substitutors_convert_quoted_text$73.$$arity = 3);
       
-      Opal.def(self, '$do_replacement', $Substitutors_do_replacement$75 = function $$do_replacement(m, replacement, restore) {
+      Opal.def(self, '$do_replacement', $Substitutors_do_replacement$74 = function $$do_replacement(m, replacement, restore) {
         var self = this, captured = nil, $case = nil;
 
         if ($truthy((captured = m['$[]'](0))['$include?']($$($nesting, 'RS')))) {
@@ -4999,13 +5055,13 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
           else if ("bounding"['$===']($case)) {return $rb_plus($rb_plus(m['$[]'](1), replacement), m['$[]'](2))}
           else {return $rb_plus(m['$[]'](1), replacement)}})()
         }
-      }, $Substitutors_do_replacement$75.$$arity = 3);
+      }, $Substitutors_do_replacement$74.$$arity = 3);
       if ($$($nesting, 'RUBY_ENGINE')['$==']("opal")) {
       } else {
         nil
       };
       
-      Opal.def(self, '$parse_quoted_text_attributes', $Substitutors_parse_quoted_text_attributes$76 = function $$parse_quoted_text_attributes(str) {
+      Opal.def(self, '$parse_quoted_text_attributes', $Substitutors_parse_quoted_text_attributes$75 = function $$parse_quoted_text_attributes(str) {
         var $a, $b, self = this, before = nil, _ = nil, after = nil, attrs = nil, $writer = nil, id = nil, roles = nil;
 
         
@@ -5057,9 +5113,9 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
         } else {
           return $hash2(["role"], {"role": str})
         };
-      }, $Substitutors_parse_quoted_text_attributes$76.$$arity = 1);
+      }, $Substitutors_parse_quoted_text_attributes$75.$$arity = 1);
       
-      Opal.def(self, '$normalize_text', $Substitutors_normalize_text$77 = function $$normalize_text(text, normalize_whitespace, unescape_closing_square_brackets) {
+      Opal.def(self, '$normalize_text', $Substitutors_normalize_text$76 = function $$normalize_text(text, normalize_whitespace, unescape_closing_square_brackets) {
         var $a, self = this;
 
         
@@ -5080,10 +5136,10 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
             text = text.$gsub($$($nesting, 'ESC_R_SB'), $$($nesting, 'R_SB'))};
         };
         return text;
-      }, $Substitutors_normalize_text$77.$$arity = -2);
+      }, $Substitutors_normalize_text$76.$$arity = -2);
       
-      Opal.def(self, '$split_simple_csv', $Substitutors_split_simple_csv$78 = function $$split_simple_csv(str) {
-        var $$79, $$80, self = this, values = nil, accum = nil, quote_open = nil;
+      Opal.def(self, '$split_simple_csv', $Substitutors_split_simple_csv$77 = function $$split_simple_csv(str) {
+        var $$78, $$79, self = this, values = nil, accum = nil, quote_open = nil;
 
         if ($truthy(str['$empty?']())) {
           return []
@@ -5092,7 +5148,7 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
           values = [];
           accum = "";
           quote_open = nil;
-          $send(str, 'each_char', [], ($$79 = function(c){var self = $$79.$$s || this, $case = nil;
+          $send(str, 'each_char', [], ($$78 = function(c){var self = $$78.$$s || this, $case = nil;
 
           
             
@@ -5108,19 +5164,19 @@ Opal.modules["asciidoctor/substitutors"] = function(Opal) {
               return (accum = "");
             }}
             else if ("\""['$===']($case)) {return (quote_open = quote_open['$!']())}
-            else {return (accum = $rb_plus(accum, c))}})();}, $$79.$$s = self, $$79.$$arity = 1, $$79));
+            else {return (accum = $rb_plus(accum, c))}})();}, $$78.$$s = self, $$78.$$arity = 1, $$78));
           return values['$<<'](accum.$strip());
         } else {
-          return $send(str.$split(","), 'map', [], ($$80 = function(it){var self = $$80.$$s || this;
+          return $send(str.$split(","), 'map', [], ($$79 = function(it){var self = $$79.$$s || this;
 
           
             
             if (it == null) {
               it = nil;
             };
-            return it.$strip();}, $$80.$$s = self, $$80.$$arity = 1, $$80))
+            return it.$strip();}, $$79.$$s = self, $$79.$$arity = 1, $$79))
         }
-      }, $Substitutors_split_simple_csv$78.$$arity = 1);
+      }, $Substitutors_split_simple_csv$77.$$arity = 1);
     })($nesting[0], $nesting)
   })($nesting[0], $nesting)
 };
@@ -5134,7 +5190,7 @@ Opal.modules["asciidoctor/version"] = function(Opal) {
 
     var $nesting = [self].concat($parent_nesting);
 
-    Opal.const_set($nesting[0], 'VERSION', "2.0.17")
+    Opal.const_set($nesting[0], 'VERSION', "2.0.23")
   })($nesting[0], $nesting)
 };
 
@@ -5148,7 +5204,7 @@ Opal.modules["asciidoctor/abstract_node"] = function(Opal) {
   }
   var self = Opal.top, $nesting = [], nil = Opal.nil, $$$ = Opal.const_get_qualified, $$ = Opal.const_get_relative, $breaker = Opal.breaker, $slice = Opal.slice, $module = Opal.module, $klass = Opal.klass, $hash2 = Opal.hash2, $truthy = Opal.truthy, $send = Opal.send;
 
-  Opal.add_stubs(['$include', '$attr_reader', '$attr_accessor', '$==', '$document', '$to_s', '$[]', '$merge', '$raise', '$converter', '$attributes', '$key?', '$[]=', '$-', '$delete', '$tap', '$new', '$each_key', '$end_with?', '$<<', '$slice', '$length', '$update', '$split', '$include?', '$===', '$join', '$empty?', '$apply_reftext_subs', '$attr?', '$attr', '$extname?', '$image_uri', '$<', '$safe', '$uriish?', '$encode_spaces_in_uri', '$normalize_web_path', '$generate_data_uri_from_uri', '$generate_data_uri', '$extname', '$normalize_system_path', '$readable?', '$strict_encode64', '$binread', '$warn', '$logger', '$require_library', '$!', '$open_uri', '$content_type', '$read', '$base_dir', '$root?', '$path_resolver', '$system_path', '$web_path', '$!=', '$prepare_source_string', '$fetch', '$read_asset']);
+  Opal.add_stubs(['$include', '$attr_reader', '$attr_accessor', '$==', '$document', '$to_s', '$[]', '$merge', '$raise', '$converter', '$attributes', '$key?', '$[]=', '$-', '$delete', '$tap', '$new', '$each_key', '$end_with?', '$<<', '$slice', '$length', '$update', '$split', '$include?', '$===', '$join', '$empty?', '$apply_reftext_subs', '$attr?', '$attr', '$extname?', '$image_uri', '$<', '$safe', '$uriish?', '$encode_spaces_in_uri', '$normalize_web_path', '$generate_data_uri_from_uri', '$generate_data_uri', '$extname', '$normalize_system_path', '$readable?', '$pack', '$binread', '$warn', '$logger', '$require_library', '$!', '$open_uri', '$content_type', '$read', '$base_dir', '$root?', '$path_resolver', '$system_path', '$web_path', '$!=', '$prepare_source_string', '$fetch', '$read_asset']);
   return (function($base, $parent_nesting) {
     var self = $module($base, 'Asciidoctor');
 
@@ -5553,7 +5609,7 @@ Opal.modules["asciidoctor/abstract_node"] = function(Opal) {
           image_path = self.$normalize_system_path(target_image)
         };
         if ($truthy($$$('::', 'File')['$readable?'](image_path))) {
-          return "" + "data:" + (mimetype) + ";base64," + ($$$('::', 'Base64').$strict_encode64($$$('::', 'File').$binread(image_path)))
+          return "" + "data:" + (mimetype) + ";base64," + ([$$$('::', 'File').$binread(image_path)].$pack("m0"))
         } else {
           
           self.$logger().$warn("" + "image to embed not found or not readable: " + (image_path));
@@ -5584,7 +5640,7 @@ Opal.modules["asciidoctor/abstract_node"] = function(Opal) {
               f = nil;
             };
             return [f.$content_type(), f.$read()];}, $$30.$$s = self, $$30.$$arity = 1, $$30)), $a = Opal.to_ary($b), (mimetype = ($a[0] == null ? nil : $a[0])), (bindata = ($a[1] == null ? nil : $a[1])), $b;
-          return "" + "data:" + (mimetype) + ";base64," + ($$$('::', 'Base64').$strict_encode64(bindata));
+          return "" + "data:" + (mimetype) + ";base64," + ([bindata].$pack("m0"));
         } catch ($err) {
           if (Opal.rescue($err, [$$($nesting, 'StandardError')])) {
             try {
@@ -6712,7 +6768,7 @@ Opal.modules["asciidoctor/block"] = function(Opal) {
         else if ("verbatim"['$===']($case) || "raw"['$===']($case)) {
         result = self.$apply_subs(self.lines, self.subs);
         if ($truthy($rb_lt(result.$size(), 2))) {
-          return result['$[]'](0)
+          return ($truthy($a = result['$[]'](0)) ? $a : "")
         } else {
           
           while ($truthy(($truthy($b = (first = result['$[]'](0))) ? first.$rstrip()['$empty?']() : $b))) {
@@ -6726,7 +6782,7 @@ Opal.modules["asciidoctor/block"] = function(Opal) {
         else {
         if (self.content_model['$==']("empty")) {
         } else {
-          self.$logger().$warn("" + "Unknown content model '" + (self.content_model) + "' for block: " + (self))
+          self.$logger().$warn("" + "unknown content model '" + (self.content_model) + "' for block: " + (self))
         };
         return nil;}})()
       }, $Block_content$2.$$arity = 0);
@@ -7568,6 +7624,11 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
             $writer = ["catalog_assets", true];
             $send(options, '[]=', Opal.to_a($writer));
             $writer[$rb_minus($writer["length"], 1)];};
+          if ($truthy(parent_doc.$options()['$[]']("to_dir"))) {
+            
+            $writer = ["to_dir", parent_doc.$options()['$[]']("to_dir")];
+            $send(options, '[]=', Opal.to_a($writer));
+            $writer[$rb_minus($writer["length"], 1)];};
           self.catalog = parent_doc.$catalog().$merge($hash2(["footnotes"], {"footnotes": []}));
           self.attribute_overrides = (attr_overrides = parent_doc.$instance_variable_get("@attribute_overrides").$merge(parent_doc.$attributes()));
           attr_overrides.$delete("compat-mode");
@@ -9387,7 +9448,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
   }
   var self = Opal.top, $nesting = [], nil = Opal.nil, $$$ = Opal.const_get_qualified, $$ = Opal.const_get_relative, $breaker = Opal.breaker, $slice = Opal.slice, $module = Opal.module, $klass = Opal.klass, $send = Opal.send, $truthy = Opal.truthy, $hash2 = Opal.hash2, $gvars = Opal.gvars;
 
-  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', '$context', '$empty?', '$header?', '$!=', '$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?', '$extend', '$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', '$context', '$empty?', '$header?', '$!=', '$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?', '$close_table', '$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');
 
@@ -9429,6 +9490,9 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
         return ($truthy($a = ($truthy($b = self['$is_delimited_block?'](l)) ? $b : ($truthy($c = l['$start_with?']("[")) ? $$($nesting, 'BlockAttributeLineRx')['$match?'](l) : $c))) ? $a : $$($nesting, 'AnyListRx')['$match?'](l));}, $Parser$3.$$s = self, $Parser$3.$$arity = 1, $Parser$3)));
       Opal.const_set($nesting[0], 'NoOp', nil);
       Opal.const_set($nesting[0], 'AuthorKeys', ["author", "authorinitials", "firstname", "middlename", "lastname", "email"]);
+      Opal.const_set($nesting[0], 'ListContinuationMarker', $$$('::', 'Module').$new());
+      Opal.const_set($nesting[0], 'ListContinuationPlaceholder', $$$('::', 'String').$new().$extend($$($nesting, 'ListContinuationMarker')));
+      Opal.const_set($nesting[0], 'ListContinuationString', $$$('::', 'String').$new($$($nesting, 'LIST_CONTINUATION')).$extend($$($nesting, 'ListContinuationMarker')));
       Opal.const_set($nesting[0], 'TableCellHorzAlignments', $hash2(["<", ">", "^"], {"<": "left", ">": "right", "^": "center"}));
       Opal.const_set($nesting[0], 'TableCellVertAlignments', $hash2(["<", ">", "^"], {"<": "top", ">": "bottom", "^": "middle"}));
       Opal.const_set($nesting[0], 'TableCellStyles', $hash2(["d", "s", "e", "m", "h", "l", "a"], {"d": "none", "s": "strong", "e": "emphasis", "m": "monospaced", "h": "header", "l": "literal", "a": "asciidoc"}));
@@ -9831,16 +9895,11 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
               if ($truthy(part)) {
                 if ($truthy(section['$blocks?']()['$!']())) {
                   if ($truthy(new_block.$style()['$!=']("partintro"))) {
-                    if (new_block.$context()['$==']("paragraph")) {
-                      
-                      
-                      $writer = ["open"];
-                      $send(new_block, 'context=', Opal.to_a($writer));
-                      $writer[$rb_minus($writer["length"], 1)];;
+                    if ($truthy((($b = new_block.$style()['$==']("open")) ? new_block.$context()['$==']("open") : new_block.$style()['$==']("open")))) {
                       
                       $writer = ["partintro"];
                       $send(new_block, 'style=', Opal.to_a($writer));
-                      $writer[$rb_minus($writer["length"], 1)];;
+                      $writer[$rb_minus($writer["length"], 1)];
                     } else {
                       
                       
@@ -9852,7 +9911,16 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
                       $send(intro, 'style=', Opal.to_a($writer));
                       $writer[$rb_minus($writer["length"], 1)];;
                       section.$blocks()['$<<'](intro);
-                    }}
+                    }
+                  } else if (new_block.$content_model()['$==']("simple")) {
+                    
+                    
+                    $writer = ["compound"];
+                    $send(new_block, 'content_model=', Opal.to_a($writer));
+                    $writer[$rb_minus($writer["length"], 1)];;
+                    new_block['$<<']($$($nesting, '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 (section.$blocks().$size()['$=='](1)) {
                   
                   first_block = section.$blocks()['$[]'](0);
@@ -9864,12 +9932,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
                     $writer = [(intro = $$($nesting, 'Block').$new(section, "open", $hash2(["content_model"], {"content_model": "compound"})))];
                     $send(new_block, 'parent=', Opal.to_a($writer));
                     $writer[$rb_minus($writer["length"], 1)];;
-                    
-                    $writer = ["partintro"];
-                    $send(intro, 'style=', Opal.to_a($writer));
-                    $writer[$rb_minus($writer["length"], 1)];;
-                    section.$blocks().$shift();
-                    if (first_block.$style()['$==']("partintro")) {
+                    if (first_block.$style()['$==']((($writer = ["partintro"]), $send(intro, 'style=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]))) {
                       
                       
                       $writer = ["paragraph"];
@@ -9879,6 +9942,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
                       $writer = [nil];
                       $send(first_block, 'style=', Opal.to_a($writer));
                       $writer[$rb_minus($writer["length"], 1)];;};
+                    section.$blocks().$shift();
                     intro['$<<'](first_block);
                     section.$blocks()['$<<'](intro);};}};
               ($truthy($b = intro) ? $b : section).$blocks()['$<<'](new_block);
@@ -9981,6 +10045,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
             if ($truthy(($truthy($b = ($truthy($c = style) ? $$($nesting, 'Compliance').$strict_verbatim_paragraphs() : $c)) ? $$($nesting, 'VERBATIM_STYLES')['$include?'](style) : $b))) {
               
               block_context = style.$to_sym();
+              cloaked_context = "paragraph";
               reader.$unshift_line(this_line);
               break;;};
             if ($truthy(text_only)) {
@@ -10347,7 +10412,11 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
         } else {
           $case = block_context;
           if ("listing"['$===']($case) || "source"['$===']($case)) {
-          if ($truthy(($truthy($a = block_context['$==']("source")) ? $a : ($truthy($b = attributes['$[]'](1)['$!']()) ? (language = ($truthy($c = attributes['$[]'](2)) ? $c : doc_attrs['$[]']("source-language"))) : $b)))) {
+          if ($truthy(($truthy($a = block_context['$==']("source")) ? $a : (language = (function() {if ($truthy(attributes['$[]'](1))) {
+            return nil
+          } else {
+            return ($truthy($b = attributes['$[]'](2)) ? $b : doc_attrs['$[]']("source-language"))
+          }; return nil; })())))) {
             
             if ($truthy(language)) {
               
@@ -10369,6 +10438,13 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
                 $writer = ["language", doc_attrs['$[]']("source-language")];
                 $send(attributes, '[]=', Opal.to_a($writer));
                 $writer[$rb_minus($writer["length"], 1)];};
+              if (cloaked_context['$==']("listing")) {
+              } else {
+                
+                $writer = ["cloaked-context", cloaked_context];
+                $send(attributes, '[]=', Opal.to_a($writer));
+                $writer[$rb_minus($writer["length"], 1)];
+              };
             };
             if ($truthy(attributes['$key?']("linenums"))) {
             } else if ($truthy(($truthy($a = attributes['$[]']("linenums-option")) ? $a : doc_attrs['$[]']("source-linenums-option")))) {
@@ -10418,6 +10494,10 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
             $send(attributes, '[]=', Opal.to_a($writer));
             $writer[$rb_minus($writer["length"], 1)];
           };
+          
+          $writer = ["cloaked-context", cloaked_context];
+          $send(attributes, '[]=', Opal.to_a($writer));
+          $writer[$rb_minus($writer["length"], 1)];;
           if ($truthy(attributes['$key?']("linenums"))) {
           } else if ($truthy(($truthy($a = attributes['$[]']("linenums-option")) ? $a : doc_attrs['$[]']("source-linenums-option")))) {
             
@@ -10812,8 +10892,9 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
                   reftext = reftext.$gsub("\\]", "]");
                   if ($truthy(reftext['$include?']($$($nesting, 'ATTR_REF_HEAD')))) {
                     reftext = document.$sub_attributes(reftext)};
-                } else if ($truthy(($truthy($b = reftext['$include?']($$($nesting, 'ATTR_REF_HEAD'))) ? (reftext = document.$sub_attributes(reftext))['$empty?']() : $b))) {
-                  return nil;}};
+                } else if ($truthy(reftext['$include?']($$($nesting, 'ATTR_REF_HEAD')))) {
+                  if ($truthy((reftext = document.$sub_attributes(reftext))['$empty?']())) {
+                    reftext = nil}}};
             };
             if ($truthy(document.$register("refs", [id, $$($nesting, 'Inline').$new(block, "anchor", reftext, $hash2(["type", "id"], {"type": "ref", "id": id}))]))) {
               return nil
@@ -11037,7 +11118,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
         };
       }, $Parser_parse_list_item$27.$$arity = -5);
       Opal.defs(self, '$read_lines_for_list_item', $Parser_read_lines_for_list_item$28 = function $$read_lines_for_list_item(reader, list_type, sibling_trait, has_text) {
-        var $a, $b, $c, $$29, $$30, $$31, $$32, $$33, self = this, buffer = nil, continuation = nil, within_nested_list = nil, detached_continuation = nil, dlist = nil, this_line = nil, prev_line = nil, $writer = nil, match = nil, nested_list_type = nil, last_line = nil;
+        var $a, $b, $c, $d, $$29, $$30, $$31, $$32, $$33, self = this, buffer = nil, continuation = nil, within_nested_list = nil, detached_continuation = nil, dlist = nil, this_line = nil, prev_line = nil, $writer = nil, match = nil, block_attribute_lines = nil, next_line = nil, interrupt = nil, ch0 = nil, nested_list_type = nil, last_line = nil;
 
         
         
@@ -11058,12 +11139,14 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
           this_line = reader.$read_line();
           if ($truthy(self['$is_sibling_list_item?'](this_line, list_type, sibling_trait))) {
             break;};
+          if (this_line['$==']($$($nesting, 'LIST_CONTINUATION'))) {
+            this_line = $$($nesting, 'ListContinuationString')};
           prev_line = (function() {if ($truthy(buffer['$empty?']())) {
             return nil
           } else {
             return buffer['$[]'](-1)
           }; return nil; })();
-          if (prev_line['$==']($$($nesting, 'LIST_CONTINUATION'))) {
+          if ($truthy($$($nesting, 'ListContinuationMarker')['$==='](prev_line))) {
             
             if (continuation['$==']("inactive")) {
               
@@ -11072,11 +11155,11 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
               if ($truthy(within_nested_list)) {
               } else {
                 
-                $writer = [-1, ""];
+                $writer = [-1, $$($nesting, 'ListContinuationPlaceholder')];
                 $send(buffer, '[]=', Opal.to_a($writer));
                 $writer[$rb_minus($writer["length"], 1)];
               };};
-            if (this_line['$==']($$($nesting, 'LIST_CONTINUATION'))) {
+            if ($truthy($$($nesting, 'ListContinuationMarker')['$==='](this_line))) {
               
               if ($truthy(continuation['$!=']("frozen"))) {
                 
@@ -11085,16 +11168,37 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
               this_line = nil;
               continue;;};};
           if ($truthy((match = self['$is_delimited_block?'](this_line, true)))) {
+            
             if (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 {
               break;
-            }
-          } else if ($truthy(($truthy($b = ($truthy($c = dlist) ? continuation['$!=']("active") : $c)) ? $$($nesting, 'BlockAttributeLineRx')['$match?'](this_line) : $b))) {
-            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(($truthy($b = ($truthy($c = ($truthy($d = dlist) ? continuation['$!=']("active") : $d)) ? this_line['$start_with?']("[") : $c)) ? $$($nesting, 'BlockAttributeLineRx')['$match?'](this_line) : $b))) {
+            
+            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(($truthy($c = next_line['$empty?']()) ? $c : ($truthy($d = next_line['$start_with?']("[")) ? $$($nesting, 'BlockAttributeLineRx')['$match?'](next_line) : $d)))) {
+                
+                block_attribute_lines['$<<'](reader.$read_line());
+                continue;;
+              } else if ($truthy(($truthy($c = $$($nesting, 'AnyListRx')['$match?'](next_line)) ? self['$is_sibling_list_item?'](next_line, list_type, sibling_trait)['$!']() : $c))) {
+                buffer.$concat(block_attribute_lines)
+              } else {
+                interrupt = true
+              };
+              break;;
+            };
+            if ($truthy(interrupt)) {
+              
+              this_line = nil;
+              reader.$unshift_lines(block_attribute_lines);
+              break;;};
           } else if ($truthy((($b = continuation['$==']("active")) ? this_line['$empty?']()['$!']() : continuation['$==']("active")))) {
             if ($truthy($$($nesting, 'LiteralParagraphRx')['$match?'](this_line))) {
               
@@ -11112,7 +11216,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
                 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(($truthy($b = ($truthy($c = $$($nesting, 'BlockTitleRx')['$match?'](this_line)) ? $c : $$($nesting, 'BlockAttributeLineRx')['$match?'](this_line))) ? $b : $$($nesting, 'AttributeEntryRx')['$match?'](this_line)))) {
+            } else if ($truthy(($truthy($b = ($truthy($c = (($d = (ch0 = this_line.$chr())['$=='](".")) ? $$($nesting, 'BlockTitleRx')['$match?'](this_line) : (ch0 = this_line.$chr())['$==']("."))) ? $c : (($d = ch0['$==']("[")) ? $$($nesting, 'BlockAttributeLineRx')['$match?'](this_line) : ch0['$==']("[")))) ? $b : (($c = ch0['$=='](":")) ? $$($nesting, 'AttributeEntryRx')['$match?'](this_line) : ch0['$=='](":"))))) {
               buffer['$<<'](this_line)
             } else {
               
@@ -11127,7 +11231,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
                 if (ctx == null) {
                   ctx = nil;
                 };
-                return $$($nesting, 'ListRxMap')['$[]'](ctx)['$match?'](this_line);}, $$30.$$s = self, $$30.$$arity = 1, $$30))))) {
+                return $$($nesting, 'ListRxMap')['$[]'](ctx)['$=~'](this_line);}, $$30.$$s = self, $$30.$$arity = 1, $$30))))) {
                 
                 within_nested_list = true;
                 if ($truthy((($b = nested_list_type['$==']("dlist")) ? (($c = $gvars['~']) === nil ? nil : $c['$[]'](3))['$nil_or_empty?']() : nested_list_type['$==']("dlist")))) {
@@ -11148,7 +11252,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
             if (this_line['$==']($$($nesting, 'LIST_CONTINUATION'))) {
               
               detached_continuation = buffer.$size();
-              buffer['$<<'](this_line);
+              buffer['$<<']($$($nesting, 'ListContinuationString'));
             } else if ($truthy(has_text)) {
               if ($truthy(self['$is_sibling_list_item?'](this_line, list_type, sibling_trait))) {
                 break;
@@ -11192,6 +11296,10 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
               buffer['$<<'](this_line);
               has_text = true;
             };
+          } else if ($truthy($$($nesting, 'ListContinuationMarker')['$==='](this_line))) {
+            
+            has_text = true;
+            buffer['$<<'](this_line);
           } else {
             
             if ($truthy(this_line['$empty?']())) {
@@ -11222,17 +11330,18 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
           reader.$unshift_line(this_line)};
         if ($truthy(detached_continuation)) {
           
-          $writer = [detached_continuation, ""];
+          $writer = [detached_continuation, $$($nesting, 'ListContinuationPlaceholder')];
           $send(buffer, '[]=', Opal.to_a($writer));
           $writer[$rb_minus($writer["length"], 1)];};
         while (!($truthy(buffer['$empty?']()))) {
-          if ($truthy((last_line = buffer['$[]'](-1))['$empty?']())) {
-            buffer.$pop()
-          } else {
+          if ($truthy($$($nesting, 'ListContinuationMarker')['$===']((last_line = buffer['$[]'](-1))))) {
             
-            if (last_line['$==']($$($nesting, 'LIST_CONTINUATION'))) {
-              buffer.$pop()};
+            buffer.$pop();
             break;;
+          } else if ($truthy(last_line['$empty?']())) {
+            buffer.$pop()
+          } else {
+            break;
           }
         };
         return buffer;
@@ -12231,6 +12340,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
             }
           };
         };
+        parser_ctx.$close_table();
         if ($truthy(($truthy($a = (($logical_op_recvr_tmp_2 = table.$attributes()), ($truthy($b = $logical_op_recvr_tmp_2['$[]']("colcount")) ? $b : (($writer = ["colcount", table.$columns().$size()]), $send($logical_op_recvr_tmp_2, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)])))['$=='](0)) ? $a : explicit_colspecs))) {
         } else {
           table.$assign_column_widths()
@@ -12719,7 +12829,7 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
     (function($base, $super, $parent_nesting) {
       var self = $klass($base, $super, 'PathResolver');
 
-      var $nesting = [self].concat($parent_nesting), $PathResolver_initialize$1, $PathResolver_absolute_path$ques$2, $a, $PathResolver_root$ques$3, $PathResolver_unc$ques$4, $PathResolver_web_root$ques$5, $PathResolver_descends_from$ques$6, $PathResolver_relative_path$7, $PathResolver_posixify$8, $PathResolver_expand_path$9, $PathResolver_partition_path$11, $PathResolver_join_path$12, $PathResolver_system_path$13, $PathResolver_web_path$16, $PathResolver_extract_uri_prefix$18;
+      var $nesting = [self].concat($parent_nesting), $PathResolver_initialize$1, $PathResolver_absolute_path$ques$2, $a, $PathResolver_root$ques$3, $PathResolver_root$ques$4, $PathResolver_unc$ques$5, $PathResolver_web_root$ques$6, $PathResolver_descends_from$ques$7, $PathResolver_relative_path$8, $PathResolver_posixify$9, $PathResolver_expand_path$10, $PathResolver_partition_path$12, $PathResolver_join_path$13, $PathResolver_system_path$14, $PathResolver_web_path$17, $PathResolver_extract_uri_prefix$19;
 
       self.$$prototype.file_separator = self.$$prototype._partition_path_web = self.$$prototype._partition_path_sys = self.$$prototype.working_dir = nil;
       
@@ -12730,6 +12840,7 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
       Opal.const_set($nesting[0], 'SLASH', "/");
       Opal.const_set($nesting[0], 'BACKSLASH', "\\");
       Opal.const_set($nesting[0], 'DOUBLE_SLASH', "//");
+      Opal.const_set($nesting[0], 'URI_CLASSLOADER', "uri:classloader:");
       Opal.const_set($nesting[0], 'WindowsRootRx', /^(?:[a-zA-Z]:)?[\\\/]/);
       self.$attr_accessor("file_separator");
       self.$attr_accessor("working_dir");
@@ -12775,23 +12886,30 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
 
           return ($truthy($a = self['$absolute_path?'](path)) ? $a : path['$start_with?']("file://", "http://", "https://"))
         }, $PathResolver_root$ques$3.$$arity = 1)
+      } else if ($$$('::', 'RUBY_ENGINE')['$==']("jruby")) {
+        
+        Opal.def(self, '$root?', $PathResolver_root$ques$4 = function(path) {
+          var $a, self = this;
+
+          return ($truthy($a = self['$absolute_path?'](path)) ? $a : path['$start_with?']($$($nesting, 'URI_CLASSLOADER')))
+        }, $PathResolver_root$ques$4.$$arity = 1)
       } else {
         Opal.alias(self, "root?", "absolute_path?")
       };
       
-      Opal.def(self, '$unc?', $PathResolver_unc$ques$4 = function(path) {
+      Opal.def(self, '$unc?', $PathResolver_unc$ques$5 = function(path) {
         var self = this;
 
         return path['$start_with?']($$($nesting, 'DOUBLE_SLASH'))
-      }, $PathResolver_unc$ques$4.$$arity = 1);
+      }, $PathResolver_unc$ques$5.$$arity = 1);
       
-      Opal.def(self, '$web_root?', $PathResolver_web_root$ques$5 = function(path) {
+      Opal.def(self, '$web_root?', $PathResolver_web_root$ques$6 = function(path) {
         var self = this;
 
         return path['$start_with?']($$($nesting, 'SLASH'))
-      }, $PathResolver_web_root$ques$5.$$arity = 1);
+      }, $PathResolver_web_root$ques$6.$$arity = 1);
       
-      Opal.def(self, '$descends_from?', $PathResolver_descends_from$ques$6 = function(path, base) {
+      Opal.def(self, '$descends_from?', $PathResolver_descends_from$ques$7 = function(path, base) {
         var $a, self = this;
 
         if (base['$=='](path)) {
@@ -12801,9 +12919,9 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
         } else {
           return ($truthy($a = path['$start_with?']($rb_plus(base, $$($nesting, 'SLASH')))) ? $rb_plus(base.$length(), 1) : $a)
         }
-      }, $PathResolver_descends_from$ques$6.$$arity = 2);
+      }, $PathResolver_descends_from$ques$7.$$arity = 2);
       
-      Opal.def(self, '$relative_path', $PathResolver_relative_path$7 = function $$relative_path(path, base) {
+      Opal.def(self, '$relative_path', $PathResolver_relative_path$8 = function $$relative_path(path, base) {
         var self = this, offset = nil;
 
         if ($truthy(self['$root?'](path))) {
@@ -12824,9 +12942,9 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
         } else {
           return path
         }
-      }, $PathResolver_relative_path$7.$$arity = 2);
+      }, $PathResolver_relative_path$8.$$arity = 2);
       
-      Opal.def(self, '$posixify', $PathResolver_posixify$8 = function $$posixify(path) {
+      Opal.def(self, '$posixify', $PathResolver_posixify$9 = function $$posixify(path) {
         var $a, self = this;
 
         if ($truthy(path)) {
@@ -12839,18 +12957,18 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
         } else {
           return ""
         }
-      }, $PathResolver_posixify$8.$$arity = 1);
+      }, $PathResolver_posixify$9.$$arity = 1);
       Opal.alias(self, "posixfy", "posixify");
       
-      Opal.def(self, '$expand_path', $PathResolver_expand_path$9 = function $$expand_path(path) {
-        var $a, $b, $$10, self = this, path_segments = nil, path_root = nil, resolved_segments = nil;
+      Opal.def(self, '$expand_path', $PathResolver_expand_path$10 = function $$expand_path(path) {
+        var $a, $b, $$11, self = this, path_segments = nil, path_root = nil, resolved_segments = nil;
 
         
         $b = self.$partition_path(path), $a = Opal.to_ary($b), (path_segments = ($a[0] == null ? nil : $a[0])), (path_root = ($a[1] == null ? nil : $a[1])), $b;
         if ($truthy(path['$include?']($$($nesting, 'DOT_DOT')))) {
           
           resolved_segments = [];
-          $send(path_segments, 'each', [], ($$10 = function(segment){var self = $$10.$$s || this;
+          $send(path_segments, 'each', [], ($$11 = function(segment){var self = $$11.$$s || this;
 
           
             
@@ -12861,14 +12979,14 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
               return resolved_segments.$pop()
             } else {
               return resolved_segments['$<<'](segment)
-            };}, $$10.$$s = self, $$10.$$arity = 1, $$10));
+            };}, $$11.$$s = self, $$11.$$arity = 1, $$11));
           return self.$join_path(resolved_segments, path_root);
         } else {
           return self.$join_path(path_segments, path_root)
         };
-      }, $PathResolver_expand_path$9.$$arity = 1);
+      }, $PathResolver_expand_path$10.$$arity = 1);
       
-      Opal.def(self, '$partition_path', $PathResolver_partition_path$11 = function $$partition_path(path, web) {
+      Opal.def(self, '$partition_path', $PathResolver_partition_path$12 = function $$partition_path(path, web) {
         var self = this, result = nil, cache = nil, posix_path = nil, root = nil, path_segments = nil, $writer = nil;
 
         
@@ -12893,6 +13011,8 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
             root = $$($nesting, 'DOUBLE_SLASH')
           } else if ($truthy(posix_path['$start_with?']($$($nesting, 'SLASH')))) {
             root = $$($nesting, 'SLASH')
+          } else if ($truthy(posix_path['$start_with?']($$($nesting, 'URI_CLASSLOADER')))) {
+            root = posix_path.$slice(0, $$($nesting, 'URI_CLASSLOADER').$length())
           } else {
             root = posix_path.$slice(0, $rb_plus(posix_path.$index($$($nesting, 'SLASH')), 1))
           }
@@ -12909,9 +13029,9 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
         $writer = [path, [path_segments, root]];
         $send(cache, '[]=', Opal.to_a($writer));
         return $writer[$rb_minus($writer["length"], 1)];;
-      }, $PathResolver_partition_path$11.$$arity = -2);
+      }, $PathResolver_partition_path$12.$$arity = -2);
       
-      Opal.def(self, '$join_path', $PathResolver_join_path$12 = function $$join_path(segments, root) {
+      Opal.def(self, '$join_path', $PathResolver_join_path$13 = function $$join_path(segments, root) {
         var self = this;
 
         
@@ -12925,10 +13045,10 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
           
           return segments.$join($$($nesting, 'SLASH'));
         };
-      }, $PathResolver_join_path$12.$$arity = -2);
+      }, $PathResolver_join_path$13.$$arity = -2);
       
-      Opal.def(self, '$system_path', $PathResolver_system_path$13 = function $$system_path(target, start, jail, opts) {
-        var $a, $b, $$14, $$15, self = this, target_path = nil, target_segments = nil, jail_segments = nil, jail_root = nil, recheck = nil, start_segments = nil, start_root = nil, resolved_segments = nil, unresolved_segments = nil, warned = nil;
+      Opal.def(self, '$system_path', $PathResolver_system_path$14 = function $$system_path(target, start, jail, opts) {
+        var $a, $b, $$15, $$16, self = this, target_path = nil, target_segments = nil, jail_segments = nil, jail_root = nil, recheck = nil, start_segments = nil, start_root = nil, resolved_segments = nil, unresolved_segments = nil, warned = nil;
 
         
         
@@ -13019,7 +13139,7 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
               $b = self.$partition_path(jail), $a = Opal.to_ary($b), (jail_segments = ($a[0] == null ? nil : $a[0])), $b
             };
             warned = false;
-            $send(unresolved_segments, 'each', [], ($$14 = function(segment){var self = $$14.$$s || this, $c;
+            $send(unresolved_segments, 'each', [], ($$15 = function(segment){var self = $$15.$$s || this, $c;
 
             
               
@@ -13042,9 +13162,9 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
                 }
               } else {
                 return resolved_segments['$<<'](segment)
-              };}, $$14.$$s = self, $$14.$$arity = 1, $$14));
+              };}, $$15.$$s = self, $$15.$$arity = 1, $$15));
           } else {
-            $send(unresolved_segments, 'each', [], ($$15 = function(segment){var self = $$15.$$s || this;
+            $send(unresolved_segments, 'each', [], ($$16 = function(segment){var self = $$16.$$s || this;
 
             
               
@@ -13055,7 +13175,7 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
                 return resolved_segments.$pop()
               } else {
                 return resolved_segments['$<<'](segment)
-              };}, $$15.$$s = self, $$15.$$arity = 1, $$15))
+              };}, $$16.$$s = self, $$16.$$arity = 1, $$16))
           };};
         if ($truthy(recheck)) {
           
@@ -13076,10 +13196,10 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
         } else {
           return self.$join_path(resolved_segments, jail_root)
         };
-      }, $PathResolver_system_path$13.$$arity = -2);
+      }, $PathResolver_system_path$14.$$arity = -2);
       
-      Opal.def(self, '$web_path', $PathResolver_web_path$16 = function $$web_path(target, start) {
-        var $a, $b, $$17, self = this, uri_prefix = nil, target_segments = nil, target_root = nil, resolved_segments = nil, resolved_path = nil;
+      Opal.def(self, '$web_path', $PathResolver_web_path$17 = function $$web_path(target, start) {
+        var $a, $b, $$18, self = this, uri_prefix = nil, target_segments = nil, target_root = nil, resolved_segments = nil, resolved_path = nil;
 
         
         
@@ -13098,7 +13218,7 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
         };
         $b = self.$partition_path(target, true), $a = Opal.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', [], ($$17 = function(segment){var self = $$17.$$s || this, $c;
+        $send(target_segments, 'each', [], ($$18 = function(segment){var self = $$18.$$s || this, $c;
 
         
           
@@ -13119,7 +13239,7 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
             }
           } else {
             return resolved_segments['$<<'](segment)
-          };}, $$17.$$s = self, $$17.$$arity = 1, $$17));
+          };}, $$18.$$s = self, $$18.$$arity = 1, $$18));
         if ($truthy((resolved_path = self.$join_path(resolved_segments, target_root))['$include?'](" "))) {
           resolved_path = resolved_path.$gsub(" ", "%20")};
         if ($truthy(uri_prefix)) {
@@ -13127,9 +13247,9 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
         } else {
           return resolved_path
         };
-      }, $PathResolver_web_path$16.$$arity = -2);
+      }, $PathResolver_web_path$17.$$arity = -2);
       self.$private();
-      return (Opal.def(self, '$extract_uri_prefix', $PathResolver_extract_uri_prefix$18 = function $$extract_uri_prefix(str) {
+      return (Opal.def(self, '$extract_uri_prefix', $PathResolver_extract_uri_prefix$19 = function $$extract_uri_prefix(str) {
         var $a, self = this;
 
         if ($truthy(($truthy($a = str['$include?'](":")) ? $$($nesting, 'UriSniffRx')['$=~'](str) : $a))) {
@@ -13137,7 +13257,7 @@ Opal.modules["asciidoctor/path_resolver"] = function(Opal) {
         } else {
           return str
         }
-      }, $PathResolver_extract_uri_prefix$18.$$arity = 1), nil) && 'extract_uri_prefix';
+      }, $PathResolver_extract_uri_prefix$19.$$arity = 1), nil) && 'extract_uri_prefix';
     })($nesting[0], null, $nesting)
   })($nesting[0], $nesting)
 };
@@ -13164,7 +13284,7 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
   }
   var self = Opal.top, $nesting = [], nil = Opal.nil, $$$ = Opal.const_get_qualified, $$ = Opal.const_get_relative, $breaker = Opal.breaker, $slice = Opal.slice, $module = Opal.module, $klass = Opal.klass, $hash2 = Opal.hash2, $truthy = Opal.truthy, $send = Opal.send, $gvars = Opal.gvars, $hash = Opal.hash;
 
-  Opal.add_stubs(['$include', '$attr_reader', '$+', '$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?', '$join', '$read_lines', '$unshift', '$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!', '$>=', '$nil?', '$extensions?', '$include_processors?', '$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', '$replace_next_line', '$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', '$+', '$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?', '$join', '$read_lines', '$unshift', '$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!', '$>=', '$nil?', '$extensions?', '$include_processors?', '$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', '$replace_next_line', '$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');
 
@@ -13309,26 +13429,31 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
       }, $Reader_next_line_empty$ques$7.$$arity = 0);
       
       Opal.def(self, '$peek_line', $Reader_peek_line$8 = function $$peek_line(direct) {
-        var $a, self = this, line = nil;
+        var $a, $b, self = this, next_line = nil, line = nil;
 
         
         
         if (direct == null) {
           direct = false;
         };
-        if ($truthy(($truthy($a = direct) ? $a : $rb_gt(self.look_ahead, 0)))) {
-          if ($truthy(self.unescape_next_line)) {
-            
-            return (line = self.lines['$[]'](-1)).$slice(1, line.$length());
-          } else {
-            return self.lines['$[]'](-1)
-          }
-        } else if ($truthy(self.lines['$empty?']())) {
+        while ($truthy(true)) {
           
-          self.look_ahead = 0;
-          return nil;
-        } else {
-          return ($truthy($a = self.$process_line(self.lines['$[]'](-1))) ? $a : self.$peek_line())
+          next_line = self.lines['$[]'](-1);
+          if ($truthy(($truthy($b = direct) ? $b : $rb_gt(self.look_ahead, 0)))) {
+            return (function() {if ($truthy(self.unescape_next_line)) {
+              
+              return next_line.$slice(1, next_line.$length());
+            } else {
+              return next_line
+            }; return nil; })()
+          } else if ($truthy(next_line)) {
+            if ($truthy((line = self.$process_line(next_line)))) {
+              return line}
+          } else {
+            
+            self.look_ahead = 0;
+            return nil;
+          };
         };
       }, $Reader_peek_line$8.$$arity = -1);
       
@@ -13822,7 +13947,7 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
 
       var $nesting = [self].concat($parent_nesting), $PreprocessorReader_initialize$47, $PreprocessorReader_has_more_lines$ques$48, $PreprocessorReader_empty$ques$49, $PreprocessorReader_peek_line$50, $PreprocessorReader_push_include$51, $PreprocessorReader_include_depth$52, $PreprocessorReader_exceeds_max_depth$ques$53, $PreprocessorReader_shift$54, $PreprocessorReader_include_processors$ques$55, $PreprocessorReader_create_include_cursor$56, $PreprocessorReader_to_s$57, $PreprocessorReader_prepare_lines$59, $PreprocessorReader_process_line$60, $PreprocessorReader_preprocess_conditional_directive$61, $PreprocessorReader_preprocess_include_directive$66, $PreprocessorReader_resolve_include_path$80, $PreprocessorReader_pop_include$82, $PreprocessorReader_split_delimited_value$83, $PreprocessorReader_skip_front_matter$excl$84, $PreprocessorReader_resolve_expr_val$85;
 
-      self.$$prototype.include_stack = self.$$prototype.lines = self.$$prototype.file = self.$$prototype.dir = self.$$prototype.path = self.$$prototype.lineno = self.$$prototype.maxdepth = self.$$prototype.process_lines = self.$$prototype.includes = self.$$prototype.document = self.$$prototype.unescape_next_line = self.$$prototype.include_processor_extensions = self.$$prototype.look_ahead = self.$$prototype.skipping = self.$$prototype.conditional_stack = nil;
+      self.$$prototype.include_stack = self.$$prototype.lines = self.$$prototype.file = self.$$prototype.dir = self.$$prototype.path = self.$$prototype.lineno = self.$$prototype.maxdepth = self.$$prototype.process_lines = self.$$prototype.includes = self.$$prototype.document = self.$$prototype.unescape_next_line = self.$$prototype.include_processor_extensions = self.$$prototype.skipping = self.$$prototype.look_ahead = self.$$prototype.conditional_stack = nil;
       
       self.$attr_reader("include_stack");
       
@@ -13943,27 +14068,21 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
           };
           self.path = (path = ($truthy($a = path) ? $a : $$$('::', 'File').$basename(file)));
           if ($truthy((self.process_lines = $send(file, 'end_with?', Opal.to_a($$($nesting, 'ASCIIDOC_EXTENSIONS').$keys()))))) {
-            
-            $writer = [path.$slice(0, path.$rindex(".")), (function() {if ($truthy(attributes['$[]']("partial-option"))) {
+            ($truthy($a = self.includes['$[]'](path.$slice(0, path.$rindex(".")))) ? $a : (($writer = [path.$slice(0, path.$rindex(".")), (function() {if ($truthy(attributes['$[]']("partial-option"))) {
               return nil
             } else {
               return true
-            }; return nil; })()];
-            $send(self.includes, '[]=', Opal.to_a($writer));
-            $writer[$rb_minus($writer["length"], 1)];};
+            }; return nil; })()]), $send(self.includes, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]))};
         } else {
           
           self.dir = ".";
           self.process_lines = true;
           if ($truthy((self.path = path))) {
-            
-            $writer = [$$($nesting, 'Helpers').$rootname(path), (function() {if ($truthy(attributes['$[]']("partial-option"))) {
+            ($truthy($a = self.includes['$[]']($$($nesting, 'Helpers').$rootname(path))) ? $a : (($writer = [$$($nesting, 'Helpers').$rootname(path), (function() {if ($truthy(attributes['$[]']("partial-option"))) {
               return nil
             } else {
               return true
-            }; return nil; })()];
-            $send(self.includes, '[]=', Opal.to_a($writer));
-            $writer[$rb_minus($writer["length"], 1)];
+            }; return nil; })()]), $send(self.includes, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]))
           } else {
             self.path = "<stdin>"
           };
@@ -14114,6 +14233,10 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
         };
         if ($truthy(line['$empty?']())) {
           
+          if ($truthy(self.skipping)) {
+            
+            self.$shift();
+            return nil;};
           self.look_ahead = $rb_plus(self.look_ahead, 1);
           return line;};
         if ($truthy(($truthy($a = ($truthy($b = line['$end_with?']("]")) ? line['$start_with?']("[")['$!']() : $b)) ? line['$include?']("::") : $a))) {
@@ -14345,7 +14468,10 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
           ext.$process_method()['$[]'](doc, self, expanded_target, doc.$parse_attributes(attrlist, [], $hash2(["sub_input"], {"sub_input": true})));
           return true;
         } else if ($truthy($rb_ge(doc.$safe(), $$$($$($nesting, 'SafeMode'), 'SECURE')))) {
-          return self.$replace_next_line("" + "link:" + (expanded_target) + "[]")
+          
+          if ($truthy(expanded_target['$include?'](" "))) {
+            expanded_target = "" + "pass:c[" + (expanded_target) + "]"};
+          return self.$replace_next_line("" + "link:" + (expanded_target) + "[role=include]");
         } else if ($truthy(self.maxdepth)) {
           
           if ($truthy($rb_ge(self.include_stack.$size(), self.maxdepth['$[]']("curr")))) {
@@ -14657,6 +14783,8 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
               self.$push_include(inc_lines, inc_path, relpath, inc_offset, parsed_attrs);};
           } else {
             
+            inc_content = nil;
+            
             try {
               
               inc_content = $send(reader, 'call', [inc_path, read_mode], ($$79 = function(f){var self = $$79.$$s || this;
@@ -14668,7 +14796,6 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
                 };
                 return f.$read();}, $$79.$$s = self, $$79.$$arity = 1, $$79));
               self.$shift();
-              self.$push_include(inc_content, inc_path, relpath, 1, parsed_attrs);
             } catch ($err) {
               if (Opal.rescue($err, [$$($nesting, 'StandardError')])) {
                 try {
@@ -14677,7 +14804,8 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
                   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 {
@@ -14699,7 +14827,10 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
           
           if ($truthy(doc['$attr?']("allow-uri-read"))) {
           } else {
-            return self.$replace_next_line("" + "link:" + (target) + "[" + (attrlist) + "]")
+            
+            if ($truthy(target['$include?'](" "))) {
+              target = "" + "pass:c[" + (target) + "]"};
+            return self.$replace_next_line("" + "link:" + (target) + "[role=include]");
           };
           if ($truthy(doc['$attr?']("cache-uri"))) {
             if ($truthy((($b = $$$('::', 'OpenURI', 'skip_raise')) && ($a = $$$($b, 'Cache', 'skip_raise')) ? 'constant' : nil))) {
@@ -14756,39 +14887,37 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
       }, $PreprocessorReader_split_delimited_value$83.$$arity = 1);
       
       Opal.def(self, '$skip_front_matter!', $PreprocessorReader_skip_front_matter$excl$84 = function(data, increment_linenos) {
-        var $a, $b, self = this, front_matter = nil, original_data = nil;
+        var $a, $b, self = this, delim = nil, original_data = nil, front_matter = nil, eof = nil;
 
         
         
         if (increment_linenos == null) {
           increment_linenos = true;
         };
-        front_matter = nil;
-        if (data['$[]'](0)['$==']("---")) {
+        if ((delim = data['$[]'](0))['$==']("---")) {
+        } else {
+          return nil
+        };
+        original_data = data.$drop(0);
+        data.$shift();
+        front_matter = [];
+        if ($truthy(increment_linenos)) {
+          self.lineno = $rb_plus(self.lineno, 1)};
+        while (!($truthy(($truthy($b = (eof = data['$empty?']())) ? $b : data['$[]'](0)['$=='](delim))))) {
           
-          original_data = data.$drop(0);
-          data.$shift();
-          front_matter = [];
+          front_matter['$<<'](data.$shift());
           if ($truthy(increment_linenos)) {
             self.lineno = $rb_plus(self.lineno, 1)};
-          while ($truthy(($truthy($b = data['$empty?']()['$!']()) ? data['$[]'](0)['$!=']("---") : $b))) {
-            
-            front_matter['$<<'](data.$shift());
-            if ($truthy(increment_linenos)) {
-              self.lineno = $rb_plus(self.lineno, 1)};
-          };
-          if ($truthy(data['$empty?']())) {
-            
-            $send(data, 'unshift', Opal.to_a(original_data));
-            if ($truthy(increment_linenos)) {
-              self.lineno = 0};
-            front_matter = nil;
-          } else {
-            
-            data.$shift();
-            if ($truthy(increment_linenos)) {
-              self.lineno = $rb_plus(self.lineno, 1)};
-          };};
+        };
+        if ($truthy(eof)) {
+          
+          $send(data, 'unshift', Opal.to_a(original_data));
+          if ($truthy(increment_linenos)) {
+            self.lineno = $rb_minus(self.lineno, original_data.$size())};
+          return nil;};
+        data.$shift();
+        if ($truthy(increment_linenos)) {
+          self.lineno = $rb_plus(self.lineno, 1)};
         return front_matter;
       }, $PreprocessorReader_skip_front_matter$excl$84.$$arity = -2);
       return (Opal.def(self, '$resolve_expr_val', $PreprocessorReader_resolve_expr_val$85 = function $$resolve_expr_val(val) {
@@ -15208,7 +15337,7 @@ Opal.modules["asciidoctor/table"] = function(Opal) {
   }
   var self = Opal.top, $nesting = [], nil = Opal.nil, $$$ = Opal.const_get_qualified, $$ = Opal.const_get_relative, $breaker = Opal.breaker, $slice = Opal.slice, $module = Opal.module, $klass = Opal.klass, $hash2 = Opal.hash2, $send = Opal.send, $truthy = Opal.truthy, $gvars = Opal.gvars;
 
-  Opal.add_stubs(['$attr_accessor', '$attr_reader', '$new', '$[]', '$>', '$to_i', '$<', '$==', '$[]=', '$-', '$attributes', '$truncate', '$*', '$/', '$to_f', '$empty?', '$body', '$each', '$<<', '$size', '$+', '$assign_column_widths', '$warn', '$logger', '$update_attributes', '$assign_width', '$round', '$map', '$shift', '$reinitialize', '$head=', '$nil?', '$unshift', '$pop', '$foot=', '$parent', '$sourcemap', '$dup', '$header_row?', '$table', '$style', '$merge', '$delete', '$===', '$start_with?', '$rstrip', '$slice', '$length', '$advance', '$lstrip', '$strip', '$split', '$include?', '$readlines', '$catalog_inline_anchor', '$=~', '$apply_subs', '$attr_writer', '$convert', '$text', '$!=', '$file', '$lineno', '$include', '$to_set', '$mark', '$key?', '$nested?', '$document', '$error', '$message_with_context', '$cursor_at_prev_line', '$nil_or_empty?', '$escape', '$columns', '$match', '$chop', '$end_with?', '$gsub', '$!', '$push_cellspec', '$cell_open?', '$close_cell', '$take_cellspec', '$squeeze', '$upto', '$times', '$cursor_before_mark', '$rowspan', '$activate_rowspan', '$colspan', '$end_of_row?', '$close_row', '$private', '$rows', '$effective_column_visits']);
+  Opal.add_stubs(['$attr_accessor', '$attr_reader', '$new', '$[]', '$>', '$to_i', '$<', '$==', '$[]=', '$-', '$attributes', '$truncate', '$*', '$/', '$to_f', '$empty?', '$body', '$each', '$<<', '$size', '$+', '$assign_column_widths', '$warn', '$logger', '$update_attributes', '$assign_width', '$round', '$map', '$shift', '$reinitialize', '$head=', '$nil?', '$unshift', '$pop', '$foot=', '$parent', '$sourcemap', '$dup', '$header_row?', '$table', '$style', '$merge', '$delete', '$===', '$start_with?', '$rstrip', '$slice', '$length', '$advance', '$lstrip', '$strip', '$split', '$include?', '$readlines', '$catalog_inline_anchor', '$=~', '$apply_subs', '$attr_writer', '$convert', '$text', '$!=', '$file', '$lineno', '$include', '$to_set', '$mark', '$key?', '$nested?', '$document', '$error', '$message_with_context', '$cursor_at_prev_line', '$nil_or_empty?', '$escape', '$columns', '$match', '$chop', '$end_with?', '$gsub', '$!', '$push_cellspec', '$cell_open?', '$close_cell', '$take_cellspec', '$squeeze', '$upto', '$times', '$cursor_before_mark', '$rowspan', '$activate_rowspan', '$colspan', '$end_of_row?', '$close_row', '$private', '$rows', '$<=>', '$effective_column_visits']);
   return (function($base, $parent_nesting) {
     var self = $module($base, 'Asciidoctor');
 
@@ -15624,7 +15753,7 @@ Opal.modules["asciidoctor/table"] = function(Opal) {
           if ($truthy(inner_document_lines['$empty?']())) {
           } else if ($truthy((unprocessed_line1 = inner_document_lines['$[]'](0))['$include?']("::"))) {
             
-            preprocessed_lines = $$($nesting, 'PreprocessorReader').$new(self.document, [unprocessed_line1]).$readlines();
+            preprocessed_lines = $$($nesting, 'PreprocessorReader').$new(self.document, [unprocessed_line1], inner_document_cursor).$readlines();
             if ($truthy((($a = unprocessed_line1['$=='](preprocessed_lines['$[]'](0))) ? $rb_lt(preprocessed_lines.$size(), 2) : unprocessed_line1['$=='](preprocessed_lines['$[]'](0))))) {
             } else {
               
@@ -15772,9 +15901,9 @@ Opal.modules["asciidoctor/table"] = function(Opal) {
     (function($base, $super, $parent_nesting) {
       var self = $klass($base, $super, 'ParserContext');
 
-      var $nesting = [self].concat($parent_nesting), $ParserContext_initialize$30, $ParserContext_starts_with_delimiter$ques$31, $ParserContext_match_delimiter$32, $ParserContext_skip_past_delimiter$33, $ParserContext_skip_past_escaped_delimiter$34, $ParserContext_buffer_has_unclosed_quotes$ques$35, $ParserContext_take_cellspec$36, $ParserContext_push_cellspec$37, $ParserContext_keep_cell_open$38, $ParserContext_mark_cell_closed$39, $ParserContext_cell_open$ques$40, $ParserContext_cell_closed$ques$41, $ParserContext_close_open_cell$42, $ParserContext_close_cell$43, $ParserContext_close_row$46, $ParserContext_activate_rowspan$47, $ParserContext_end_of_row$ques$49, $ParserContext_effective_column_visits$50, $ParserContext_advance$51;
+      var $nesting = [self].concat($parent_nesting), $ParserContext_initialize$30, $ParserContext_starts_with_delimiter$ques$31, $ParserContext_match_delimiter$32, $ParserContext_skip_past_delimiter$33, $ParserContext_skip_past_escaped_delimiter$34, $ParserContext_buffer_has_unclosed_quotes$ques$35, $ParserContext_take_cellspec$36, $ParserContext_push_cellspec$37, $ParserContext_keep_cell_open$38, $ParserContext_mark_cell_closed$39, $ParserContext_cell_open$ques$40, $ParserContext_cell_closed$ques$41, $ParserContext_close_open_cell$42, $ParserContext_close_cell$43, $ParserContext_close_table$46, $ParserContext_close_row$47, $ParserContext_activate_rowspan$48, $ParserContext_end_of_row$ques$50, $ParserContext_effective_column_visits$51, $ParserContext_advance$52;
 
-      self.$$prototype.delimiter = self.$$prototype.delimiter_rx = self.$$prototype.buffer = self.$$prototype.cellspecs = self.$$prototype.cell_open = self.$$prototype.format = self.$$prototype.start_cursor_data = self.$$prototype.reader = self.$$prototype.table = self.$$prototype.current_row = self.$$prototype.colcount = self.$$prototype.column_visits = self.$$prototype.active_rowspans = self.$$prototype.linenum = nil;
+      self.$$prototype.delimiter = self.$$prototype.delimiter_rx = self.$$prototype.buffer = self.$$prototype.cellspecs = self.$$prototype.cell_open = self.$$prototype.format = self.$$prototype.start_cursor_data = self.$$prototype.reader = self.$$prototype.column_visits = self.$$prototype.table = self.$$prototype.current_row = self.$$prototype.colcount = self.$$prototype.active_rowspans = self.$$prototype.linenum = nil;
       
       self.$include($$($nesting, 'Logging'));
       Opal.const_set($nesting[0], 'FORMATS', ["psv", "csv", "dsv", "tsv"].$to_set());
@@ -15963,8 +16092,7 @@ Opal.modules["asciidoctor/table"] = function(Opal) {
         return nil;
       }, $ParserContext_close_open_cell$42.$$arity = -1);
       
-      Opal.def(self, '$close_cell', $ParserContext_close_cell$43 = function $$close_cell(eol) {try {
-
+      Opal.def(self, '$close_cell', $ParserContext_close_cell$43 = function $$close_cell(eol) {
         var $a, $b, $$44, self = this, cell_text = nil, cellspec = nil, repeat = nil, q = nil;
 
         
@@ -16003,7 +16131,7 @@ Opal.modules["asciidoctor/table"] = function(Opal) {
               cell_text = cell_text.$squeeze(q)
             }};
         };
-        $send((1), 'upto', [repeat], ($$44 = function(i){var self = $$44.$$s || this, $c, $d, $$45, $e, column = nil, extra_cols = nil, offset = nil, cell = nil;
+        $send((1), 'upto', [repeat], ($$44 = function(i){var self = $$44.$$s || this, $c, $d, $$45, $e, column = nil, extra_cols = nil, offset = nil, cell = nil, cursor_before_mark = nil, row_status = nil;
           if (self.colcount == null) self.colcount = nil;
           if (self.table == null) self.table = nil;
           if (self.current_row == null) self.current_row = nil;
@@ -16031,13 +16159,10 @@ Opal.modules["asciidoctor/table"] = function(Opal) {
                   j = nil;
                 };
                 return self.table.$columns()['$<<']($$$($$($nesting, 'Table'), 'Column').$new(self.table, $rb_plus(offset, j)));}, $$45.$$s = self, $$45.$$arity = 1, $$45));};
-          } else if ($truthy((column = self.table.$columns()['$[]'](self.current_row.$size())))) {
           } else {
-            
-            self.$logger().$error(self.$message_with_context("dropping cell because it exceeds specified number of columns", $hash2(["source_location"], {"source_location": self.reader.$cursor_before_mark()})));
-            Opal.ret(nil);
+            column = self.table.$columns()['$[]'](self.current_row.$size())
           };
-          cell = $$$($$($nesting, 'Table'), 'Cell').$new(column, cell_text, cellspec, $hash2(["cursor"], {"cursor": self.reader.$cursor_before_mark()}));
+          cell = $$$($$($nesting, 'Table'), 'Cell').$new(column, cell_text, cellspec, $hash2(["cursor"], {"cursor": (cursor_before_mark = self.reader.$cursor_before_mark())}));
           self.reader.$mark();
           if ($truthy(($truthy($c = cell.$rowspan()['$!']()) ? $c : cell.$rowspan()['$=='](1)))) {
           } else {
@@ -16045,22 +16170,44 @@ Opal.modules["asciidoctor/table"] = function(Opal) {
           };
           self.column_visits = $rb_plus(self.column_visits, ($truthy($c = cell.$colspan()) ? $c : 1));
           self.current_row['$<<'](cell);
-          if ($truthy(($truthy($c = self['$end_of_row?']()) ? ($truthy($d = ($truthy($e = self.colcount['$!='](-1)) ? $e : $rb_gt(self.linenum, 0))) ? $d : ($truthy($e = eol) ? i['$=='](repeat) : $e)) : $c))) {
-            return self.$close_row()
+          if ($truthy(($truthy($c = $rb_gt((row_status = self['$end_of_row?']()), -1)) ? ($truthy($d = ($truthy($e = self.colcount['$!='](-1)) ? $e : $rb_gt(self.linenum, 0))) ? $d : ($truthy($e = eol) ? i['$=='](repeat) : $e)) : $c))) {
+            if ($truthy($rb_gt(row_status, 0))) {
+              
+              self.$logger().$error(self.$message_with_context("dropping cell because it exceeds specified number of columns", $hash2(["source_location"], {"source_location": cursor_before_mark})));
+              return self.$close_row(true);
+            } else {
+              return self.$close_row()
+            }
           } else {
             return nil
           };}, $$44.$$s = self, $$44.$$arity = 1, $$44));
         self.cell_open = false;
         return nil;
-        } catch ($returner) { if ($returner === Opal.returner) { return $returner.$v } throw $returner; }
       }, $ParserContext_close_cell$43.$$arity = -1);
+      
+      Opal.def(self, '$close_table', $ParserContext_close_table$46 = function $$close_table() {
+        var self = this;
+
+        
+        if (self.column_visits['$=='](0)) {
+          return nil};
+        self.$logger().$error(self.$message_with_context("dropping cells from incomplete row detected end of table", $hash2(["source_location"], {"source_location": self.reader.$cursor_before_mark()})));
+        return nil;
+      }, $ParserContext_close_table$46.$$arity = 0);
       self.$private();
       
-      Opal.def(self, '$close_row', $ParserContext_close_row$46 = function $$close_row() {
+      Opal.def(self, '$close_row', $ParserContext_close_row$47 = function $$close_row(drop) {
         var $a, self = this, $writer = nil;
 
         
-        self.table.$rows().$body()['$<<'](self.current_row);
+        
+        if (drop == null) {
+          drop = false;
+        };
+        if ($truthy(drop)) {
+        } else {
+          self.table.$rows().$body()['$<<'](self.current_row)
+        };
         if (self.colcount['$=='](-1)) {
           self.colcount = self.column_visits};
         self.column_visits = 0;
@@ -16068,13 +16215,13 @@ Opal.modules["asciidoctor/table"] = function(Opal) {
         self.active_rowspans.$shift();
         ($truthy($a = self.active_rowspans['$[]'](0)) ? $a : (($writer = [0, 0]), $send(self.active_rowspans, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]));
         return nil;
-      }, $ParserContext_close_row$46.$$arity = 0);
+      }, $ParserContext_close_row$47.$$arity = -1);
       
-      Opal.def(self, '$activate_rowspan', $ParserContext_activate_rowspan$47 = function $$activate_rowspan(rowspan, colspan) {
-        var $$48, self = this;
+      Opal.def(self, '$activate_rowspan', $ParserContext_activate_rowspan$48 = function $$activate_rowspan(rowspan, colspan) {
+        var $$49, self = this;
 
         
-        $send((1), 'upto', [$rb_minus(rowspan, 1)], ($$48 = function(i){var self = $$48.$$s || this, $a, $writer = nil;
+        $send((1), 'upto', [$rb_minus(rowspan, 1)], ($$49 = function(i){var self = $$49.$$s || this, $a, $writer = nil;
           if (self.active_rowspans == null) self.active_rowspans = nil;
 
         
@@ -16084,26 +16231,30 @@ Opal.modules["asciidoctor/table"] = function(Opal) {
           };
           $writer = [i, $rb_plus(($truthy($a = self.active_rowspans['$[]'](i)) ? $a : 0), colspan)];
           $send(self.active_rowspans, '[]=', Opal.to_a($writer));
-          return $writer[$rb_minus($writer["length"], 1)];}, $$48.$$s = self, $$48.$$arity = 1, $$48));
+          return $writer[$rb_minus($writer["length"], 1)];}, $$49.$$s = self, $$49.$$arity = 1, $$49));
         return nil;
-      }, $ParserContext_activate_rowspan$47.$$arity = 2);
+      }, $ParserContext_activate_rowspan$48.$$arity = 2);
       
-      Opal.def(self, '$end_of_row?', $ParserContext_end_of_row$ques$49 = function() {
-        var $a, self = this;
+      Opal.def(self, '$end_of_row?', $ParserContext_end_of_row$ques$50 = function() {
+        var self = this;
 
-        return ($truthy($a = self.colcount['$=='](-1)) ? $a : self.$effective_column_visits()['$=='](self.colcount))
-      }, $ParserContext_end_of_row$ques$49.$$arity = 0);
+        if (self.colcount['$=='](-1)) {
+          return 0
+        } else {
+          return self.$effective_column_visits()['$<=>'](self.colcount)
+        }
+      }, $ParserContext_end_of_row$ques$50.$$arity = 0);
       
-      Opal.def(self, '$effective_column_visits', $ParserContext_effective_column_visits$50 = function $$effective_column_visits() {
+      Opal.def(self, '$effective_column_visits', $ParserContext_effective_column_visits$51 = function $$effective_column_visits() {
         var self = this;
 
         return $rb_plus(self.column_visits, self.active_rowspans['$[]'](0))
-      }, $ParserContext_effective_column_visits$50.$$arity = 0);
-      return (Opal.def(self, '$advance', $ParserContext_advance$51 = function $$advance() {
+      }, $ParserContext_effective_column_visits$51.$$arity = 0);
+      return (Opal.def(self, '$advance', $ParserContext_advance$52 = function $$advance() {
         var self = this;
 
         return (self.linenum = $rb_plus(self.linenum, 1))
-      }, $ParserContext_advance$51.$$arity = 0), nil) && 'advance';
+      }, $ParserContext_advance$52.$$arity = 0), nil) && 'advance';
     })($$($nesting, 'Table'), null, $nesting);
   })($nesting[0], $nesting)
 };
@@ -16670,7 +16821,7 @@ Opal.modules["asciidoctor/syntax_highlighter/highlightjs"] = function(Opal) {
               return "" + "<script src=\"" + (base_url) + "/languages/" + (lang.$lstrip()) + ".min.js\"></script>\n";}, $$6.$$s = self, $$6.$$arity = 1, $$6)).$join()
           } else {
             return ""
-          }; return nil; })()) + "<script>\n" + "if (!hljs.initHighlighting.called) {\n" + "  hljs.initHighlighting.called = true\n" + "  ;[].slice.call(document.querySelectorAll('pre.highlight > code')).forEach(function (el) { hljs.highlightBlock(el) })\n" + "}\n" + "</script>"
+          }; return nil; })()) + "<script>\n" + "if (!hljs.initHighlighting.called) {\n" + "  hljs.initHighlighting.called = true\n" + "  ;[].slice.call(document.querySelectorAll('pre.highlight > code[data-lang]')).forEach(function (el) { hljs.highlightBlock(el) })\n" + "}\n" + "</script>"
         };
       }, $HighlightJsAdapter_docinfo$5.$$arity = 3), nil) && 'docinfo';
     })($$($nesting, 'SyntaxHighlighter'), $$$($$($nesting, 'SyntaxHighlighter'), 'Base'), $nesting)
@@ -18238,7 +18389,7 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
           
           return syntax_hl.$format(node, lang, opts);
         } else {
-          return $rb_plus($rb_plus(pre_open, ($truthy($a = node.$content()) ? $a : "")), pre_close)
+          return $rb_plus($rb_plus(pre_open, node.$content()), pre_close)
         }; return nil; })()) + "\n" + "</div>\n" + "</div>";
       }, $Html5Converter_convert_listing$26.$$arity = 1);
       
@@ -18370,7 +18521,7 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
         if ((style = node.$style())['$==']("abstract")) {
           if ($truthy((($a = node.$parent()['$=='](node.$document())) ? node.$document().$doctype()['$==']("book") : node.$parent()['$=='](node.$document())))) {
             
-            self.$logger().$warn("abstract block cannot be used in a document without a title when doctype is book. Excluding block content.");
+            self.$logger().$warn("abstract block cannot be used in a document without a doctitle when doctype is book. Excluding block content.");
             return "";
           } else {
             
@@ -19452,7 +19603,7 @@ Opal.modules["asciidoctor/extensions"] = function(Opal) {
   }
   var self = Opal.top, $nesting = [], nil = Opal.nil, $$$ = Opal.const_get_qualified, $$ = Opal.const_get_relative, $breaker = Opal.breaker, $slice = Opal.slice, $module = Opal.module, $klass = Opal.klass, $truthy = Opal.truthy, $hash2 = Opal.hash2, $send = Opal.send, $hash = Opal.hash;
 
-  Opal.add_stubs(['$==', '$[]=', '$config', '$-', '$const_defined?', '$singleton_class?', '$include', '$const_get', '$extend', '$attr_reader', '$merge', '$class', '$update', '$raise', '$document', '$doctype', '$[]', '$+', '$level', '$delete', '$>', '$casecmp', '$new', '$title=', '$sectname=', '$special=', '$fetch', '$numbered=', '$!', '$key?', '$attr?', '$special', '$numbered', '$generate_id', '$title', '$id=', '$update_attributes', '$tr', '$basename', '$create_block', '$assign_caption', '$===', '$parse_blocks', '$empty?', '$include?', '$sub_attributes', '$parse', '$each', '$define_method', '$unshift', '$shift', '$send', '$size', '$binding', '$receiver', '$define_singleton_method', '$instance_exec', '$to_proc', '$call', '$option', '$flatten', '$respond_to?', '$to_s', '$partition', '$to_i', '$<<', '$compact', '$inspect', '$attr_accessor', '$to_set', '$match?', '$resolve_regexp', '$method', '$register', '$values', '$groups', '$arity', '$activate', '$add_document_processor', '$any?', '$select', '$add_syntax_processor', '$to_sym', '$instance_variable_get', '$kind', '$private', '$join', '$map', '$split', '$capitalize', '$instance_variable_set', '$resolve_args', '$enable_dsl', '$singleton_class', '$process_block_given?', '$source_location', '$freeze', '$resolve_class', '$<', '$update_config', '$as_symbol', '$name', '$name=', '$pop', '$-@', '$next_auto_id', '$generate_name']);
+  Opal.add_stubs(['$==', '$[]=', '$config', '$-', '$const_defined?', '$singleton_class?', '$include', '$const_get', '$extend', '$attr_reader', '$merge', '$class', '$update', '$raise', '$document', '$doctype', '$[]', '$+', '$level', '$delete', '$>', '$casecmp', '$new', '$title=', '$sectname=', '$special=', '$fetch', '$numbered=', '$!', '$key?', '$attr?', '$special', '$numbered', '$generate_id', '$title', '$id=', '$update_attributes', '$tr', '$basename', '$create_block', '$assign_caption', '$===', '$parse_blocks', '$empty?', '$include?', '$sub_attributes', '$parse', '$each', '$define_method', '$unshift', '$shift', '$send', '$size', '$binding', '$receiver', '$define_singleton_method', '$instance_exec', '$to_proc', '$call', '$option', '$flatten', '$respond_to?', '$to_s', '$partition', '$to_i', '$<<', '$compact', '$inspect', '$attr_accessor', '$to_set', '$match?', '$resolve_regexp', '$method', '$register', '$reset', '$values', '$groups', '$arity', '$activate', '$add_document_processor', '$any?', '$select', '$add_syntax_processor', '$to_sym', '$instance_variable_get', '$kind', '$private', '$join', '$map', '$split', '$capitalize', '$instance_variable_set', '$resolve_args', '$enable_dsl', '$singleton_class', '$process_block_given?', '$source_location', '$freeze', '$resolve_class', '$<', '$update_config', '$as_symbol', '$name', '$name=', '$pop', '$-@', '$next_auto_id', '$generate_name', '$each_with_object']);
   
   if ($$($nesting, 'RUBY_ENGINE')['$==']("opal")) {
   } else {
@@ -20390,9 +20541,9 @@ Opal.modules["asciidoctor/extensions"] = function(Opal) {
       (function($base, $super, $parent_nesting) {
         var self = $klass($base, $super, 'Registry');
 
-        var $nesting = [self].concat($parent_nesting), $Registry_initialize$53, $Registry_activate$54, $Registry_preprocessor$56, $Registry_preprocessors$ques$57, $Registry_preprocessors$58, $Registry_tree_processor$59, $Registry_tree_processors$ques$60, $Registry_tree_processors$61, $Registry_postprocessor$62, $Registry_postprocessors$ques$63, $Registry_postprocessors$64, $Registry_include_processor$65, $Registry_include_processors$ques$66, $Registry_include_processors$67, $Registry_docinfo_processor$68, $Registry_docinfo_processors$ques$69, $Registry_docinfo_processors$71, $Registry_block$73, $Registry_blocks$ques$74, $Registry_registered_for_block$ques$75, $Registry_find_block_extension$76, $Registry_block_macro$77, $Registry_block_macros$ques$78, $Registry_registered_for_block_macro$ques$79, $Registry_find_block_macro_extension$80, $Registry_inline_macro$81, $Registry_inline_macros$ques$82, $Registry_registered_for_inline_macro$ques$83, $Registry_find_inline_macro_extension$84, $Registry_inline_macros$85, $Registry_prefer$86, $Registry_add_document_processor$87, $Registry_add_syntax_processor$89, $Registry_resolve_args$91, $Registry_as_symbol$92;
+        var $nesting = [self].concat($parent_nesting), $Registry_initialize$53, $Registry_activate$54, $Registry_preprocessor$56, $Registry_preprocessors$ques$57, $Registry_preprocessors$58, $Registry_tree_processor$59, $Registry_tree_processors$ques$60, $Registry_tree_processors$61, $Registry_postprocessor$62, $Registry_postprocessors$ques$63, $Registry_postprocessors$64, $Registry_include_processor$65, $Registry_include_processors$ques$66, $Registry_include_processors$67, $Registry_docinfo_processor$68, $Registry_docinfo_processors$ques$69, $Registry_docinfo_processors$71, $Registry_block$73, $Registry_blocks$ques$74, $Registry_registered_for_block$ques$75, $Registry_find_block_extension$76, $Registry_block_macro$77, $Registry_block_macros$ques$78, $Registry_registered_for_block_macro$ques$79, $Registry_find_block_macro_extension$80, $Registry_inline_macro$81, $Registry_inline_macros$ques$82, $Registry_registered_for_inline_macro$ques$83, $Registry_find_inline_macro_extension$84, $Registry_inline_macros$85, $Registry_prefer$86, $Registry_add_document_processor$87, $Registry_add_syntax_processor$89, $Registry_reset$91, $Registry_resolve_args$92, $Registry_as_symbol$93;
 
-        self.$$prototype.groups = self.$$prototype.preprocessor_extensions = self.$$prototype.tree_processor_extensions = self.$$prototype.postprocessor_extensions = self.$$prototype.include_processor_extensions = self.$$prototype.docinfo_processor_extensions = self.$$prototype.block_extensions = self.$$prototype.block_macro_extensions = self.$$prototype.inline_macro_extensions = nil;
+        self.$$prototype.document = self.$$prototype.groups = self.$$prototype.preprocessor_extensions = self.$$prototype.tree_processor_extensions = self.$$prototype.postprocessor_extensions = self.$$prototype.include_processor_extensions = self.$$prototype.docinfo_processor_extensions = self.$$prototype.block_extensions = self.$$prototype.block_macro_extensions = self.$$prototype.inline_macro_extensions = nil;
         
         self.$attr_reader("document");
         self.$attr_reader("groups");
@@ -20406,6 +20557,7 @@ Opal.modules["asciidoctor/extensions"] = function(Opal) {
             groups = $hash2([], {});
           };
           self.groups = groups;
+          self.$reset();
           self.preprocessor_extensions = (self.tree_processor_extensions = (self.postprocessor_extensions = (self.include_processor_extensions = (self.docinfo_processor_extensions = (self.block_extensions = (self.block_macro_extensions = (self.inline_macro_extensions = nil)))))));
           return (self.document = nil);
         }, $Registry_initialize$53.$$arity = -1);
@@ -20414,6 +20566,8 @@ Opal.modules["asciidoctor/extensions"] = function(Opal) {
           var $$55, self = this, ext_groups = nil;
 
           
+          if ($truthy(self.document)) {
+            self.$reset()};
           self.document = document;
           if ($truthy((ext_groups = $rb_plus($$($nesting, 'Extensions').$groups().$values(), self.groups.$values()))['$empty?']())) {
           } else {
@@ -20784,7 +20938,7 @@ Opal.modules["asciidoctor/extensions"] = function(Opal) {
             };
             if ($truthy(processor['$process_block_given?']())) {
             } else {
-              self.$raise($$$('::', 'ArgumentError'), "" + "No block specified to process " + (kind_name) + " extension at " + (block.$source_location()))
+              self.$raise($$$('::', 'NoMethodError'), "" + "No block specified to process " + (kind_name) + " extension at " + (block.$source_location().$join(":")))
             };
             processor.$freeze();
             extension = $$($nesting, 'ProcessorExtension').$new(kind, processor);
@@ -20854,11 +21008,11 @@ Opal.modules["asciidoctor/extensions"] = function(Opal) {
             };
             if ($truthy((name = self.$as_symbol(processor.$name())))) {
             } else {
-              self.$raise($$$('::', 'ArgumentError'), "" + "No name specified for " + (kind_name) + " extension at " + (block.$source_location()))
+              self.$raise($$$('::', 'ArgumentError'), "" + "No name specified for " + (kind_name) + " extension at " + (block.$source_location().$join(":")))
             };
             if ($truthy(processor['$process_block_given?']())) {
             } else {
-              self.$raise($$$('::', 'NoMethodError'), "" + "No block specified to process " + (kind_name) + " extension at " + (block.$source_location()))
+              self.$raise($$$('::', 'NoMethodError'), "" + "No block specified to process " + (kind_name) + " extension at " + (block.$source_location().$join(":")))
             };
             processor.$freeze();
             
@@ -20911,7 +21065,15 @@ Opal.modules["asciidoctor/extensions"] = function(Opal) {
           };
         }, $Registry_add_syntax_processor$89.$$arity = 2);
         
-        Opal.def(self, '$resolve_args', $Registry_resolve_args$91 = function $$resolve_args(args, expect) {
+        Opal.def(self, '$reset', $Registry_reset$91 = function $$reset() {
+          var self = this;
+
+          
+          self.preprocessor_extensions = (self.tree_processor_extensions = (self.postprocessor_extensions = (self.include_processor_extensions = (self.docinfo_processor_extensions = (self.block_extensions = (self.block_macro_extensions = (self.inline_macro_extensions = nil)))))));
+          return (self.document = nil);
+        }, $Registry_reset$91.$$arity = 0);
+        
+        Opal.def(self, '$resolve_args', $Registry_resolve_args$92 = function $$resolve_args(args, expect) {
           var self = this, opts = nil, missing = nil;
 
           
@@ -20928,8 +21090,8 @@ Opal.modules["asciidoctor/extensions"] = function(Opal) {
             args.$pop(missing['$-@']())};
           args['$<<'](opts);
           return args;
-        }, $Registry_resolve_args$91.$$arity = 2);
-        return (Opal.def(self, '$as_symbol', $Registry_as_symbol$92 = function $$as_symbol(name) {
+        }, $Registry_resolve_args$92.$$arity = 2);
+        return (Opal.def(self, '$as_symbol', $Registry_as_symbol$93 = function $$as_symbol(name) {
           var self = this;
 
           if ($truthy(name)) {
@@ -20937,42 +21099,42 @@ Opal.modules["asciidoctor/extensions"] = function(Opal) {
           } else {
             return nil
           }
-        }, $Registry_as_symbol$92.$$arity = 1), nil) && 'as_symbol';
+        }, $Registry_as_symbol$93.$$arity = 1), nil) && 'as_symbol';
       })($nesting[0], null, $nesting);
       (function(self, $parent_nesting) {
-        var $nesting = [self].concat($parent_nesting), $generate_name$93, $next_auto_id$94, $groups$95, $create$96, $register$97, $unregister_all$98, $unregister$99;
+        var $nesting = [self].concat($parent_nesting), $generate_name$94, $next_auto_id$95, $groups$96, $create$97, $register$98, $unregister_all$99, $unregister$100;
 
         
         
-        Opal.def(self, '$generate_name', $generate_name$93 = function $$generate_name() {
+        Opal.def(self, '$generate_name', $generate_name$94 = function $$generate_name() {
           var self = this;
 
           return "" + "extgrp" + (self.$next_auto_id())
-        }, $generate_name$93.$$arity = 0);
+        }, $generate_name$94.$$arity = 0);
         
-        Opal.def(self, '$next_auto_id', $next_auto_id$94 = function $$next_auto_id() {
+        Opal.def(self, '$next_auto_id', $next_auto_id$95 = function $$next_auto_id() {
           var $a, self = this;
           if (self.auto_id == null) self.auto_id = nil;
 
           
           self.auto_id = ($truthy($a = self.auto_id) ? $a : -1);
           return (self.auto_id = $rb_plus(self.auto_id, 1));
-        }, $next_auto_id$94.$$arity = 0);
+        }, $next_auto_id$95.$$arity = 0);
         
-        Opal.def(self, '$groups', $groups$95 = function $$groups() {
+        Opal.def(self, '$groups', $groups$96 = function $$groups() {
           var $a, self = this;
           if (self.groups == null) self.groups = nil;
 
           return (self.groups = ($truthy($a = self.groups) ? $a : $hash2([], {})))
-        }, $groups$95.$$arity = 0);
+        }, $groups$96.$$arity = 0);
         
-        Opal.def(self, '$create', $create$96 = function $$create(name) {
-          var $iter = $create$96.$$p, block = $iter || nil, $a, self = this;
+        Opal.def(self, '$create', $create$97 = function $$create(name) {
+          var $iter = $create$97.$$p, block = $iter || nil, $a, self = this;
 
-          if ($iter) $create$96.$$p = null;
+          if ($iter) $create$97.$$p = null;
           
           
-          if ($iter) $create$96.$$p = null;;
+          if ($iter) $create$97.$$p = null;;
           
           if (name == null) {
             name = nil;
@@ -20982,15 +21144,15 @@ Opal.modules["asciidoctor/extensions"] = function(Opal) {
           } else {
             return $$($nesting, 'Registry').$new()
           };
-        }, $create$96.$$arity = -1);
+        }, $create$97.$$arity = -1);
         
-        Opal.def(self, '$register', $register$97 = function $$register($a) {
-          var $iter = $register$97.$$p, block = $iter || nil, $post_args, args, $b, self = this, argc = nil, resolved_group = nil, group = nil, name = nil, $writer = nil;
+        Opal.def(self, '$register', $register$98 = function $$register($a) {
+          var $iter = $register$98.$$p, block = $iter || nil, $post_args, args, $b, self = this, argc = nil, resolved_group = nil, group = nil, name = nil, $writer = nil;
 
-          if ($iter) $register$97.$$p = null;
+          if ($iter) $register$98.$$p = null;
           
           
-          if ($iter) $register$97.$$p = null;;
+          if ($iter) $register$98.$$p = null;;
           
           $post_args = Opal.slice.call(arguments, 0, arguments.length);
           
@@ -21012,34 +21174,37 @@ Opal.modules["asciidoctor/extensions"] = function(Opal) {
           $writer = [name.$to_sym(), resolved_group];
           $send(self.$groups(), '[]=', Opal.to_a($writer));
           return $writer[$rb_minus($writer["length"], 1)];;
-        }, $register$97.$$arity = -1);
+        }, $register$98.$$arity = -1);
         
-        Opal.def(self, '$unregister_all', $unregister_all$98 = function $$unregister_all() {
+        Opal.def(self, '$unregister_all', $unregister_all$99 = function $$unregister_all() {
           var self = this;
 
           
           self.groups = $hash2([], {});
           return nil;
-        }, $unregister_all$98.$$arity = 0);
-        return (Opal.def(self, '$unregister', $unregister$99 = function $$unregister($a) {
-          var $post_args, names, $$100, self = this;
+        }, $unregister_all$99.$$arity = 0);
+        return (Opal.def(self, '$unregister', $unregister$100 = function $$unregister($a) {
+          var $post_args, names, $$101, self = this;
 
           
           
           $post_args = Opal.slice.call(arguments, 0, arguments.length);
           
           names = $post_args;;
-          $send(names, 'each', [], ($$100 = function(group){var self = $$100.$$s || this;
-            if (self.groups == null) self.groups = nil;
+          $send(names, 'each_with_object', [self.$groups()], ($$101 = function(group, catalog){var self = $$101.$$s || this;
 
           
             
             if (group == null) {
               group = nil;
             };
-            return self.groups.$delete(group.$to_sym());}, $$100.$$s = self, $$100.$$arity = 1, $$100));
+            
+            if (catalog == null) {
+              catalog = nil;
+            };
+            return catalog.$delete(group.$to_sym());}, $$101.$$s = self, $$101.$$arity = 2, $$101));
           return nil;
-        }, $unregister$99.$$arity = -1), nil) && 'unregister';
+        }, $unregister$100.$$arity = -1), nil) && 'unregister';
       })(Opal.get_singleton_class(self), $nesting);
     })($nesting[0], $nesting)
   })($nesting[0], $nesting);
@@ -21395,7 +21560,8 @@ Opal.modules["asciidoctor/js/postscript"] = function(Opal) {
   self.$require("asciidoctor/converter/html5");
   self.$require("asciidoctor/extensions");
   self.$require("asciidoctor/js/asciidoctor_ext");
-  return self.$require("asciidoctor/js/opal_ext/logger");
+  self.$require("asciidoctor/js/opal_ext/logger");
+  return Opal.const_set($$($nesting, 'Asciidoctor'), 'InlineLinkRx', new RegExp("" + "(^|link:|" + ($$$($$($nesting, 'Asciidoctor'), 'CG_BLANK')) + "|\\\\?&lt;(?=\\\\?(?:https?|file|ftp|irc)(:))|[>\\(\\)\\[\\];\"'])(\\\\?(?:https?|file|ftp|irc)://)(?:([^\\s\\[\\]]+)\\[(|" + ($$$($$($nesting, 'Asciidoctor'), 'CC_ALL')) + "*?[^\\\\])\\]|(?!\\2)([^\\s]*?)&gt;|([^\\s\\[\\]<]*([^\\s,.?!\\[\\]<\\)])))"));
 };
 
 /* Generated by Opal 0.11.99.dev */
@@ -21530,13 +21696,13 @@ Opal.modules["asciidoctor/js/postscript"] = function(Opal) {
     Opal.const_set($nesting[0], 'FILE_READ_MODE', (function() {if ($truthy($$($nesting, 'RUBY_ENGINE_OPAL'))) {
       return "r"
     } else {
-      return "rb:utf-8:utf-8"
+      return "rb:UTF-8:UTF-8"
     }; return nil; })());
     Opal.const_set($nesting[0], 'URI_READ_MODE', $$($nesting, 'FILE_READ_MODE'));
     Opal.const_set($nesting[0], 'FILE_WRITE_MODE', (function() {if ($truthy($$($nesting, 'RUBY_ENGINE_OPAL'))) {
       return "w"
     } else {
-      return "w:utf-8"
+      return "wb:UTF-8"
     }; return nil; })());
     Opal.const_set($nesting[0], 'DEFAULT_DOCTYPE', "article");
     Opal.const_set($nesting[0], 'DEFAULT_BACKEND', "html5");
@@ -27022,7 +27188,7 @@ Html5Converter.prototype.convert = function (node, transform, opts) {
 }
 
 
-var ASCIIDOCTOR_JS_VERSION = '2.2.6';
+var ASCIIDOCTOR_JS_VERSION = '2.2.8';
 
   /**
    * Get Asciidoctor.js version number.