ui/pretty-code: minor reformatting

modules/ui/pretty-code/autoload.el

@@ -1,62 +1,10 @@
 ;;; ui/pretty-code/settings.el -*- lexical-binding: t; -*-
 
-;;;###autoload
-(defvar +pretty-code-symbols
-  '(;; org
-    :name          "»"
-    :src_block     "»"
-    :src_block_end "«"
-    ;; Functional
-    :lambda        "λ"
-    :def           "ƒ"
-    :composition   "∘"
-    :map           "↦"
-    ;; Types
-    :null          "∅"
-    :true          "𝕋"
-    :false         "𝔽"
-    :int           "ℤ"
-    :float         "ℝ"
-    :str           "𝕊"
-    :bool          "𝔹"
-    ;; Flow
-    :not           "￢"
-    :in            "∈"
-    :not-in        "∉"
-    :and           "∧"
-    :or            "∨"
-    :for           "∀"
-    :some          "∃"
-    :return        "⟼"
-    :yield         "⟻"
-    ;; Other
-    :tuple         "⨂"
-    :pipe          "" ;; FIXME: find a non-private char
-    :dot           "•")
-  "Options plist for `set-pretty-symbols!'.
-
-This should not contain any symbols from the Unicode Private Area! There is no
-universal way of getting the correct symbol as that area varies from font to
-font.")
-
 ;;;###autoload
 (defvar +pretty-code-symbols-alist '((t))
   "An alist containing a mapping of major modes to its value for
 `prettify-symbols-alist'.")
 
-;;;###autodef
-(defun +pretty-code--correct-symbol-bounds (ligature-alist)
-  "Prepend non-breaking spaces to a ligature.
-
-This way `compose-region' (called by `prettify-symbols-mode') will use the
-correct width of the symbols instead of the width measured by `char-width'."
-  (let ((len (length (car ligature-alist)))
-        (acc (list   (cdr ligature-alist))))
-    (while (> len 1)
-      (setq acc (cons #X00a0 (cons '(Br . Bl) acc))
-            len (1- len)))
-    (cons (car ligature-alist) acc)))
-
 ;;;###autodef
 (defun set-pretty-symbols! (modes &rest plist)
   "Associates string patterns with icons in certain major-modes.

modules/ui/pretty-code/config.el

@@ -1,13 +1,54 @@
 ;;; ui/pretty-code/config.el -*- lexical-binding: t; -*-
 
-(cond ((featurep! +fira)
+(defvar +pretty-code-symbols
-       (load! "+fira"))
+  '(;; org
-      ((featurep! +iosevka)
+    :name          "»"
-       (load! "+iosevka"))
+    :src_block     "»"
-      ((featurep! +hasklig)
+    :src_block_end "«"
-       (load! "+hasklig"))
+    ;; Functional
-      ((featurep! +pragmata-pro)
+    :lambda        "λ"
-       (load! "+pragmata-pro")))
+    :def           "ƒ"
+    :composition   "∘"
+    :map           "↦"
+    ;; Types
+    :null          "∅"
+    :true          "𝕋"
+    :false         "𝔽"
+    :int           "ℤ"
+    :float         "ℝ"
+    :str           "𝕊"
+    :bool          "𝔹"
+    ;; Flow
+    :not           "￢"
+    :in            "∈"
+    :not-in        "∉"
+    :and           "∧"
+    :or            "∨"
+    :for           "∀"
+    :some          "∃"
+    :return        "⟼"
+    :yield         "⟻"
+    ;; Other
+    :tuple         "⨂"
+    :pipe          "" ;; FIXME: find a non-private char
+    :dot           "•")
+  "Options plist for `set-pretty-symbols!'.
+
+This should not contain any symbols from the Unicode Private Area! There is no
+universal way of getting the correct symbol as that area varies from font to
+font.")
+
+(defun +pretty-code--correct-symbol-bounds (ligature-alist)
+  "Prepend non-breaking spaces to a ligature.
+
+This way `compose-region' (called by `prettify-symbols-mode') will use the
+correct width of the symbols instead of the width measured by `char-width'."
+  (let ((len (length (car ligature-alist)))
+        (acc (list   (cdr ligature-alist))))
+    (while (> len 1)
+      (setq acc (cons #X00a0 (cons '(Br . Bl) acc))
+            len (1- len)))
+    (cons (car ligature-alist) acc)))
 
 (defvar +pretty-code-enabled-modes t
   "List of major modes in which `prettify-symbols-mode' should be enabled.
@@ -40,3 +81,13 @@ Otherwise it builds `prettify-code-symbols-alist' according to
       (prettify-symbols-mode +1))))
 
 (add-hook 'after-change-major-mode-hook #'+pretty-code-init-pretty-symbols-h)
+
+;; Font-specific ligature support
+(cond ((featurep! +fira)
+       (load! "+fira"))
+      ((featurep! +iosevka)
+       (load! "+iosevka"))
+      ((featurep! +hasklig)
+       (load! "+hasklig"))
+      ((featurep! +pragmata-pro)
+       (load! "+pragmata-pro")))