Module Name: src
Committed By: fcambus
Date: Fri Jul 31 20:39:50 UTC 2020
Modified Files:
src/sys/dev/wsfont: spleen16x32.h spleen32x64.h spleen8x16.h
Log Message:
Update Spleen kernel fonts to version 1.8.2, bringing the following
improvements:
- Fix size of the lower case 'ae' character in the 16x32 and 32x64 versions
- Shorten parentheses, square brackets, braces, slash, backslash in the
8x16 version, fixing alignment issues
- Shift vertical line and double vertical line characters one pixel
up in the 8x16 version
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/wsfont/spleen16x32.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/wsfont/spleen32x64.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/wsfont/spleen8x16.h
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/spleen16x32.h
diff -u src/sys/dev/wsfont/spleen16x32.h:1.6 src/sys/dev/wsfont/spleen16x32.h:1.7
--- src/sys/dev/wsfont/spleen16x32.h:1.6 Mon Jul 20 13:41:16 2020
+++ src/sys/dev/wsfont/spleen16x32.h Fri Jul 31 20:39:50 2020
@@ -1,8 +1,8 @@
-/* $NetBSD: spleen16x32.h,v 1.6 2020/07/20 13:41:16 fcambus Exp $ */
+/* $NetBSD: spleen16x32.h,v 1.7 2020/07/31 20:39:50 fcambus Exp $ */
/* $OpenBSD: spleen16x32.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
- * Copyright (c) 2018-2019 Frederic Cambus <[email protected]>
+ * Copyright (c) 2018-2020 Frederic Cambus <[email protected]>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -6589,20 +6589,20 @@ static u_char spleen16x32_data[] = {
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
- 0x1f, 0x3f, /* ...*****..****** */
- 0x1f, 0xff, /* ...************* */
- 0x01, 0xe3, /* .......****...** */
- 0x00, 0xc3, /* ........**....** */
- 0x00, 0xc3, /* ........**....** */
- 0x0f, 0xc3, /* ....******....** */
- 0x1f, 0xff, /* ...************* */
- 0x38, 0xff, /* ..***...******** */
- 0x30, 0xc0, /* ..**....**...... */
- 0x30, 0xc0, /* ..**....**...... */
- 0x30, 0xc0, /* ..**....**...... */
- 0x39, 0xe0, /* ..***..****..... */
- 0x1f, 0xff, /* ...************* */
- 0x0f, 0x3f, /* ....****..****** */
+ 0x1e, 0x7c, /* ...****..*****.. */
+ 0x1f, 0xfc, /* ...***********.. */
+ 0x03, 0xcc, /* ......****..**.. */
+ 0x01, 0x8c, /* .......**...**.. */
+ 0x01, 0x8c, /* .......**...**.. */
+ 0x0f, 0x8c, /* ....*****...**.. */
+ 0x1f, 0xfc, /* ...***********.. */
+ 0x39, 0xfc, /* ..***..*******.. */
+ 0x31, 0x80, /* ..**...**....... */
+ 0x31, 0x80, /* ..**...**....... */
+ 0x31, 0x80, /* ..**...**....... */
+ 0x39, 0xc0, /* ..***..***...... */
+ 0x1f, 0xfc, /* ...***********.. */
+ 0x0f, 0x7c, /* ....****.*****.. */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
Index: src/sys/dev/wsfont/spleen32x64.h
diff -u src/sys/dev/wsfont/spleen32x64.h:1.7 src/sys/dev/wsfont/spleen32x64.h:1.8
--- src/sys/dev/wsfont/spleen32x64.h:1.7 Mon Jul 20 13:41:16 2020
+++ src/sys/dev/wsfont/spleen32x64.h Fri Jul 31 20:39:50 2020
@@ -1,8 +1,8 @@
-/* $NetBSD: spleen32x64.h,v 1.7 2020/07/20 13:41:16 fcambus Exp $ */
+/* $NetBSD: spleen32x64.h,v 1.8 2020/07/31 20:39:50 fcambus Exp $ */
/* $OpenBSD: spleen32x64.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
- * Copyright (c) 2018-2019 Frederic Cambus <[email protected]>
+ * Copyright (c) 2018-2020 Frederic Cambus <[email protected]>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -12937,34 +12937,34 @@ static u_char spleen32x64_data[] = {
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
- 0x03, 0xff, 0x0f, 0xff, /* ......**********....************ */
- 0x03, 0xff, 0x9f, 0xff, /* ......***********..************* */
- 0x03, 0xff, 0xff, 0xff, /* ......************************** */
- 0x03, 0xff, 0xff, 0xff, /* ......************************** */
- 0x00, 0x03, 0xfc, 0x0f, /* ..............********......**** */
- 0x00, 0x01, 0xf8, 0x0f, /* ...............******.......**** */
- 0x00, 0x00, 0xf0, 0x0f, /* ................****........**** */
- 0x00, 0x00, 0xf0, 0x0f, /* ................****........**** */
- 0x00, 0x00, 0xf0, 0x0f, /* ................****........**** */
- 0x00, 0x00, 0xf0, 0x0f, /* ................****........**** */
- 0x00, 0x7f, 0xf0, 0x0f, /* .........***********........**** */
- 0x01, 0xff, 0xf0, 0x0f, /* .......*************........**** */
- 0x03, 0xff, 0xff, 0xff, /* ......************************** */
- 0x07, 0xff, 0xff, 0xff, /* .....*************************** */
- 0x07, 0xc0, 0xff, 0xff, /* .....*****......**************** */
- 0x0f, 0x80, 0xff, 0xff, /* ....*****.......**************** */
- 0x0f, 0x00, 0xf0, 0x00, /* ....****........****............ */
- 0x0f, 0x00, 0xf0, 0x00, /* ....****........****............ */
- 0x0f, 0x00, 0xf0, 0x00, /* ....****........****............ */
- 0x0f, 0x00, 0xf0, 0x00, /* ....****........****............ */
- 0x0f, 0x00, 0xf0, 0x00, /* ....****........****............ */
- 0x0f, 0x00, 0xf0, 0x00, /* ....****........****............ */
- 0x0f, 0x81, 0xf8, 0x00, /* ....*****......******........... */
- 0x07, 0xc3, 0xfc, 0x00, /* .....*****....********.......... */
- 0x07, 0xff, 0xff, 0xff, /* .....*************************** */
- 0x03, 0xff, 0xff, 0xff, /* ......************************** */
- 0x01, 0xff, 0x9f, 0xff, /* .......**********..************* */
- 0x00, 0x7f, 0x0f, 0xff, /* .........*******....************ */
+ 0x03, 0xfc, 0x3f, 0xf0, /* ......********....**********.... */
+ 0x03, 0xfe, 0x7f, 0xf0, /* ......*********..***********.... */
+ 0x03, 0xff, 0xff, 0xf0, /* ......**********************.... */
+ 0x03, 0xff, 0xff, 0xf0, /* ......**********************.... */
+ 0x00, 0x0f, 0xf0, 0xf0, /* ............********....****.... */
+ 0x00, 0x07, 0xe0, 0xf0, /* .............******.....****.... */
+ 0x00, 0x03, 0xc0, 0xf0, /* ..............****......****.... */
+ 0x00, 0x03, 0xc0, 0xf0, /* ..............****......****.... */
+ 0x00, 0x03, 0xc0, 0xf0, /* ..............****......****.... */
+ 0x00, 0x03, 0xc0, 0xf0, /* ..............****......****.... */
+ 0x00, 0x7f, 0xc0, 0xf0, /* .........*********......****.... */
+ 0x01, 0xff, 0xc0, 0xf0, /* .......***********......****.... */
+ 0x03, 0xff, 0xff, 0xf0, /* ......**********************.... */
+ 0x07, 0xff, 0xff, 0xf0, /* .....***********************.... */
+ 0x07, 0xc3, 0xff, 0xf0, /* .....*****....**************.... */
+ 0x0f, 0x83, 0xff, 0xf0, /* ....*****.....**************.... */
+ 0x0f, 0x03, 0xc0, 0x00, /* ....****......****.............. */
+ 0x0f, 0x03, 0xc0, 0x00, /* ....****......****.............. */
+ 0x0f, 0x03, 0xc0, 0x00, /* ....****......****.............. */
+ 0x0f, 0x03, 0xc0, 0x00, /* ....****......****.............. */
+ 0x0f, 0x03, 0xc0, 0x00, /* ....****......****.............. */
+ 0x0f, 0x03, 0xc0, 0x00, /* ....****......****.............. */
+ 0x0f, 0x83, 0xe0, 0x00, /* ....*****.....*****............. */
+ 0x07, 0xc7, 0xf0, 0x00, /* .....*****...*******............ */
+ 0x07, 0xff, 0xff, 0xf0, /* .....***********************.... */
+ 0x03, 0xff, 0xff, 0xf0, /* ......**********************.... */
+ 0x01, 0xfe, 0x7f, 0xf0, /* .......********..***********.... */
+ 0x00, 0x7c, 0x3f, 0xf0, /* .........*****....**********.... */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
Index: src/sys/dev/wsfont/spleen8x16.h
diff -u src/sys/dev/wsfont/spleen8x16.h:1.5 src/sys/dev/wsfont/spleen8x16.h:1.6
--- src/sys/dev/wsfont/spleen8x16.h:1.5 Mon Jul 20 13:41:16 2020
+++ src/sys/dev/wsfont/spleen8x16.h Fri Jul 31 20:39:50 2020
@@ -1,8 +1,8 @@
-/* $NetBSD: spleen8x16.h,v 1.5 2020/07/20 13:41:16 fcambus Exp $ */
+/* $NetBSD: spleen8x16.h,v 1.6 2020/07/31 20:39:50 fcambus Exp $ */
/* $OpenBSD: spleen8x16.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
- * Copyright (c) 2018-2019 Frederic Cambus <[email protected]>
+ * Copyright (c) 2018-2020 Frederic Cambus <[email protected]>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -188,13 +188,13 @@ static u_char spleen8x16_data[] = {
0x60, /* .**..... */
0x60, /* .**..... */
0x60, /* .**..... */
- 0x60, /* .**..... */
- 0x60, /* .**..... */
0x30, /* ..**.... */
0x30, /* ..**.... */
0x18, /* ...**... */
0x0e, /* ....***. */
0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
0x00, /* ........ */
0x70, /* .***.... */
@@ -205,13 +205,13 @@ static u_char spleen8x16_data[] = {
0x06, /* .....**. */
0x06, /* .....**. */
0x06, /* .....**. */
- 0x06, /* .....**. */
- 0x06, /* .....**. */
0x0c, /* ....**.. */
0x0c, /* ....**.. */
0x18, /* ...**... */
0x70, /* .***.... */
0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
0x00, /* ........ */
0x00, /* ........ */
@@ -299,8 +299,6 @@ static u_char spleen8x16_data[] = {
0x00, /* ........ */
0x00, /* ........ */
- 0x03, /* ......** */
- 0x03, /* ......** */
0x06, /* .....**. */
0x06, /* .....**. */
0x0c, /* ....**.. */
@@ -314,6 +312,8 @@ static u_char spleen8x16_data[] = {
0xc0, /* **...... */
0xc0, /* **...... */
0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
0x00, /* ........ */
0x00, /* ........ */
@@ -1058,10 +1058,10 @@ static u_char spleen8x16_data[] = {
0x30, /* ..**.... */
0x30, /* ..**.... */
0x30, /* ..**.... */
- 0x30, /* ..**.... */
- 0x30, /* ..**.... */
0x3e, /* ..*****. */
0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
0x00, /* ........ */
0xc0, /* **...... */
@@ -1076,8 +1076,8 @@ static u_char spleen8x16_data[] = {
0x0c, /* ....**.. */
0x06, /* .....**. */
0x06, /* .....**. */
- 0x03, /* ......** */
- 0x03, /* ......** */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
0x00, /* ........ */
0x00, /* ........ */
@@ -1092,10 +1092,10 @@ static u_char spleen8x16_data[] = {
0x0c, /* ....**.. */
0x0c, /* ....**.. */
0x0c, /* ....**.. */
- 0x0c, /* ....**.. */
- 0x0c, /* ....**.. */
0x7c, /* .*****.. */
0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
0x00, /* ........ */
0x10, /* ...*.... */
@@ -1596,19 +1596,18 @@ static u_char spleen8x16_data[] = {
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
- 0x18, /* ...**... */
0x70, /* .***.... */
0x70, /* .***.... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
- 0x18, /* ...**... */
0x0e, /* ....***. */
0x00, /* ........ */
-
0x00, /* ........ */
0x00, /* ........ */
+
+ 0x00, /* ........ */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
@@ -1623,6 +1622,7 @@ static u_char spleen8x16_data[] = {
0x18, /* ...**... */
0x00, /* ........ */
0x00, /* ........ */
+ 0x00, /* ........ */
0x00, /* ........ */
0x70, /* .***.... */
@@ -1630,16 +1630,16 @@ static u_char spleen8x16_data[] = {
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
- 0x18, /* ...**... */
0x0e, /* ....***. */
0x0e, /* ....***. */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
- 0x18, /* ...**... */
0x70, /* .***.... */
0x00, /* ........ */
+ 0x00, /* ........ */
+ 0x00, /* ........ */
0x00, /* ........ */
0x00, /* ........ */
