From: Thomas Rast <trast@student.ethz.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH resend] Disable asciidoc 8.4.1+ semantics for `{plus}` and friends
Date: Sat, 25 Jul 2009 14:06:50 +0200 [thread overview]
Message-ID: <8e1edb4fb24a009e8eee419df31d0ae17a63a866.1248523345.git.trast@student.ethz.ch> (raw)
In-Reply-To: <8e1edb4fb24a009e8eee419df31d0ae17a63a866.1247752162.git.trast@student.ethz.ch>
asciidoc 8.4.1 changed the semantics of inline backtick quoting so
that they disable parsing of inline constructs, i.e.,
Input: `{plus}`
Pre 8.4.1: +
Post 8.4.1: {plus}
Fix this by defining the asciidoc attribute 'no-inline-literal'
(which, per the 8.4.1 changelog, is the toggle to return to the old
behaviour) when under ASCIIDOC8.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
I wrote:
> I checked the output of 8.4.4 with ASCIIDOC8 and ASCIIDOC_NO_ROFF set.
> I unfortunately cannot test if the extra attribute affects pre-8.4.1
> versions. (If it conflicts, we will have to introduce yet another
> ASCIIDOC_* option, but I'm trying to avoid it.)
Junio, can this go in before 1.6.4? Otherwise the docs will not be
rendered right with asciidoc 8.4.1 and newer. I got hold of a machine
with asciidoc 8.2.7 and it does not affect the output there.
Documentation/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 7a8037f..06b0c57 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -84,7 +84,7 @@ endif
#
ifdef ASCIIDOC8
-ASCIIDOC_EXTRA += -a asciidoc7compatible
+ASCIIDOC_EXTRA += -a asciidoc7compatible -a no-inline-literal
endif
ifdef DOCBOOK_XSL_172
ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
--
1.6.4.rc2.216.g3239.dirty
next prev parent reply other threads:[~2009-07-25 12:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-16 13:54 [PATCH] Disable asciidoc 8.4.1+ semantics for `{plus}` and friends Thomas Rast
2009-07-25 12:06 ` Thomas Rast [this message]
2009-07-25 16:56 ` [PATCH resend] " 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=8e1edb4fb24a009e8eee419df31d0ae17a63a866.1248523345.git.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).