mizuho 0.9.10 → 0.9.11

data/asciidoc/tests/testasciidoc.conf

@@ -37,7 +37,7 @@ Source highlighter
 Example article
 
 % options
-['--section-numbers']
+['--section-numbers', ('--attribute','css-signature=article-test')]
 
 % attributes
 # So document date in footer doesn't generate an error.
@@ -209,11 +209,20 @@ data/lang-en-test.txt
 % attributes
 {'toc':True}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+English language file (manpage)
+
+% backends
+['docbook']
+
+% source
+data/lang-en-man-test.txt
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 Russian language file (article)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-ru-article-test
@@ -231,7 +240,7 @@ data/lang-ru-test.txt
 Russian language file (book)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-ru-book-test
@@ -245,11 +254,20 @@ data/lang-ru-test.txt
 % attributes
 {'toc':True}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Russian language file (manpage)
+
+% backends
+['docbook']
+
+% source
+data/lang-ru-man-test.txt
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 French language file (article)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-fr-article-test
@@ -267,7 +285,7 @@ data/lang-fr-test.txt
 French language file (book)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-fr-book-test
@@ -281,11 +299,20 @@ data/lang-fr-test.txt
 % attributes
 {'toc':True}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+French language file (manpage)
+
+% backends
+['docbook']
+
+% source
+data/lang-fr-man-test.txt
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 German language file (article)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-de-article-test
@@ -303,7 +330,7 @@ data/lang-de-test.txt
 German language file (book)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-de-book-test
@@ -317,11 +344,20 @@ data/lang-de-test.txt
 % attributes
 {'toc':True}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+German language file (manpage)
+
+% backends
+['docbook']
+
+% source
+data/lang-de-man-test.txt
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 Hungarian language file (article)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-hu-article-test
@@ -339,7 +375,7 @@ data/lang-hu-test.txt
 Hungarian language file (book)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-hu-book-test
@@ -353,11 +389,20 @@ data/lang-hu-test.txt
 % attributes
 {'toc':True}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Hungarian language file (manpage)
+
+% backends
+['docbook']
+
+% source
+data/lang-hu-man-test.txt
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 Spanish language file (article)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-es-article-test
@@ -375,7 +420,7 @@ data/lang-es-test.txt
 Spanish language file (book)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-es-book-test
@@ -389,11 +434,20 @@ data/lang-es-test.txt
 % attributes
 {'toc':True}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Spanish language file (manpage)
+
+% backends
+['docbook']
+
+% source
+data/lang-es-man-test.txt
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 Brazilian Portuguese language file (article)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-pt-BR-article-test
@@ -411,7 +465,7 @@ data/lang-pt-BR-test.txt
 Brazilian Portuguese language file (book)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-pt-BR-book-test
@@ -425,11 +479,20 @@ data/lang-pt-BR-test.txt
 % attributes
 {'toc':True}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Brazilian Portuguese language file (manpage)
+
+% backends
+['docbook']
+
+% source
+data/lang-pt-BR-man-test.txt
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 Ukrainian language file (article)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-uk-article-test
@@ -447,7 +510,7 @@ data/lang-uk-test.txt
 Ukrainian language file (book)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-uk-book-test
@@ -461,11 +524,20 @@ data/lang-uk-test.txt
 % attributes
 {'toc':True}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Ukrainian language file (manpage)
+
+% backends
+['docbook']
+
+% source
+data/lang-uk-man-test.txt
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 Dutch language file (article)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-nl-article-test
@@ -483,7 +555,7 @@ data/lang-nl-test.txt
 Dutch language file (book)
 
 % backends
-['docbook','xhtml11','html5']
+['docbook','xhtml11','html4','html5']
 
 % name
 lang-nl-book-test
@@ -497,6 +569,60 @@ data/lang-nl-test.txt
 % attributes
 {'toc':True}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Dutch language file (manpage)
+
+% backends
+['docbook']
+
+% source
+data/lang-nl-man-test.txt
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Italian language file (article)
+
+% backends
+['docbook','xhtml11','html4','html5']
+
+% name
+lang-it-article-test
+
+% source
+data/lang-it-test.txt
+
+% options
+[('--doctype','article')]
+
+% attributes
+{'toc':True}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Italian language file (book)
+
+% backends
+['docbook','xhtml11','html4','html5']
+
+% name
+lang-it-book-test
+
+% source
+data/lang-it-test.txt
+
+% options
+[('--doctype','book')]
+
+% attributes
+{'toc':True}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Italian language file (manpage)
+
+% backends
+['docbook']
+
+% source
+data/lang-it-man-test.txt
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 RCS $Id$ marker test
 

