all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#53131] [PATCH 0/4] Update Fira fonts.
@ 2022-01-08 23:44 Philip McGrath
  2022-01-08 23:47 ` [bug#53131] [PATCH 1/4] gnu: font-fira-sans: Update to 4.203 Philip McGrath
  2022-01-13 22:03 ` bug#53131: [PATCH 0/4] Update Fira fonts Ludovic Courtès
  0 siblings, 2 replies; 6+ messages in thread
From: Philip McGrath @ 2022-01-08 23:44 UTC (permalink / raw)
  To: 53131; +Cc: Philip McGrath

These patches update 'font-fira-sans', adjust the definition of
'font-fira-mono' to inherit from 'font-fira-sans', and update
'font-fira-code'.

The final patch adds a note to 'font-fira-go' to explain that it does not have
corresponding source code: that patch is last, in case the FSDG require that
'font-fira-go' be removed, instead.

 -Philip

Philip McGrath (4):
  gnu: font-fira-sans: Update to 4.203.
  gnu: font-fira-mono: Inherit from font-fira-sans.
  gnu: font-fira-code: Update to 6.2.
  gnu: font-fira-go: Note lack of corresponding source.

 gnu/packages/fonts.scm | 120 +++++++++++++++++++++++++++++------------
 1 file changed, 86 insertions(+), 34 deletions(-)

-- 
2.32.0





