Browse Source

Bring superscripts slightly lower in BDF fonts

Scott Lahteine 5 years ago
parent
commit
82c96c971e

+ 4
- 8
Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h View File

@@ -1,9 +1,6 @@
1 1
 /**
2 2
  * Marlin 3D Printer Firmware
3
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
- *
5
- * Based on Sprinter and grbl.
6
- * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
3
+ * Copyright (C) 2018 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
7 4
  *
8 5
  * This program is free software: you can redistribute it and/or modify
9 6
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +32,6 @@
35 32
   X Font      ascent = 8 descent=-2
36 33
   Max Font    ascent = 8 descent=-2
37 34
 */
38
-
39 35
 const u8g_fntpgm_uint8_t ISO10646_1_5x7[1328] U8G_FONT_SECTION("ISO10646_1_5x7") = {
40 36
   0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0x7f,0xfe,0x08,0xfe,0x08,
41 37
   0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,
@@ -233,12 +229,12 @@ const u8g_fntpgm_uint8_t ISO10646_1_5x7[2651] U8G_FONT_SECTION("ISO10646_1_5x7")
233 229
   0xf8,0x08,0x08,0x03,0x01,0x01,0x06,0x01,0x03,0xe0,0x06,0x07,0x07,0x06,0x00,0x00,
234 230
   0x78,0x84,0xb4,0xa4,0xa4,0x84,0x78,0x05,0x01,0x01,0x06,0x00,0x07,0xf8,0x04,0x04,
235 231
   0x04,0x06,0x01,0x05,0x60,0x90,0x90,0x60,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x20,
236
-  0xf8,0x20,0x20,0x00,0xf8,0x03,0x05,0x05,0x06,0x01,0x05,0x40,0xa0,0x20,0x40,0xe0,
237
-  0x03,0x05,0x05,0x06,0x01,0x05,0xc0,0x20,0x40,0x20,0xc0,0x03,0x03,0x03,0x06,0x01,
232
+  0xf8,0x20,0x20,0x00,0xf8,0x03,0x05,0x05,0x06,0x01,0x04,0x40,0xa0,0x20,0x40,0xe0,
233
+  0x03,0x05,0x05,0x06,0x01,0x04,0xc0,0x20,0x40,0x20,0xc0,0x03,0x03,0x03,0x06,0x01,
238 234
   0x05,0x20,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,0x98,0xe8,0x80,
239 235
   0x80,0x05,0x08,0x08,0x06,0x00,0x00,0x78,0xe8,0xe8,0xe8,0x68,0x28,0x28,0x28,0x02,
240 236
   0x02,0x02,0x06,0x02,0x03,0xc0,0xc0,0x03,0x02,0x02,0x06,0x01,0xfe,0x20,0xc0,0x03,
241
-  0x05,0x05,0x06,0x01,0x05,0x40,0xc0,0x40,0x40,0xe0,0x03,0x05,0x05,0x06,0x01,0x05,
237
+  0x05,0x05,0x06,0x01,0x04,0x40,0xc0,0x40,0x40,0xe0,0x03,0x05,0x05,0x06,0x01,0x05,
242 238
   0x40,0xa0,0x40,0x00,0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xa0,0x50,0x28,0x50,0xa0,
243 239
   0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0xc0,0x48,0x50,0x60,0x50,0xb0,0x50,0x78,0x10,
244 240
   0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0xc0,0x48,0x50,0x60,0x50,0xa8,0x08,0x10,0x38,

+ 13
- 13
buildroot/share/fonts/marlin-6x12-1.bdf View File

@@ -1646,7 +1646,7 @@ STARTCHAR twosuperior
1646 1646
 ENCODING 178
1647 1647
 SWIDTH 480 0
1648 1648
 DWIDTH 6 0
1649
-BBX 3 5 1 5
1649
+BBX 3 5 1 4
1650 1650
 BITMAP
1651 1651
 40
1652 1652
 A0
@@ -1658,7 +1658,7 @@ STARTCHAR threesuperior
1658 1658
 ENCODING 179
1659 1659
 SWIDTH 480 0
1660 1660
 DWIDTH 6 0
1661
-BBX 3 5 1 5
1661
+BBX 3 5 1 4
1662 1662
 BITMAP
1663 1663
 C0
1664 1664
 20
@@ -1727,7 +1727,7 @@ STARTCHAR onesuperior
1727 1727
 ENCODING 185
1728 1728
 SWIDTH 480 0
1729 1729
 DWIDTH 6 0
1730
-BBX 3 5 1 5
1730
+BBX 3 5 1 4
1731 1731
 BITMAP
1732 1732
 40
1733 1733
 C0
@@ -26792,7 +26792,7 @@ STARTCHAR zerosuperior
26792 26792
 ENCODING 8304
26793 26793
 SWIDTH 480 0
26794 26794
 DWIDTH 6 0
26795
-BBX 3 5 1 5
26795
+BBX 3 5 1 4
26796 26796
 BITMAP
26797 26797
 40
26798 26798
 A0
@@ -26816,7 +26816,7 @@ STARTCHAR foursuperior
26816 26816
 ENCODING 8308
26817 26817
 SWIDTH 480 0
26818 26818
 DWIDTH 6 0
26819
-BBX 3 5 1 5
26819
+BBX 3 5 1 4
26820 26820
 BITMAP
26821 26821
 80
26822 26822
 80
@@ -26828,7 +26828,7 @@ STARTCHAR fivesuperior
26828 26828
 ENCODING 8309
26829 26829
 SWIDTH 480 0
26830 26830
 DWIDTH 6 0
26831
-BBX 3 5 1 5
26831
+BBX 3 5 1 4
26832 26832
 BITMAP
26833 26833
 E0
26834 26834
 80
@@ -26840,7 +26840,7 @@ STARTCHAR sixsuperior
26840 26840
 ENCODING 8310
26841 26841
 SWIDTH 480 0
26842 26842
 DWIDTH 6 0
26843
-BBX 3 5 1 5
26843
+BBX 3 5 1 4
26844 26844
 BITMAP
26845 26845
 60
26846 26846
 80
@@ -26852,7 +26852,7 @@ STARTCHAR sevensuperior
26852 26852
 ENCODING 8311
26853 26853
 SWIDTH 480 0
26854 26854
 DWIDTH 6 0
26855
-BBX 3 5 1 5
26855
+BBX 3 5 1 4
26856 26856
 BITMAP
26857 26857
 E0
26858 26858
 20
@@ -26864,7 +26864,7 @@ STARTCHAR eightsuperior
26864 26864
 ENCODING 8312
26865 26865
 SWIDTH 480 0
26866 26866
 DWIDTH 6 0
26867
-BBX 3 5 1 5
26867
+BBX 3 5 1 4
26868 26868
 BITMAP
26869 26869
 40
26870 26870
 A0
@@ -26876,7 +26876,7 @@ STARTCHAR ninesuperior
26876 26876
 ENCODING 8313
26877 26877
 SWIDTH 480 0
26878 26878
 DWIDTH 6 0
26879
-BBX 3 5 1 5
26879
+BBX 3 5 1 4
26880 26880
 BITMAP
26881 26881
 40
26882 26882
 A0
@@ -26916,7 +26916,7 @@ STARTCHAR parenleftsuperior
26916 26916
 ENCODING 8317
26917 26917
 SWIDTH 480 0
26918 26918
 DWIDTH 6 0
26919
-BBX 2 5 1 5
26919
+BBX 2 5 1 4
26920 26920
 BITMAP
26921 26921
 40
26922 26922
 80
@@ -26928,7 +26928,7 @@ STARTCHAR parenrightsuperior
26928 26928
 ENCODING 8318
26929 26929
 SWIDTH 480 0
26930 26930
 DWIDTH 6 0
26931
-BBX 2 5 1 5
26931
+BBX 2 5 1 4
26932 26932
 BITMAP
26933 26933
 80
26934 26934
 40
@@ -26940,7 +26940,7 @@ STARTCHAR nsuperior
26940 26940
 ENCODING 8319
26941 26941
 SWIDTH 480 0
26942 26942
 DWIDTH 6 0
26943
-BBX 3 4 1 5
26943
+BBX 3 4 1 4
26944 26944
 BITMAP
26945 26945
 C0
26946 26946
 A0

+ 13
- 13
buildroot/share/fonts/marlin-6x12-2.bdf View File

@@ -1644,7 +1644,7 @@ STARTCHAR twosuperior
1644 1644
 ENCODING 178
1645 1645
 SWIDTH 480 0
1646 1646
 DWIDTH 6 0
1647
-BBX 3 5 1 5
1647
+BBX 3 5 1 4
1648 1648
 BITMAP
1649 1649
 40
1650 1650
 A0
@@ -1656,7 +1656,7 @@ STARTCHAR threesuperior
1656 1656
 ENCODING 179
1657 1657
 SWIDTH 480 0
1658 1658
 DWIDTH 6 0
1659
-BBX 3 5 1 5
1659
+BBX 3 5 1 4
1660 1660
 BITMAP
1661 1661
 C0
1662 1662
 20
@@ -1725,7 +1725,7 @@ STARTCHAR onesuperior
1725 1725
 ENCODING 185
1726 1726
 SWIDTH 480 0
1727 1727
 DWIDTH 6 0
1728
-BBX 3 5 1 5
1728
+BBX 3 5 1 4
1729 1729
 BITMAP
1730 1730
 40
1731 1731
 C0
@@ -26790,7 +26790,7 @@ STARTCHAR zerosuperior
26790 26790
 ENCODING 8304
26791 26791
 SWIDTH 480 0
26792 26792
 DWIDTH 6 0
26793
-BBX 3 5 1 5
26793
+BBX 3 5 1 4
26794 26794
 BITMAP
26795 26795
 40
26796 26796
 A0
@@ -26814,7 +26814,7 @@ STARTCHAR foursuperior
26814 26814
 ENCODING 8308
26815 26815
 SWIDTH 480 0
26816 26816
 DWIDTH 6 0
26817
-BBX 3 5 1 5
26817
+BBX 3 5 1 4
26818 26818
 BITMAP
26819 26819
 80
26820 26820
 80
@@ -26826,7 +26826,7 @@ STARTCHAR fivesuperior
26826 26826
 ENCODING 8309
26827 26827
 SWIDTH 480 0
26828 26828
 DWIDTH 6 0
26829
-BBX 3 5 1 5
26829
+BBX 3 5 1 4
26830 26830
 BITMAP
26831 26831
 E0
26832 26832
 80
@@ -26838,7 +26838,7 @@ STARTCHAR sixsuperior
26838 26838
 ENCODING 8310
26839 26839
 SWIDTH 480 0
26840 26840
 DWIDTH 6 0
26841
-BBX 3 5 1 5
26841
+BBX 3 5 1 4
26842 26842
 BITMAP
26843 26843
 60
26844 26844
 80
@@ -26850,7 +26850,7 @@ STARTCHAR sevensuperior
26850 26850
 ENCODING 8311
26851 26851
 SWIDTH 480 0
26852 26852
 DWIDTH 6 0
26853
-BBX 3 5 1 5
26853
+BBX 3 5 1 4
26854 26854
 BITMAP
26855 26855
 E0
26856 26856
 20
@@ -26862,7 +26862,7 @@ STARTCHAR eightsuperior
26862 26862
 ENCODING 8312
26863 26863
 SWIDTH 480 0
26864 26864
 DWIDTH 6 0
26865
-BBX 3 5 1 5
26865
+BBX 3 5 1 4
26866 26866
 BITMAP
26867 26867
 40
26868 26868
 A0
@@ -26874,7 +26874,7 @@ STARTCHAR ninesuperior
26874 26874
 ENCODING 8313
26875 26875
 SWIDTH 480 0
26876 26876
 DWIDTH 6 0
26877
-BBX 3 5 1 5
26877
+BBX 3 5 1 4
26878 26878
 BITMAP
26879 26879
 40
26880 26880
 A0
@@ -26914,7 +26914,7 @@ STARTCHAR parenleftsuperior
26914 26914
 ENCODING 8317
26915 26915
 SWIDTH 480 0
26916 26916
 DWIDTH 6 0
26917
-BBX 2 5 1 5
26917
+BBX 2 5 1 4
26918 26918
 BITMAP
26919 26919
 40
26920 26920
 80
@@ -26926,7 +26926,7 @@ STARTCHAR parenrightsuperior
26926 26926
 ENCODING 8318
26927 26927
 SWIDTH 480 0
26928 26928
 DWIDTH 6 0
26929
-BBX 2 5 1 5
26929
+BBX 2 5 1 4
26930 26930
 BITMAP
26931 26931
 80
26932 26932
 40
@@ -26938,7 +26938,7 @@ STARTCHAR nsuperior
26938 26938
 ENCODING 8319
26939 26939
 SWIDTH 480 0
26940 26940
 DWIDTH 6 0
26941
-BBX 3 4 1 5
26941
+BBX 3 4 1 4
26942 26942
 BITMAP
26943 26943
 C0
26944 26944
 A0

+ 13
- 13
buildroot/share/fonts/marlin-6x12-3.bdf View File

@@ -1644,7 +1644,7 @@ STARTCHAR twosuperior
1644 1644
 ENCODING 178
1645 1645
 SWIDTH 480 0
1646 1646
 DWIDTH 6 0
1647
-BBX 3 5 1 5
1647
+BBX 3 5 1 4
1648 1648
 BITMAP
1649 1649
 40
1650 1650
 A0
@@ -1656,7 +1656,7 @@ STARTCHAR threesuperior
1656 1656
 ENCODING 179
1657 1657
 SWIDTH 480 0
1658 1658
 DWIDTH 6 0
1659
-BBX 3 5 1 5
1659
+BBX 3 5 1 4
1660 1660
 BITMAP
1661 1661
 C0
1662 1662
 20
@@ -1725,7 +1725,7 @@ STARTCHAR onesuperior
1725 1725
 ENCODING 185
1726 1726
 SWIDTH 480 0
1727 1727
 DWIDTH 6 0
1728
-BBX 3 5 1 5
1728
+BBX 3 5 1 4
1729 1729
 BITMAP
1730 1730
 40
1731 1731
 C0
@@ -27124,7 +27124,7 @@ STARTCHAR zerosuperior
27124 27124
 ENCODING 8304
27125 27125
 SWIDTH 480 0
27126 27126
 DWIDTH 6 0
27127
-BBX 3 5 1 5
27127
+BBX 3 5 1 4
27128 27128
 BITMAP
27129 27129
 40
27130 27130
 A0
@@ -27148,7 +27148,7 @@ STARTCHAR foursuperior
27148 27148
 ENCODING 8308
27149 27149
 SWIDTH 480 0
27150 27150
 DWIDTH 6 0
27151
-BBX 3 5 1 5
27151
+BBX 3 5 1 4
27152 27152
 BITMAP
27153 27153
 80
27154 27154
 80
@@ -27160,7 +27160,7 @@ STARTCHAR fivesuperior
27160 27160
 ENCODING 8309
27161 27161
 SWIDTH 480 0
27162 27162
 DWIDTH 6 0
27163
-BBX 3 5 1 5
27163
+BBX 3 5 1 4
27164 27164
 BITMAP
27165 27165
 E0
27166 27166
 80
@@ -27172,7 +27172,7 @@ STARTCHAR sixsuperior
27172 27172
 ENCODING 8310
27173 27173
 SWIDTH 480 0
27174 27174
 DWIDTH 6 0
27175
-BBX 3 5 1 5
27175
+BBX 3 5 1 4
27176 27176
 BITMAP
27177 27177
 60
27178 27178
 80
@@ -27184,7 +27184,7 @@ STARTCHAR sevensuperior
27184 27184
 ENCODING 8311
27185 27185
 SWIDTH 480 0
27186 27186
 DWIDTH 6 0
27187
-BBX 3 5 1 5
27187
+BBX 3 5 1 4
27188 27188
 BITMAP
27189 27189
 E0
27190 27190
 20
@@ -27196,7 +27196,7 @@ STARTCHAR eightsuperior
27196 27196
 ENCODING 8312
27197 27197
 SWIDTH 480 0
27198 27198
 DWIDTH 6 0
27199
-BBX 3 5 1 5
27199
+BBX 3 5 1 4
27200 27200
 BITMAP
27201 27201
 40
27202 27202
 A0
@@ -27208,7 +27208,7 @@ STARTCHAR ninesuperior
27208 27208
 ENCODING 8313
27209 27209
 SWIDTH 480 0
27210 27210
 DWIDTH 6 0
27211
-BBX 3 5 1 5
27211
+BBX 3 5 1 4
27212 27212
 BITMAP
27213 27213
 40
27214 27214
 A0
@@ -27248,7 +27248,7 @@ STARTCHAR parenleftsuperior
27248 27248
 ENCODING 8317
27249 27249
 SWIDTH 480 0
27250 27250
 DWIDTH 6 0
27251
-BBX 2 5 1 5
27251
+BBX 2 5 1 4
27252 27252
 BITMAP
27253 27253
 40
27254 27254
 80
@@ -27260,7 +27260,7 @@ STARTCHAR parenrightsuperior
27260 27260
 ENCODING 8318
27261 27261
 SWIDTH 480 0
27262 27262
 DWIDTH 6 0
27263
-BBX 2 5 1 5
27263
+BBX 2 5 1 4
27264 27264
 BITMAP
27265 27265
 80
27266 27266
 40
@@ -27272,7 +27272,7 @@ STARTCHAR nsuperior
27272 27272
 ENCODING 8319
27273 27273
 SWIDTH 480 0
27274 27274
 DWIDTH 6 0
27275
-BBX 3 4 1 5
27275
+BBX 3 4 1 4
27276 27276
 BITMAP
27277 27277
 C0
27278 27278
 A0

Loading…
Cancel
Save