[PATCH] Add TeX Gyre fonts.

[PATCH] Add TeX Gyre fonts.

[Ricardo Wurmus]

[-- Attachment #1: Type: text/plain, Size: 524 bytes --]

Attached is a patch to add the TeX Gyre font collection in OTF format.
There is another archive available for download which includes a lot
more formats and documentation, but I think this flat zip file with the
OTF files is sufficient.

The fonts are released under the “GUST font license”, which is legally
equivalent to LPPL v1.3c as it just contains an optional request.

The TeX Gyre fonts are required by the latest version of Lilypond, so I
think it is useful to have them.  (Also: they are pretty.)

~~ Ricardo


[-- Attachment #2: 0001-guix-Add-GUST-font-license-1.0.patch --]
[-- Type: text/x-patch, Size: 1457 bytes --]

From a39b2f7bf132a64f3aca269d67266f74da7bc938 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 30 Aug 2015 19:40:17 +0200
Subject: [PATCH 1/2] guix: Add GUST font license 1.0.

* guix/licenses.scm (gfl1.0): New variable.
---
 guix/licenses.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/guix/licenses.scm b/guix/licenses.scm
index dae0e3d..0b8faf5 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2012, 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -38,6 +39,7 @@
             expat
             freetype
             gpl1 gpl1+ gpl2 gpl2+ gpl3 gpl3+
+            gfl1.0
             fdl1.3+
             opl1.0+
             isc
@@ -211,6 +213,11 @@ at URI, which may be a file:// URI pointing the package's tree."
            "https://www.gnu.org/licenses/gpl.html"
            "https://www.gnu.org/licenses/license-list#GNUGPLv3"))
 
