From b518a45123d79b6d40ee47f0f83b90d45b678685 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Tue, 27 Jan 2015 01:13:25 -0500 Subject: [PATCH 1/3] Add documentation for font --- doc/DOCUMENTATION.md | 53 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/doc/DOCUMENTATION.md b/doc/DOCUMENTATION.md index ed47012b1b52..9764f14b8c09 100644 --- a/doc/DOCUMENTATION.md +++ b/doc/DOCUMENTATION.md @@ -852,12 +852,53 @@ By default its value is: ``` The properties should be pretty straightforward, it is possible to set any -valid property of a [font-spec][]. - -The special property `:powerline-offset` is for quick tweaking of the -mode-line height in order to avoid crappy rendering of the separators like on -the following screenshot (in this extreme case bump the offset to `+8` or more -but most of the time `2` or `4` is alright). +valid property of a [font-spec][]: +- `:family` Font family or fontset (a string). +- `:width` Relative character width. This should be one of the symbols: + - ultra-condensed + - extra-condensed + - condensed + - semi-condensed + - normal + - semi-expanded + - expanded + - extra-expanded + - ultra-expanded +- `:height` The height of the font. In the simplest case, this is an integer in +units of 1/10 point. +- `:weight` Font weight—one of the symbols (from densest to faintest): + - ultra-bold + - extra-bold + - bold + - semi-bold + - normal + - semi-light + - light + - extra-light + - ultra-light +On text terminals which support variable-brightness text, any weight greater +than normal is displayed as extra bright, and any weight less than normal is +displayed as half-bright. +- `:slant` Font slant—one of the symbols: + - italic + - oblique + - normal + - reverse-italic + - reverse-oblique. +On text terminals that support variable-brightness text, slanted text is +displayed as half-bright. +- `:size` The font size—either a non-negative integer that specifies the pixel +size, or a floating-point number that specifies the point size. +- `:adstyle` Additional typographic style information for the font, such as +‘sans’. The value should be a string or a symbol. +- `:registry` The charset registry and encoding of the font, such as +‘iso8859-1’. The value should be a string or a symbol. +- `:script` The script that the font must support (a symbol). + +The special property `:powerline-offset` is `Spacemacs` specific and it is for +quick tweaking of the mode-line height in order to avoid crappy rendering of +the separators like on the following screenshot (in this extreme case bump the +offset to `+8` or more but most of the time `2` or `4` is alright). _Ugly separators_ From 7faa7c496b2d753350cea2cfa2784a44108a15c7 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Tue, 27 Jan 2015 01:19:20 -0500 Subject: [PATCH 2/3] Fix crash if `Source Code Pro` is not available on the system --- core/core-spacemacs-mode.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/core-spacemacs-mode.el b/core/core-spacemacs-mode.el index c79f67257c80..2a9f423cba2f 100644 --- a/core/core-spacemacs-mode.el +++ b/core/core-spacemacs-mode.el @@ -90,7 +90,8 @@ "able to launch a graphical instance of Emacs" "with this build."))) ;; font - (spacemacs/set-font dotspacemacs-default-font) + (when (member (car dotspacemacs-default-font) (font-family-list)) + (spacemacs/set-font dotspacemacs-default-font)) ;; banner (spacemacs//insert-banner) ;; bind-key is required by use-package From 33a3f6389e9500a361cb0c8bc8f1e24b14a3f80b Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Tue, 27 Jan 2015 01:19:55 -0500 Subject: [PATCH 3/3] Bump version to 0.50.1 --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 83c09df2f3cc..2b3c2d90937b 100644 --- a/init.el +++ b/init.el @@ -9,7 +9,7 @@ ;; This file is not part of GNU Emacs. ;; ;;; License: GPLv3 -(defconst spacemacs-version "0.50.0" "Spacemacs version.") +(defconst spacemacs-version "0.50.1" "Spacemacs version.") (defconst spacemacs-min-version "24.3" "Minimal required version of Emacs.") (defun spacemacs/emacs-version-ok ()