Module Name: src
Committed By: rin
Date: Sat Nov 21 22:59:19 UTC 2020
Modified Files:
src/sys/dev/wsfont: files.wsfont wsfont.c
Log Message:
Sort spleen by size, instead of character code.
No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/wsfont/files.wsfont
cvs rdiff -u -r1.69 -r1.70 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.26 src/sys/dev/wsfont/files.wsfont:1.27
--- src/sys/dev/wsfont/files.wsfont:1.26 Fri Nov 13 01:03:39 2020
+++ src/sys/dev/wsfont/files.wsfont Sat Nov 21 22:59:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.wsfont,v 1.26 2020/11/13 01:03:39 macallan Exp $
+# $NetBSD: files.wsfont,v 1.27 2020/11/21 22:59:18 rin Exp $
defpseudo wsfont
@@ -29,11 +29,11 @@ defflag opt_wsfont.h FONT_BOLD8x16
FONT_DROID_SANS_MONO9x18
FONT_DROID_SANS_MONO19x36
FONT_GO_MONO12x23
+ FONT_SPLEEN5x8
+ FONT_SPLEEN8x16
FONT_SPLEEN12x24
FONT_SPLEEN16x32
FONT_SPLEEN32x64
- FONT_SPLEEN5x8
- FONT_SPLEEN8x16
FONT_LIBERATION_MONO12x21
file dev/wsfont/wsfontdev.c wsfont needs-flag
Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.69 src/sys/dev/wsfont/wsfont.c:1.70
--- src/sys/dev/wsfont/wsfont.c:1.69 Fri Nov 13 01:03:39 2020
+++ src/sys/dev/wsfont/wsfont.c Sat Nov 21 22:59:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.69 2020/11/13 01:03:39 macallan Exp $ */
+/* $NetBSD: wsfont.c,v 1.70 2020/11/21 22:59:18 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.69 2020/11/13 01:03:39 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.70 2020/11/21 22:59:18 rin Exp $");
#include "opt_wsfont.h"
@@ -150,34 +150,34 @@ __KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1
#include <dev/wsfont/Go_Mono_12x23.h>
#endif
-#ifdef FONT_SPLEEN12x24
+#ifdef FONT_SPLEEN5x8
#define HAVE_FONT 1
-#include <dev/wsfont/spleen12x24.h>
+#include <dev/wsfont/spleen5x8.h>
#endif
-#ifdef FONT_SPLEEN16x32
+#ifdef FONT_SPLEEN6x12
#define HAVE_FONT 1
-#include <dev/wsfont/spleen16x32.h>
+#include <dev/wsfont/spleen6x12.h>
#endif
-#ifdef FONT_SPLEEN32x64
+#ifdef FONT_SPLEEN8x16
#define HAVE_FONT 1
-#include <dev/wsfont/spleen32x64.h>
+#include <dev/wsfont/spleen8x16.h>
#endif
-#ifdef FONT_SPLEEN5x8
+#ifdef FONT_SPLEEN12x24
#define HAVE_FONT 1
-#include <dev/wsfont/spleen5x8.h>
+#include <dev/wsfont/spleen12x24.h>
#endif
-#ifdef FONT_SPLEEN6x12
+#ifdef FONT_SPLEEN16x32
#define HAVE_FONT 1
-#include <dev/wsfont/spleen6x12.h>
+#include <dev/wsfont/spleen16x32.h>
#endif
-#ifdef FONT_SPLEEN8x16
+#ifdef FONT_SPLEEN32x64
#define HAVE_FONT 1
-#include <dev/wsfont/spleen8x16.h>
+#include <dev/wsfont/spleen32x64.h>
#endif
#ifdef FONT_LIBERATION_MONO12x21
