From d76dcf2e9c19aac616cd904bbe9c1cc842d07df4 Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Wed, 6 Nov 2019 20:09:45 +0100
Subject: [PATCH] Small NewFont midline fixes

---
 fonts/8x16graph.pcf.gz        | Bin 17595 -> 17595 bytes
 fonts/9x16graph_patch.bdf     | 623 +---------------------------------
 fonts/map-newfont             |   6 +-
 fonts/newfont_8x16.h          |  41 +--
 fonts/newfont_9x16.h          |  45 +--
 fonts/unicodemap.h            |   6 +
 src/ftextview.cpp             |   3 +-
 src/include/final/flistview.h |  32 +-
 8 files changed, 72 insertions(+), 684 deletions(-)

diff --git a/fonts/8x16graph.pcf.gz b/fonts/8x16graph.pcf.gz
index 1a18040c8681c87a689050b3ea10d1ded1b30ec9..ca84deedc3bf894622bcbd9ae52451da1d6161f8 100644
GIT binary patch
delta 18
Zcmdnp$+)|dkzKx<gX5p@;f?HDTmV2g2G9Ti

delta 18
Zcmdnp$+)|dkzKx<gTr6x&_?zxE&w~k1}^{r

diff --git a/fonts/9x16graph_patch.bdf b/fonts/9x16graph_patch.bdf
index a0a40b27..9f55a952 100644
--- a/fonts/9x16graph_patch.bdf
+++ b/fonts/9x16graph_patch.bdf
@@ -24,7 +24,7 @@ SLANT "R"
 WEIGHT_NAME "Medium"
 X_HEIGHT 7
 ENDPROPERTIES
-CHARS 43
+CHARS 16
 STARTCHAR nf_revltarrow2
 ENCODING 57780
 SWIDTH 480 0
@@ -186,29 +186,6 @@ FF
 FF
 00
 ENDCHAR
-STARTCHAR nf_bor_left
-ENCODING 57788
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-ENDCHAR
 STARTCHAR nf_rev_up_aw2
 ENCODING 57789
 SWIDTH 480 0
@@ -255,420 +232,6 @@ FF
 FF
 00
 ENDCHAR
-STARTCHAR nf_bor_mid_ll
-ENCODING 57792
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-80
-80
-80
-80
-80
-80
-80
-FF
-00
-00
-00
-00
-00
-00
-00
-00
-ENDCHAR
-STARTCHAR nf_rev_up_aw1
-ENCODING 57793
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-7F
-7F
-7E
-7C
-78
-70
-60
-7C
-7C
-7C
-7C
-7C
-7C
-7F
-00
-ENDCHAR
-STARTCHAR nf_rev_dn_aw1
-ENCODING 57794
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-7F
-7C
-7C
-7C
-7C
-7C
-7C
-60
-70
-78
-7C
-7E
-7F
-7F
-00
-ENDCHAR
-STARTCHAR nf_bor_vrt
-ENCODING 57795
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-80
-80
-80
-80
-80
-80
-80
-FF
-80
-80
-80
-80
-80
-80
-80
-80
-ENDCHAR
-STARTCHAR nf_bor_up+dn
-ENCODING 57797
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-FF
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-FF
-ENDCHAR
-STARTCHAR nf_shw_box_mid
-ENCODING 57798
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-FF
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-FF
-FF
-00
-ENDCHAR
-STARTCHAR nf_shw_box_hdd
-ENCODING 57799
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-FF
-00
-00
-0E
-00
-00
-00
-00
-00
-00
-00
-00
-FF
-FF
-00
-ENDCHAR
-STARTCHAR nf_rev_lf_aw1
-ENCODING 57800
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-7F
-7F
-7F
-79
-71
-60
-40
-60
-71
-79
-7F
-7F
-7F
-7F
-00
-ENDCHAR
-STARTCHAR nf_rev_rt_aw1
-ENCODING 57801
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-7F
-7F
-7F
-7F
-7F
-40
-40
-40
-7F
-7F
-7F
-7F
-7F
-7F
-00
-ENDCHAR
-STARTCHAR nf_rev_mn_btn1
-ENCODING 57802
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-7F
-7F
-7F
-7F
-7F
-7F
-7E
-7E
-7F
-7F
-7F
-7F
-7F
-7F
-00
-ENDCHAR
-STARTCHAR nf_rev_mn_btn2
-ENCODING 57803
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-FF
-FF
-FF
-FF
-FF
-FF
-00
-00
-FF
-FF
-FF
-FF
-FF
-FF
-00
-ENDCHAR
-STARTCHAR nf_bor_mid_ul
-ENCODING 57804
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-00
-00
-00
-00
-00
-00
-FF
-80
-80
-80
-80
-80
-80
-80
-80
-ENDCHAR
-STARTCHAR nf_shw_box_cd
-ENCODING 57805
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-FF
-00
-00
-6C
-8A
-8A
-8A
-6C
-00
-00
-00
-00
-FF
-FF
-00
-ENDCHAR
-STARTCHAR nf_shw_box_lf
-ENCODING 57806
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-07
-04
-04
-04
-04
-04
-04
-04
-04
-04
-04
-04
-07
-03
-00
-ENDCHAR
-STARTCHAR nf_shw_box_net
-ENCODING 57809
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-FF
-00
-00
-12
-1A
-16
-12
-12
-00
-00
-00
-00
-FF
-FF
-00
-ENDCHAR
-STARTCHAR nf_rev_up_tri1
-ENCODING 57810
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-7F
-7F
-7F
-7F
-7E
-7C
-78
-70
-60
-7F
-7F
-7F
-7F
-7F
-00
-ENDCHAR
-STARTCHAR nf_bor_ll
-ENCODING 57811
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-FF
-ENDCHAR
-STARTCHAR nf_bor_bottom
-ENCODING 57812
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-FF
-ENDCHAR
 STARTCHAR nf_radio_btn2
 ENCODING 57813
 SWIDTH 480 0
@@ -715,52 +278,6 @@ FE
 00
 00
 ENDCHAR
-STARTCHAR nf_rev_dn_tri1
-ENCODING 57815
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-7F
-7F
-7F
-7F
-7F
-60
-70
-78
-7C
-7E
-7F
-7F
-7F
-7F
-00
-ENDCHAR
-STARTCHAR nf_bor_upper
-ENCODING 57816
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-FF
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-00
-ENDCHAR
 STARTCHAR nf_radio_btn1
 ENCODING 57817
 SWIDTH 480 0
@@ -784,52 +301,6 @@ BITMAP
 00
 00
 ENDCHAR
-STARTCHAR nf_bor_ul
-ENCODING 57818
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-FF
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-80
-ENDCHAR
-STARTCHAR nf_shw_box_chk
-ENCODING 57820
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-FF
-00
-01
-03
-06
-06
-CC
-6C
-38
-18
-00
-00
-FF
-FF
-00
-ENDCHAR
 STARTCHAR nf_rev_b_rt+lf
 ENCODING 57831
 SWIDTH 480 0
@@ -922,96 +393,4 @@ FF
 FF
 00
 ENDCHAR
-STARTCHAR nf_shw_box_rt
-ENCODING 57845
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-C0
-60
-60
-60
-60
-60
-60
-60
-60
-60
-60
-60
-E0
-E0
-00
-ENDCHAR
-STARTCHAR nf_bullet
-ENCODING 57849
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-00
-00
-00
-38
-7C
-FE
-FE
-FE
-7C
-38
-00
-00
-00
-00
-00
-ENDCHAR
-STARTCHAR nf_check_mark
-ENCODING 57851
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-03
-03
-06
-06
-0C
-0C
-CC
-D8
-D8
-78
-38
-00
-00
-00
-00
-ENDCHAR
-STARTCHAR nf_xsuperior
-ENCODING 57852
-SWIDTH 480 0
-DWIDTH 8 0
-BBX 8 16 0 -4
-BITMAP
-00
-CC
-78
-30
-30
-78
-CC
-00
-00
-00
-00
-00
-00
-00
-00
-00
-ENDCHAR
 ENDFONT
diff --git a/fonts/map-newfont b/fonts/map-newfont
index f8675b1b..2ccb54a9 100644
--- a/fonts/map-newfont
+++ b/fonts/map-newfont
@@ -222,8 +222,8 @@
 0xcc	0xe1cc	#	NF BORDER CORNER MIDDLE UPPER LEFT
 0xcd	0xe1cd	#	NF SHADOW BOX CD
 0xce	0xe1ce	#	NF SHADOW BOX LEFT
-0xcf  0xe1cf  # NF BORDER LINE MIDDLE LEFT DOWN
-0xd0  0xe1d0  # NF BORDER LINE MIDDLE RIGHT UP
+0xcf	0xe1cf	#	NF BORDER LINE MIDDLE LEFT DOWN
+0xd0	0xe1d0	#	NF BORDER LINE MIDDLE RIGHT UP
 0xd1	0xe1d1	#	NF SHADOW BOX NET
 0xd2	0xe1d2	#	NF REVERSE UP POINTING TRIANGLE 1
 0xd3	0xe1d3	#	NF BORDER CORNER LOWER LEFT
@@ -250,7 +250,7 @@
 0xe8	0xe1e8	#	NF REVERSE UP POINTING TRIANGLE 2
 0xe9	0xe1e9	#	NF REVERSE DOWN POINTING TRIANGLE 2
 0xea	0xe1ea	#	NF BORDER CORNER MIDDLE LOWER RIGHT
-0xd0	0xe1d0	#	NF BORDER CORNER MIDDLE UPPER RIGHT
+0xeb	0xe1eb	#	NF BORDER CORNER MIDDLE UPPER RIGHT
 0xec	0x221e	#	INFINITY
 0xed	0x03c6	#	GREEK SMALL LETTER PHI
 0xee	0x03b5	#	GREEK SMALL LETTER EPSILON
diff --git a/fonts/newfont_8x16.h b/fonts/newfont_8x16.h
index 4d318bf5..bc24802b 100644
--- a/fonts/newfont_8x16.h
+++ b/fonts/newfont_8x16.h
@@ -246,26 +246,27 @@ static unsigned char __8x16graph[] =
   0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0x7e, 0x3e, 0x1e, 0x0e, 0x06, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00,  /* 232 */
   0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x06, 0x0e, 0x1e, 0x3e, 0x7e, 0xfe, 0xfe, 0xfe, 0xfe, 0x00,  /* 233 */
   0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 234 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xdb, 0xdb, 0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 235 */
-  0x00, 0x00, 0x00, 0x03, 0x06, 0x7e, 0xdb, 0xdb, 0xf3, 0x7e, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00,  /* 236 */
-  0x00, 0x00, 0x1c, 0x30, 0x60, 0x60, 0x7c, 0x60, 0x60, 0x60, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00,  /* 237 */
-  0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,  /* 238 */
-  0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 239 */
-  0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00,  /* 240 */
-  0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,  /* 241 */
-  0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,  /* 242 */
-  0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x7e, 0x7e, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00,  /* 243 */
-  0x00, 0xc0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xe0, 0xe0, 0x00,  /* 244 */
-  0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 245 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 246 */
-  0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 247 */
-  0x00, 0x00, 0x00, 0x00, 0x38, 0x7c, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 248 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 249 */
-  0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0xcc, 0xd8, 0xd8, 0x78, 0x38, 0x00, 0x00, 0x00, 0x00,  /* 250 */
-  0x00, 0xcc, 0x78, 0x30, 0x30, 0x78, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 251 */
-  0x00, 0x70, 0xd8, 0x30, 0x60, 0xc8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 252 */
-  0x00, 0x00, 0x00, 0x00, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 253 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00   /* 254 */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,  /* 235 */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xdb, 0xdb, 0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 236 */
+  0x00, 0x00, 0x00, 0x03, 0x06, 0x7e, 0xdb, 0xdb, 0xf3, 0x7e, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00,  /* 237 */
+  0x00, 0x00, 0x1c, 0x30, 0x60, 0x60, 0x7c, 0x60, 0x60, 0x60, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00,  /* 238 */
+  0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,  /* 239 */
+  0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 240 */
+  0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00,  /* 241 */
+  0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,  /* 242 */
+  0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,  /* 243 */
+  0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x7e, 0x7e, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00,  /* 244 */
+  0x00, 0xc0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xe0, 0xe0, 0x00,  /* 245 */
+  0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 246 */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 247 */
+  0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 248 */
+  0x00, 0x00, 0x00, 0x00, 0x38, 0x7c, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 249 */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 250 */
+  0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0xcc, 0xd8, 0xd8, 0x78, 0x38, 0x00, 0x00, 0x00, 0x00,  /* 251 */
+  0x00, 0xcc, 0x78, 0x30, 0x30, 0x78, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 252 */
+  0x00, 0x70, 0xd8, 0x30, 0x60, 0xc8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 253 */
+  0x00, 0x00, 0x00, 0x00, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 254 */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00   /* 255 */
 };
 
 }  // namespace fc