data/asciidoc/tests/testasciidoc.py

@@ -21,7 +21,14 @@ __version__ = '0.1.1'
 __copyright__ = 'Copyright (C) 2009 Stuart Rackham'
 
 
-import os, sys, re, StringIO, difflib
+import os, sys, re, difflib
+
+if sys.platform[:4] == 'java':
+    # Jython cStringIO is more compatible with CPython StringIO.
+    import cStringIO as StringIO
+else:
+    import StringIO
+
 import asciidocapi
 
 
@@ -275,7 +282,9 @@ class AsciiDocTests(object):
         first = True
         while not lines.eol():
             s = lines.read_until(r'^%+$')
-            if s:
+            s = [ l for l in s if l]    # Drop blank lines.
+            # Must be at least one non-blank line in addition to delimiter.
+            if len(s) > 1:
                 # Optional globals precede all tests.
                 if first and re.match(r'^%\s*globals$',s[0]):
                     self.globals = eval(' '.join(normalize_data(s[1:])))

data/asciidoc/{stylesheets → themes/volnitsky}/volnitsky.css

@@ -3,7 +3,7 @@
  * Based on css from http://volnitsky.com, which was in turn based on default
  * theme from AsciiDoc
  *
- * FIXME: The stlying is still a bit rough in places.
+ * FIXME: The styling is still a bit rough in places.
  *
  */
 

data/asciidoc/vim/ftdetect/asciidoc_filetype.vim

@@ -10,7 +10,7 @@
 " The first sets asciidoc syntax highlighting on all .txt files, the second
 " only existing files *.txt that appear to be AsciiDoc files.
 
-au BufNewFile,BufRead *.txt,README,TODO,CHANGELOG,NOTES  setfiletype asciidoc
+au BufNewFile,BufRead *.asciidoc,*.txt,README,TODO,CHANGELOG,NOTES  setfiletype asciidoc
 "au BufRead *.txt,README,TODO,CHANGELOG,NOTES call s:FTasciidoc()
 
 " This function checks for a valid AsciiDoc document title after first

data/asciidoc/vim/syntax/asciidoc.vim

@@ -89,7 +89,7 @@ syn region asciidocFilterBlock start=/^\w*\~\{4,}$/ end=/^\w*\~\{4,}$/
 syn region asciidocMacroAttributes matchgroup=asciidocRefMacro start=/\\\@<!<<"\{-}\(\w\|-\|_\|:\|\.\)\+"\?,\?/ end=/\(>>\)\|^$/ contains=asciidocQuoted.* keepend
 syn region asciidocMacroAttributes matchgroup=asciidocAnchorMacro start=/\\\@<!\[\{2}\(\w\|-\|_\|:\|\.\)\+,\?/ end=/\]\{2}/ keepend
 syn region asciidocMacroAttributes matchgroup=asciidocAnchorMacro start=/\\\@<!\[\{3}\(\w\|-\|_\|:\|\.\)\+/ end=/\]\{3}/ keepend
