From 30bbf8c533ec8696d7d50fee0f190d880cf416d8 Mon Sep 17 00:00:00 2001
From: Louis <spalax@gresille.org>
Date: Wed, 28 Oct 2015 21:35:02 +0100
Subject: [PATCH] First draft for pdflatex replacement by lualatex

---
 patacrep/build.py                         | 16 ++++++++--------
 patacrep/data/latex/patacrep.sty          |  5 +++++
 patacrep/data/templates/layout.tex        |  2 --
 test/test_compilation/subdir.tex.control  |  2 --
 test/test_compilation/unicode.tex.control |  5 +----
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/patacrep/build.py b/patacrep/build.py
index 40ef74ff..00be667e 100644
--- a/patacrep/build.py
+++ b/patacrep/build.py
@@ -136,10 +136,10 @@ class SongbookBuilder(object):
 
     # if False, do not expect anything from stdin.
     interactive = False
-    # if True, allow unsafe option, like adding the --shell-escape to pdflatex
+    # if True, allow unsafe option, like adding the --shell-escape to lualatex
     unsafe = False
-    # Options to add to pdflatex
-    _pdflatex_options = []
+    # Options to add to lualatex
+    _lualatex_options = []
     # Dictionary of functions that have been called by self._run_once(). Keys
     # are function; values are return values of functions.
     _called_functions = {}
@@ -165,11 +165,11 @@ class SongbookBuilder(object):
     def _set_latex(self):
         """Set LaTeX options."""
         if self.unsafe:
-            self._pdflatex_options.append("--shell-escape")
+            self._lualatex_options.append("--shell-escape")
         if not self.interactive:
-            self._pdflatex_options.append("-halt-on-error")
+            self._lualatex_options.append("-halt-on-error")
         for datadir in self.songbook.config["datadir"]:
-            self._pdflatex_options.append(
+            self._lualatex_options.append(
                 '--include-directory="{}"'.format(datadir)
                 )
 
@@ -180,7 +180,7 @@ class SongbookBuilder(object):
         - steps: list of steps to perform to compile songbook. Available steps
           are:
           - tex: build .tex file from templates;
-          - pdf: compile .tex using pdflatex;
+          - pdf: compile .tex using lualatex;
           - sbx: compile song and author indexes;
           - clean: remove temporary files,
           - any string beginning with a sharp sign (#): it is interpreted as a
@@ -219,7 +219,7 @@ class SongbookBuilder(object):
 
         try:
             process = Popen(
-                ["pdflatex"] + self._pdflatex_options + [self.basename],
+                ["lualatex"] + self._lualatex_options + [self.basename],
                 stdin=PIPE,
                 stdout=PIPE,
                 stderr=PIPE,
diff --git a/patacrep/data/latex/patacrep.sty b/patacrep/data/latex/patacrep.sty
index f3218005..d3735739 100644
--- a/patacrep/data/latex/patacrep.sty
+++ b/patacrep/data/latex/patacrep.sty
@@ -75,6 +75,11 @@
 \pdfobjcompresslevel=0
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Unicode characters
+\RequirePackage{fontspec}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Multilanguage management
 
diff --git a/patacrep/data/templates/layout.tex b/patacrep/data/templates/layout.tex
index ae23d681..099772a4 100644
--- a/patacrep/data/templates/layout.tex
+++ b/patacrep/data/templates/layout.tex
@@ -41,8 +41,6 @@
 (* endblock *)
 
 (* block songbookpreambule *)
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
 \usepackage{lmodern}
 (* endblock songbookpreambule *)
 
diff --git a/test/test_compilation/subdir.tex.control b/test/test_compilation/subdir.tex.control
index bd9ac649..87ae4e77 100644
--- a/test/test_compilation/subdir.tex.control
+++ b/test/test_compilation/subdir.tex.control
@@ -29,8 +29,6 @@ pictures,
 guitar,
     ]{patacrep}
 
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
 \usepackage{lmodern}
 
 
diff --git a/test/test_compilation/unicode.tex.control b/test/test_compilation/unicode.tex.control
index cd402cdb..41ecff30 100644
--- a/test/test_compilation/unicode.tex.control
+++ b/test/test_compilation/unicode.tex.control
@@ -29,8 +29,6 @@ pictures,
 guitar,
     ]{patacrep}
 
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
 \usepackage{lmodern}
 
 
@@ -54,7 +52,6 @@ guitar,
    \newcommand{\href}[2]{\expandafter\url\expandafter{#1}}
 }
 \makeatother
-\DeclareUnicodeCharacter{00A0}{~}
 
 
 \usepackage{chords}
@@ -114,4 +111,4 @@ guitar,
 
 
 
-\end{document}
\ No newline at end of file
+\end{document}