diff --git a/fonts/newfont_9x16.h b/fonts/newfont_9x16.h
index 32df785c..cfec8120 100644
--- a/fonts/newfont_9x16.h
+++ b/fonts/newfont_9x16.h
@@ -203,7 +203,7 @@ static unsigned char __9x16graph[] =
   0x00, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0x00,  /* 189 */
   0x00, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0x00,  /* 190 */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  /* 191 */
-  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 192 */
+  0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 192 */
   0x00, 0x7f, 0x7f, 0x7e, 0x7c, 0x78, 0x70, 0x60, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7f, 0x00,  /* 193 */
   0x00, 0x7f, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x60, 0x70, 0x78, 0x7c, 0x7e, 0x7f, 0x7f, 0x00,  /* 194 */
   0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xff, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  /* 195 */
@@ -215,7 +215,7 @@ static unsigned char __9x16graph[] =
   0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x40, 0x40, 0x40, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00,  /* 201 */
   0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7e, 0x7e, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00,  /* 202 */
   0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,  /* 203 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  /* 204 */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,  /* 204 */
   0x00, 0xff, 0x00, 0x00, 0x6c, 0x8a, 0x8a, 0x8a, 0x6c, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,  /* 205 */
   0x00, 0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07, 0x03, 0x00,  /* 206 */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,  /* 207 */
