Hi tech@,
Here is a diff to sync kernel fonts with the latest released Spleen
version, bringing the following improvements:
- Character at position CB is 'E' with diaeresis, not with tilde (12x24 version)
- Character at position D6 is 'O' with diaeresis, not with tilde (12x24 version)
- Character at position DC is 'U' with diaeresis, not with tilde (12x24 version)
- Fix middle bar thickness in the upper case 'eth' character (12x24 version)
- Fix ring alignment for the 'A' and 'a' characters (16x32 and 32x64 versions)
- Fix tilde alignment in the 'o' with tilde character (32x64 version)
- Remove strain pixel on the '3' and 'k' characters (32x64 version)
Comments? OK?
Index: sys/dev/wsfont/spleen12x24.h
===================================================================
RCS file: /cvs/src/sys/dev/wsfont/spleen12x24.h,v
retrieving revision 1.3
diff -u -p -r1.3 spleen12x24.h
--- sys/dev/wsfont/spleen12x24.h 8 Jun 2019 07:44:07 -0000 1.3
+++ sys/dev/wsfont/spleen12x24.h 3 Sep 2019 20:22:08 -0000
@@ -4319,9 +4319,9 @@ static u_char spleen12x24_data[] = {
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
- 0x1c, 0x60, /* ...***...**..... */
- 0x3f, 0xc0, /* ..********...... */
- 0x63, 0x80, /* .**...***....... */
+ 0x00, 0x00, /* ................ */
+ 0x30, 0xc0, /* ..**....**...... */
+ 0x30, 0xc0, /* ..**....**...... */
0x00, 0x00, /* ................ */
0x1f, 0xe0, /* ...********..... */
0x30, 0x00, /* ..**............ */
@@ -4419,9 +4419,9 @@ static u_char spleen12x24_data[] = {
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
- 0x1c, 0x60, /* ...***...**..... */
- 0x3f, 0xc0, /* ..********...... */
- 0x63, 0x80, /* .**...***....... */
+ 0x00, 0x00, /* ................ */
+ 0x30, 0xc0, /* ..**....**...... */
+ 0x30, 0xc0, /* ..**....**...... */
0x00, 0x00, /* ................ */
0x3f, 0xc0, /* ..********...... */
0x06, 0x00, /* .....**......... */
@@ -4456,7 +4456,7 @@ static u_char spleen12x24_data[] = {
0x60, 0x60, /* .**......**..... */
0x60, 0x60, /* .**......**..... */
0xfc, 0x60, /* ******...**..... */
- 0xfc, 0x60, /* ******...**..... */
+ 0x60, 0x60, /* .**......**..... */
0x60, 0x60, /* .**......**..... */
0x60, 0x60, /* .**......**..... */
0x60, 0x60, /* .**......**..... */
@@ -4744,9 +4744,9 @@ static u_char spleen12x24_data[] = {
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
- 0x1c, 0x60, /* ...***...**..... */
- 0x3f, 0xc0, /* ..********...... */
- 0x63, 0x80, /* .**...***....... */
+ 0x00, 0x00, /* ................ */
+ 0x30, 0xc0, /* ..**....**...... */
+ 0x30, 0xc0, /* ..**....**...... */
0x00, 0x00, /* ................ */
0x60, 0x60, /* .**......**..... */
0x60, 0x60, /* .**......**..... */
Index: sys/dev/wsfont/spleen16x32.h
===================================================================
RCS file: /cvs/src/sys/dev/wsfont/spleen16x32.h,v
retrieving revision 1.3
diff -u -p -r1.3 spleen16x32.h
--- sys/dev/wsfont/spleen16x32.h 8 Jun 2019 07:44:07 -0000 1.3
+++ sys/dev/wsfont/spleen16x32.h 3 Sep 2019 20:22:09 -0000
@@ -5489,12 +5489,12 @@ static u_char spleen16x32_data[] = {
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
- 0x00, 0x00, /* ................ */
0x01, 0x80, /* .......**....... */
0x03, 0xc0, /* ......****...... */
0x06, 0x60, /* .....**..**..... */
0x06, 0x60, /* .....**..**..... */
0x03, 0xc0, /* ......****...... */
+ 0x01, 0x80, /* .......**....... */
0x0f, 0xf0, /* ....********.... */
0x1f, 0xf8, /* ...**********... */
0x38, 0x1c, /* ..***......***.. */
@@ -6548,7 +6548,6 @@ static u_char spleen16x32_data[] = {
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
- 0x00, 0x00, /* ................ */
0x01, 0xc0, /* .......***...... */
0x03, 0xe0, /* ......*****..... */
0x06, 0x30, /* .....**...**.... */
@@ -6556,6 +6555,7 @@ static u_char spleen16x32_data[] = {
0x06, 0x30, /* .....**...**.... */
0x03, 0xe0, /* ......*****..... */
0x01, 0xc0, /* .......***...... */
+ 0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x1f, 0xf0, /* ...*********.... */
0x1f, 0xf8, /* ...**********... */
Index: sys/dev/wsfont/spleen32x64.h
===================================================================
RCS file: /cvs/src/sys/dev/wsfont/spleen32x64.h,v
retrieving revision 1.3
diff -u -p -r1.3 spleen32x64.h
--- sys/dev/wsfont/spleen32x64.h 8 Jun 2019 07:44:07 -0000 1.3
+++ sys/dev/wsfont/spleen32x64.h 3 Sep 2019 20:22:09 -0000
@@ -1309,7 +1309,7 @@ static u_char spleen32x64_data[] = {
0x00, 0x00, 0x03, 0xc0, /* ......................****...... */
0x00, 0x3f, 0xff, 0x80, /* ..........***************....... */
0x00, 0x3f, 0xff, 0x00, /* ..........**************........ */
- 0x00, 0x3f, 0xff, 0x80, /* ..........***************....... */
+ 0x00, 0x3f, 0xff, 0x00, /* ..........**************........ */
0x00, 0x3f, 0xff, 0x80, /* ..........***************....... */
0x00, 0x00, 0x03, 0xc0, /* ......................****...... */
0x00, 0x00, 0x01, 0xe0, /* .......................****..... */
@@ -4970,7 +4970,7 @@ static u_char spleen32x64_data[] = {
0x03, 0xc0, 0x03, 0xe0, /* ......****............*****..... */
0x03, 0xc0, 0x01, 0xf0, /* ......****.............*****.... */
0x03, 0xc0, 0x00, 0xf0, /* ......****..............****.... */
- 0x03, 0xc0, 0x00, 0xf0, /* ......****..............****.... */
+ 0x03, 0xc0, 0x00, 0x70, /* ......****...............***.... */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
@@ -10769,8 +10769,6 @@ static u_char spleen32x64_data[] = {
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
- 0x00, 0x00, 0x00, 0x00, /* ................................ */
- 0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x07, 0xe0, 0x00, /* .............******............. */
0x00, 0x0f, 0xf0, 0x00, /* ............********............ */
@@ -10781,6 +10779,8 @@ static u_char spleen32x64_data[] = {
0x00, 0x3c, 0x3c, 0x00, /* ..........****....****.......... */
0x00, 0x1f, 0xf8, 0x00, /* ...........**********........... */
0x00, 0x0f, 0xf0, 0x00, /* ............********............ */
+ 0x00, 0x07, 0xe0, 0x00, /* .............******............. */
+ 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x7f, 0xfe, 0x00, /* .........**************......... */
0x01, 0xff, 0xff, 0x80, /* .......******************....... */
0x03, 0xff, 0xff, 0xc0, /* ......********************...... */
@@ -12855,8 +12855,6 @@ static u_char spleen32x64_data[] = {
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
- 0x00, 0x00, 0x00, 0x00, /* ................................ */
- 0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x01, 0xe0, 0x00, /* ...............****............. */
0x00, 0x07, 0xf8, 0x00, /* .............********........... */
0x00, 0x0f, 0xfc, 0x00, /* ............**********.......... */
@@ -12873,6 +12871,8 @@ static u_char spleen32x64_data[] = {
0x00, 0x01, 0xe0, 0x00, /* ...............****............. */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
+ 0x00, 0x00, 0x00, 0x00, /* ................................ */
+ 0x00, 0x00, 0x00, 0x00, /* ................................ */
0x03, 0xff, 0xfe, 0x00, /* ......*****************......... */
0x03, 0xff, 0xff, 0x80, /* ......*******************....... */
0x03, 0xff, 0xff, 0xc0, /* ......********************...... */
@@ -13897,16 +13897,16 @@ static u_char spleen32x64_data[] = {
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
- 0x00, 0xf0, 0x01, 0xe0, /* ........****...........****..... */
- 0x03, 0xfc, 0x01, 0xe0, /* ......********.........****..... */
- 0x07, 0xfe, 0x01, 0xe0, /* .....**********........****..... */
- 0x0f, 0xff, 0x01, 0xe0, /* ....************.......****..... */
- 0x1f, 0x9f, 0x83, 0xe0, /* ...******..******.....*****..... */
- 0x1f, 0x0f, 0xc7, 0xe0, /* ...*****....******...******..... */
- 0x1e, 0x07, 0xff, 0xc0, /* ...****......*************...... */
- 0x1e, 0x03, 0xff, 0x80, /* ...****.......***********....... */
- 0x1e, 0x01, 0xff, 0x00, /* ...****........*********........ */
- 0x1e, 0x00, 0x7c, 0x00, /* ...****..........*****.......... */
+ 0x00, 0x78, 0x00, 0xf0, /* .........****...........****.... */
+ 0x01, 0xfe, 0x00, 0xf0, /* .......********.........****.... */
+ 0x03, 0xff, 0x00, 0xf0, /* ......**********........****.... */
+ 0x07, 0xff, 0x80, 0xf0, /* .....************.......****.... */
+ 0x0f, 0xcf, 0xc1, 0xf0, /* ....******..******.....*****.... */
+ 0x0f, 0x87, 0xe3, 0xf0, /* ....*****....******...******.... */
+ 0x0f, 0x03, 0xff, 0xe0, /* ....****......*************..... */
+ 0x0f, 0x01, 0xff, 0xc0, /* ....****.......***********...... */
+ 0x0f, 0x00, 0xff, 0x80, /* ....****........*********....... */
+ 0x0f, 0x00, 0x3e, 0x00, /* ....****..........*****......... */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
