@asciidoctor/core 2.2.5 → 2.2.7

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");
@@ -1950,9 +1975,9 @@ Opal.modules["asciidoctor/core_ext/hash/merge"] = function(Opal) {
   function $rb_gt(lhs, rhs) {
     return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs > rhs : lhs['$>'](rhs);
   }
-  var $$1, self = Opal.top, $nesting = [], nil = Opal.nil, $$$ = Opal.const_get_qualified, $$ = Opal.const_get_relative, $breaker = Opal.breaker, $slice = Opal.slice, $send = Opal.send, $truthy = Opal.truthy, $hash2 = Opal.hash2;
+  var $$1, self = Opal.top, $nesting = [], nil = Opal.nil, $$$ = Opal.const_get_qualified, $$ = Opal.const_get_relative, $breaker = Opal.breaker, $slice = Opal.slice, $send = Opal.send, $truthy = Opal.truthy;
 
-  Opal.add_stubs(['$==', '$arity', '$instance_method', '$send', '$new', '$<', '$length', '$>', '$inject', '$merge', '$[]']);
+  Opal.add_stubs(['$==', '$arity', '$instance_method', '$send', '$new', '$<', '$length', '$dup', '$>', '$inject', '$merge', '$[]']);
   if ($$($nesting, 'Hash').$instance_method("merge").$arity()['$=='](1)) {
     return $$($nesting, 'Hash').$send("prepend", $send($$($nesting, 'Module'), 'new', [], ($$1 = function(){var self = $$1.$$s || this, $merge$2;
 
@@ -1966,7 +1991,7 @@ Opal.modules["asciidoctor/core_ext/hash/merge"] = function(Opal) {
         
         args = $post_args;;
         if ($truthy($rb_lt((len = args.$length()), 1))) {
-          return $send(self, Opal.find_super_dispatcher(self, 'merge', $merge$2, false), [$hash2([], {})], null)
+          return self.$dup()
         } else {
           
           if ($truthy($rb_gt(len, 1))) {
@@ -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 = str['$include?'](":")) ? $$($nesting, 'UriSniffRx')['$match?'](str) : $a)
-      }, $Helpers_uriish$ques$16.$$arity = 1);
+          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$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,13 @@ 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'));
+    Opal.const_set($nesting[0], 'InlineLinkRx', new RegExp("" + "(^|link:|" + ($$($nesting, 'CG_BLANK')) + "|\\\\?&lt;()|[>\\(\\)\\[\\];\"'])(\\\\?(?:https?|file|ftp|irc)://)(?:([^\\s\\[\\]]+)\\[(|" + ($$($nesting, 'CC_ALL')) + "*?[^\\\\])\\]|\\2([^\\s]*?)&gt;|([^\\s\\[\\]<]*([^\\s,.?!\\[\\]<\\)])))", 'm'));
     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 +3211,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 +3239,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 +3248,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 +3744,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 +3753,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 +3873,93 @@ 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};
+              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()));};
+              target = $rb_plus((($c = $gvars['~']) === nil ? nil : $c['$[]'](3)), (($c = $gvars['~']) === nil ? nil : $c['$[]'](6)));
+              if (target['$==']((($c = $gvars['~']) === nil ? nil : $c['$[]'](3)))) {
+                return (($c = $gvars['~']) === nil ? nil : $c['$[]'](0));};
+              doc.$register("links", target);
+              link_text = (function() {if ($truthy(doc_attrs['$key?']("hide-uri-scheme"))) {
+                
+                return target.$sub($$($nesting, 'UriSniffRx'), "");
+              } else {
+                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 {
               
-              $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))) {
+              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)))) {
                 
-                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 (prefix['$==']("link:")) {
+                  prefix = ""};
+                if ($truthy((link_text = (($c = $gvars['~']) === nil ? nil : $c['$[]'](5)))['$empty?']())) {
+                  link_text = nil};
               } else {
-                suffix = ";"
-              };
-              if ($truthy(target['$end_with?']("://"))) {
-                return (($c = $gvars['~']) === nil ? nil : $c['$[]'](0));};}
-              else if (":"['$===']($case)) {
-              if ($truthy((target = target.$chop())['$end_with?'](")"))) {
                 
-                target = target.$chop();
-                suffix = "):";
-              } else {
-                suffix = ":"
+                $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 {
+                  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));};};
               };
-              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)) {
-              
-              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))) {
+              link_opts = $hash2(["type"], {"type": "link"});
+              if ($truthy(link_text)) {
                 
-                $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))) {
+                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 +3967,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 +4127,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 +4478,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 +4537,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 +5006,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 +5037,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 +5050,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 +5108,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 +5131,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 +5143,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 +5159,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 +5185,7 @@ Opal.modules["asciidoctor/version"] = function(Opal) {
 
     var $nesting = [self].concat($parent_nesting);
 
-    Opal.const_set($nesting[0], 'VERSION', "2.0.16")
+    Opal.const_set($nesting[0], 'VERSION', "2.0.22")
   })($nesting[0], $nesting)
 };
 