^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#53131] [PATCH 1/4] gnu: font-fira-sans: Update to 4.203.
  2022-01-08 23:44 [bug#53131] [PATCH 0/4] Update Fira fonts Philip McGrath
@ 2022-01-08 23:47 ` Philip McGrath
  2022-01-08 23:47   ` [bug#53131] [PATCH 2/4] gnu: font-fira-mono: Inherit from font-fira-sans Philip McGrath
                     ` (2 more replies)
  2022-01-13 22:03 ` bug#53131: [PATCH 0/4] Update Fira fonts Ludovic Courtès
  1 sibling, 3 replies; 6+ messages in thread
From: Philip McGrath @ 2022-01-08 23:47 UTC (permalink / raw)
  To: 53131; +Cc: Philip McGrath

This is the final version to include corresponding UFO sources.

* gnu/packages/fonts.scm (font-fira-sans): Update to 4.203.
[source]: Move to new upstream repository.
[arguments]: Change to the right variant directory.
[synopsis, description]: Rewrite, since Firefox OS was discontinued.
---
 gnu/packages/fonts.scm | 87 +++++++++++++++++++++++++++++++++---------
 1 file changed, 68 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index df1446380f..dc385b08c4 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -42,6 +42,7 @@
 ;;; Copyright © 2021 Sergiu Ivanov <sivanov@colimite.fr>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
 ;;; Copyright © 2021 Paul A. Patience <paul@apatience.com>
+;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1039,6 +1040,73 @@ (define-public font-adobe-source-serif-pro
 Sans Pro family.")
     (license license:silofl1.1)))
 
+(define-public font-fira-sans
+  ;; Fira Sans v4.203 (which corresponds to Fira Mono v3.206) is the final
+  ;; version to include UFO sources. It is the same version packaged by other
+  ;; notable distributors, including Google Fonts. Note that the "reserved
+  ;; font name" was removed by the copyright holders.
+  ;;
+  ;; The upstream release includes a "Fira Code" which "is Fira Mono 3.206
+  ;; with less Line Space (1.0) – does not include programming ligatures". We
+  ;; do not package that: our 'font-fira-code' package (like e.g. Debian's
+  ;; "fonts-firacode") is the much better known Fira Code font by Nikita
+  ;; Prokopov, which is an older, independent adaptation of Fira Mono. For the
+  ;; historical relationship between them, see:
+  ;; https://github.com/mozilla/Fira/issues/218
+  ;;
+  ;; For a lengthy discussion of the available sources and versions,
+  ;; see: https://github.com/LiberalArtist/FiraSans/
+  ;;
+  ;; See also:
+  ;;   - https://github.com/mozilla/Fira/pull/219
+  ;;   - https://github.com/bBoxType/FiraSans/issues/4#issuecomment-695833327
+  (package
+    (name "font-fira-sans")
+    (version "4.203")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/bBoxType/FiraSans")
+                     (commit "a606927401bcc3951587339fee53aa882856b51b")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1r9kb7v9jg83nnxwkl6gx9ix1rng3ksr7v33qrm46qb4fhwsyc2n"))))
+    (build-system font-build-system)
+    (arguments
+     `(#:modules
+       ((ice-9 match)
+        (ice-9 regex)
+        (guix build utils)
+        (guix build font-build-system))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'chdir
+           (lambda* (#:key outputs #:allow-other-keys)
+             (define-values (pkg-name _version)
+               (package-name->name+version
+                (strip-store-file-name (assoc-ref outputs "out"))))
+             (define variant
+               (string-capitalize
+                (match:substring (string-match "fira-([a-z]+)" pkg-name) 1)))
+             (match (find-files "." (format #f "^Fira_~a_[0-9]" variant)
+                                #:directories? #t)
+               ((dir)
+                (chdir dir))))))))
+    ;; While the repository has moved,
+    ;; this specimen still works well as the home-page:
+    (home-page "https://mozilla.github.io/Fira/")
+    (synopsis
+     "Humanist sans-serif with numerous weights emphasizing legibility")
+    (description "Fira Sans is a humanist sans-serif typeface with an emphasis
+on legibility, commissioned by Mozilla from Erik Spiekermann and Ralph du
+Carrois.  The large family includes 2,709 glyphs in normal, condensed, and
+compressed cuts at 11 weights (plus 6 experimental weights), each with
+corresponding italics.
+
+The package @code{font-fira-mono} provides a corresponding monospace cut.")
+    (license license:silofl1.1)))
+
 (define-public font-fira-mono
   (package
     (name "font-fira-mono")
@@ -1058,25 +1126,6 @@ (define-public font-fira-mono
     (description "This is the typeface used by Mozilla in Firefox OS.")
     (license license:silofl1.1)))
 
-(define-public font-fira-sans
-  (package
-    (name "font-fira-sans")
-    (version "4.202")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/mozilla/Fira")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "116j26gdj5g1r124b4669372f7490vfjqw7apiwp2ggl0am5xd0w"))))
-    (build-system font-build-system)
-    (home-page "https://mozilla.github.io/Fira/")
-    (synopsis "Mozilla's Fira Sans Font")
-    (description "This is the typeface used by Mozilla in Firefox OS.")
-    (license license:silofl1.1)))
-
 (define-public font-fira-go
   (package
     (name "font-fira-go")
-- 
2.32.0





^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#53131] [PATCH 2/4] gnu: font-fira-mono: Inherit from font-fira-sans.
  2022-01-08 23:47 ` [bug#53131] [PATCH 1/4] gnu: font-fira-sans: Update to 4.203 Philip McGrath
@ 2022-01-08 23:47   ` Philip McGrath
  2022-01-08 23:47   ` [bug#53131] [PATCH 3/4] gnu: font-fira-code: Update to 6.2 Philip McGrath
  2022-01-08 23:47   ` [bug#53131] [PATCH 4/4] gnu: font-fira-go: Note lack of corresponding source Philip McGrath
  2 siblings, 0 replies; 6+ messages in thread
From: Philip McGrath @ 2022-01-08 23:47 UTC (permalink / raw)
  To: 53131; +Cc: Philip McGrath

* gnu/packages/fonts.scm (font-fira-mono)[source, build-system,
home-page]: Inherit from font-fira-sans.
[synopsis, description]: Rewrite, since Firefox OS was discontinued.
---
 gnu/packages/fonts.scm | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index dc385b08c4..b1b20d7163 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1109,21 +1109,13 @@ (define variant
 
 (define-public font-fira-mono
   (package
+    (inherit font-fira-sans)
     (name "font-fira-mono")
     (version "3.206")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://carrois.com/downloads/fira_mono_3_2/"
-                                  "FiraMonoFonts"
-                                  (string-replace-substring version "." "")
-                                  ".zip"))
-              (sha256
-               (base32
-                "1z65x0dw5dq6rs6p9wyfrir50rlh95vgzsxr8jcd40nqazw4jhpi"))))
-    (build-system font-build-system)
-    (home-page "https://mozilla.github.io/Fira/")
-    (synopsis "Mozilla's monospace font")
-    (description "This is the typeface used by Mozilla in Firefox OS.")
+    (synopsis "Monospace cut of Fira Sans")
+    (description
+     "Fira Mono is a monospace cut of Fira Sans (see @code{font-fira-sans}).
+It includes regular, medium, and bold weights.")
     (license license:silofl1.1)))
 
 (define-public font-fira-go
-- 
2.32.0





^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#53131] [PATCH 3/4] gnu: font-fira-code: Update to 6.2.
  2022-01-08 23:47 ` [bug#53131] [PATCH 1/4] gnu: font-fira-sans: Update to 4.203 Philip McGrath
  2022-01-08 23:47   ` [bug#53131] [PATCH 2/4] gnu: font-fira-mono: Inherit from font-fira-sans Philip McGrath
@ 2022-01-08 23:47   ` Philip McGrath
  2022-01-08 23:47   ` [bug#53131] [PATCH 4/4] gnu: font-fira-go: Note lack of corresponding source Philip McGrath
  2 siblings, 0 replies; 6+ messages in thread
From: Philip McGrath @ 2022-01-08 23:47 UTC (permalink / raw)
  To: 53131; +Cc: Philip McGrath

* gnu/packages/fonts.scm (font-fira-code): Update to 6.2.
[home-page]: Change. This font was never affiliated with Mozilla.
[description]: Tweak. Fix formatting.
---
 gnu/packages/fonts.scm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index b1b20d7163..41caa4d5ee 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1142,24 +1142,29 @@ (define-public font-fira-go
 (define-public font-fira-code
   (package
     (name "font-fira-code")
-    (version "5.2")
+    (version "6.2")
     (source
      (origin
+       ;; changing to git-fetch would require building from source
        (method url-fetch/zipbomb)
        (uri (string-append "https://github.com/tonsky/FiraCode/releases/"
                            "download/" version
                            "/Fira_Code_v" version ".zip"))
        (sha256
-        (base32 "1zayrb6k0gd7xdvx7yx44dpip767q0bzhqwf4j6nf8nx02z746jj"))))
+        (base32 "0y9y7snyrr30z75kxz2zgh6q6hizcbzsf41xv6gxh97bm1dr2j89"))))
     (build-system font-build-system)
-    (home-page "https://mozilla.github.io/Fira/")
+    ;; This font began as an independent derived work of Fira Mono.
+    ;; It was never affiliated with Mozilla.
+    ;; See comments on font-fira-sans for further discussion.
+    (home-page "https://github.com/tonsky/FiraCode")
     (synopsis "Monospaced font with programming ligatures")
     (description
-     "Fira Code is an extension of the Fira Mono font containing a set of ligatures
-for common programming multi-character combinations.  This is just a font rendering
-feature: underlying code remains ASCII-compatible.  This helps to read and understand
-code faster.  For some frequent sequences like .. or //, ligatures allow us to
-correct spacing.")
+     "Fira Code is a monospace font by Nikita Prokopov featuring ligatures for
+common programming multi-character combinations.  It began as an extension of
+Fira Mono.  The ligatures are just a font rendering feature: underlying code
+remains ASCII-compatible.  They are designed to help people to read and
+understand code faster.  For some frequent sequences like @code{..} or
+@code{//}, ligatures are used to simulate proportional spacing.")
     (license license:silofl1.1)))
 
 (define-public font-awesome
-- 
2.32.0





^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#53131] [PATCH 4/4] gnu: font-fira-go: Note lack of corresponding source.
  2022-01-08 23:47 ` [bug#53131] [PATCH 1/4] gnu: font-fira-sans: Update to 4.203 Philip McGrath
  2022-01-08 23:47   ` [bug#53131] [PATCH 2/4] gnu: font-fira-mono: Inherit from font-fira-sans Philip McGrath
  2022-01-08 23:47   ` [bug#53131] [PATCH 3/4] gnu: font-fira-code: Update to 6.2 Philip McGrath
@ 2022-01-08 23:47   ` Philip McGrath
  2 siblings, 0 replies; 6+ messages in thread
From: Philip McGrath @ 2022-01-08 23:47 UTC (permalink / raw)
  To: 53131; +Cc: Philip McGrath

* gnu/packages/fonts.scm (font-fira-go)[description]: Note lack of
corresponding source.
---
 gnu/packages/fonts.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 41caa4d5ee..b37408f653 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1136,7 +1136,13 @@ (define-public font-fira-go
     (synopsis "Multilingual extension of the Fira Sans font family")
     (description "FiraGO is a multilingual extension of the Fira Sans font
 family.  Based on the Fira Sans 4.3 glyph set, FiraGO adds support for the
-Arabic, Devanagari, Georgian, Hebrew and Thai scripts.")
+Arabic, Devanagari, Georgian, Hebrew and Thai scripts.
+
+Note that FiraGO does not include corresponding source.")
+    ;; See:
+    ;;   - https://github.com/bBoxType/FiraGO/issues/42
+    ;;   - https://github.com/bBoxType/FiraSans/issues/4#issuecomment-699882058
+    ;; For further discussion, see comments on font-fira-sans.
     (license license:silofl1.1)))
 
 (define-public font-fira-code
-- 
2.32.0





^ permalink raw reply	[flat|nested] 6+ messages in thread

* bug#53131: [PATCH 0/4] Update Fira fonts.
  2022-01-08 23:44 [bug#53131] [PATCH 0/4] Update Fira fonts Philip McGrath
  2022-01-08 23:47 ` [bug#53131] [PATCH 1/4] gnu: font-fira-sans: Update to 4.203 Philip McGrath
@ 2022-01-13 22:03 ` Ludovic Courtès
  1 sibling, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2022-01-13 22:03 UTC (permalink / raw)
  To: Philip McGrath; +Cc: 53131-done

Hi,

Philip McGrath <philip@philipmcgrath.com> skribis:

> These patches update 'font-fira-sans', adjust the definition of
> 'font-fira-mono' to inherit from 'font-fira-sans', and update
> 'font-fira-code'.

Nice.

> The final patch adds a note to 'font-fira-go' to explain that it does not have
> corresponding source code: that patch is last, in case the FSDG require that
> 'font-fira-go' be removed, instead.

I believe that is fine (there are other font packages that lack
“source”).

>   gnu: font-fira-sans: Update to 4.203.
>   gnu: font-fira-mono: Inherit from font-fira-sans.
>   gnu: font-fira-code: Update to 6.2.
>   gnu: font-fira-go: Note lack of corresponding source.

Applied, thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-01-13 22:05 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-08 23:44 [bug#53131] [PATCH 0/4] Update Fira fonts Philip McGrath
2022-01-08 23:47 ` [bug#53131] [PATCH 1/4] gnu: font-fira-sans: Update to 4.203 Philip McGrath
2022-01-08 23:47   ` [bug#53131] [PATCH 2/4] gnu: font-fira-mono: Inherit from font-fira-sans Philip McGrath
2022-01-08 23:47   ` [bug#53131] [PATCH 3/4] gnu: font-fira-code: Update to 6.2 Philip McGrath
2022-01-08 23:47   ` [bug#53131] [PATCH 4/4] gnu: font-fira-go: Note lack of corresponding source Philip McGrath
2022-01-13 22:03 ` bug#53131: [PATCH 0/4] Update Fira fonts Ludovic Courtès

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.