asciidoctor 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8a3cff3d36fc7c331d8fa58ec52d3de55c82a01
-  data.tar.gz: 4096f0425da556b1c4fb0c808fcf09f2c3848131
+  metadata.gz: 83e440b38375e7aaf9706436000410fd3d80a205
+  data.tar.gz: 3a6e68864dbce5fe5e845305972a49cca714b4ab
 SHA512:
-  metadata.gz: 57e7391640b1677fb9d19ecde95af02a6cd53111613d0335e0618901a55dff080aa1bab1290a2f0d591de7ec5db7a8c9e198ba78b386d7c1a3f3b0a3ba5953f6
-  data.tar.gz: 6f6f8002274a90e950327b5ecd69d3a05d760f842acc9b70fdce6c17a55e039dcd1c293d06b565047b7c7557c128f375e6ba7d8f37c4e28318207fe6bc002a03
+  metadata.gz: ebd29c43ea544f14375e7c8f49c43bda1cfb99057cf819c2919679e32d3fd9c27c42459ac115decbd846e6e4349b2c094693e11e549dbb300c7815ab8500053a
+  data.tar.gz: 19b9420012417f358e1433e3c38511a12b5bdbaf9c99f5487ea5829493d7271c2a9156afc78e377e36ff0678e000b49d6dc22e4d74a63919033bb4b4253d24e6

data/Gemfile

@@ -1,2 +1,12 @@
 source 'https://rubygems.org'
+
 gemspec
+
+# enable this group to use Guard for continuous testing
+# after removing comments, run `bundle install` then `guard` 
+#group :guardtest do
+#  gem 'guard'
+#  gem 'guard-test'
+#  gem 'libnotify'
+#  gem 'listen', :github => 'guard/listen'
+#end

data/Guardfile

@@ -0,0 +1,18 @@
+# use `guard start -n f` to disable notifications
+# or set the environment variable GUARD_NOTIFY=false
+notification :libnotify,
+  :display_message => true,
+  :timeout => 5, # in seconds
+  :append => false,
+  :transient => true,
+  :urgency => :critical
+
+guard :test do
+  watch(%r{^lib/(.+)\.rb$}) do |m|
+    "test/#{m[1]}_test.rb"
+  end
+  watch(%r{^test.+_test\.rb$})
+  watch('test/test_helper.rb') do
+    "test"
+  end
+end

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) Ryan Waldron and Dan Allen
+Copyright (C) 2012-2013 Dan Allen and Ryan Waldron
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.adoc

@@ -1,20 +1,21 @@
 = Asciidoctor
+:awestruct-layout: base
 :homepage: http://asciidoctor.org
 :asciidoc: http://asciidoc.org
-:sources: http://github.com/asciidoctor/asciidoctor
+:sources: https://github.com/asciidoctor/asciidoctor
 :issues: https://github.com/asciidoctor/asciidoctor/issues
 :forum: http://discuss.asciidoctor.org
-:org: http://github.com/asciidoctor
+:org: https://github.com/asciidoctor
 :contributors: https://github.com/asciidoctor/asciidoctor/graphs/contributors
 :templates: https://github.com/asciidoctor/asciidoctor/blob/master/lib/asciidoctor/backends
 :gitscm-next: https://github.com/github/gitscm-next
 :seed-contribution: https://github.com/github/gitscm-next/commits/master/lib/asciidoc.rb
 :tilt: https://github.com/rtomayko/tilt
-:freesoftware: http://www.fsf.org/licensing/essays/free-sw.html
+:freesoftware: http://www.gnu.org/philosophy/free-sw.html
 :gist: https://gist.github.com
-:fork: http://help.github.com/fork-a-repo/
+:fork: https://help.github.com/articles/fork-a-repo
 :branch: http://learn.github.com/p/branching.html
-:pr: http://help.github.com/send-pull-requests/
+:pr: https://help.github.com/articles/using-pull-requests
 :license: https://github.com/asciidoctor/asciidoctor/blob/master/LICENSE
 :idprefix:
 :idseparator: -
@@ -24,23 +25,26 @@
 and other formats. It's http://rubygems.org/gems/asciidoctor[published
 as a RubyGem] and is available under the MIT open source license.
 