@@ -5148,7 +5199,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 +5604,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 +5635,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 {
@@ -5760,15 +5811,12 @@ Opal.modules["asciidoctor/abstract_block"] = function(Opal) {
   function $rb_minus(lhs, rhs) {
     return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs - rhs : lhs['$-'](rhs);
   }
-  function $rb_gt(lhs, rhs) {
-    return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs > rhs : lhs['$>'](rhs);
-  }
   function $rb_plus(lhs, rhs) {
     return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs + rhs : lhs['$+'](rhs);
   }
   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;
 
-  Opal.add_stubs(['$attr_reader', '$attr_writer', '$attr_accessor', '$==', '$===', '$level', '$file', '$lineno', '$playback_attributes', '$convert', '$converter', '$join', '$map', '$to_s', '$parent', '$parent=', '$-', '$<<', '$empty?', '$>', '$Integer', '$find_by_internal', '$to_proc', '$context', '$[]', '$items', '$+', '$find_index', '$include?', '$next_adjacent_block', '$blocks', '$select', '$sub_specialchars', '$match?', '$sub_replacements', '$title', '$apply_title_subs', '$delete', '$reftext', '$!', '$nil_or_empty?', '$sub_placeholder', '$sub_quotes', '$compat_mode', '$attributes', '$chomp', '$increment_and_store_counter', '$index=', '$numbered', '$sectname', '$counter', '$numeral=', '$numeral', '$caption=', '$int_to_roman', '$each', '$assign_numeral', '$reindex_sections', '$protected', '$has_role?', '$raise', '$header?', '$!=', '$flatten', '$head', '$rows', '$merge', '$body', '$foot', '$style', '$inner_document']);
+  Opal.add_stubs(['$attr_reader', '$attr_writer', '$attr_accessor', '$==', '$===', '$level', '$file', '$lineno', '$playback_attributes', '$convert', '$converter', '$join', '$map', '$to_s', '$parent', '$parent=', '$-', '$<<', '$empty?', '$Integer', '$find_by_internal', '$to_proc', '$context', '$[]', '$items', '$+', '$find_index', '$include?', '$next_adjacent_block', '$blocks', '$select', '$sub_specialchars', '$match?', '$sub_replacements', '$title', '$apply_title_subs', '$delete', '$reftext', '$!', '$nil_or_empty?', '$sub_placeholder', '$sub_quotes', '$compat_mode', '$attributes', '$chomp', '$increment_and_store_counter', '$index=', '$numbered', '$sectname', '$counter', '$numeral=', '$numeral', '$caption=', '$int_to_roman', '$each', '$assign_numeral', '$reindex_sections', '$protected', '$has_role?', '$raise', '$header?', '$!=', '$flatten', '$head', '$rows', '$merge', '$body', '$foot', '$style', '$inner_document']);
   return (function($base, $parent_nesting) {
     var self = $module($base, 'Asciidoctor');
 
@@ -5779,7 +5827,7 @@ Opal.modules["asciidoctor/abstract_block"] = function(Opal) {
 
       var $nesting = [self].concat($parent_nesting), $AbstractBlock_initialize$1, $AbstractBlock_block$ques$2, $AbstractBlock_inline$ques$3, $AbstractBlock_file$4, $AbstractBlock_lineno$5, $AbstractBlock_convert$6, $AbstractBlock_content$7, $AbstractBlock_context$eq$9, $AbstractBlock_$lt$lt$10, $AbstractBlock_blocks$ques$11, $AbstractBlock_sections$ques$12, $AbstractBlock_number$13, $AbstractBlock_number$eq$14, $AbstractBlock_find_by$15, $AbstractBlock_next_adjacent_block$16, $AbstractBlock_sections$18, $AbstractBlock_alt$20, $AbstractBlock_caption$21, $AbstractBlock_captioned_title$22, $AbstractBlock_list_marker_keyword$23, $AbstractBlock_title$24, $AbstractBlock_title$ques$25, $AbstractBlock_title$eq$26, $AbstractBlock_sub$ques$27, $AbstractBlock_remove_sub$28, $AbstractBlock_xreftext$29, $AbstractBlock_assign_caption$30, $AbstractBlock_assign_numeral$31, $AbstractBlock_reindex_sections$32, $AbstractBlock_find_by_internal$34;
 
-      self.$$prototype.source_location = self.$$prototype.document = self.$$prototype.attributes = self.$$prototype.blocks = self.$$prototype.next_section_index = self.$$prototype.numeral = self.$$prototype.context = self.$$prototype.parent = self.$$prototype.caption = self.$$prototype.style = self.$$prototype.converted_title = self.$$prototype.title = self.$$prototype.subs = self.$$prototype.next_section_ordinal = self.$$prototype.id = self.$$prototype.header = nil;
+      self.$$prototype.source_location = self.$$prototype.document = self.$$prototype.attributes = self.$$prototype.blocks = self.$$prototype.numeral = self.$$prototype.context = self.$$prototype.parent = self.$$prototype.caption = self.$$prototype.style = self.$$prototype.converted_title = self.$$prototype.title = self.$$prototype.subs = self.$$prototype.next_section_index = self.$$prototype.next_section_ordinal = self.$$prototype.id = self.$$prototype.header = nil;
       
       self.$attr_reader("blocks");
       self.$attr_writer("caption");
@@ -5900,7 +5948,7 @@ Opal.modules["asciidoctor/abstract_block"] = function(Opal) {
       Opal.def(self, '$sections?', $AbstractBlock_sections$ques$12 = function() {
         var self = this;
 
-        return $rb_gt(self.next_section_index, 0)
+        return false
       }, $AbstractBlock_sections$ques$12.$$arity = 0);
       
       Opal.def(self, '$number', $AbstractBlock_number$13 = function $$number() {
@@ -6715,7 +6763,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))) {
@@ -6729,7 +6777,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);
@@ -6882,7 +6930,7 @@ Opal.modules["asciidoctor/converter"] = 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, $truthy = Opal.truthy, $send = Opal.send, $klass = Opal.klass, $gvars = Opal.gvars;
 
-  Opal.add_stubs(['$autoload', '$__dir__', '$attr_reader', '$raise', '$class', '$[]', '$sub', '$slice', '$length', '$==', '$[]=', '$backend_traits', '$-', '$derive_backend_traits', '$register', '$map', '$to_s', '$new', '$create', '$default', '$each', '$default=', '$registry', '$for', '$===', '$supports_templates?', '$merge', '$private', '$include', '$delete', '$clear', '$send', '$extend', '$private_class_method', '$node_name', '$+', '$receiver', '$name', '$warn', '$logger', '$respond_to?', '$content']);
+  Opal.add_stubs(['$autoload', '$__dir__', '$==', '$attr_reader', '$raise', '$class', '$[]', '$sub', '$slice', '$length', '$[]=', '$backend_traits', '$-', '$derive_backend_traits', '$register', '$map', '$to_s', '$new', '$create', '$default', '$each', '$default=', '$registry', '$for', '$===', '$supports_templates?', '$merge', '$private', '$include', '$delete', '$clear', '$send', '$extend', '$private_class_method', '$node_name', '$+', '$receiver', '$name', '$warn', '$logger', '$respond_to?', '$content']);
   return (function($base, $parent_nesting) {
     var self = $module($base, 'Asciidoctor');
 
@@ -6895,7 +6943,10 @@ Opal.modules["asciidoctor/converter"] = function(Opal) {
 
       
       self.$autoload("CompositeConverter", "" + (self.$__dir__()) + "/converter/composite");
-      self.$autoload("TemplateConverter", "" + (self.$__dir__()) + "/converter/template");
+      if ($$($nesting, 'RUBY_ENGINE')['$==']("opal")) {
+      } else {
+        nil
+      };
       self.$attr_reader("backend");
       
       Opal.def(self, '$initialize', $Converter_initialize$1 = function $$initialize(backend, opts) {
@@ -7423,7 +7474,7 @@ Opal.modules["asciidoctor/document"] = 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, $hash = Opal.hash, $gvars = Opal.gvars;
 
-  Opal.add_stubs(['$new', '$attr_reader', '$nil?', '$<<', '$[]', '$[]=', '$-', '$include?', '$strip', '$squeeze', '$gsub', '$empty?', '$!', '$rpartition', '$attr_accessor', '$delete', '$base_dir', '$options', '$merge', '$catalog', '$instance_variable_get', '$attributes', '$safe', '$compat_mode', '$outfilesuffix', '$sourcemap', '$path_resolver', '$converter', '$extensions', '$syntax_highlighter', '$each', '$end_with?', '$start_with?', '$slice', '$length', '$chop', '$==', '$downcase', '$===', '$extname', '$value_for_name', '$key?', '$freeze', '$attribute_undefined', '$attribute_missing', '$update', '$&', '$keys', '$name_for_value', '$expand_path', '$pwd', '$to_s', '$>=', '$+', '$abs', '$to_i', '$delete_if', '$update_doctype_attributes', '$cursor', '$parse', '$restore_attributes', '$update_backend_attributes', '$fetch', '$fill_datetime_attributes', '$activate', '$groups', '$create', '$to_proc', '$preprocessors?', '$preprocessors', '$process_method', '$tree_processors?', '$tree_processors', '$!=', '$counter', '$attribute_locked?', '$nil_or_empty?', '$nextval', '$value', '$save_to', '$register', '$tap', '$xreftext', '$source', '$source_lines', '$doctitle', '$sectname=', '$title=', '$first_section', '$title', '$reftext', '$>', '$<', '$find', '$context', '$assign_numeral', '$clear_playback_attributes', '$save_attributes', '$name', '$negate', '$rewind', '$replace', '$apply_attribute_value_subs', '$delete?', '$start', '$doctype', '$content_model', '$warn', '$logger', '$content', '$convert', '$postprocessors?', '$postprocessors', '$record', '$write', '$respond_to?', '$chomp', '$class', '$write_alternate_pages', '$map', '$split', '$resolve_docinfo_subs', '$normalize_system_path', '$read_asset', '$apply_subs', '$docinfo_processors?', '$join', '$concat', '$compact', '$docinfo_processors', '$object_id', '$inspect', '$size', '$private', '$=~', '$resolve_pass_subs', '$apply_header_subs', '$limit_bytesize', '$bytesize', '$valid_encoding?', '$byteslice', '$resolve_subs', '$utc', '$at', '$Integer', '$now', '$index', '$strftime', '$year', '$utc_offset', '$partition', '$create_converter', '$basebackend', '$filetype', '$htmlsyntax', '$derive_backend_traits', '$raise']);
+  Opal.add_stubs(['$new', '$attr_reader', '$nil?', '$<<', '$[]', '$[]=', '$-', '$include?', '$strip', '$squeeze', '$gsub', '$empty?', '$!', '$rpartition', '$attr_accessor', '$delete', '$base_dir', '$options', '$merge', '$catalog', '$instance_variable_get', '$attributes', '$safe', '$compat_mode', '$outfilesuffix', '$sourcemap', '$path_resolver', '$converter', '$extensions', '$syntax_highlighter', '$each', '$end_with?', '$start_with?', '$slice', '$length', '$chop', '$==', '$downcase', '$===', '$extname', '$value_for_name', '$key?', '$freeze', '$attribute_undefined', '$attribute_missing', '$update', '$&', '$keys', '$name_for_value', '$expand_path', '$pwd', '$to_s', '$>=', '$+', '$abs', '$to_i', '$delete_if', '$update_doctype_attributes', '$cursor', '$parse', '$restore_attributes', '$update_backend_attributes', '$fetch', '$fill_datetime_attributes', '$activate', '$groups', '$create', '$to_proc', '$preprocessors?', '$preprocessors', '$process_method', '$tree_processors?', '$tree_processors', '$!=', '$counter', '$attribute_locked?', '$nil_or_empty?', '$nextval', '$value', '$save_to', '$register', '$tap', '$xreftext', '$>', '$source', '$source_lines', '$doctitle', '$sectname=', '$title=', '$first_section', '$title', '$reftext', '$<', '$find', '$context', '$assign_numeral', '$clear_playback_attributes', '$save_attributes', '$name', '$negate', '$rewind', '$replace', '$apply_attribute_value_subs', '$delete?', '$start', '$doctype', '$content_model', '$warn', '$logger', '$content', '$convert', '$postprocessors?', '$postprocessors', '$record', '$write', '$respond_to?', '$chomp', '$class', '$write_alternate_pages', '$map', '$split', '$resolve_docinfo_subs', '$normalize_system_path', '$read_asset', '$apply_subs', '$docinfo_processors?', '$join', '$concat', '$compact', '$docinfo_processors', '$object_id', '$inspect', '$size', '$private', '$=~', '$resolve_pass_subs', '$apply_header_subs', '$limit_bytesize', '$bytesize', '$valid_encoding?', '$byteslice', '$resolve_subs', '$utc', '$at', '$Integer', '$now', '$index', '$strftime', '$year', '$utc_offset', '$partition', '$create_converter', '$basebackend', '$filetype', '$htmlsyntax', '$derive_backend_traits', '$raise']);
   return (function($base, $parent_nesting) {
     var self = $module($base, 'Asciidoctor');
 
@@ -7432,9 +7483,9 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
     (function($base, $super, $parent_nesting) {
       var self = $klass($base, $super, 'Document');
 
-      var $nesting = [self].concat($parent_nesting), $Document$1, $Document_initialize$8, $Document_parse$11, $Document_parsed$ques$14, $Document_counter$15, $Document_increment_and_store_counter$16, $Document_register$17, $Document_resolve_id$18, $Document_footnotes$ques$22, $Document_footnotes$23, $Document_callouts$24, $Document_nested$ques$25, $Document_embedded$ques$26, $Document_extensions$ques$27, $Document_source$28, $Document_source_lines$29, $Document_basebackend$ques$30, $Document_title$31, $Document_title$eq$32, $Document_doctitle$33, $Document_xreftext$34, $Document_author$35, $Document_authors$36, $Document_revdate$37, $Document_notitle$38, $Document_noheader$39, $Document_nofooter$40, $Document_first_section$41, $Document_header$ques$43, $Document_$lt$lt$44, $Document_finalize_header$45, $Document_playback_attributes$46, $Document_restore_attributes$48, $Document_set_attribute$49, $Document_delete_attribute$50, $Document_attribute_locked$ques$51, $Document_set_header_attribute$52, $Document_convert$53, $Document_write$55, $Document_content$56, $Document_docinfo$57, $Document_docinfo_processors$ques$60, $Document_to_s$61, $Document_apply_attribute_value_subs$62, $Document_limit_bytesize$63, $Document_resolve_docinfo_subs$64, $Document_create_converter$65, $Document_clear_playback_attributes$66, $Document_save_attributes$67, $Document_fill_datetime_attributes$69, $Document_update_backend_attributes$70, $Document_update_doctype_attributes$71;
+      var $nesting = [self].concat($parent_nesting), $Document$1, $Document_initialize$8, $Document_parse$11, $Document_parsed$ques$14, $Document_counter$15, $Document_increment_and_store_counter$16, $Document_register$17, $Document_resolve_id$18, $Document_sections$ques$22, $Document_footnotes$ques$23, $Document_footnotes$24, $Document_callouts$25, $Document_nested$ques$26, $Document_embedded$ques$27, $Document_extensions$ques$28, $Document_source$29, $Document_source_lines$30, $Document_basebackend$ques$31, $Document_title$32, $Document_title$eq$33, $Document_doctitle$34, $Document_xreftext$35, $Document_author$36, $Document_authors$37, $Document_revdate$38, $Document_notitle$39, $Document_noheader$40, $Document_nofooter$41, $Document_first_section$42, $Document_header$ques$44, $Document_$lt$lt$45, $Document_finalize_header$46, $Document_playback_attributes$47, $Document_restore_attributes$49, $Document_set_attribute$50, $Document_delete_attribute$51, $Document_attribute_locked$ques$52, $Document_set_header_attribute$53, $Document_convert$54, $Document_write$56, $Document_content$57, $Document_docinfo$58, $Document_docinfo_processors$ques$61, $Document_to_s$62, $Document_apply_attribute_value_subs$63, $Document_limit_bytesize$64, $Document_resolve_docinfo_subs$65, $Document_create_converter$66, $Document_clear_playback_attributes$67, $Document_save_attributes$68, $Document_fill_datetime_attributes$70, $Document_update_backend_attributes$71, $Document_update_doctype_attributes$72;
 
-      self.$$prototype.attributes = self.$$prototype.safe = self.$$prototype.sourcemap = self.$$prototype.reader = self.$$prototype.base_dir = self.$$prototype.parsed = self.$$prototype.parent_document = self.$$prototype.extensions = self.$$prototype.options = self.$$prototype.counters = self.$$prototype.catalog = self.$$prototype.reftexts = self.$$prototype.header = self.$$prototype.blocks = self.$$prototype.header_attributes = self.$$prototype.attributes_modified = self.$$prototype.backend = self.$$prototype.attribute_overrides = self.$$prototype.timings = self.$$prototype.converter = self.$$prototype.outfilesuffix = self.$$prototype.docinfo_processor_extensions = self.$$prototype.document = self.$$prototype.max_attribute_value_size = self.$$prototype.id = self.$$prototype.doctype = nil;
+      self.$$prototype.attributes = self.$$prototype.safe = self.$$prototype.sourcemap = self.$$prototype.reader = self.$$prototype.base_dir = self.$$prototype.parsed = self.$$prototype.parent_document = self.$$prototype.extensions = self.$$prototype.options = self.$$prototype.counters = self.$$prototype.catalog = self.$$prototype.reftexts = self.$$prototype.next_section_index = self.$$prototype.header = self.$$prototype.blocks = self.$$prototype.header_attributes = self.$$prototype.attributes_modified = self.$$prototype.backend = self.$$prototype.attribute_overrides = self.$$prototype.timings = self.$$prototype.converter = self.$$prototype.outfilesuffix = self.$$prototype.docinfo_processor_extensions = self.$$prototype.document = self.$$prototype.max_attribute_value_size = self.$$prototype.id = self.$$prototype.doctype = nil;
       
       Opal.const_set($nesting[0], 'ImageReference', $send($$$('::', 'Struct'), 'new', ["target", "imagesdir"], ($Document$1 = function(){var self = $Document$1.$$s || this;
 
@@ -7568,6 +7619,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");
@@ -8068,7 +8124,13 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         }
       }, $Document_resolve_id$18.$$arity = 1);
       
-      Opal.def(self, '$footnotes?', $Document_footnotes$ques$22 = function() {
+      Opal.def(self, '$sections?', $Document_sections$ques$22 = function() {
+        var self = this;
+
+        return $rb_gt(self.next_section_index, 0)
+      }, $Document_sections$ques$22.$$arity = 0);
+      
+      Opal.def(self, '$footnotes?', $Document_footnotes$ques$23 = function() {
         var self = this;
 
         if ($truthy(self.catalog['$[]']("footnotes")['$empty?']())) {
@@ -8076,21 +8138,21 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return true
         }
-      }, $Document_footnotes$ques$22.$$arity = 0);
+      }, $Document_footnotes$ques$23.$$arity = 0);
       
-      Opal.def(self, '$footnotes', $Document_footnotes$23 = function $$footnotes() {
+      Opal.def(self, '$footnotes', $Document_footnotes$24 = function $$footnotes() {
         var self = this;
 
         return self.catalog['$[]']("footnotes")
-      }, $Document_footnotes$23.$$arity = 0);
+      }, $Document_footnotes$24.$$arity = 0);
       
-      Opal.def(self, '$callouts', $Document_callouts$24 = function $$callouts() {
+      Opal.def(self, '$callouts', $Document_callouts$25 = function $$callouts() {
         var self = this;
 
         return self.catalog['$[]']("callouts")
-      }, $Document_callouts$24.$$arity = 0);
+      }, $Document_callouts$25.$$arity = 0);
       
-      Opal.def(self, '$nested?', $Document_nested$ques$25 = function() {
+      Opal.def(self, '$nested?', $Document_nested$ques$26 = function() {
         var self = this;
 
         if ($truthy(self.parent_document)) {
@@ -8098,15 +8160,15 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return false
         }
-      }, $Document_nested$ques$25.$$arity = 0);
+      }, $Document_nested$ques$26.$$arity = 0);
       
-      Opal.def(self, '$embedded?', $Document_embedded$ques$26 = function() {
+      Opal.def(self, '$embedded?', $Document_embedded$ques$27 = function() {
         var self = this;
 
         return self.attributes['$key?']("embedded")
-      }, $Document_embedded$ques$26.$$arity = 0);
+      }, $Document_embedded$ques$27.$$arity = 0);
       
-      Opal.def(self, '$extensions?', $Document_extensions$ques$27 = function() {
+      Opal.def(self, '$extensions?', $Document_extensions$ques$28 = function() {
         var self = this;
 
         if ($truthy(self.extensions)) {
@@ -8114,9 +8176,9 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return false
         }
-      }, $Document_extensions$ques$27.$$arity = 0);
+      }, $Document_extensions$ques$28.$$arity = 0);
       
-      Opal.def(self, '$source', $Document_source$28 = function $$source() {
+      Opal.def(self, '$source', $Document_source$29 = function $$source() {
         var self = this;
 
         if ($truthy(self.reader)) {
@@ -8124,9 +8186,9 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return nil
         }
-      }, $Document_source$28.$$arity = 0);
+      }, $Document_source$29.$$arity = 0);
       
-      Opal.def(self, '$source_lines', $Document_source_lines$29 = function $$source_lines() {
+      Opal.def(self, '$source_lines', $Document_source_lines$30 = function $$source_lines() {
         var self = this;
 
         if ($truthy(self.reader)) {
@@ -8134,21 +8196,21 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return nil
         }
-      }, $Document_source_lines$29.$$arity = 0);
+      }, $Document_source_lines$30.$$arity = 0);
       
-      Opal.def(self, '$basebackend?', $Document_basebackend$ques$30 = function(base) {
+      Opal.def(self, '$basebackend?', $Document_basebackend$ques$31 = function(base) {
         var self = this;
 
         return self.attributes['$[]']("basebackend")['$=='](base)
-      }, $Document_basebackend$ques$30.$$arity = 1);
+      }, $Document_basebackend$ques$31.$$arity = 1);
       
-      Opal.def(self, '$title', $Document_title$31 = function $$title() {
+      Opal.def(self, '$title', $Document_title$32 = function $$title() {
         var self = this;
 
         return self.$doctitle()
-      }, $Document_title$31.$$arity = 0);
+      }, $Document_title$32.$$arity = 0);
       
-      Opal.def(self, '$title=', $Document_title$eq$32 = function(title) {
+      Opal.def(self, '$title=', $Document_title$eq$33 = function(title) {
         var self = this, sect = nil, $writer = nil;
 
         
@@ -8163,9 +8225,9 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         $writer = [title];
         $send(sect, 'title=', Opal.to_a($writer));
         return $writer[$rb_minus($writer["length"], 1)];;
-      }, $Document_title$eq$32.$$arity = 1);
+      }, $Document_title$eq$33.$$arity = 1);
       
-      Opal.def(self, '$doctitle', $Document_doctitle$33 = function $$doctitle(opts) {
+      Opal.def(self, '$doctitle', $Document_doctitle$34 = function $$doctitle(opts) {
         var $a, self = this, val = nil, sect = nil, separator = nil;
 
         
@@ -8189,10 +8251,10 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return val
         };
-      }, $Document_doctitle$33.$$arity = -1);
+      }, $Document_doctitle$34.$$arity = -1);
       Opal.alias(self, "name", "doctitle");
       
-      Opal.def(self, '$xreftext', $Document_xreftext$34 = function $$xreftext(xrefstyle) {
+      Opal.def(self, '$xreftext', $Document_xreftext$35 = function $$xreftext(xrefstyle) {
         var $a, self = this, val = nil;
 
         
@@ -8205,15 +8267,15 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return self.$title()
         };
-      }, $Document_xreftext$34.$$arity = -1);
+      }, $Document_xreftext$35.$$arity = -1);
       
-      Opal.def(self, '$author', $Document_author$35 = function $$author() {
+      Opal.def(self, '$author', $Document_author$36 = function $$author() {
         var self = this;
 
         return self.attributes['$[]']("author")
-      }, $Document_author$35.$$arity = 0);
+      }, $Document_author$36.$$arity = 0);
       
-      Opal.def(self, '$authors', $Document_authors$36 = function $$authors() {
+      Opal.def(self, '$authors', $Document_authors$37 = function $$authors() {
         var $a, self = this, attrs = nil, authors = nil, num_authors = nil, idx = nil;
 
         if ($truthy((attrs = self.attributes)['$key?']("author"))) {
@@ -8231,46 +8293,46 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return []
         }
-      }, $Document_authors$36.$$arity = 0);
+      }, $Document_authors$37.$$arity = 0);
       
-      Opal.def(self, '$revdate', $Document_revdate$37 = function $$revdate() {
+      Opal.def(self, '$revdate', $Document_revdate$38 = function $$revdate() {
         var self = this;
 
         return self.attributes['$[]']("revdate")
-      }, $Document_revdate$37.$$arity = 0);
+      }, $Document_revdate$38.$$arity = 0);
       
-      Opal.def(self, '$notitle', $Document_notitle$38 = function $$notitle() {
+      Opal.def(self, '$notitle', $Document_notitle$39 = function $$notitle() {
         var self = this;
 
         return self.attributes['$key?']("notitle")
-      }, $Document_notitle$38.$$arity = 0);
+      }, $Document_notitle$39.$$arity = 0);
       
-      Opal.def(self, '$noheader', $Document_noheader$39 = function $$noheader() {
+      Opal.def(self, '$noheader', $Document_noheader$40 = function $$noheader() {
         var self = this;
 
         return self.attributes['$key?']("noheader")
-      }, $Document_noheader$39.$$arity = 0);
+      }, $Document_noheader$40.$$arity = 0);
       
-      Opal.def(self, '$nofooter', $Document_nofooter$40 = function $$nofooter() {
+      Opal.def(self, '$nofooter', $Document_nofooter$41 = function $$nofooter() {
         var self = this;
 
         return self.attributes['$key?']("nofooter")
-      }, $Document_nofooter$40.$$arity = 0);
+      }, $Document_nofooter$41.$$arity = 0);
       
-      Opal.def(self, '$first_section', $Document_first_section$41 = function $$first_section() {
-        var $a, $$42, self = this;
+      Opal.def(self, '$first_section', $Document_first_section$42 = function $$first_section() {
+        var $a, $$43, self = this;
 
-        return ($truthy($a = self.header) ? $a : $send(self.blocks, 'find', [], ($$42 = function(e){var self = $$42.$$s || this;
+        return ($truthy($a = self.header) ? $a : $send(self.blocks, 'find', [], ($$43 = function(e){var self = $$43.$$s || this;
 
         
           
           if (e == null) {
             e = nil;
           };
-          return e.$context()['$==']("section");}, $$42.$$s = self, $$42.$$arity = 1, $$42)))
-      }, $Document_first_section$41.$$arity = 0);
+          return e.$context()['$==']("section");}, $$43.$$s = self, $$43.$$arity = 1, $$43)))
+      }, $Document_first_section$42.$$arity = 0);
       
-      Opal.def(self, '$header?', $Document_header$ques$43 = function() {
+      Opal.def(self, '$header?', $Document_header$ques$44 = function() {
         var self = this;
 
         if ($truthy(self.header)) {
@@ -8278,13 +8340,13 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return false
         }
-      }, $Document_header$ques$43.$$arity = 0);
+      }, $Document_header$ques$44.$$arity = 0);
       Opal.alias(self, "has_header?", "header?");
       
-      Opal.def(self, '$<<', $Document_$lt$lt$44 = function(block) {
-        var $iter = $Document_$lt$lt$44.$$p, $yield = $iter || nil, self = this, $zuper = nil, $zuper_i = nil, $zuper_ii = nil;
+      Opal.def(self, '$<<', $Document_$lt$lt$45 = function(block) {
+        var $iter = $Document_$lt$lt$45.$$p, $yield = $iter || nil, self = this, $zuper = nil, $zuper_i = nil, $zuper_ii = nil;
 
-        if ($iter) $Document_$lt$lt$44.$$p = null;
+        if ($iter) $Document_$lt$lt$45.$$p = null;
         // Prepare super implicit arguments
         for($zuper_i = 0, $zuper_ii = arguments.length, $zuper = new Array($zuper_ii); $zuper_i < $zuper_ii; $zuper_i++) {
           $zuper[$zuper_i] = arguments[$zuper_i];
@@ -8292,10 +8354,10 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         
         if (block.$context()['$==']("section")) {
           self.$assign_numeral(block)};
-        return $send(self, Opal.find_super_dispatcher(self, '<<', $Document_$lt$lt$44, false), $zuper, $iter);
-      }, $Document_$lt$lt$44.$$arity = 1);
+        return $send(self, Opal.find_super_dispatcher(self, '<<', $Document_$lt$lt$45, false), $zuper, $iter);
+      }, $Document_$lt$lt$45.$$arity = 1);
       
-      Opal.def(self, '$finalize_header', $Document_finalize_header$45 = function $$finalize_header(unrooted_attributes, header_valid) {
+      Opal.def(self, '$finalize_header', $Document_finalize_header$46 = function $$finalize_header(unrooted_attributes, header_valid) {
         var self = this, $writer = nil;
 
         
@@ -8313,13 +8375,13 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
           $writer[$rb_minus($writer["length"], 1)];
         };
         return unrooted_attributes;
-      }, $Document_finalize_header$45.$$arity = -2);
+      }, $Document_finalize_header$46.$$arity = -2);
       
-      Opal.def(self, '$playback_attributes', $Document_playback_attributes$46 = function $$playback_attributes(block_attributes) {
-        var $$47, self = this;
+      Opal.def(self, '$playback_attributes', $Document_playback_attributes$47 = function $$playback_attributes(block_attributes) {
+        var $$48, self = this;
 
         if ($truthy(block_attributes['$key?']("attribute_entries"))) {
-          return $send(block_attributes['$[]']("attribute_entries"), 'each', [], ($$47 = function(entry){var self = $$47.$$s || this, name = nil, $writer = nil;
+          return $send(block_attributes['$[]']("attribute_entries"), 'each', [], ($$48 = function(entry){var self = $$48.$$s || this, name = nil, $writer = nil;
             if (self.attributes == null) self.attributes = nil;
 
           
@@ -8347,13 +8409,13 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
               } else {
                 return nil
               };
-            };}, $$47.$$s = self, $$47.$$arity = 1, $$47))
+            };}, $$48.$$s = self, $$48.$$arity = 1, $$48))
         } else {
           return nil
         }
-      }, $Document_playback_attributes$46.$$arity = 1);
+      }, $Document_playback_attributes$47.$$arity = 1);
       
-      Opal.def(self, '$restore_attributes', $Document_restore_attributes$48 = function $$restore_attributes() {
+      Opal.def(self, '$restore_attributes', $Document_restore_attributes$49 = function $$restore_attributes() {
         var self = this;
 
         
@@ -8362,9 +8424,9 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
           self.catalog['$[]']("callouts").$rewind()
         };
         return self.attributes.$replace(self.header_attributes);
-      }, $Document_restore_attributes$48.$$arity = 0);
+      }, $Document_restore_attributes$49.$$arity = 0);
       
-      Opal.def(self, '$set_attribute', $Document_set_attribute$49 = function $$set_attribute(name, value) {
+      Opal.def(self, '$set_attribute', $Document_set_attribute$50 = function $$set_attribute(name, value) {
         var $a, self = this, $writer = nil, $case = nil;
 
         
@@ -8398,9 +8460,9 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
           };
           return value;
         };
-      }, $Document_set_attribute$49.$$arity = -2);
+      }, $Document_set_attribute$50.$$arity = -2);
       
-      Opal.def(self, '$delete_attribute', $Document_delete_attribute$50 = function $$delete_attribute(name) {
+      Opal.def(self, '$delete_attribute', $Document_delete_attribute$51 = function $$delete_attribute(name) {
         var self = this;
 
         if ($truthy(self['$attribute_locked?'](name))) {
@@ -8411,15 +8473,15 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
           self.attributes_modified['$<<'](name);
           return true;
         }
-      }, $Document_delete_attribute$50.$$arity = 1);
+      }, $Document_delete_attribute$51.$$arity = 1);
       
-      Opal.def(self, '$attribute_locked?', $Document_attribute_locked$ques$51 = function(name) {
+      Opal.def(self, '$attribute_locked?', $Document_attribute_locked$ques$52 = function(name) {
         var self = this;
 
         return self.attribute_overrides['$key?'](name)
-      }, $Document_attribute_locked$ques$51.$$arity = 1);
+      }, $Document_attribute_locked$ques$52.$$arity = 1);
       
-      Opal.def(self, '$set_header_attribute', $Document_set_header_attribute$52 = function $$set_header_attribute(name, value, overwrite) {
+      Opal.def(self, '$set_header_attribute', $Document_set_header_attribute$53 = function $$set_header_attribute(name, value, overwrite) {
         var $a, self = this, attrs = nil, $writer = nil;
 
         
@@ -8442,10 +8504,10 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
           $writer[$rb_minus($writer["length"], 1)];;
           return true;
         };
-      }, $Document_set_header_attribute$52.$$arity = -2);
+      }, $Document_set_header_attribute$53.$$arity = -2);
       
-      Opal.def(self, '$convert', $Document_convert$53 = function $$convert(opts) {
-        var $a, $$54, self = this, $writer = nil, block = nil, output = nil, transform = nil, exts = nil;
+      Opal.def(self, '$convert', $Document_convert$54 = function $$convert(opts) {
+        var $a, $$55, self = this, $writer = nil, block = nil, output = nil, transform = nil, exts = nil;
 
         
         
@@ -8502,21 +8564,21 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         };
         if ($truthy(self.parent_document)) {
         } else if ($truthy(($truthy($a = (exts = self.extensions)) ? exts['$postprocessors?']() : $a))) {
-          $send(exts.$postprocessors(), 'each', [], ($$54 = function(ext){var self = $$54.$$s || this;
+          $send(exts.$postprocessors(), 'each', [], ($$55 = function(ext){var self = $$55.$$s || this;
 
           
             
             if (ext == null) {
               ext = nil;
             };
-            return (output = ext.$process_method()['$[]'](self, output));}, $$54.$$s = self, $$54.$$arity = 1, $$54))};
+            return (output = ext.$process_method()['$[]'](self, output));}, $$55.$$s = self, $$55.$$arity = 1, $$55))};
         if ($truthy(self.timings)) {
           self.timings.$record("convert")};
         return output;
-      }, $Document_convert$53.$$arity = -1);
+      }, $Document_convert$54.$$arity = -1);
       Opal.alias(self, "render", "convert");
       
-      Opal.def(self, '$write', $Document_write$55 = function $$write(output, target) {
+      Opal.def(self, '$write', $Document_write$56 = function $$write(output, target) {
         var $a, $b, self = this;
 
         
@@ -8542,23 +8604,23 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         if ($truthy(self.timings)) {
           self.timings.$record("write")};
         return nil;
-      }, $Document_write$55.$$arity = 2);
+      }, $Document_write$56.$$arity = 2);
       
-      Opal.def(self, '$content', $Document_content$56 = function $$content() {
-        var $iter = $Document_content$56.$$p, $yield = $iter || nil, self = this, $zuper = nil, $zuper_i = nil, $zuper_ii = nil;
+      Opal.def(self, '$content', $Document_content$57 = function $$content() {
+        var $iter = $Document_content$57.$$p, $yield = $iter || nil, self = this, $zuper = nil, $zuper_i = nil, $zuper_ii = nil;
 
-        if ($iter) $Document_content$56.$$p = null;
+        if ($iter) $Document_content$57.$$p = null;
         // Prepare super implicit arguments
         for($zuper_i = 0, $zuper_ii = arguments.length, $zuper = new Array($zuper_ii); $zuper_i < $zuper_ii; $zuper_i++) {
           $zuper[$zuper_i] = arguments[$zuper_i];
         }
         
         self.attributes.$delete("title");
-        return $send(self, Opal.find_super_dispatcher(self, 'content', $Document_content$56, false), $zuper, $iter);
-      }, $Document_content$56.$$arity = 0);
+        return $send(self, Opal.find_super_dispatcher(self, 'content', $Document_content$57, false), $zuper, $iter);
+      }, $Document_content$57.$$arity = 0);
       
-      Opal.def(self, '$docinfo', $Document_docinfo$57 = function $$docinfo(location, suffix) {
-        var $a, $$58, $$59, self = this, qualifier = nil, docinfo = nil, content = nil, docinfo_file = nil, docinfo_dir = nil, docinfo_subs = nil, docinfo_path = nil, shared_docinfo = nil, private_docinfo = nil;
+      Opal.def(self, '$docinfo', $Document_docinfo$58 = function $$docinfo(location, suffix) {
+        var $a, $$59, $$60, self = this, qualifier = nil, docinfo = nil, content = nil, docinfo_file = nil, docinfo_dir = nil, docinfo_subs = nil, docinfo_path = nil, shared_docinfo = nil, private_docinfo = nil;
 
         
         
@@ -8589,14 +8651,14 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
               }; return nil; })()
             }
           } else {
-            docinfo = $send(docinfo.$split(","), 'map', [], ($$58 = function(it){var self = $$58.$$s || this;
+            docinfo = $send(docinfo.$split(","), 'map', [], ($$59 = function(it){var self = $$59.$$s || this;
 
             
               
               if (it == null) {
                 it = nil;
               };
-              return it.$strip();}, $$58.$$s = self, $$58.$$arity = 1, $$58))
+              return it.$strip();}, $$59.$$s = self, $$59.$$arity = 1, $$59))
           };
           if ($truthy(docinfo)) {
             
@@ -8617,22 +8679,22 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
                 content['$<<'](self.$apply_subs(private_docinfo, docinfo_subs))};
             };};};
         if ($truthy(($truthy($a = self.extensions) ? self['$docinfo_processors?'](location) : $a))) {
-          return ($truthy($a = content) ? $a : []).$concat($send(self.docinfo_processor_extensions['$[]'](location), 'map', [], ($$59 = function(ext){var self = $$59.$$s || this;
+          return ($truthy($a = content) ? $a : []).$concat($send(self.docinfo_processor_extensions['$[]'](location), 'map', [], ($$60 = function(ext){var self = $$60.$$s || this;
 
           
             
             if (ext == null) {
               ext = nil;
             };
-            return ext.$process_method()['$[]'](self);}, $$59.$$s = self, $$59.$$arity = 1, $$59)).$compact()).$join($$($nesting, 'LF'))
+            return ext.$process_method()['$[]'](self);}, $$60.$$s = self, $$60.$$arity = 1, $$60)).$compact()).$join($$($nesting, 'LF'))
         } else if ($truthy(content)) {
           return content.$join($$($nesting, 'LF'))
         } else {
           return ""
         };
-      }, $Document_docinfo$57.$$arity = -1);
+      }, $Document_docinfo$58.$$arity = -1);
       
-      Opal.def(self, '$docinfo_processors?', $Document_docinfo_processors$ques$60 = function(location) {
+      Opal.def(self, '$docinfo_processors?', $Document_docinfo_processors$ques$61 = function(location) {
         var $a, self = this, $writer = nil;
 
         
@@ -8650,16 +8712,16 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
           $send(self.docinfo_processor_extensions, '[]=', Opal.to_a($writer));
           return $writer[$rb_minus($writer["length"], 1)];
         };
-      }, $Document_docinfo_processors$ques$60.$$arity = -1);
+      }, $Document_docinfo_processors$ques$61.$$arity = -1);
       
-      Opal.def(self, '$to_s', $Document_to_s$61 = function $$to_s() {
+      Opal.def(self, '$to_s', $Document_to_s$62 = function $$to_s() {
         var $a, self = this;
 
         return "" + "#<" + (self.$class()) + "@" + (self.$object_id()) + " {doctype: " + (self.$doctype().$inspect()) + ", doctitle: " + (($truthy($a = self.header) ? self.header.$title() : $a).$inspect()) + ", blocks: " + (self.blocks.$size()) + "}>"
-      }, $Document_to_s$61.$$arity = 0);
+      }, $Document_to_s$62.$$arity = 0);
       self.$private();
       
-      Opal.def(self, '$apply_attribute_value_subs', $Document_apply_attribute_value_subs$62 = function $$apply_attribute_value_subs(value) {
+      Opal.def(self, '$apply_attribute_value_subs', $Document_apply_attribute_value_subs$63 = function $$apply_attribute_value_subs(value) {
         var $a, self = this;
 
         
@@ -8677,9 +8739,9 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return value
         };
-      }, $Document_apply_attribute_value_subs$62.$$arity = 1);
+      }, $Document_apply_attribute_value_subs$63.$$arity = 1);
       
-      Opal.def(self, '$limit_bytesize', $Document_limit_bytesize$63 = function $$limit_bytesize(str, max) {
+      Opal.def(self, '$limit_bytesize', $Document_limit_bytesize$64 = function $$limit_bytesize(str, max) {
         var $a, self = this;
 
         
@@ -8688,9 +8750,9 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
             max = $rb_minus(max, 1)
           }};
         return str;
-      }, $Document_limit_bytesize$63.$$arity = 2);
+      }, $Document_limit_bytesize$64.$$arity = 2);
       
-      Opal.def(self, '$resolve_docinfo_subs', $Document_resolve_docinfo_subs$64 = function $$resolve_docinfo_subs() {
+      Opal.def(self, '$resolve_docinfo_subs', $Document_resolve_docinfo_subs$65 = function $$resolve_docinfo_subs() {
         var self = this;
 
         if ($truthy(self.attributes['$key?']("docinfosubs"))) {
@@ -8699,9 +8761,9 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return ["attributes"]
         }
-      }, $Document_resolve_docinfo_subs$64.$$arity = 0);
+      }, $Document_resolve_docinfo_subs$65.$$arity = 0);
       
-      Opal.def(self, '$create_converter', $Document_create_converter$65 = function $$create_converter(backend, delegate_backend) {
+      Opal.def(self, '$create_converter', $Document_create_converter$66 = function $$create_converter(backend, delegate_backend) {
         var $a, self = this, converter_opts = nil, template_dirs = nil, opts = nil, $writer = nil, converter = nil;
 
         
@@ -8742,16 +8804,16 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return opts.$fetch("converter_factory", $$($nesting, 'Converter')).$create(backend, converter_opts)
         };
-      }, $Document_create_converter$65.$$arity = 2);
+      }, $Document_create_converter$66.$$arity = 2);
       
-      Opal.def(self, '$clear_playback_attributes', $Document_clear_playback_attributes$66 = function $$clear_playback_attributes(attributes) {
+      Opal.def(self, '$clear_playback_attributes', $Document_clear_playback_attributes$67 = function $$clear_playback_attributes(attributes) {
         var self = this;
 
         return attributes.$delete("attribute_entries")
-      }, $Document_clear_playback_attributes$66.$$arity = 1);
+      }, $Document_clear_playback_attributes$67.$$arity = 1);
       
-      Opal.def(self, '$save_attributes', $Document_save_attributes$67 = function $$save_attributes() {
-        var $a, $$68, self = this, attrs = nil, doctitle_val = nil, $writer = nil, toc_val = nil, toc_position_val = nil, toc_placement_val = nil, default_toc_position = nil, default_toc_class = nil, position = nil, $case = nil, icons_val = nil, basebackend = nil, syntax_hl_name = nil, syntax_hl_factory = nil, syntax_hls = nil;
+      Opal.def(self, '$save_attributes', $Document_save_attributes$68 = function $$save_attributes() {
+        var $a, $$69, self = this, attrs = nil, doctitle_val = nil, $writer = nil, toc_val = nil, toc_position_val = nil, toc_placement_val = nil, default_toc_position = nil, default_toc_class = nil, position = nil, $case = nil, icons_val = nil, basebackend = nil, syntax_hl_name = nil, syntax_hl_factory = nil, syntax_hls = nil;
 
         
         if ($truthy(($truthy($a = (attrs = self.attributes)['$key?']("doctitle")) ? $a : (doctitle_val = self.$doctitle())['$!']()))) {
@@ -8878,7 +8940,7 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
               $writer[$rb_minus($writer["length"], 1)];
             };};
           self.outfilesuffix = attrs['$[]']("outfilesuffix");
-          $send($$($nesting, 'FLEXIBLE_ATTRIBUTES'), 'each', [], ($$68 = function(name){var self = $$68.$$s || this, $b;
+          $send($$($nesting, 'FLEXIBLE_ATTRIBUTES'), 'each', [], ($$69 = function(name){var self = $$69.$$s || this, $b;
             if (self.attribute_overrides == null) self.attribute_overrides = nil;
 
           
@@ -8890,12 +8952,12 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
               return self.attribute_overrides.$delete(name)
             } else {
               return nil
-            };}, $$68.$$s = self, $$68.$$arity = 1, $$68));
+            };}, $$69.$$s = self, $$69.$$arity = 1, $$69));
         };
         return (self.header_attributes = attrs.$merge());
-      }, $Document_save_attributes$67.$$arity = 0);
+      }, $Document_save_attributes$68.$$arity = 0);
       
-      Opal.def(self, '$fill_datetime_attributes', $Document_fill_datetime_attributes$69 = function $$fill_datetime_attributes(attrs, input_mtime) {
+      Opal.def(self, '$fill_datetime_attributes', $Document_fill_datetime_attributes$70 = function $$fill_datetime_attributes(attrs, input_mtime) {
         var $a, $b, self = this, now = nil, source_date_epoch = nil, localdate = nil, $writer = nil, localtime = nil, docdate = nil, doctime = nil;
 
         
@@ -8943,9 +9005,9 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         }; return nil; })()))]), $send(attrs, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]));
         ($truthy($a = attrs['$[]']("docdatetime")) ? $a : (($writer = ["docdatetime", "" + (docdate) + " " + (doctime)]), $send(attrs, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]));
         return nil;
-      }, $Document_fill_datetime_attributes$69.$$arity = 2);
+      }, $Document_fill_datetime_attributes$70.$$arity = 2);
       