@@ -246,26 +246,27 @@ static unsigned char __9x16graph[] =
   0x00, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,  /* 232 */
   0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x00,  /* 233 */
   0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 234 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xdb, 0xdb, 0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 235 */
-  0x00, 0x00, 0x00, 0x03, 0x06, 0x7e, 0xdb, 0xdb, 0xf3, 0x7e, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00,  /* 236 */
-  0x00, 0x00, 0x1c, 0x30, 0x60, 0x60, 0x7c, 0x60, 0x60, 0x60, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00,  /* 237 */
-  0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,  /* 238 */
-  0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 239 */
-  0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00,  /* 240 */
-  0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,  /* 241 */
-  0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,  /* 242 */
-  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,  /* 243 */
-  0x00, 0xc0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xe0, 0xe0, 0x00,  /* 244 */
-  0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 245 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 246 */
-  0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 247 */
-  0x00, 0x00, 0x00, 0x00, 0x38, 0x7c, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 248 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 249 */
-  0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0xcc, 0xd8, 0xd8, 0x78, 0x38, 0x00, 0x00, 0x00, 0x00,  /* 250 */
-  0x00, 0xcc, 0x78, 0x30, 0x30, 0x78, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 251 */
-  0x00, 0x70, 0xd8, 0x30, 0x60, 0xc8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 252 */
-  0x00, 0x00, 0x00, 0x00, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 253 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00   /* 254 */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,  /* 235 */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xdb, 0xdb, 0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 236 */
+  0x00, 0x00, 0x00, 0x03, 0x06, 0x7e, 0xdb, 0xdb, 0xf3, 0x7e, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00,  /* 237 */
+  0x00, 0x00, 0x1c, 0x30, 0x60, 0x60, 0x7c, 0x60, 0x60, 0x60, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00,  /* 238 */
+  0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,  /* 239 */
+  0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 240 */
+  0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00,  /* 241 */
+  0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,  /* 242 */
+  0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,  /* 243 */
+  0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,  /* 244 */
+  0x00, 0xc0, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0xe0, 0xe0, 0x00,  /* 245 */
+  0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 246 */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 247 */
+  0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 248 */
+  0x00, 0x00, 0x00, 0x00, 0x38, 0x7c, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 249 */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 250 */
+  0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0xcc, 0xd8, 0xd8, 0x78, 0x38, 0x00, 0x00, 0x00, 0x00,  /* 251 */
+  0x00, 0xcc, 0x78, 0x30, 0x30, 0x78, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 252 */
+  0x00, 0x70, 0xd8, 0x30, 0x60, 0xc8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 253 */
+  0x00, 0x00, 0x00, 0x00, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 254 */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00   /* 255 */
 };
 
 }  // namespace fc
