mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
c2a7f5d438
When asciidoc converts a listing block like: ---------------------- $ git log --merge ---------------------- it marks it to be displayed in a monospace font. This works fine when generating HTML output. However, when generating docbook output, we override the expansion of a listingblock to work around bugs in some versions of the docbook toolchain. Our override did not mark the listingblock with the "monospaced" class. The main output that uses docbook as an intermediate format is the manpages. We didn't notice any issue there because the monospaced class seems to be ignored when generating roff from the docbook manpages. However, when generating texinfo to make info pages, docbook does respect this class. The resulting texinfo output properly uses "@example" blocks to display the listing in this case. Besides possibly looking prettier in some texinfo backends, one important effect is that the monospace font suppresses texinfo's expansion of "--" and "---" into en-dashes and em-dashes. With the current code, the example above ends up looking like "git log -merge", which is confusing and wrong. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
22 lines
432 B
Plaintext
22 lines
432 B
Plaintext
[titles]
|
|
underlines="__","==","--","~~","^^"
|
|
|
|
[attributes]
|
|
caret=^
|
|
startsb=[
|
|
endsb=]
|
|
tilde=~
|
|
|
|
[linkgit-inlinemacro]
|
|
<ulink url="{target}.html">{target}{0?({0})}</ulink>
|
|
|
|
ifdef::backend-docbook[]
|
|
# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
|
|
[listingblock]
|
|
<example><title>{title}</title>
|
|
<literallayout class="monospaced">
|
|
|
|
|
</literallayout>
|
|
{title#}</example>
|
|
endif::backend-docbook[]
|