-      Opal.def(self, '$update_backend_attributes', $Document_update_backend_attributes$70 = function $$update_backend_attributes(new_backend, init) {
+      Opal.def(self, '$update_backend_attributes', $Document_update_backend_attributes$71 = function $$update_backend_attributes(new_backend, init) {
         var $a, $b, self = this, current_backend = nil, current_basebackend = nil, attrs = nil, current_doctype = nil, actual_backend = nil, _ = nil, $writer = nil, delegate_backend = nil, converter = nil, new_basebackend = nil, new_filetype = nil, htmlsyntax = nil, backend_traits = nil, current_filetype = nil, page_width = nil;
 
         
@@ -9073,8 +9135,8 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return nil
         };
-      }, $Document_update_backend_attributes$70.$$arity = -2);
-      return (Opal.def(self, '$update_doctype_attributes', $Document_update_doctype_attributes$71 = function $$update_doctype_attributes(new_doctype) {
+      }, $Document_update_backend_attributes$71.$$arity = -2);
+      return (Opal.def(self, '$update_doctype_attributes', $Document_update_doctype_attributes$72 = function $$update_doctype_attributes(new_doctype) {
         var $a, self = this, attrs = nil, current_backend = nil, current_basebackend = nil, current_doctype = nil, $writer = nil;
 
         if ($truthy(($truthy($a = new_doctype) ? new_doctype['$!='](self.doctype) : $a))) {
@@ -9118,7 +9180,7 @@ Opal.modules["asciidoctor/document"] = function(Opal) {
         } else {
           return nil
         }
-      }, $Document_update_doctype_attributes$71.$$arity = 1), nil) && 'update_doctype_attributes';
+      }, $Document_update_doctype_attributes$72.$$arity = 1), nil) && 'update_doctype_attributes';
     })($nesting[0], $$($nesting, 'AbstractBlock'), $nesting)
   })($nesting[0], $nesting)
 };
@@ -9381,7 +9443,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', '$doctype', '$parse_manpage_header', '$=~', '$downcase', '$error', '$logger', '$message_with_context', '$cursor_at_line', '$backend', '$save', '$update', '$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?', '$process_authors', '$apply_header_subs', '$rstrip', '$each_with_index', '$compact', '$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?', '$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');
 
@@ -9423,20 +9485,23 @@ 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"}));
       self.$private_class_method("new");
       Opal.defs(self, '$parse', $Parser_parse$4 = function $$parse(reader, document, options) {
-        var $a, $b, $c, self = this, block_attributes = nil, new_section = nil;
+        var $a, $b, $c, self = this, block_attributes = nil, header_only = nil, new_section = nil;
 
         
         
         if (options == null) {
           options = $hash2([], {});
         };
-        block_attributes = self.$parse_document_header(reader, document);
-        if ($truthy(options['$[]']("header_only"))) {
+        block_attributes = self.$parse_document_header(reader, document, (header_only = options['$[]']("header_only")));
+        if ($truthy(header_only)) {
         } else {
           while ($truthy(reader['$has_more_lines?']())) {
             
@@ -9449,10 +9514,14 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
         };
         return document;
       }, $Parser_parse$4.$$arity = -3);
-      Opal.defs(self, '$parse_document_header', $Parser_parse_document_header$5 = function $$parse_document_header(reader, document) {
-        var $a, $b, self = this, block_attrs = nil, doc_attrs = nil, implicit_doctitle = nil, val = nil, $writer = nil, doctitle_attr_val = nil, source_location = nil, _ = nil, l0_section_title = nil, atx = nil, separator = nil, doc_id = nil, role = nil, reftext = nil, modified_attrs = nil;
+      Opal.defs(self, '$parse_document_header', $Parser_parse_document_header$5 = function $$parse_document_header(reader, document, header_only) {
+        var $a, $b, self = this, block_attrs = nil, doc_attrs = nil, implicit_doctitle = nil, $writer = nil, val = nil, doctitle_attr_val = nil, source_location = nil, _ = nil, l0_section_title = nil, atx = nil, separator = nil, doc_id = nil, role = nil, reftext = nil, modified_attrs = nil, author = nil, author_metadata = nil;
 
         
+        
+        if (header_only == null) {
+          header_only = false;
+        };
         block_attrs = (function() {if ($truthy(reader.$skip_blank_lines())) {
           
           return self.$parse_block_metadata_lines(reader, document);
@@ -9461,7 +9530,12 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
         }; return nil; })();
         doc_attrs = document.$attributes();
         if ($truthy(($truthy($a = (implicit_doctitle = self['$is_next_line_doctitle?'](reader, block_attrs, doc_attrs['$[]']("leveloffset")))) ? block_attrs['$[]']("title") : $a))) {
-          return document.$finalize_header(block_attrs, false)};
+          
+          
+          $writer = ["authorcount", 0];
+          $send(doc_attrs, '[]=', Opal.to_a($writer));
+          $writer[$rb_minus($writer["length"], 1)];;
+          return document.$finalize_header(block_attrs, false);};
         if ($truthy((val = doc_attrs['$[]']("doctitle"))['$nil_or_empty?']())) {
         } else {
           
@@ -9528,7 +9602,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
             $writer[$rb_minus($writer["length"], 1)];};
           block_attrs.$clear();
           (modified_attrs = document.$instance_variable_get("@attributes_modified")).$delete("doctitle");
-          self.$parse_header_metadata(reader, document);
+          self.$parse_header_metadata(reader, document, nil);
           if ($truthy(modified_attrs['$include?']("doctitle"))) {
             if ($truthy(($truthy($a = (val = doc_attrs['$[]']("doctitle"))['$nil_or_empty?']()) ? $a : val['$=='](doctitle_attr_val)))) {
               
@@ -9544,15 +9618,35 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
           } else if ($truthy(l0_section_title['$!']())) {
             modified_attrs['$<<']("doctitle")};
           if ($truthy(doc_id)) {
-            document.$register("refs", [doc_id, document])};};
+            document.$register("refs", [doc_id, document])};
+        } else if ($truthy((author = doc_attrs['$[]']("author")))) {
+          
+          author_metadata = self.$process_authors(author, true, false);
+          if ($truthy(doc_attrs['$[]']("authorinitials"))) {
+            author_metadata.$delete("authorinitials")};
+          doc_attrs.$update(author_metadata);
+        } else if ($truthy((author = doc_attrs['$[]']("authors")))) {
+          
+          author_metadata = self.$process_authors(author, true);
+          doc_attrs.$update(author_metadata);
+        } else {
+          
+          $writer = ["authorcount", 0];
+          $send(doc_attrs, '[]=', Opal.to_a($writer));
+          $writer[$rb_minus($writer["length"], 1)];
+        };
         if (document.$doctype()['$==']("manpage")) {
-          self.$parse_manpage_header(reader, document, block_attrs)};
+          self.$parse_manpage_header(reader, document, block_attrs, header_only)};
         return document.$finalize_header(block_attrs);
-      }, $Parser_parse_document_header$5.$$arity = 2);
-      Opal.defs(self, '$parse_manpage_header', $Parser_parse_manpage_header$6 = function $$parse_manpage_header(reader, document, block_attributes) {
+      }, $Parser_parse_document_header$5.$$arity = -3);
+      Opal.defs(self, '$parse_manpage_header', $Parser_parse_manpage_header$6 = function $$parse_manpage_header(reader, document, block_attributes, header_only) {
         var $a, $b, $$7, $$8, self = this, doc_attrs = nil, $writer = nil, manvolnum = nil, mantitle = nil, manname = nil, name_section_level = nil, name_section = nil, name_section_buffer = nil, mannames = nil, manpurpose = nil, error_msg = nil;
 
         
+        
+        if (header_only == null) {
+          header_only = false;
+        };
         if ($truthy($$($nesting, 'ManpageTitleVolnumRx')['$=~']((doc_attrs = document.$attributes())['$[]']("doctitle")))) {
           
           
@@ -9597,6 +9691,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
             $writer = ["outfilesuffix", "" + "." + (manvolnum)];
             $send(doc_attrs, '[]=', Opal.to_a($writer));
             $writer[$rb_minus($writer["length"], 1)];;};
+        } else if ($truthy(header_only)) {
         } else {
           
           reader.$skip_blank_lines();
@@ -9696,7 +9791,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
           };
         };
         return nil;
-      }, $Parser_parse_manpage_header$6.$$arity = 3);
+      }, $Parser_parse_manpage_header$6.$$arity = -4);
       Opal.defs(self, '$next_section', $Parser_next_section$9 = function $$next_section(reader, parent, attributes) {
         var $a, $b, $c, $d, self = this, preamble = nil, intro = nil, part = nil, has_header = nil, book = nil, document = nil, $writer = nil, section = nil, current_level = nil, expected_next_level = nil, expected_next_level_alt = nil, title = nil, sectname = nil, next_level = nil, expected_condition = nil, new_section = nil, block_cursor = nil, new_block = nil, first_block = nil, child_block = nil;
 
@@ -9795,16 +9890,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 {
                       
                       
@@ -9816,7 +9906,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);
@@ -9828,12 +9927,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"];
@@ -9843,6 +9937,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);
@@ -9945,6 +10040,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)) {
@@ -10079,7 +10175,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
                             old_v = nil;
                           };
                           return old_v;}, $$11.$$s = self, $$11.$$arity = 2, $$11))};
-                      if ($truthy((block = extension.$process_method()['$[]'](parent, target, attributes)))) {
+                      if ($truthy(($truthy($b = (block = extension.$process_method()['$[]'](parent, target, attributes))) ? block['$!='](parent) : $b))) {
                         
                         attributes.$replace(block.$attributes());
                         break;;
@@ -10311,7 +10407,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)) {
               
@@ -10333,6 +10433,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")))) {
@@ -10382,6 +10489,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")))) {
             
@@ -10614,7 +10725,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
         };
       }, $Parser_is_delimited_block$ques$15.$$arity = -2);
       Opal.defs(self, '$build_block', $Parser_build_block$16 = function $$build_block(block_context, content_model, terminator, parent, reader, attributes, options) {
-        var $a, self = this, $case = nil, skip_processing = nil, parse_as_content_model = nil, lines = nil, block_reader = nil, block_cursor = nil, tab_size = nil, indent = nil, extension = nil, block = nil;
+        var $a, $b, self = this, $case = nil, skip_processing = nil, parse_as_content_model = nil, lines = nil, block_reader = nil, block_cursor = nil, tab_size = nil, indent = nil, extension = nil, block = nil;
 
         
         
@@ -10661,10 +10772,10 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
         if ($truthy((extension = options['$[]']("extension")))) {
           
           attributes.$delete("style");
-          if ($truthy((block = extension.$process_method()['$[]'](parent, ($truthy($a = block_reader) ? $a : $$($nesting, 'Reader').$new(lines)), attributes.$merge())))) {
+          if ($truthy(($truthy($a = (block = extension.$process_method()['$[]'](parent, ($truthy($b = block_reader) ? $b : $$($nesting, 'Reader').$new(lines)), attributes.$merge()))) ? block['$!='](parent) : $a))) {
             
             attributes.$replace(block.$attributes());
-            if ($truthy((($a = block.$content_model()['$==']("compound")) ? (lines = block.$lines())['$empty?']()['$!']() : block.$content_model()['$==']("compound")))) {
+            if ($truthy(($truthy($a = (($b = block.$content_model()['$==']("compound")) ? $$($nesting, 'Block')['$==='](block) : block.$content_model()['$==']("compound"))) ? (lines = block.$lines())['$empty?']()['$!']() : $a))) {
               
               content_model = "compound";
               block_reader = $$($nesting, 'Reader').$new(lines);};
@@ -10776,8 +10887,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
@@ -11001,7 +11113,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;
 
         
         
@@ -11022,12 +11134,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")) {
               
@@ -11036,11 +11150,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"))) {
                 
@@ -11049,16 +11163,36 @@ 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)) {
+              
+              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))) {
               
@@ -11076,7 +11210,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 {
               
@@ -11091,7 +11225,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")))) {
@@ -11112,7 +11246,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;
@@ -11156,6 +11290,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?']())) {
@@ -11186,17 +11324,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;
@@ -11407,60 +11546,58 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
             sect_level = 0};};
         return [sect_id, sect_reftext, sect_title, sect_level, atx];
       }, $Parser_parse_section_title$40.$$arity = -3);