diff --git a/fonts/unicodemap.h b/fonts/unicodemap.h
index 52a5af6a..8b01d63d 100644
--- a/fonts/unicodemap.h
+++ b/fonts/unicodemap.h
@@ -559,8 +559,10 @@ static struct unipair unicode_newfont_pairs[] =
   {0x266b, 0x0e},
   {0x266c, 0x0e},
   {0x2713, 0xfb},
+  {0xe1b3, 0xb3},
   {0xe1b4, 0xb4},
   {0xe1b5, 0xb5},
+  {0xe1b6, 0xb6},
   {0xe1b7, 0xb7},
   {0xe1b8, 0xb8},
   {0xe1b9, 0xb9},
@@ -569,10 +571,12 @@ static struct unipair unicode_newfont_pairs[] =
   {0xe1bc, 0xbc},
   {0xe1bd, 0xbd},
   {0xe1be, 0xbe},
+  {0xe1bf, 0xbf},
   {0xe1c0, 0xc0},
   {0xe1c1, 0xc1},
   {0xe1c2, 0xc2},
   {0xe1c3, 0xc3},
+  {0xe1c4, 0xc4},
   {0xe1c5, 0xc5},
   {0xe1c6, 0xc6},
   {0xe1c7, 0xc7},
@@ -599,6 +603,8 @@ static struct unipair unicode_newfont_pairs[] =
   {0xe1e7, 0xe7},
   {0xe1e8, 0xe8},
   {0xe1e9, 0xe9},
