10/44: gnu: texlive-latex-base: Fix xetex and xelatex formats.

[Ricardo Wurmus]

rekado pushed a commit to branch master
in repository guix.

commit 702f23b3b85cd8a6aa11d3ebe1ad032faca3954b
Author: Ricardo Wurmus <address@hidden>
Date:   Sun Jul 9 11:29:17 2017 +0200

    gnu: texlive-latex-base: Fix xetex and xelatex formats.
    
    * gnu/packages/tex.scm (texlive-latex-base)[arguments]: Build xetex and
    xelatex formats with matching interpreters.
---
 gnu/packages/tex.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f4b6596..e0584eb 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -743,25 +743,28 @@ book).")
                     ;; leading asterisk).  We should not use luatex here,
                     ;; because that would make the generated format files
                     ;; incompatible with any other TeX engine.
-
-                    ;; FIXME: XeTeX fails to build because neither
-                    ;; \XeTeXuseglyphmetrics nor \XeTeXdashbreakstate are
-                    ;; defined.
                     (every
                      (lambda (format)
                        (zero? (system* "latex" "-ini" "-interaction=batchmode"
                                        "-output-directory=web2c"
                                        "-translate-file=cp227.tcx"
                                        (string-append "*" format ".ini"))))
-                     '("latex" ;"xetex"
+                     '("latex"
                        "pdflatex"
                        "pdfetex"))
                     (every
                      (lambda (format)
+                       (zero? (system* format "-ini" "-interaction=batchmode"
+                                       "-output-directory=web2c"
+                                       (string-append "*" format ".ini"))))
+                     '("xetex"
+                       "xelatex"))
+                    (every
+                     (lambda (format)
                        (zero? (system* "luatex" "-ini" "-interaction=batchmode"
                                        "-output-directory=web2c"
                                        (string-append format ".ini"))))
-                     '("dviluatex" "dvilualatex" "luatex" "lualatex" 
"xelatex")))))
+                     '("dviluatex" "dvilualatex" "luatex" "lualatex")))))
            (replace 'install
              (lambda* (#:key outputs #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))