From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Jean-Noël Avila" <jn.avila@free.fr>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>
Subject: Re: [PATCH] asciidoctor: fix `synopsis` rendering
Date: Sat, 20 Jul 2024 17:01:02 -0700 [thread overview]
Message-ID: <xmqqr0bnfwap.fsf@gitster.g> (raw)
In-Reply-To: <xmqqsew3hdmv.fsf@gitster.g> (Junio C. Hamano's message of "Sat, 20 Jul 2024 16:01:12 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> The rendered result is bad in the same way with or without this
> patch applied, and "git clone" manual page is simply incorrect by
> mangling a handful of command line options. A recent bug report in
> the thread that contains
>
> https://lore.kernel.org/git/xmqqle1xjm1s.fsf@gitster.g/
>
> gives us more details.
With Jean-Noël Avila's {empty} patch applied, would this patch be
still necessary?
I am wondering if the reason why "git clone" page needs this patch
while others do not may have something to do with the mistaken
triggering of "generalized roles" feature (whatever it is). Even
though I dislike that we have to resort to the {empty} hack, if the
misrendered block display you are fixing with this patch is due to
the "generalized roles" problem, fixing the latter would also be the
right fix for your problem.
Thanks.
>> diff --git a/Documentation/Makefile b/Documentation/Makefile
>> index 3f2383a12c7..78e407e4bd1 100644
>> --- a/Documentation/Makefile
>> +++ b/Documentation/Makefile
>> @@ -202,6 +202,7 @@ ASCIIDOC_DOCBOOK = docbook5
>> ASCIIDOC_EXTRA += -acompat-mode -atabsize=8
>> ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
>> ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
>> +ASCIIDOC_EXTRA += -adocinfo=shared
>> ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
>> DBLATEX_COMMON =
>> XMLTO_EXTRA += --skip-validation
>> diff --git a/Documentation/docinfo.html b/Documentation/docinfo.html
>> new file mode 100644
>> index 00000000000..fb3560eb92b
>> --- /dev/null
>> +++ b/Documentation/docinfo.html
>> @@ -0,0 +1,5 @@
>> +<style>
>> +pre>code {
>> + display: inline;
>> +}
>> +</style>
>>
>> base-commit: 76880f0510c6be9f6385f2d43dcfcba4eca9ccbc
next prev parent reply other threads:[~2024-07-21 0:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-20 20:30 [PATCH] asciidoctor: fix `synopsis` rendering Johannes Schindelin via GitGitGadget
2024-07-20 23:01 ` Junio C Hamano
2024-07-21 0:01 ` Junio C Hamano [this message]
2024-07-22 16:27 ` Junio C Hamano
2024-07-22 20:25 ` [PATCH v2] " Johannes Schindelin via GitGitGadget
2024-07-22 20:45 ` Junio C Hamano
2024-07-23 3:13 ` Junio C Hamano
2024-07-23 14:19 ` Johannes Schindelin
2024-07-23 16:43 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr0bnfwap.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jn.avila@free.fr \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).