Module Name: src
Committed By: rin
Date: Sat Nov 20 00:00:19 UTC 2021
Modified Files:
src/sys/dev/wsfont: files.wsfont wsfont.c
Log Message:
Sort Droid Sans Mono family fonts by size.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/wsfont/files.wsfont
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/wsfont/wsfont.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/files.wsfont
diff -u src/sys/dev/wsfont/files.wsfont:1.28 src/sys/dev/wsfont/files.wsfont:1.29
--- src/sys/dev/wsfont/files.wsfont:1.28 Sat Nov 21 23:00:02 2020
+++ src/sys/dev/wsfont/files.wsfont Sat Nov 20 00:00:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.wsfont,v 1.28 2020/11/21 23:00:02 rin Exp $
+# $NetBSD: files.wsfont,v 1.29 2021/11/20 00:00:19 rin Exp $
defpseudo wsfont
@@ -25,8 +25,8 @@ defflag opt_wsfont.h FONT_BOLD8x16
FONT_SONY12x24
FONT_OMRON12x20
FONT_DEJAVU_SANS_MONO12x22
- FONT_DROID_SANS_MONO12x22
FONT_DROID_SANS_MONO9x18
+ FONT_DROID_SANS_MONO12x22
FONT_DROID_SANS_MONO19x36
FONT_GO_MONO12x23
FONT_SPLEEN5x8
Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.73 src/sys/dev/wsfont/wsfont.c:1.74
--- src/sys/dev/wsfont/wsfont.c:1.73 Fri Nov 19 23:55:16 2021
+++ src/sys/dev/wsfont/wsfont.c Sat Nov 20 00:00:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.73 2021/11/19 23:55:16 rin Exp $ */
+/* $NetBSD: wsfont.c,v 1.74 2021/11/20 00:00:19 rin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.73 2021/11/19 23:55:16 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.74 2021/11/20 00:00:19 rin Exp $");
#include "opt_wsfont.h"
@@ -130,14 +130,14 @@ __KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1
#include <dev/wsfont/DejaVu_Sans_Mono_12x22.h>
#endif
-#ifdef FONT_DROID_SANS_MONO12x22
+#ifdef FONT_DROID_SANS_MONO9x18
#define HAVE_FONT 1
-#include <dev/wsfont/Droid_Sans_Mono_12x22.h>
+#include <dev/wsfont/Droid_Sans_Mono_9x18.h>
#endif
-#ifdef FONT_DROID_SANS_MONO9x18
+#ifdef FONT_DROID_SANS_MONO12x22
#define HAVE_FONT 1
-#include <dev/wsfont/Droid_Sans_Mono_9x18.h>
+#include <dev/wsfont/Droid_Sans_Mono_12x22.h>
#endif
#ifdef FONT_DROID_SANS_MONO19x36
