asciidoctor 1.5.2 → 1.5.3

data/lib/asciidoctor/abstract_node.rb

@@ -90,7 +90,7 @@ class AbstractNode
   # return the value of the attribute or the default value if the attribute
   # is not found in the attributes of this node or the document node
   def attr(name, default_value = nil, inherit = true)
-    name = name.to_s if name.is_a?(::Symbol)
+    name = name.to_s if ::Symbol === name
     inherit = false if self == @document
     if inherit
       @attributes[name] || @document.attributes[name] || default_value
@@ -117,7 +117,7 @@ class AbstractNode
   # comparison value is specified, whether the value of the attribute matches
   # the comparison value
   def attr?(name, expect = nil, inherit = true)
-    name = name.to_s if name.is_a?(::Symbol)
+    name = name.to_s if ::Symbol === name
     inherit = false if self == @document
     if expect.nil?
       @attributes.has_key?(name) || (inherit && @document.attributes.has_key?(name))
@@ -130,23 +130,18 @@ class AbstractNode
 
   # Public: Assign the value to the attribute name for the current node.
   #
-  # name      - The String attribute name
-  # value     - The Object value to assign to the attribute name
+  # name      - The String attribute name to assign
+  # value     - The Object value to assign to the attribute
   # overwrite - A Boolean indicating whether to assign the attribute
-  #             if currently present in the attributes Hash
+  #             if currently present in the attributes Hash (default: true)
   #
   # Returns a [Boolean] indicating whether the assignment was performed
-  def set_attr name, value, overwrite = nil
-    if overwrite.nil?
+  def set_attr name, value, overwrite = true
+    if overwrite == false && (@attributes.key? name)
+      false
+    else
       @attributes[name] = value
       true
-    else
-      if overwrite || !(@attributes.key? name)
-        @attributes[name] = value
-        true
-      else
-        false
-      end
     end
   end
 
@@ -226,6 +221,21 @@ class AbstractNode
     end
   end
 
+  # Public: A convenience method that adds the given role directly to this node
+  def add_role(name)
+    unless (roles = (@attributes['role'] || '').split(' ')).include? name
+      @attributes['role'] = roles.push(name) * ' '
+    end
+  end
+
+  # Public: A convenience method that removes the given role directly from this node
+  def remove_role(name)
+    if (roles = (@attributes['role'] || '').split(' ')).include? name
+      roles.delete name
+      @attributes['role'] = roles * ' '
+    end
+  end
+
   # Public: A convenience method that checks if the reftext attribute is specified
   def reftext?
     @attributes.has_key?('reftext') || @document.attributes.has_key?('reftext')
@@ -301,8 +311,8 @@ class AbstractNode
   # Returns A String reference or data URI for the target image
   def image_uri(target_image, asset_dir_key = 'imagesdir')
     if (doc = @document).safe < SafeMode::SECURE && doc.attr?('data-uri')