-      Opal.defs(self, '$parse_header_metadata', $Parser_parse_header_metadata$41 = function $$parse_header_metadata(reader, document) {
-        var $a, $$42, $$43, $$44, self = this, doc_attrs = nil, implicit_authors = nil, metadata = nil, implicit_author = nil, implicit_authorinitials = nil, author_metadata = nil, rev_metadata = nil, rev_line = nil, match = nil, $writer = nil, component = nil, author_line = nil, authors = nil, author_idx = nil, author_key = nil, explicit = nil, sparse = nil, author_override = nil;
+      Opal.defs(self, '$parse_header_metadata', $Parser_parse_header_metadata$41 = function $$parse_header_metadata(reader, document, retrieve) {
+        var $a, $$42, $$43, $$44, self = this, doc_attrs = nil, authorcount = nil, implicit_author_metadata = nil, $writer = nil, implicit_author = nil, implicit_authorinitials = nil, implicit_authors = nil, rev_line = nil, match = nil, rev_metadata = nil, component = nil, author_line = nil, author_metadata = nil, authors = nil, author_idx = nil, author_key = nil, explicit = nil, sparse = nil, author_override = nil;
 
         
         
         if (document == null) {
           document = nil;
         };
+        
+        if (retrieve == null) {
+          retrieve = true;
+        };
         doc_attrs = ($truthy($a = document) ? document.$attributes() : $a);
         self.$process_attribute_entries(reader, document);
-        $a = [(implicit_authors = $hash2([], {})), nil, nil], (metadata = $a[0]), (implicit_author = $a[1]), (implicit_authorinitials = $a[2]), $a;
         if ($truthy(($truthy($a = reader['$has_more_lines?']()) ? reader['$next_line_empty?']()['$!']() : $a))) {
           
-          if ($truthy((author_metadata = self.$process_authors(reader.$read_line()))['$empty?']())) {
-          } else {
+          authorcount = (implicit_author_metadata = self.$process_authors(reader.$read_line())).$delete("authorcount");
+          if ($truthy(($truthy($a = document) ? $rb_gt((($writer = ["authorcount", authorcount]), $send(doc_attrs, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]), 0) : $a))) {
             
-            if ($truthy(document)) {
-              
-              $send(author_metadata, 'each', [], ($$42 = function(key, val){var self = $$42.$$s || this, $writer = nil;
+            $send(implicit_author_metadata, 'each', [], ($$42 = function(key, val){var self = $$42.$$s || this;
 
+            
               
+              if (key == null) {
+                key = nil;
+              };
+              
+              if (val == null) {
+                val = nil;
+              };
+              if ($truthy(doc_attrs['$key?'](key))) {
+                return nil
+              } else {
                 
-                if (key == null) {
-                  key = nil;
-                };
-                
-                if (val == null) {
-                  val = nil;
-                };
-                if ($truthy(doc_attrs['$key?'](key))) {
-                  return nil
-                } else {
-                  
-                  $writer = [key, (function() {if ($truthy($$$('::', 'String')['$==='](val))) {
-                    
-                    return document.$apply_header_subs(val);
-                  } else {
-                    return val
-                  }; return nil; })()];
-                  $send(doc_attrs, '[]=', Opal.to_a($writer));
-                  return $writer[$rb_minus($writer["length"], 1)];
-                };}, $$42.$$s = self, $$42.$$arity = 2, $$42));
-              implicit_author = doc_attrs['$[]']("author");
-              implicit_authorinitials = doc_attrs['$[]']("authorinitials");
-              implicit_authors = doc_attrs['$[]']("authors");};
-            metadata = author_metadata;
-          };
+                $writer = [key, document.$apply_header_subs(val)];
+                $send(doc_attrs, '[]=', Opal.to_a($writer));
+                return $writer[$rb_minus($writer["length"], 1)];
+              };}, $$42.$$s = self, $$42.$$arity = 2, $$42));
+            implicit_author = doc_attrs['$[]']("author");
+            implicit_authorinitials = doc_attrs['$[]']("authorinitials");
+            implicit_authors = doc_attrs['$[]']("authors");};
+          
+          $writer = ["authorcount", authorcount];
+          $send(implicit_author_metadata, '[]=', Opal.to_a($writer));
+          $writer[$rb_minus($writer["length"], 1)];;
           self.$process_attribute_entries(reader, document);
-          rev_metadata = $hash2([], {});
           if ($truthy(($truthy($a = reader['$has_more_lines?']()) ? reader['$next_line_empty?']()['$!']() : $a))) {
             
             rev_line = reader.$read_line();
             if ($truthy((match = $$($nesting, 'RevisionInfoLineRx').$match(rev_line)))) {
               
+              rev_metadata = $hash2([], {});
               if ($truthy(match['$[]'](1))) {
                 
                 $writer = ["revnumber", match['$[]'](1).$rstrip()];
@@ -11483,38 +11620,33 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
                 $writer = ["revremark", match['$[]'](3).$rstrip()];
                 $send(rev_metadata, '[]=', Opal.to_a($writer));
                 $writer[$rb_minus($writer["length"], 1)];};
-            } else {
-              reader.$unshift_line(rev_line)
-            };};
-          if ($truthy(rev_metadata['$empty?']())) {
-          } else {
-            
-            if ($truthy(document)) {
-              $send(rev_metadata, 'each', [], ($$43 = function(key, val){var self = $$43.$$s || this;
+              if ($truthy(($truthy($a = document) ? rev_metadata['$empty?']()['$!']() : $a))) {
+                $send(rev_metadata, 'each', [], ($$43 = function(key, val){var self = $$43.$$s || this;
 
-              
                 
-                if (key == null) {
-                  key = nil;
-                };
-                
-                if (val == null) {
-                  val = nil;
-                };
-                if ($truthy(doc_attrs['$key?'](key))) {
-                  return nil
-                } else {
                   
-                  $writer = [key, document.$apply_header_subs(val)];
-                  $send(doc_attrs, '[]=', Opal.to_a($writer));
-                  return $writer[$rb_minus($writer["length"], 1)];
-                };}, $$43.$$s = self, $$43.$$arity = 2, $$43))};
-            metadata.$update(rev_metadata);
-          };
+                  if (key == null) {
+                    key = nil;
+                  };
+                  
+                  if (val == null) {
+                    val = nil;
+                  };
+                  if ($truthy(doc_attrs['$key?'](key))) {
+                    return nil
+                  } else {
+                    
+                    $writer = [key, document.$apply_header_subs(val)];
+                    $send(doc_attrs, '[]=', Opal.to_a($writer));
+                    return $writer[$rb_minus($writer["length"], 1)];
+                  };}, $$43.$$s = self, $$43.$$arity = 2, $$43))};
+            } else {
+              reader.$unshift_line(rev_line)
+            };};
           self.$process_attribute_entries(reader, document);
           reader.$skip_blank_lines();
         } else {
-          author_metadata = $hash2([], {})
+          implicit_author_metadata = $hash2([], {})
         };
         if ($truthy(document)) {
           
@@ -11530,7 +11662,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
             $a = [[], 1, "author_1", false, false], (authors = $a[0]), (author_idx = $a[1]), (author_key = $a[2]), (explicit = $a[3]), (sparse = $a[4]), $a;
             while ($truthy(doc_attrs['$key?'](author_key))) {
               
-              if ((author_override = doc_attrs['$[]'](author_key))['$=='](author_metadata['$[]'](author_key))) {
+              if ((author_override = doc_attrs['$[]'](author_key))['$=='](implicit_author_metadata['$[]'](author_key))) {
                 
                 authors['$<<'](nil);
                 sparse = true;
@@ -11558,7 +11690,7 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
                   if ($truthy(author)) {
                     return nil;};
                   
-                  $writer = [idx, $send([author_metadata['$[]']("" + "firstname_" + ((name_idx = $rb_plus(idx, 1)))), author_metadata['$[]']("" + "middlename_" + (name_idx)), author_metadata['$[]']("" + "lastname_" + (name_idx))].$compact(), 'map', [], ($$45 = function(it){var self = $$45.$$s || this;
+                  $writer = [idx, $send([implicit_author_metadata['$[]']("" + "firstname_" + ((name_idx = $rb_plus(idx, 1)))), implicit_author_metadata['$[]']("" + "middlename_" + (name_idx)), implicit_author_metadata['$[]']("" + "lastname_" + (name_idx))].$compact(), 'map', [], ($$45 = function(it){var self = $$45.$$s || this;
 
                   
                     
@@ -11570,11 +11702,18 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
                   return $writer[$rb_minus($writer["length"], 1)];;}, $$44.$$s = self, $$44.$$arity = 2, $$44))};
               author_metadata = self.$process_authors(authors, true, false);
             } else {
-              author_metadata = $hash2([], {})
+              author_metadata = $hash2(["authorcount"], {"authorcount": 0})
             };
           };
-          if ($truthy(author_metadata['$empty?']())) {
-            ($truthy($a = metadata['$[]']("authorcount")) ? $a : (($writer = ["authorcount", (($writer = ["authorcount", 0]), $send(doc_attrs, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)])]), $send(metadata, '[]=', Opal.to_a($writer)), $writer[$rb_minus($writer["length"], 1)]))
+          if (author_metadata['$[]']("authorcount")['$=='](0)) {
+            if ($truthy(authorcount)) {
+              author_metadata = nil
+            } else {
+              
+              $writer = ["authorcount", 0];
+              $send(doc_attrs, '[]=', Opal.to_a($writer));
+              $writer[$rb_minus($writer["length"], 1)];
+            }
           } else {
             
             doc_attrs.$update(author_metadata);
@@ -11584,7 +11723,11 @@ Opal.modules["asciidoctor/parser"] = function(Opal) {
               $send(doc_attrs, '[]=', Opal.to_a($writer));
               $writer[$rb_minus($writer["length"], 1)];};
           };};
-        return metadata;
+        if ($truthy(retrieve)) {
+          return implicit_author_metadata.$merge(rev_metadata.$to_h(), author_metadata.$to_h())
+        } else {
+          return nil
+        };
       }, $Parser_parse_header_metadata$41.$$arity = -2);
       Opal.defs(self, '$process_authors', $Parser_process_authors$46 = function $$process_authors(author_line, names_only, multiple) {
         var $a, $$47, self = this, author_metadata = nil, author_idx = nil, $writer = nil;
@@ -12679,7 +12822,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;
       
@@ -12690,6 +12833,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");
@@ -12735,23 +12879,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)) {
@@ -12761,9 +12912,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))) {
@@ -12784,9 +12935,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)) {
@@ -12799,18 +12950,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;
 
           
             
@@ -12821,14 +12972,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;
 
         
@@ -12853,6 +13004,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))
           }
@@ -12869,9 +13022,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;
 
         
@@ -12885,10 +13038,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;
 
         
         
@@ -12979,7 +13132,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;
 
             
               
@@ -13002,9 +13155,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;
 
             
               
@@ -13015,7 +13168,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)) {
           
@@ -13036,10 +13189,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;
 
         
         
@@ -13058,7 +13211,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;
 
         
           
@@ -13079,7 +13232,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)) {
@@ -13087,9 +13240,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))) {
@@ -13097,7 +13250,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)
 };
@@ -13124,7 +13277,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', '$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');
 
@@ -13269,26 +13422,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);
       
@@ -13780,7 +13938,7 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
     (function($base, $super, $parent_nesting) {
       var self = $klass($base, $super, 'PreprocessorReader');
 
-      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$79, $PreprocessorReader_pop_include$81, $PreprocessorReader_split_delimited_value$82, $PreprocessorReader_skip_front_matter$excl$83, $PreprocessorReader_resolve_expr_val$84;
+      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;
       
@@ -13903,27 +14061,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>"
           };
@@ -14256,7 +14408,7 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
       }, $PreprocessorReader_preprocess_conditional_directive$61.$$arity = 4);
       
       Opal.def(self, '$preprocess_include_directive', $PreprocessorReader_preprocess_include_directive$66 = function $$preprocess_include_directive(target, attrlist) {
-        var $a, $b, $$67, $$68, $$69, $$70, $$71, $$72, $$74, $$77, $$78, self = this, doc = nil, expanded_target = nil, attr_missing = nil, ext = nil, parsed_attrs = nil, inc_path = nil, target_type = nil, relpath = nil, $case = nil, reader = nil, read_mode = nil, enc = nil, $writer = nil, read_mode_params = nil, inc_linenos = nil, inc_tags = nil, tag = nil, inc_lines = nil, inc_offset = nil, inc_lineno = nil, tag_stack = nil, tags_used = nil, active_tag = nil, select = nil, base_select = nil, wildcard = nil, missing_tags = nil, inc_content = nil;
+        var $a, $b, $$67, $$68, $$69, $$70, $$71, $$72, $$74, $$77, $$78, $$79, self = this, doc = nil, expanded_target = nil, attr_missing = nil, ext = nil, parsed_attrs = nil, inc_path = nil, target_type = nil, relpath = nil, $case = nil, reader = nil, read_mode = nil, enc = nil, $writer = nil, read_mode_params = nil, inc_linenos = nil, inc_tags = nil, tag = nil, inc_lines = nil, inc_offset = nil, inc_lineno = nil, tag_stack = nil, tags_selected = nil, active_tag = nil, select = nil, base_select = nil, wildcard = nil, missing_tags = nil, inc_content = nil;
 
         
         doc = self.document;
@@ -14305,7 +14457,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")))) {
@@ -14460,7 +14615,7 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
               self.$push_include(inc_lines, inc_path, relpath, inc_offset, parsed_attrs);};
           } else if ($truthy(inc_tags)) {
             
-            $a = [[], nil, 0, [], $$$('::', 'Set').$new(), nil], (inc_lines = $a[0]), (inc_offset = $a[1]), (inc_lineno = $a[2]), (tag_stack = $a[3]), (tags_used = $a[4]), (active_tag = $a[5]), $a;
+            $a = [[], nil, 0, [], $$$('::', 'Set').$new(), nil], (inc_lines = $a[0]), (inc_offset = $a[1]), (inc_lineno = $a[2]), (tag_stack = $a[3]), (tags_selected = $a[4]), (active_tag = $a[5]), $a;
             if ($truthy(inc_tags['$key?']("**"))) {
               
               select = (base_select = inc_tags.$delete("**"));
@@ -14536,8 +14691,9 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
                       }
                     } else if ($truthy(inc_tags['$key?'](this_tag))) {
                       
-                      tags_used['$<<'](this_tag);
-                      return tag_stack['$<<']([(active_tag = this_tag), (select = inc_tags['$[]'](this_tag)), inc_lineno]);
+                      if ($truthy((select = inc_tags['$[]'](this_tag)))) {
+                        tags_selected['$<<'](this_tag)};
+                      return tag_stack['$<<']([(active_tag = this_tag), select, inc_lineno]);
                     } else if ($truthy(wildcard['$nil?']()['$!']())) {
                       
                       select = (function() {if ($truthy(($truthy($d = active_tag) ? select['$!']() : $d))) {
@@ -14584,7 +14740,18 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
                 };
                 return self.$logger().$warn(self.$message_with_context("" + "detected unclosed tag '" + (tag_name) + "' starting at line " + (tag_lineno) + " of include " + (target_type) + ": " + (inc_path), $hash2(["source_location", "include_location"], {"source_location": self.$cursor(), "include_location": self.$create_include_cursor(inc_path, expanded_target, tag_lineno)})));}, $$77.$$s = self, $$77.$$arity = 3, $$77))
             };
-            if ($truthy((missing_tags = $rb_minus(inc_tags.$keys(), tags_used.$to_a()))['$empty?']())) {
+            if ($truthy((missing_tags = $rb_minus($send(inc_tags, 'keep_if', [], ($$78 = function(_, v){var self = $$78.$$s || this;
+
+            
+              
+              if (_ == null) {
+                _ = nil;
+              };
+              
+              if (v == null) {
+                v = nil;
+              };
+              return v;}, $$78.$$s = self, $$78.$$arity = 2, $$78)).$keys(), tags_selected.$to_a()))['$empty?']())) {
             } else {
               self.$logger().$warn(self.$message_with_context("" + "tag" + ((function() {if ($truthy($rb_gt(missing_tags.$size(), 1))) {
                 return "s"
@@ -14605,18 +14772,19 @@ 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], ($$78 = function(f){var self = $$78.$$s || this;
+              inc_content = $send(reader, 'call', [inc_path, read_mode], ($$79 = function(f){var self = $$79.$$s || this;
 
               
                 
                 if (f == null) {
                   f = nil;
                 };
-                return f.$read();}, $$78.$$s = self, $$78.$$arity = 1, $$78));
+                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 {
@@ -14625,7 +14793,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 {
@@ -14633,8 +14802,8 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
         };
       }, $PreprocessorReader_preprocess_include_directive$66.$$arity = 2);
       
-      Opal.def(self, '$resolve_include_path', $PreprocessorReader_resolve_include_path$79 = function $$resolve_include_path(target, attrlist, attributes) {
-        var $a, $b, $$80, self = this, doc = nil, inc_path = nil, relpath = nil;
+      Opal.def(self, '$resolve_include_path', $PreprocessorReader_resolve_include_path$80 = function $$resolve_include_path(target, attrlist, attributes) {
+        var $a, $b, $$81, self = this, doc = nil, inc_path = nil, relpath = nil;
 
         
         doc = self.document;
@@ -14647,7 +14816,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))) {
@@ -14663,9 +14835,9 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
           if ($truthy($$$('::', 'File')['$file?'](inc_path))) {
           } else if ($truthy(attributes['$[]']("optional-option"))) {
             
-            $send(self.$logger(), 'info', [], ($$80 = function(){var self = $$80.$$s || this;
+            $send(self.$logger(), 'info', [], ($$81 = function(){var self = $$81.$$s || this;
 
-            return self.$message_with_context("" + "optional include dropped because include file not found: " + (inc_path), $hash2(["source_location"], {"source_location": self.$cursor()}))}, $$80.$$s = self, $$80.$$arity = 0, $$80));
+            return self.$message_with_context("" + "optional include dropped because include file not found: " + (inc_path), $hash2(["source_location"], {"source_location": self.$cursor()}))}, $$81.$$s = self, $$81.$$arity = 0, $$81));
             self.$shift();
             return true;
           } else {
@@ -14676,9 +14848,9 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
           relpath = doc.$path_resolver().$relative_path(inc_path, doc.$base_dir());
           return [inc_path, "file", relpath];
         };
-      }, $PreprocessorReader_resolve_include_path$79.$$arity = 3);
+      }, $PreprocessorReader_resolve_include_path$80.$$arity = 3);
       
-      Opal.def(self, '$pop_include', $PreprocessorReader_pop_include$81 = function $$pop_include() {
+      Opal.def(self, '$pop_include', $PreprocessorReader_pop_include$82 = function $$pop_include() {
         var $a, $b, self = this;
 
         if ($truthy(self.include_stack['$empty?']())) {
@@ -14689,9 +14861,9 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
           self.look_ahead = 0;
           return nil;
         }
-      }, $PreprocessorReader_pop_include$81.$$arity = 0);
+      }, $PreprocessorReader_pop_include$82.$$arity = 0);
       
-      Opal.def(self, '$split_delimited_value', $PreprocessorReader_split_delimited_value$82 = function $$split_delimited_value(val) {
+      Opal.def(self, '$split_delimited_value', $PreprocessorReader_split_delimited_value$83 = function $$split_delimited_value(val) {
         var self = this;
 
         if ($truthy(val['$include?'](","))) {
@@ -14701,45 +14873,43 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
           
           return val.$split(";");
         }
-      }, $PreprocessorReader_split_delimited_value$82.$$arity = 1);
+      }, $PreprocessorReader_split_delimited_value$83.$$arity = 1);
       
-      Opal.def(self, '$skip_front_matter!', $PreprocessorReader_skip_front_matter$excl$83 = function(data, increment_linenos) {
-        var $a, $b, self = this, front_matter = nil, original_data = nil;
+      Opal.def(self, '$skip_front_matter!', $PreprocessorReader_skip_front_matter$excl$84 = function(data, increment_linenos) {
+        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$83.$$arity = -2);
-      return (Opal.def(self, '$resolve_expr_val', $PreprocessorReader_resolve_expr_val$84 = function $$resolve_expr_val(val) {
+      }, $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) {
         var $a, $b, self = this, quoted = nil;
 
         
@@ -14767,7 +14937,7 @@ Opal.modules["asciidoctor/reader"] = function(Opal) {
         } else {
           return val.$to_i()
         };
-      }, $PreprocessorReader_resolve_expr_val$84.$$arity = 1), nil) && 'resolve_expr_val';
+      }, $PreprocessorReader_resolve_expr_val$85.$$arity = 1), nil) && 'resolve_expr_val';
     })($nesting[0], $$($nesting, 'Reader'), $nesting);
   })($nesting[0], $nesting)
 };
@@ -14785,7 +14955,7 @@ Opal.modules["asciidoctor/section"] = 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;
 
