asciidoctor 0.1.2 → 0.1.3

data/lib/asciidoctor/attribute_list.rb

@@ -45,9 +45,6 @@ class AttributeList
   # TODO named attributes cannot contain dash characters
   NAME_PATTERN = /[A-Za-z:_][A-Za-z:_\-\.]*/
 
-  # Public: A regular expression for splitting a comma-separated string
-  CSV_SPLIT_PATTERN = /[ \t]*,[ \t]*/
-
   def initialize(source, block = nil, quotes = ['\'', '"'], delimiter = ',', escape_char = '\\')
     @scanner = ::StringScanner.new source
     @block = block
@@ -170,8 +167,8 @@ class AttributeList
       # opts is an alias for options
       if name == 'options' || name == 'opts'
         name = 'options'
-        resolved_value.split(CSV_SPLIT_PATTERN).each do |o|
-          @attributes[o + '-option'] = ''
+        resolved_value.split(',').each do |o|
+          @attributes[o.strip + '-option'] = ''
         end
       elsif single_quoted_value && !@block.nil?
         resolved_value = @block.apply_normal_subs(value)

data/{stylesheets/asciidoctor.css → lib/asciidoctor/backends/_stylesheets.rb}

@@ -1,3 +1,18 @@
+module Asciidoctor
+module HTML5
+  # Internal: Generate the default stylesheet for CodeRay
+  #
+  # returns the default CodeRay stylesheet as a String
+  def self.default_coderay_stylesheet
+    ::Asciidoctor::Helpers.require_library 'coderay'
+    ::CodeRay::Encoders[:html]::CSS.new(:default).stylesheet
+  end
+
+  # Internal: Generate the default stylesheet for Asciidoctor
+  #
+  # returns the default Asciidoctor stylesheet as a String
+  def self.default_asciidoctor_stylesheet
+    <<'DEFAULT_ASCIIDOCTOR_STYLESHEET'
 /* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */
 article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary { display: block; }
 audio, canvas, video { display: inline-block; }
@@ -55,7 +70,7 @@ img { -ms-interpolation-mode: bicubic; }
 img { display: inline-block; }
 textarea { height: auto; min-height: 50px; }
 select { width: 100%; }
