[src/trunk]: src/sys/dev/wsfont Sort spleen by size, instead of character code.

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/11519ae3d6cf
branches:  trunk
changeset: 946263:11519ae3d6cf
user:      rin <rin%NetBSD.org@localhost>
date:      Sat Nov 21 22:59:18 2020 +0000

description:
Sort spleen by size, instead of character code.
No functional changes.

diffstat:

 sys/dev/wsfont/files.wsfont |   6 +++---
 sys/dev/wsfont/wsfont.c     |  34 +++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diffs (85 lines):

diff -r dbb77ce5eab0 -r 11519ae3d6cf sys/dev/wsfont/files.wsfont
--- a/sys/dev/wsfont/files.wsfont       Sat Nov 21 22:37:11 2020 +0000
+++ b/sys/dev/wsfont/files.wsfont       Sat Nov 21 22:59:18 2020 +0000
@@ -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 @@
                                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
diff -r dbb77ce5eab0 -r 11519ae3d6cf sys/dev/wsfont/wsfont.c
--- a/sys/dev/wsfont/wsfont.c   Sat Nov 21 22:37:11 2020 +0000
+++ b/sys/dev/wsfont/wsfont.c   Sat Nov 21 22:59:18 2020 +0000
@@ -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,6 +150,21 @@
 #include <dev/wsfont/Go_Mono_12x23.h>
 #endif
 
+#ifdef FONT_SPLEEN5x8
+#define HAVE_FONT 1
+#include <dev/wsfont/spleen5x8.h>
+#endif
+
+#ifdef FONT_SPLEEN6x12
+#define HAVE_FONT 1
+#include <dev/wsfont/spleen6x12.h>
+#endif
+
+#ifdef FONT_SPLEEN8x16
+#define HAVE_FONT 1
+#include <dev/wsfont/spleen8x16.h>
+#endif
+
 #ifdef FONT_SPLEEN12x24
 #define HAVE_FONT 1
 #include <dev/wsfont/spleen12x24.h>
@@ -165,21 +180,6 @@
 #include <dev/wsfont/spleen32x64.h>
 #endif
 
-#ifdef FONT_SPLEEN5x8
-#define HAVE_FONT 1
-#include <dev/wsfont/spleen5x8.h>
-#endif
-
-#ifdef FONT_SPLEEN6x12
-#define HAVE_FONT 1
-#include <dev/wsfont/spleen6x12.h>
-#endif
-
-#ifdef FONT_SPLEEN8x16
-#define HAVE_FONT 1
-#include <dev/wsfont/spleen8x16.h>
-#endif
-
 #ifdef FONT_LIBERATION_MONO12x21
 #define HAVE_FONT 1
 #include <dev/wsfont/Liberation_Mono_12x21.h>