-  Opal.add_stubs(['$attr_accessor', '$attr_reader', '$===', '$+', '$level', '$special', '$generate_id', '$title', '$==', '$>', '$sectnum', '$reftext', '$!', '$empty?', '$sub_placeholder', '$sub_quotes', '$compat_mode', '$[]', '$attributes', '$context', '$assign_numeral', '$class', '$object_id', '$inspect', '$size', '$length', '$chr', '$[]=', '$-', '$gsub', '$downcase', '$delete', '$tr_s', '$end_with?', '$chop', '$start_with?', '$slice', '$key?', '$catalog', '$unique_id_start_index']);
+  Opal.add_stubs(['$attr_accessor', '$attr_reader', '$===', '$+', '$level', '$special', '$generate_id', '$title', '$>', '$==', '$sectnum', '$reftext', '$!', '$empty?', '$sub_placeholder', '$sub_quotes', '$compat_mode', '$[]', '$attributes', '$context', '$assign_numeral', '$class', '$object_id', '$inspect', '$size', '$length', '$chr', '$[]=', '$-', '$gsub', '$downcase', '$delete', '$tr_s', '$end_with?', '$chop', '$start_with?', '$slice', '$key?', '$catalog', '$unique_id_start_index']);
   return (function($base, $parent_nesting) {
     var self = $module($base, 'Asciidoctor');
 
@@ -14794,9 +14964,9 @@ Opal.modules["asciidoctor/section"] = function(Opal) {
     (function($base, $super, $parent_nesting) {
       var self = $klass($base, $super, 'Section');
 
-      var $nesting = [self].concat($parent_nesting), $Section_initialize$1, $Section_generate_id$2, $Section_sectnum$3, $Section_xreftext$4, $Section_$lt$lt$5, $Section_to_s$6, $Section_generate_id$7;
+      var $nesting = [self].concat($parent_nesting), $Section_initialize$1, $Section_generate_id$2, $Section_sections$ques$3, $Section_sectnum$4, $Section_xreftext$5, $Section_$lt$lt$6, $Section_to_s$7, $Section_generate_id$8;
 
-      self.$$prototype.document = self.$$prototype.level = self.$$prototype.parent = self.$$prototype.numeral = self.$$prototype.numbered = self.$$prototype.sectname = self.$$prototype.title = self.$$prototype.blocks = nil;
+      self.$$prototype.document = self.$$prototype.next_section_index = self.$$prototype.level = self.$$prototype.parent = self.$$prototype.numeral = self.$$prototype.numbered = self.$$prototype.sectname = self.$$prototype.title = self.$$prototype.blocks = nil;
       
       self.$attr_accessor("index");
       self.$attr_accessor("sectname");
@@ -14842,7 +15012,13 @@ Opal.modules["asciidoctor/section"] = function(Opal) {
         return $$($nesting, 'Section').$generate_id(self.$title(), self.document)
       }, $Section_generate_id$2.$$arity = 0);
       
-      Opal.def(self, '$sectnum', $Section_sectnum$3 = function $$sectnum(delimiter, append) {
+      Opal.def(self, '$sections?', $Section_sections$ques$3 = function() {
+        var self = this;
+
+        return $rb_gt(self.next_section_index, 0)
+      }, $Section_sections$ques$3.$$arity = 0);
+      
+      Opal.def(self, '$sectnum', $Section_sectnum$4 = function $$sectnum(delimiter, append) {
         var $a, self = this;
 
         
@@ -14864,9 +15040,9 @@ Opal.modules["asciidoctor/section"] = function(Opal) {
         } else {
           return "" + (self.numeral) + (append)
         };
-      }, $Section_sectnum$3.$$arity = -1);
+      }, $Section_sectnum$4.$$arity = -1);
       
-      Opal.def(self, '$xreftext', $Section_xreftext$4 = function $$xreftext(xrefstyle) {
+      Opal.def(self, '$xreftext', $Section_xreftext$5 = function $$xreftext(xrefstyle) {
         var $a, self = this, val = nil, $case = nil, type = nil, quoted_title = nil, signifier = nil;
 
         
@@ -14914,12 +15090,12 @@ Opal.modules["asciidoctor/section"] = function(Opal) {
         } else {
           return self.$title()
         };
-      }, $Section_xreftext$4.$$arity = -1);
+      }, $Section_xreftext$5.$$arity = -1);
       
-      Opal.def(self, '$<<', $Section_$lt$lt$5 = function(block) {
-        var $iter = $Section_$lt$lt$5.$$p, $yield = $iter || nil, self = this, $zuper = nil, $zuper_i = nil, $zuper_ii = nil;
+      Opal.def(self, '$<<', $Section_$lt$lt$6 = function(block) {
+        var $iter = $Section_$lt$lt$6.$$p, $yield = $iter || nil, self = this, $zuper = nil, $zuper_i = nil, $zuper_ii = nil;
 
-        if ($iter) $Section_$lt$lt$5.$$p = null;
+        if ($iter) $Section_$lt$lt$6.$$p = null;
         // Prepare super implicit arguments
         for($zuper_i = 0, $zuper_ii = arguments.length, $zuper = new Array($zuper_ii); $zuper_i < $zuper_ii; $zuper_i++) {
           $zuper[$zuper_i] = arguments[$zuper_i];
@@ -14927,13 +15103,13 @@ Opal.modules["asciidoctor/section"] = function(Opal) {
         
         if (block.$context()['$==']("section")) {
           self.$assign_numeral(block)};
-        return $send(self, Opal.find_super_dispatcher(self, '<<', $Section_$lt$lt$5, false), $zuper, $iter);
-      }, $Section_$lt$lt$5.$$arity = 1);
+        return $send(self, Opal.find_super_dispatcher(self, '<<', $Section_$lt$lt$6, false), $zuper, $iter);
+      }, $Section_$lt$lt$6.$$arity = 1);
       
-      Opal.def(self, '$to_s', $Section_to_s$6 = function $$to_s() {
-        var $iter = $Section_to_s$6.$$p, $yield = $iter || nil, self = this, formal_title = nil, $zuper = nil, $zuper_i = nil, $zuper_ii = nil;
+      Opal.def(self, '$to_s', $Section_to_s$7 = function $$to_s() {
+        var $iter = $Section_to_s$7.$$p, $yield = $iter || nil, self = this, formal_title = nil, $zuper = nil, $zuper_i = nil, $zuper_ii = nil;
 
-        if ($iter) $Section_to_s$6.$$p = null;
+        if ($iter) $Section_to_s$7.$$p = null;
         // Prepare super implicit arguments
         for($zuper_i = 0, $zuper_ii = arguments.length, $zuper = new Array($zuper_ii); $zuper_i < $zuper_ii; $zuper_i++) {
           $zuper[$zuper_i] = arguments[$zuper_i];
@@ -14947,10 +15123,10 @@ Opal.modules["asciidoctor/section"] = function(Opal) {
           }; return nil; })();
           return "" + "#<" + (self.$class()) + "@" + (self.$object_id()) + " {level: " + (self.level) + ", title: " + (formal_title.$inspect()) + ", blocks: " + (self.blocks.$size()) + "}>";
         } else {
-          return $send(self, Opal.find_super_dispatcher(self, 'to_s', $Section_to_s$6, false), $zuper, $iter)
+          return $send(self, Opal.find_super_dispatcher(self, 'to_s', $Section_to_s$7, false), $zuper, $iter)
         }
-      }, $Section_to_s$6.$$arity = 0);
-      return (Opal.defs(self, '$generate_id', $Section_generate_id$7 = function $$generate_id(title, document) {
+      }, $Section_to_s$7.$$arity = 0);
+      return (Opal.defs(self, '$generate_id', $Section_generate_id$8 = function $$generate_id(title, document) {
         var $a, $b, self = this, attrs = nil, pre = nil, sep = nil, no_sep = nil, $writer = nil, sep_sub = nil, gen_id = nil, ids = nil, cnt = nil, candidate_id = nil;
 
         
@@ -14988,7 +15164,7 @@ Opal.modules["asciidoctor/section"] = function(Opal) {
         } else {
           return gen_id
         };
-      }, $Section_generate_id$7.$$arity = 2), nil) && 'generate_id';
+      }, $Section_generate_id$8.$$arity = 2), nil) && 'generate_id';
     })($nesting[0], $$($nesting, 'AbstractBlock'), $nesting)
   })($nesting[0], $nesting)
 };
@@ -16612,7 +16788,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)
@@ -17221,7 +17397,7 @@ Opal.modules["asciidoctor/converter/html5"] = 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, $hash2 = Opal.hash2, $truthy = Opal.truthy, $gvars = Opal.gvars;
 