-p.lead, #preamble > .sectionbody > .paragraph:first-of-type p { font-size: 1.21875em; line-height: 1.6; }
+p.lead, .paragraph.lead > p, #preamble > .sectionbody > .paragraph:first-of-type p { font-size: 1.21875em; line-height: 1.6; }
 .subheader, .admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .ulist > .title, .olist > .title, .dlist > .title, .qlist > .title, .tableblock > caption { line-height: 1.4; color: #7a2518; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
 div, dl, dt, dd, ul, ol, li, h1, h2, h3, #toctitle, .sidebarblock > .content > .title, h4, h5, h6, pre, form, p, blockquote, th, td { margin: 0; padding: 0; direction: ltr; }
 a { color: #005498; text-decoration: underline; line-height: inherit; }
@@ -63,7 +78,7 @@ a:hover, a:focus { color: #00467f; }
 a img { border: none; }
 p { font-family: inherit; font-weight: normal; font-size: 1em; line-height: 1.6; margin-bottom: 1.25em; text-rendering: optimizeLegibility; }
 p aside { font-size: 0.875em; line-height: 1.35; font-style: italic; }
-h1, h2, h3, #toctitle, .sidebarblock > .content > .title, h4, h5, h6 { font-family: "Lucida Grande", Georgia, Verdana, "Helvetica", Helvetica, Arial, sans-serif; font-weight: normal; font-style: normal; color: #ba3925; text-rendering: optimizeLegibility; margin-top: 1em; margin-bottom: 0.5em; line-height: 1.2125em; }
+h1, h2, h3, #toctitle, .sidebarblock > .content > .title, h4, h5, h6 { font-family: Georgia, "URW Bookman L", Helvetica, Arial, sans-serif; font-weight: normal; font-style: normal; color: #ba3925; text-rendering: optimizeLegibility; margin-top: 1em; margin-bottom: 0.5em; line-height: 1.2125em; }
 h1 small, h2 small, h3 small, #toctitle small, .sidebarblock > .content > .title small, h4 small, h5 small, h6 small { font-size: 60%; color: #e99b8f; line-height: 0; }
 h1 { font-size: 2.125em; }
 h2 { font-size: 1.6875em; }
@@ -128,6 +143,11 @@ table tr.even, table tr.alt, table tr:nth-of-type(even) { background: #f9f9f9; }
 table thead tr th, table tfoot tr th, table tbody tr td, table tr td, table tfoot tr td { display: table-cell; line-height: 1.6; }
 pre > code, pre > tt { color: #222222; }
 tt { font-size: 0.9375em; padding: 1px 3px 0; white-space: nowrap; background-color: #f2f2f2; border: 1px solid #cccccc; -webkit-border-radius: 4px; border-radius: 4px; text-shadow: none; }
+kbd.keyseq { color: #555555; }
+kbd:not(.keyseq) { display: inline-block; color: #222222; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
+kbd kbd:first-child { margin-left: 0; }
+kbd kbd:last-child { margin-right: 0; }
+.menuseq, .menu { color: #090909; }
 p a > tt { text-decoration: underline; }
 p a > tt:hover { color: #561309; }
 #header, #content, #footnotes, #footer { width: 100%; margin-left: auto; margin-right: auto; margin-top: 0; margin-bottom: 0; max-width: 62.5em; *zoom: 1; position: relative; padding-left: 0.9375em; padding-right: 0.9375em; }
@@ -142,12 +162,25 @@ p a > tt:hover { color: #561309; }
 #header br + span:before { content: "\2013 \0020"; }
 #toc { border-bottom: 3px double #ebebeb; padding-bottom: 1.25em; }
 #toc > ol { margin-left: 0.25em; }
+#toc ol.sectlevel0 > li > a { font-style: italic; }
+#toc ol.sectlevel0 ol.sectlevel1 { margin-left: 0; margin-top: 0.5em; margin-bottom: 0.5em; }
 #toc ol { list-style-type: none; }
 #toctitle { color: #7a2518; }
+@media only screen and (min-width: 80em) { body.toc2 { padding-left: 20em; }
+  #toc.toc2 { position: fixed; width: 20em; left: 0; top: 0; border-right: 1px solid #ebebeb; border-bottom: 0; z-index: 1000; padding: 1em; height: 100%; overflow: auto; }
+  #toc.toc2 #toctitle { margin-top: 0; }
+  #toc.toc2 > ol { font-size: .95em; }
+  #toc.toc2 ol ol { margin-left: 0; padding-left: 1em; }
+  #toc.toc2 ol.sectlevel0 ol.sectlevel1 { padding-left: 0; margin-top: 0.5em; margin-bottom: 0.5em; } }
 #footer { max-width: 100%; background-color: #222222; padding: 1.25em; }
 #footer-text { color: #dddddd; line-height: 1.44; }
 .sect1 { border-bottom: 3px double #ebebeb; padding-bottom: 1.25em; }
 .sect1:last-of-type { border-bottom: 0; }
+#content h1 > a.anchor, h2 > a.anchor, h3 > a.anchor, #toctitle > a.anchor, .sidebarblock > .content > .title > a.anchor, h4 > a.anchor, h5 > a.anchor, h6 > a.anchor { position: absolute; width: 1em; margin-left: -1em; display: block; text-decoration: none; visibility: hidden; text-align: center; font-weight: normal; }
+#content h1 > a.anchor:before, h2 > a.anchor:before, h3 > a.anchor:before, #toctitle > a.anchor:before, .sidebarblock > .content > .title > a.anchor:before, h4 > a.anchor:before, h5 > a.anchor:before, h6 > a.anchor:before { content: '\00A7'; font-size: .85em; vertical-align: text-top; display: block; margin-top: 0.05em; }
+#content h1:hover > a.anchor, #content h1 > a.anchor:hover, h2:hover > a.anchor, h2 > a.anchor:hover, h3:hover > a.anchor, #toctitle:hover > a.anchor, .sidebarblock > .content > .title:hover > a.anchor, h3 > a.anchor:hover, #toctitle > a.anchor:hover, .sidebarblock > .content > .title > a.anchor:hover, h4:hover > a.anchor, h4 > a.anchor:hover, h5:hover > a.anchor, h5 > a.anchor:hover, h6:hover > a.anchor, h6 > a.anchor:hover { visibility: visible; }
+#content h1 > a.link, h2 > a.link, h3 > a.link, #toctitle > a.link, .sidebarblock > .content > .title > a.link, h4 > a.link, h5 > a.link, h6 > a.link { color: #ba3925; text-decoration: none; }
+#content h1 > a.link:hover, h2 > a.link:hover, h3 > a.link:hover, #toctitle > a.link:hover, .sidebarblock > .content > .title > a.link:hover, h4 > a.link:hover, h5 > a.link:hover, h6 > a.link:hover { color: #a53221; }
 .admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .listingblock > .title, .literalblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .ulist > .title, .olist > .title, .dlist > .title, .qlist > .title { text-align: left; font-weight: bold; }
 .tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
 table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
@@ -163,7 +196,7 @@ table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-si
 .exampleblock > .content > :last-child { margin-bottom: 0; }
 .exampleblock > .content h1, .exampleblock > .content h2, .exampleblock > .content h3, .exampleblock > .content #toctitle, .sidebarblock.exampleblock > .content > .title, .exampleblock > .content h4, .exampleblock > .content h5, .exampleblock > .content h6 { line-height: 1; margin-bottom: 0.625em; }
 .exampleblock > .content h1.subheader, .exampleblock > .content h2.subheader, .exampleblock > .content h3.subheader, .exampleblock > .content .subheader#toctitle, .sidebarblock.exampleblock > .content > .subheader.title, .exampleblock > .content h4.subheader, .exampleblock > .content h5.subheader, .exampleblock > .content h6.subheader { line-height: 1.4; }
-.exampleblock > .content > :last-child > :last-child, .exampleblock > .content .olist > ol > li:last-child > :last-child, .exampleblock > .content .ulist > ul > li:last-child > :last-child { margin-bottom: 0; }
+.exampleblock > .content > :last-child > :last-child, .exampleblock > .content .olist > ol > li:last-child > :last-child, .exampleblock > .content .ulist > ul > li:last-child > :last-child, .exampleblock > .content .qlist > ol > li:last-child > :last-child { margin-bottom: 0; }
 .exampleblock.result > .content { -webkit-box-shadow: 0 1px 8px #d9d9d9; box-shadow: 0 1px 8px #d9d9d9; }
 .imageblock { margin-bottom: 1.25em; }
 .sidebarblock { border-style: solid; border-width: 1px; border-color: #d9d9d9; margin-bottom: 1.25em; padding: 1.25em; background: #f2f2f2; -webkit-border-radius: 4px; border-radius: 4px; }
@@ -174,6 +207,8 @@ table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-si
 .sidebarblock h1.subheader, .sidebarblock h2.subheader, .sidebarblock h3.subheader, .sidebarblock .subheader#toctitle, .sidebarblock > .content > .subheader.title, .sidebarblock h4.subheader, .sidebarblock h5.subheader, .sidebarblock h6.subheader { line-height: 1.4; }
 .sidebarblock > .content > .title { color: #7a2518; margin-top: 0; line-height: 1.6; }
 .sidebarblock > .content > .paragraph:last-child p { margin-bottom: 0; }
+pre { color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; overflow-x: auto; line-height: 1.6; }
+.verseblock { margin-bottom: 1.25em; }
 .literalblock, .listingblock { margin-bottom: 1.25em; }
 .literalblock > .content > pre, .listingblock > .content > pre { background: none; color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; border-width: 1px 0; border-style: dotted; border-color: #bfbfbf; -webkit-border-radius: 4px; border-radius: 4px; padding: 0.75em 0.75em 0.5em 0.75em; white-space: pre; overflow-x: auto; line-height: 1.6; }
 .literalblock > .content > pre > code, .literalblock > .content > pre > tt, .listingblock > .content > pre > code, .listingblock > .content > pre > tt { color: inherit; font-family: Consolas, "Liberation Mono", Courier, monospace; padding: 0; background: none; font-weight: normal; }
@@ -185,12 +220,13 @@ table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-si
 .listingblock:hover .ruby:before { content: "ruby"; text-transform: uppercase; float: right; font-size: 0.9em; color: #999; }
 .listingblock:hover .asciidoc:before { content: "asciidoc"; text-transform: uppercase; float: right; font-size: 0.9em; color: #999; }
 .listingblock:hover .java:before { content: "java"; text-transform: uppercase; float: right; font-size: 0.9em; color: #999; }
+.listingblock:hover .javascript:before { content: "javascript"; text-transform: uppercase; float: right; font-size: 0.9em; color: #999; }
 .listingblock:hover .css:before { content: "css"; text-transform: uppercase; float: right; font-size: 0.9em; color: #999; }
 .listingblock:hover .scss:before { content: "scss"; text-transform: uppercase; float: right; font-size: 0.9em; color: #999; }
 .quoteblock { margin: 0 0 1.25em; padding: 0.5625em 1.25em 0 1.1875em; border-left: 1px solid #dddddd; }
-.quoteblock blockquote { margin: 0 0 1.25em 0; padding: 0; border: 0; }
+.quoteblock blockquote { margin: 0 0 1.25em 0; padding: 0 0 0.5625em 0; border: 0; }
 .quoteblock blockquote > .paragraph:last-child p { margin-bottom: 0; }
-.quoteblock .attribution { padding-bottom: 0.5625em; font-size: inherit; color: #555555; }
+.quoteblock .attribution { margin-top: -.25em; padding-bottom: 0.5625em; font-size: inherit; color: #555555; }
 .quoteblock .attribution br { display: none; }
 .quoteblock .attribution cite { display: block; margin-bottom: 0.625em; }
 table thead th, table tfoot th { font-weight: bold; }
@@ -222,53 +258,67 @@ ol.upperroman { list-style-type: upper-roman; }
 .literalblock + .colist, .listingblock + .colist { margin-top: -0.5em; }
 .colist > table tr > td:first-of-type { padding: 0 .8em; line-height: 1; }
 .colist > table tr > td:last-of-type { padding: 0.25em 0; }
-td.hdlist1 { vertical-align: top; padding-right: .8em; }
+td.hdlist1 { vertical-align: top; padding-right: .8em; font-weight: bold; }
 .qanda > ol > li > p:first-child { color: #00467f; }
 span.footnote, span.footnoteref { vertical-align: super; font-size: 0.875em; }
 span.footnote a, span.footnoteref a { text-decoration: none; }
-#footnotes { padding: 0.75em 0.375em; margin-bottom: 1.25em; border-top: 1px solid #dddddd; }
-#footnotes hr { display: none; }
+#footnotes { padding: 0.75em 0.375em; margin-bottom: 1.25em; #border-top: 1px solid #dddddd; }
+#footnotes hr { width: 20%; min-width: 6.25em; margin: -.25em 0 .75em 0; border-width: 1px 0 0 0; }
 #footnotes .footnote { line-height: 1.3; font-size: 0.875em; margin-left: 1.2em; text-indent: -1.2em; margin-bottom: .2em; }
 #footnotes .footnote a { font-weight: bold; text-decoration: none; }
 #footnotes .footnote:last-of-type { margin-bottom: 0; }
 .gist .file-data > table { border: none; background: #fff; width: 100%; margin-bottom: 0; }
 .gist .file-data > table td.line-data { width: 99%; }
-.unbreakable { page-break-inside: avoid; }
-span.big { font-size: larger; }
-span.small { font-size: smaller; }
-span.underline { text-decoration: underline; }
-span.overline { text-decoration: overline; }
-span.line-through { text-decoration: line-through; }
-span.aqua { color: #00bfbf; }
-span.aqua-background { background-color: #00fafa; }
-span.black { color: black; }
-span.black-background { background-color: black; }
-span.blue { color: #0000bf; }
-span.blue-background { background-color: #0000fa; }
-span.fuchsia { color: #bf00bf; }
-span.fuchsia-background { background-color: #fa00fa; }
-span.gray { color: #606060; }
-span.gray-background { background-color: #7d7d7d; }
-span.green { color: #006000; }
-span.green-background { background-color: #007d00; }
-span.lime { color: #00bf00; }
-span.lime-background { background-color: #00fa00; }
-span.maroon { color: #600000; }
-span.maroon-background { background-color: #7d0000; }
-span.navy { color: #000060; }
-span.navy-background { background-color: #00007d; }
-span.olive { color: #606000; }
-span.olive-background { background-color: #7d7d00; }
-span.purple { color: #600060; }
-span.purple-background { background-color: #7d007d; }
-span.red { color: #bf0000; }
-span.red-background { background-color: #fa0000; }
-span.silver { color: #909090; }
-span.silver-background { background-color: #bcbcbc; }
-span.teal { color: #006060; }
-span.teal-background { background-color: #007d7d; }
-span.white { color: #bfbfbf; }
-span.white-background { background-color: #fafafa; }
-span.yellow { color: #bfbf00; }
-span.yellow-background { background-color: #fafa00; }
+div.unbreakable { page-break-inside: avoid; }
+.big { font-size: larger; }
+.small { font-size: smaller; }
+.underline { text-decoration: underline; }
+.overline { text-decoration: overline; }
+.line-through { text-decoration: line-through; }
+.aqua { color: #00bfbf; }
+.aqua-background { background-color: #00fafa; }
+.black { color: black; }
+.black-background { background-color: black; }
+.blue { color: #0000bf; }
+.blue-background { background-color: #0000fa; }
+.fuchsia { color: #bf00bf; }
+.fuchsia-background { background-color: #fa00fa; }
+.gray { color: #606060; }
+.gray-background { background-color: #7d7d7d; }
+.green { color: #006000; }
+.green-background { background-color: #007d00; }
+.lime { color: #00bf00; }
+.lime-background { background-color: #00fa00; }
+.maroon { color: #600000; }
+.maroon-background { background-color: #7d0000; }
+.navy { color: #000060; }
+.navy-background { background-color: #00007d; }
+.olive { color: #606000; }
+.olive-background { background-color: #7d7d00; }
+.purple { color: #600060; }
+.purple-background { background-color: #7d007d; }
+.red { color: #bf0000; }
+.red-background { background-color: #fa0000; }
+.silver { color: #909090; }
+.silver-background { background-color: #bcbcbc; }
+.teal { color: #006060; }
+.teal-background { background-color: #007d7d; }
+.white { color: #bfbfbf; }
+.white-background { background-color: #fafafa; }
+.yellow { color: #bfbf00; }
+.yellow-background { background-color: #fafa00; }
+.admonitionblock td.icon [class^="icon-"]:before { font-size: 2.5em; text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); cursor: default; }
+.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #005498; color: #003f72; }
+.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
+.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
+.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
+.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
+.conum { display: inline-block; color: white !important; background-color: #222222; -webkit-border-radius: 100px; border-radius: 100px; text-align: center; width: 20px; height: 20px; font-size: 12px; font-weight: bold; line-height: 20px; font-family: Arial, sans-serif; font-style: normal; position: relative; top: -2px; letter-spacing: -1px; }
+.conum * { color: white !important; }
+.conum:empty { display: none; }
+pre .comment .conum { left: -20px; }
 .literalblock > .content > pre, .listingblock > .content > pre { -webkit-border-radius: 0; border-radius: 0; }
+DEFAULT_ASCIIDOCTOR_STYLESHEET
+  end
+end
+end

data/lib/asciidoctor/backends/base_template.rb

@@ -65,7 +65,7 @@ class BaseTemplate
   # returns the text with blank lines removed and HTML line feed entities
   # converted to an endline character.
   def compact(str)
-    str.gsub(BLANK_LINES_PATTERN, '').gsub(LINE_FEED_ENTITY, "\n")
+    str.gsub(BLANK_LINE_PATTERN, '').gsub(LINE_FEED_ENTITY, "\n")
   end
 
   # Public: Preserve endlines by replacing them with the HTML line feed entity.
@@ -96,10 +96,15 @@ class BaseTemplate
   end
 
   # create template matter to insert a style class if the variable has a value
-  def attrvalue(key, sibling = true)
+  def attrvalue(key, sibling = true, inherit = true)
     delimiter = sibling ? ' ' : ''
-    # example: <% if attr? 'foo' %><%= attr 'foo' %><% end %>
-    %(<% if attr? '#{key}' %>#{delimiter}<%= attr '#{key}' %><% end %>)
+    if inherit
+      # example: <% if attr? 'foo' %><%= attr 'foo' %><% end %>
+      %(<% if attr? '#{key}' %>#{delimiter}<%= attr '#{key}' %><% end %>)
+    else
+      # example: <% if attr? 'foo', nil, false %><%= attr 'foo', nil, false %><% end %>
+      %(<% if attr? '#{key}', nil, false %>#{delimiter}<%= attr '#{key}', nil, false %><% end %>)
+    end
   end
 
   # create template matter to insert an id if one is specified for the block

data/lib/asciidoctor/backends/docbook45.rb

@@ -15,9 +15,9 @@ module Asciidoctor
 
     def title_tag(optional = true)
       if optional
-        %q{<%= title? ? "<title>#{title}</title>" : '' %>}
+        %(<%= title? ? "\n<title>\#{title}</title>" : nil %>)
       else
-        %q{<title><%= title %></title>}
+        %(\n<title><%= title %></title>)
       end
     end
 
@@ -26,7 +26,15 @@ module Asciidoctor
     end
 
     def common_attrs_erb
-      %q{<%= template.common_attrs(@id, (attr 'role'), (attr 'reftext')) %>}
+      %q(<%= template.common_attrs(@id, (attr 'role'), (attr 'reftext')) %>)
+    end
+
+    def content(node)
+      node.blocks? ? node.content.chomp : "<simpara>#{node.content.chomp}</simpara>"
+    end
+
+    def content_erb
+      %q(<%= blocks? ? content.chomp : "<simpara>#{content.chomp}</simpara>" %>)
     end
   end
 
@@ -54,7 +62,7 @@ class DocumentTemplate < BaseTemplate
     <% end %>
     <% if has_header? %>
     <% if attr? :author %>
-    <% if attr? :authorcount, 1 %>
+    <% if (attr :authorcount).to_i < 2 %>
     <author>
       #{tag 'firstname', :firstname}
       #{tag 'othername', :middlename}
@@ -64,7 +72,7 @@ class DocumentTemplate < BaseTemplate
     #{tag 'authorinitials', :authorinitials}
     <% else %>
     <authorgroup>
-    <% (1..(attr(:authorcount))).each do |idx| %>
+    <% (1..((attr :authorcount).to_i)).each do |idx| %>
       <author> 
         #{tag 'firstname', :"firstname_\#{idx}", true}
         #{tag 'othername', :"middlename_\#{idx}", true}
@@ -102,14 +110,14 @@ class DocumentTemplate < BaseTemplate
   <bookinfo>
 #{docinfo}
   </bookinfo>
-<%= content %>
+<%= content.chomp %>
 </book>
 <% else %>
 <article<% unless attr? :nolang %> lang="<%= attr :lang, 'en' %>"<% end %>>
   <articleinfo>
 #{docinfo}
   </articleinfo>
-<%= content %>
+<%= content.chomp %>
 </article>
 <% end %>
     EOF
@@ -135,14 +143,13 @@ end
 class BlockPreambleTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><% if @document.doctype == 'book' %>
-<preface#{common_attrs_erb}>
-  #{title_tag false}
-<%= content %>
-</preface>
-<% else %>
-<%= content %>
-<% end %>
+<%#encoding:UTF-8%><%
+if @document.doctype == 'book' %><preface#{common_attrs_erb}>#{title_tag false}
+<%= content.chomp %>
+</preface><%
+else %>
+<%= content.chomp %><%
+end %>
     EOF
   end
 end
@@ -155,9 +162,9 @@ class SectionTemplate < BaseTemplate
       tag = sec.document.doctype == 'book' && sec.level <= 1 ? (sec.level == 0 ? 'part' : 'chapter') : 'section'
     end
     %(<#{tag}#{common_attrs(sec.id, (sec.attr 'role'), (sec.attr 'reftext'))}>
-  #{sec.title? ? "<title>#{sec.title}</title>" : nil}
-  #{sec.content}
-</#{tag}>)
+#{sec.title? ? "<title>#{sec.title}</title>" : nil}
+#{sec.content.chomp}
+</#{tag}>\n)
   end
 
   def template
@@ -175,32 +182,18 @@ end
 
 class BlockParagraphTemplate < BaseTemplate
   def paragraph(id, style, role, reftext, title, content)
-    # FIXME temporary hack until I can generalize this feature
-    if style == 'partintro'
-      if title
-        %(<partintro#{common_attrs(id, role, reftext)}>
-  <title>#{title}</title>
-  <simpara>#{content}</simpara>
-</partintro>)
-      else
-        %(<partintro#{common_attrs(id, role, reftext)}>
-  <simpara>#{content}</simpara>
-</partintro>)
-      end
+    if !title.nil?
+      %(<formalpara#{common_attrs(id, role, reftext)}>
+<title>#{title}</title>
+<para>#{content}</para>
+</formalpara>\n)
     else
-      if title
-        %(<formalpara#{common_attrs(id, role, reftext)}>
-  <title>#{title}</title>
-  <para>#{content}</para>
-</formalpara>)
-      else
-        %(<simpara#{common_attrs(id, role, reftext)}>#{content}</simpara>)
-      end
+      %(<simpara#{common_attrs(id, role, reftext)}>#{content}</simpara>\n)
     end
   end
 
   def result(node)
-    paragraph(node.id, node.attr('style'), node.attr('role'), node.attr('reftext'), (node.title? ? node.title : nil), node.content)
+    paragraph(node.id, (node.attr 'style', nil, false), (node.attr 'role'), (node.attr 'reftext'), (node.title? ? node.title : nil), node.content)
   end
 
   def template
@@ -211,13 +204,8 @@ end
 class BlockAdmonitionTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><<%= attr :name %>#{common_attrs_erb}>
-  #{title_tag}
-  <% if blocks? %>
-<%= content %>
-  <% else %>
-  <simpara><%= content.chomp %></simpara>
-  <% end %>
+<%#encoding:UTF-8%><<%= attr :name %>#{common_attrs_erb}>#{title_tag}
+#{content_erb}
 </<%= attr :name %>>
     EOF
   end
@@ -227,8 +215,7 @@ class BlockUlistTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
 <%#encoding:UTF-8%><% if attr? :style, 'bibliography' %>
-<bibliodiv#{common_attrs_erb}>
-  #{title_tag}
+<bibliodiv#{common_attrs_erb}>#{title_tag}
   <% content.each do |li| %>
     <bibliomixed>
       <bibliomisc><%= li.text %></bibliomisc>
@@ -239,8 +226,7 @@ class BlockUlistTemplate < BaseTemplate
   <% end %>
 </bibliodiv>
 <% else %>
-<itemizedlist#{common_attrs_erb}>
-  #{title_tag}
+<itemizedlist#{common_attrs_erb}>#{title_tag}
   <% content.each do |li| %>
     <listitem>
       <simpara><%= li.text %></simpara>
@@ -258,8 +244,7 @@ end
 class BlockOlistTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><orderedlist#{common_attrs_erb}#{attribute('numeration', :style)}>
-  #{title_tag}
+<%#encoding:UTF-8%><orderedlist#{common_attrs_erb}#{attribute('numeration', :style)}>#{title_tag}
   <% content.each do |li| %>
     <listitem>
       <simpara><%= li.text %></simpara>
@@ -276,8 +261,7 @@ end
 class BlockColistTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><calloutlist#{common_attrs_erb}>
-  #{title_tag}
+<%#encoding:UTF-8%><calloutlist#{common_attrs_erb}>#{title_tag}
   <% content.each do |li| %>
   <callout arearefs="<%= li.attr :coids %>">
     <para><%= li.text %></para>
@@ -315,67 +299,154 @@ class BlockDlistTemplate < BaseTemplate
   }
 
   def template
+    # TODO may want to refactor ListItem content to hold multiple terms
+    # that change would drastically simplify this template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><% tags = (template.class::LIST_TAGS[attr :style] || template.class::LIST_TAGS['labeled']) %>
-<% if tags[:list] %><<%= tags[:list] %>#{common_attrs_erb}><% end %>
-  #{title_tag}
-  <% content.each do |dt, dd| %>
-  <<%= tags[:entry] %>>
-    <% if tags.has_key?(:label) %>
-    <<%= tags[:label] %>>
-      <<%= tags[:term] %>>
-        <%= dt.text %>
-      </<%= tags[:term] %>>
-    </<%= tags[:label] %>>
-    <% else %>
-    <<%= tags[:term] %>>
-      <%= dt.text %>
-    </<%= tags[:term] %>>
-    <% end %>
-    <% unless dd.nil? %>
-    <<%= tags[:item] %>>
-      <% if dd.text? %>
-      <simpara><%= dd.text %></simpara>
-      <% end %>
-      <% if dd.blocks? %>
-<%= dd.content %>
-      <% end %>
-    </<%= tags[:item] %>>
-    <% end %>
-  </<%= tags[:entry] %>>
-  <% end %>
-<% if tags[:list] %></<%= tags[:list] %>><% end %>
+<%#encoding:UTF-8%><%
+continuing = false;
+entries = content
+last_index = entries.length - 1
+if attr? :style, 'horizontal'
+%><<%= (tag = title? ? 'table' : 'informaltable') %>#{common_attrs_erb} tabstyle="horizontal" frame="none" colsep="0" rowsep="0">#{title_tag}
+<tgroup cols="2">
+<colspec colwidth="<%= attr :labelwidth, 15 %>*"/>
+<colspec colwidth="<%= attr :labelwidth, 85 %>*"/>
+<tbody valign="top"><%
+  entries.each_with_index do |(dt, dd), index|
+    last = (index == last_index)
+    unless continuing %>
+<row>
+<entry><%
+    end %>
+<simpara><%= dt.text %></simpara><%
+    if !last && dd.nil?
+      continuing = true
+      next
+    else
+      continuing = false
+    end %>
+</entry>
+<entry><%
+    unless dd.nil?
+      if dd.text? %>
+<simpara><%= dd.text %></simpara><%
+      end
+      if dd.blocks? %>
+<%= dd.content.chomp %><%
+      end
+    end %>
+</entry><%
+    if last || !dd.nil? %>
+</row><%
+    end %><%
+  end %>
+</tbody>
+</tgroup>
+</<%= tag %>><%
+else
+  tags = (template.class::LIST_TAGS[attr :style] || template.class::LIST_TAGS['labeled'])
+  if tags[:list]
+%><<%= tags[:list] %>#{common_attrs_erb}>#{title_tag}<%
+  end
+  entries.each_with_index do |(dt, dd), index|
+    last = (index == last_index)
+    unless continuing %>
+<<%= tags[:entry] %>><%
+    end
+    if tags.has_key?(:label)
+      unless continuing %>
+<<%= tags[:label] %>><%
+      end %>
+<<%= tags[:term] %>><%= dt.text %></<%= tags[:term] %>><%
+      if last || !dd.nil? %>
+</<%= tags[:label] %>><%
+      end
+    else %>
+<<%= tags[:term] %>><%= dt.text %></<%= tags[:term] %>><%
+    end
+    if !last && dd.nil?
+      continuing = true
+      next
+    else
+      continuing = false
+    end %>
+<<%= tags[:item] %>><%
+    unless dd.nil?
+      if dd.text? %>
+<simpara><%= dd.text %></simpara><%
+      end
+      if dd.blocks? %>
+<%= dd.content %><%
+      end
+    end %>
+</<%= tags[:item] %>>
+</<%= tags[:entry] %>><%
+  end
+  if tags[:list] %>
+</<%= tags[:list] %>><%
+  end
+end %>
     EOF
   end
 end
 
 class BlockOpenTemplate < BaseTemplate
+  def result(node)
+    open_block(node, node.id, (node.attr 'style', nil, false),
+        (node.attr 'role'), (node.attr 'reftext'), node.title? ? node.title : nil)
+  end
+
+  def open_block(node, id, style, role, reftext, title)
+    case style
+    when 'abstract'
+      if node.parent == node.document && node.document.attr?('doctype', 'book')
+        puts 'asciidoctor: WARNING: abstract block cannot be used in a document without a title when doctype is book. Excluding block content.'
+        ''
+      else
+        %(<abstract>#{title && "\n<title>#{title}</title>"}
+#{content node}
+</abstract>\n)
+      end
+    when 'partintro'
+      unless node.document.attr?('doctype', 'book') && node.parent.is_a?(Asciidoctor::Section) && node.level == 0
+        puts 'asciidoctor: ERROR: partintro block can only be used when doctype is book and it\'s a child of a part section. Excluding block content.'
+        ''
+      else
+        %(<partintro#{common_attrs id, role, reftext}>#{title && "\n<title>#{title}</title>"}
+#{content node}
+</partintro>\n)
+      end
+    else
+      node.content
+    end
+  end
+
   def template
-    :content
+    :invoke_result
   end
 end
 
 class BlockListingTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><% if !title? %>
-<% if attr? :style, 'source' %>
-<programlisting#{common_attrs_erb}#{attribute('language', :language)} linenumbering="<%= (attr? :linenums) ? 'numbered' : 'unnumbered' %>"><%= template.preserve_endlines(content, self) %></programlisting>
-<% else %>
-<screen#{common_attrs_erb}><%= template.preserve_endlines(content, self) %></screen>
-<% end %>
-<% else %>
-<formalpara#{common_attrs_erb}>
-  #{title_tag false}
-  <para>
-    <% if attr :style, 'source' %>
-    <programlisting language="<%= attr :language %>" linenumbering="<%= (attr? :linenums) ? 'numbered' : 'unnumbered' %>"><%= template.preserve_endlines(content, self) %></programlisting>
-    <% else %>
-    <screen><%= template.preserve_endlines(content, self) %></screen>
-    <% end %>
-  </para>
-</formalpara>
-<% end %>
+<%#encoding:UTF-8%><%
+if !title?
+  if (attr? 'style', 'source') && (attr? 'language')
+%><programlisting#{common_attrs_erb}#{attribute('language', :language)} linenumbering="<%= (attr? :linenums) ? 'numbered' : 'unnumbered' %>"><%= template.preserve_endlines(content, self) %></programlisting><%
+  else
+%><screen#{common_attrs_erb}><%= template.preserve_endlines(content, self) %></screen><%
+  end
+else
+%><formalpara#{common_attrs_erb}>#{title_tag false}
+<para><%
+  if (attr? 'style', 'source') && (attr? 'language') %>
+<programlisting language="<%= attr 'language' %>" linenumbering="<%= (attr? :linenums) ? 'numbered' : 'unnumbered' %>"><%= template.preserve_endlines(content, self) %></programlisting><%
+  else %>
+<screen><%= template.preserve_endlines(content, self) %></screen><%
+  end %>
+</para>
+</formalpara><%
+end %>
     EOF
   end
 end
@@ -386,8 +457,7 @@ class BlockLiteralTemplate < BaseTemplate
 <%#encoding:UTF-8%><% if !title? %>
 <literallayout#{common_attrs_erb} class="monospaced"><%= template.preserve_endlines(content, self) %></literallayout>
 <% else %>
-<formalpara#{common_attrs_erb}>
-  #{title_tag false}
+<formalpara#{common_attrs_erb}>#{title_tag false}
   <para>
     <literallayout class="monospaced"><%= template.preserve_endlines(content, self) %></literallayout>
   </para>
@@ -400,10 +470,9 @@ end
 class BlockExampleTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><example#{common_attrs_erb}>
-  #{title_tag}
-<%= content %>
-</example>
+<%#encoding:UTF-8%><<%= (tag_name = title? ? 'example' : 'informalexample') %>#{common_attrs_erb}>#{title_tag}
+#{content_erb}
+</<%= tag_name %>>
     EOF
   end
 end
@@ -411,9 +480,8 @@ end
 class BlockSidebarTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><sidebar#{common_attrs_erb}>
-  #{title_tag}
-<%= content %>
+<%#encoding:UTF-8%><sidebar#{common_attrs_erb}>#{title_tag}
+#{content_erb}
 </sidebar>
     EOF
   end
@@ -422,21 +490,16 @@ end
 class BlockQuoteTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><blockquote#{common_attrs_erb}>
-  #{title_tag}
+<%#encoding:UTF-8%><blockquote#{common_attrs_erb}>#{title_tag}
   <% if (attr? :attribution) || (attr? :citetitle) %>
   <attribution>
     <% if attr? :attribution %>
-    <%= attr(:attribution) %>
+    <%= (attr :attribution) %>
     <% end %>
     #{tag 'citetitle', :citetitle}
   </attribution>
   <% end %>
-<% if !@buffer.nil? %>
-<simpara><%= content %></simpara>
-<% else %>
-<%= content %>
-<% end %>
+#{content_erb}
 </blockquote>
     EOF
   end
@@ -445,12 +508,11 @@ end
 class BlockVerseTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><blockquote#{common_attrs_erb}>
-  #{title_tag}
+<%#encoding:UTF-8%><blockquote#{common_attrs_erb}>#{title_tag}
   <% if (attr? :attribution) || (attr? :citetitle) %>
   <attribution>
     <% if attr? :attribution %>
-    <%= attr(:attribution) %>
+    <%= (attr :attribution) %>
     <% end %>
     #{tag 'citetitle', :citetitle}
   </attribution>
@@ -470,9 +532,8 @@ end
 class BlockTableTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOS
-<%#encoding:UTF-8%><<%= title? ? 'table' : 'informaltable'%>#{common_attrs_erb} frame="<%= attr :frame, 'all'%>"
-    rowsep="<%= ['none', 'cols'].include?(attr :grid) ? 0 : 1 %>" colsep="<%= ['none', 'rows'].include?(attr :grid) ? 0 : 1 %>">
-  #{title_tag}
+<%#encoding:UTF-8%><<%= (tag_name = title? ? 'table' : 'informaltable') %>#{common_attrs_erb} frame="<%= attr :frame, 'all'%>"
+    rowsep="<%= ['none', 'cols'].include?(attr :grid) ? 0 : 1 %>" colsep="<%= ['none', 'rows'].include?(attr :grid) ? 0 : 1 %>">#{title_tag}
   <% if attr? :width %>
   <?dbhtml table-width="<%= attr :width %>"?>
   <?dbfo table-width="<%= attr :width %>"?>
@@ -480,7 +541,7 @@ class BlockTableTemplate < BaseTemplate
   <% end %>
   <tgroup cols="<%= attr :colcount %>">
     <% @columns.each do |col| %>
-    <colspec colname="col_<%= col.attr :colnumber %>" colwidth="<%= col.attr((attr? :width) ? :colabswidth : :colpcwidth) %>*"/>
+    <colspec colname="col_<%= col.attr :colnumber %>" colwidth="<%= (col.attr (attr? :width) ? :colabswidth : :colpcwidth) %>*"/>
     <% end %>
     <% [:head, :foot, :body].select {|tblsec| !rows[tblsec].empty? }.each do |tblsec| %>
     <t<%= tblsec %>>
@@ -490,22 +551,23 @@ class BlockTableTemplate < BaseTemplate
         <entry#{attribute('align', 'cell.attr :halign')}#{attribute('valign', 'cell.attr :valign')}<%
         if cell.colspan %> namest="col_<%= cell.column.attr :colnumber %>" nameend="col_<%= (cell.column.attr :colnumber) + cell.colspan - 1 %>"<%
         end %><% if cell.rowspan %> morerows="<%= cell.rowspan - 1 %>"<% end %>><%
-        if tblsec == :head %><%= cell.text %><%
+        cell_content = ''
+        if tblsec == :head %><% cell_content = cell.text %><%
         else %><%
-        case cell.attr(:style)
-          when :asciidoc %><%= cell.content %><%
-          when :verse %><literallayout><%= template.preserve_endlines(cell.text, self) %></literallayout><%
-          when :literal %><literallayout class="monospaced"><%= template.preserve_endlines(cell.text, self) %></literallayout><%
-          when :header %><% cell.content.each do |text| %><simpara><emphasis role="strong"><%= text %></emphasis></simpara><% end %><%
-          else %><% cell.content.each do |text| %><simpara><%= text %></simpara><% end %><%
-        %><% end %><% end %></entry>
+        case (cell.attr :style)
+          when :asciidoc %><% cell_content = cell.content %><%
+          when :verse %><% cell_content = %(<literallayout>\#{template.preserve_endlines(cell.text, self)}</literallayout>) %><%
+          when :literal %><% cell_content = %(<literallayout class="monospaced">\#{template.preserve_endlines(cell.text, self)}</literallayout>) %><%
+          when :header %><% cell.content.each do |text| %><% cell_content = %(\#{cell_content\}<simpara><emphasis role="strong">\#{text}</emphasis></simpara>) %><% end %><%
+          else %><% cell.content.each do |text| %><% cell_content = %(\#{cell_content}<simpara>\#{text}</simpara>) %><% end %><%
+        %><% end %><% end %><%= (@document.attr? 'cellbgcolor') ? %(<?dbfo bgcolor="\#{@document.attr 'cellbgcolor'}"?>) : nil %><%= cell_content %></entry>
         <% end %>
       </row>
       <% end %>
     </t<%= tblsec %>>
     <% end %>
   </tgroup>
-</<%= title? ? 'table' : 'informaltable'%>>
+</<%= tag_name %>>
     EOS
   end
 end
@@ -513,8 +575,7 @@ end
 class BlockImageTemplate < BaseTemplate
   def template
     @template ||= @eruby.new <<-EOF
-<%#encoding:UTF-8%><%#encoding:UTF-8%><figure#{common_attrs_erb}>
-  #{title_tag}
+<%#encoding:UTF-8%><%#encoding:UTF-8%><figure#{common_attrs_erb}>#{title_tag}
   <mediaobject>
     <imageobject>
       <imagedata fileref="<%= image_uri(attr :target) %>"#{attribute('contentwidth', :width)}#{attribute('contentdepth', :height)}/>
@@ -581,7 +642,54 @@ class InlineQuotedTemplate < BaseTemplate
   end
 
   def result(node)
-    quote_text(node.text, node.type, node.attr('role'))
+    quote_text(node.text, node.type, (node.attr 'role'))
+  end
+
+  def template
+    :invoke_result
+  end
+end
+
+class InlineButtonTemplate < BaseTemplate
+  def result(node)
+    %(<guibutton>#{node.text}</guibutton>)
+  end
+
+  def template
+    :invoke_result
+  end
+end
+
+class InlineKbdTemplate < BaseTemplate
+  def result(node)
+    keys = node.attr 'keys'
+    if keys.size == 1
+      %(<keycap>#{keys.first}</keycap>)
+    else
+      key_combo = keys.map{|key| %(<keycap>#{key}</keycap>) }.join
+      %(<keycombo>#{key_combo}</keycombo>)
+    end
+  end
+
+  def template
+    :invoke_result
+  end
+end
+
+class InlineMenuTemplate < BaseTemplate
+  def menu(menu, submenus, menuitem)
+    if !submenus.empty?
+      submenu_path = submenus.map{|submenu| %(<guisubmenu>#{submenu}</guisubmenu> ) }.join.chop
+      %(<menuchoice><guimenu>#{menu}</guimenu> #{submenu_path} <guimenuitem>#{menuitem}</guimenuitem></menuchoice>)
+    elsif !menuitem.nil?
+      %(<menuchoice><guimenu>#{menu}</guimenu> <guimenuitem>#{menuitem}</guimenuitem></menuchoice>)
+    else
+      %(<guimenu>#{menu}</guimenu>)
+    end
+  end
+
+  def result(node)
+    menu(node.attr('menu'), node.attr('submenus'), node.attr('menuitem'))
   end
 
   def template