Hi tech@,
Here is a diff to sync kernel fonts with the latest released Spleen
version, bringing the following improvements:
- Shift the middle bar of the upper case 'G' one pixel down in the 12x24
version
- Shift lower case 'k' character right, for better alignment in the 12x24,
16x32, and 32x64 versions
- Make upper case 'X' thicker in the 16x32 and 32x64 versions
- Make upper case 'V' thicker in the 32x64 version
- Make lower case 'g' character smoother in the 16x32 and 32x64 versions
- Add some artefacts on each side of the lower case 'i' characters
Comments? OK?
Index: sys/dev/wsfont/spleen12x24.h
===================================================================
RCS file: /cvs/src/sys/dev/wsfont/spleen12x24.h,v
retrieving revision 1.2
diff -u -p -r1.2 spleen12x24.h
--- sys/dev/wsfont/spleen12x24.h 8 Mar 2019 10:53:59 -0000 1.2
+++ sys/dev/wsfont/spleen12x24.h 5 Jun 2019 10:15:21 -0000
@@ -1029,13 +1029,13 @@ static u_char spleen12x24_data[] = {
0x60, 0x00, /* .**............. */
0x60, 0x00, /* .**............. */
0x60, 0x00, /* .**............. */
+ 0x60, 0x00, /* .**............. */
0x63, 0xe0, /* .**...*****..... */
0x60, 0x60, /* .**......**..... */
0x60, 0x60, /* .**......**..... */
0x60, 0x60, /* .**......**..... */
0x60, 0x60, /* .**......**..... */
0x60, 0x60, /* .**......**..... */
- 0x60, 0x60, /* .**......**..... */
0x30, 0x60, /* ..**.....**..... */
0x1f, 0xe0, /* ...********..... */
0x00, 0x00, /* ................ */
@@ -1877,6 +1877,7 @@ static u_char spleen12x24_data[] = {
0x06, 0x00, /* .....**......... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
+ 0x1e, 0x00, /* ...****......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
@@ -1886,8 +1887,7 @@ static u_char spleen12x24_data[] = {
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
- 0x06, 0x00, /* .....**......... */
- 0x06, 0x00, /* .....**......... */
+ 0x07, 0x80, /* .....****....... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
@@ -1923,21 +1923,21 @@ static u_char spleen12x24_data[] = {
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
- 0x60, 0x00, /* .**............. */
- 0x60, 0x00, /* .**............. */
- 0x60, 0x00, /* .**............. */
- 0x60, 0x00, /* .**............. */
- 0x61, 0x80, /* .**....**....... */
- 0x61, 0x80, /* .**....**....... */
- 0x63, 0x00, /* .**...**........ */
- 0x66, 0x00, /* .**..**......... */
- 0x7c, 0x00, /* .*****.......... */
- 0x6c, 0x00, /* .**.**.......... */
- 0x66, 0x00, /* .**..**......... */
- 0x63, 0x00, /* .**...**........ */
- 0x61, 0x80, /* .**....**....... */
- 0x60, 0xc0, /* .**.....**...... */
- 0x60, 0xc0, /* .**.....**...... */
+ 0x30, 0x00, /* ..**............ */
+ 0x30, 0x00, /* ..**............ */
+ 0x30, 0x00, /* ..**............ */
+ 0x30, 0x00, /* ..**............ */
+ 0x30, 0xc0, /* ..**....**...... */
+ 0x30, 0xc0, /* ..**....**...... */
+ 0x31, 0x80, /* ..**...**....... */
+ 0x33, 0x00, /* ..**..**........ */
+ 0x3e, 0x00, /* ..*****......... */
+ 0x36, 0x00, /* ..**.**......... */
+ 0x33, 0x00, /* ..**..**........ */
+ 0x31, 0x80, /* ..**...**....... */
+ 0x30, 0xc0, /* ..**....**...... */
+ 0x30, 0x60, /* ..**.....**..... */
+ 0x30, 0x60, /* ..**.....**..... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
@@ -5152,6 +5152,7 @@ static u_char spleen12x24_data[] = {
0x03, 0x00, /* ......**........ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
+ 0x1e, 0x00, /* ...****......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
@@ -5161,8 +5162,7 @@ static u_char spleen12x24_data[] = {
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
- 0x06, 0x00, /* .....**......... */
- 0x06, 0x00, /* .....**......... */
+ 0x07, 0x80, /* .....****....... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
@@ -5177,6 +5177,7 @@ static u_char spleen12x24_data[] = {
0x0c, 0x00, /* ....**.......... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
+ 0x1e, 0x00, /* ...****......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
@@ -5186,8 +5187,7 @@ static u_char spleen12x24_data[] = {
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
- 0x06, 0x00, /* .....**......... */
- 0x06, 0x00, /* .....**......... */
+ 0x07, 0x80, /* .....****....... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
@@ -5202,6 +5202,7 @@ static u_char spleen12x24_data[] = {
0x30, 0xc0, /* ..**....**...... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
+ 0x1e, 0x00, /* ...****......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
@@ -5211,8 +5212,7 @@ static u_char spleen12x24_data[] = {
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
- 0x06, 0x00, /* .....**......... */
- 0x06, 0x00, /* .....**......... */
+ 0x07, 0x80, /* .....****....... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
@@ -5227,6 +5227,7 @@ static u_char spleen12x24_data[] = {
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
+ 0x1e, 0x00, /* ...****......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
@@ -5236,8 +5237,7 @@ static u_char spleen12x24_data[] = {
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
0x06, 0x00, /* .....**......... */
- 0x06, 0x00, /* .....**......... */
- 0x06, 0x00, /* .....**......... */
+ 0x07, 0x80, /* .....****....... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
Index: sys/dev/wsfont/spleen16x32.h
===================================================================
RCS file: /cvs/src/sys/dev/wsfont/spleen16x32.h,v
retrieving revision 1.2
diff -u -p -r1.2 spleen16x32.h
--- sys/dev/wsfont/spleen16x32.h 8 Mar 2019 10:53:59 -0000 1.2
+++ sys/dev/wsfont/spleen16x32.h 5 Jun 2019 10:15:21 -0000
@@ -1904,14 +1904,14 @@ static u_char spleen16x32_data[] = {
0x30, 0x0c, /* ..**........**.. */
0x30, 0x0c, /* ..**........**.. */
0x30, 0x0c, /* ..**........**.. */
- 0x30, 0x0c, /* ..**........**.. */
- 0x18, 0x18, /* ...**......**... */
- 0x0c, 0x30, /* ....**....**.... */
+ 0x38, 0x1c, /* ..***......***.. */
+ 0x1c, 0x38, /* ...***....***... */
+ 0x0e, 0x70, /* ....***..***.... */
0x07, 0xe0, /* .....******..... */
0x07, 0xe0, /* .....******..... */
- 0x0c, 0x30, /* ....**....**.... */
- 0x18, 0x18, /* ...**......**... */
- 0x30, 0x0c, /* ..**........**.. */
+ 0x0e, 0x70, /* ....***..***.... */
+ 0x1c, 0x38, /* ...***....***... */
+ 0x38, 0x1c, /* ..***......***.. */
0x30, 0x0c, /* ..**........**.. */
0x30, 0x0c, /* ..**........**.. */
0x30, 0x0c, /* ..**........**.. */
@@ -2410,8 +2410,8 @@ static u_char spleen16x32_data[] = {
0x30, 0x0c, /* ..**........**.. */
0x30, 0x0c, /* ..**........**.. */
0x30, 0x0c, /* ..**........**.. */
- 0x38, 0x18, /* ..***......**... */
- 0x1f, 0xf0, /* ...*********.... */
+ 0x38, 0x1c, /* ..***......***.. */
+ 0x1f, 0xf8, /* ...**********... */
0x0f, 0xf0, /* ....********.... */
0x00, 0x18, /* ...........**... */
0x00, 0x0c, /* ............**.. */
@@ -2465,6 +2465,8 @@ static u_char spleen16x32_data[] = {
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
+ 0x07, 0x80, /* .....****....... */
+ 0x07, 0x80, /* .....****....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
@@ -2475,10 +2477,8 @@ static u_char spleen16x32_data[] = {
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
+ 0x01, 0xe0, /* .......****..... */
+ 0x01, 0xe0, /* .......****..... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
@@ -2525,26 +2525,26 @@ static u_char spleen16x32_data[] = {
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
- 0x30, 0x00, /* ..**............ */
- 0x30, 0x00, /* ..**............ */
- 0x30, 0x00, /* ..**............ */
- 0x30, 0x00, /* ..**............ */
- 0x30, 0x00, /* ..**............ */
- 0x30, 0x00, /* ..**............ */
- 0x30, 0x60, /* ..**.....**..... */
- 0x30, 0xe0, /* ..**....***..... */
- 0x31, 0xc0, /* ..**...***...... */
- 0x33, 0x80, /* ..**..***....... */
- 0x37, 0x00, /* ..**.***........ */
- 0x3e, 0x00, /* ..*****......... */
- 0x3e, 0x00, /* ..*****......... */
- 0x37, 0x00, /* ..**.***........ */
- 0x33, 0x80, /* ..**..***....... */
- 0x31, 0xc0, /* ..**...***...... */
- 0x30, 0xe0, /* ..**....***..... */
- 0x30, 0x70, /* ..**.....***.... */
- 0x30, 0x38, /* ..**......***... */
- 0x30, 0x18, /* ..**.......**... */
+ 0x18, 0x00, /* ...**........... */
+ 0x18, 0x00, /* ...**........... */
+ 0x18, 0x00, /* ...**........... */
+ 0x18, 0x00, /* ...**........... */
+ 0x18, 0x00, /* ...**........... */
+ 0x18, 0x00, /* ...**........... */
+ 0x18, 0x30, /* ...**.....**.... */
+ 0x18, 0x70, /* ...**....***.... */
+ 0x18, 0xe0, /* ...**...***..... */
+ 0x19, 0xc0, /* ...**..***...... */
+ 0x1b, 0x80, /* ...**.***....... */
+ 0x1f, 0x00, /* ...*****........ */
+ 0x1f, 0x00, /* ...*****........ */
+ 0x1b, 0x80, /* ...**.***....... */
+ 0x19, 0xc0, /* ...**..***...... */
+ 0x18, 0xe0, /* ...**...***..... */
+ 0x18, 0x70, /* ...**....***.... */
+ 0x18, 0x38, /* ...**.....***... */
+ 0x18, 0x1c, /* ...**......***.. */
+ 0x18, 0x0c, /* ...**.......**.. */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
@@ -6788,6 +6788,8 @@ static u_char spleen16x32_data[] = {
0x00, 0x60, /* .........**..... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
+ 0x07, 0x80, /* .....****....... */
+ 0x07, 0x80, /* .....****....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
@@ -6798,10 +6800,8 @@ static u_char spleen16x32_data[] = {
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
+ 0x01, 0xe0, /* .......****..... */
+ 0x01, 0xe0, /* .......****..... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
@@ -6821,6 +6821,8 @@ static u_char spleen16x32_data[] = {
0x06, 0x00, /* .....**......... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
+ 0x07, 0x80, /* .....****....... */
+ 0x07, 0x80, /* .....****....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
@@ -6831,10 +6833,8 @@ static u_char spleen16x32_data[] = {
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
+ 0x01, 0xe0, /* .......****..... */
+ 0x01, 0xe0, /* .......****..... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
@@ -6854,6 +6854,8 @@ static u_char spleen16x32_data[] = {
0x18, 0x18, /* ...**......**... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
+ 0x07, 0x80, /* .....****....... */
+ 0x07, 0x80, /* .....****....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
@@ -6864,10 +6866,8 @@ static u_char spleen16x32_data[] = {
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
+ 0x01, 0xe0, /* .......****..... */
+ 0x01, 0xe0, /* .......****..... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
@@ -6887,6 +6887,8 @@ static u_char spleen16x32_data[] = {
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
+ 0x07, 0x80, /* .....****....... */
+ 0x07, 0x80, /* .....****....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
@@ -6897,10 +6899,8 @@ static u_char spleen16x32_data[] = {
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
- 0x01, 0x80, /* .......**....... */
+ 0x01, 0xe0, /* .......****..... */
+ 0x01, 0xe0, /* .......****..... */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
0x00, 0x00, /* ................ */
Index: sys/dev/wsfont/spleen32x64.h
===================================================================
RCS file: /cvs/src/sys/dev/wsfont/spleen32x64.h,v
retrieving revision 1.2
diff -u -p -r1.2 spleen32x64.h
--- sys/dev/wsfont/spleen32x64.h 8 Mar 2019 10:53:59 -0000 1.2
+++ sys/dev/wsfont/spleen32x64.h 5 Jun 2019 10:15:22 -0000
@@ -3594,14 +3594,14 @@ static u_char spleen32x64_data[] = {
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
- 0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
0x0f, 0x80, 0x01, 0xf0, /* ....*****..............*****.... */
- 0x07, 0xc0, 0x03, 0xe0, /* .....*****............*****..... */
- 0x03, 0xe0, 0x07, 0xc0, /* ......*****..........*****...... */
- 0x01, 0xf0, 0x0f, 0x80, /* .......*****........*****....... */
- 0x00, 0xf8, 0x1f, 0x00, /* ........*****......*****........ */
- 0x00, 0x7c, 0x3e, 0x00, /* .........*****....*****......... */
- 0x00, 0x3e, 0x7c, 0x00, /* ..........*****..*****.......... */
+ 0x0f, 0xc0, 0x03, 0xf0, /* ....******............******.... */
+ 0x07, 0xe0, 0x07, 0xe0, /* .....******..........******..... */
+ 0x03, 0xf0, 0x0f, 0xc0, /* ......******........******...... */
+ 0x01, 0xf8, 0x1f, 0x80, /* .......******......******....... */
+ 0x00, 0xfc, 0x3f, 0x00, /* ........******....******........ */
+ 0x00, 0x7e, 0x7e, 0x00, /* .........******..******......... */
+ 0x00, 0x3f, 0xfc, 0x00, /* ..........************.......... */
0x00, 0x1f, 0xf8, 0x00, /* ...........**********........... */
0x00, 0x0f, 0xf0, 0x00, /* ............********............ */
0x00, 0x07, 0xe0, 0x00, /* .............******............. */
@@ -3709,18 +3709,19 @@ static u_char spleen32x64_data[] = {
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
- 0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
0x0f, 0x80, 0x01, 0xf0, /* ....*****..............*****.... */
- 0x07, 0xc0, 0x03, 0xe0, /* .....*****............*****..... */
- 0x03, 0xe0, 0x07, 0xc0, /* ......*****..........*****...... */
- 0x01, 0xf0, 0x0f, 0x80, /* .......*****........*****....... */
+ 0x0f, 0xc0, 0x03, 0xf0, /* ....******............******.... */
+ 0x07, 0xe0, 0x07, 0xe0, /* .....******..........******..... */
+ 0x03, 0xf0, 0x0f, 0xc0, /* ......******........******...... */
+ 0x01, 0xf8, 0x1f, 0x80, /* .......******......******....... */
0x00, 0xff, 0xff, 0x00, /* ........****************........ */
0x00, 0x7f, 0xfe, 0x00, /* .........**************......... */
0x00, 0x7f, 0xfe, 0x00, /* .........**************......... */
0x00, 0xff, 0xff, 0x00, /* ........****************........ */
- 0x01, 0xf0, 0x0f, 0x80, /* .......*****........*****....... */
- 0x03, 0xe0, 0x07, 0xc0, /* ......*****..........*****...... */
- 0x07, 0xc0, 0x03, 0xe0, /* .....*****............*****..... */
+ 0x01, 0xf8, 0x1f, 0x80, /* .......******......******....... */
+ 0x03, 0xf0, 0x0f, 0xc0, /* ......******........******...... */
+ 0x07, 0xe0, 0x07, 0xe0, /* .....******..........******..... */
+ 0x0f, 0xc0, 0x03, 0xf0, /* ....******............******.... */
0x0f, 0x80, 0x01, 0xf0, /* ....*****..............*****.... */
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
@@ -3735,7 +3736,6 @@ static u_char spleen32x64_data[] = {
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
- 0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
@@ -4705,13 +4705,13 @@ static u_char spleen32x64_data[] = {
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
0x0f, 0x00, 0x00, 0xf0, /* ....****................****.... */
- 0x0f, 0x80, 0x01, 0xe0, /* ....*****..............****..... */
- 0x07, 0xc0, 0x03, 0xc0, /* .....*****............****...... */
- 0x07, 0xff, 0xff, 0x80, /* .....********************....... */
- 0x03, 0xff, 0xff, 0x00, /* ......******************........ */
- 0x01, 0xff, 0xff, 0x00, /* .......*****************........ */
- 0x00, 0x7f, 0xff, 0x80, /* .........****************....... */
- 0x00, 0x00, 0x03, 0xc0, /* ......................****...... */
+ 0x0f, 0x80, 0x01, 0xf0, /* ....*****..............*****.... */
+ 0x07, 0xc0, 0x03, 0xe0, /* .....*****............*****..... */
+ 0x07, 0xff, 0xff, 0xc0, /* .....*********************...... */
+ 0x03, 0xff, 0xff, 0x80, /* ......*******************....... */
+ 0x01, 0xff, 0xff, 0x80, /* .......******************....... */
+ 0x00, 0x7f, 0xff, 0xc0, /* .........*****************...... */
+ 0x00, 0x00, 0x03, 0xe0, /* ......................*****..... */
0x00, 0x00, 0x01, 0xe0, /* .......................****..... */
0x00, 0x00, 0x00, 0xf0, /* ........................****.... */
0x00, 0x00, 0x00, 0xf0, /* ........................****.... */
@@ -4813,6 +4813,10 @@ static u_char spleen32x64_data[] = {
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
@@ -4833,14 +4837,10 @@ static u_char spleen32x64_data[] = {
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
@@ -4931,46 +4931,46 @@ static u_char spleen32x64_data[] = {
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
- 0x0f, 0x00, 0x00, 0x00, /* ....****........................ */
- 0x0f, 0x00, 0x00, 0x00, /* ....****........................ */
- 0x0f, 0x00, 0x00, 0x00, /* ....****........................ */
- 0x0f, 0x00, 0x00, 0x00, /* ....****........................ */
- 0x0f, 0x00, 0x00, 0x00, /* ....****........................ */
- 0x0f, 0x00, 0x00, 0x00, /* ....****........................ */
- 0x0f, 0x00, 0x00, 0x00, /* ....****........................ */
- 0x0f, 0x00, 0x00, 0x00, /* ....****........................ */
- 0x0f, 0x00, 0x00, 0x00, /* ....****........................ */
- 0x0f, 0x00, 0x00, 0x00, /* ....****........................ */
- 0x0f, 0x00, 0x00, 0x00, /* ....****........................ */
- 0x0f, 0x00, 0x00, 0x00, /* ....****........................ */
- 0x0f, 0x00, 0x1c, 0x00, /* ....****...........***.......... */
- 0x0f, 0x00, 0x3c, 0x00, /* ....****..........****.......... */
- 0x0f, 0x00, 0x7c, 0x00, /* ....****.........*****.......... */
- 0x0f, 0x00, 0xf8, 0x00, /* ....****........*****........... */
- 0x0f, 0x01, 0xf0, 0x00, /* ....****.......*****............ */
- 0x0f, 0x03, 0xe0, 0x00, /* ....****......*****............. */
- 0x0f, 0x07, 0xc0, 0x00, /* ....****.....*****.............. */
- 0x0f, 0x0f, 0x80, 0x00, /* ....****....*****............... */
- 0x0f, 0x1f, 0x00, 0x00, /* ....****...*****................ */
- 0x0f, 0x3e, 0x00, 0x00, /* ....****..*****................. */
- 0x0f, 0xfc, 0x00, 0x00, /* ....**********.................. */
- 0x0f, 0xfc, 0x00, 0x00, /* ....**********.................. */
- 0x0f, 0xfc, 0x00, 0x00, /* ....**********.................. */
- 0x0f, 0xfc, 0x00, 0x00, /* ....**********.................. */
- 0x0f, 0x3e, 0x00, 0x00, /* ....****..*****................. */
- 0x0f, 0x1f, 0x00, 0x00, /* ....****...*****................ */
- 0x0f, 0x0f, 0x80, 0x00, /* ....****....*****............... */
- 0x0f, 0x07, 0xc0, 0x00, /* ....****.....*****.............. */
- 0x0f, 0x03, 0xe0, 0x00, /* ....****......*****............. */
- 0x0f, 0x01, 0xf0, 0x00, /* ....****.......*****............ */
- 0x0f, 0x00, 0xf8, 0x00, /* ....****........*****........... */
- 0x0f, 0x00, 0x7c, 0x00, /* ....****.........*****.......... */
- 0x0f, 0x00, 0x3e, 0x00, /* ....****..........*****......... */
- 0x0f, 0x00, 0x1f, 0x00, /* ....****...........*****........ */
- 0x0f, 0x00, 0x0f, 0x80, /* ....****............*****....... */
- 0x0f, 0x00, 0x07, 0xc0, /* ....****.............*****...... */
- 0x0f, 0x00, 0x03, 0xc0, /* ....****..............****...... */
- 0x0f, 0x00, 0x03, 0xc0, /* ....****..............****...... */
+ 0x03, 0xc0, 0x00, 0x00, /* ......****...................... */
+ 0x03, 0xc0, 0x00, 0x00, /* ......****...................... */
+ 0x03, 0xc0, 0x00, 0x00, /* ......****...................... */
+ 0x03, 0xc0, 0x00, 0x00, /* ......****...................... */
+ 0x03, 0xc0, 0x00, 0x00, /* ......****...................... */
+ 0x03, 0xc0, 0x00, 0x00, /* ......****...................... */
+ 0x03, 0xc0, 0x00, 0x00, /* ......****...................... */
+ 0x03, 0xc0, 0x00, 0x00, /* ......****...................... */
+ 0x03, 0xc0, 0x00, 0x00, /* ......****...................... */
+ 0x03, 0xc0, 0x00, 0x00, /* ......****...................... */
+ 0x03, 0xc0, 0x00, 0x00, /* ......****...................... */
+ 0x03, 0xc0, 0x00, 0x00, /* ......****...................... */
+ 0x03, 0xc0, 0x07, 0x00, /* ......****...........***........ */
+ 0x03, 0xc0, 0x0f, 0x00, /* ......****..........****........ */
+ 0x03, 0xc0, 0x1f, 0x00, /* ......****.........*****........ */
+ 0x03, 0xc0, 0x3e, 0x00, /* ......****........*****......... */
+ 0x03, 0xc0, 0x7c, 0x00, /* ......****.......*****.......... */
+ 0x03, 0xc0, 0xf8, 0x00, /* ......****......*****........... */
+ 0x03, 0xc1, 0xf0, 0x00, /* ......****.....*****............ */
+ 0x03, 0xc3, 0xe0, 0x00, /* ......****....*****............. */
+ 0x03, 0xc7, 0xc0, 0x00, /* ......****...*****.............. */
+ 0x03, 0xcf, 0x80, 0x00, /* ......****..*****............... */
+ 0x03, 0xff, 0x00, 0x00, /* ......**********................ */
+ 0x03, 0xff, 0x00, 0x00, /* ......**********................ */
+ 0x03, 0xff, 0x00, 0x00, /* ......**********................ */
+ 0x03, 0xff, 0x00, 0x00, /* ......**********................ */
+ 0x03, 0xcf, 0x80, 0x00, /* ......****..*****............... */
+ 0x03, 0xc7, 0xc0, 0x00, /* ......****...*****.............. */
+ 0x03, 0xc3, 0xe0, 0x00, /* ......****....*****............. */
+ 0x03, 0xc1, 0xf0, 0x00, /* ......****.....*****............ */
+ 0x03, 0xc0, 0xf8, 0x00, /* ......****......*****........... */
+ 0x03, 0xc0, 0x7c, 0x00, /* ......****.......*****.......... */
+ 0x03, 0xc0, 0x3e, 0x00, /* ......****........*****......... */
+ 0x03, 0xc0, 0x1f, 0x00, /* ......****.........*****........ */
+ 0x03, 0xc0, 0x0f, 0x80, /* ......****..........*****....... */
+ 0x03, 0xc0, 0x07, 0xc0, /* ......****...........*****...... */
+ 0x03, 0xc0, 0x03, 0xe0, /* ......****............*****..... */
+ 0x03, 0xc0, 0x01, 0xf0, /* ......****.............*****.... */
+ 0x03, 0xc0, 0x00, 0xf0, /* ......****..............****.... */
+ 0x03, 0xc0, 0x00, 0xf0, /* ......****..............****.... */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
@@ -13328,6 +13328,10 @@ static u_char spleen32x64_data[] = {
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
@@ -13348,14 +13352,10 @@ static u_char spleen32x64_data[] = {
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
@@ -13393,6 +13393,10 @@ static u_char spleen32x64_data[] = {
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
@@ -13413,14 +13417,10 @@ static u_char spleen32x64_data[] = {
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
@@ -13458,6 +13458,10 @@ static u_char spleen32x64_data[] = {
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
@@ -13478,14 +13482,10 @@ static u_char spleen32x64_data[] = {
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
@@ -13523,6 +13523,10 @@ static u_char spleen32x64_data[] = {
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
+ 0x00, 0x3f, 0xc0, 0x00, /* ..........********.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
@@ -13543,14 +13547,10 @@ static u_char spleen32x64_data[] = {
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
- 0x00, 0x03, 0xc0, 0x00, /* ..............****.............. */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
+ 0x00, 0x03, 0xfc, 0x00, /* ..............********.......... */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
0x00, 0x00, 0x00, 0x00, /* ................................ */
Index: sys/dev/wsfont/spleen5x8.h
===================================================================
RCS file: /cvs/src/sys/dev/wsfont/spleen5x8.h,v
retrieving revision 1.2
diff -u -p -r1.2 spleen5x8.h
--- sys/dev/wsfont/spleen5x8.h 2 Dec 2018 14:47:23 -0000 1.2
+++ sys/dev/wsfont/spleen5x8.h 5 Jun 2019 10:15:22 -0000
@@ -704,10 +704,10 @@ static u_char spleen5x8_data[] = {
0x00, /* ........ */
0x20, /* ..*..... */
0x00, /* ........ */
+ 0x60, /* .**..... */
0x20, /* ..*..... */
0x20, /* ..*..... */
- 0x20, /* ..*..... */
- 0x20, /* ..*..... */
+ 0x30, /* ..**.... */
0x00, /* ........ */
0x00, /* ........ */
Index: sys/dev/wsfont/spleen8x16.h
===================================================================
RCS file: /cvs/src/sys/dev/wsfont/spleen8x16.h,v
retrieving revision 1.2
diff -u -p -r1.2 spleen8x16.h
--- sys/dev/wsfont/spleen8x16.h 8 Mar 2019 10:53:59 -0000 1.2
+++ sys/dev/wsfont/spleen8x16.h 5 Jun 2019 10:15:22 -0000
@@ -1290,13 +1290,13 @@ static u_char spleen8x16_data[] = {
0x18, /* ...**... */
0x18, /* ...**... */
0x00, /* ........ */
+ 0x38, /* ..***... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
- 0x18, /* ...**... */
- 0x18, /* ...**... */
+ 0x1c, /* ...***.. */
0x00, /* ........ */
0x00, /* ........ */
0x00, /* ........ */
@@ -3517,13 +3517,13 @@ static u_char spleen8x16_data[] = {
0x18, /* ...**... */
0x0c, /* ....**.. */
0x00, /* ........ */
+ 0x38, /* ..***... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
- 0x18, /* ...**... */
- 0x18, /* ...**... */
+ 0x1c, /* ...***.. */
0x00, /* ........ */
0x00, /* ........ */
0x00, /* ........ */
@@ -3534,13 +3534,13 @@ static u_char spleen8x16_data[] = {
0x18, /* ...**... */
0x30, /* ..**.... */
0x00, /* ........ */
+ 0x38, /* ..***... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
- 0x18, /* ...**... */
- 0x18, /* ...**... */
+ 0x1c, /* ...***.. */
0x00, /* ........ */
0x00, /* ........ */
0x00, /* ........ */
@@ -3551,13 +3551,13 @@ static u_char spleen8x16_data[] = {
0x3c, /* ..****.. */
0x66, /* .**..**. */
0x00, /* ........ */
+ 0x38, /* ..***... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
- 0x18, /* ...**... */
- 0x18, /* ...**... */
+ 0x1c, /* ...***.. */
0x00, /* ........ */
0x00, /* ........ */
0x00, /* ........ */
@@ -3568,13 +3568,13 @@ static u_char spleen8x16_data[] = {
0x66, /* .**..**. */
0x66, /* .**..**. */
0x00, /* ........ */
+ 0x38, /* ..***... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
0x18, /* ...**... */
- 0x18, /* ...**... */
- 0x18, /* ...**... */
+ 0x1c, /* ...***.. */
0x00, /* ........ */
0x00, /* ........ */
0x00, /* ........ */