X-Git-Url: https://git.tokkee.org/?p=tig.git;a=blobdiff_plain;f=asciidoc.conf;h=90fdb6ad71cc437f0cce15d77d879fd2ba200cb3;hp=8ad167ab4ee2c0218aa2f87f7badf34d70f80f2f;hb=8869ebf96178755c9c88e011db35048b93647ae2;hpb=bb0ab19f0540342604a8b9dfc97bd7b3bb822a51

diff --git a/asciidoc.conf b/asciidoc.conf
index 8ad167a..90fdb6a 100644
--- a/asciidoc.conf
+++ b/asciidoc.conf
@@ -1,23 +1,13 @@
 ifdef::backend-docbook[]
-[gitlink-inlinemacro]
+[manpage-inlinemacro]
 {0%{target}}
 {0#<citerefentry>}
 {0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
 {0#</citerefentry>}
 endif::backend-docbook[]
 
-ifdef::backend-docbook[]
-# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
-[listingblock]
-<example><title>{title}</title>
-<literallayout>
-|
-</literallayout>
-{title#}</example>
-endif::backend-docbook[]
-
 ifdef::backend-xhtml11[]
-[gitlink-inlinemacro]
+[manpage-inlinemacro]
 <a href="{target}{0?.{0}}.html">{target}{0?({0})}</a>
 endif::backend-xhtml11[]
 
@@ -37,15 +27,36 @@ template::[header-declarations]
   <refname>{manname}</refname>
   <refpurpose>{manpurpose}</refpurpose>
 </refnamediv>
+
+# The following two small workarounds insert a simple paragraph after screen
+#
+
+[listingblock]
+<example><title>{title}</title>
+<screen>
+|
+</screen><simpara></simpara>
+{title#}</example>
+
+[verseblock]
+<formalpara{id? id="{id}"}><title>{title}</title><para>
+{title%}<literallayout{id? id="{id}"}>
+{title#}<literallayout>
+|
+</literallayout><simpara></simpara>
+{title#}</para></formalpara>
 endif::backend-docbook[]
 endif::doctype-manpage[]
 
 ifdef::readme[]
 # No header or footers for README.html
 [header]
-<div style="font-family: monospace;">
+<div style="font-family: sans-serif;">
 <h1>{doctitle}</h1>
 
 [footer]
 </div>
+
+[replacements]
+(^|[^-\\])--($|[^-])=\1--\2
 endif::readme[]