Remove lucida16x29.h and omron12x20 fonts.

- lucida16x29 is a bad conversion from a truetype font, it is too bold
which makes it unreadable.
- omron12x20 is a serif font, and is very difficult to read due to
inconsistencies in character spacing, alignement, and width.

Moreover, both fonts only have 96 glyphs.

No objection from mlarkin@

OK mpi@, jcs@

1 files changed, 4 insertions, 20 deletions

diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c
index 0abc51670f7..054ffc17a0c 100644
--- a/sys/dev/wsfont/wsfont.c
+++ b/sys/dev/wsfont/wsfont.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsfont.c,v 1.46 2017/01/22 17:17:38 fcambus Exp $ */
+/*	$OpenBSD: wsfont.c,v 1.47 2017/05/30 10:19:22 fcambus Exp $ */
 /*	$NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $	*/
 
 /*-
@@ -49,11 +49,6 @@
 #include <dev/wsfont/qvss8x15.h>
 #endif
 
-#ifdef FONT_LUCIDA16x29
-#define HAVE_FONT 1
-#include <dev/wsfont/lucida16x29.h>
-#endif
-
 #ifdef FONT_VT220L8x8
 #define HAVE_FONT 1
 #include <dev/wsfont/vt220l8x8.h>
@@ -64,11 +59,6 @@
 #include <dev/wsfont/vt220l8x10.h>
 #endif
 
-#ifdef FONT_OMRON12x20
-#define HAVE_FONT 1
-#include <dev/wsfont/omron12x20.h>
-#endif
-
 #ifdef FONT_BOLD8x16
 #define HAVE_FONT 1
 #include <dev/wsfont/bold8x16.h>
@@ -132,20 +122,14 @@ static struct font builtin_fonts[] = {
 #ifdef FONT_GALLANT12x22
 	BUILTIN_FONT(gallant12x22, 3),
 #endif
-#ifdef FONT_LUCIDA16x29
-	BUILTIN_FONT(lucida16x29, 4),
-#endif
 #ifdef FONT_QVSS8x15
-	BUILTIN_FONT(qvss8x15, 5),
+	BUILTIN_FONT(qvss8x15, 4),
 #endif
 #ifdef FONT_VT220L8x8
-	BUILTIN_FONT(vt220l8x8, 6),
+	BUILTIN_FONT(vt220l8x8, 5),
 #endif
 #ifdef FONT_VT220L8x10
-	BUILTIN_FONT(vt220l8x10, 7),
-#endif
-#ifdef FONT_OMRON12x20
-	BUILTIN_FONT(omron12x20, 8),
+	BUILTIN_FONT(vt220l8x10, 6),
 #endif
 #undef BUILTIN_FONT
 };