-  Opal.add_stubs(['$register_for', '$default=', '$-', '$==', '$[]', '$init_backend_traits', '$node_name', '$===', '$convert_inline_quoted', '$convert_paragraph', '$convert_inline_anchor', '$convert_section', '$convert_listing', '$convert_literal', '$convert_ulist', '$convert_olist', '$convert_dlist', '$convert_admonition', '$convert_colist', '$convert_embedded', '$convert_example', '$convert_floating_title', '$convert_image', '$convert_inline_break', '$convert_inline_button', '$convert_inline_callout', '$convert_inline_footnote', '$convert_inline_image', '$convert_inline_indexterm', '$convert_inline_kbd', '$convert_inline_menu', '$convert_open', '$convert_page_break', '$convert_preamble', '$convert_quote', '$convert_sidebar', '$convert_stem', '$convert_table', '$convert_thematic_break', '$convert_verse', '$convert_video', '$convert_document', '$convert_toc', '$convert_pass', '$convert_audio', '$empty?', '$attr', '$attr?', '$<<', '$include?', '$sub_replacements', '$gsub', '$extname', '$slice', '$length', '$doctitle', '$normalize_web_path', '$primary_stylesheet_data', '$instance', '$read_contents', '$syntax_highlighter', '$size', '$docinfo', '$id', '$sections?', '$doctype', '$role?', '$role', '$join', '$noheader', '$convert', '$converter', '$generate_manname_section', '$header?', '$notitle', '$title', '$header', '$each', '$authors', '$>', '$name', '$email', '$sub_macros', '$+', '$downcase', '$concat', '$content', '$footnotes?', '$!', '$footnotes', '$index', '$text', '$nofooter', '$docinfo?', '$[]=', '$delete_at', '$inspect', '$!=', '$to_i', '$attributes', '$document', '$sections', '$level', '$caption', '$captioned_title', '$numbered', '$<=', '$<', '$sectname', '$sectnum', '$convert_outline', '$title?', '$icon_uri', '$compact', '$media_uri', '$option?', '$append_boolean_attribute', '$style', '$items', '$blocks?', '$text?', '$chomp', '$safe', '$read_svg_contents', '$alt', '$image_uri', '$encode_attribute_value', '$append_link_constraint_attrs', '$highlight?', '$to_sym', '$format', '$*', '$count', '$start_with?', '$end_with?', '$list_marker_keyword', '$parent', '$warn', '$logger', '$context', '$error', '$new', '$columns', '$to_h', '$rows', '$colspan', '$rowspan', '$unshift', '$shift', '$pop', '$split', '$nil_or_empty?', '$type', '$catalog', '$get_root_document', '$xreftext', '$target', '$reftext', '$chop', '$sub', '$match', '$private', '$upcase', '$nested?', '$parent_document', '$to_s', '$handles?', '$send']);
+  Opal.add_stubs(['$register_for', '$default=', '$-', '$==', '$[]', '$init_backend_traits', '$node_name', '$===', '$convert_inline_quoted', '$convert_paragraph', '$convert_inline_anchor', '$convert_section', '$convert_listing', '$convert_literal', '$convert_ulist', '$convert_olist', '$convert_dlist', '$convert_admonition', '$convert_colist', '$convert_embedded', '$convert_example', '$convert_floating_title', '$convert_image', '$convert_inline_break', '$convert_inline_button', '$convert_inline_callout', '$convert_inline_footnote', '$convert_inline_image', '$convert_inline_indexterm', '$convert_inline_kbd', '$convert_inline_menu', '$convert_open', '$convert_page_break', '$convert_preamble', '$convert_quote', '$convert_sidebar', '$convert_stem', '$convert_table', '$convert_thematic_break', '$convert_verse', '$convert_video', '$convert_document', '$convert_toc', '$convert_pass', '$convert_audio', '$empty?', '$attr', '$attr?', '$<<', '$include?', '$sub_replacements', '$gsub', '$extname', '$slice', '$length', '$doctitle', '$normalize_web_path', '$primary_stylesheet_data', '$instance', '$read_contents', '$syntax_highlighter', '$size', '$docinfo', '$id', '$sections?', '$doctype', '$role?', '$role', '$join', '$noheader', '$convert', '$converter', '$generate_manname_section', '$header?', '$notitle', '$title', '$header', '$each', '$authors', '$>', '$name', '$email', '$sub_macros', '$+', '$downcase', '$concat', '$content', '$footnotes?', '$!', '$footnotes', '$index', '$text', '$nofooter', '$docinfo?', '$[]=', '$delete_at', '$inspect', '$!=', '$to_i', '$attributes', '$document', '$sections', '$level', '$caption', '$captioned_title', '$numbered', '$<=', '$<', '$sectname', '$sectnum', '$convert_outline', '$title?', '$icon_uri', '$compact', '$media_uri', '$option?', '$append_boolean_attribute', '$style', '$items', '$blocks?', '$text?', '$chomp', '$safe', '$read_svg_contents', '$alt', '$image_uri', '$encode_attribute_value', '$append_link_constraint_attrs', '$highlight?', '$to_sym', '$format', '$*', '$count', '$start_with?', '$end_with?', '$list_marker_keyword', '$parent', '$warn', '$logger', '$context', '$error', '$new', '$columns', '$to_h', '$rows', '$colspan', '$rowspan', '$unshift', '$shift', '$split', '$pop', '$nil_or_empty?', '$type', '$catalog', '$get_root_document', '$xreftext', '$target', '$reftext', '$chop', '$sub', '$match', '$private', '$upcase', '$nested?', '$parent_document', '$to_s', '$handles?', '$send']);
   return (function($base, $parent_nesting) {
     var self = $module($base, 'Asciidoctor');
 
@@ -17230,7 +17406,7 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
     (function($base, $super, $parent_nesting) {
       var self = $klass($base, $super, 'Html5Converter');
 
-      var $nesting = [self].concat($parent_nesting), $Html5Converter_initialize$1, $Html5Converter_convert$2, $Html5Converter_convert_document$3, $Html5Converter_convert_embedded$6, $Html5Converter_convert_outline$8, $Html5Converter_convert_section$10, $Html5Converter_convert_admonition$11, $Html5Converter_convert_audio$12, $Html5Converter_convert_colist$13, $Html5Converter_convert_dlist$16, $Html5Converter_convert_example$23, $Html5Converter_convert_floating_title$24, $Html5Converter_convert_image$25, $Html5Converter_convert_listing$26, $Html5Converter_convert_literal$27, $Html5Converter_convert_stem$28, $Html5Converter_convert_olist$30, $Html5Converter_convert_open$32, $Html5Converter_convert_page_break$33, $Html5Converter_convert_paragraph$34, $Html5Converter_convert_preamble$35, $Html5Converter_convert_quote$36, $Html5Converter_convert_thematic_break$37, $Html5Converter_convert_sidebar$38, $Html5Converter_convert_table$39, $Html5Converter_convert_toc$44, $Html5Converter_convert_ulist$45, $Html5Converter_convert_verse$47, $Html5Converter_convert_video$48, $Html5Converter_convert_inline_anchor$49, $Html5Converter_convert_inline_break$50, $Html5Converter_convert_inline_button$51, $Html5Converter_convert_inline_callout$52, $Html5Converter_convert_inline_footnote$53, $Html5Converter_convert_inline_image$54, $Html5Converter_convert_inline_indexterm$56, $Html5Converter_convert_inline_kbd$57, $Html5Converter_convert_inline_menu$58, $Html5Converter_convert_inline_quoted$59, $Html5Converter_read_svg_contents$60, $Html5Converter_append_boolean_attribute$62, $Html5Converter_append_link_constraint_attrs$63, $Html5Converter_encode_attribute_value$64, $Html5Converter_generate_manname_section$65, $Html5Converter_get_root_document$66, $Html5Converter_method_missing$67, $Html5Converter_respond_to_missing$ques$68, $writer = nil;
+      var $nesting = [self].concat($parent_nesting), $Html5Converter_initialize$1, $Html5Converter_convert$2, $Html5Converter_convert_document$3, $Html5Converter_convert_embedded$6, $Html5Converter_convert_outline$8, $Html5Converter_convert_section$10, $Html5Converter_convert_admonition$11, $Html5Converter_convert_audio$12, $Html5Converter_convert_colist$13, $Html5Converter_convert_dlist$16, $Html5Converter_convert_example$23, $Html5Converter_convert_floating_title$24, $Html5Converter_convert_image$25, $Html5Converter_convert_listing$26, $Html5Converter_convert_literal$27, $Html5Converter_convert_stem$28, $Html5Converter_convert_olist$30, $Html5Converter_convert_open$32, $Html5Converter_convert_page_break$33, $Html5Converter_convert_paragraph$34, $Html5Converter_convert_preamble$35, $Html5Converter_convert_quote$36, $Html5Converter_convert_thematic_break$37, $Html5Converter_convert_sidebar$38, $Html5Converter_convert_table$39, $Html5Converter_convert_toc$44, $Html5Converter_convert_ulist$45, $Html5Converter_convert_verse$47, $Html5Converter_convert_video$48, $Html5Converter_convert_inline_anchor$49, $Html5Converter_convert_inline_break$50, $Html5Converter_convert_inline_button$51, $Html5Converter_convert_inline_callout$52, $Html5Converter_convert_inline_footnote$53, $Html5Converter_convert_inline_image$54, $Html5Converter_convert_inline_indexterm$55, $Html5Converter_convert_inline_kbd$56, $Html5Converter_convert_inline_menu$57, $Html5Converter_convert_inline_quoted$58, $Html5Converter_read_svg_contents$59, $Html5Converter_append_boolean_attribute$61, $Html5Converter_append_link_constraint_attrs$62, $Html5Converter_encode_attribute_value$63, $Html5Converter_generate_manname_section$64, $Html5Converter_get_root_document$65, $Html5Converter_method_missing$66, $Html5Converter_respond_to_missing$ques$67, $writer = nil;
 
       self.$$prototype.void_element_slash = self.$$prototype.xml_mode = self.$$prototype.refs = self.$$prototype.resolving_xref = nil;
       
@@ -18067,7 +18243,7 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
       }, $Html5Converter_convert_floating_title$24.$$arity = 1);
       
       Opal.def(self, '$convert_image', $Html5Converter_convert_image$25 = function $$convert_image(node) {
-        var $a, $b, $c, self = this, target = nil, width_attr = nil, height_attr = nil, svg = nil, obj = nil, img = nil, fallback = nil, id_attr = nil, classes = nil, class_attr = nil, title_el = nil;
+        var $a, $b, self = this, target = nil, width_attr = nil, height_attr = nil, img = nil, fallback = nil, id_attr = nil, classes = nil, class_attr = nil, title_el = nil;
 
         
         target = node.$attr("target");
@@ -18081,18 +18257,23 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
         } else {
           return ""
         }; return nil; })();
-        if ($truthy(($truthy($a = ($truthy($b = ($truthy($c = node['$attr?']("format", "svg")) ? $c : target['$include?'](".svg"))) ? $rb_lt(node.$document().$safe(), $$$($$($nesting, 'SafeMode'), 'SECURE')) : $b)) ? ($truthy($b = (svg = node['$option?']("inline"))) ? $b : (obj = node['$option?']("interactive"))) : $a))) {
-          if ($truthy(svg)) {
+        if ($truthy(($truthy($a = ($truthy($b = node['$attr?']("format", "svg")) ? $b : target['$include?'](".svg"))) ? $rb_lt(node.$document().$safe(), $$$($$($nesting, 'SafeMode'), 'SECURE')) : $a))) {
+          if ($truthy(node['$option?']("inline"))) {
             img = ($truthy($a = self.$read_svg_contents(node, target)) ? $a : "" + "<span class=\"alt\">" + (node.$alt()) + "</span>")
-          } else if ($truthy(obj)) {
+          } else if ($truthy(node['$option?']("interactive"))) {
             
             fallback = (function() {if ($truthy(node['$attr?']("fallback"))) {
               return "" + "<img src=\"" + (node.$image_uri(node.$attr("fallback"))) + "\" alt=\"" + (self.$encode_attribute_value(node.$alt())) + "\"" + (width_attr) + (height_attr) + (self.void_element_slash) + ">"
             } else {
               return "" + "<span class=\"alt\">" + (node.$alt()) + "</span>"
             }; return nil; })();
-            img = "" + "<object type=\"image/svg+xml\" data=\"" + (node.$image_uri(target)) + "\"" + (width_attr) + (height_attr) + ">" + (fallback) + "</object>";}};
-        img = ($truthy($a = img) ? $a : "" + "<img src=\"" + (node.$image_uri(target)) + "\" alt=\"" + (self.$encode_attribute_value(node.$alt())) + "\"" + (width_attr) + (height_attr) + (self.void_element_slash) + ">");
+            img = "" + "<object type=\"image/svg+xml\" data=\"" + (node.$image_uri(target)) + "\"" + (width_attr) + (height_attr) + ">" + (fallback) + "</object>";
+          } else {
+            img = "" + "<img src=\"" + (node.$image_uri(target)) + "\" alt=\"" + (self.$encode_attribute_value(node.$alt())) + "\"" + (width_attr) + (height_attr) + (self.void_element_slash) + ">"
+          }
+        } else {
+          img = "" + "<img src=\"" + (node.$image_uri(target)) + "\" alt=\"" + (self.$encode_attribute_value(node.$alt())) + "\"" + (width_attr) + (height_attr) + (self.void_element_slash) + ">"
+        };
         if ($truthy(node['$attr?']("link"))) {
           img = "" + "<a class=\"image\" href=\"" + (node.$attr("link")) + "\"" + (self.$append_link_constraint_attrs(node).$join()) + ">" + (img) + "</a>"};
         id_attr = (function() {if ($truthy(node.$id())) {
@@ -18175,7 +18356,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);
       
@@ -18307,7 +18488,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 {
             
@@ -18475,7 +18656,7 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
       }, $Html5Converter_convert_sidebar$38.$$arity = 1);
       
       Opal.def(self, '$convert_table', $Html5Converter_convert_table$39 = function $$convert_table(node) {
-        var $a, $$40, $$41, self = this, result = nil, id_attribute = nil, frame = nil, classes = nil, stripes = nil, styles = nil, autowidth = nil, tablewidth = nil, role = nil, class_attribute = nil, style_attribute = nil, slash = nil;
+        var $a, $$40, $$41, self = this, result = nil, id_attribute = nil, frame = nil, classes = nil, stripes = nil, style_attribute = nil, autowidth = nil, tablewidth = nil, role = nil, class_attribute = nil, slash = nil;
 
         
         result = [];
@@ -18489,24 +18670,19 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
         classes = ["tableblock", "" + "frame-" + (frame), "" + "grid-" + (node.$attr("grid", "all", "table-grid"))];
         if ($truthy((stripes = node.$attr("stripes", nil, "table-stripes")))) {
           classes['$<<']("" + "stripes-" + (stripes))};
-        styles = [];
+        style_attribute = "";
         if ($truthy(($truthy($a = (autowidth = node['$option?']("autowidth"))) ? node['$attr?']("width")['$!']() : $a))) {
           classes['$<<']("fit-content")
         } else if ((tablewidth = node.$attr("tablepcwidth"))['$=='](100)) {
           classes['$<<']("stretch")
         } else {
-          styles['$<<']("" + "width: " + (tablewidth) + "%;")
+          style_attribute = "" + " style=\"width: " + (tablewidth) + "%;\""
         };
         if ($truthy(node['$attr?']("float"))) {
           classes['$<<'](node.$attr("float"))};
         if ($truthy((role = node.$role()))) {
           classes['$<<'](role)};
         class_attribute = "" + " class=\"" + (classes.$join(" ")) + "\"";
-        style_attribute = (function() {if ($truthy(styles['$empty?']())) {
-          return ""
-        } else {
-          return "" + " style=\"" + (styles.$join(" ")) + "\""
-        }; return nil; })();
         result['$<<']("" + "<table" + (id_attribute) + (class_attribute) + (style_attribute) + ">");
         if ($truthy(node['$title?']())) {
           result['$<<']("" + "<caption class=\"title\">" + (node.$captioned_title()) + "</caption>")};
@@ -18770,7 +18946,7 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
       }, $Html5Converter_convert_verse$47.$$arity = 1);
       
       Opal.def(self, '$convert_video', $Html5Converter_convert_video$48 = function $$convert_video(node) {
-        var $a, $b, self = this, xml = nil, id_attribute = nil, classes = nil, class_attribute = nil, title_element = nil, width_attribute = nil, height_attribute = nil, $case = nil, asset_uri_scheme = nil, start_anchor = nil, delimiter = nil, autoplay_param = nil, loop_param = nil, muted_param = nil, rel_param_val = nil, start_param = nil, end_param = nil, has_loop_param = nil, mute_param = nil, controls_param = nil, fs_param = nil, fs_attribute = nil, modest_param = nil, theme_param = nil, hl_param = nil, target = nil, list = nil, list_param = nil, playlist = nil, poster_attribute = nil, val = nil, preload_attribute = nil, start_t = nil, end_t = nil, time_anchor = nil;
+        var $a, $b, self = this, xml = nil, id_attribute = nil, classes = nil, class_attribute = nil, title_element = nil, width_attribute = nil, height_attribute = nil, $case = nil, asset_uri_scheme = nil, start_anchor = nil, delimiter = nil, target = nil, hash = nil, hash_param = nil, autoplay_param = nil, loop_param = nil, muted_param = nil, rel_param_val = nil, start_param = nil, end_param = nil, has_loop_param = nil, mute_param = nil, controls_param = nil, fs_param = nil, fs_attribute = nil, modest_param = nil, theme_param = nil, hl_param = nil, list = nil, list_param = nil, playlist = nil, poster_attribute = nil, val = nil, preload_attribute = nil, start_t = nil, end_t = nil, time_anchor = nil;
 
         
         xml = self.xml_mode;
@@ -18814,6 +18990,12 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
           return ""
         }; return nil; })();
         delimiter = ["?"];
+        $b = node.$attr("target").$split("/", 2), $a = Opal.to_ary($b), (target = ($a[0] == null ? nil : $a[0])), (hash = ($a[1] == null ? nil : $a[1])), $b;
+        hash_param = (function() {if ($truthy((hash = ($truthy($a = hash) ? $a : node.$attr("hash"))))) {
+          return "" + (($truthy($a = delimiter.$pop()) ? $a : "&amp;")) + "h=" + (hash)
+        } else {
+          return ""
+        }; return nil; })();
         autoplay_param = (function() {if ($truthy(node['$option?']("autoplay"))) {
           return "" + (($truthy($a = delimiter.$pop()) ? $a : "&amp;")) + "autoplay=1"
         } else {
@@ -18829,7 +19011,7 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
         } else {
           return ""
         }; return nil; })();
-        return "" + "<div" + (id_attribute) + (class_attribute) + ">" + (title_element) + "\n" + "<div class=\"content\">\n" + "<iframe" + (width_attribute) + (height_attribute) + " src=\"" + (asset_uri_scheme) + "//player.vimeo.com/video/" + (node.$attr("target")) + (autoplay_param) + (loop_param) + (muted_param) + (start_anchor) + "\" frameborder=\"0\"" + ((function() {if ($truthy(node['$option?']("nofullscreen"))) {
+        return "" + "<div" + (id_attribute) + (class_attribute) + ">" + (title_element) + "\n" + "<div class=\"content\">\n" + "<iframe" + (width_attribute) + (height_attribute) + " src=\"" + (asset_uri_scheme) + "//player.vimeo.com/video/" + (target) + (hash_param) + (autoplay_param) + (loop_param) + (muted_param) + (start_anchor) + "\" frameborder=\"0\"" + ((function() {if ($truthy(node['$option?']("nofullscreen"))) {
           return ""
         } else {
           
@@ -18906,7 +19088,7 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
           
           $b = target.$split(",", 2), $a = Opal.to_ary($b), (target = ($a[0] == null ? nil : $a[0])), (playlist = ($a[1] == null ? nil : $a[1])), $b;
           if ($truthy((playlist = ($truthy($a = playlist) ? $a : node.$attr("playlist"))))) {
-            list_param = "" + "&amp;playlist=" + (playlist)
+            list_param = "" + "&amp;playlist=" + (target) + "," + (playlist)
           } else {
             list_param = (function() {if ($truthy(has_loop_param)) {
               return "" + "&amp;playlist=" + (target)
@@ -19082,87 +19264,85 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
       }, $Html5Converter_convert_inline_footnote$53.$$arity = 1);
       
       Opal.def(self, '$convert_inline_image', $Html5Converter_convert_inline_image$54 = function $$convert_inline_image(node) {
-        var $a, $b, $$55, $c, $d, self = this, type = nil, class_attr_val = nil, title_attr = nil, img = nil, target = nil, attrs = nil, svg = nil, obj = nil, fallback = nil, role = nil;
-
-        
-        if ($truthy((($a = (type = ($truthy($b = node.$type()) ? $b : "image"))['$==']("icon")) ? node.$document()['$attr?']("icons", "font") : (type = ($truthy($b = node.$type()) ? $b : "image"))['$==']("icon")))) {
-          
-          class_attr_val = "" + "fa fa-" + (node.$target());
-          $send($hash2(["size", "rotate", "flip"], {"size": "fa-", "rotate": "fa-rotate-", "flip": "fa-flip-"}), 'each', [], ($$55 = function(key, prefix){var self = $$55.$$s || this;
-
-          
-            
-            if (key == null) {
-              key = nil;
-            };
+        var $a, $b, self = this, target = nil, type = nil, icons = nil, i_class_attr_val = nil, attrs = nil, img = nil, fallback = nil, class_attr_val = nil, role = nil;
+
+        
+        target = node.$target();
+        if ((type = ($truthy($a = node.$type()) ? $a : "image"))['$==']("icon")) {
+          if ((icons = node.$document().$attr("icons"))['$==']("font")) {
+            
+            i_class_attr_val = "" + "fa fa-" + (target);
+            if ($truthy(node['$attr?']("size"))) {
+              i_class_attr_val = "" + (i_class_attr_val) + " fa-" + (node.$attr("size"))};
+            if ($truthy(node['$attr?']("flip"))) {
+              i_class_attr_val = "" + (i_class_attr_val) + " fa-flip-" + (node.$attr("flip"))
+            } else if ($truthy(node['$attr?']("rotate"))) {
+              i_class_attr_val = "" + (i_class_attr_val) + " fa-rotate-" + (node.$attr("rotate"))};
+            attrs = (function() {if ($truthy(node['$attr?']("title"))) {
+              return "" + " title=\"" + (node.$attr("title")) + "\""
+            } else {
+              return ""
+            }; return nil; })();
+            img = "" + "<i class=\"" + (i_class_attr_val) + "\"" + (attrs) + "></i>";
+          } else if ($truthy(icons)) {
             
-            if (prefix == null) {
-              prefix = nil;
-            };
-            if ($truthy(node['$attr?'](key))) {
-              return (class_attr_val = "" + (class_attr_val) + " " + (prefix) + (node.$attr(key)))
+            attrs = (function() {if ($truthy(node['$attr?']("width"))) {
+              return "" + " width=\"" + (node.$attr("width")) + "\""
             } else {
-              return nil
-            };}, $$55.$$s = self, $$55.$$arity = 2, $$55));
-          title_attr = (function() {if ($truthy(node['$attr?']("title"))) {
-            return "" + " title=\"" + (node.$attr("title")) + "\""
+              return ""
+            }; return nil; })();
+            if ($truthy(node['$attr?']("height"))) {
+              attrs = "" + (attrs) + " height=\"" + (node.$attr("height")) + "\""};
+            if ($truthy(node['$attr?']("title"))) {
+              attrs = "" + (attrs) + " title=\"" + (node.$attr("title")) + "\""};
+            img = "" + "<img src=\"" + (node.$icon_uri(target)) + "\" alt=\"" + (self.$encode_attribute_value(node.$alt())) + "\"" + (attrs) + (self.void_element_slash) + ">";
           } else {
-            return ""
-          }; return nil; })();
-          img = "" + "<i class=\"" + (class_attr_val) + "\"" + (title_attr) + "></i>";
-        } else if ($truthy((($a = type['$==']("icon")) ? node.$document()['$attr?']("icons")['$!']() : type['$==']("icon")))) {
-          img = "" + "[" + (node.$alt()) + "]"
+            img = "" + "[" + (node.$alt()) + "&#93;"
+          }
         } else {
           
-          target = node.$target();
-          attrs = [];
-          if ($truthy(node['$attr?']("width"))) {
-            attrs['$<<']("" + " width=\"" + (node.$attr("width")) + "\"")};
-          if ($truthy(node['$attr?']("height"))) {
-            attrs['$<<']("" + " height=\"" + (node.$attr("height")) + "\"")};
-          if ($truthy(node['$attr?']("title"))) {
-            attrs['$<<']("" + " title=\"" + (node.$attr("title")) + "\"")};
-          attrs = (function() {if ($truthy(attrs['$empty?']())) {
-            return ""
+          attrs = (function() {if ($truthy(node['$attr?']("width"))) {
+            return "" + " width=\"" + (node.$attr("width")) + "\""
           } else {
-            return attrs.$join()
+            return ""
           }; return nil; })();
-          if ($truthy(($truthy($a = ($truthy($b = ($truthy($c = type['$!=']("icon")) ? ($truthy($d = node['$attr?']("format", "svg")) ? $d : target['$include?'](".svg")) : $c)) ? $rb_lt(node.$document().$safe(), $$$($$($nesting, 'SafeMode'), 'SECURE')) : $b)) ? ($truthy($b = (svg = node['$option?']("inline"))) ? $b : (obj = node['$option?']("interactive"))) : $a))) {
-            if ($truthy(svg)) {
+          if ($truthy(node['$attr?']("height"))) {
+            attrs = "" + (attrs) + " height=\"" + (node.$attr("height")) + "\""};
+          if ($truthy(node['$attr?']("title"))) {
+            attrs = "" + (attrs) + " title=\"" + (node.$attr("title")) + "\""};
+          if ($truthy(($truthy($a = ($truthy($b = node['$attr?']("format", "svg")) ? $b : target['$include?'](".svg"))) ? $rb_lt(node.$document().$safe(), $$$($$($nesting, 'SafeMode'), 'SECURE')) : $a))) {
+            if ($truthy(node['$option?']("inline"))) {
               img = ($truthy($a = self.$read_svg_contents(node, target)) ? $a : "" + "<span class=\"alt\">" + (node.$alt()) + "</span>")
-            } else if ($truthy(obj)) {
+            } else if ($truthy(node['$option?']("interactive"))) {
               
               fallback = (function() {if ($truthy(node['$attr?']("fallback"))) {
                 return "" + "<img src=\"" + (node.$image_uri(node.$attr("fallback"))) + "\" alt=\"" + (self.$encode_attribute_value(node.$alt())) + "\"" + (attrs) + (self.void_element_slash) + ">"
               } else {
                 return "" + "<span class=\"alt\">" + (node.$alt()) + "</span>"
               }; return nil; })();
-              img = "" + "<object type=\"image/svg+xml\" data=\"" + (node.$image_uri(target)) + "\"" + (attrs) + ">" + (fallback) + "</object>";}};
-          img = ($truthy($a = img) ? $a : "" + "<img src=\"" + ((function() {if (type['$==']("icon")) {
-            
-            return node.$icon_uri(target);
+              img = "" + "<object type=\"image/svg+xml\" data=\"" + (node.$image_uri(target)) + "\"" + (attrs) + ">" + (fallback) + "</object>";
+            } else {
+              img = "" + "<img src=\"" + (node.$image_uri(target)) + "\" alt=\"" + (self.$encode_attribute_value(node.$alt())) + "\"" + (attrs) + (self.void_element_slash) + ">"
+            }
           } else {
-            
-            return node.$image_uri(target);
-          }; return nil; })()) + "\" alt=\"" + (self.$encode_attribute_value(node.$alt())) + "\"" + (attrs) + (self.void_element_slash) + ">");
+            img = "" + "<img src=\"" + (node.$image_uri(target)) + "\" alt=\"" + (self.$encode_attribute_value(node.$alt())) + "\"" + (attrs) + (self.void_element_slash) + ">"
+          };
         };
         if ($truthy(node['$attr?']("link"))) {
           img = "" + "<a class=\"image\" href=\"" + (node.$attr("link")) + "\"" + (self.$append_link_constraint_attrs(node).$join()) + ">" + (img) + "</a>"};
+        class_attr_val = type;
         if ($truthy((role = node.$role()))) {
-          if ($truthy(node['$attr?']("float"))) {
-            class_attr_val = "" + (type) + " " + (node.$attr("float")) + " " + (role)
+          class_attr_val = (function() {if ($truthy(node['$attr?']("float"))) {
+            return "" + (class_attr_val) + " " + (node.$attr("float")) + " " + (role)
           } else {
-            class_attr_val = "" + (type) + " " + (role)
-          }
+            return "" + (class_attr_val) + " " + (role)
+          }; return nil; })()
         } else if ($truthy(node['$attr?']("float"))) {
-          class_attr_val = "" + (type) + " " + (node.$attr("float"))
-        } else {
-          class_attr_val = type
-        };
+          class_attr_val = "" + (class_attr_val) + " " + (node.$attr("float"))};
         return "" + "<span class=\"" + (class_attr_val) + "\">" + (img) + "</span>";
       }, $Html5Converter_convert_inline_image$54.$$arity = 1);
       
-      Opal.def(self, '$convert_inline_indexterm', $Html5Converter_convert_inline_indexterm$56 = function $$convert_inline_indexterm(node) {
+      Opal.def(self, '$convert_inline_indexterm', $Html5Converter_convert_inline_indexterm$55 = function $$convert_inline_indexterm(node) {
         var self = this;
 
         if (node.$type()['$==']("visible")) {
@@ -19170,9 +19350,9 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
         } else {
           return ""
         }
-      }, $Html5Converter_convert_inline_indexterm$56.$$arity = 1);
+      }, $Html5Converter_convert_inline_indexterm$55.$$arity = 1);
       
-      Opal.def(self, '$convert_inline_kbd', $Html5Converter_convert_inline_kbd$57 = function $$convert_inline_kbd(node) {
+      Opal.def(self, '$convert_inline_kbd', $Html5Converter_convert_inline_kbd$56 = function $$convert_inline_kbd(node) {
         var self = this, keys = nil;
 
         if ((keys = node.$attr("keys")).$size()['$=='](1)) {
@@ -19180,9 +19360,9 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
         } else {
           return "" + "<span class=\"keyseq\"><kbd>" + (keys.$join("</kbd>+<kbd>")) + "</kbd></span>"
         }
-      }, $Html5Converter_convert_inline_kbd$57.$$arity = 1);
+      }, $Html5Converter_convert_inline_kbd$56.$$arity = 1);
       
-      Opal.def(self, '$convert_inline_menu', $Html5Converter_convert_inline_menu$58 = function $$convert_inline_menu(node) {
+      Opal.def(self, '$convert_inline_menu', $Html5Converter_convert_inline_menu$57 = function $$convert_inline_menu(node) {
         var self = this, caret = nil, submenu_joiner = nil, menu = nil, submenus = nil, menuitem = nil;
 
         
@@ -19202,9 +19382,9 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
         } else {
           return "" + "<span class=\"menuseq\"><b class=\"menu\">" + (menu) + "</b>" + (caret) + "<b class=\"submenu\">" + (submenus.$join(submenu_joiner)) + "</b>" + (caret) + "<b class=\"menuitem\">" + (node.$attr("menuitem")) + "</b></span>"
         };
-      }, $Html5Converter_convert_inline_menu$58.$$arity = 1);
+      }, $Html5Converter_convert_inline_menu$57.$$arity = 1);
       
-      Opal.def(self, '$convert_inline_quoted', $Html5Converter_convert_inline_quoted$59 = function $$convert_inline_quoted(node) {
+      Opal.def(self, '$convert_inline_quoted', $Html5Converter_convert_inline_quoted$58 = function $$convert_inline_quoted(node) {
         var $a, $b, self = this, open = nil, close = nil, tag = nil, class_attr = nil;
 
         
@@ -19230,10 +19410,10 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
         } else {
           return "" + (open) + (node.$text()) + (close)
         };
-      }, $Html5Converter_convert_inline_quoted$59.$$arity = 1);
+      }, $Html5Converter_convert_inline_quoted$58.$$arity = 1);
       
-      Opal.def(self, '$read_svg_contents', $Html5Converter_read_svg_contents$60 = function $$read_svg_contents(node, target) {
-        var $$61, self = this, svg = nil, old_start_tag = nil, new_start_tag = nil, start_tag_match = nil;
+      Opal.def(self, '$read_svg_contents', $Html5Converter_read_svg_contents$59 = function $$read_svg_contents(node, target) {
+        var $$60, self = this, svg = nil, old_start_tag = nil, new_start_tag = nil, start_tag_match = nil;
 
         
         if ($truthy((svg = node.$read_contents(target, $hash2(["start", "normalize", "label", "warn_if_empty"], {"start": node.$document().$attr("imagesdir"), "normalize": true, "label": "SVG", "warn_if_empty": true}))))) {
@@ -19245,7 +19425,7 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
             svg = svg.$sub($$($nesting, 'SvgPreambleRx'), "")
           };
           old_start_tag = (new_start_tag = (start_tag_match = nil));
-          $send(["width", "height"], 'each', [], ($$61 = function(dim){var self = $$61.$$s || this, $a, $b;
+          $send(["width", "height"], 'each', [], ($$60 = function(dim){var self = $$60.$$s || this, $a, $b;
 
           
             
@@ -19263,14 +19443,14 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
                 return nil;};
               new_start_tag = (old_start_tag = start_tag_match['$[]'](0)).$gsub($$($nesting, 'DimensionAttributeRx'), "");
             };
-            return (new_start_tag = "" + (new_start_tag.$chop()) + " " + (dim) + "=\"" + (node.$attr(dim)) + "\">");}, $$61.$$s = self, $$61.$$arity = 1, $$61));
+            return (new_start_tag = "" + (new_start_tag.$chop()) + " " + (dim) + "=\"" + (node.$attr(dim)) + "\">");}, $$60.$$s = self, $$60.$$arity = 1, $$60));
           if ($truthy(new_start_tag)) {
             svg = "" + (new_start_tag) + (svg['$[]'](Opal.Range.$new(old_start_tag.$length(), -1, false)))};};
         return svg;
-      }, $Html5Converter_read_svg_contents$60.$$arity = 2);
+      }, $Html5Converter_read_svg_contents$59.$$arity = 2);
       self.$private();
       
-      Opal.def(self, '$append_boolean_attribute', $Html5Converter_append_boolean_attribute$62 = function $$append_boolean_attribute(name, xml) {
+      Opal.def(self, '$append_boolean_attribute', $Html5Converter_append_boolean_attribute$61 = function $$append_boolean_attribute(name, xml) {
         var self = this;
 
         if ($truthy(xml)) {
@@ -19278,9 +19458,9 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
         } else {
           return "" + " " + (name)
         }
-      }, $Html5Converter_append_boolean_attribute$62.$$arity = 2);
+      }, $Html5Converter_append_boolean_attribute$61.$$arity = 2);
       
-      Opal.def(self, '$append_link_constraint_attrs', $Html5Converter_append_link_constraint_attrs$63 = function $$append_link_constraint_attrs(node, attrs) {
+      Opal.def(self, '$append_link_constraint_attrs', $Html5Converter_append_link_constraint_attrs$62 = function $$append_link_constraint_attrs(node, attrs) {
         var $a, self = this, rel = nil, window = nil;
 
         
@@ -19302,9 +19482,9 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
         } else if ($truthy(rel)) {
           attrs['$<<']("" + " rel=\"" + (rel) + "\"")};
         return attrs;
-      }, $Html5Converter_append_link_constraint_attrs$63.$$arity = -2);
+      }, $Html5Converter_append_link_constraint_attrs$62.$$arity = -2);
       
-      Opal.def(self, '$encode_attribute_value', $Html5Converter_encode_attribute_value$64 = function $$encode_attribute_value(val) {
+      Opal.def(self, '$encode_attribute_value', $Html5Converter_encode_attribute_value$63 = function $$encode_attribute_value(val) {
         var self = this;
 
         if ($truthy(val['$include?']("\""))) {
@@ -19313,9 +19493,9 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
         } else {
           return val
         }
-      }, $Html5Converter_encode_attribute_value$64.$$arity = 1);
+      }, $Html5Converter_encode_attribute_value$63.$$arity = 1);
       
-      Opal.def(self, '$generate_manname_section', $Html5Converter_generate_manname_section$65 = function $$generate_manname_section(node) {
+      Opal.def(self, '$generate_manname_section', $Html5Converter_generate_manname_section$64 = function $$generate_manname_section(node) {
         var $a, self = this, manname_title = nil, next_section = nil, next_section_title = nil, manname_id_attr = nil, manname_id = nil;
 
         
@@ -19328,9 +19508,9 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
           return ""
         }; return nil; })();
         return "" + "<h2" + (manname_id_attr) + ">" + (manname_title) + "</h2>\n" + "<div class=\"sectionbody\">\n" + "<p>" + (node.$attr("mannames").$join(", ")) + " - " + (node.$attr("manpurpose")) + "</p>\n" + "</div>";
-      }, $Html5Converter_generate_manname_section$65.$$arity = 1);
+      }, $Html5Converter_generate_manname_section$64.$$arity = 1);
       
-      Opal.def(self, '$get_root_document', $Html5Converter_get_root_document$66 = function $$get_root_document(node) {
+      Opal.def(self, '$get_root_document', $Html5Converter_get_root_document$65 = function $$get_root_document(node) {
         var $a, self = this;
 
         
@@ -19338,12 +19518,12 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
           node = node.$parent_document()
         };
         return node;
-      }, $Html5Converter_get_root_document$66.$$arity = 1);
+      }, $Html5Converter_get_root_document$65.$$arity = 1);
       
-      Opal.def(self, '$method_missing', $Html5Converter_method_missing$67 = function $$method_missing(id, $a) {
-        var $post_args, args, $b, $iter = $Html5Converter_method_missing$67.$$p, $yield = $iter || nil, self = this, name = nil, $zuper = nil, $zuper_i = nil, $zuper_ii = nil;
+      Opal.def(self, '$method_missing', $Html5Converter_method_missing$66 = function $$method_missing(id, $a) {
+        var $post_args, args, $b, $iter = $Html5Converter_method_missing$66.$$p, $yield = $iter || nil, self = this, name = nil, $zuper = nil, $zuper_i = nil, $zuper_ii = nil;
 
-        if ($iter) $Html5Converter_method_missing$67.$$p = null;
+        if ($iter) $Html5Converter_method_missing$66.$$p = null;
         // Prepare super implicit arguments
         for($zuper_i = 0, $zuper_ii = arguments.length, $zuper = new Array($zuper_ii); $zuper_i < $zuper_ii; $zuper_i++) {
           $zuper[$zuper_i] = arguments[$zuper_i];
@@ -19357,10 +19537,10 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
           
           return $send(self, 'send', ["" + "convert_" + (name)].concat(Opal.to_a(args)));
         } else {
-          return $send(self, Opal.find_super_dispatcher(self, 'method_missing', $Html5Converter_method_missing$67, false), $zuper, $iter)
+          return $send(self, Opal.find_super_dispatcher(self, 'method_missing', $Html5Converter_method_missing$66, false), $zuper, $iter)
         };
-      }, $Html5Converter_method_missing$67.$$arity = -2);
-      return (Opal.def(self, '$respond_to_missing?', $Html5Converter_respond_to_missing$ques$68 = function(id, $a) {
+      }, $Html5Converter_method_missing$66.$$arity = -2);
+      return (Opal.def(self, '$respond_to_missing?', $Html5Converter_respond_to_missing$ques$67 = function(id, $a) {
         var $post_args, options, $b, self = this, name = nil;
 
         
@@ -19369,7 +19549,7 @@ Opal.modules["asciidoctor/converter/html5"] = function(Opal) {
         
         options = $post_args;;
         return ($truthy($b = (name = id.$to_s())['$start_with?']("convert_")['$!']()) ? self['$handles?'](name) : $b);
-      }, $Html5Converter_respond_to_missing$ques$68.$$arity = -2), nil) && 'respond_to_missing?';
+      }, $Html5Converter_respond_to_missing$ques$67.$$arity = -2), nil) && 'respond_to_missing?';
     })($$($nesting, 'Converter'), $$$($$($nesting, 'Converter'), 'Base'), $nesting)
   })($nesting[0], $nesting)
 };