-syn region asciidocMacroAttributes matchgroup=asciidocMacro start=/[\\0-9a-zA-Z]\@<!\w\(\w\|-\)*:\S\{-}\[/ skip=/\\\]/ end=/\]\|^$/ contains=asciidocQuoted.*,asciidocAttributeRef keepend
+syn region asciidocMacroAttributes matchgroup=asciidocMacro start=/[\\0-9a-zA-Z]\@<!\w\(\w\|-\)*:\S\{-}\[/ skip=/\\\]/ end=/\]\|^$/ contains=asciidocQuoted.*,asciidocAttributeRef,asciidocEntityRef keepend
 " Highlight macro that starts with an attribute reference (a common idiom).
 syn region asciidocMacroAttributes matchgroup=asciidocMacro start=/\(\\\@<!{\w\(\w\|[-,+]\)*\([=!@#$%?:].*\)\?}\)\@<=\S\{-}\[/ skip=/\\\]/ end=/\]\|^$/ contains=asciidocQuoted.*,asciidocAttributeRef keepend
 syn region asciidocMacroAttributes matchgroup=asciidocIndexTerm start=/\\\@<!(\{2,3}/ end=/)\{2,3}/ contains=asciidocQuoted.*,asciidocAttributeRef keepend

data/asciidoc/xhtml11-quirks.conf

@@ -9,8 +9,8 @@
 <div class="content">
 <a class="image" href="{link}">
 {data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} />
-{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} src="data:image/{eval:os.path.splitext('{target}')[1][1:]};base64,
-{data-uri#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{imagesdir=}","{target}")}"}" />
+{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} src="data:image/{eval:os.path.splitext(r'{target}')[1][1:]};base64,
+{data-uri#}{sys:"{python}" -u -c "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{imagesdir=}",r"{target}")}"}" />
 {link#}</a>
 </div>
 <div class="image-title">{caption={figure-caption} {counter:figure-number}: }{title}</div>

data/asciidoc/xhtml11.conf

@@ -32,8 +32,8 @@ endif::asciidoc7compatible[]
 <div style="page-break-after:always"></div>
 
 [blockdef-pass]
-asciimath-style=template="asciimathblock",subs=[]
-latexmath-style=template="latexmathblock",subs=[]
+asciimath-style=template="asciimathblock",subs=()
+latexmath-style=template="latexmathblock",subs=()
 
 [macros]
 # math macros.
@@ -45,14 +45,14 @@ latexmath-style=template="latexmathblock",subs=[]
 `{passtext}`
 
 [asciimath-blockmacro]
-<div class="mathblock{role? {role}}"{id? id="{id}"}>
+<div class="mathblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <div class="content">
 <div class="title">{title}</div>
 `{passtext}`
 </div></div>
 
 [asciimathblock]
-<div class="mathblock{role? {role}}"{id? id="{id}"}>
+<div class="mathblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <div class="content">
 <div class="title">{title}</div>
 `|`
@@ -62,14 +62,14 @@ latexmath-style=template="latexmathblock",subs=[]
 {passtext}
 
 [latexmath-blockmacro]
-<div class="mathblock{role? {role}}"{id? id="{id}"}>
+<div class="mathblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <div class="content">
 <div class="title">{title}</div>
 {passtext}
 </div></div>
 
 [latexmathblock]
-<div class="mathblock{role? {role}}"{id? id="{id}"}>
+<div class="mathblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <div class="content">
 <div class="title">{title}</div>
 |
@@ -79,18 +79,18 @@ latexmath-style=template="latexmathblock",subs=[]
 <span class="image{role? {role}}">
 <a class="image" href="{link}">
 {data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"} />
-{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"} src="data:image/{eval:os.path.splitext('{target}')[1][1:]};base64,
-{data-uri#}{sys3:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{imagesdir=}","{target}")}"}" />
+{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"}{title? title="{title}"} src="data:image/{eval:os.path.splitext(r'{target}')[1][1:]};base64,
+{data-uri#}{sys3:"{python}" -u -c "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{imagesdir=}",r"{target}")}"}" />
 {link#}</a>
 </span>
 
 [image-blockmacro]
-<div class="imageblock{style? {style}}{role? {role}}"{id? id="{id}"}{align? style="text-align:{align};"}{float? style="float:{float};"}>
+<div class="imageblock{style? {style}}{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}{align? style="text-align:{align};"}{float? style="float:{float};"}>
 <div class="content">
 <a class="image" href="{link}">
 {data-uri%}<img src="{imagesdir=}{imagesdir?/}{target}" alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} />
-{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} src="data:image/{eval:os.path.splitext('{target}')[1][1:]};base64,
-{data-uri#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{imagesdir=}","{target}")}"}" />
+{data-uri#}<img alt="{alt={target}}"{width? width="{width}"}{height? height="{height}"} src="data:image/{eval:os.path.splitext(r'{target}')[1][1:]};base64,
+{data-uri#}{sys:"{python}" -u -c "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{imagesdir=}",r"{target}")}"}" />
 {link#}</a>
 </div>
 <div class="title">{caption={figure-caption} {counter:figure-number}. }{title}</div>
@@ -99,6 +99,9 @@ latexmath-style=template="latexmathblock",subs=[]
 [unfloat-blockmacro]
 <div style="clear:both;"></div>
 
+[toc-blockmacro]
+template::[toc]
+
 [indexterm-inlinemacro]
 # Index term.
 {empty}
@@ -128,7 +131,7 @@ ifndef::data-uri[]
 endif::data-uri[]
 ifdef::data-uri[]
 <img alt="{index}" src="data:image/png;base64,
-{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{icon={iconsdir}/callouts/{index}.png}")}"}" />
+{sys:"{python}" -u -c "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{icon={iconsdir}/callouts/{index}.png}")}"}" />
 endif::data-uri[]
 endif::icons[]
 
@@ -191,7 +194,7 @@ ifndef::data-uri[]
 item=<tr><td><img src="{iconsdir}/callouts/{listindex}.png" alt="{listindex}" /></td><td>|</td></tr>
 endif::data-uri[]
 ifdef::data-uri[]
-item=<tr><td><img alt="{listindex}" src="data:image/png;base64, {sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{icon={iconsdir}/callouts/{listindex}.png}")}"}" /></td><td>|</td></tr>
+item=<tr><td><img alt="{listindex}" src="data:image/png;base64, {sys:"{python}" -u -c "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{icon={iconsdir}/callouts/{listindex}.png}")}"}" /></td><td>|</td></tr>
 endif::data-uri[]
 text=|
 endif::icons[]
@@ -275,7 +278,7 @@ endif::deprecated-quotes[]
 
 # Paragraph substitution.
 [paragraph]
-<div class="paragraph{role? {role}}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<p>
+<div class="paragraph{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>{title?<div class="title">{title}</div>}<p>
 |
 </p></div>
 
@@ -284,7 +287,7 @@ template::[admonitionblock]
 
 # Delimited blocks.
 [listingblock]
-<div class="listingblock{role? {role}}"{id? id="{id}"}>
+<div class="listingblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <div class="title">{caption=}{title}</div>
 <div class="content">
 <pre><tt>
@@ -293,7 +296,7 @@ template::[admonitionblock]
 </div></div>
 
 [literalblock]
-<div class="literalblock{role? {role}}"{id? id="{id}"}>
+<div class="literalblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <div class="title">{title}</div>
 <div class="content">
 <pre><tt>
@@ -302,14 +305,14 @@ template::[admonitionblock]
 </div></div>
 
 [sidebarblock]
-<div class="sidebarblock{role? {role}}"{id? id="{id}"}>
+<div class="sidebarblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <div class="content">
 <div class="title">{title}</div>
 |
 </div></div>
 
 [openblock]
-<div class="openblock{role? {role}}"{id? id="{id}"}>
+<div class="openblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <div class="title">{title}</div>
 <div class="content">
 |
@@ -322,7 +325,7 @@ template::[openblock]
 template::[quoteblock]
 
 [quoteblock]
-<div class="quoteblock{role? {role}}"{id? id="{id}"}>
+<div class="quoteblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <div class="title">{title}</div>
 <div class="content">
 |
@@ -333,7 +336,7 @@ template::[quoteblock]
 </div></div>
 
 [verseblock]
-<div class="verseblock{role? {role}}"{id? id="{id}"}>
+<div class="verseblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <div class="title">{title}</div>
 <pre class="content">
 |
@@ -344,19 +347,19 @@ template::[quoteblock]
 </div></div>
 
 [exampleblock]
-<div class="exampleblock{role? {role}}"{id? id="{id}"}>
+<div class="exampleblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <div class="title">{caption={example-caption} {counter:example-number}. }{title}</div>
 <div class="content">
 |
 </div></div>
 
 [admonitionblock]
-<div class="admonitionblock{role? {role}}"{id? id="{id}"}>
+<div class="admonitionblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <table><tr>
 <td class="icon">
 {data-uri%}{icons#}<img src="{icon={iconsdir}/{name}.png}" alt="{caption}" />
 {data-uri#}{icons#}<img alt="{caption}" src="data:image/png;base64,
-{data-uri#}{icons#}{sys:python -uc "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join("{indir={outdir}}","{icon={iconsdir}/{name}.png}")}"}" />
+{data-uri#}{icons#}{sys:"{python}" -u -c "import base64,sys; base64.encode(sys.stdin,sys.stdout)" < "{eval:os.path.join(r"{indir={outdir}}",r"{icon={iconsdir}/{name}.png}")}"}" />
 {icons%}<div class="title">{caption}</div>
 </td>
 <td class="content">
@@ -399,7 +402,7 @@ bodydata=<td {colspan@1::colspan="{colspan}" }{rowspan@1::rowspan="{rowspan}" }a
 paragraph=
 
 [table]
-<div class="tableblock{role? {role}}"{id? id="{id}"}>
+<div class="tableblock{role? {role}}{unbreakable-option? unbreakable}"{id? id="{id}"}>
 <table rules="{grid=all}"
 style="margin-left:{align@left:0}{align@center|right:auto}; margin-right:{align@left|center:auto}{align@right:0};"
 style="float:{float};"
@@ -531,7 +534,6 @@ cellspacing="0" cellpadding="4">
 {title%}<title>{doctitle=}</title>
 ifdef::linkcss[]
 <link rel="stylesheet" href="{stylesdir=.}/{theme=asciidoc}.css" type="text/css" />
-{doctype-manpage}<link rel="stylesheet" href="{stylesdir=.}/{theme=asciidoc}-manpage.css" type="text/css" />
 ifdef::quirks[]
 <link rel="stylesheet" href="{stylesdir=.}/xhtml11-quirks.css" type="text/css" />
 endif::quirks[]
@@ -541,10 +543,8 @@ ifdef::toc2[<link rel="stylesheet" href="{stylesdir=.}/toc2.css" type="text/css"
 endif::linkcss[]
 ifndef::linkcss[]
 <style type="text/css">
-include1::{stylesdir=./stylesheets}/{theme=asciidoc}.css[]
-ifdef::doctype-manpage[]
-include1::{stylesdir=./stylesheets}/{theme=asciidoc}-manpage.css[]
-endif::doctype-manpage[]
+include1::{theme%}{stylesdir=./stylesheets}/asciidoc.css[]
+include1::{themedir}/{theme}.css[]
 ifdef::quirks[]
 include1::{stylesdir=./stylesheets}/xhtml11-quirks.css[]
 endif::quirks[]
@@ -560,6 +560,7 @@ endif::linkcss[]
 ifndef::disable-javascript[]
 ifdef::linkcss[]
 <script type="text/javascript" src="{scriptsdir=.}/asciidoc.js"></script>
+<script type="text/javascript" src="{scriptsdir=.}/{theme}.js"></script>
 <script type="text/javascript">
 # Escape as CDATA to pass validators.
 /*<![CDATA[*/
@@ -572,6 +573,7 @@ ifndef::linkcss[]
 # Escape as CDATA to pass validators.
 /*<![CDATA[*/
 include1::{scriptsdir=./javascripts}/asciidoc.js[]
+include1::{themedir}/{theme}.js[warnings=False]
 asciidoc.install({toc,toc2?{toclevels}});
 /*]]>*/
 </script>
@@ -605,8 +607,9 @@ endif::linkcss[]
 endif::latexmath[]
 {docinfo1,docinfo2#}{include:{docdir}/docinfo.html}
 {docinfo,docinfo2#}{include:{docdir}/{docname}-docinfo.html}
+template::[docinfo]
 </head>
-<body class="{doctype}"{max-width? style="max-width:{max-width}"}>
+<body class="{doctype}"{max-width? style="max-width:{max-width}"}{css-signature? id="{css-signature}"}>
 # Article, book header.
 ifndef::doctype-manpage[]
 <div id="header">
@@ -618,7 +621,7 @@ ifdef::doctitle[]
 <span id="revdate">{revdate}</span>
 <br /><span id="revremark">{revremark}</span>
 endif::doctitle[]
-ifdef::toc,toc2[{template:toc}]
+{toc,toc2#}{toc-placement$auto:}{template:toc}
 </div>
 endif::doctype-manpage[]
 # Man page header.
@@ -627,7 +630,7 @@ ifdef::doctype-manpage[]
 <h1>
 {doctitle} Manual Page
 </h1>
-ifdef::toc,toc2[{template:toc}]
+{toc,toc2#}{toc-placement$auto:}{template:toc}
 <h2>{manname-title}</h2>
 <div class="sectionbody">
 <p>{manname} -
@@ -662,11 +665,6 @@ ifdef::icons[]
     src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
     alt="Valid CSS!" />
 </a>
-<a href="http://www.mozilla.org/products/firefox/">
-  <img style="border:none; width:110px; height:32px;"
-       src="http://www.spreadfirefox.com/community/images/affiliates/Buttons/110x32/safer.gif"
-       alt="Get Firefox!" />
-</a>
 endif::icons[]
 </div>
 endif::badges[]