+(define gfl1.0
+  (license "GUST font license 1.0"
+           "http://www.gust.org.pl/projects/e-foundry/licenses/GUST-FONT-LICENSE.txt"
+           "https://www.gnu.org/licenses/license-list#LPPL-1.3a"))
+
 (define fdl1.3+
   (license "FDL 1.3+"
            "https://www.gnu.org/licenses/fdl.html"
-- 
2.5.0


[-- Attachment #3: 0002-gnu-Add-TeX-Gyre-fonts.patch --]
[-- Type: text/x-patch, Size: 2460 bytes --]

From ff7bde10f0cfd01ae33b1b61c233ad6f97857a24 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 30 Aug 2015 19:52:55 +0200
Subject: [PATCH 2/2] gnu: Add TeX Gyre fonts.

* gnu/packages/fonts.scm (font-tex-gyre): New variable.
---
 gnu/packages/fonts.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 62d44ec..a1efa78 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
+;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -486,3 +487,40 @@ code-points needed for zh_cn, zh_sg, zh_tw, zh_hk, zh_mo, ja (Japanese) and
 ko (Korean) locales for fontconfig.")
     ;; GPLv2 with font embedding exception
     (license license:gpl2)))
+
+(define-public font-tex-gyre
+  (package
+    (name "font-tex-gyre")
+    (version "2.005")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.gust.org.pl/projects/e-foundry/"
+                           "tex-gyre/whole/tg-" version "otf.zip"))
+       (sha256
+        (base32
+         "0kph9l3g7jb2bpmxdbdg5zl56wacmnvdvsdn7is1gc750sqvsn31"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+
+         (let ((unzip     (string-append (assoc-ref %build-inputs "unzip")
+                                         "/bin/unzip"))
+               (font-dir (string-append %output "/share/fonts/opentype")))
+           (mkdir-p font-dir)
+           (system* unzip
+                    (assoc-ref %build-inputs "source")
+                    "-d" font-dir)))))
+    (native-inputs
+     `(("unzip" ,unzip)))
+    (home-page "http://www.gust.org.pl/projects/e-foundry/tex-gyre/")
+    (synopsis "Remake of Ghostscript fonts")
+    (description "The TeX Gyre collection of fonts is an extensive remake and
+extension of the freely available 35 base PostScript fonts distributed with
+Ghostscript version 4.00.  The collection contains the following fonts in the
+OpenType format: Adventor, Bonum, Chorus, Cursor, Heros, Pagella, Schola,
+Termes.")
+    (license license:gfl1.0)))
-- 
2.5.0

Re: [PATCH] Add TeX Gyre fonts.

[Ricardo Wurmus]

[-- Attachment #1: Type: text/plain, Size: 358 bytes --]


> Attached is a patch to add the TeX Gyre font collection in OTF format.
> There is another archive available for download which includes a lot
> more formats and documentation, but I think this flat zip file with the
> OTF files is sufficient.

The indentation in the second patch was wrong and the description
misleading, so here’s an updated version:


[-- Attachment #2: 0002-gnu-Add-TeX-Gyre-fonts.patch --]
[-- Type: text/x-patch, Size: 2469 bytes --]

From f00ce9715045a73a91814d41da665640ace820fc Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 30 Aug 2015 19:52:55 +0200
Subject: [PATCH 2/2] gnu: Add TeX Gyre fonts.

* gnu/packages/fonts.scm (font-tex-gyre): New variable.
---
 gnu/packages/fonts.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 62d44ec..a78995c 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
+;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -486,3 +487,40 @@ code-points needed for zh_cn, zh_sg, zh_tw, zh_hk, zh_mo, ja (Japanese) and
 ko (Korean) locales for fontconfig.")
     ;; GPLv2 with font embedding exception
     (license license:gpl2)))
+
+(define-public font-tex-gyre
+  (package
+    (name "font-tex-gyre")
+    (version "2.005")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.gust.org.pl/projects/e-foundry/"
+                           "tex-gyre/whole/tg-" version "otf.zip"))
+       (sha256
+        (base32
+         "0kph9l3g7jb2bpmxdbdg5zl56wacmnvdvsdn7is1gc750sqvsn31"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+
+         (let ((unzip    (string-append (assoc-ref %build-inputs "unzip")
+                                        "/bin/unzip"))
+               (font-dir (string-append %output "/share/fonts/opentype")))
+           (mkdir-p font-dir)
+           (system* unzip
+                    (assoc-ref %build-inputs "source")
+                    "-d" font-dir)))))
+    (native-inputs
+     `(("unzip" ,unzip)))
+    (home-page "http://www.gust.org.pl/projects/e-foundry/tex-gyre/")
+    (synopsis "Remake of Ghostscript fonts")
+    (description "The TeX Gyre collection of fonts is the result of an
+extensive remake and extension of the freely available base PostScript fonts
+distributed with Ghostscript version 4.00.  The collection contains the
+following fonts in the OpenType format: Adventor, Bonum, Chorus, Cursor,
+Heros, Pagella, Schola, Termes.")
+    (license license:gfl1.0)))
-- 
2.5.0

Re: [PATCH] Add TeX Gyre fonts.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> Attached is a patch to add the TeX Gyre font collection in OTF format.
> There is another archive available for download which includes a lot
> more formats and documentation, but I think this flat zip file with the
> OTF files is sufficient.
>
> The fonts are released under the “GUST font license”, which is legally
> equivalent to LPPL v1.3c as it just contains an optional request.
>
> The TeX Gyre fonts are required by the latest version of Lilypond, so I
> think it is useful to have them.  (Also: they are pretty.)

OK.

> From a39b2f7bf132a64f3aca269d67266f74da7bc938 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Sun, 30 Aug 2015 19:40:17 +0200
> Subject: [PATCH 1/2] guix: Add GUST font license 1.0.
>
> * guix/licenses.scm (gfl1.0): New variable.

[...]

> +(define gfl1.0
> +  (license "GUST font license 1.0"

Could you add what you wrote above about it being equivalent to the LPPL
as a comment?

Otherwise OK.

Ludo’.

Re: [PATCH] Add TeX Gyre fonts.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> From f00ce9715045a73a91814d41da665640ace820fc Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Sun, 30 Aug 2015 19:52:55 +0200
> Subject: [PATCH 2/2] gnu: Add TeX Gyre fonts.
>
> * gnu/packages/fonts.scm (font-tex-gyre): New variable.

LGTM, thanks!

Ludo'.