From 9e08ea995a0353ae78470c344b68fcefa38b64b3 Mon Sep 17 00:00:00 2001
From: Felix Janda <felix.janda@posteo.de>
Date: Thu, 3 Sep 2020 12:44:43 -0400
Subject: [PATCH] docs: generate pdfs using dblatex

---
 Makefile.config.in |  4 ++--
 configure.ac       | 16 ++++++++--------
 doc/Makefile       | 10 +++++-----
 doc/README         |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index 679ff5d3c..0b3bbce5a 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -69,7 +69,7 @@ INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-JW = @JW@
+DBLATEX = @DBLATEX@
 LIBDIR = @LIBDIR@
 LIBDOM_CFLAGS = @LIBDOM_CFLAGS@
 LIBDOM_LIBS = @LIBDOM_LIBS@
@@ -139,7 +139,7 @@ CONFIG_HTML_HIGHLIGHT = @CONFIG_HTML_HIGHLIGHT@
 CONFIG_IDN = @CONFIG_IDN@
 CONFIG_INTERLINK = @CONFIG_INTERLINK@
 CONFIG_IPV6 = @CONFIG_IPV6@
-CONFIG_JW = @CONFIG_JW@
+CONFIG_DBLATEX = @CONFIG_DBLATEX@
 CONFIG_LEDS = @CONFIG_LEDS@
 CONFIG_LIBDOM = @CONFIG_LIBDOM@
 CONFIG_LZMA = @CONFIG_LZMA@
diff --git a/configure.ac b/configure.ac
index a8ed4aff6..30bc4c050 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ PKG_PROG_PKG_CONFIG
 CONFIG_ASCIIDOC="no"
 CONFIG_POD2HTML="no"
 CONFIG_XMLTO="no"
-CONFIG_JW="no"
+CONFIG_DBLATEX="no"
 
 if test "x$CONFIG_DOC" != xno; then
 	AC_PATH_PROGS(PYTHON3, "python3")
@@ -91,10 +91,10 @@ if test "x$CONFIG_DOC" != xno; then
 		EL_CONFIG(MAN_XMLTO, [man (groff)])
 	fi
 
-	AC_PATH_PROGS(JW, "jw")
-      	if test "x$JW" != "x"; then
-		EL_CONFIG(CONFIG_JW, [JadeWrapper])
-		EL_CONFIG(MANUAL_JW, [PDF])
+	AC_PATH_PROGS(DBLATEX, "dblatex")
+	if test "x$DBLATEX" != "x"; then
+		EL_CONFIG(CONFIG_DBLATEX, [dblatex])
+		EL_CONFIG(MANUAL_DBLATEX, [PDF])
 	fi
 
 	AC_PATH_PROGS(POD2HTML, "pod2html")
@@ -114,10 +114,10 @@ AC_SUBST(CONFIG_ASCIIDOC)
 AC_SUBST(CONFIG_DOXYGEN)
 AC_SUBST(CONFIG_POD2HTML)
 AC_SUBST(CONFIG_XMLTO)
-AC_SUBST(CONFIG_JW)
+AC_SUBST(CONFIG_DBLATEX)
 
-EL_CONFIG_DEPENDS(CONFIG_DOC, [CONFIG_ASCIIDOC CONFIG_XMLTO CONFIG_JW CONFIG_POD2HTML], [Documentation Tools])
-EL_CONFIG_DEPENDS(CONFIG_MANUAL, [MANUAL_ASCIIDOC MANUAL_XMLTO MANUAL_JW], [Manual Formats])
+EL_CONFIG_DEPENDS(CONFIG_DOC, [CONFIG_ASCIIDOC CONFIG_XMLTO CONFIG_DBLATEX CONFIG_POD2HTML], [Documentation Tools])
+EL_CONFIG_DEPENDS(CONFIG_MANUAL, [MANUAL_ASCIIDOC MANUAL_XMLTO MANUAL_DBLATEX], [Manual Formats])
 EL_CONFIG_DEPENDS(CONFIG_MANPAGE, [MAN_ASCIIDOC MAN_XMLTO], [Man Page Formats])
 EL_CONFIG_DEPENDS(CONFIG_APIDOCS, [CONFIG_DOXYGEN], [API Documentation])
 
diff --git a/doc/Makefile b/doc/Makefile
index f4f5418db..2698118f6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -54,8 +54,8 @@ MAN_DOCS-$(CONFIG_XMLTO) += \
  elinks.conf.5 \
  elinkskeys.5
 
-# Use jw for generating PDF, since xmlto seems to freak out.
-PDF_DOCS-$(CONFIG_JW) += \
+# Use dblatex for generating PDF
+PDF_DOCS-$(CONFIG_DBLATEX) += \
  manual.pdf
 
 API_DOCS-$(CONFIG_DOXYGEN) += \
@@ -146,8 +146,8 @@ option-%.frag.xhtml: $(ELINKS) $(HELP2XML)
 #############################################################################
 # Build commands and macros
 
-      quiet_cmd_jw = '       [$(LINK_COLOR)JW$(END_COLOR)]   $(RELPATH)$@'
-            cmd_jw = $(JW) -b $(2) $<
+      quiet_cmd_dblatex = '       [$(LINK_COLOR)DBLATEX$(END_COLOR)]   $(RELPATH)$@'
+            cmd_dblatex = $(DBLATEX) $<
 
    quiet_cmd_xmlto = '    [$(LINK_COLOR)XMLTO$(END_COLOR)]   $(RELPATH)$@'
          cmd_xmlto = $(XMLTO) -o $(call outdir) $(3) $(2) $<
@@ -203,7 +203,7 @@ elinks.conf.5.html: option-config.frag.xhtml
 	$(call cmd,xmlto,html)
 
 %.pdf: %.xml
-	$(call cmd,jw,pdf)
+	$(call cmd,dblatex)
 
 %.html: %.pod
 	$(call cmd,pod2html)
diff --git a/doc/README b/doc/README
index 64efce074..70a05926c 100644
--- a/doc/README
+++ b/doc/README
@@ -76,7 +76,7 @@ The following tools are used for generating documentation in various formats:
  - python: interpreter for asciidoc, which is the basic tool for
    lifting the .txt files to other formats.
  - xmlto: used for outputting chunked HTML and man pages. 
- - jw: used for pdf documents.
+ - dblatex: used for pdf documents.
  - pod2html: used for perl docs.
 
 All these tools are checked by configure, thus to successfully build all the
@@ -89,7 +89,7 @@ manual formats (with tool requirements listed):
 
  - HTML one-file (asciidoc)
  - HTML chunked / multiple files (asciidoc + xmlto)
- - PDF (asciidoc + jw)
+ - PDF (asciidoc + dblatex)
 
 and the following man page formats: