asciidoctor 1.5.5 → 1.5.6

data/lib/asciidoctor/attribute_list.rb

@@ -22,38 +22,31 @@ module Asciidoctor
 #    => {'style' => 'quote', 'attribution' => 'Famous Person', 'citetitle' => 'Famous Book (2001)'}
 #
 class AttributeList
-
-  # FIXME Opal not inheriting constants from parent scope
-  # NOTE can't use ::RUBY_ENGINE_OPAL here either
-  if ::RUBY_ENGINE == 'opal'
-    CG_BLANK = '[ \\t]'
-    CC_WORD  = 'a-zA-Z0-9_'
-    CG_WORD  = '[a-zA-Z0-9_]'
-  end
+  BACKSLASH = '\\'
 
   # Public: Regular expressions for detecting the boundary of a value
   BoundaryRxs = {
     '"' => /.*?[^\\](?=")/,
     '\'' => /.*?[^\\](?=')/,
-    ',' => /.*?(?=#{CG_BLANK}*(,|$))/
+    ',' => /.*?(?=[ \t]*(,|$))/
   }
 
   # Public: Regular expressions for unescaping quoted characters
-  EscapedQuoteRxs = {
-    '"' => /\\"/,
-    '\'' => /\\'/
+  EscapedQuotes = {
+    '"' => '\\"',
+    '\'' => '\\\''
   }
 
   # Public: A regular expression for an attribute name (approx. name token from XML)
   # TODO named attributes cannot contain dash characters
   NameRx = /#{CG_WORD}[#{CC_WORD}\-.]*/
 
-  BlankRx = /#{CG_BLANK}+/
+  BlankRx = /[ \t]+/
 
   # Public: Regular expressions for skipping blanks and delimiters
   SkipRxs = {
     :blank => BlankRx,
-    ',' => /#{CG_BLANK}*(,|$)/
+    ',' => /[ \t]*(,|$)/
   }
 
   def initialize source, block = nil, delimiter = ','
@@ -162,16 +155,27 @@ class AttributeList
       # opts is an alias for options
       case name
       when 'options', 'opts'
-        name = 'options'
-        value.tr(' ', '').split(',').each {|opt| @attributes[%(#{opt}-option)] = '' }
-        @attributes[name] = value
-      when 'title'
-        @attributes[name] = value
+        if value.include? ','
+          value = value.delete ' ' if value.include? ' '
+          (value.split ',').each {|opt| @attributes[%(#{opt}-option)] = '' unless opt.empty? }
+        else
+          @attributes[%(#{value = value.strip}-option)] = ''
+        end
+        @attributes['options'] = value
       else
-        @attributes[name] = single_quoted_value && !value.empty? && @block ? (@block.apply_normal_subs value) : value
+        if single_quoted_value && @block
+          case name
+          when 'title', 'reftext'
+            @attributes[name] = value
+          else
+            @attributes[name] = @block.apply_subs value
+          end
+        else
+          @attributes[name] = value
+        end
       end
     else
-      resolved_name = single_quoted_value && !name.empty? && @block ? (@block.apply_normal_subs name) : name
+      resolved_name = single_quoted_value && @block ? (@block.apply_subs name) : name
       if (pos_name = pos_attrs[index])
         @attributes[pos_name] = resolved_name
       end
@@ -193,7 +197,11 @@ class AttributeList
 
     if (value = scan_to_quote quote)
       @scanner.get_byte
-      value.gsub EscapedQuoteRxs[quote], quote
+      if value.include? BACKSLASH
+        value.gsub EscapedQuotes[quote], quote
+      else
+        value
+      end
     else
       %(#{quote}#{scan_to_delimiter})
     end

data/lib/asciidoctor/block.rb

@@ -24,7 +24,7 @@ class Block < AbstractBlock
   }).default = :simple
 
   # Public: Create alias for context to be consistent w/ AsciiDoc
-  alias :blockname :context
+  alias blockname context
 
   # Public: Get/Set the original Array content for this block, if applicable
   attr_accessor :lines
@@ -74,14 +74,14 @@ class Block < AbstractBlock
         lock_in_subs
       # e.g., :subs => nil
       else
-        @subs = []
+        # NOTE @subs is initialized as empty array by super constructor
         # prevent subs from being resolved
         @default_subs = []
         @attributes.delete 'subs'
       end
     # defer subs resolution; subs attribute is honored
     else
-      @subs = []
+      # NOTE @subs is initialized as empty array by super constructor
       # QUESTION should we honor :default_subs option (i.e., @default_subs = opts[:default_subs])?
       @default_subs = nil
     end
@@ -109,9 +109,9 @@ class Block < AbstractBlock
     when :compound
       super
     when :simple
-      apply_subs(@lines * EOL, @subs)
+      apply_subs @lines * LF, @subs
     when :verbatim, :raw
-      #((apply_subs @lines.join(EOL), @subs).sub StripLineWiseRx, '\1')
+      #((apply_subs @lines * LF, @subs).sub StripLineWiseRx, '\1')
 
       # QUESTION could we use strip here instead of popping empty lines?
       # maybe apply_subs can know how to strip whitespace?
@@ -121,7 +121,7 @@ class Block < AbstractBlock
       else
         result.shift while (first = result[0]) && first.rstrip.empty?
         result.pop while (last = result[-1]) && last.rstrip.empty?
-        result * EOL
+        result * LF
       end
     else
       warn %(Unknown content model '#{@content_model}' for block: #{to_s}) unless @content_model == :empty
@@ -134,7 +134,7 @@ class Block < AbstractBlock
   # Returns the a String containing the lines joined together or nil if there
   # are no lines
   def source
-    @lines * EOL
+    @lines * LF
   end
 
   def to_s

data/lib/asciidoctor/cli/invoker.rb

@@ -7,7 +7,7 @@ module Asciidoctor
       attr_reader :documents
       attr_reader :code
 
-      def initialize(*options)
+      def initialize *options
         @documents = []
         @out = nil
         @err = nil
@@ -33,19 +33,12 @@ module Asciidoctor
         return unless @options
 
         old_verbose = $VERBOSE
-        case @options[:verbose]
-        when 0
-          $VERBOSE = nil
-        when 1
-          $VERBOSE = false
-        when 2
-          $VERBOSE = true
-        end
-
         opts = {}
         infiles = []
         outfile = nil
-        tofile = nil
+        err = @err || $stderr
+        show_timings = false
+
         @options.map do |key, val|
           case key
           when :input_files
@@ -57,55 +50,75 @@ module Asciidoctor
           when :attributes
             # NOTE processor will dup attributes internally
             opts[:attributes] = val
+          when :timings
+            show_timings = val
           when :trace
-            # currently, nothing
+            # currently does nothing
+          when :verbose
+            case val
+            when 0
+              $VERBOSE = nil
+            when 1
+              $VERBOSE = false
+            when 2
+              $VERBOSE = true
+            end
           else
             opts[key] = val unless val.nil?
           end
         end
 
-        if infiles.size == 1 && infiles[0] == '-'
-          # allows use of block to supply stdin, particularly useful for tests
-          inputs = [block_given? ? yield : STDIN]
-        else
-          inputs = infiles.map {|infile| ::File.new infile, 'r'}
+        stdin = if infiles.size == 1
+          if (infile0 = infiles[0]) == '-'
+            outfile ||= infile0
+            true
+          elsif ::File.pipe? infile0
+            outfile ||= '-'
+            nil
+          end
         end
 
-        # NOTE if infile is stdin, default to outfile as stout
-        if outfile == '-' || (!outfile && infiles.size == 1 && infiles[0] == '-')
-          tofile = (@out || $stdout)
+        tofile = if outfile == '-'
+          @out || $stdout
         elsif outfile
-          tofile = outfile
           opts[:mkdirs] = true
+          outfile
         else
-          # automatically calculate outfile based on infile unless to_dir is set
-          tofile = nil
           opts[:mkdirs] = true
+          nil # automatically calculate outfile based on infile
         end
 
-        show_timings = @options[:timings]
-        inputs.each do |input|
-          # NOTE processor will dup options and attributes internally
-          input_opts = tofile.nil? ? opts : opts.merge(:to_file => tofile)
+        if stdin
+          # allows use of block to supply stdin, particularly useful for tests
+          input = block_given? ? yield : STDIN
+          input_opts = opts.merge :to_file => tofile
           if show_timings
-            timings = Timings.new
-            @documents << ::Asciidoctor.convert(input, input_opts.merge(:timings => timings))
-            timings.print_report((@err || $stderr), ((input.respond_to? :path) ? input.path : '-'))
+            @documents << (::Asciidoctor.convert input, (input_opts.merge :timings => (timings = Timings.new)))
+            timings.print_report err, '-'
           else
-            @documents << ::Asciidoctor.convert(input, input_opts)
+            @documents << (::Asciidoctor.convert input, input_opts)
+          end
+        else
+          infiles.each do |infile|
+            input_opts = opts.merge :to_file => tofile
+            if show_timings
+              @documents << (::Asciidoctor.convert_file infile, (input_opts.merge :timings => (timings = Timings.new)))
+              timings.print_report err, infile
+            else
+              @documents << (::Asciidoctor.convert_file infile, input_opts)
+            end
           end
         end
       rescue ::Exception => e
         if ::SignalException === e
           @code = e.signo
           # add extra endline if Ctrl+C is used
-          (@err || $stderr).puts if ::Interrupt === e
+          err.puts if ::Interrupt === e
         else
           @code = (e.respond_to? :status) ? e.status : 1
           if @options[:trace]
             raise e
           else
-            err = (@err || $stderr)
             if ::RuntimeError === e
               err.puts %(#{e.message} (#{e.class}))
             else
@@ -123,7 +136,7 @@ module Asciidoctor
         @documents[0]
       end
 
-      def redirect_streams(out, err = nil)
+      def redirect_streams out, err = nil
         @out = out
         @err = err
       end

data/lib/asciidoctor/cli/options.rb

@@ -56,14 +56,14 @@ Example: asciidoctor -b html5 source.asciidoc
           end
           opts.on('--safe',
                   'set safe mode level to safe (default: unsafe)',
-                  'enables include macros, but restricts access to ancestor paths of source file',
+                  'enables include directives, but prevents access to ancestor paths of source file',
                   'provided for compatibility with the asciidoc command') do
             self[:safe] = SafeMode::SAFE
           end
-          opts.on('-S', '--safe-mode SAFE_MODE', (safe_mode_names = SafeMode.constants.map(&:to_s).map(&:downcase)),
+          opts.on('-S', '--safe-mode SAFE_MODE', (safe_mode_names = SafeMode.names),
                   %(set safe mode level explicitly: [#{safe_mode_names * ', '}] (default: unsafe)),
-                  'disables potentially dangerous macros in source files, such as include::[]') do |safe_mode|
-            self[:safe] = SafeMode.const_get safe_mode.upcase
+                  'disables potentially dangerous macros in source files, such as include::[]') do |name|
+            self[:safe] = SafeMode.value_for_name name
           end
           opts.on('-s', '--no-header-footer', 'suppress output of header and footer (default: false)') do
             self[:header_footer] = false
@@ -84,7 +84,7 @@ Example: asciidoctor -b html5 source.asciidoc
             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]}!"
+            #  key = %(#{key[1..-1]}!)
             #end
             self[:attributes][key] = val
           end
@@ -93,7 +93,7 @@ Example: asciidoctor -b html5 source.asciidoc
             if self[:template_dirs].nil?
               self[:template_dirs] = [template_dir]
             elsif ::Array === self[:template_dirs]
-              self[:template_dirs].push template_dir
+              self[:template_dirs] << template_dir
             else
               self[:template_dirs] = [self[:template_dirs], template_dir]
             end
@@ -128,8 +128,19 @@ Example: asciidoctor -b html5 source.asciidoc
             self[:timings] = true
           end
 
-          opts.on_tail('-h', '--help', 'show this message') do
-            $stdout.puts opts
+          opts.on_tail('-h', '--help [TOPIC]', 'print the help message',
+              'show the command usage if TOPIC is not specified (or not recognized)',
+              'dump the Asciidoctor man page (in troff/groff format) if TOPIC is manpage') do |topic|
+            if topic == 'manpage'
+              if ::File.exist?(manpage_path = (::File.join ::Asciidoctor::ROOT_PATH, 'man', 'asciidoctor.1'))
+                $stdout.puts(::IO.read manpage_path)
+              else
+                $stderr.puts 'asciidoctor: FAILED: man page not found; try `man asciidoctor`'
+                return 1
+              end
+            else
+              $stdout.puts opts
+            end
             return 0
           end
 
@@ -153,12 +164,12 @@ Example: asciidoctor -b html5 source.asciidoc
 
         # shave off the file to process so that options errors appear correctly
         if args.size == 1 && args[0] == '-'
-          infiles.push args.pop
+          infiles << args.pop
         elsif
           args.each do |file|
             if file == '-' || (file.start_with? '-')
               # warn, but don't panic; we may have enough to proceed, so we won't force a failure
-              $stderr.puts "asciidoctor: WARNING: extra arguments detected (unparsed arguments: #{args.map{|a| "'#{a}'"} * ', '}) or incorrect usage of stdin"
+              $stderr.puts %(asciidoctor: WARNING: extra arguments detected (unparsed arguments: '#{args * "', '"}') or incorrect usage of stdin)
             else
               if ::File.readable? file
                 matches = [file]
@@ -179,7 +190,7 @@ Example: asciidoctor -b html5 source.asciidoc
         end
 
         infiles.each do |file|
-          unless file == '-' || (::File.file? file)
+          unless file == '-' || (::File.file? file) || (::File.pipe? file)
             if ::File.readable? file
               $stderr.puts %(asciidoctor: FAILED: input path #{file} is a #{(::File.stat file).ftype}, not a file)
             else

data/lib/asciidoctor/converter.rb

@@ -184,7 +184,7 @@ module Asciidoctor
     end
 
     # Alias for backward compatibility.
-    alias :convert_with_options :convert
+    alias convert_with_options convert
   end
 
   # A module that can be used to mix the {#write} method into a {Converter}
@@ -202,9 +202,9 @@ module Asciidoctor
       if target.respond_to? :write
         target.write output.chomp
         # ensure there's a trailing endline to be nice to terminals
-        target.write EOL
+        target.write LF
       else
-        ::File.open(target, 'w') {|f| f.write output }
+        ::IO.write target, output
       end
       nil
     end

data/lib/asciidoctor/converter/base.rb

@@ -34,7 +34,7 @@ module Asciidoctor
       opts.empty? ? (send transform, node) : (send transform, node, opts)
     end
 
-    alias :handles? :respond_to?
+    alias handles? respond_to?
 
     # Public: Returns the converted content of the {AbstractNode}.
     #
@@ -43,7 +43,7 @@ module Asciidoctor
       node.content
     end
 
-    alias :pass :content
+    alias pass content
 
     # Public: Skips conversion of the {AbstractNode}.
     #

data/lib/asciidoctor/converter/composite.rb

@@ -32,7 +32,7 @@ module Asciidoctor
     end
 
     # Alias for backward compatibility.
-    alias :convert_with_options :convert
+    alias convert_with_options convert
 
     # Public: Retrieve the converter for the specified transform.
     #

data/lib/asciidoctor/converter/docbook45.rb

@@ -29,7 +29,7 @@ module Asciidoctor
         result << '</listitem>'
       end
       result << %(</orderedlist>)
-      result * EOL
+      result * LF
     end
 
     def inline_anchor node
@@ -66,7 +66,7 @@ module Asciidoctor
       result << %(<email>#{doc.attr email_key}</email>) if doc.attr? email_key
       result << '</author>'
 
-      result * EOL
+      result * LF
     end
 
     def common_attributes id, role = nil, reftext = nil

data/lib/asciidoctor/converter/docbook5.rb

@@ -4,6 +4,8 @@ module Asciidoctor
   # similar to the docbook45 backend from AsciiDoc Python, but migrated to the
   # DocBook 5 specification.
   class Converter::DocBook5Converter < Converter::BuiltIn
+    ImageMacroRx = /^image::?(.+?)\[(.*?)\]$/
+
     def document node
       result = []
       if (root_tag_name = node.doctype) == 'manpage'
@@ -29,34 +31,25 @@ module Asciidoctor
       end
       lang_attribute = (node.attr? 'nolang') ? nil : %( #{lang_attribute_name}="#{node.attr 'lang', 'en'}")
       result << %(<#{root_tag_name}#{document_ns_attributes node}#{lang_attribute}>)
-      result << (document_info_element node, root_tag_name)
+      result << (document_info_element node, root_tag_name) unless node.noheader
       result << node.content if node.blocks?
       unless (footer_docinfo = node.docinfo :footer).empty?
         result << footer_docinfo
       end
       result << %(</#{root_tag_name}>)
 
-      result * EOL
+      result * LF
     end
 
-    alias :embedded :content
+    alias embedded content
+
+    MANPAGE_SECTION_TAGS = { 'section' => 'refsection', 'synopsis' => 'refsynopsisdiv' }
 
     def section node
-      doctype = node.document.doctype
-      if node.special
-        if (tag_name = node.sectname).start_with? 'sect'
-          # a normal child section of a special section
-          tag_name = 'section'
-        end
+      if node.document.doctype == 'manpage'
+        tag_name = MANPAGE_SECTION_TAGS[tag_name = node.sectname] || tag_name
       else
-        tag_name = doctype == 'book' && node.level <= 1 ? (node.level == 0 ? 'part' : 'chapter') : 'section'
-      end
-      if doctype == 'manpage'
-        if tag_name == 'section'
-          tag_name = 'refsection'
-        elsif tag_name == 'synopsis'
-          tag_name = 'refsynopsisdiv'
-        end
+        tag_name = node.sectname
       end
       %(<#{tag_name}#{common_attributes node.id, node.role, node.reftext}>
 <title>#{node.title}</title>
@@ -70,7 +63,7 @@ module Asciidoctor
 </#{tag_name}>)
     end
 
-    alias :audio :skip
+    alias audio skip
 
     def colist node
       result = []
@@ -83,16 +76,10 @@ module Asciidoctor
         result << '</callout>'
       end
       result << %(</calloutlist>)
-      result * EOL
+      result * LF
     end
 
     (DLIST_TAGS = {
-      'labeled' => {
-        :list  => 'variablelist',
-        :entry => 'varlistentry',
-        :term  => 'term',
-        :item  => 'listitem'
-      },
       'qanda' => {
         :list  => 'qandaset',
         :entry => 'qandaentry',
@@ -106,7 +93,7 @@ module Asciidoctor
         :term  => 'glossterm',
         :item  => 'glossdef'
       }
-    }).default = { # default value == DLIST['labeled'], expanded for Opal
+    }).default = { # default is variable
       :list => 'variablelist',
       :entry => 'varlistentry',
       :term => 'term',
@@ -172,7 +159,7 @@ module Asciidoctor
         result << %(</#{list_tag}>) if list_tag
       end
 
-      result * EOL
+      result * LF
     end
 
     def example node
@@ -193,19 +180,29 @@ module Asciidoctor
     end
 
     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
+      # NOTE according to the DocBook spec, content area, scaling, and scaling to fit are mutually exclusive
+      # See http://tdg.docbook.org/tdg/4.5/imagedata-x.html#d0e79635
+      if node.attr? 'scaledwidth'
+        width_attribute = %( width="#{node.attr 'scaledwidth'}")
+        depth_attribute = nil
+        scale_attribute = nil
+      elsif node.attr? 'scale'
+        # QUESTION should we set the viewport using width and depth? (the scaled image would be contained within this box)
+        #width_attribute = (node.attr? 'width') ? %( width="#{node.attr 'width'}") : nil
+        #depth_attribute = (node.attr? 'height') ? %( depth="#{node.attr 'height'}") : nil
+        scale_attribute = %( scale="#{node.attr 'scale'}")
+      else
+        width_attribute = (node.attr? 'width') ? %( contentwidth="#{node.attr 'width'}") : nil
+        depth_attribute = (node.attr? 'height') ? %( contentdepth="#{node.attr 'height'}") : nil
+        scale_attribute = nil
+      end
       align_attribute = (node.attr? 'align') ? %( align="#{node.attr 'align'}") : nil
 
       mediaobject = %(<mediaobject>
 <imageobject>
-<imagedata fileref="#{node.image_uri(node.attr 'target')}"#{width_attribute}#{depth_attribute}#{swidth_attribute}#{scale_attribute}#{align_attribute}/>
+<imagedata fileref="#{node.image_uri(node.attr 'target')}"#{width_attribute}#{depth_attribute}#{scale_attribute}#{align_attribute}/>
 </imageobject>
-<textobject><phrase>#{node.attr 'alt'}</phrase></textobject>
+<textobject><phrase>#{node.alt}</phrase></textobject>
 </mediaobject>)
 
       if node.title?
@@ -224,7 +221,7 @@ module Asciidoctor
       informal = !node.title?
       listing_attributes = (common_attributes node.id, node.role, node.reftext)
       if node.style == 'source' && (node.attr? 'language')
-        numbering = (node.attr? 'linenums') ? 'numbered' : 'unnumbered'
+        numbering = (node.attr? 'linenums', nil, false) ? 'numbered' : 'unnumbered'
         listing_content = %(<programlisting#{informal ? listing_attributes : nil} language="#{node.attr 'language', nil, false}" linenumbering="#{numbering}">#{node.content}</programlisting>)
       else
         listing_content = %(<screen#{informal ? listing_attributes : nil}>#{node.content}</screen>)
@@ -256,10 +253,12 @@ module Asciidoctor
 
     def stem node
       if (idx = node.subs.index :specialcharacters)
-        node.subs.delete :specialcharacters
+        node.subs.delete_at idx
+        equation = node.content
+        idx > 0 ? (node.subs.insert idx, :specialcharacters) : (node.subs.unshift :specialcharacters)
+      else
+        equation = node.content
       end
-      equation = node.content
-      node.subs.insert idx, :specialcharacters if idx
       if node.style == 'asciimath'
         if ((defined? ::AsciiMath) || ((defined? @asciimath_available) ? @asciimath_available :
             (@asciimath_available = Helpers.require_library 'asciimath', true, :warn)))
@@ -299,13 +298,13 @@ module Asciidoctor
         result << '</listitem>'
       end
       result << %(</orderedlist>)
-      result * EOL
+      result * LF
     end
 
     def open node
       case node.style
       when 'abstract'
-        if node.parent == node.document && node.document.attr?('doctype', 'book')
+        if node.parent == node.document && node.document.doctype == 'book'
           warn 'asciidoctor: WARNING: abstract block cannot be used in a document without a title when doctype is book. Excluding block content.'
           ''
         else
@@ -368,7 +367,7 @@ module Asciidoctor
       end
       result << (resolve_content node)
       result << '</blockquote>'
-      result * EOL
+      result * LF
     end
 
     def thematic_break node
@@ -382,7 +381,6 @@ module Asciidoctor
     end
 
     TABLE_PI_NAMES = ['dbhtml', 'dbfo', 'dblatex']
-    TABLE_SECTIONS = [:head, :foot, :body]
 
     def table node
       has_body = false
@@ -407,10 +405,11 @@ module Asciidoctor
       node.columns.each do |col|
         result << %(<colspec colname="col_#{col.attr 'colnumber'}" colwidth="#{col.attr col_width_key}*"/>)
       end
-      TABLE_SECTIONS.select {|tblsec| !node.rows[tblsec].empty? }.each do |tblsec|
-        has_body = true if tblsec == :body
-        result << %(<t#{tblsec}>)
-        node.rows[tblsec].each do |row|
+      node.rows.by_section.each do |tsec, rows|
+        next if rows.empty?
+        has_body = true if tsec == :body
+        result << %(<t#{tsec}>)
+        rows.each do |row|
           result << '<row>'
           row.each do |cell|
             halign_attribute = (cell.attr? 'halign') ? %( align="#{cell.attr 'halign'}") : nil
@@ -419,20 +418,20 @@ module Asciidoctor
             rowspan_attribute = cell.rowspan ? %( morerows="#{cell.rowspan - 1}") : nil
             # NOTE <entry> may not have whitespace (e.g., line breaks) as a direct descendant according to DocBook rules
             entry_start = %(<entry#{halign_attribute}#{valign_attribute}#{colspan_attribute}#{rowspan_attribute}>)
-            cell_content = if tblsec == :head
-              cell.text
+            if tsec == :head
+              cell_content = cell.text
             else
               case cell.style
               when :asciidoc
-                cell.content
+                cell_content = cell.content
               when :verse
-                %(<literallayout>#{cell.text}</literallayout>)
+                cell_content = %(<literallayout>#{cell.text}</literallayout>)
               when :literal
-                %(<literallayout class="monospaced">#{cell.text}</literallayout>)
+                cell_content = %(<literallayout class="monospaced">#{cell.text}</literallayout>)
               when :header
-                cell.content.map {|text| %(<simpara><emphasis role="strong">#{text}</emphasis></simpara>) }.join
+                cell_content = (cell_content = cell.content).empty? ? '' : %(<simpara><emphasis role="strong">#{cell_content * '</emphasis></simpara><simpara><emphasis role="strong">'}</emphasis></simpara>)
               else
-                cell.content.map {|text| %(<simpara>#{text}</simpara>) }.join
+                cell_content = (cell_content = cell.content).empty? ? '' : %(<simpara>#{cell_content * '</simpara><simpara>'}</simpara>)
               end
             end
             entry_end = (node.document.attr? 'cellbgcolor') ? %(<?dbfo bgcolor="#{node.document.attr 'cellbgcolor'}"?></entry>) : '</entry>'
@@ -440,16 +439,16 @@ module Asciidoctor
           end
           result << '</row>'
         end
-        result << %(</t#{tblsec}>)
+        result << %(</t#{tsec}>)
       end
       result << '</tgroup>'
       result << %(</#{tag_name}>)
 
       warn 'asciidoctor: WARNING: tables must have at least one body row' unless has_body
-      result * EOL
+      result * LF
     end
 
-    alias :toc :skip
+    alias toc skip
 
     def ulist node
       result = []
@@ -482,7 +481,7 @@ module Asciidoctor
         result << '</itemizedlist>'
       end
 
-      result * EOL
+      result * LF
     end
 
     def verse node
@@ -501,15 +500,15 @@ module Asciidoctor
       end
       result << %(<literallayout>#{node.content}</literallayout>)
       result << '</blockquote>'
-      result * EOL
+      result * LF
     end
 
-    alias :video :skip
+    alias video skip
 
     def inline_anchor node
       case node.type
       when :ref
-        %(<anchor#{common_attributes node.target, nil, node.text}/>)
+        %(<anchor#{common_attributes((id = node.id), nil, node.reftext || %([#{id}]))}/>)
       when :xref
         if (path = node.attributes['path'])
           # QUESTION should we use refid as fallback text instead? (like the html5 backend?)
@@ -521,8 +520,8 @@ module Asciidoctor
       when :link
         %(<link xl:href="#{node.target}">#{node.text}</link>)
       when :bibref
-        target = node.target
-        %(<anchor#{common_attributes target, nil, "[#{target}]"}/>[#{target}])
+        # NOTE technically node.text should be node.reftext, but subs have already been applied to text
+        %(<anchor#{common_attributes node.id, nil, (text = node.text)}/>#{text})
       else
         warn %(asciidoctor: WARNING: unknown anchor type: #{node.type.inspect})
       end
@@ -555,7 +554,7 @@ module Asciidoctor
 <imageobject>
 <imagedata fileref="#{node.type == 'icon' ? (node.icon_uri node.target) : (node.image_uri node.target)}"#{width_attribute}#{depth_attribute}/>
 </imageobject>
-<textobject><phrase>#{node.attr 'alt'}</phrase></textobject>
+<textobject><phrase>#{node.alt}</phrase></textobject>
 </inlinemediaobject>)
     end
 
@@ -578,7 +577,7 @@ module Asciidoctor
         result << %(<indexterm>
 <primary>#{terms[-1]}</primary>
 </indexterm>)
-        result * EOL
+        result * LF
       end
     end
 
@@ -586,32 +585,33 @@ module Asciidoctor
       if (keys = node.attr 'keys').size == 1
         %(<keycap>#{keys[0]}</keycap>)
       else
-        %(<keycombo>#{keys.map {|key| "<keycap>#{key}</keycap>" }.join}</keycombo>)
+        %(<keycombo><keycap>#{keys * '</keycap><keycap>'}</keycap></keycombo>)
       end
     end
 
     def inline_menu node
       menu = node.attr 'menu'
-      if !(submenus = node.attr 'submenus').empty?
-        submenu_path = submenus.map {|submenu| %(<guisubmenu>#{submenu}</guisubmenu> ) }.join.chop
-        %(<menuchoice><guimenu>#{menu}</guimenu> #{submenu_path} <guimenuitem>#{node.attr 'menuitem'}</guimenuitem></menuchoice>)
-      elsif (menuitem = node.attr 'menuitem')
-        %(<menuchoice><guimenu>#{menu}</guimenu> <guimenuitem>#{menuitem}</guimenuitem></menuchoice>)
+      if (submenus = node.attr 'submenus').empty?
+        if (menuitem = node.attr 'menuitem', nil, false)
+          %(<menuchoice><guimenu>#{menu}</guimenu> <guimenuitem>#{menuitem}</guimenuitem></menuchoice>)
+        else
+          %(<guimenu>#{menu}</guimenu>)
+        end
       else
-        %(<guimenu>#{menu}</guimenu>)
+        %(<menuchoice><guimenu>#{menu}</guimenu> <guisubmenu>#{submenus * '</guisubmenu> <guisubmenu>'}</guisubmenu> <guimenuitem>#{node.attr 'menuitem'}</guimenuitem></menuchoice>)
       end
     end
 
     (QUOTE_TAGS = {
+      :monospaced  => ['<literal>',                '</literal>',     false],
       :emphasis    => ['<emphasis>',               '</emphasis>',    true],
       :strong      => ['<emphasis role="strong">', '</emphasis>',    true],
-      :monospaced  => ['<literal>',                '</literal>',     false],
-      :superscript => ['<superscript>',            '</superscript>', false],
-      :subscript   => ['<subscript>',              '</subscript>',   false],
       :double      => ['&#8220;',                  '&#8221;',        true],
       :single      => ['&#8216;',                  '&#8217;',        true],
-      :mark        => ['<emphasis role="marked">', '</emphasis>',    false]
-    }).default = [nil, nil, true]
+      :mark        => ['<emphasis role="marked">', '</emphasis>',    false],
+      :superscript => ['<superscript>',            '</superscript>', false],
+      :subscript   => ['<subscript>',              '</subscript>',   false]
+    }).default = ['', '', true]
 
     def inline_quoted node
       if (type = node.type) == :asciimath
@@ -628,11 +628,11 @@ module Asciidoctor
       else
         open, close, supports_phrase = QUOTE_TAGS[type]
         text = node.text
-        if (role = node.role)
+        if node.role
           if supports_phrase
-            quoted_text = %(#{open}<phrase role="#{role}">#{text}</phrase>#{close})
+            quoted_text = %(#{open}<phrase role="#{node.role}">#{text}</phrase>#{close})
           else
-            quoted_text = %(#{open.chop} role="#{role}">#{text}#{close})
+            quoted_text = %(#{open.chop} role="#{node.role}">#{text}#{close})
           end
         else
           quoted_text = %(#{open}#{text}#{close})
@@ -658,14 +658,20 @@ module Asciidoctor
       result << %(<email>#{doc.attr email_key}</email>) if doc.attr? email_key
       result << '</author>'
 
-      result * EOL
+      result * LF
     end
 
     def common_attributes id, role = nil, reftext = nil
-      res = id ? %( xml:id="#{id}") : ''
-      res = %(#{res} role="#{role}") if role
-      res = %(#{res} xreflabel="#{reftext}") if reftext
-      res
+      attrs = id ? %( xml:id="#{id}") : ''
+      attrs = %(#{attrs} role="#{role}") if role
+      if reftext
+        if (reftext.include? '<') && ((reftext = reftext.gsub XmlSanitizeRx, '').include? ' ')
+          reftext = (reftext.squeeze ' ').strip
+        end
+        reftext = (reftext.gsub '"', '&quot;') if reftext.include? '"'
+        attrs = %(#{attrs} xreflabel="#{reftext}")
+      end
+      attrs
     end
 
     def doctype_declaration root_tag_name
@@ -673,7 +679,7 @@ module Asciidoctor
     end
 
     def document_info_element doc, info_tag_prefix, use_info_tag_prefix = false
-      info_tag_prefix = '' unless use_info_tag_prefix
+      info_tag_prefix = nil unless use_info_tag_prefix
       result = []
       result << %(<#{info_tag_prefix}info>)
       result << document_title_tags(doc.doctitle :partition => true, :use_fallback => true) unless doc.notitle
@@ -703,6 +709,16 @@ module Asciidoctor
           result << %(</revision>
 </revhistory>)
         end
+        unless use_info_tag_prefix
+          if (doc.attr? 'front-cover-image') || (doc.attr? 'back-cover-image')
+            if (back_cover_tag = cover_tag doc, 'back')
+              result << (cover_tag doc, 'front', true)
+              result << back_cover_tag
+            elsif (front_cover_tag = cover_tag doc, 'front')
+              result << front_cover_tag
+            end
+          end
+        end
         unless (head_docinfo = doc.docinfo).empty?
           result << head_docinfo
         end
@@ -721,7 +737,7 @@ module Asciidoctor
         result << '</refnamediv>'
       end
 
-      result * EOL
+      result * LF
     end
 
     def document_ns_attributes doc
@@ -749,5 +765,34 @@ module Asciidoctor
     def title_tag node, optional = true
       !optional || node.title? ? %(<title>#{node.title}</title>\n) : nil
     end
+
+    def cover_tag doc, face, use_placeholder = false
+      if (cover_image = doc.attr %(#{face}-cover-image))
+        width_attr = nil
+        depth_attr = nil
+        if (cover_image.include? ':') && ImageMacroRx =~ cover_image
+          cover_image = doc.image_uri $1
+          unless $2.empty?
+            attrs = (AttributeList.new $2).parse ['alt', 'width', 'height']
+            if attrs.key? 'scaledwidth'
+              # NOTE scalefit="1" is the default in this case
+              width_attr = %( width="#{attrs['scaledwidth']}")
+            else
+              width_attr = %( contentwidth="#{attrs['width']}") if attrs.key? 'width'
+              depth_attr = %( contentdepth="#{attrs['height']}") if attrs.key? 'height'
+            end
+          end
+        end
+        %(<cover role="#{face}">
+<mediaobject>
+<imageobject>
+<imagedata fileref="#{cover_image}"#{width_attr}#{depth_attr}/>
+</imageobject>
+</mediaobject>
+</cover>)
+      elsif use_placeholder
+        %(<cover role="#{face}"/>)
+      end
+    end
   end
 end