-      if is_uri?(target_image) ||
-          (asset_dir_key && (images_base = doc.attr(asset_dir_key)) && is_uri?(images_base) &&
+      if (Helpers.uriish? target_image) ||
+          (asset_dir_key && (images_base = doc.attr(asset_dir_key)) && (Helpers.uriish? images_base) &&
           (target_image = normalize_web_path(target_image, images_base, false)))
         if doc.attr?('allow-uri-read')
           generate_data_uri_from_uri target_image, doc.attr?('cache-uri')
@@ -330,8 +340,9 @@ class AbstractNode
   #
   # Returns A String data URI containing the content of the target image
   def generate_data_uri(target_image, asset_dir_key = nil)
-    ext = ::File.extname(target_image)[1..-1]
-    mimetype = (ext == 'svg' ? 'image/svg+xml' : %(image/#{ext}))
+    ext = ::File.extname target_image
+    # QUESTION what if ext is empty?
+    mimetype = (ext == '.svg' ? 'image/svg+xml' : %(image/#{ext[1..-1]}))
     if asset_dir_key
       image_path = normalize_system_path(target_image, @document.attr(asset_dir_key), nil, :target_name => 'image')
     else
@@ -352,6 +363,7 @@ class AbstractNode
     else
       bindata = ::File.open(image_path, 'rb') {|file| file.read }
     end
+    # NOTE base64 is autoloaded by reference to ::Base64
     %(data:#{mimetype};base64,#{::Base64.encode64(bindata).delete EOL})
   end
  
@@ -368,7 +380,6 @@ class AbstractNode
   # Returns A data URI string built from Base64 encoded data read from the URI
   # and the mime type specified in the Content Type header.
   def generate_data_uri_from_uri image_uri, cache_uri = false
-    Helpers.require_library 'base64'
     if cache_uri
       # caching requires the open-uri-cached gem to be installed
       # processing will be automatically aborted if these libraries can't be opened
@@ -384,7 +395,8 @@ class AbstractNode
         mimetype = file.content_type 
         file.read
       }
-      %(data:#{mimetype};base64,#{Base64.encode64(bindata).delete EOL})
+      # NOTE base64 is autoloaded by reference to ::Base64
+      %(data:#{mimetype};base64,#{::Base64.encode64(bindata).delete EOL})
     rescue
       warn %(asciidoctor: WARNING: could not retrieve image data from URI: #{image_uri})
       image_uri
@@ -395,6 +407,46 @@ class AbstractNode
     end
   end
 
+  # Public: Resolve the URI or system path to the specified target, then read and return its contents
+  #
+  # The URI or system path of the target is first resolved. If the resolved path is a URI, read the
+  # contents from the URI if the allow-uri-read attribute is set, enabling caching if the cache-uri
+  # attribute is also set. If the resolved path is not a URI, read the contents of the file from the
+  # file system. If the normalize option is set, the data will be normalized.
+  #
+  # target - The URI or local path from which to read the data.
+  # opts   - a Hash of options to control processing (default: {})
+  #          * :label the String label of the target to use in warning messages (default: 'asset')
+  #          * :normalize a Boolean that indicates whether the data should be normalized (default: false)
+  #          * :start the String relative base path to use when resolving the target (default: nil)
+  #          * :warn_on_failure a Boolean that indicates whether warnings are issued if the target cannot be read (default: true)
+  # Returns the contents of the resolved target or nil if the resolved target cannot be read
+  # --
+  # TODO refactor other methods in this class to use this method were possible (repurposing if necessary)
+  def read_contents target, opts = {}
+    doc = @document
+    if (Helpers.uriish? target) || ((start = opts[:start]) && (Helpers.uriish? start) &&
+        (target = (@path_resolver ||= PathResolver.new).web_path target, start))
+      if doc.attr? 'allow-uri-read'
+        Helpers.require_library 'open-uri/cached', 'open-uri-cached' if doc.attr? 'cache-uri'
+        begin
+          data = ::OpenURI.open_uri(target) {|fd| fd.read }
+          data = (Helpers.normalize_lines_from_string data) * EOL if opts[:normalize]
+        rescue
+          warn %(asciidoctor: WARNING: could not retrieve contents of #{opts[:label] || 'asset'} at URI: #{target}) if opts.fetch :warn_on_failure, true
+          data = nil
+        end
+      else
+        warn %(asciidoctor: WARNING: cannot retrieve contents of #{opts[:label] || 'asset'} at URI: #{target} (allow-uri-read attribute not enabled)) if opts.fetch :warn_on_failure, true
+        data = nil
+      end
+    else
+      target = normalize_system_path target, opts[:start], nil, :target_name => (opts[:label] || 'asset')
+      data = read_asset target, :normalize => opts[:normalize], :warn_on_failure => (opts.fetch :warn_on_failure, true)
+    end
+    data
+  end
+
   # Public: Read the contents of the file at the specified path.
   # This method assumes that the path is safe to read. It checks
   # that the file is readable before attempting to read it.
@@ -413,9 +465,9 @@ class AbstractNode
     opts = { :warn_on_failure => (opts != false) } unless ::Hash === opts
     if ::File.readable? path
       if opts[:normalize]
-        # QUESTION should we strip content?
         Helpers.normalize_lines_from_string(::IO.read(path)) * EOL
       else
+        # QUESTION should we chomp or rstrip content?
         ::IO.read(path)
       end
     else
@@ -434,7 +486,7 @@ class AbstractNode
   #
   # Returns the resolved [String] path 
   def normalize_web_path(target, start = nil, preserve_uri_target = true)
-    if preserve_uri_target && is_uri?(target)
+    if preserve_uri_target && (Helpers.uriish? target)
       target
     else
       (@path_resolver ||= PathResolver.new).web_path target, start
@@ -497,8 +549,10 @@ class AbstractNode
 
   # Public: Check whether the specified String is a URI by
   # matching it against the Asciidoctor::UriSniffRx regex.
+  #
+  # @deprecated Use Helpers.uriish? instead
   def is_uri? str
-    str.include?(':') && UriSniffRx =~ str
+    Helpers.uriish? str
   end
 
   # Public: Retrieve the list marker keyword for the specified list type.
@@ -511,6 +565,5 @@ class AbstractNode
   def list_marker_keyword(list_type = nil)
     ORDERED_LIST_KEYWORDS[list_type || @style]
   end
-
 end
 end

data/lib/asciidoctor/attribute_list.rb

@@ -163,7 +163,7 @@ class AttributeList
       case name
       when 'options', 'opts'
         name = 'options'
-        value.split(',').each {|o| @attributes[%(#{o.strip}-option)] = '' }
+        value.tr(' ', '').split(',').each {|opt| @attributes[%(#{opt}-option)] = '' }
         @attributes[name] = value
       when 'title'
         @attributes[name] = value

data/lib/asciidoctor/block.rb

@@ -9,7 +9,7 @@ module Asciidoctor
 #   => "<em>This</em> is a &lt;test&gt;"
 class Block < AbstractBlock
 
-  DEFAULT_CONTENT_MODEL = {
+  (DEFAULT_CONTENT_MODEL = {
     # TODO should probably fill in all known blocks
     :audio => :empty,
     :image => :empty,
@@ -21,8 +21,7 @@ class Block < AbstractBlock
     :pass => :raw,
     :thematic_break => :empty,
     :video => :empty
-  }
-  DEFAULT_CONTENT_MODEL.default = :simple
+  }).default = :simple
 
   # Public: Create alias for context to be consistent w/ AsciiDoc
   alias :blockname :context

data/lib/asciidoctor/cli/options.rb

@@ -43,7 +43,8 @@ Example: asciidoctor -b html5 source.asciidoc
 
           EOS
 
-          opts.on('-b', '--backend BACKEND', 'set output format backend (default: html5)') do |backend|
+          opts.on('-b', '--backend BACKEND', 'set output format backend: [html5, xhtml5, docbook5, docbook45, manpage] (default: html5)',
+                  'additional backends are supported via extensions (e.g., pdf, latex)') do |backend|
             self[:attributes]['backend'] = backend
           end
           opts.on('-d', '--doctype DOCTYPE', ['article', 'book', 'manpage', 'inline'],
@@ -76,24 +77,22 @@ Example: asciidoctor -b html5 source.asciidoc
           end
           opts.on('-C', '--compact', 'compact the output by removing blank lines. (No longer in use)') do
           end
-          opts.on('-a', '--attribute key[=value],key2[=value2],...', ::Array,
-                  'a list of document attributes to set in the form of key, key! or key=value pair',
-                  'unless @ is appended to the value, these attributes take precedence over attributes',
-                  'defined in the source document') do |attribs|
-            attribs.each do |attrib|
-              key, val = attrib.split '=', 2
-              # move leading ! to end for internal processing
-              #if val.nil? && key.start_with?('!')
-              #  key = "#{key[1..-1]}!"
-              #end
-              self[:attributes][key] = val || ''
-            end
+          opts.on('-a', '--attribute key[=value]', 'a document attribute to set in the form of key, key! or key=value pair',
+                  'unless @ is appended to the value, this attributes takes precedence over attributes',
+                  'defined in the source document') do |attr|
+            key, val = attr.split '=', 2
+            val = val ? (FORCE_ENCODING ? (val.force_encoding ::Encoding::UTF_8) : val) : ''
+            # move leading ! to end for internal processing
+            #if !val && key.start_with?('!')
+            #  key = "#{key[1..-1]}!"
+            #end
+            self[:attributes][key] = val
           end
           opts.on('-T', '--template-dir DIR', 'a directory containing custom converter templates that override the built-in converter (requires tilt gem)',
                   'may be specified multiple times') do |template_dir|
             if self[:template_dirs].nil?
               self[:template_dirs] = [template_dir]
-            elsif self[:template_dirs].is_a? ::Array
+            elsif ::Array === self[:template_dirs]
               self[:template_dirs].push template_dir
             else
               self[:template_dirs] = [self[:template_dirs], template_dir]
@@ -108,7 +107,7 @@ Example: asciidoctor -b html5 source.asciidoc
           opts.on('-D', '--destination-dir DIR', 'destination output directory (default: directory of source file)') do |dest_dir|
             self[:destination_dir] = dest_dir
           end
-          opts.on('-IDIRECTORY', '--load-path LIBRARY', 'add a directory to the $LOAD_PATH',
+          opts.on('-IDIRECTORY', '--load-path DIRECTORY', 'add a directory to the $LOAD_PATH',
               'may be specified more than once') do |path|
             (self[:load_paths] ||= []).concat(path.split ::File::PATH_SEPARATOR)
           end

data/lib/asciidoctor/converter/docbook45.rb

@@ -33,21 +33,21 @@ module Asciidoctor
     end
 
     def inline_anchor node
-      target = node.target
       case node.type
       when :ref
-        %(<anchor#{common_attributes target, nil, node.text}/>)
+        %(<anchor#{common_attributes node.target, nil, node.text}/>)
       when :xref
-        if node.attr? 'path', nil
-          linkend = (node.attr 'fragment') || target
-          (text = node.text) ? %(<link linkend="#{linkend}">#{text}</link>) : %(<xref linkend="#{linkend}"/>)
+        if (path = node.attributes['path'])
+          # QUESTION should we use refid as fallback text instead? (like the html5 backend?)
+          %(<ulink url="#{node.target}">#{node.text || path}</ulink>)
         else
-          text = node.text || (node.attr 'path')
-          %(<ulink url="#{target}">#{text}</ulink>)
+          linkend = node.attributes['fragment'] || node.target
+          (text = node.text) ? %(<link linkend="#{linkend}">#{text}</link>) : %(<xref linkend="#{linkend}"/>)
         end
       when :link
-        %(<ulink url="#{target}">#{node.text}</ulink>)
+        %(<ulink url="#{node.target}">#{node.text}</ulink>)
       when :bibref
+        target = node.target
         %(<anchor#{common_attributes target, nil, "[#{target}]"}/>[#{target}])
       end
     end

data/lib/asciidoctor/converter/docbook5.rb

@@ -83,7 +83,7 @@ module Asciidoctor
       result * EOL
     end
 
-    DLIST_TAGS = {
+    (DLIST_TAGS = {
       'labeled' => {
         :list  => 'variablelist',
         :entry => 'varlistentry',
@@ -103,8 +103,7 @@ module Asciidoctor
         :term  => 'glossterm',
         :item  => 'glossdef'
       }
-    }
-    DLIST_TAGS.default = DLIST_TAGS['labeled']
+    }).default = DLIST_TAGS['labeled']
 
     def dlist node
       result = []
@@ -188,6 +187,8 @@ module Asciidoctor
     def image node
       width_attribute = (node.attr? 'width') ? %( contentwidth="#{node.attr 'width'}") : nil
       depth_attribute = (node.attr? 'height') ? %( contentdepth="#{node.attr 'height'}") : nil
+      # FIXME if scaledwidth is set, we should remove width & depth
+      # See http://www.docbook.org/tdg/en/html/imagedata.html#d0e92271 for details
       swidth_attribute = (node.attr? 'scaledwidth') ? %( width="#{node.attr 'scaledwidth'}" scalefit="1") : nil
       scale_attribute = (node.attr? 'scale') ? %( scale="#{node.attr 'scale'}") : nil
       align_attribute = (node.attr? 'align') ? %( align="#{node.attr 'align'}") : nil
@@ -254,9 +255,11 @@ module Asciidoctor
       if node.style == 'latexmath'
         equation_data = %(<alt><![CDATA[#{equation}]]></alt>
 <mediaobject><textobject><phrase></phrase></textobject></mediaobject>)
-      # asciimath
+      elsif node.style == 'asciimath' && ((defined? ::AsciiMath) || (!(defined? @asciimath_loaded) ?
+          (@asciimath_loaded = Helpers.require_library 'asciimath', true, :warn) : @asciimath_loaded))
+        equation_data = ::AsciiMath.parse(equation).to_mathml 'mml:', 'xmlns:mml' => 'http://www.w3.org/1998/Math/MathML'
       else
-        # DocBook backends can't handle AsciiMath, so output raw expression in text object
+        # Unsupported math style, so output raw expression in text object
         equation_data = %(<mediaobject><textobject><phrase><![CDATA[#{equation}]]></phrase></textobject></mediaobject>)
       end
       if node.title?
@@ -374,6 +377,11 @@ module Asciidoctor
       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}">)
+      if (node.option? 'unbreakable')
+        result << '<?dbfo keep-together="always"?>'
+      elsif (node.option? 'breakable')
+        result << '<?dbfo keep-together="auto"?>'
+      end
       result << %(<title>#{node.title}</title>) if tag_name == 'table'
       if (width = (node.attr? 'width') ? (node.attr 'width') : nil)
         TABLE_PI_NAMES.each do |pi_name|
@@ -488,16 +496,18 @@ module Asciidoctor
       when :ref
         %(<anchor#{common_attributes node.target, nil, node.text}/>)
       when :xref
-        if node.attr? 'path', nil
-          linkend = (node.attr 'fragment') || node.target
-          (text = node.text) ? %(<link linkend="#{linkend}">#{text}</link>) : %(<xref linkend="#{linkend}"/>)
+        if (path = node.attributes['path'])
+          # QUESTION should we use refid as fallback text instead? (like the html5 backend?)
+          %(<link xlink:href="#{node.target}">#{node.text || path}</link>)
         else
-          %(<link xlink:href="#{target}">#{node.text || (node.attr 'path')}</link>)
+          linkend = node.attributes['fragment'] || node.target
+          (text = node.text) ? %(<link linkend="#{linkend}">#{text}</link>) : %(<xref linkend="#{linkend}"/>)
         end
       when :link
         %(<link xlink:href="#{node.target}">#{node.text}</link>)
       when :bibref
-        %(<anchor#{common_attributes node.target, nil, "[#{node.target}]"}/>[#{node.target}])
+        target = node.target
+        %(<anchor#{common_attributes target, nil, "[#{target}]"}/>[#{target}])
       else
         warn %(asciidoctor: WARNING: unknown anchor type: #{node.type.inspect})
       end
@@ -561,8 +571,7 @@ module Asciidoctor
       if (keys = node.attr 'keys').size == 1
         %(<keycap>#{keys[0]}</keycap>)
       else
-        key_combo = keys.map {|key| %(<keycap>#{key}</keycap>) }.join
-        %(<keycombo>#{key_combo}</keycombo>)
+        %(<keycombo>#{keys.map {|key| "<keycap>#{key}</keycap>" }.join}</keycombo>)
       end
     end
 
@@ -578,7 +587,7 @@ module Asciidoctor
       end
     end
 
-    QUOTE_TAGS = {
+    (QUOTE_TAGS = {
       :emphasis    => ['<emphasis>',               '</emphasis>',    true],
       :strong      => ['<emphasis role="strong">', '</emphasis>',    true],
       :monospaced  => ['<literal>',                '</literal>',     false],
@@ -587,8 +596,7 @@ module Asciidoctor
       :double      => ['&#8220;',                  '&#8221;',        true],
       :single      => ['&#8216;',                  '&#8217;',        true],
       :mark        => ['<emphasis role="marked">', '</emphasis>',    false]
-    }
-    QUOTE_TAGS.default = [nil, nil, true]
+    }).default = [nil, nil, true]
 
     def inline_quoted node
       if (type = node.type) == :latexmath
@@ -672,8 +680,8 @@ module Asciidoctor
           result << %(</revision>
 </revhistory>)
         end
-        unless (header_docinfo = doc.docinfo :header).empty?
-          result << header_docinfo
+        unless (head_docinfo = doc.docinfo).empty?
+          result << head_docinfo
         end
         result << %(<orgname>#{doc.attr 'orgname'}</orgname>) if doc.attr? 'orgname'
       end

data/lib/asciidoctor/converter/factory.rb

@@ -49,7 +49,7 @@ module Asciidoctor
             require 'thread_safe'.to_s unless defined? ::ThreadSafe
             new ::ThreadSafe::Cache.new
           rescue ::LoadError
-            warn 'asciidoctor: WARNING: gem \'thread_safe\' is not installed. This gem recommended when registering custom converters.'
+            warn 'asciidoctor: WARNING: gem \'thread_safe\' is not installed. This gem is recommended when registering custom converters.'
             new
           end
         end
@@ -207,6 +207,11 @@ module Asciidoctor
             require 'asciidoctor/converter/docbook45'.to_s
           end
           DocBook45Converter.new backend, opts
+        when 'manpage'
+          unless defined? ::Asciidoctor::Converter::ManPageConverter
+            require 'asciidoctor/converter/manpage'.to_s
+          end
+          ManPageConverter.new backend, opts
         end
 
         return base_converter unless opts.key? :template_dirs

data/lib/asciidoctor/converter/html5.rb

@@ -3,7 +3,7 @@ module Asciidoctor
   # A built-in {Converter} implementation that generates HTML 5 output
   # consistent with the html5 backend from AsciiDoc Python.
   class Converter::Html5Converter < Converter::BuiltIn
-    QUOTE_TAGS = {
+    (QUOTE_TAGS = {
       :emphasis    => ['<em>',     '</em>',     true],
       :strong      => ['<strong>', '</strong>', true],
       :monospaced  => ['<code>',   '</code>',   true],
@@ -17,8 +17,11 @@ module Asciidoctor
       # Opal can't resolve these constants when referenced here
       #:asciimath   => INLINE_MATH_DELIMITERS[:asciimath] + [false],
       #:latexmath   => INLINE_MATH_DELIMITERS[:latexmath] + [false]
-    }
-    QUOTE_TAGS.default = [nil, nil, nil]
+    }).default = [nil, nil, nil]
+
+    SvgPreambleRx = /\A.*?(?=<svg[ >])/m
+    SvgStartTagRx = /\A<svg[^>]*>/
+    DimensionAttributeRx = /\s(?:width|height|style)=(["']).*?\1/
 
     def initialize backend, opts = {}
       @xml_mode = opts[:htmlsyntax] == 'xml'
@@ -30,8 +33,9 @@ module Asciidoctor
       result = []
       slash = @void_element_slash
       br = %(<br#{slash}>)
-      asset_uri_scheme = (node.attr 'asset-uri-scheme', 'https')
-      asset_uri_scheme = %(#{asset_uri_scheme}:) unless asset_uri_scheme.empty?
+      unless (asset_uri_scheme = (node.attr 'asset-uri-scheme', 'https')).empty?
+        asset_uri_scheme = %(#{asset_uri_scheme}:)
+      end
       cdn_base = %(#{asset_uri_scheme}//cdnjs.cloudflare.com/ajax/libs)
       linkcss = node.safe >= SafeMode::SECURE || (node.attr? 'linkcss')
       result << '<!DOCTYPE html>'
@@ -52,7 +56,7 @@ module Asciidoctor
       result << %(<title>#{node.doctitle :sanitize => true, :use_fallback => true}</title>)
       if DEFAULT_STYLESHEET_KEYS.include?(node.attr 'stylesheet')
         if (webfonts = node.attr 'webfonts')
-          result << %(<link rel="stylesheet" href="#{asset_uri_scheme}//fonts.googleapis.com/css?family=#{webfonts.empty? ? 'Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400' : webfonts}"#{slash}>)
+          result << %(<link rel="stylesheet" href="#{asset_uri_scheme}//fonts.googleapis.com/css?family=#{webfonts.empty? ? 'Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700' : webfonts}"#{slash}>)
         end
         if linkcss
           result << %(<link rel="stylesheet" href="#{node.normalize_web_path DEFAULT_STYLESHEET_NAME, (node.attr 'stylesdir', ''), false}"#{slash}>)
@@ -71,14 +75,14 @@ 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.2.0/css/font-awesome.min.css]}"#{slash}>)
+          result << %(<link rel="stylesheet" href="#{node.attr 'iconfont-cdn', %[#{cdn_base}/font-awesome/4.4.0/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}>)
         end
       end
 
-      case node.attr 'source-highlighter'
+      case (highlighter = node.attr 'source-highlighter')
       when 'coderay'
         if (node.attr 'coderay-css', 'class') == 'class'
           if linkcss
@@ -96,38 +100,6 @@ module Asciidoctor
             result << (@stylesheets.embed_pygments_stylesheet pygments_style)
           end
         end
-      when 'highlightjs', 'highlight.js'
-        highlightjs_path = node.attr 'highlightjsdir', %(#{cdn_base}/highlight.js/8.4)
-        result << %(<link rel="stylesheet" href="#{highlightjs_path}/styles/#{node.attr 'highlightjs-theme', 'github'}.min.css"#{slash}>
-<script src="#{highlightjs_path}/highlight.min.js"></script>
-<script>hljs.initHighlightingOnLoad()</script>)
-      when 'prettify'
-        prettify_path = node.attr 'prettifydir', %(#{cdn_base}/prettify/r298)
-        result << %(<link rel="stylesheet" href="#{prettify_path}/#{node.attr 'prettify-theme', 'prettify'}.min.css"#{slash}>
-<script src="#{prettify_path}/prettify.min.js"></script>
-<script>document.addEventListener('DOMContentLoaded', prettyPrint)</script>)
-      end
-
-      if node.attr? 'stem'
-        # IMPORTANT to_s calls on delimiter arrays are intentional for JavaScript compat (emulates JSON.stringify)
-        eqnums_val = node.attr 'eqnums', 'none'
-        eqnums_val = 'AMS' if eqnums_val == ''
-        eqnums_opt = %( equationNumbers: { autoNumber: "#{eqnums_val}" } )
-        result << %(<script type="text/x-mathjax-config">
-MathJax.Hub.Config({
-  tex2jax: {
-    inlineMath: [#{INLINE_MATH_DELIMITERS[:latexmath].to_s}],
-    displayMath: [#{BLOCK_MATH_DELIMITERS[:latexmath].to_s}],
-    ignoreClass: "nostem|nolatexmath"
-  },
-  asciimath2jax: {
-    delimiters: [#{BLOCK_MATH_DELIMITERS[:asciimath].to_s}],
-    ignoreClass: "nostem|noasciimath"
-  },
-  TeX: {#{eqnums_opt}}
-});
-</script>
-<script src="#{cdn_base}/mathjax/2.4.0/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>)
       end
 
       unless (docinfo_content = node.docinfo).empty?
@@ -159,6 +131,7 @@ MathJax.Hub.Config({
 #{outline node}
 </div>)
           end
+          # QUESTION should this h2 have an auto-generated id?
           result << %(<h2>#{node.attr 'manname-title'}</h2>
 <div class="sectionbody">
 <p>#{node.attr 'manname'} - #{node.attr 'manpurpose'}</p>
@@ -221,22 +194,57 @@ MathJax.Hub.Config({
         end
         result << '</div>'
       end
+
       unless node.nofooter
         result << '<div id="footer">'
         result << '<div id="footer-text">'
-        if node.attr? 'revnumber'
-          result << %(#{node.attr 'version-label'} #{node.attr 'revnumber'}#{br})
-        end
-        if node.attr? 'last-update-label'
-          result << %(#{node.attr 'last-update-label'} #{node.attr 'docdatetime'})
-        end
+        result << %(#{node.attr 'version-label'} #{node.attr 'revnumber'}#{br}) if node.attr? 'revnumber'
+        result << %(#{node.attr 'last-update-label'} #{node.attr 'docdatetime'}) if node.attr? 'last-update-label'
         result << '</div>'
-        unless (docinfo_content = node.docinfo :footer).empty?
-          result << docinfo_content
-        end
         result << '</div>'
       end
 
+      unless (docinfo_content = node.docinfo :footer).empty?
+        result << docinfo_content
+      end
+      
+      # Load Javascript at the end of body for performance
+      # See http://www.html5rocks.com/en/tutorials/speed/script-loading/
+      case highlighter
+      when 'highlightjs', 'highlight.js'
+        highlightjs_path = node.attr 'highlightjsdir', %(#{cdn_base}/highlight.js/8.9.1)
+        result << %(<link rel="stylesheet" href="#{highlightjs_path}/styles/#{node.attr 'highlightjs-theme', 'github'}.min.css"#{slash}>)
+        result << %(<script src="#{highlightjs_path}/highlight.min.js"></script>
+<script>hljs.initHighlighting()</script>)
+      when 'prettify'
+        prettify_path = node.attr 'prettifydir', %(#{cdn_base}/prettify/r298)
+        result << %(<link rel="stylesheet" href="#{prettify_path}/#{node.attr 'prettify-theme', 'prettify'}.min.css"#{slash}>)
+        result << %(<script src="#{prettify_path}/prettify.min.js"></script>
+<script>prettyPrint()</script>)
+      end
+
+      if node.attr? 'stem'
+        # IMPORTANT to_s calls on delimiter arrays are intentional for JavaScript compat (emulates JSON.stringify)
+        eqnums_val = node.attr 'eqnums', 'none'
+        eqnums_val = 'AMS' if eqnums_val == ''
+        eqnums_opt = %( equationNumbers: { autoNumber: "#{eqnums_val}" } )
+        result << %(<script type="text/x-mathjax-config">
+MathJax.Hub.Config({
+  tex2jax: {
+    inlineMath: [#{INLINE_MATH_DELIMITERS[:latexmath].inspect}],
+    displayMath: [#{BLOCK_MATH_DELIMITERS[:latexmath].inspect}],
+    ignoreClass: "nostem|nolatexmath"
+  },
+  asciimath2jax: {
+    delimiters: [#{BLOCK_MATH_DELIMITERS[:asciimath].inspect}],
+    ignoreClass: "nostem|noasciimath"
+  },
+  TeX: {#{eqnums_opt}}
+});
+</script>
+<script src="#{cdn_base}/mathjax/2.5.3/MathJax.js?config=TeX-MML-AM_HTMLorMML"></script>)
+      end
+
       result << '</body>'
       result << '</html>'
       result * EOL
@@ -244,9 +252,29 @@ MathJax.Hub.Config({
 
     def embedded node
       result = []
-      if !node.notitle && node.has_header?
-        id_attr = node.id ? %( id="#{node.id}") : nil
-        result << %(<h1#{id_attr}>#{node.header.title}</h1>)
+      if node.doctype == 'manpage'
+        # QUESTION should notitle control the manual page title?
+        unless node.notitle
+          id_attr = node.id ? %( id="#{node.id}") : nil
+          result << %(<h1#{id_attr}>#{node.doctitle} Manual Page</h1>)
+        end
+        # QUESTION should this h2 have an auto-generated id?
+        result << %(<h2>#{node.attr 'manname-title'}</h2>
+<div class="sectionbody">
+<p>#{node.attr 'manname'} - #{node.attr 'manpurpose'}</p>
+</div>)
+      else
+        if node.has_header? && !node.notitle
+          id_attr = node.id ? %( id="#{node.id}") : nil
+          result << %(<h1#{id_attr}>#{node.header.title}</h1>)
+        end
+      end
+
+      if (node.attr? 'toc') && !['macro', 'preamble'].include?(node.attr 'toc-placement')
+        result << %(<div id="toc" class="toc">
+<div id="toctitle">#{node.attr 'toc-title'}</div>
+#{outline node}
+</div>)
       end
 
       result << node.content
@@ -256,10 +284,9 @@ MathJax.Hub.Config({
 <hr#{@void_element_slash}>)
         node.footnotes.each do |footnote|
           result << %(<div class="footnote" id="_footnote_#{footnote.index}">
-<a href="#_footnoteref_#{footnote.index}">#{footnote.index}</a> #{footnote.text}
+<a href="#_footnoteref_#{footnote.index}">#{footnote.index}</a>. #{footnote.text}
 </div>)
         end
-
         result << '</div>'
       end
 
@@ -510,29 +537,34 @@ Your browser does not support the audio tag.
     end
 
     def image node
-      align = (node.attr? 'align') ? (node.attr 'align') : nil
-      float = (node.attr? 'float') ? (node.attr 'float') : nil
-      style_attribute = if align || float
-        styles = [align ? %(text-align: #{align}) : nil, float ? %(float: #{float}) : nil].compact
-        %( style="#{styles * ';'}")
+      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
+          ((svg = (node.option? 'inline')) || (obj = (node.option? 'interactive')))
+        if svg
+          img = (read_svg_contents node, target) || %(<span class="alt">#{node.attr 'alt'}</span>)
+        elsif obj
+          fallback = (node.attr? 'fallback') ? %(<img src="#{node.image_uri(node.attr 'fallback')}" alt="#{node.attr 'alt'}"#{width_attr}#{height_attr}#{@void_element_slash}>) : %(<span class="alt">#{node.attr 'alt'}</span>)
+          img = %(<object type="image/svg+xml" data="#{node.image_uri target}"#{width_attr}#{height_attr}>#{fallback}</object>)
+        end
       end
-
-      width_attribute = (node.attr? 'width') ? %( width="#{node.attr 'width'}") : nil
-      height_attribute = (node.attr? 'height') ? %( height="#{node.attr 'height'}") : nil
-
-      img_element = %(<img src="#{node.image_uri node.attr('target')}" alt="#{node.attr 'alt'}"#{width_attribute}#{height_attribute}#{@void_element_slash}>)
+      img ||= %(<img src="#{node.image_uri target}" alt="#{node.attr 'alt'}"#{width_attr}#{height_attr}#{@void_element_slash}>)
       if (link = node.attr 'link')
-        img_element = %(<a class="image" href="#{link}">#{img_element}</a>)
+        img = %(<a class="image" href="#{link}">#{img}</a>)
       end
-      id_attribute = node.id ? %( id="#{node.id}") : nil
+      id_attr = node.id ? %( id="#{node.id}") : nil
       classes = ['imageblock', node.style, node.role].compact
-      class_attribute = %( class="#{classes * ' '}")
-      title_element = node.title? ? %(\n<div class="title">#{node.captioned_title}</div>) : nil
-
-      %(<div#{id_attribute}#{class_attribute}#{style_attribute}>
+      class_attr = %( class="#{classes * ' '}")
+      styles = []
+      styles << %(text-align: #{node.attr 'align'}) if node.attr? 'align'
+      styles << %(float: #{node.attr 'float'}) if node.attr? 'float'
+      style_attr = styles.empty? ? nil : %( style="#{styles * ';'}")
+      title_el = node.title? ? %(\n<div class="title">#{node.captioned_title}</div>) : nil
+      %(<div#{id_attr}#{class_attr}#{style_attr}>
 <div class="content">
-#{img_element}
-</div>#{title_element}
+#{img}
+</div>#{title_el}
 </div>)
     end
 
@@ -663,25 +695,16 @@ Your browser does not support the audio tag.
     end
 
     def paragraph node
-      attributes = if node.id
-        if node.role
-          %( id="#{node.id}" class="paragraph #{node.role}")
-        else
-          %( id="#{node.id}" class="paragraph")
-        end
-      elsif node.role
-        %( class="paragraph #{node.role}")
-      else
-        ' class="paragraph"'
-      end
+      class_attribute = node.role ? %(class="paragraph #{node.role}") : 'class="paragraph"'
+      attributes = node.id ? %(id="#{node.id}" #{class_attribute}) : class_attribute
 
       if node.title?
-        %(<div#{attributes}>
+        %(<div #{attributes}>
 <div class="title">#{node.title}</div>
 <p>#{node.content}</p>
 </div>)
       else
-        %(<div#{attributes}>
+        %(<div #{attributes}>
 <p>#{node.content}</p>
 </div>)
       end
@@ -911,6 +934,9 @@ Your browser does not support the audio tag.
       height_attribute = (node.attr? 'height') ? %( height="#{node.attr 'height'}") : nil
       case node.attr 'poster'
       when 'vimeo'
+        unless (asset_uri_scheme = (node.document.attr 'asset-uri-scheme', 'https')).empty?
+          asset_uri_scheme = %(#{asset_uri_scheme}:)
+        end
         start_anchor = (node.attr? 'start', nil, false) ? %(#at=#{node.attr 'start'}) : nil
         delimiter = '?'
         autoplay_param = (node.option? 'autoplay') ? %(#{delimiter}autoplay=1) : nil
@@ -918,10 +944,13 @@ Your browser does not support the audio tag.
         loop_param = (node.option? 'loop') ? %(#{delimiter}loop=1) : nil
         %(<div#{id_attribute}#{class_attribute}>#{title_element}
 <div class="content">
-<iframe#{width_attribute}#{height_attribute} src="//player.vimeo.com/video/#{node.attr 'target'}#{start_anchor}#{autoplay_param}#{loop_param}" frameborder="0"#{(node.option? 'nofullscreen') ? nil : (append_boolean_attribute 'allowfullscreen', xml)}></iframe>
+<iframe#{width_attribute}#{height_attribute} src="#{asset_uri_scheme}//player.vimeo.com/video/#{node.attr 'target'}#{start_anchor}#{autoplay_param}#{loop_param}" frameborder="0"#{(node.option? 'nofullscreen') ? nil : (append_boolean_attribute 'allowfullscreen', xml)}></iframe>
 </div>
 </div>)
       when 'youtube'
+        unless (asset_uri_scheme = (node.document.attr 'asset-uri-scheme', 'https')).empty?
+          asset_uri_scheme = %(#{asset_uri_scheme}:)
+        end
         rel_param_val = (node.option? 'related') ? 1 : 0
         start_param = (node.attr? 'start', nil, false) ? %(&amp;start=#{node.attr 'start'}) : nil
         end_param = (node.attr? 'end', nil, false) ? %(&amp;end=#{node.attr 'end'}) : nil
@@ -951,13 +980,14 @@ Your browser does not support the audio tag.
             # INFO playlist bar doesn't appear in Firefox unless showinfo=1 and modestbranding=1
             list_param = %(&amp;playlist=#{playlist})
           else
-            list_param = nil
+            # NOTE for loop to work, playlist must be specified; use VIDEO_ID if there's no explicit playlist
+            list_param = loop_param ? %(&amp;playlist=#{target}) : nil
           end
         end
 
         %(<div#{id_attribute}#{class_attribute}>#{title_element}
 <div class="content">
-<iframe#{width_attribute}#{height_attribute} src="//www.youtube.com/embed/#{target}?rel=#{rel_param_val}#{start_param}#{end_param}#{autoplay_param}#{loop_param}#{controls_param}#{list_param}#{fs_param}#{modest_param}#{theme_param}#{hl_param}" frameborder="0"#{fs_attribute}></iframe>
+<iframe#{width_attribute}#{height_attribute} src="#{asset_uri_scheme}//www.youtube.com/embed/#{target}?rel=#{rel_param_val}#{start_param}#{end_param}#{autoplay_param}#{loop_param}#{controls_param}#{list_param}#{fs_param}#{modest_param}#{theme_param}#{hl_param}" frameborder="0"#{fs_attribute}></iframe>
 </div>
 </div>)
       else
@@ -979,7 +1009,7 @@ Your browser does not support the video tag.
       target = node.target
       case node.type
       when :xref
-        refid = (node.attr 'refid') || target
+        refid = node.attributes['refid'] || target
         # NOTE we lookup text in converter because DocBook doesn't need this logic
         text = node.text || (node.document.references[:ids][refid] || %([#{refid}]))
         # FIXME shouldn't target be refid? logic seems confused here
@@ -992,8 +1022,8 @@ Your browser does not support the video tag.
         if (role = node.role)
           attrs << %( class="#{role}")
         end
-        attrs << %( title="#{node.attr 'title'}") if node.attr? 'title'
-        attrs << %( target="#{node.attr 'window'}") if node.attr? 'window'
+        attrs << %( title="#{node.attr 'title'}") if node.attr? 'title', nil, false
+        attrs << %( target="#{node.attr 'window'}") if node.attr? 'window', nil, false
         %(<a href="#{target}"#{attrs.join}>#{node.text}</a>)
       when :bibref
         %(<a id="#{target}"></a>[#{target}])
@@ -1024,51 +1054,47 @@ Your browser does not support the video tag.
     def inline_footnote node
       if (index = node.attr 'index')
         if node.type == :xref
-          %(<span class="footnoteref">[<a class="footnote" href="#_footnote_#{index}" title="View footnote.">#{index}</a>]</span>)
+          %(<sup class="footnoteref">[<a class="footnote" href="#_footnote_#{index}" title="View footnote.">#{index}</a>]</sup>)
         else
           id_attr = node.id ? %( id="_footnote_#{node.id}") : nil
-          %(<span class="footnote"#{id_attr}>[<a id="_footnoteref_#{index}" class="footnote" href="#_footnote_#{index}" title="View footnote.">#{index}</a>]</span>)
+          %(<sup class="footnote"#{id_attr}>[<a id="_footnoteref_#{index}" class="footnote" href="#_footnote_#{index}" title="View footnote.">#{index}</a>]</sup>)
         end
       elsif node.type == :xref
-        %(<span class="footnoteref red" title="Unresolved footnote reference.">[#{node.text}]</span>)
+        %(<sup class="footnoteref red" title="Unresolved footnote reference.">[#{node.text}]</sup>)
       end
     end
 
     def inline_image node
       if (type = node.type) == 'icon' && (node.document.attr? 'icons', 'font')
-        style_class = %(fa fa-#{node.target})
-        if node.attr? 'size'
-          style_class = %(#{style_class} fa-#{node.attr 'size'})
-        end
-        if node.attr? 'rotate'
-          style_class = %(#{style_class} fa-rotate-#{node.attr 'rotate'})
-        end
-        if node.attr? 'flip'
-          style_class = %(#{style_class} fa-flip-#{node.attr 'flip'})
+        class_attr_val = %(fa fa-#{node.target})
+        {'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_attribute = (node.attr? 'title') ? %( title="#{node.attr 'title'}") : nil
-        img = %(<i class="#{style_class}"#{title_attribute}></i>)
+        title_attr = (node.attr? 'title') ? %( title="#{node.attr 'title'}") : nil
+        img = %(<i class="#{class_attr_val}"#{title_attr}></i>)
       elsif type == 'icon' && !(node.document.attr? 'icons')
         img = %([#{node.attr 'alt'}])
       else
-        resolved_target = (type == 'icon') ? (node.icon_uri node.target) : (node.image_uri node.target)
-
-        attrs = ['alt', 'width', 'height', 'title'].map {|name|
-          (node.attr? name) ? %( #{name}="#{node.attr name}") : nil
-        }.join
-
-        img = %(<img src="#{resolved_target}"#{attrs}#{@void_element_slash}>)
+        target = node.target
+        attrs = ['width', 'height', 'title'].map {|name| (node.attr? name) ? %( #{name}="#{node.attr name}") : nil }.join
+        if type != 'icon' && ((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>)
+          elsif obj
+            fallback = (node.attr? 'fallback') ? %(<img src="#{node.image_uri(node.attr 'fallback')}" alt="#{node.attr 'alt'}"#{attrs}#{@void_element_slash}>) : %(<span class="alt">#{node.attr 'alt'}</span>)
+            img = %(<object type="image/svg+xml" data="#{node.image_uri target}"#{attrs}>#{fallback}</object>)
+          end
+        end
+        img ||= %(<img src="#{type == 'icon' ? (node.icon_uri target) : (node.image_uri target)}" alt="#{node.attr 'alt'}"#{attrs}#{@void_element_slash}>)
       end
-
       if node.attr? 'link'
         window_attr = (node.attr? 'window') ? %( target="#{node.attr 'window'}") : nil
         img = %(<a class="image" href="#{node.attr 'link'}"#{window_attr}>#{img}</a>)
       end
-
-      style_classes = (role = node.role) ? %(#{type} #{role}) : type
+      class_attr_val = (role = node.role) ? %(#{type} #{role}) : type
       style_attr = (node.attr? 'float') ? %( style="float: #{node.attr 'float'}") : nil
-
-      %(<span class="#{style_classes}"#{style_attr}>#{img}</span>)
+      %(<span class="#{class_attr_val}"#{style_attr}>#{img}</span>)
     end
 
     def inline_indexterm node
@@ -1114,5 +1140,21 @@ Your browser does not support the video tag.
     def append_boolean_attribute name, xml
       xml ? %( #{name}="#{name}") : %( #{name})
     end
+
+    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
+        ['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">)
+          end
+        end
+        svg = svg.sub SvgStartTagRx, start_tag if start_tag
+      end
+      svg
+    end
   end
 end