docs: drop asciidoc7compatible flag

When we made the switch to supporting asciidoc 8 in 4c7100a (Documentation: adjust to AsciiDoc 8, 2007-06-14), we were able to leave most of the documentation intact by defining asciidoc7compatible. Since commit 6cf378f (docs: stop using asciidoc no-inline-literal, 2012-04-26), we don't support versions of asciidoc older than 8.4.1, which is when inline literals were introduced. Therefore there is not much point in keeping our documentation compatible with asciidoc 7. So we are now free to drop the asciidoc7compatible flag and update the documentation itself to assume asciidoc8. Fortunately, doing the latter is very easy; we weren't using any of the constructs impacted by asciidoc7compatible, so there are no changes to make. The reason is somewhat subtle. The asciidoc7compatible affects only super/sub-scripts ("^" and "~") and index terms. We don't use the latter at all. Nor we do we use the former, but we did have to protect them from accidental expansion in constructs like "rev^1". However, all of our uses of "~" and "^" are either in code blocks (which are rendered literally), or inside backticks. Prior to 6cf378f, backticks were not inline literals, and needed proper quoting. But post-6cf378f, we don't have to worry whether we are using the old or new rules, as those characters are not interpreted at all in either case. I verified that the result of "make install-html install-man" is identical before and after this patch on asciidoc 8.6.7. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed May 30, 2012 at 06:22 UTC bf1712621178340e0f15cb060afc8e650ae72faf
4 files changed -23
Documentation/Makefile
-9
@@ -65,12 +65,6 @@ endif
65 -include ../config.mak.autogen
66 -include ../config.mak
67
68 -#
69 -# For asciidoc ...
70 -# -7.1.2, set ASCIIDOC7
71 -# 8.0-, no extra settings are needed
72 -#
73 -
68 #
69 # For docbook-xsl ...
70 # -1.68.1, no extra settings are needed?
@@ -81,9 +75,6 @@ endif
75 # 1.73.0-, no extra settings are needed
76 #
77
84 -ifndef ASCIIDOC7
85 -ASCIIDOC_EXTRA += -a asciidoc7compatible
86 -endif
78 ifdef DOCBOOK_XSL_172
79 ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
80 MANPAGE_XSL = manpage-1.72.xsl
Makefile
-6
@@ -203,8 +203,6 @@ all::
203 # Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
204 # field that counts the on-disk footprint in 512-byte blocks.
205 #
206 -# Define ASCIIDOC7 if you want to format documentation with AsciiDoc 7
207 -#
206 # Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72
207 # (not v1.73 or v1.71).
208 #
@@ -1834,10 +1832,6 @@ ifndef V
1832 endif
1833 endif
1834
1837 -ifdef ASCIIDOC7
1838 - export ASCIIDOC7
1839 -endif
1840 -
1835 ifdef NO_INSTALL_HARDLINKS
1836 export NO_INSTALL_HARDLINKS
1837 endif
config.mak.in
-1
@@ -28,7 +28,6 @@ VPATH = @srcdir@
28 export exec_prefix mandir
29 export srcdir VPATH
30
31 -ASCIIDOC7=@ASCIIDOC7@
31 NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@
32 NO_OPENSSL=@NO_OPENSSL@
33 NO_CURL=@NO_CURL@
configure.ac
-7
@@ -437,21 +437,14 @@ if test -n "$ASCIIDOC"; then
437 AC_MSG_CHECKING([for asciidoc version])
438 asciidoc_version=`$ASCIIDOC --version 2>/dev/null`
439 case "${asciidoc_version}" in
440 - asciidoc' '7*)
441 - ASCIIDOC7=YesPlease
442 - AC_MSG_RESULT([${asciidoc_version} > 7])
443 - ;;
440 asciidoc' '8*)
445 - ASCIIDOC7=
441 AC_MSG_RESULT([${asciidoc_version}])
442 ;;
443 *)
449 - ASCIIDOC7=
444 AC_MSG_RESULT([${asciidoc_version} (unknown)])
445 ;;
446 esac
447 fi
454 -AC_SUBST(ASCIIDOC7)
448
449
450 ## Checks for libraries.