01/02: refcard: Use the new 'texlive-fonts-lm' package.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 947d2398602d2858c75355b6ecd544120ad046bf
Author: Ludovic Courtès <address@hidden>
Date:   Mon Feb 11 11:51:17 2019 +0100

    refcard: Use the new 'texlive-fonts-lm' package.
    
    * doc/refcard/build.scm (texlive-latex-lm): Remove.
    (texlive-fonts-lm): New variable.
    (lout->pdf): Switch to TEXLIVE-FONTS-LM.
---
 doc/refcard/build.scm | 52 ++++-----------------------------------------------
 1 file changed, 4 insertions(+), 48 deletions(-)

diff --git a/doc/refcard/build.scm b/doc/refcard/build.scm
index 9cb3c56..0dfcead 100644
--- a/doc/refcard/build.scm
+++ b/doc/refcard/build.scm
@@ -1,7 +1,7 @@
 ;; Build file for the GNU Guix Reference Card.
 ;; Run "guix build -f build.scm".
 ;;
-;; Copyright © 2018 Ludovic Courtès <address@hidden>
+;; Copyright © 2018, 2019 Ludovic Courtès <address@hidden>
 ;; Released under the GNU GPLv3 or any later version.
 
 (use-modules (guix) (gnu)
@@ -14,54 +14,10 @@
 (define lout (specification->package "lout"))
 (define font-gentium (specification->package "font-sil-gentium"))
 (define font-charis (specification->package "font-sil-charis"))
+(define texlive-fonts-lm (specification->package "texlive-fonts-lm"))
 (define coreutils (specification->package "coreutils"))
 (define ttf2pt1 (specification->package "ttf2pt1"))
 
-(define-public texlive-latex-lm
-  ;; XXX: This package contains the Type1 fonts (pfa and afm files) built by
-  ;; upstream; it does *not* rebuild them from the METAPOST source, which is
-  ;; why we're not including it in Guix proper.
-  (package
-    (name "texlive-latex-lm")
-    (version "2.004")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    
"http://www.gust.org.pl/projects/e-foundry/latin-modern/download/lm";
-                    version "bas.zip"))
-              (sha256
-               (base32
-                "0z2s253y751m2ci5aw8nq0sf2kyg9hpimv2gyixkch9d07m2b9wp"))))
-    (build-system trivial-build-system)
-    (arguments
-     '(#:modules ((guix build utils))
-       #:builder (begin
-                   (use-modules (guix build utils))
-
-                   (let* ((source (assoc-ref %build-inputs "source"))
-                          (unzip  (assoc-ref %build-inputs "unzip"))
-                          (out    (assoc-ref %outputs "out"))
-                          (texmf  (string-append out "/share/texmf-dist")))
-                     (mkdir-p texmf)
-                     (with-directory-excursion texmf
-                       (invoke (string-append unzip "/bin/unzip") source))))))
-    (native-inputs
-     `(("unzip" ,(specification->package "unzip"))))
-    (home-page "http://www.gust.org.pl/projects/e-foundry/latin-modern/";)
-    (synopsis "Latin modern fonts in outline formats")
-    (description
-     "The Latin Modern family of fonts consists of 72 text fonts and 20
-mathematics fonts, and is based on the Computer Modern fonts released into
-public domain by AMS.  The @code{lm} font set contains a lot of additional
-characters, mainly accented ones, but not exclusively.  There is one set of
-fonts, available both in Adobe Type 1 format (*.pfb) and in OpenType
-format (@file{.otf}).  There are five sets of TeX Font Metric files,
-corresponding to: Cork encoding (@file{cork-*.tfm}); QX
-encoding (@file{qx-*.tfm}); TeX ANSI aka LY1 encoding (@file{texnansi-*.tfm});
-T5 (Vietnamese) encoding (@file{t5-*.tfm}); and Text Companion for EC fonts
-aka TS1 (@file{ts1-*.tfm}).")
-    (license license:gfl1.0)))
-
 (define (truetype->type1 fonts)
   "Return a directory containing Type 1 .afm and .pfa files for FONTS."
   (define build
@@ -113,7 +69,7 @@ PDF."
           (invoke #$(file-append lout "/bin/lout") "-a" "-r3"
                   "-I."
                   "-F" #$(file-append font-directory "/share/fonts/type1")
-                  "-F" #$(file-append texlive-latex-lm
+                  "-F" #$(file-append texlive-fonts-lm
                                       "/share/texmf-dist/fonts/afm/public/lm")
                   "-s" #$file "-o" ps-file)
 
@@ -121,7 +77,7 @@ PDF."
                                       "/bin:" 'suffix))
           (setenv "GS_FONTPATH"
                   (string-append #$font-directory "/share/fonts/type1:"
-                                 #$texlive-latex-lm
+                                 #$texlive-fonts-lm
                                  "/share/texmf-dist/fonts/type1/public/lm"))
           (invoke #$(file-append ghostscript "/bin/ps2pdf")
                   "-dPDFSETTINGS=/prepress" "-sPAPERSIZE=a4"