From 07052cf626b91492860e9bd59193f15ec039dbf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Thu, 23 Apr 2020 22:20:59 +0200
Subject: [PATCH] Factorize asciidoctor pararms and resolve litdd macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

litdd macro is meant to replace '\--' which would be interpreted as a
long hyphen instead of double-dash. One of those so-called
simplifications that make it difficult to predict the output of
asciidoc.

Signed-off-by: Jean-No챘l Avila <jn.avila@free.fr>
---
 makefile.locale | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/makefile.locale b/makefile.locale
index 3158566..1781954 100644
--- a/makefile.locale
+++ b/makefile.locale
@@ -44,16 +44,20 @@ ifndef V
 endif
 
 -include ../GIT-VERSION-FILE
+ASCIIDOC_EXTRA = -d manpage -I.. -I. -rasciidoctor-extensions
+ASCIIDOC_EXTRA += -amanmanual='Git Manual' \
+                  -amansource='Git $(GIT_VERSION)' \
+                  -amanversion=$(GIT_VERSION)
+ASCIIDOC_EXTRA += -alitdd='\--'
 
 $(HTML_FILTER): %.html: %.txt
-	$(QUIET_ASCIIDOC)asciidoctor -b xhtml5 -d manpage -d manpage -I.. -I. -rasciidoctor-extensions \
-        -amanversion=$(GIT_VERSION) -amanmanual='Git Manual' -amansource='Git  $(GIT_VERSION)' $<
+	$(QUIET_ASCIIDOC)asciidoctor -b xhtml5 \
+        $(ASCIIDOC_EXTRA) $<
 
 MANPAGES=$(patsubst %.txt,%.1,$(MAN_FILTER))
 $(MANPAGES): %.1: %.txt
-	$(QUIET_ASCIIDOC)asciidoctor -b manpage -d manpage -o $@ \
-        -I. -I.. -rasciidoctor-extensions \
-        -amanmanual='Git Manual' -amansource='Git $(GIT_VERSION)' $<
+	$(QUIET_ASCIIDOC)asciidoctor -b manpage -o $@ \
+        $(ASCIIDOC_EXTRA) $<
 
 man: $(MANPAGES)
 html: $(HTML_FILTER)
-- 
GitLab