From 34e30e0f39a5e084cca15e5da261345812b7402e Mon Sep 17 00:00:00 2001 From: James Ravn Date: Fri, 8 Nov 2019 10:43:32 +0000 Subject: [PATCH 1/8] Add +pretty-code/install-iosevka-font --- modules/ui/pretty-code/+iosevka.el | 51 ++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/modules/ui/pretty-code/+iosevka.el b/modules/ui/pretty-code/+iosevka.el index 315dbd754..734eb7950 100644 --- a/modules/ui/pretty-code/+iosevka.el +++ b/modules/ui/pretty-code/+iosevka.el @@ -230,3 +230,54 @@ +pretty-code-iosevka-font-ligatures))) (add-hook 'doom-init-ui-hook #'+pretty-code-setup-iosevka-ligatures-h) + +(defvar +pretty-code--iosevka-font-names + '( + "iosevka-custom-lightoblique.ttf" + "iosevka-custom-thinoblique.ttf" + "iosevka-custom-mediumitalic.ttf" + "iosevka-custom-light.ttf" + "iosevka-custom-heavy.ttf" + "iosevka-custom-bolditalic.ttf" + "iosevka-custom-bold.ttf" + "iosevka-custom-lightitalic.ttf" + "iosevka-custom-thin.ttf" + "iosevka-custom-extralight.ttf" + "iosevka-custom-oblique.ttf" + "iosevka-custom-italic.ttf" + "iosevka-custom-heavyoblique.ttf" + "iosevka-custom-heavyitalic.ttf" + "iosevka-custom-extralightitalic.ttf" + "iosevka-custom-thinitalic.ttf" + "iosevka-custom-medium.ttf" + "iosevka-custom-mediumoblique.ttf" + "iosevka-custom-extralightoblique.ttf" + "iosevka-custom-boldoblique.ttf" + "iosevka-custom-regular.ttf")) + +(defun +pretty-code/install-iosevka-font (&optional pfx) + "Helper function to download and install Iosevka font based on OS. +When PFX is non-nil, ignore the prompt and just install" + (interactive "P") + (when (or pfx (yes-or-no-p "This will download and install the Iosevka fonts, are you sure you want to do this?")) + (let* ((url-format "https://github.com/jsravn/iosevka-emacs/raw/master/%s") + (font-dest (cl-case window-system + (x (concat (or (getenv "XDG_DATA_HOME") ;; Default Linux install directories + (concat (getenv "HOME") "/.local/share")) + "/fonts/")) + (mac (concat (getenv "HOME") "/Library/Fonts/" )) + (ns (concat (getenv "HOME") "/Library/Fonts/" )))) ;; Default MacOS install directory + (known-dest? (stringp font-dest)) + (font-dest (or font-dest (read-directory-name "Font installation directory: " "~/")))) + + (unless (file-directory-p font-dest) (mkdir font-dest t)) + + (dolist (font +pretty-code--iosevka-font-names) + (url-copy-file (format url-format font) (expand-file-name font font-dest) t)) + + (when known-dest? + (message "Font downloaded, updating font cache... ") + (shell-command-to-string (format "fc-cache -f -v"))) + (message "Successfully %s `Iosevka' fonts to `%s'!" + (if known-dest? "installed" "downloaded") + font-dest)))) From 2e15387999f8a33ac7906030a1759042bb327f43 Mon Sep 17 00:00:00 2001 From: James Ravn Date: Tue, 25 Feb 2020 19:55:33 +0000 Subject: [PATCH 2/8] Move iosevka changes into pretty-code/autoload --- modules/ui/pretty-code/+iosevka.el | 51 ------------------ modules/ui/pretty-code/autoload/iosevka.el | 52 +++++++++++++++++++ .../{autoload.el => autoload/pretty-code.el} | 2 +- 3 files changed, 53 insertions(+), 52 deletions(-) create mode 100644 modules/ui/pretty-code/autoload/iosevka.el rename modules/ui/pretty-code/{autoload.el => autoload/pretty-code.el} (96%) diff --git a/modules/ui/pretty-code/+iosevka.el b/modules/ui/pretty-code/+iosevka.el index 734eb7950..315dbd754 100644 --- a/modules/ui/pretty-code/+iosevka.el +++ b/modules/ui/pretty-code/+iosevka.el @@ -230,54 +230,3 @@ +pretty-code-iosevka-font-ligatures))) (add-hook 'doom-init-ui-hook #'+pretty-code-setup-iosevka-ligatures-h) - -(defvar +pretty-code--iosevka-font-names - '( - "iosevka-custom-lightoblique.ttf" - "iosevka-custom-thinoblique.ttf" - "iosevka-custom-mediumitalic.ttf" - "iosevka-custom-light.ttf" - "iosevka-custom-heavy.ttf" - "iosevka-custom-bolditalic.ttf" - "iosevka-custom-bold.ttf" - "iosevka-custom-lightitalic.ttf" - "iosevka-custom-thin.ttf" - "iosevka-custom-extralight.ttf" - "iosevka-custom-oblique.ttf" - "iosevka-custom-italic.ttf" - "iosevka-custom-heavyoblique.ttf" - "iosevka-custom-heavyitalic.ttf" - "iosevka-custom-extralightitalic.ttf" - "iosevka-custom-thinitalic.ttf" - "iosevka-custom-medium.ttf" - "iosevka-custom-mediumoblique.ttf" - "iosevka-custom-extralightoblique.ttf" - "iosevka-custom-boldoblique.ttf" - "iosevka-custom-regular.ttf")) - -(defun +pretty-code/install-iosevka-font (&optional pfx) - "Helper function to download and install Iosevka font based on OS. -When PFX is non-nil, ignore the prompt and just install" - (interactive "P") - (when (or pfx (yes-or-no-p "This will download and install the Iosevka fonts, are you sure you want to do this?")) - (let* ((url-format "https://github.com/jsravn/iosevka-emacs/raw/master/%s") - (font-dest (cl-case window-system - (x (concat (or (getenv "XDG_DATA_HOME") ;; Default Linux install directories - (concat (getenv "HOME") "/.local/share")) - "/fonts/")) - (mac (concat (getenv "HOME") "/Library/Fonts/" )) - (ns (concat (getenv "HOME") "/Library/Fonts/" )))) ;; Default MacOS install directory - (known-dest? (stringp font-dest)) - (font-dest (or font-dest (read-directory-name "Font installation directory: " "~/")))) - - (unless (file-directory-p font-dest) (mkdir font-dest t)) - - (dolist (font +pretty-code--iosevka-font-names) - (url-copy-file (format url-format font) (expand-file-name font font-dest) t)) - - (when known-dest? - (message "Font downloaded, updating font cache... ") - (shell-command-to-string (format "fc-cache -f -v"))) - (message "Successfully %s `Iosevka' fonts to `%s'!" - (if known-dest? "installed" "downloaded") - font-dest)))) diff --git a/modules/ui/pretty-code/autoload/iosevka.el b/modules/ui/pretty-code/autoload/iosevka.el new file mode 100644 index 000000000..e68bf82df --- /dev/null +++ b/modules/ui/pretty-code/autoload/iosevka.el @@ -0,0 +1,52 @@ +;;; ui/pretty-code/autoload/iosevka.el -*- lexical-binding: t; -*- + +(defvar +pretty-code--iosevka-font-names + '( + "iosevka-custom-lightoblique.ttf" + "iosevka-custom-thinoblique.ttf" + "iosevka-custom-mediumitalic.ttf" + "iosevka-custom-light.ttf" + "iosevka-custom-heavy.ttf" + "iosevka-custom-bolditalic.ttf" + "iosevka-custom-bold.ttf" + "iosevka-custom-lightitalic.ttf" + "iosevka-custom-thin.ttf" + "iosevka-custom-extralight.ttf" + "iosevka-custom-oblique.ttf" + "iosevka-custom-italic.ttf" + "iosevka-custom-heavyoblique.ttf" + "iosevka-custom-heavyitalic.ttf" + "iosevka-custom-extralightitalic.ttf" + "iosevka-custom-thinitalic.ttf" + "iosevka-custom-medium.ttf" + "iosevka-custom-mediumoblique.ttf" + "iosevka-custom-extralightoblique.ttf" + "iosevka-custom-boldoblique.ttf" + "iosevka-custom-regular.ttf")) + +(defun +pretty-code/install-iosevka-font (&optional pfx) + "Helper function to download and install Iosevka font based on OS. +When PFX is non-nil, ignore the prompt and just install" + (interactive "P") + (when (or pfx (yes-or-no-p "This will download and install the Iosevka fonts, are you sure you want to do this?")) + (let* ((url-format "https://github.com/jsravn/iosevka-emacs/raw/master/%s") + (font-dest (cl-case window-system + (x (concat (or (getenv "XDG_DATA_HOME") ;; Default Linux install directories + (concat (getenv "HOME") "/.local/share")) + "/fonts/")) + (mac (concat (getenv "HOME") "/Library/Fonts/" )) + (ns (concat (getenv "HOME") "/Library/Fonts/" )))) ;; Default MacOS install directory + (known-dest? (stringp font-dest)) + (font-dest (or font-dest (read-directory-name "Font installation directory: " "~/")))) + + (unless (file-directory-p font-dest) (mkdir font-dest t)) + + (dolist (font +pretty-code--iosevka-font-names) + (url-copy-file (format url-format font) (expand-file-name font font-dest) t)) + + (when known-dest? + (message "Font downloaded, updating font cache... ") + (shell-command-to-string (format "fc-cache -f -v"))) + (message "Successfully %s `Iosevka' fonts to `%s'!" + (if known-dest? "installed" "downloaded") + font-dest)))) diff --git a/modules/ui/pretty-code/autoload.el b/modules/ui/pretty-code/autoload/pretty-code.el similarity index 96% rename from modules/ui/pretty-code/autoload.el rename to modules/ui/pretty-code/autoload/pretty-code.el index ee0942ea9..bdd3ce46b 100644 --- a/modules/ui/pretty-code/autoload.el +++ b/modules/ui/pretty-code/autoload/pretty-code.el @@ -1,4 +1,4 @@ -;;; ui/pretty-code/settings.el -*- lexical-binding: t; -*- +;;; ui/pretty-code/autoload/pretty-code.el -*- lexical-binding: t; -*- ;;;###autoload (defvar +pretty-code-symbols-alist '((t)) From 8ee2e327a0753881dd580afa72bbeb130ebe9215 Mon Sep 17 00:00:00 2001 From: James Ravn Date: Tue, 25 Feb 2020 20:52:47 +0000 Subject: [PATCH 3/8] Add autoload cookie to iosevka autoloads --- modules/ui/pretty-code/autoload/iosevka.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/ui/pretty-code/autoload/iosevka.el b/modules/ui/pretty-code/autoload/iosevka.el index e68bf82df..670f6fd67 100644 --- a/modules/ui/pretty-code/autoload/iosevka.el +++ b/modules/ui/pretty-code/autoload/iosevka.el @@ -1,5 +1,6 @@ ;;; ui/pretty-code/autoload/iosevka.el -*- lexical-binding: t; -*- +;;;###autoload (defvar +pretty-code--iosevka-font-names '( "iosevka-custom-lightoblique.ttf" @@ -24,6 +25,7 @@ "iosevka-custom-boldoblique.ttf" "iosevka-custom-regular.ttf")) +;;;###autoload (defun +pretty-code/install-iosevka-font (&optional pfx) "Helper function to download and install Iosevka font based on OS. When PFX is non-nil, ignore the prompt and just install" From 41140787a1b378480100e46b379643f7c9d447d8 Mon Sep 17 00:00:00 2001 From: James Ravn Date: Tue, 25 Feb 2020 21:39:37 +0000 Subject: [PATCH 4/8] Add generic font install function for pretty-code --- modules/ui/pretty-code/autoload/iosevka.el | 34 +++++---------------- modules/ui/pretty-code/config.el | 35 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 26 deletions(-) diff --git a/modules/ui/pretty-code/autoload/iosevka.el b/modules/ui/pretty-code/autoload/iosevka.el index 670f6fd67..bcd482605 100644 --- a/modules/ui/pretty-code/autoload/iosevka.el +++ b/modules/ui/pretty-code/autoload/iosevka.el @@ -1,6 +1,5 @@ ;;; ui/pretty-code/autoload/iosevka.el -*- lexical-binding: t; -*- -;;;###autoload (defvar +pretty-code--iosevka-font-names '( "iosevka-custom-lightoblique.ttf" @@ -26,29 +25,12 @@ "iosevka-custom-regular.ttf")) ;;;###autoload -(defun +pretty-code/install-iosevka-font (&optional pfx) - "Helper function to download and install Iosevka font based on OS. -When PFX is non-nil, ignore the prompt and just install" +(defun +pretty-code/install-iosevka-font (&optional prefix) + "Download and install Iosevka font based on OS. +When prefix is non-nil, ignore the prompt and just install." (interactive "P") - (when (or pfx (yes-or-no-p "This will download and install the Iosevka fonts, are you sure you want to do this?")) - (let* ((url-format "https://github.com/jsravn/iosevka-emacs/raw/master/%s") - (font-dest (cl-case window-system - (x (concat (or (getenv "XDG_DATA_HOME") ;; Default Linux install directories - (concat (getenv "HOME") "/.local/share")) - "/fonts/")) - (mac (concat (getenv "HOME") "/Library/Fonts/" )) - (ns (concat (getenv "HOME") "/Library/Fonts/" )))) ;; Default MacOS install directory - (known-dest? (stringp font-dest)) - (font-dest (or font-dest (read-directory-name "Font installation directory: " "~/")))) - - (unless (file-directory-p font-dest) (mkdir font-dest t)) - - (dolist (font +pretty-code--iosevka-font-names) - (url-copy-file (format url-format font) (expand-file-name font font-dest) t)) - - (when known-dest? - (message "Font downloaded, updating font cache... ") - (shell-command-to-string (format "fc-cache -f -v"))) - (message "Successfully %s `Iosevka' fonts to `%s'!" - (if known-dest? "installed" "downloaded") - font-dest)))) + (+pretty-code--install-font + prefix + "Iosevka" + "https://github.com/jsravn/iosevka-emacs/raw/master/%s" + +pretty-code--iosevka-font-names)) diff --git a/modules/ui/pretty-code/config.el b/modules/ui/pretty-code/config.el index a1f942bc0..bb378e39a 100644 --- a/modules/ui/pretty-code/config.el +++ b/modules/ui/pretty-code/config.el @@ -95,3 +95,38 @@ Otherwise it builds `prettify-code-symbols-alist' according to (load! "+hasklig")) ((featurep! +pragmata-pro) (load! "+pragmata-pro"))) + +(defun +pretty-code--install-font (prefix name url-format fonts-alist) + "Install fonts to the local system. + +If PREFIX is nil, will prompt whether or not to download. NAME is informational only. +URL-FORMAT is a format string that should be a url and have a single %s, which is expanded +for each font in FONTS-ALIST. FONTS-ALIST should be the filename of each font. It is used +as the source and destination filename. +" + (when (or prefix (yes-or-no-p + (format "This will download and install the %s fonts, are you sure you want to do this?" name))) + (let* ((font-dest (cl-case window-system + ;; Linux + (x (concat (or (getenv "XDG_DATA_HOME") + (concat (getenv "HOME") "/.local/share")) + "/fonts/")) + ;; MacOS + (mac (concat (getenv "HOME") "/Library/Fonts/" )) + (ns (concat (getenv "HOME") "/Library/Fonts/" )))) + (known-dest? (stringp font-dest)) + (font-dest (or font-dest (read-directory-name "Font installation directory: " "~/")))) + + (unless (file-directory-p font-dest) (mkdir font-dest t)) + + (dolist (font fonts-alist) + (url-copy-file (format url-format font) (expand-file-name font font-dest) t)) + + (when known-dest? + (message "Font downloaded, updating font cache... ") + (shell-command-to-string (format "fc-cache -f -v"))) + (message "Successfully %s `%s' fonts to `%s'!" + (if known-dest? "installed" "downloaded") + name + font-dest))) + ) From dea0320a1a27025e7ae20358d06a162f0f568a28 Mon Sep 17 00:00:00 2001 From: James Ravn Date: Tue, 25 Feb 2020 21:50:29 +0000 Subject: [PATCH 5/8] Add FiraCode download --- modules/ui/pretty-code/autoload/fira.el | 20 ++++++++++++++++++++ modules/ui/pretty-code/autoload/iosevka.el | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 modules/ui/pretty-code/autoload/fira.el diff --git a/modules/ui/pretty-code/autoload/fira.el b/modules/ui/pretty-code/autoload/fira.el new file mode 100644 index 000000000..05c3a5547 --- /dev/null +++ b/modules/ui/pretty-code/autoload/fira.el @@ -0,0 +1,20 @@ +;;; ui/pretty-code/autoload/fira.el -*- lexical-binding: t; -*- + +(defvar +pretty-code--fira-font-names + '( + "FiraCode-Bold.ttf" + "FiraCode-Light.ttf" + "FiraCode-Medium.ttf" + "FiraCode-Regular.ttf" + "FiraCode-Retina.ttf")) + +;;;###autoload +(defun +pretty-code/install-fira-font (&optional prefix) + "Download and install Fira Code font based on OS. +When prefix is non-nil, ignore the prompt and just install." + (interactive "P") + (+pretty-code--install-font + prefix + "FiraCode" + "https://github.com/tonsky/FiraCode/raw/13234c0/distr/ttf/%s" + +pretty-code--fira-font-names)) diff --git a/modules/ui/pretty-code/autoload/iosevka.el b/modules/ui/pretty-code/autoload/iosevka.el index bcd482605..a6f72bfd6 100644 --- a/modules/ui/pretty-code/autoload/iosevka.el +++ b/modules/ui/pretty-code/autoload/iosevka.el @@ -32,5 +32,5 @@ When prefix is non-nil, ignore the prompt and just install." (+pretty-code--install-font prefix "Iosevka" - "https://github.com/jsravn/iosevka-emacs/raw/master/%s" + "https://github.com/jsravn/iosevka-emacs/raw/20fc2c4/%s" +pretty-code--iosevka-font-names)) From d6356d9618fcea332c8bb08794d6557cfd988c94 Mon Sep 17 00:00:00 2001 From: James Ravn Date: Tue, 25 Feb 2020 22:07:00 +0000 Subject: [PATCH 6/8] Add hasklig font install --- modules/ui/pretty-code/autoload/hasklig.el | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 modules/ui/pretty-code/autoload/hasklig.el diff --git a/modules/ui/pretty-code/autoload/hasklig.el b/modules/ui/pretty-code/autoload/hasklig.el new file mode 100644 index 000000000..8a313c537 --- /dev/null +++ b/modules/ui/pretty-code/autoload/hasklig.el @@ -0,0 +1,29 @@ +;;; ui/pretty-code/autoload/hasklig.el -*- lexical-binding: t; -*- + +(defvar +pretty-code--hasklig-font-names + '( + "Hasklig-Black.otf" + "Hasklig-BlackIt.otf" + "Hasklig-Bold.otf" + "Hasklig-BoldIt.otf" + "Hasklig-ExtraLight.otf" + "Hasklig-ExtraLightIt.otf" + "Hasklig-It.otf" + "Hasklig-Light.otf" + "Hasklig-LightIt.otf" + "Hasklig-Medium.otf" + "Hasklig-MediumIt.otf" + "Hasklig-Regular.otf" + "Hasklig-Semibold.otf" + "Hasklig-SemiboldIt.otf")) + +;;;###autoload +(defun +pretty-code/install-hasklig-font (&optional prefix) + "Download and install Hasklig font based on OS. +When prefix is non-nil, ignore the prompt and just install." + (interactive "P") + (+pretty-code--install-font + prefix + "FiraCode" + "https://github.com/jsravn/hasklig-emacs/raw/33354a3/%s" + +pretty-code--hasklig-font-names)) From 2077a859d804eb6da617ae0855e3c4f7f010a26b Mon Sep 17 00:00:00 2001 From: James Ravn Date: Tue, 25 Feb 2020 22:09:37 +0000 Subject: [PATCH 7/8] Fix type in Hasklig install messages --- modules/ui/pretty-code/autoload/hasklig.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ui/pretty-code/autoload/hasklig.el b/modules/ui/pretty-code/autoload/hasklig.el index 8a313c537..507a8fab0 100644 --- a/modules/ui/pretty-code/autoload/hasklig.el +++ b/modules/ui/pretty-code/autoload/hasklig.el @@ -24,6 +24,6 @@ When prefix is non-nil, ignore the prompt and just install." (interactive "P") (+pretty-code--install-font prefix - "FiraCode" + "Hasklig" "https://github.com/jsravn/hasklig-emacs/raw/33354a3/%s" +pretty-code--hasklig-font-names)) From 91f3d677d739ac52067c5b3fd45f76c4c40f7a0b Mon Sep 17 00:00:00 2001 From: James Ravn Date: Mon, 16 Mar 2020 12:22:23 +0000 Subject: [PATCH 8/8] Fix formatting --- modules/ui/pretty-code/autoload/fira.el | 3 +-- modules/ui/pretty-code/autoload/hasklig.el | 3 +-- modules/ui/pretty-code/autoload/iosevka.el | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/ui/pretty-code/autoload/fira.el b/modules/ui/pretty-code/autoload/fira.el index 05c3a5547..2a559cbd9 100644 --- a/modules/ui/pretty-code/autoload/fira.el +++ b/modules/ui/pretty-code/autoload/fira.el @@ -1,8 +1,7 @@ ;;; ui/pretty-code/autoload/fira.el -*- lexical-binding: t; -*- (defvar +pretty-code--fira-font-names - '( - "FiraCode-Bold.ttf" + '("FiraCode-Bold.ttf" "FiraCode-Light.ttf" "FiraCode-Medium.ttf" "FiraCode-Regular.ttf" diff --git a/modules/ui/pretty-code/autoload/hasklig.el b/modules/ui/pretty-code/autoload/hasklig.el index 507a8fab0..90fc295a6 100644 --- a/modules/ui/pretty-code/autoload/hasklig.el +++ b/modules/ui/pretty-code/autoload/hasklig.el @@ -1,8 +1,7 @@ ;;; ui/pretty-code/autoload/hasklig.el -*- lexical-binding: t; -*- (defvar +pretty-code--hasklig-font-names - '( - "Hasklig-Black.otf" + '("Hasklig-Black.otf" "Hasklig-BlackIt.otf" "Hasklig-Bold.otf" "Hasklig-BoldIt.otf" diff --git a/modules/ui/pretty-code/autoload/iosevka.el b/modules/ui/pretty-code/autoload/iosevka.el index a6f72bfd6..4fa4f83da 100644 --- a/modules/ui/pretty-code/autoload/iosevka.el +++ b/modules/ui/pretty-code/autoload/iosevka.el @@ -1,8 +1,7 @@ ;;; ui/pretty-code/autoload/iosevka.el -*- lexical-binding: t; -*- (defvar +pretty-code--iosevka-font-names - '( - "iosevka-custom-lightoblique.ttf" + '("iosevka-custom-lightoblique.ttf" "iosevka-custom-thinoblique.ttf" "iosevka-custom-mediumitalic.ttf" "iosevka-custom-light.ttf"