asciidoctor 1.5.4 → 1.5.5

data/data/stylesheets/asciidoctor-default.css

@@ -7,7 +7,6 @@ audio:not([controls]){display:none;height:0}
 [hidden],template{display:none}
 script{display:none!important}
 html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}
-body{margin:0}
 a{background:transparent}
 a:focus{outline:thin dotted}
 a:active,a:hover{outline:0}
@@ -42,7 +41,7 @@ textarea{overflow:auto;vertical-align:top}
 table{border-collapse:collapse;border-spacing:0}
 *,*:before,*:after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
 html,body{font-size:100%}
-body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto}
+body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
 a:hover{cursor:pointer}
 img,object,embed{max-width:100%;height:auto}
 object,embed{height:100%}
@@ -54,7 +53,6 @@ img{-ms-interpolation-mode:bicubic}
 .text-center{text-align:center!important}
 .text-justify{text-align:justify!important}
 .hide{display:none}
-body{-webkit-font-smoothing:antialiased}
 img,object,svg{display:inline-block;vertical-align:middle}
 textarea{height:auto;min-height:50px}
 select{width:100%}
@@ -109,13 +107,16 @@ table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:
 table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
 table tr.even,table tr.alt,table tr:nth-of-type(even){background:#f8f8f7}
 table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{display:table-cell;line-height:1.6}
-body{tab-size:4}
 h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
 h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
 .clearfix:before,.clearfix:after,.float-group:before,.float-group:after{content:" ";display:table}
 .clearfix:after,.float-group:after{clear:both}
-*:not(pre)>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background-color:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
+*:not(pre)>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background-color:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed;word-wrap:break-word}
+*:not(pre)>code.nobreak{word-wrap:normal}
+*:not(pre)>code.nowrap{white-space:nowrap}
 pre,pre>code{line-height:1.45;color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;text-rendering:optimizeSpeed}
+em em{font-style:normal}
+strong strong{font-weight:400}
 .keyseq{color:rgba(51,51,51,.8)}
 kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em white inset;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em #fff inset;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
 .keyseq kbd:first-child{margin-left:0}

data/lib/asciidoctor.rb

@@ -13,7 +13,6 @@ if RUBY_ENGINE == 'opal'
   require 'asciidoctor/opal_ext'
 else
   autoload :Base64, 'base64'
-  autoload :FileUtils, 'fileutils'
   autoload :OpenURI, 'open-uri'
   autoload :StringScanner, 'strscan'
 end
@@ -632,7 +631,7 @@ module Asciidoctor
     InlineSectionAnchorRx = /^(.*?)#{CG_BLANK}+(\\)?\[\[([#{CC_ALPHA}:_][#{CC_WORD}:.-]*)(?:,#{CG_BLANK}*(\S.*?))?\]\]$/
 
     # Matches invalid characters in a section id.
