From: Felipe Contreras <felipe.contreras@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>, git@vger.kernel.org
Cc: "brian m . carlson" <sandals@crustytoothpaste.net>,
"Martin Ågren" <martin.agren@gmail.com>,
"Bagas Sanjaya" <bagasdotme@gmail.com>,
"Jeff King" <peff@peff.net>, "Junio C Hamano" <gitster@pobox.com>
Subject: RE: [RFC/NOPATCHv3 3/4] doc: use XML-style escapes only for HTML and XML
Date: Fri, 18 Jun 2021 16:07:49 -0500 [thread overview]
Message-ID: <60cd0b255b8b0_c0ff920870@natae.notmuch> (raw)
In-Reply-To: <20210618203057.790320-4-felipe.contreras@gmail.com>
Felipe Contreras wrote:
> From: "brian m. carlson" <sandals@crustytoothpaste.net>
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -183,12 +183,15 @@ ASCIIDOC_HTML = xhtml5
> ASCIIDOC_DOCBOOK = docbook5
> ASCIIDOC_EXTRA += -acompat-mode -atabsize=8
> ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
> -ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
> +TXT_TO_HTML += -alitdd='&\#x2d;&\#x2d;'
> +TXT_TO_XML += -alitdd='&\#x2d;&\#x2d;'
> DBLATEX_COMMON =
> XMLTO_EXTRA += --skip-validation
> XMLTO_EXTRA += -x manpage.xsl
> ifdef USE_ASCIIDOCTOR_MANPAGE
> TXT_TO_MAN = $(ASCIIDOC_COMMON) -b manpage
> +TXT_TO_MAN += -aplus='+'
> +TXT_TO_MAN += -alitdd='\--'
> endif
> endif
>
My version of the workaround [1] is much cleaner, and doesn't mess with
the build system:
if doc.backend == 'manpage'
doc.attributes.merge!({ 'litdd' => '\--', 'plus' => '+' })
end
Once asciidoctor issue #4059 is fixed [2] and in widespread use the
above workaround can be removed.
[1] https://lore.kernel.org/git/20210521224452.530852-7-felipe.contreras@gmail.com/
[2] https://github.com/asciidoctor/asciidoctor/issues/4059
--
Felipe Contreras
next prev parent reply other threads:[~2021-06-18 21:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-18 20:30 [RFC/NOPATCHv3 0/4] doc: asciidoctor: direct man page creation and fixes (brian's version) Felipe Contreras
2021-06-18 20:30 ` [RFC/NOPATCHv3 1/4] doc: add an option to have Asciidoctor build man pages directly Felipe Contreras
2021-06-18 20:57 ` Felipe Contreras
2021-06-18 20:30 ` [RFC/NOPATCHv3 2/4] doc: add linkgit macros for asciidoctor Felipe Contreras
2021-06-18 21:03 ` Felipe Contreras
2021-06-18 20:30 ` [RFC/NOPATCHv3 3/4] doc: use XML-style escapes only for HTML and XML Felipe Contreras
2021-06-18 21:07 ` Felipe Contreras [this message]
2021-06-18 20:30 ` [RFC/NOPATCHv3 4/4] doc: remove GNU_ROFF option Felipe Contreras
2021-06-18 21:34 ` Felipe Contreras
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=60cd0b255b8b0_c0ff920870@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).