Browse Source

org-faces.el: Use fixed-pitch

* org-faces.el (org-hide, org-date, org-table, org-formula)
(org-code, org-block, org-verbatim): Use fixed-pitch.

Link: https://orgmode.org/list/875z8njaol.fsf@protesilaos.com/
Protesilaos Stavrou 4 years ago
parent
commit
667cb6f1ae
2 changed files with 16 additions and 8 deletions
  1. 4 0
      etc/ORG-NEWS
  2. 12 8
      lisp/org-faces.el

+ 4 - 0
etc/ORG-NEWS

@@ -109,6 +109,10 @@ By default ox-html now inlines webp images.
 
 
 This is the CSS class name to use for the top level content wrapper.
 This is the CSS class name to use for the top level content wrapper.
 
 
+*** Some faces now use fixed-pitch
+
+See https://orgmode.org/list/875z8njaol.fsf@protesilaos.com.
+
 ** New features
 ** New features
 *** =ob-python= improvements to =:return= header argument 
 *** =ob-python= improvements to =:return= header argument 
 
 

+ 12 - 8
lisp/org-faces.el

@@ -38,7 +38,8 @@
   :group 'org-faces)
   :group 'org-faces)
 
 
 (defface org-hide
 (defface org-hide
-  '((((background light)) (:foreground "white"))
+  '((default :inherit fixed-pitch)
+    (((background light)) (:foreground "white"))
     (((background dark)) (:foreground "black")))
     (((background dark)) (:foreground "black")))
   "Face used to hide leading stars in headlines.
   "Face used to hide leading stars in headlines.
 The foreground color of this face should be equal to the background
 The foreground color of this face should be equal to the background
@@ -193,7 +194,8 @@ set the properties in the `org-column' face.  For example, set
   :group 'org-faces)
   :group 'org-faces)
 
 
 (defface org-date
 (defface org-date
-  '((((class color) (background light)) (:foreground "Purple" :underline t))
+  '((default :inherit fixed-pitch)
+    (((class color) (background light)) (:foreground "Purple" :underline t))
     (((class color) (background dark)) (:foreground "Cyan" :underline t))
     (((class color) (background dark)) (:foreground "Cyan" :underline t))
     (t (:underline t)))
     (t (:underline t)))
   "Face for date/time stamps."
   "Face for date/time stamps."
@@ -369,7 +371,8 @@ changes."
 		   (sexp :tag "Face")))))
 		   (sexp :tag "Face")))))
 
 
 (defface org-table	   ;Copied from `font-lock-function-name-face'
 (defface org-table	   ;Copied from `font-lock-function-name-face'
-  '((((class color) (min-colors 88) (background light)) (:foreground "Blue1"))
+  '((default :inherit fixed-pitch)
+    (((class color) (min-colors 88) (background light)) (:foreground "Blue1"))
     (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue"))
     (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue"))
     (((class color) (min-colors 16) (background light)) (:foreground "Blue"))
     (((class color) (min-colors 16) (background light)) (:foreground "Blue"))
     (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue"))
     (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue"))
@@ -385,7 +388,8 @@ changes."
   :group 'org-faces)
   :group 'org-faces)
 
 
 (defface org-formula
 (defface org-formula
-  '((((class color) (min-colors 88) (background light)) (:foreground "Firebrick"))
+  '((default :inherit fixed-pitch)
+    (((class color) (min-colors 88) (background light)) (:foreground "Firebrick"))
     (((class color) (min-colors 88) (background dark)) (:foreground "chocolate1"))
     (((class color) (min-colors 88) (background dark)) (:foreground "chocolate1"))
     (((class color) (min-colors 8)  (background light)) (:foreground "red"))
     (((class color) (min-colors 8)  (background light)) (:foreground "red"))
     (((class color) (min-colors 8)  (background dark)) (:foreground "red"))
     (((class color) (min-colors 8)  (background dark)) (:foreground "red"))
@@ -393,12 +397,12 @@ changes."
   "Face for formulas."
   "Face for formulas."
   :group 'org-faces)
   :group 'org-faces)
 
 
-(defface org-code '((t :inherit shadow))
+(defface org-code '((t :inherit (fixed-pitch shadow)))
   "Face for fixed-width text like code snippets."
   "Face for fixed-width text like code snippets."
   :group 'org-faces
   :group 'org-faces
   :version "22.1")
   :version "22.1")
 
 
-(defface org-meta-line '((t :inherit font-lock-comment-face))
+(defface org-meta-line '((t :inherit (fixed-pitch font-lock-comment-face)))
   "Face for meta lines starting with \"#+\"."
   "Face for meta lines starting with \"#+\"."
   :group 'org-faces
   :group 'org-faces
   :version "22.1")
   :version "22.1")
@@ -425,7 +429,7 @@ This face applies to the #+TITLE:, #+SUBTITLE:, #+AUTHOR:,
 #+EMAIL: and #+DATE: keywords."
 #+EMAIL: and #+DATE: keywords."
   :group 'org-faces)
   :group 'org-faces)
 
 
-(defface org-block `((t :inherit shadow
+(defface org-block `((t :inherit (fixed-pitch shadow)
 			,@(and (>= emacs-major-version 27) '(:extend t))))
 			,@(and (>= emacs-major-version 27) '(:extend t))))
   "Face used for text inside various blocks.
   "Face used for text inside various blocks.
 
 
@@ -447,7 +451,7 @@ verse and quote blocks are fontified using the `org-verse' and
   "Face used for the line delimiting the end of source blocks."
   "Face used for the line delimiting the end of source blocks."
   :group 'org-faces)
   :group 'org-faces)
 
 
-(defface org-verbatim '((t (:inherit shadow)))
+(defface org-verbatim '((t (:inherit (fixed-pitch shadow))))
   "Face for fixed-with text like code snippets."
   "Face for fixed-with text like code snippets."
   :group 'org-faces
   :group 'org-faces
   :version "22.1")
   :version "22.1")