From 594eb3774d30378a7a5db0f250e80d7ab2cdd152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Lindqvist?= Date: Sat, 24 Oct 2015 14:29:12 +0200 Subject: [PATCH] fonts: turn hardcoded font names and sizes into constants --- basis/fonts/fonts.factor | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/basis/fonts/fonts.factor b/basis/fonts/fonts.factor index 311715ce44..5389fc73d1 100644 --- a/basis/fonts/fonts.factor +++ b/basis/fonts/fonts.factor @@ -1,8 +1,14 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel colors colors.constants accessors combinators math ; +USING: accessors colors.constants combinators kernel math ; IN: fonts +CONSTANT: default-serif-font-name "serif" +CONSTANT: default-sans-serif-font-name "sans serif" +CONSTANT: default-monospace-font-name "monospace" + +CONSTANT: default-font-size 12 + TUPLE: font name size @@ -42,18 +48,18 @@ italic? : serif-font ( -- font ) - "serif" >>name - 12 >>size ; + default-serif-font-name >>name + default-font-size >>size ; : sans-serif-font ( -- font ) - "sans-serif" >>name - 12 >>size ; + default-sans-serif-font-name >>name + default-font-size >>size ; : monospace-font ( -- font ) - "monospace" >>name - 12 >>size ; + default-monospace-font-name >>name + default-font-size >>size ; : strip-font-colors ( font -- font' ) clone f >>background f >>foreground ;