+ifndef::awestruct[]
 image::https://travis-ci.org/asciidoctor/asciidoctor.png?branch=master[Build Status, link="https://travis-ci.org/asciidoctor/asciidoctor"]
+endif::awestruct[]
 
 Asciidoctor uses a set of built-in ERB templates to render the document
 to HTML 5 or DocBook 4.5. We've matched the rendered output as close as
 possible to the default output of the native Python processor. You can
 override this behavior by providing {tilt}[Tilt]-compatible templates.
-See <<usage,Usage>> for more details.
+See the <<usage>> section for more details.
 
 Asciidoctor currently works (read as 'tested') with Ruby 1.8.7, Ruby
-1.9.3, Ruby 2.0.0, JRuby 1.7.2 and Rubinius 1.2.4 (on Linux, Mac and
+1.9.3, Ruby 2.0.0, JRuby 1.7.4 and Rubinius nightly (on Linux, Mac and
 Windows). We expect it will work with other versions of Ruby as well and
 would welcome help in testing it out.
 
-The initial code from which Asciidoctor started emerged from the
-{gitscm-next}[Git SCM site repo]. Refer to commit history of
+The initial code from which Asciidoctor emerged was written by
+http://github.com/nickh[Nick Hengeveld] to process the git man pages for
+the {gitscm-next}[Git project site]. Refer to commit history of
 {seed-contribution}[asciidoc.rb] to view the initial contributions and
-individual contributors.
+contributors.
 
 The source code can now be found in the {sources}[Asciidoctor source
 repository] on GitHub.
@@ -74,7 +78,7 @@ Ruby if it's not already on your machine.
 == Usage
 
 Asciidoctor has both a command line interface (CLI) and an API. The CLI
-is a drop-in replacement for the +asciidoc.py+ command from the python
+is a drop-in replacement for the +asciidoc.py+ command from the Python
 implementation. The API is intended for integration with other software
 projects and is suitable for server-side applications, such as Rails,
 Sinatra and GitHub.
@@ -233,6 +237,9 @@ Here are the known cases where Asciidoctor differs from AsciiDoc:
   quotes are rarely needed, though you may want to keep them for
   compatibility)
 
+* Asciidoctor adds the type attribute on ordered lists to provide hint
+  for numbering style when stylesheet is absent (such as in embedded mode)
+
 * Asciidoctor recognizes +opts+ as an alias for the +options+ attribute.
 
 * Asciidoctor creates xref labels using the text from the linked section
@@ -247,6 +254,9 @@ Here are the known cases where Asciidoctor differs from AsciiDoc:
 NOTE: In general, Asciidoctor handles whitespace much more intelligently
 +
 
+* Asciidoctor does not output an empty +<dd>+ for labeled list items
+  that don't have a definition
+
 * In Asciidoctor, a horizontal ruler can have attributes
 
 * Asciidoctor wraps +<col>+ elements in +<colgroup>+ in tables
@@ -279,7 +289,7 @@ NOTE: In general, Asciidoctor handles whitespace much more intelligently
 * Asciidoctor honors the id, title, role and levels attributes set on
   the toc macro.
 
-* Asciidoctor does not output two tocs with the same id.
+* Asciidoctor does not output two TOCs with the same id.
 
 * Asciidoctor is nice about using a section title syntax inside a
   delimited block by simply ignoring it (AsciiDoc issues warnings)
@@ -287,7 +297,9 @@ NOTE: In general, Asciidoctor handles whitespace much more intelligently
 * Asciidoctor honors the alternate style name "discrete" for a floating
   title (i.e., +[discrete]+)
 
-* Asciidoctor supports syntax highlighting of listing or literal blocks
+* Asciidoctor supports the +pass+ style on open blocks and paragraphs
+
+* Asciidoctor supports syntax highlighting of listing, literal or open blocks
   that have the "source" style out of the box
 
 ** Asciidoctor honors the source-highlighter values +coderay+ and
@@ -296,6 +308,9 @@ NOTE: In general, Asciidoctor handles whitespace much more intelligently
 ** Asciidoctor does not currently support Pygments for source
    highlighting
 