+  {0xe1ea, 0xea},
+  {0xe1eb, 0xeb},
   {0xe1f4, 0xf4},
   {0xe1f5, 0xf5},
   {0xe1f9, 0xf9},
diff --git a/src/ftextview.cpp b/src/ftextview.cpp
index a929022b..fa31ca0b 100644
--- a/src/ftextview.cpp
+++ b/src/ftextview.cpp
@@ -620,7 +620,8 @@ void FTextView::drawBorder()
     if ( isMonochron() )
       setReverse(true);
 
-    FWidget::drawBorder();
+    FRect box(FPoint(1, 1), getSize());
+    finalcut::drawListBorder (this, box);
 
     if ( isMonochron() )
       setReverse(false);
diff --git a/src/include/final/flistview.h b/src/include/final/flistview.h
index e4a01977..257b5cd7 100644
--- a/src/include/final/flistview.h
+++ b/src/include/final/flistview.h
@@ -126,14 +126,14 @@ class FListViewItem : public FObject
     void                resetVisibleLineCounter();
 
     // Data members
-    FStringList      column_list{};
-    FDataPtr         data_pointer{nullptr};
-    iterator         root{};
-    std::size_t      visible_lines{1};
-    bool             expandable{false};
-    bool             is_expand{false};
-    bool             checkable{false};
-    bool             is_checked{false};
+    FStringList         column_list{};
+    FDataPtr            data_pointer{nullptr};
+    iterator            root{};
+    std::size_t         visible_lines{1};
+    bool                expandable{false};
+    bool                is_expand{false};
+    bool                checkable{false};
+    bool                is_checked{false};
 
     // Friend class
     friend class FListView;
@@ -208,21 +208,21 @@ class FListViewIterator
     bool               operator != (const FListViewIterator&) const;
 
     // Accessor
-    const FString       getClassName() const;
-    int                 getPosition() const;
+    const FString      getClassName() const;
+    int                getPosition() const;
 
     // Methods
-    void                parentElement();
+    void               parentElement();
 
   private:
     // Methods
-    void                nextElement (iterator&);
-    void                prevElement (iterator&);
+    void               nextElement (iterator&);
+    void               prevElement (iterator&);
 
     // Data members
-    iterator_stack       iter_path{};
-    iterator             node{};
-    int                  position{0};
+    iterator_stack     iter_path{};
+    iterator           node{};
+    int                position{0};
 };