From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Sat, 9 Jan 2016 12:48:59 +0000 (+0900)
Subject: Issue 4733: Add settings for dblatex can use XeTeX backend
X-Git-Tag: release/2.19.36-1~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=99f0cff51b335b21de2d66070c48bde6987104ee;p=lilypond.git

Issue 4733: Add settings for dblatex can use XeTeX backend

dblatex uses pdfLaTeX engine for generating PDFs.
This commit ensures that it can be selected XeLaTeX
by the configure script.
---

diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index b27aa56e14..3dda429003 100644
--- a/make/lilypond-book-rules.make
+++ b/make/lilypond-book-rules.make
@@ -52,5 +52,5 @@ $(outdir)/%.xml:  %.lyxml
 # Add the xml => pdf rule only if we have dblatex
 ifeq (,$(findstring dblatex,$(MISSING_OPTIONAL)))
 $(outdir)/%.pdf:  $(outdir)/%.xml
-	cd $(outdir) && $(buildscript-dir)/run-and-check "$(DBLATEX) $(notdir $<)" "$*.dblatex.log"
+	cd $(outdir) && $(buildscript-dir)/run-and-check "$(DBLATEX) $(DBLATEX_BACKEND) $(notdir $<)" "$*.dblatex.log"
 endif
diff --git a/make/lilypond-book-vars.make b/make/lilypond-book-vars.make
index f41a0541ff..8d9955b6a4 100644
--- a/make/lilypond-book-vars.make
+++ b/make/lilypond-book-vars.make
@@ -40,6 +40,11 @@ OUT_DOCBOOK_FILES = ${DOCBOOK_FILES:%.lyxml=$(outdir)/%.pdf}
 else
 OUT_DOCBOOK_FILES = ${DOCBOOK_FILES:%.lyxml=$(outdir)/%.xml}
 endif
+ifeq ($(PDFLATEX),xelatex)
+DBLATEX_BACKEND = -b xetex
+else
+DBLATEX_BACKEND =
+endif
 
 OUT_FILES = $(sort $(OUT_HTML_FILES) \
                             $(OUT_HTMLY_FILES) \