+** Asciidoctor gracefully falls back to listing block if no source language
+   is specified
+
 * Asciidoctor sets these additional intrinsic attributes
 
   +asciidoctor+::
@@ -311,7 +326,7 @@ NOTE: In general, Asciidoctor handles whitespace much more intelligently
 * Use can set the extension for icons using the +icontype+ attribute
   (AsciiDoc defaults to .png)
 
-* AsciiDoc uses the +<blockquote>+ for the content and +<cite>+ tag for
+* Asciidoctor uses the +<blockquote>+ for the content and +<cite>+ tag for
   attribution title in the HTML output for quote blocks, requiring some
   additional styling to match AsciiDoc
 +
@@ -319,11 +334,22 @@ NOTE: In general, Asciidoctor handles whitespace much more intelligently
  cite { color: navy; }
 +
 
+* Asciidoctor supports markdown-style blockquotes as well as a shorthand
+  for a blockquote paragraph.
+
+* Asciidoctor supports markdown-style headings (section titles)
+
 * Asciidoctor does not support the deprecated index term syntax (`++`
   and `+++`)
 
-* Asciidoctor does not yet ship w/ a stylesheet, must provide your own
-  using the +stylesheet+ attribute
+* Asciidoctor includes a modern default stylesheet based on Foundation.
+
+* Asciidoctor links to, rather than embeds, the default stylesheet into
+  the document by default (e.g., +linkcss+). To include the default
+  stylesheet, you can either use the +copycss+ attribute to tell
+  Asciidoctor to copy it to the output directory, or you can embed it
+  into the document using the +linkcss!+ attribute. You can also provide
+  your own stylesheet using the +stylesheet+ attribute.
 
 * Asciidoctor introduces the +hardbreaks+ attribute, which inserts a
   line break character after each line of wrapped text
@@ -358,6 +384,19 @@ NOTE: In general, Asciidoctor handles whitespace much more intelligently
   when SafeMode is SECURE or greater (this makes for a friendly
   experience on GitHub)
 
+* Asciidoctor supports up to 6 section levels (to cover all heading levels in
+  HTML) whereas AsciiDoc stops at 5; note the 6 section level is only available
+  using the single-line section title syntax
+
+* Admonition block style is added to class of outer div in html5 backend
+  in Asciidoctor
+
+* Admonition block caption can be overridden in Asciidoctor using the
+  +caption+ block attribute
+
+* Asciidoctor will parse attributes in link macros if the +linkattrs+
+  attribute is set on the document.
+
 If there's a difference you don't see in this list, check the {issues}[issue
 tracker] to see if it's an outstanding feature, or file an issue to report the
 difference.
@@ -420,8 +459,8 @@ This library aims to support the following Ruby implementations:
 * Ruby 1.8.7
 * Ruby 1.9.3
 * Ruby 2.0.0
-* JRuby 1.7.2
-* Rubinius 1.2.4
+* JRuby 1.7.4
+* Rubinius nightly
 
 If something doesn't work on one of these interpreters, it should be
 considered a bug.
@@ -448,14 +487,19 @@ GitHub organization:: {org}
 
 == Authors
 
-*Asciidoctor* was written by Ryan Waldron, Dan Allen and
-{contributors}[other contributors].
+*Asciidoctor* was written by https://github.com/mojavelinux[Dan Allen],
+https://github.com/erebor[Ryan Waldron],
+https://github.com/lightguard[Jason Porter], https://github.com/nickh[Nick
+Hengeveld] and {contributors}[other contributors].
 
 *AsciiDoc* was written by Stuart Rackham and has received contributions
 from many other individuals.
 
 == Copyright
 
-Copyright (C) 2012-2013 Ryan Waldron and Dan Allen. See {license}[LICENSE] for details.
+Copyright (C) 2012-2013 Dan Allen and Ryan Waldron. Free use of this
+software is granted under the terms of the MIT License.
+
+See the {license}[LICENSE] file for details.
 
 // vim: tw=72

data/Rakefile

@@ -47,12 +47,22 @@ task :default => :test
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
+  puts "LANG: #{ENV['LANG']}"
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*_test.rb'
   test.warning = true
   test.verbose = true
 end
 
+# Run tests with Encoding::default_external set to US-ASCII
+Rake::TestTask.new(:test_us_ascii) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.warning = true
+  test.verbose = true
+  test.ruby_opts << '-EUS-ASCII' if RUBY_VERSION >= '1.9'
+end
+
 desc "Generate RCov test coverage and open in your browser"
 task :coverage do
   require 'rcov'

data/asciidoctor.gemspec

@@ -1,69 +1,52 @@
-## This is the rakegem gemspec template. Make sure you read and understand
-## all of the comments. Some sections require modification, and others can
-## be deleted if you don't need them. Once you understand the contents of
-## this file, feel free to delete any comments that begin with two hash marks.
-## You can find comprehensive Gem::Specification documentation, at
-## http://docs.rubygems.org/read/chapter/20
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.rubygems_version = '1.8.5'
 
-  ## This group of properties is updated automatically by the Rake build when
-  ## cutting a new release (see the validate task)
+  ## name, version, date and rubyforge_project are updated automatically by the
+  ## Rake build (see the validate task)
   s.name              = 'asciidoctor'
-  s.version           = '0.1.2'
-  s.date              = '2013-04-25'
+  s.version           = '0.1.3'
+  s.date              = '2013-05-30'
   s.rubyforge_project = 'asciidoctor'
 
-  ## Make sure your summary is short. The description may be as long
-  ## as you like.
   s.summary     = 'A native Ruby AsciiDoc syntax processor and publishing toolchain'
   s.description = <<-EOS
-An open source text processor and publishing toolchain, written entirely in Ruby, for converting AsciiDoc markup into HTML 5, DocBook 4.5 and other formats. 
+An open source text processor and publishing toolchain written in Ruby for converting AsciiDoc markup into HTML 5, DocBook 4.5 and custom formats.
 EOS
   s.license     = 'MIT'
-
-  ## List the primary authors. If there are a bunch of authors, it's probably
-  ## better to set the email to an email list or something. If you don't have
-  ## a custom homepage, consider using your GitHub URL or the like.
-  s.authors  = ['Ryan Waldron', 'Dan Allen', 'Jeremy McAnally', 'Jason Porter']
-  s.email    = ['rew@erebor.com', 'dan.j.allen@gmail.com']
+  s.authors  = ['Dan Allen', 'Ryan Waldron', 'Jeremy McAnally', 'Jason Porter', 'Nick Hengeveld']
+  s.email    = ['dan.j.allen@gmail.com', 'rew@erebor.com']
   s.homepage = 'http://asciidoctor.org'
 
-  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
-  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
   s.require_paths = %w[lib]
-
-  ## If your gem includes any executables, list them here.
   s.executables = ['asciidoctor', 'asciidoctor-safe']
 
-  ## Specify any RDoc options here. You'll want to add your README and
-  ## LICENSE files to the extra_rdoc_files list.
+  s.has_rdoc = true
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = %w[LICENSE]
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
+  #s.add_dependency 'foo', '~> 1.0.0'
 
-  ## List your development dependencies here. Development dependencies are
-  ## those that are only needed during development
+  ## Development dependencies are libraries only needed during development or
+  ## testing
   s.add_development_dependency('coderay')
   s.add_development_dependency('erubis')
-  s.add_development_dependency('htmlentities')
-  s.add_development_dependency('mocha')
   s.add_development_dependency('nokogiri')
   s.add_development_dependency('pending')
   s.add_development_dependency('rake')
   s.add_development_dependency('rdoc', '~> 3.12')
   s.add_development_dependency('tilt')
 
