Browse Source

Bring superscripts slightly lower in BDF fonts

Scott Lahteine 6 years ago
parent
commit
82c96c971e

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

1
 /**
1
 /**
2
  * Marlin 3D Printer Firmware
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
  * This program is free software: you can redistribute it and/or modify
5
  * This program is free software: you can redistribute it and/or modify
9
  * it under the terms of the GNU General Public License as published by
6
  * it under the terms of the GNU General Public License as published by
35
   X Font      ascent = 8 descent=-2
32
   X Font      ascent = 8 descent=-2
36
   Max Font    ascent = 8 descent=-2
33
   Max Font    ascent = 8 descent=-2
37
 */
34
 */
38
-
39
 const u8g_fntpgm_uint8_t ISO10646_1_5x7[1328] U8G_FONT_SECTION("ISO10646_1_5x7") = {
35
 const u8g_fntpgm_uint8_t ISO10646_1_5x7[1328] U8G_FONT_SECTION("ISO10646_1_5x7") = {
40
   0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0x7f,0xfe,0x08,0xfe,0x08,
36
   0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0x7f,0xfe,0x08,0xfe,0x08,
41
   0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,
37
   0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,
233
   0xf8,0x08,0x08,0x03,0x01,0x01,0x06,0x01,0x03,0xe0,0x06,0x07,0x07,0x06,0x00,0x00,
229
   0xf8,0x08,0x08,0x03,0x01,0x01,0x06,0x01,0x03,0xe0,0x06,0x07,0x07,0x06,0x00,0x00,
234
   0x78,0x84,0xb4,0xa4,0xa4,0x84,0x78,0x05,0x01,0x01,0x06,0x00,0x07,0xf8,0x04,0x04,
230
   0x78,0x84,0xb4,0xa4,0xa4,0x84,0x78,0x05,0x01,0x01,0x06,0x00,0x07,0xf8,0x04,0x04,
235
   0x04,0x06,0x01,0x05,0x60,0x90,0x90,0x60,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x20,
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
   0x05,0x20,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,0x98,0xe8,0x80,
234
   0x05,0x20,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,0x98,0xe8,0x80,
239
   0x80,0x05,0x08,0x08,0x06,0x00,0x00,0x78,0xe8,0xe8,0xe8,0x68,0x28,0x28,0x28,0x02,
235
   0x80,0x05,0x08,0x08,0x06,0x00,0x00,0x78,0xe8,0xe8,0xe8,0x68,0x28,0x28,0x28,0x02,
240
   0x02,0x02,0x06,0x02,0x03,0xc0,0xc0,0x03,0x02,0x02,0x06,0x01,0xfe,0x20,0xc0,0x03,
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
   0x40,0xa0,0x40,0x00,0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xa0,0x50,0x28,0x50,0xa0,
238
   0x40,0xa0,0x40,0x00,0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xa0,0x50,0x28,0x50,0xa0,
243
   0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0xc0,0x48,0x50,0x60,0x50,0xb0,0x50,0x78,0x10,
239
   0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0xc0,0x48,0x50,0x60,0x50,0xb0,0x50,0x78,0x10,
244
   0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0xc0,0x48,0x50,0x60,0x50,0xa8,0x08,0x10,0x38,
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
 ENCODING 178
1646
 ENCODING 178
1647
 SWIDTH 480 0
1647
 SWIDTH 480 0
1648
 DWIDTH 6 0
1648
 DWIDTH 6 0
1649
-BBX 3 5 1 5
1649
+BBX 3 5 1 4
1650
 BITMAP
1650
 BITMAP
1651
 40
1651
 40
1652
 A0
1652
 A0
1658
 ENCODING 179
1658
 ENCODING 179
1659
 SWIDTH 480 0
1659
 SWIDTH 480 0
1660
 DWIDTH 6 0
1660
 DWIDTH 6 0
1661
-BBX 3 5 1 5
1661
+BBX 3 5 1 4
1662
 BITMAP
1662
 BITMAP
1663
 C0
1663
 C0
1664
 20
1664
 20
1727
 ENCODING 185
1727
 ENCODING 185
1728
 SWIDTH 480 0
1728
 SWIDTH 480 0
1729
 DWIDTH 6 0
1729
 DWIDTH 6 0
1730
-BBX 3 5 1 5
1730
+BBX 3 5 1 4
1731
 BITMAP
1731
 BITMAP
1732
 40
1732
 40
1733
 C0
1733
 C0
26792
 ENCODING 8304
26792
 ENCODING 8304
26793
 SWIDTH 480 0
26793
 SWIDTH 480 0
26794
 DWIDTH 6 0
26794
 DWIDTH 6 0
26795
-BBX 3 5 1 5
26795
+BBX 3 5 1 4
26796
 BITMAP
26796
 BITMAP
26797
 40
26797
 40
26798
 A0
26798
 A0
26816
 ENCODING 8308
26816
 ENCODING 8308
26817
 SWIDTH 480 0
26817
 SWIDTH 480 0
26818
 DWIDTH 6 0
26818
 DWIDTH 6 0
26819
-BBX 3 5 1 5
26819
+BBX 3 5 1 4
26820
 BITMAP
26820
 BITMAP
26821
 80
26821
 80
26822
 80
26822
 80
26828
 ENCODING 8309
26828
 ENCODING 8309
26829
 SWIDTH 480 0
26829
 SWIDTH 480 0
26830
 DWIDTH 6 0
26830
 DWIDTH 6 0
26831
-BBX 3 5 1 5
26831
+BBX 3 5 1 4
26832
 BITMAP
26832
 BITMAP
26833
 E0
26833
 E0
26834
 80
26834
 80
26840
 ENCODING 8310
26840
 ENCODING 8310
26841
 SWIDTH 480 0
26841
 SWIDTH 480 0
26842
 DWIDTH 6 0
26842
 DWIDTH 6 0
26843
-BBX 3 5 1 5
26843
+BBX 3 5 1 4
26844
 BITMAP
26844
 BITMAP
26845
 60
26845
 60
26846
 80
26846
 80
26852
 ENCODING 8311
26852
 ENCODING 8311
26853
 SWIDTH 480 0
26853
 SWIDTH 480 0
26854
 DWIDTH 6 0
26854
 DWIDTH 6 0
26855
-BBX 3 5 1 5
26855
+BBX 3 5 1 4
26856
 BITMAP
26856
 BITMAP
26857
 E0
26857
 E0
26858
 20
26858
 20
26864
 ENCODING 8312
26864
 ENCODING 8312
26865
 SWIDTH 480 0
26865
 SWIDTH 480 0
26866
 DWIDTH 6 0
26866
 DWIDTH 6 0
26867
-BBX 3 5 1 5
26867
+BBX 3 5 1 4
26868
 BITMAP
26868
 BITMAP
26869
 40
26869
 40
26870
 A0
26870
 A0
26876
 ENCODING 8313
26876
 ENCODING 8313
26877
 SWIDTH 480 0
26877
 SWIDTH 480 0
26878
 DWIDTH 6 0
26878
 DWIDTH 6 0
26879
-BBX 3 5 1 5
26879
+BBX 3 5 1 4
26880
 BITMAP
26880
 BITMAP
26881
 40
26881
 40
26882
 A0
26882
 A0
26916
 ENCODING 8317
26916
 ENCODING 8317
26917
 SWIDTH 480 0
26917
 SWIDTH 480 0
26918
 DWIDTH 6 0
26918
 DWIDTH 6 0
26919
-BBX 2 5 1 5
26919
+BBX 2 5 1 4
26920
 BITMAP
26920
 BITMAP
26921
 40
26921
 40
26922
 80
26922
 80
26928
 ENCODING 8318
26928
 ENCODING 8318
26929
 SWIDTH 480 0
26929
 SWIDTH 480 0
26930
 DWIDTH 6 0
26930
 DWIDTH 6 0
26931
-BBX 2 5 1 5
26931
+BBX 2 5 1 4
26932
 BITMAP
26932
 BITMAP
26933
 80
26933
 80
26934
 40
26934
 40
26940
 ENCODING 8319
26940
 ENCODING 8319
26941
 SWIDTH 480 0
26941
 SWIDTH 480 0
26942
 DWIDTH 6 0
26942
 DWIDTH 6 0
26943
-BBX 3 4 1 5
26943
+BBX 3 4 1 4
26944
 BITMAP
26944
 BITMAP
26945
 C0
26945
 C0
26946
 A0
26946
 A0

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

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

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

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

Loading…
Cancel
Save