[PATCH] Disable asciidoc 8.4.1+ semantics for `{plus}` and friends

[PATCH] Disable asciidoc 8.4.1+ semantics for `{plus}` and friends

[Thomas Rast]

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 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.)


 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.rc1.193.g17735.dirty

[PATCH resend] Disable asciidoc 8.4.1+ semantics for `{plus}` and friends

[Thomas Rast]

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

Re: [PATCH resend] Disable asciidoc 8.4.1+ semantics for `{plus}` and friends

[Junio C Hamano]

Thanks.  Will queue.