-  ## Leave this section as-is. It will be automatically generated from the
-  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
-  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
+  ## The manifest section is automatically generated by the Rake build
+  ## based on the contents of the Git repository (see the gemspec task).
+  ## DO NOT REMOVE THE = MANIFEST = DELIMITERS!
   # = MANIFEST =
   s.files = %w[
     Gemfile
+    Guardfile
     LICENSE
     README.adoc
     Rakefile
@@ -75,6 +58,7 @@ EOS
     lib/asciidoctor/abstract_block.rb
     lib/asciidoctor/abstract_node.rb
     lib/asciidoctor/attribute_list.rb
+    lib/asciidoctor/backends/_stylesheets.rb
     lib/asciidoctor/backends/base_template.rb
     lib/asciidoctor/backends/docbook45.rb
     lib/asciidoctor/backends/html5.rb
@@ -97,7 +81,6 @@ EOS
     lib/asciidoctor/version.rb
     man/asciidoctor.1
     man/asciidoctor.ad
-    stylesheets/asciidoctor.css
     test/attributes_test.rb
     test/blocks_test.rb
     test/document_test.rb
@@ -134,7 +117,6 @@ EOS
   ]
   # = MANIFEST =
 
-  ## Test files will be grabbed from the file list. Make sure the path glob
-  ## matches what you actually use.
+  ## Test files are selected from the file list using the path glob here
   s.test_files = s.files.select { |path| path =~ /^test\/.*_test\.rb/ }
 end

data/compat/asciidoc.conf

@@ -20,30 +20,107 @@ plus=+
 space=" "
 tilde=~
 