-    InvalidSectionIdCharsRx = /&(?:[a-zA-Z]{2,}|#\d{2,5}|#x[a-fA-F0-9]{2,4});|[^#{CC_WORD}]+?/
+    InvalidSectionIdCharsRx = /&(?:[a-zA-Z]{2,}|#\d{2,6}|#x[a-fA-F0-9]{2,5});|[^#{CC_WORD}]+?/
 
     # Matches the block style used to designate a section title as a floating title.
     #
@@ -646,7 +645,9 @@ module Asciidoctor
     ## Lists
 
     # Detects the start of any list item.
-    AnyListRx = /^(?:<?\d+>#{CG_BLANK}+#{CG_GRAPH}|#{CG_BLANK}*(?:-|(?:\*|\.|\u2022){1,5}|\d+\.|[a-zA-Z]\.|[IVXivx]+\))#{CG_BLANK}+#{CG_GRAPH}|#{CG_BLANK}*.*?(?::{2,4}|;;)(?:#{CG_BLANK}+#{CG_GRAPH}|$))/
+    #
+    # NOTE we only have to check as far as the blank character because we know it means non-whitespace follows.
+    AnyListRx = /^(?:#{CG_BLANK}*(?:-|([*.\u2022])\1{0,4}|\d+\.|[a-zA-Z]\.|[IVXivx]+\))#{CG_BLANK}|#{CG_BLANK}*.*?(?::{2,4}|;;)(?:$|#{CG_BLANK})|<?\d+>#{CG_BLANK})/
 
     # Matches an unordered list item (one level for hyphens, up to 5 levels for asterisks).
     #
@@ -656,6 +657,7 @@ module Asciidoctor
     #   - Foo
     #
     # NOTE we know trailing (.*) will match at least one character because we strip trailing spaces
+    # NOTE I want to use (-|([*\u2022])\2{0,4}) but breaks the parser since it relies on fixed match positions
     UnorderedListRx = /^#{CG_BLANK}*(-|\*{1,5}|\u2022{1,5})#{CG_BLANK}+(.*)$/
 
     # Matches an ordered list item (explicit numbering or up to 5 consecutive dots).
@@ -684,7 +686,7 @@ module Asciidoctor
       #:lowergreek => /[a-z]\]/
     }
 
-    # Matches a definition list item.
+    # Matches a description list entry.
     #
     # Examples
     #
@@ -693,26 +695,26 @@ module Asciidoctor
     #   foo::::
     #   foo;;
     #
-    #   # should be followed by a definition, on the same line...
+    #   # the term can be followed by a description on the same line...
     #
     #   foo:: That which precedes 'bar' (see also, <<bar>>)
     #
-    #   # ...or on a separate line
+    #   # ...or on a separate line (optionally indented)
     #
     #   foo::
     #     That which precedes 'bar' (see also, <<bar>>)
     #
-    #   # the term may be an attribute reference
+    #   # the term or description may be an attribute reference
     #
     #   {foo_term}:: {foo_def}
     #
     # NOTE negative match for comment line is intentional since that isn't handled when looking for next list item
-    # QUESTION should we check for line comment in regex or when scanning the lines?
+    # TODO check for line comment when scanning lines instead of in regex
     #
-    DefinitionListRx = /^(?!\/\/)#{CG_BLANK}*(.*?)(:{2,4}|;;)(?:#{CG_BLANK}+(.*))?$/
+    DescriptionListRx = /^(?!\/\/)#{CG_BLANK}*(.*?)(:{2,4}|;;)(?:#{CG_BLANK}+(.*))?$/
 
-    # Matches a sibling definition list item (which does not include the keyed type).
-    DefinitionListSiblingRx = {
+    # Matches a sibling description list item (which does not include the type in the key).
+    DescriptionListSiblingRx = {
       # (?:.*?[^:])? - a non-capturing group which grabs longest sequence of characters that doesn't end w/ colon
       '::' => /^(?!\/\/)#{CG_BLANK}*((?:.*[^:])?)(::)(?:#{CG_BLANK}+(.*))?$/,
       ':::' => /^(?!\/\/)#{CG_BLANK}*((?:.*[^:])?)(:::)(?:#{CG_BLANK}+(.*))?$/,
@@ -727,7 +729,7 @@ module Asciidoctor
     #   <1> Foo
     #
     # NOTE we know trailing (.*) will match at least one character because we strip trailing spaces
-    CalloutListRx = /^<?(\d+)>#{CG_BLANK}+(.*)/
+    CalloutListRx = /^<?(\d+)>#{CG_BLANK}+(.*)$/
 
     # Matches a callout reference inside literal text.
     #
@@ -749,7 +751,7 @@ module Asciidoctor
     ListRxMap = {
       :ulist => UnorderedListRx,
       :olist => OrderedListRx,
-      :dlist => DefinitionListRx,
+      :dlist => DescriptionListRx,
       :colist => CalloutListRx
     }
 
@@ -965,12 +967,12 @@ module Asciidoctor
     ## Layout
 
     # Matches a trailing + preceded by at least one space character,
-    # which forces a hard line break (<br> tag in HTML outputs).
+    # which forces a hard line break (<br> tag in HTML output).
     #
     # Examples
     #
-    #    +
-    #   Foo +
+    #   Humpty Dumpty sat on a wall, +
+    #   Humpty Dumpty had a great fall.
     #
     if RUBY_ENGINE == 'opal'
       # NOTE JavaScript only treats ^ and $ as line boundaries in multiline regexp; . won't match newlines
@@ -1249,7 +1251,7 @@ module Asciidoctor
     # left double arrow <=
     [/\\?&lt;=/, '&#8656;', :none],
     # restore entities
-    [/\\?(&)amp;((?:[a-zA-Z]+|#\d{2,5}|#x[a-fA-F0-9]{2,4});)/, '', :bounding]
+    [/\\?(&)amp;((?:[a-zA-Z]{2,}|#\d{2,6}|#x[a-fA-F0-9]{2,5});)/, '', :bounding]
   ]
 
   class << self
@@ -1308,7 +1310,8 @@ module Asciidoctor
     if ::File === input
       # TODO cli checks if input path can be read and is file, but might want to add check to API
       input_path = ::File.expand_path input.path
-      input_mtime = input.mtime
+      # See https://reproducible-builds.org/specs/source-date-epoch/
+      input_mtime = ::ENV['SOURCE_DATE_EPOCH'] ? (::Time.at ::ENV['SOURCE_DATE_EPOCH'].to_i).utc : input.mtime
       lines = input.readlines
       # hold off on setting infile and indir until we get a better sense of their purpose
       attributes['docfile'] = input_path
@@ -1487,7 +1490,7 @@ module Asciidoctor
 
       unless ::File.directory? outdir
         if mkdirs
-          ::FileUtils.mkdir_p outdir
+          Helpers.mkdir_p outdir
         else
           # NOTE we intentionally refer to the directory as it was passed to the API
           raise ::IOError, %(target directory does not exist: #{to_dir})

data/lib/asciidoctor/abstract_block.rb

@@ -244,11 +244,10 @@ class AbstractBlock < AbstractNode
   end
 =end
 
-  # Public: Query for all descendant block nodes in the document tree that
-  # match the specified Symbol filter_context and, optionally, the style and/or
-  # role specified in the options Hash. If a block is provided, it's used as an
-  # additional filter. If no filters are specified, all block nodes in the tree
-  # are returned.
+  # Public: Query for all descendant block-level nodes in the document tree
+  # that match the specified selector (context, style, id, and/or role). If a
+  # Ruby block is given, it's used as an additional filter. If no selector or
+  # Ruby block is supplied, all block-level nodes in the tree are returned.
   #
   # Examples
   #
@@ -262,7 +261,7 @@ class AbstractBlock < AbstractNode
   #   doc.find_by context: :listing, style: 'source'
   #   #=> Asciidoctor::Block@13136720 { context: :listing, content_model: :verbatim, style: "source", lines: 1 }
   #
-  # Returns An Array of block nodes that match the given selector or an empty Array if no matches are found
+  # Returns An Array of block-level nodes that match the filter or an empty Array if no matches are found
   #--
   # TODO support jQuery-style selector (e.g., image.thumb)
   def find_by selector = {}, &block
@@ -290,8 +289,8 @@ class AbstractBlock < AbstractNode
       result.concat(@header.find_by selector, &block)
     end
 
-    # yuck, dlist is a special case
     unless context_selector == :document # optimization
+      # yuck, dlist is a special case
       if @context == :dlist
         if any_context || context_selector != :section # optimization
           @blocks.flatten.each do |li|
@@ -356,6 +355,17 @@ class AbstractBlock < AbstractNode
     nil
   end
 
+  # Public: Retrieve the list marker keyword for the specified list type.
+  #
+  # For use in the HTML type attribute.
+  #
+  # list_type - the type of list; default to the @style if not specified
+  #
+  # Returns the single-character [String] keyword that represents the marker for the specified list type
+  def list_marker_keyword list_type = nil
+    ORDERED_LIST_KEYWORDS[list_type || @style]
+  end
+
   # Internal: Assign the next index (0-based) to this section
   #
   # Assign the next index of this section within the parent
@@ -369,10 +379,10 @@ class AbstractBlock < AbstractNode
     if section.sectname == 'appendix'
       appendix_number = @document.counter 'appendix-number', 'A'
       section.number = appendix_number if section.numbered
-      if (caption = @document.attr 'appendix-caption', '') != ''
-        section.caption = %(#{caption} #{appendix_number}: )
-      else
+      if (caption = @document.attr 'appendix-caption', '').empty?
         section.caption = %(#{appendix_number}. )
+      else
+        section.caption = %(#{caption} #{appendix_number}: )
       end
     elsif section.numbered
       # chapters in a book doctype should be sequential even when divided into parts

data/lib/asciidoctor/abstract_node.rb

@@ -548,9 +548,9 @@ class AbstractNode
   end
 
   # Public: Calculate the relative path to this absolute filename from the Document#base_dir
-  def relative_path(filename)
-    (@path_resolver ||= PathResolver.new).relative_path filename, @document.base_dir
-  end
+  #def relative_path(filename)
+  #  (@path_resolver ||= PathResolver.new).relative_path filename, @document.base_dir
+  #end
 
   # Public: Check whether the specified String is a URI by
   # matching it against the Asciidoctor::UriSniffRx regex.
@@ -559,16 +559,5 @@ class AbstractNode
   def is_uri? str
     Helpers.uriish? str
   end
-
-  # Public: Retrieve the list marker keyword for the specified list type.
-  #
-  # For use in the HTML type attribute.
-  #
-  # list_type - the type of list; default to the @style if not specified
-  #
-  # Returns the single-character [String] keyword that represents the marker for the specified list type
-  def list_marker_keyword(list_type = nil)
-    ORDERED_LIST_KEYWORDS[list_type || @style]
-  end
 end
 end

data/lib/asciidoctor/cli/invoker.rb

@@ -13,12 +13,13 @@ module Asciidoctor
         @err = nil
         @code = 0
         options = options.flatten
-        if (first_option = options[0]).is_a?(Cli::Options)
+        case (first_option = options[0])
+        when Options
           @options = first_option
-        elsif first_option.is_a?(::Hash)
-          @options = Cli::Options.new(options)
+        when ::Hash
+          @options = Options.new options
         else
-          if (result = Cli::Options.parse! options).is_a? ::Integer
+          if ::Integer === (result = Options.parse! options)
             @code = result
             @options = nil
           else

data/lib/asciidoctor/cli/options.rb

@@ -243,7 +243,7 @@ Example: asciidoctor -b html5 source.asciidoc
         os.puts %(Asciidoctor #{::Asciidoctor::VERSION} [http://asciidoctor.org])
         if RUBY_VERSION >= '1.9.3'
           encoding_info = {'lc' => 'locale', 'fs' => 'filesystem', 'in' => 'internal', 'ex' => 'external'}.map do |k,v|
-            %(#{k}:#{Encoding.find(v) || '-'})
+            %(#{k}:#{::Encoding.find(v) || '-'})
           end
           os.puts %(Runtime Environment (#{RUBY_DESCRIPTION}) (#{encoding_info * ' '}))
         else

data/lib/asciidoctor/converter/docbook5.rb

@@ -388,7 +388,7 @@ module Asciidoctor
       has_body = false
       result = []
       pgwide_attribute = (node.option? 'pgwide') ? ' pgwide="1"' : nil
-      result << %(<#{tag_name = node.title? ? 'table' : 'informaltable'}#{common_attributes node.id, node.role, node.reftext}#{pgwide_attribute} frame="#{node.attr 'frame', 'all'}" rowsep="#{['none', 'cols'].include?(node.attr 'grid') ? 0 : 1}" colsep="#{['none', 'rows'].include?(node.attr 'grid') ? 0 : 1}">)
+      result << %(<#{tag_name = node.title? ? 'table' : 'informaltable'}#{common_attributes node.id, node.role, node.reftext}#{pgwide_attribute} frame="#{node.attr 'frame', 'all'}" rowsep="#{['none', 'cols'].include?(node.attr 'grid') ? 0 : 1}" colsep="#{['none', 'rows'].include?(node.attr 'grid') ? 0 : 1}"#{(node.attr? 'orientation', 'landscape', nil) ? ' orient="land"' : nil}>)
       if (node.option? 'unbreakable')
         result << '<?dbfo keep-together="always"?>'
       elsif (node.option? 'breakable')

data/lib/asciidoctor/converter/factory.rb

@@ -184,11 +184,7 @@ module Asciidoctor
       # Returns the [Converter] object
       def create backend, opts = {}
         if (converter = resolve backend)
-          if converter.is_a? ::Class
-            return converter.new backend, opts
-          else
-            return converter
-          end
+          return ::Class === converter ? (converter.new backend, opts) : converter
         end
 
         base_converter = case backend

data/lib/asciidoctor/converter/html5.rb

@@ -19,7 +19,7 @@ module Asciidoctor
       #:latexmath   => INLINE_MATH_DELIMITERS[:latexmath] + [false]
     }).default = [nil, nil, nil]
 
-    SvgPreambleRx = /\A.*?(?=<svg[ >])/m
+    SvgPreambleRx = /\A.*?(?=<svg\b)/m
     SvgStartTagRx = /\A<svg[^>]*>/
     DimensionAttributeRx = /\s(?:width|height|style)=(["']).*?\1/
 
@@ -74,7 +74,7 @@ module Asciidoctor
 
       if node.attr? 'icons', 'font'
         if node.attr? 'iconfont-remote'
-          result << %(<link rel="stylesheet" href="#{node.attr 'iconfont-cdn', %[#{cdn_base}/font-awesome/4.5.0/css/font-awesome.min.css]}"#{slash}>)
+          result << %(<link rel="stylesheet" href="#{node.attr 'iconfont-cdn', %[#{cdn_base}/font-awesome/4.6.3/css/font-awesome.min.css]}"#{slash}>)
         else
           iconfont_stylesheet = %(#{node.attr 'iconfont-name', 'font-awesome'}.css)
           result << %(<link rel="stylesheet" href="#{node.normalize_web_path iconfont_stylesheet, (node.attr 'stylesdir', ''), false}"#{slash}>)
@@ -220,7 +220,7 @@ module Asciidoctor
 
       if node.attr? 'stem'
         eqnums_val = node.attr 'eqnums', 'none'
-        eqnums_val = 'AMS' if eqnums_val == ''
+        eqnums_val = 'AMS' if eqnums_val.empty?
         eqnums_opt = %( equationNumbers: { autoNumber: "#{eqnums_val}" } )
         # IMPORTANT inspect calls on delimiter arrays are intentional for JavaScript compat (emulates JSON.stringify)
         result << %(<script type="text/x-mathjax-config">
@@ -321,15 +321,18 @@ MathJax.Hub.Config({
       htag = %(h#{slevel + 1})
       id_attr = anchor = link_start = link_end = nil
       if node.id
-        id_attr = %( id="#{node.id}")
-        if node.document.attr? 'sectanchors'
-          anchor = %(<a class="anchor" href="##{node.id}"></a>)
+        id_attr = %( id="#{id = node.id}")
+        if (doc = node.document).attr? 'sectanchors'
+          anchor = %(<a class="anchor" href="##{id}"></a>)
           # possible idea - anchor icons GitHub-style
-          #if node.document.attr? 'icons', 'font'
-          #  anchor = %(<a class="anchor" href="##{node.id}"><i class="fa fa-anchor"></i></a>)
+          #if doc.attr? 'icons', 'font'
+          #  anchor = %(<a class="anchor" href="##{id}"><i class="fa fa-anchor"></i></a>)
           #else
-        elsif node.document.attr? 'sectlinks'
-          link_start = %(<a class="link" href="##{node.id}">)
+          #  anchor = %(<a class="anchor" href="##{id}"></a>)
+          #end
+        end
+        if doc.attr? 'sectlinks'
+          link_start = %(<a class="link" href="##{id}">)
           link_end = '</a>'
         end
       end
@@ -377,9 +380,9 @@ MathJax.Hub.Config({
     end
 
     def audio node
-      xml = node.document.attr? 'htmlsyntax', 'xml'
+      xml = @xml_mode
       id_attribute = node.id ? %( id="#{node.id}") : nil
-      classes = ['audioblock', node.style, node.role].compact
+      classes = ['audioblock', node.role].compact
       class_attribute = %( class="#{classes * ' '}")
       title_element = node.title? ? %(<div class="title">#{node.captioned_title}</div>\n) : nil
       %(<div#{id_attribute}#{class_attribute}>
@@ -537,7 +540,7 @@ Your browser does not support the audio tag.
       target = node.attr 'target'
       width_attr = (node.attr? 'width') ? %( width="#{node.attr 'width'}") : nil
       height_attr = (node.attr? 'height') ? %( height="#{node.attr 'height'}") : nil
-      if ((node.attr? 'format', 'svg', false) || (target.include? '.svg')) && node.document.safe < SafeMode::SECURE
+      if ((node.attr? 'format', 'svg', false) || (target.include? '.svg')) && node.document.safe < SafeMode::SECURE &&
           ((svg = (node.option? 'inline')) || (obj = (node.option? 'interactive')))
         if svg
           img = (read_svg_contents node, target) || %(<span class="alt">#{node.attr 'alt'}</span>)
@@ -551,7 +554,7 @@ Your browser does not support the audio tag.
         img = %(<a class="image" href="#{link}">#{img}</a>)
       end
       id_attr = node.id ? %( id="#{node.id}") : nil
-      classes = ['imageblock', node.style, node.role].compact
+      classes = ['imageblock', node.role].compact
       class_attr = %( class="#{classes * ' '}")
       styles = []
       styles << %(text-align: #{node.attr 'align'}) if node.attr? 'align'
@@ -645,7 +648,8 @@ Your browser does not support the audio tag.
 
       type_attribute = (keyword = node.list_marker_keyword) ? %( type="#{keyword}") : nil
       start_attribute = (node.attr? 'start') ? %( start="#{node.attr 'start'}") : nil
-      result << %(<ol class="#{node.style}"#{type_attribute}#{start_attribute}>)
+      reversed_attribute = (node.option? 'reversed') ? (append_boolean_attribute 'reversed', @xml_mode) : nil
+      result << %(<ol class="#{node.style}"#{type_attribute}#{start_attribute}#{reversed_attribute}>)
 
       node.items.each do |item|
         result << '<li>'
@@ -666,19 +670,19 @@ Your browser does not support the audio tag.
           ''
         else
           id_attr = node.id ? %( id="#{node.id}") : nil
-          title_el = node.title? ? %(<div class="title">#{node.title}</div>) : nil
+          title_el = node.title? ? %(<div class="title">#{node.title}</div>\n) : nil
           %(<div#{id_attr} class="quoteblock abstract#{(role = node.role) && " #{role}"}">
 #{title_el}<blockquote>
 #{node.content}
 </blockquote>
 </div>)
         end
-      elsif style == 'partintro' && (node.level != 0 || node.parent.context != :section || node.document.doctype != 'book')
+      elsif style == 'partintro' && (node.level > 0 || node.parent.context != :section || node.document.doctype != 'book')
         warn 'asciidoctor: ERROR: partintro block can only be used when doctype is book and it\'s a child of a book part. Excluding block content.'
         ''
       else
           id_attr = node.id ? %( id="#{node.id}") : nil
-          title_el = node.title? ? %(<div class="title">#{node.title}</div>) : nil
+          title_el = node.title? ? %(<div class="title">#{node.title}</div>\n) : nil
         %(<div#{id_attr} class="openblock#{style && style != 'open' ? " #{style}" : ''}#{(role = node.role) && " #{role}"}">
 #{title_el}<div class="content">
 #{node.content}
@@ -766,11 +770,11 @@ Your browser does not support the audio tag.
       id_attribute = node.id ? %( id="#{node.id}") : nil
       classes = ['tableblock', %(frame-#{node.attr 'frame', 'all'}), %(grid-#{node.attr 'grid', 'all'})]
       styles = []
-      unless node.option? 'autowidth'
-        if (tablepcwidth = node.attr 'tablepcwidth') == 100
+      unless (node.option? 'autowidth') && !(node.attr? 'width', nil, false)
+        if node.attr? 'tablepcwidth', 100
           classes << 'spread'
         else
-          styles << %(width: #{tablepcwidth}%;)
+          styles << %(width: #{node.attr 'tablepcwidth'}%;)
         end
       end
       if (role = node.role)
@@ -867,7 +871,7 @@ Your browser does not support the audio tag.
         div_classes.insert 1, 'checklist'
         ul_class_attribute = ' class="checklist"'
         if node.option? 'interactive'
-          if node.document.attr? 'htmlsyntax', 'xml'
+          if @xml_mode
             marker_checked = '<input type="checkbox" data-item-complete="1" checked="checked"/> '
             marker_unchecked = '<input type="checkbox" data-item-complete="0"/> '
           else
@@ -927,9 +931,9 @@ Your browser does not support the audio tag.
     end
 
     def video node
-      xml = node.document.attr? 'htmlsyntax', 'xml'
+      xml = @xml_mode
       id_attribute = node.id ? %( id="#{node.id}") : nil
-      classes = ['videoblock', node.style, node.role].compact
+      classes = ['videoblock', node.role].compact
       class_attribute = %( class="#{classes * ' '}")
       title_element = node.title? ? %(\n<div class="title">#{node.captioned_title}</div>) : nil
       width_attribute = (node.attr? 'width') ? %( width="#{node.attr 'width'}") : nil
@@ -1070,7 +1074,7 @@ Your browser does not support the video tag.
     def inline_image node
       if (type = node.type) == 'icon' && (node.document.attr? 'icons', 'font')
         class_attr_val = %(fa fa-#{node.target})
-        {'size' => 'fa-', 'rotate' => 'fa-rotate-', 'flip' => 'fa-flip-'}.each do |(key, prefix)|
+        {'size' => 'fa-', 'rotate' => 'fa-rotate-', 'flip' => 'fa-flip-'}.each do |key, prefix|
           class_attr_val = %(#{class_attr_val} #{prefix}#{node.attr key}) if node.attr? key
         end
         title_attr = (node.attr? 'title') ? %( title="#{node.attr 'title'}") : nil
@@ -1146,16 +1150,17 @@ Your browser does not support the video tag.
 
     def read_svg_contents node, target
       if (svg = node.read_contents target, :start => (node.document.attr 'imagesdir'), :normalize => true, :label => 'SVG')
-        svg = svg.sub SvgPreambleRx, ''
-        start_tag = nil
+        svg = svg.sub SvgPreambleRx, '' unless svg.start_with? '<svg'
+        old_start_tag = new_start_tag = nil
+        # NOTE width, height and style attributes are removed if either width or height is specified
         ['width', 'height'].each do |dim|
           if node.attr? dim
-            # NOTE width, height and style attributes are removed if either width or height is specified
-            start_tag ||= (svg.match SvgStartTagRx)[0].gsub DimensionAttributeRx, ''
-            start_tag = %(#{start_tag.chop} #{dim}="#{node.attr dim}px">)
+            new_start_tag = (old_start_tag = (svg.match SvgStartTagRx)[0]).gsub DimensionAttributeRx, '' unless new_start_tag
+            # QUESTION should we add px since it's already the default?
+            new_start_tag = %(#{new_start_tag.chop} #{dim}="#{node.attr dim}px">)
           end
         end
-        svg = svg.sub SvgStartTagRx, start_tag if start_tag
+        svg = %(#{new_start_tag}#{svg[old_start_tag.length..-1]}) if new_start_tag
       end
       svg
     end