@@ -19390,7 +19570,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 {
@@ -20328,9 +20508,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");
@@ -20344,6 +20524,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);
@@ -20352,6 +20533,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 {
@@ -20722,7 +20905,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);
@@ -20792,11 +20975,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();
             
@@ -20849,7 +21032,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;
 
           
@@ -20866,8 +21057,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)) {
@@ -20875,42 +21066,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;
@@ -20920,15 +21111,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);
           
@@ -20950,34 +21141,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);
@@ -21031,6 +21225,12 @@ Opal.modules["asciidoctor/js/asciidoctor_ext/document"] = function(Opal) {
       var nil = Opal.nil
       var utc_offset
       var source_date_epoch
+      var localdate
+      var localyear
+      var localtime
+      var localdatetime
+      var docdate
+      var doctime
 
       var getYear = function (time, utc_offset) {
         return utc_offset === 0 ? time.getUTCFullYear() : time.getFullYear()
@@ -21118,6 +21318,7 @@ Opal.modules["asciidoctor/js/asciidoctor_ext/document"] = function(Opal) {
         var mtime_hours = ('0' + (getHours(input_mtime, utc_offset))).slice(-2)
         var mtime_minutes = ('0' + (input_mtime.getMinutes())).slice(-2)
         var mtime_seconds = ('0' + (input_mtime.getSeconds())).slice(-2)
+        var utc_offset_format
         if (utc_offset === 0) {
           utc_offset_format = 'UTC'
         } else if (utc_offset > 0) {
@@ -21326,7 +21527,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 */
@@ -21461,13 +21663,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");
@@ -21993,7 +22195,7 @@ AbstractBlock.prototype.setTitle = function (title) {
  *
  * If a caption has already been assigned to this block, do nothing.
  *
- * The parts of a complete caption are: <prefix> <number>. <title>
+ * The parts of a complete caption are: `<prefix> <number>. <title>`
  * This partial caption represents the part the precedes the title.
  *
  * @param {string} value - the String caption to assign to this block or nil to use document attribute.
@@ -26771,6 +26973,21 @@ ConverterFactory.register = function (converter, backends) {
   var bridgeComposedMethodToInstance = function (obj, instance) {
     bridgeMethodToInstance(obj, instance, '$composed', 'composed')
   }
+  var bridgeEqEqMethodToInstance = function (obj, instance) {
+    bridgeMethodToInstance(obj, instance, '$==', '==', function (other) {
+      return instance === other
+    })
+  }
+  var bridgeSendMethodToInstance = function (obj, instance) {
+    bridgeMethodToInstance(obj, instance, '$send', 'send', function (symbol) {
+      var args = Array.prototype.slice.call(arguments, 1)
+      var func = instance['$' + symbol]
+      if (func) {
+        return func.apply(instance, args)
+      }
+      throw new Error(`undefined method \`${symbol}\` for \`${instance.toString()}\``)
+    })
+  }
   var bridgeMethodToInstance = function (obj, instance, methodName, functionName, defaultImplementation) {
     if (typeof obj[methodName] === 'undefined') {
       if (typeof obj[functionName] === 'function') {
@@ -26837,6 +27054,8 @@ ConverterFactory.register = function (converter, backends) {
     }
     bridgeHandlesMethodToInstance(converter, converter)
     bridgeComposedMethodToInstance(converter, converter)
+    bridgeEqEqMethodToInstance(converter, converter)
+    bridgeSendMethodToInstance(converter, converter)
     addRespondToMethod(converter)
     object = converter
   }
@@ -26936,7 +27155,7 @@ Html5Converter.prototype.convert = function (node, transform, opts) {
 }
 
 
-var ASCIIDOCTOR_JS_VERSION = '2.2.5';
+var ASCIIDOCTOR_JS_VERSION = '2.2.7';
 
   /**
    * Get Asciidoctor.js version number.