+# enables markdown-style headings
+[titles]
+sect0=^(=|#) +(?P<title>[\S].*?)(?: +\1)?$
+sect1=^(==|##) +(?P<title>[\S].*?)(?: +\1)?$
+sect2=^(===|###) +(?P<title>[\S].*?)(?: +\1)?$
+sect3=^(====|####) +(?P<title>[\S].*?)(?: +\1)?$
+sect4=^(=====|#####) +(?P<title>[\S].*?)(?: +\1)?$
+
 # enables fenced code blocks
-# I haven't sorted out yet how to do syntax highlighting
+# FIXME I haven't sorted out yet how to do syntax highlighting
 [blockdef-fenced-code]
 delimiter=^```\w*$
 template::[blockdef-listing]
 
+# enables blockquotes to be defined using two double quotes
+[blockdef-air-quote]
+delimiter=^""$
+template::[blockdef-quote]
+
+# markdown-style blockquote (paragraph only)
+# FIXME does not strip leading > on subsequent lines
+[paradef-markdown-quote]
+delimiter=(?s)>\s*(?P<text>\S.*)
+style=quote
+quote-style=template="quoteparagraph",posattrs=("style","attribution","citetitle")
+
+# fix regex for callout list to require number; also makes markdown-style blockquote work
+[listdef-callout]
+posattrs=style
+delimiter=^<?(?P<index>\d+>) +(?P<text>.+)$
+type=callout
+tags=callout
+style=arabic
+
 # enables literal block to be used as code block
 [blockdef-literal]
 template::[source-filter-style]
 
+[tabledef-csv]
+template::[tabledef-default]
+delimiter=^,={3,}$
+format=csv
+
+[tabledef-dsv]
+template::[tabledef-default]
+delimiter=^:={3,}$
+format=dsv
+
+[macros]
+# btn:[Save]
+(?su)(?<!\w)\\?btn:\[(?P<attrlist>(?:\\\]|[^\]])+?)\]=button
+
+# kbd:[F11] or kbd:[Ctrl+T] or kbd:[Ctrl,T]
+(?su)(?<!\w)\\?kbd:\[(?P<attrlist>(?:\\\]|[^\]])+?)\]=keyboard
+
+# menu:Search[] or menu:File[New...] or menu:View[Page Style, No Style]
+# TODO implement menu:View[Page Style > No Style] syntax
+(?su)(?<!\w)[\\]?(?P<name>menu):(?P<target>\w|\w.*?\S)?\[(?P<attrlist>.*?)\]=
+
 ifdef::basebackend-html[]
 
+[button-inlinemacro]
+<b class="button">{1}</b>
+
+[keyboard-inlinemacro]
+{set2:keys:{eval:re.split(r'(?<!\+ |.\+)\+', '{1}')}}
+{2%}{eval:len({keys}) == 1}<kbd>{1}</kbd>
+{2%}{eval:len({keys}) == 2}<kbd class="combo"><kbd>{eval:{keys}[0].strip()}</kbd>+<kbd>{eval:{keys}[1].strip()}</kbd></kbd>
+{2%}{eval:len({keys}) == 3}<kbd class="combo"><kbd>{eval:{keys}[0].strip()}</kbd>+<kbd>{eval:{keys}[1].strip()}</kbd>+<kbd>{eval:{keys}[2].strip()}</kbd></kbd>
+{2#}{3%}<kbd class="combo"><kbd>{1}</kbd>+<kbd>{2}</kbd></kbd>
+{3#}<kbd class="combo"><kbd>{1}</kbd>+<kbd>{2}</kbd>+<kbd>{3}</kbd></kbd>
+
+[menu-inlinemacro]
+{1%}<span class="menu">{target}</span>
+{1#}{2%}<span class="menuseq"><span class="menu">{target}</span>&#160;&#9656; <span class="menuitem">{1}</span></span>
+{2#}{3%}<span class="menuseq"><span class="menu">{target}</span>&#160;&#9656; <span class="submenu">{1}</span>&#160;&#9656; <span class="menuitem">{2}</span></span>
+{3#}<span class="menuseq"><span class="menu">{target}</span>&#160;&#9656; <span class="submenu">{1}</span>&#160;&#9656; <span class="submenu">{2}</span>&#160;&#9656; <span class="menuitem">{3}</span></span>
+
 [literal-inlinemacro]
 <code>{passtext}</code>
 
 [tags]
+emphasis=<em{1? class="{1}"}>|</em>
+strong=<strong{1? class="{1}"}>|</strong>
 monospaced=<code{1? class="{1}"}>|</code>
+superscript=<sup{1? class="{1}"}>|</sup>
+subscript=<sub{1? class="{1}"}>|</sub>
 
 [monospacedwords]
 <code>{words}</code>
 
+[listtags-numbered]
+list=<div class="olist{style? {style}}{compact-option? compact}{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<ol class="{style}"{style@loweralpha: type="a"}{style@lowerroman: type="i"}{style@upperalpha: type="A"}{style@upperroman: type="I"}{start? start="{start}"}>|</ol></div>
+
 [tabletags-monospaced]
 paragraph=<p class="tableblock"><code>|</code></p>
 
+[sect0]
+<h1{id? id="{id}"} class="sect0">{title}</h1>
+|
+
 # support for document title in embedded documents
 ifeval::[not config.header_footer]
 [preamble]
@@ -52,6 +129,7 @@ ifeval::[not config.header_footer]
 <div class="sectionbody">
 |
 </div>
+{toc,toc2#}{toc-placement$preamble:}{template:toc}
 </div>
 
 [sect1]
@@ -109,28 +187,67 @@ template::[attribution]
 template::[attribution]
 </div>
 
+# override tabletags to support cellbgcolor
+[tabletags-default]
+headdata=<th class="tableblock halign-{halign=left} valign-{valign=top}"{colspan@1:: colspan="{colspan}"}{rowspan@1:: rowspan="{rowspan}"}{cellbgcolor? style="background-color:{cellbgcolor};"}>|</th>
+bodydata=<td class="tableblock halign-{halign=left} valign-{valign=top}"{colspan@1:: colspan="{colspan}"}{rowspan@1:: rowspan="{rowspan}"}{cellbgcolor? style="background-color:{cellbgcolor};"}>|</td>
+
+[toc]
+<div id="toc">
+<div id="toctitle">{toc-title}</div>
+ifdef::toc2[]
+<script type="text/javascript">
+document.body.className += ' toc2';
+document.getElementById('toc').className = 'toc2';
+</script>
+endif::toc2[]
+<noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
+</div>
+
 endif::basebackend-html[]
 
 # Override docinfo to support subtitle
 ifdef::basebackend-docbook[]
 
+[button-inlinemacro]
+<guibutton>{1}</guibutton>
+
+[keyboard-inlinemacro]
+{set2:keys:{eval:re.split(r'(?<!\+ |.\+)\+', '{1}')}}
+{2%}{eval:len({keys}) == 1}<keycap>{1}</keycap>
+{2%}{eval:len({keys}) == 2}<keycombo><keycap>{eval:{keys}[0].strip()}</keycap><keycap>{eval:{keys}[1].strip()}</keycap></keycombo>
+{2%}{eval:len({keys}) == 3}<keycombo><keycap>{eval:{keys}[0].strip()}</keycap><keycap>{eval:{keys}[1].strip()}</keycap><keycap>{eval:{keys}[2].strip()}</keycap></keycombo>
+{2#}{3%}<keycombo><keycap>{1}</keycap><keycap>{2}</keycap></keycombo>
+{3#}<keycombo><keycap>{1}</keycap><keycap>{2}</keycap><keycap>{3}</keycap></keycombo>
+
+[menu-inlinemacro]
+{1%}<guimenu>{target}</guimenu>
+{1#}{2%}<menuchoice><guimenu>{target}</guimenu> <guimenuitem>{1}</guimenuitem></menuchoice>
+{2#}{3%}<menuchoice><guimenu>{target}</guimenu> <guisubmenu>{1}</guisubmenu> <guimenuitem>{2}</guimenuitem></menuchoice>
+{3#}<menuchoice><guimenu>{target}</guimenu> <guisubmenu>{1}</guisubmenu> <guisubmenu>{2}</guisubmenu> <guimenuitem>{3}</guimenuitem></menuchoice>
+
+# override tabletags to support cellbgcolor
+[tabletags-default]
+headdata=<entry align="{halign}" valign="{valign}"{colspan@1:: namest="col_{colstart}" nameend="col_{colend}"}{morerows@0:: morerows="{morerows}"}>{cellbgcolor?<?dbfo bgcolor="{cellbgcolor}"?>}|</entry>
+bodydata=<entry align="{halign}" valign="{valign}"{colspan@1:: namest="col_{colstart}" nameend="col_{colend}"}{morerows@0:: morerows="{morerows}"}>{cellbgcolor?<?dbfo bgcolor="{cellbgcolor}"?>}|</entry>
+
 [docinfo]
 ifndef::notitle[]
 {set2:subtitle_offset:{eval:'{doctitle}'.rfind(': ')}}
-{eval:{subtitle_offset} != -1}    <title>{eval:'{doctitle}'[0:{subtitle_offset}]}</title>
-{eval:{subtitle_offset} != -1}    <subtitle>{eval:'{doctitle}'[{subtitle_offset} + 2:]}</subtitle>
-{eval:{subtitle_offset} < 0}    <title>{doctitle}</title>
+{eval:{subtitle_offset} != -1}<title>{eval:'{doctitle}'[0:{subtitle_offset}]}</title>
+{eval:{subtitle_offset} != -1}<subtitle>{eval:'{doctitle}'[{subtitle_offset} + 2:]}</subtitle>
+{eval:{subtitle_offset} < 0}<title>{doctitle}</title>
 endif::notitle[]
-    <date>{revdate}</date>
+<date>{revdate}</date>
 # To ensure valid articleinfo/bookinfo when there is no AsciiDoc header.
-    {doctitle%}{revdate%}<date>{docdate}</date>
-    {authored#}<author>
-        <firstname>{firstname}</firstname>
-        <othername>{middlename}</othername>
-        <surname>{lastname}</surname>
-        <email>{email}</email>
-    {authored#}</author>
-    <authorinitials>{authorinitials}</authorinitials>
+{doctitle%}{revdate%}<date>{docdate}</date>
+{authored#}<author>
+<firstname>{firstname}</firstname>
+<othername>{middlename}</othername>
+<surname>{lastname}</surname>
+<email>{email}</email>
+{authored#}</author>
+<authorinitials>{authorinitials}</authorinitials>
 <revhistory><revision>{revnumber?<revnumber>{revnumber}</revnumber>}<date>{revdate}</date>{authorinitials?<authorinitials>{authorinitials}</authorinitials>}{revremark?<revremark>{revremark}</revremark>}</revision></revhistory>
 {docinfo1,docinfo2#}{include:{docdir}/docinfo.xml}
 {docinfo,docinfo2#}{include:{docdir}/{docname}-docinfo.xml}