A fork of https://github.com/crosspoint-reader/crosspoint-reader
fix: render U+FFFD replacement character instead of ? (#366)
The current behavior of rendering `?` for an unknown Unicode character
can be hard to distinguish from a typo. Use the standard Unicode
"replacement character" instead, that's what it's designed for:
https://en.wikipedia.org/wiki/Specials_(Unicode_block)
I'm making this PR as a draft because I'm not sure I did everything that
was needed to change the character set covered by the fonts. Running
that script is in its own commit. If this is proper, I'll rebase/squash
into one commit and un-draft.
Co-authored-by: Maeve Andrews <maeve@git.mail.maeveandrews.com>
authored by
Maeve Andrews
Maeve Andrews
and committed by
GitHub
5fef99c6
7a792a53
+620
-100
+1
-2
lib/EpdFont/EpdFont.cpp
+1
-2
lib/EpdFont/EpdFont.cpp
+14
-3
lib/EpdFont/builtinFonts/bookerly_12_bold.h
+14
-3
lib/EpdFont/builtinFonts/bookerly_12_bold.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_12_boldBitmaps[51217] = {
10
+
static const uint8_t bookerly_12_boldBitmaps[51367] = {
11
11
0x0A, 0x83, 0xFC, 0x3F, 0x87, 0xF4, 0x7F, 0x43, 0xF4, 0x3F, 0x03, 0xF0, 0x3F, 0x03, 0xF0, 0x3F,
12
12
0x03, 0xF0, 0x2F, 0x01, 0xF0, 0x00, 0x00, 0x10, 0x2F, 0xC3, 0xFC, 0x3F, 0xC0, 0x50, 0x7E, 0x1F,
13
13
0x7F, 0x8F, 0xDF, 0xD3, 0xF3, 0xF4, 0xFC, 0xFD, 0x3F, 0x2F, 0x0F, 0xCB, 0xC3, 0xF2, 0xE0, 0xF8,
···
3209
3209
0x2F, 0xFF, 0xFF, 0xFE, 0xBF, 0xFF, 0xFF, 0xFA, 0xFF, 0xFF, 0xFF, 0xE0, 0x2F, 0x47, 0xFC, 0x7F,
3210
3210
0xC3, 0xF4, 0x00, 0x00, 0x1F, 0x80, 0x0B, 0xC0, 0x0B, 0xD0, 0xFF, 0x40, 0xBF, 0x80, 0x7F, 0xC3,
3211
3211
0xFD, 0x02, 0xFE, 0x01, 0xFF, 0x0B, 0xE0, 0x07, 0xF0, 0x03, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00,
3212
-
0x00,
3212
+
0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00,
3213
+
0x7F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x74, 0x1F, 0x80, 0x00,
3214
+
0x00, 0x00, 0x74, 0x00, 0x78, 0x00, 0x00, 0x00, 0x7D, 0x04, 0x0B, 0x80, 0x00, 0x00, 0x7F, 0xFF,
3215
+
0xE0, 0xF8, 0x00, 0x00, 0x7F, 0xFF, 0xFD, 0x2F, 0x80, 0x00, 0x7F, 0xFF, 0xFF, 0x87, 0xF8, 0x00,
3216
+
0x7F, 0xFF, 0xFF, 0xE1, 0xFF, 0x80, 0x7F, 0xFF, 0xFF, 0x80, 0xBF, 0xF8, 0x2F, 0xFF, 0xF8, 0x00,
3217
+
0x3F, 0xFE, 0x02, 0xFF, 0xFC, 0x00, 0xBF, 0xFE, 0x00, 0x2F, 0xFF, 0x42, 0xFF, 0xFE, 0x00, 0x02,
3218
+
0xFF, 0xE2, 0xFF, 0xFE, 0x00, 0x00, 0x2F, 0xFC, 0xBF, 0xFE, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFE,
3219
+
0x00, 0x00, 0x00, 0x2F, 0xD2, 0xFE, 0x00, 0x00, 0x00, 0x02, 0xF0, 0x3E, 0x00, 0x00, 0x00, 0x00,
3220
+
0x2D, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x00, 0x00,
3221
+
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
3213
3222
};
3214
3223
3215
3224
static const EpdGlyph bookerly_12_boldGlyphs[] = {
···
3941
3950
{ 15, 18, 25, 5, 18, 68, 51112 }, // ⊥
3942
3951
{ 6, 5, 16, 5, 9, 8, 51180 }, // ⋅
3943
3952
{ 23, 5, 25, 1, 9, 29, 51188 }, // ⋯
3953
+
{ 25, 24, 25, 0, 21, 150, 51217 }, // �
3944
3954
};
3945
3955
3946
3956
static const EpdUnicodeInterval bookerly_12_boldIntervals[] = {
···
4004
4014
{ 0x22A5, 0x22A5, 0x2D5 },
4005
4015
{ 0x22C5, 0x22C5, 0x2D6 },
4006
4016
{ 0x22EF, 0x22EF, 0x2D7 },
4017
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
4007
4018
};
4008
4019
4009
4020
static const EpdFontData bookerly_12_bold = {
4010
4021
bookerly_12_boldBitmaps,
4011
4022
bookerly_12_boldGlyphs,
4012
4023
bookerly_12_boldIntervals,
4013
-
60,
4024
+
61,
4014
4025
33,
4015
4026
27,
4016
4027
-7,
+14
-3
lib/EpdFont/builtinFonts/bookerly_12_bolditalic.h
+14
-3
lib/EpdFont/builtinFonts/bookerly_12_bolditalic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_12_bolditalicBitmaps[52522] = {
10
+
static const uint8_t bookerly_12_bolditalicBitmaps[52672] = {
11
11
0x00, 0x68, 0x01, 0xFC, 0x03, 0xF8, 0x07, 0xF4, 0x07, 0xF0, 0x0B, 0xE0, 0x0F, 0xD0, 0x0F, 0xC0,
12
12
0x0F, 0xC0, 0x0F, 0x80, 0x1F, 0x40, 0x1F, 0x00, 0x2F, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x04, 0x00,
13
13
0x7F, 0x00, 0xBF, 0x00, 0xBD, 0x00, 0x10, 0x00, 0x0B, 0x87, 0xC2, 0xF4, 0xFC, 0x3F, 0x2F, 0x83,
···
3290
3290
0xC0, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x2F, 0xFF, 0xFF, 0xFE, 0xBF, 0xFF, 0xFF,
3291
3291
0xFA, 0xFF, 0xFF, 0xFF, 0xE0, 0x2F, 0x47, 0xFC, 0x7F, 0xC3, 0xF4, 0x00, 0x00, 0x1F, 0x80, 0x0B,
3292
3292
0xC0, 0x0B, 0xD0, 0xFF, 0x40, 0xBF, 0x80, 0x7F, 0xC3, 0xFD, 0x02, 0xFE, 0x01, 0xFF, 0x0B, 0xE0,
3293
-
0x07, 0xF0, 0x03, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3293
+
0x07, 0xF0, 0x03, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00,
3294
+
0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7F,
3295
+
0xF8, 0x00, 0x00, 0x00, 0x00, 0x74, 0x1F, 0x80, 0x00, 0x00, 0x00, 0x74, 0x00, 0x78, 0x00, 0x00,
3296
+
0x00, 0x7D, 0x04, 0x0B, 0x80, 0x00, 0x00, 0x7F, 0xFF, 0xE0, 0xF8, 0x00, 0x00, 0x7F, 0xFF, 0xFD,
3297
+
0x2F, 0x80, 0x00, 0x7F, 0xFF, 0xFF, 0x87, 0xF8, 0x00, 0x7F, 0xFF, 0xFF, 0xE1, 0xFF, 0x80, 0x7F,
3298
+
0xFF, 0xFF, 0x80, 0xBF, 0xF8, 0x2F, 0xFF, 0xF8, 0x00, 0x3F, 0xFE, 0x02, 0xFF, 0xFC, 0x00, 0xBF,
3299
+
0xFE, 0x00, 0x2F, 0xFF, 0x42, 0xFF, 0xFE, 0x00, 0x02, 0xFF, 0xE2, 0xFF, 0xFE, 0x00, 0x00, 0x2F,
3300
+
0xFC, 0xBF, 0xFE, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFE, 0x00, 0x00, 0x00, 0x2F, 0xD2, 0xFE, 0x00,
3301
+
0x00, 0x00, 0x02, 0xF0, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x02,
3302
+
0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
3294
3303
};
3295
3304
3296
3305
static const EpdGlyph bookerly_12_bolditalicGlyphs[] = {
···
4022
4031
{ 15, 18, 25, 5, 18, 68, 52417 }, // ⊥
4023
4032
{ 6, 5, 16, 5, 9, 8, 52485 }, // ⋅
4024
4033
{ 23, 5, 25, 1, 9, 29, 52493 }, // ⋯
4034
+
{ 25, 24, 25, 0, 21, 150, 52522 }, // �
4025
4035
};
4026
4036
4027
4037
static const EpdUnicodeInterval bookerly_12_bolditalicIntervals[] = {
···
4085
4095
{ 0x22A5, 0x22A5, 0x2D5 },
4086
4096
{ 0x22C5, 0x22C5, 0x2D6 },
4087
4097
{ 0x22EF, 0x22EF, 0x2D7 },
4098
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
4088
4099
};
4089
4100
4090
4101
static const EpdFontData bookerly_12_bolditalic = {
4091
4102
bookerly_12_bolditalicBitmaps,
4092
4103
bookerly_12_bolditalicGlyphs,
4093
4104
bookerly_12_bolditalicIntervals,
4094
-
60,
4105
+
61,
4095
4106
33,
4096
4107
27,
4097
4108
-7,
+15
-3
lib/EpdFont/builtinFonts/bookerly_12_italic.h
+15
-3
lib/EpdFont/builtinFonts/bookerly_12_italic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_12_italicBitmaps[48812] = {
10
+
static const uint8_t bookerly_12_italicBitmaps[48962] = {
11
11
0x00, 0x14, 0x03, 0xD0, 0x1F, 0x00, 0xF8, 0x03, 0xD0, 0x0F, 0x00, 0x7C, 0x02, 0xD0, 0x0B, 0x00,
12
12
0x3C, 0x00, 0xE0, 0x03, 0x80, 0x1D, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x01, 0xF8, 0x07,
13
13
0xC0, 0x04, 0x00, 0x0A, 0x07, 0x0B, 0x87, 0xC3, 0xD2, 0xE0, 0xF0, 0xB4, 0x38, 0x3C, 0x0D, 0x0E,
···
3058
3058
0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x02, 0xE0, 0x00, 0x00, 0x0B, 0x80, 0x00,
3059
3059
0x00, 0x2E, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x05, 0x56, 0xE5, 0x54, 0xBF, 0xFF, 0xFF, 0xFA, 0xFF,
3060
3060
0xFF, 0xFF, 0xE0, 0x10, 0xBD, 0xFE, 0xBC, 0x04, 0x00, 0x04, 0x00, 0x05, 0x1F, 0xC0, 0x0F, 0xC0,
3061
-
0x0B, 0xDB, 0xF0, 0x03, 0xF0, 0x03, 0xF8, 0xF4, 0x00, 0xF8, 0x00, 0x7C,
3061
+
0x0B, 0xDB, 0xF0, 0x03, 0xF0, 0x03, 0xF8, 0xF4, 0x00, 0xF8, 0x00, 0x7C, 0x00, 0x00, 0x00, 0x40,
3062
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x80, 0x00, 0x00, 0x00,
3063
+
0x00, 0x7F, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x74, 0x1F, 0x80, 0x00, 0x00, 0x00, 0x74, 0x00, 0x78,
3064
+
0x00, 0x00, 0x00, 0x7D, 0x04, 0x0B, 0x80, 0x00, 0x00, 0x7F, 0xFF, 0xE0, 0xF8, 0x00, 0x00, 0x7F,
3065
+
0xFF, 0xFD, 0x2F, 0x80, 0x00, 0x7F, 0xFF, 0xFF, 0x87, 0xF8, 0x00, 0x7F, 0xFF, 0xFF, 0xE1, 0xFF,
3066
+
0x80, 0x7F, 0xFF, 0xFF, 0x80, 0xBF, 0xF8, 0x2F, 0xFF, 0xF8, 0x00, 0x3F, 0xFE, 0x02, 0xFF, 0xFC,
3067
+
0x00, 0xBF, 0xFE, 0x00, 0x2F, 0xFF, 0x42, 0xFF, 0xFE, 0x00, 0x02, 0xFF, 0xE2, 0xFF, 0xFE, 0x00,
3068
+
0x00, 0x2F, 0xFC, 0xBF, 0xFE, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFE, 0x00, 0x00, 0x00, 0x2F, 0xD2,
3069
+
0xFE, 0x00, 0x00, 0x00, 0x02, 0xF0, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x2E, 0x00, 0x00, 0x00,
3070
+
0x00, 0x02, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
3071
+
0x00, 0x00,
3062
3072
};
3063
3073
3064
3074
static const EpdGlyph bookerly_12_italicGlyphs[] = {
···
3790
3800
{ 15, 18, 25, 5, 18, 68, 48719 }, // ⊥
3791
3801
{ 4, 4, 16, 6, 9, 4, 48787 }, // ⋅
3792
3802
{ 21, 4, 25, 2, 9, 21, 48791 }, // ⋯
3803
+
{ 25, 24, 25, 0, 21, 150, 48812 }, // �
3793
3804
};
3794
3805
3795
3806
static const EpdUnicodeInterval bookerly_12_italicIntervals[] = {
···
3853
3864
{ 0x22A5, 0x22A5, 0x2D5 },
3854
3865
{ 0x22C5, 0x22C5, 0x2D6 },
3855
3866
{ 0x22EF, 0x22EF, 0x2D7 },
3867
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
3856
3868
};
3857
3869
3858
3870
static const EpdFontData bookerly_12_italic = {
3859
3871
bookerly_12_italicBitmaps,
3860
3872
bookerly_12_italicGlyphs,
3861
3873
bookerly_12_italicIntervals,
3862
-
60,
3874
+
61,
3863
3875
33,
3864
3876
27,
3865
3877
-7,
+15
-3
lib/EpdFont/builtinFonts/bookerly_12_regular.h
+15
-3
lib/EpdFont/builtinFonts/bookerly_12_regular.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_12_regularBitmaps[47071] = {
10
+
static const uint8_t bookerly_12_regularBitmaps[47221] = {
11
11
0x28, 0xBC, 0xFC, 0xF8, 0xF8, 0xF8, 0xF4, 0xF4, 0xF4, 0xF4, 0xB4, 0xB4, 0x74, 0x74, 0x00, 0x00,
12
12
0x78, 0xFD, 0xFC, 0x10, 0x28, 0x2E, 0xE1, 0xFB, 0x47, 0xED, 0x1E, 0xB4, 0x7A, 0xD1, 0xEB, 0x03,
13
13
0x94, 0x04, 0x00, 0x0E, 0x02, 0xC0, 0x00, 0x0D, 0x03, 0x80, 0x00, 0x1D, 0x03, 0x40, 0x00, 0x2C,
···
2949
2949
0x00, 0x0B, 0x80, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x00, 0x02, 0xE0, 0x00, 0x00,
2950
2950
0x0B, 0x80, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0xB8, 0x00, 0x05, 0x56, 0xE5, 0x54, 0xBF, 0xFF,
2951
2951
0xFF, 0xFA, 0xFF, 0xFF, 0xFF, 0xE0, 0x10, 0xBD, 0xFE, 0xBC, 0x04, 0x00, 0x04, 0x00, 0x05, 0x1F,
2952
-
0xC0, 0x0F, 0xC0, 0x0B, 0xDB, 0xF0, 0x03, 0xF0, 0x03, 0xF8, 0xF4, 0x00, 0xF8, 0x00, 0x7C,
2952
+
0xC0, 0x0F, 0xC0, 0x0B, 0xDB, 0xF0, 0x03, 0xF0, 0x03, 0xF8, 0xF4, 0x00, 0xF8, 0x00, 0x7C, 0x00,
2953
+
0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x80,
2954
+
0x00, 0x00, 0x00, 0x00, 0x7F, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x74, 0x1F, 0x80, 0x00, 0x00, 0x00,
2955
+
0x74, 0x00, 0x78, 0x00, 0x00, 0x00, 0x7D, 0x04, 0x0B, 0x80, 0x00, 0x00, 0x7F, 0xFF, 0xE0, 0xF8,
2956
+
0x00, 0x00, 0x7F, 0xFF, 0xFD, 0x2F, 0x80, 0x00, 0x7F, 0xFF, 0xFF, 0x87, 0xF8, 0x00, 0x7F, 0xFF,
2957
+
0xFF, 0xE1, 0xFF, 0x80, 0x7F, 0xFF, 0xFF, 0x80, 0xBF, 0xF8, 0x2F, 0xFF, 0xF8, 0x00, 0x3F, 0xFE,
2958
+
0x02, 0xFF, 0xFC, 0x00, 0xBF, 0xFE, 0x00, 0x2F, 0xFF, 0x42, 0xFF, 0xFE, 0x00, 0x02, 0xFF, 0xE2,
2959
+
0xFF, 0xFE, 0x00, 0x00, 0x2F, 0xFC, 0xBF, 0xFE, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFE, 0x00, 0x00,
2960
+
0x00, 0x2F, 0xD2, 0xFE, 0x00, 0x00, 0x00, 0x02, 0xF0, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x2E,
2961
+
0x00, 0x00, 0x00, 0x00, 0x02, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x00, 0x00, 0x00, 0x00,
2962
+
0x00, 0x01, 0x00, 0x00, 0x00,
2953
2963
};
2954
2964
2955
2965
static const EpdGlyph bookerly_12_regularGlyphs[] = {
···
3681
3691
{ 15, 18, 25, 5, 18, 68, 46978 }, // ⊥
3682
3692
{ 4, 4, 16, 6, 9, 4, 47046 }, // ⋅
3683
3693
{ 21, 4, 25, 2, 9, 21, 47050 }, // ⋯
3694
+
{ 25, 24, 25, 0, 21, 150, 47071 }, // �
3684
3695
};
3685
3696
3686
3697
static const EpdUnicodeInterval bookerly_12_regularIntervals[] = {
···
3744
3755
{ 0x22A5, 0x22A5, 0x2D5 },
3745
3756
{ 0x22C5, 0x22C5, 0x2D6 },
3746
3757
{ 0x22EF, 0x22EF, 0x2D7 },
3758
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
3747
3759
};
3748
3760
3749
3761
static const EpdFontData bookerly_12_regular = {
3750
3762
bookerly_12_regularBitmaps,
3751
3763
bookerly_12_regularGlyphs,
3752
3764
bookerly_12_regularIntervals,
3753
-
60,
3765
+
61,
3754
3766
33,
3755
3767
27,
3756
3768
-7,
+17
-3
lib/EpdFont/builtinFonts/bookerly_14_bold.h
+17
-3
lib/EpdFont/builtinFonts/bookerly_14_bold.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_14_boldBitmaps[67020] = {
10
+
static const uint8_t bookerly_14_boldBitmaps[67209] = {
11
11
0x1A, 0x4B, 0xF8, 0xFF, 0x8F, 0xF4, 0xFF, 0x4F, 0xF0, 0xFF, 0x0F, 0xF0, 0xFF, 0x0F, 0xF0, 0xBF,
12
12
0x0B, 0xF0, 0x7F, 0x07, 0xF0, 0x3F, 0x03, 0xF0, 0x10, 0x00, 0x00, 0x2F, 0x4B, 0xFC, 0xBF, 0xC7,
13
13
0xFC, 0x15, 0x00, 0x2F, 0x42, 0xE7, 0xF4, 0xFF, 0xBF, 0x0F, 0xEB, 0xF0, 0xFE, 0xBF, 0x0F, 0xEB,
···
4196
4196
0xFF, 0xFF, 0xFF, 0xFA, 0xFF, 0xFF, 0xFF, 0xFE, 0xBF, 0xFF, 0xFF, 0xFF, 0x80, 0x01, 0x03, 0xFC,
4197
4197
0xBF, 0xEB, 0xFE, 0x3F, 0xC0, 0x00, 0x05, 0x00, 0x00, 0x40, 0x00, 0x04, 0x0F, 0xF0, 0x02, 0xFE,
4198
4198
0x00, 0x3F, 0xDB, 0xFD, 0x00, 0xFF, 0xC0, 0x1F, 0xFA, 0xFF, 0x40, 0x3F, 0xF0, 0x07, 0xFE, 0x7F,
4199
-
0xC0, 0x0B, 0xF4, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4199
+
0xC0, 0x0B, 0xF4, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
4200
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xE0, 0x00, 0x00,
4201
+
0x00, 0x00, 0x02, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x5B, 0xE0, 0x00, 0x00, 0x00, 0x02,
4202
+
0xC0, 0x02, 0xE0, 0x00, 0x00, 0x00, 0x2E, 0x00, 0x01, 0xE0, 0x00, 0x00, 0x02, 0xFC, 0x69, 0x02,
4203
+
0xE0, 0x00, 0x00, 0x2F, 0xFF, 0xFF, 0x03, 0xE0, 0x00, 0x02, 0xFF, 0xFF, 0xFF, 0x0F, 0xE0, 0x00,
4204
+
0x2F, 0xFF, 0xFF, 0xFC, 0x2F, 0xE0, 0x02, 0xFF, 0xFF, 0xFF, 0xF0, 0xBF, 0xE0, 0x2F, 0xFF, 0xFF,
4205
+
0xFF, 0x42, 0xFF, 0xE2, 0xFF, 0xFF, 0xFE, 0x40, 0x0F, 0xFF, 0xE3, 0xFF, 0xFF, 0xC0, 0x00, 0xFF,
4206
+
0xFF, 0x03, 0xFF, 0xFF, 0x00, 0x2F, 0xFF, 0xF0, 0x03, 0xFF, 0xFC, 0x0B, 0xFF, 0xFF, 0x00, 0x03,
4207
+
0xFF, 0xF0, 0xBF, 0xFF, 0xF0, 0x00, 0x03, 0xFF, 0xD1, 0xFF, 0xFF, 0x00, 0x00, 0x03, 0xFF, 0xFF,
4208
+
0xFF, 0xF0, 0x00, 0x00, 0x03, 0xFF, 0xEF, 0xFF, 0x00, 0x00, 0x00, 0x03, 0xFC, 0x0F, 0xF0, 0x00,
4209
+
0x00, 0x00, 0x03, 0xF0, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x03, 0xD2, 0xF0, 0x00, 0x00, 0x00, 0x00,
4210
+
0x03, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00,
4211
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4200
4212
};
4201
4213
4202
4214
static const EpdGlyph bookerly_14_boldGlyphs[] = {
···
4928
4940
{ 17, 21, 29, 6, 21, 90, 66883 }, // ⊥
4929
4941
{ 6, 6, 18, 6, 11, 9, 66973 }, // ⋅
4930
4942
{ 25, 6, 29, 2, 11, 38, 66982 }, // ⋯
4943
+
{ 27, 28, 29, 1, 24, 189, 67020 }, // �
4931
4944
};
4932
4945
4933
4946
static const EpdUnicodeInterval bookerly_14_boldIntervals[] = {
···
4991
5004
{ 0x22A5, 0x22A5, 0x2D5 },
4992
5005
{ 0x22C5, 0x22C5, 0x2D6 },
4993
5006
{ 0x22EF, 0x22EF, 0x2D7 },
5007
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
4994
5008
};
4995
5009
4996
5010
static const EpdFontData bookerly_14_bold = {
4997
5011
bookerly_14_boldBitmaps,
4998
5012
bookerly_14_boldGlyphs,
4999
5013
bookerly_14_boldIntervals,
5000
-
60,
5014
+
61,
5001
5015
38,
5002
5016
31,
5003
5017
-8,
+17
-3
lib/EpdFont/builtinFonts/bookerly_14_bolditalic.h
+17
-3
lib/EpdFont/builtinFonts/bookerly_14_bolditalic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_14_bolditalicBitmaps[70024] = {
10
+
static const uint8_t bookerly_14_bolditalicBitmaps[70213] = {
11
11
0x00, 0x1A, 0x40, 0x2F, 0xD0, 0x0F, 0xF0, 0x0B, 0xF8, 0x03, 0xFD, 0x00, 0xFF, 0x00, 0x3F, 0x80,
12
12
0x1F, 0xD0, 0x07, 0xF0, 0x02, 0xFC, 0x00, 0xBE, 0x00, 0x3F, 0x40, 0x0F, 0xC0, 0x03, 0xF0, 0x00,
13
13
0xF8, 0x00, 0x3D, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0xF4, 0x01, 0xFF, 0x00, 0xBF, 0x80, 0x1F,
···
4384
4384
0xFF, 0xFF, 0xFF, 0xFE, 0xBF, 0xFF, 0xFF, 0xFF, 0x80, 0x01, 0x03, 0xFC, 0xBF, 0xEB, 0xFE, 0x3F,
4385
4385
0xC0, 0x00, 0x05, 0x00, 0x00, 0x40, 0x00, 0x04, 0x0F, 0xF0, 0x02, 0xFE, 0x00, 0x3F, 0xDB, 0xFD,
4386
4386
0x00, 0xFF, 0xC0, 0x1F, 0xFA, 0xFF, 0x40, 0x3F, 0xF0, 0x07, 0xFE, 0x7F, 0xC0, 0x0B, 0xF4, 0x00,
4387
-
0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4387
+
0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
4388
+
0x00, 0x02, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF,
4389
+
0xE0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x5B, 0xE0, 0x00, 0x00, 0x00, 0x02, 0xC0, 0x02, 0xE0, 0x00,
4390
+
0x00, 0x00, 0x2E, 0x00, 0x01, 0xE0, 0x00, 0x00, 0x02, 0xFC, 0x69, 0x02, 0xE0, 0x00, 0x00, 0x2F,
4391
+
0xFF, 0xFF, 0x03, 0xE0, 0x00, 0x02, 0xFF, 0xFF, 0xFF, 0x0F, 0xE0, 0x00, 0x2F, 0xFF, 0xFF, 0xFC,
4392
+
0x2F, 0xE0, 0x02, 0xFF, 0xFF, 0xFF, 0xF0, 0xBF, 0xE0, 0x2F, 0xFF, 0xFF, 0xFF, 0x42, 0xFF, 0xE2,
4393
+
0xFF, 0xFF, 0xFE, 0x40, 0x0F, 0xFF, 0xE3, 0xFF, 0xFF, 0xC0, 0x00, 0xFF, 0xFF, 0x03, 0xFF, 0xFF,
4394
+
0x00, 0x2F, 0xFF, 0xF0, 0x03, 0xFF, 0xFC, 0x0B, 0xFF, 0xFF, 0x00, 0x03, 0xFF, 0xF0, 0xBF, 0xFF,
4395
+
0xF0, 0x00, 0x03, 0xFF, 0xD1, 0xFF, 0xFF, 0x00, 0x00, 0x03, 0xFF, 0xFF, 0xFF, 0xF0, 0x00, 0x00,
4396
+
0x03, 0xFF, 0xEF, 0xFF, 0x00, 0x00, 0x00, 0x03, 0xFC, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x03, 0xF0,
4397
+
0x3F, 0x00, 0x00, 0x00, 0x00, 0x03, 0xD2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x03, 0xFF, 0x00, 0x00,
4398
+
0x00, 0x00, 0x00, 0x03, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
4399
+
0x00, 0x00, 0x00, 0x00, 0x00,
4388
4400
};
4389
4401
4390
4402
static const EpdGlyph bookerly_14_bolditalicGlyphs[] = {
···
5116
5128
{ 17, 21, 29, 6, 21, 90, 69887 }, // ⊥
5117
5129
{ 6, 6, 18, 6, 11, 9, 69977 }, // ⋅
5118
5130
{ 25, 6, 29, 2, 11, 38, 69986 }, // ⋯
5131
+
{ 27, 28, 29, 1, 24, 189, 70024 }, // �
5119
5132
};
5120
5133
5121
5134
static const EpdUnicodeInterval bookerly_14_bolditalicIntervals[] = {
···
5179
5192
{ 0x22A5, 0x22A5, 0x2D5 },
5180
5193
{ 0x22C5, 0x22C5, 0x2D6 },
5181
5194
{ 0x22EF, 0x22EF, 0x2D7 },
5195
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
5182
5196
};
5183
5197
5184
5198
static const EpdFontData bookerly_14_bolditalic = {
5185
5199
bookerly_14_bolditalicBitmaps,
5186
5200
bookerly_14_bolditalicGlyphs,
5187
5201
bookerly_14_bolditalicIntervals,
5188
-
60,
5202
+
61,
5189
5203
38,
5190
5204
31,
5191
5205
-8,
+17
-3
lib/EpdFont/builtinFonts/bookerly_14_italic.h
+17
-3
lib/EpdFont/builtinFonts/bookerly_14_italic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_14_italicBitmaps[64856] = {
10
+
static const uint8_t bookerly_14_italicBitmaps[65045] = {
11
11
0x00, 0x05, 0x00, 0x0F, 0x80, 0x0B, 0xD0, 0x03, 0xF0, 0x00, 0xF8, 0x00, 0x7D, 0x00, 0x2F, 0x00,
12
12
0x0F, 0x80, 0x03, 0xD0, 0x00, 0xF0, 0x00, 0x7C, 0x00, 0x1E, 0x00, 0x0B, 0x40, 0x02, 0xC0, 0x00,
13
13
0xF0, 0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBC, 0x00, 0x3F, 0x40, 0x0F,
···
4061
4061
0xFC, 0x00, 0x06, 0xAA, 0xBF, 0xAA, 0xA6, 0xFF, 0xFF, 0xFF, 0xFE, 0xBF, 0xFF, 0xFF, 0xFF, 0x80,
4062
4062
0x0A, 0x43, 0xFC, 0x3F, 0xC2, 0xF8, 0x00, 0x00, 0x0A, 0x00, 0x01, 0xA0, 0x00, 0x29, 0x0F, 0xF0,
4063
4063
0x01, 0xFD, 0x00, 0x2F, 0xC3, 0xFC, 0x00, 0xBF, 0x80, 0x0F, 0xF0, 0xFD, 0x00, 0x0F, 0xC0, 0x01,
4064
-
0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4064
+
0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
4065
+
0x00, 0x02, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF,
4066
+
0xE0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x5B, 0xE0, 0x00, 0x00, 0x00, 0x02, 0xC0, 0x02, 0xE0, 0x00,
4067
+
0x00, 0x00, 0x2E, 0x00, 0x01, 0xE0, 0x00, 0x00, 0x02, 0xFC, 0x69, 0x02, 0xE0, 0x00, 0x00, 0x2F,
4068
+
0xFF, 0xFF, 0x03, 0xE0, 0x00, 0x02, 0xFF, 0xFF, 0xFF, 0x0F, 0xE0, 0x00, 0x2F, 0xFF, 0xFF, 0xFC,
4069
+
0x2F, 0xE0, 0x02, 0xFF, 0xFF, 0xFF, 0xF0, 0xBF, 0xE0, 0x2F, 0xFF, 0xFF, 0xFF, 0x42, 0xFF, 0xE2,
4070
+
0xFF, 0xFF, 0xFE, 0x40, 0x0F, 0xFF, 0xE3, 0xFF, 0xFF, 0xC0, 0x00, 0xFF, 0xFF, 0x03, 0xFF, 0xFF,
4071
+
0x00, 0x2F, 0xFF, 0xF0, 0x03, 0xFF, 0xFC, 0x0B, 0xFF, 0xFF, 0x00, 0x03, 0xFF, 0xF0, 0xBF, 0xFF,
4072
+
0xF0, 0x00, 0x03, 0xFF, 0xD1, 0xFF, 0xFF, 0x00, 0x00, 0x03, 0xFF, 0xFF, 0xFF, 0xF0, 0x00, 0x00,
4073
+
0x03, 0xFF, 0xEF, 0xFF, 0x00, 0x00, 0x00, 0x03, 0xFC, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x03, 0xF0,
4074
+
0x3F, 0x00, 0x00, 0x00, 0x00, 0x03, 0xD2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x03, 0xFF, 0x00, 0x00,
4075
+
0x00, 0x00, 0x00, 0x03, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
4076
+
0x00, 0x00, 0x00, 0x00, 0x00,
4065
4077
};
4066
4078
4067
4079
static const EpdGlyph bookerly_14_italicGlyphs[] = {
···
4793
4805
{ 17, 21, 29, 6, 21, 90, 64726 }, // ⊥
4794
4806
{ 6, 5, 18, 6, 10, 8, 64816 }, // ⋅
4795
4807
{ 25, 5, 29, 2, 10, 32, 64824 }, // ⋯
4808
+
{ 27, 28, 29, 1, 24, 189, 64856 }, // �
4796
4809
};
4797
4810
4798
4811
static const EpdUnicodeInterval bookerly_14_italicIntervals[] = {
···
4856
4869
{ 0x22A5, 0x22A5, 0x2D5 },
4857
4870
{ 0x22C5, 0x22C5, 0x2D6 },
4858
4871
{ 0x22EF, 0x22EF, 0x2D7 },
4872
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
4859
4873
};
4860
4874
4861
4875
static const EpdFontData bookerly_14_italic = {
4862
4876
bookerly_14_italicBitmaps,
4863
4877
bookerly_14_italicGlyphs,
4864
4878
bookerly_14_italicIntervals,
4865
-
60,
4879
+
61,
4866
4880
38,
4867
4881
31,
4868
4882
-8,
+16
-3
lib/EpdFont/builtinFonts/bookerly_14_regular.h
+16
-3
lib/EpdFont/builtinFonts/bookerly_14_regular.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_14_regularBitmaps[62675] = {
10
+
static const uint8_t bookerly_14_regularBitmaps[62864] = {
11
11
0x1A, 0x1F, 0xCB, 0xE2, 0xF4, 0xBD, 0x2F, 0x4B, 0xC2, 0xF0, 0xBC, 0x2F, 0x07, 0xC1, 0xF0, 0x7C,
12
12
0x0F, 0x03, 0xC0, 0xF0, 0x00, 0x00, 0x00, 0x40, 0xFC, 0xBF, 0x5F, 0xC1, 0x40, 0x18, 0x06, 0x1F,
13
13
0x07, 0xCB, 0xC2, 0xF1, 0xF0, 0xBC, 0x7C, 0x1F, 0x1F, 0x07, 0xC7, 0xC1, 0xF1, 0xF0, 0x7C, 0x34,
···
3925
3925
0xAA, 0xA6, 0xFF, 0xFF, 0xFF, 0xFE, 0xBF, 0xFF, 0xFF, 0xFF, 0x80, 0x0A, 0x43, 0xFC, 0x3F, 0xC2,
3926
3926
0xF8, 0x00, 0x00, 0x0A, 0x00, 0x01, 0xA0, 0x00, 0x29, 0x0F, 0xF0, 0x01, 0xFD, 0x00, 0x2F, 0xC3,
3927
3927
0xFC, 0x00, 0xBF, 0x80, 0x0F, 0xF0, 0xFD, 0x00, 0x0F, 0xC0, 0x01, 0xF8, 0x00, 0x00, 0x00, 0x00,
3928
-
0x00, 0x00, 0x00,
3928
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xE0, 0x00, 0x00,
3929
+
0x00, 0x00, 0x00, 0x2F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00,
3930
+
0x2E, 0x5B, 0xE0, 0x00, 0x00, 0x00, 0x02, 0xC0, 0x02, 0xE0, 0x00, 0x00, 0x00, 0x2E, 0x00, 0x01,
3931
+
0xE0, 0x00, 0x00, 0x02, 0xFC, 0x69, 0x02, 0xE0, 0x00, 0x00, 0x2F, 0xFF, 0xFF, 0x03, 0xE0, 0x00,
3932
+
0x02, 0xFF, 0xFF, 0xFF, 0x0F, 0xE0, 0x00, 0x2F, 0xFF, 0xFF, 0xFC, 0x2F, 0xE0, 0x02, 0xFF, 0xFF,
3933
+
0xFF, 0xF0, 0xBF, 0xE0, 0x2F, 0xFF, 0xFF, 0xFF, 0x42, 0xFF, 0xE2, 0xFF, 0xFF, 0xFE, 0x40, 0x0F,
3934
+
0xFF, 0xE3, 0xFF, 0xFF, 0xC0, 0x00, 0xFF, 0xFF, 0x03, 0xFF, 0xFF, 0x00, 0x2F, 0xFF, 0xF0, 0x03,
3935
+
0xFF, 0xFC, 0x0B, 0xFF, 0xFF, 0x00, 0x03, 0xFF, 0xF0, 0xBF, 0xFF, 0xF0, 0x00, 0x03, 0xFF, 0xD1,
3936
+
0xFF, 0xFF, 0x00, 0x00, 0x03, 0xFF, 0xFF, 0xFF, 0xF0, 0x00, 0x00, 0x03, 0xFF, 0xEF, 0xFF, 0x00,
3937
+
0x00, 0x00, 0x03, 0xFC, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x03, 0xF0, 0x3F, 0x00, 0x00, 0x00, 0x00,
3938
+
0x03, 0xD2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x03, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xF0,
3939
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3929
3940
};
3930
3941
3931
3942
static const EpdGlyph bookerly_14_regularGlyphs[] = {
···
4657
4668
{ 17, 21, 29, 6, 21, 90, 62545 }, // ⊥
4658
4669
{ 6, 5, 18, 6, 10, 8, 62635 }, // ⋅
4659
4670
{ 25, 5, 29, 2, 10, 32, 62643 }, // ⋯
4671
+
{ 27, 28, 29, 1, 24, 189, 62675 }, // �
4660
4672
};
4661
4673
4662
4674
static const EpdUnicodeInterval bookerly_14_regularIntervals[] = {
···
4720
4732
{ 0x22A5, 0x22A5, 0x2D5 },
4721
4733
{ 0x22C5, 0x22C5, 0x2D6 },
4722
4734
{ 0x22EF, 0x22EF, 0x2D7 },
4735
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
4723
4736
};
4724
4737
4725
4738
static const EpdFontData bookerly_14_regular = {
4726
4739
bookerly_14_regularBitmaps,
4727
4740
bookerly_14_regularGlyphs,
4728
4741
bookerly_14_regularIntervals,
4729
-
60,
4742
+
61,
4730
4743
38,
4731
4744
31,
4732
4745
-8,
+20
-3
lib/EpdFont/builtinFonts/bookerly_16_bold.h
+20
-3
lib/EpdFont/builtinFonts/bookerly_16_bold.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_16_boldBitmaps[85154] = {
10
+
static const uint8_t bookerly_16_boldBitmaps[85402] = {
11
11
0x0A, 0x90, 0xFF, 0x87, 0xFE, 0x2F, 0xF4, 0xBF, 0xC2, 0xFF, 0x0B, 0xFC, 0x2F, 0xF0, 0xBF, 0xC2,
12
12
0xFF, 0x0B, 0xFC, 0x1F, 0xF0, 0x7F, 0xC0, 0xFE, 0x03, 0xF8, 0x0F, 0xE0, 0x3F, 0xC0, 0xBF, 0x01,
13
13
0x40, 0x00, 0x00, 0x05, 0x40, 0xFF, 0xC7, 0xFF, 0x1F, 0xFC, 0x3F, 0xF0, 0x19, 0x00, 0x0A, 0x80,
···
5330
5330
0x2F, 0xFC, 0x7F, 0xE0, 0x15, 0x00, 0x0A, 0x90, 0x00, 0x2A, 0x40, 0x00, 0xA9, 0x0F, 0xFC, 0x00,
5331
5331
0x3F, 0xF0, 0x00, 0xFF, 0xC7, 0xFF, 0x40, 0x1F, 0xFD, 0x00, 0x7F, 0xF5, 0xFF, 0xD0, 0x07, 0xFF,
5332
5332
0x40, 0x1F, 0xFD, 0x3F, 0xF0, 0x00, 0xFF, 0xC0, 0x03, 0xFF, 0x01, 0x50, 0x00, 0x05, 0x40, 0x00,
5333
-
0x15, 0x00,
5333
+
0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00,
5334
+
0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFC, 0x00, 0x00,
5335
+
0x00, 0x00, 0x00, 0x00, 0xFF, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xEF, 0xFC, 0x00, 0x00,
5336
+
0x00, 0x00, 0x00, 0xF0, 0x01, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0xBC, 0x00, 0x00,
5337
+
0x00, 0x00, 0xFC, 0x00, 0x00, 0xBC, 0x00, 0x00, 0x00, 0x0F, 0xF9, 0xBE, 0x40, 0xFC, 0x00, 0x00,
5338
+
0x00, 0xFF, 0xFF, 0xFF, 0x81, 0xFC, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0x43, 0xFC, 0x00, 0x00,
5339
+
0xFF, 0xFF, 0xFF, 0xFE, 0x0F, 0xFC, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0xFC, 0x2F, 0xFC, 0x00, 0xFF,
5340
+
0xFF, 0xFF, 0xFF, 0xD0, 0xFF, 0xFC, 0x0F, 0xFF, 0xFF, 0xFF, 0xE4, 0x03, 0xFF, 0xFC, 0x7F, 0xFF,
5341
+
0xFF, 0xD0, 0x00, 0x2F, 0xFF, 0xF4, 0x7F, 0xFF, 0xFE, 0x00, 0x02, 0xFF, 0xFF, 0x40, 0x7F, 0xFF,
5342
+
0xF8, 0x00, 0x7F, 0xFF, 0xF4, 0x00, 0x7F, 0xFF, 0xE0, 0x2F, 0xFF, 0xFF, 0x40, 0x00, 0x7F, 0xFF,
5343
+
0xC2, 0xFF, 0xFF, 0xF4, 0x00, 0x00, 0x7F, 0xFF, 0x07, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x7F, 0xFE,
5344
+
0x7F, 0xFF, 0xF4, 0x00, 0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x7F, 0xF4,
5345
+
0x7F, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x80, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x03,
5346
+
0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0x2F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xF4,
5347
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x00,
5348
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5334
5349
};
5335
5350
5336
5351
static const EpdGlyph bookerly_16_boldGlyphs[] = {
···
6062
6077
{ 19, 23, 33, 7, 23, 110, 84989 }, // ⊥
6063
6078
{ 7, 6, 21, 7, 12, 11, 85099 }, // ⋅
6064
6079
{ 29, 6, 33, 2, 12, 44, 85110 }, // ⋯
6080
+
{ 31, 32, 33, 1, 28, 248, 85154 }, // �
6065
6081
};
6066
6082
6067
6083
static const EpdUnicodeInterval bookerly_16_boldIntervals[] = {
···
6125
6141
{ 0x22A5, 0x22A5, 0x2D5 },
6126
6142
{ 0x22C5, 0x22C5, 0x2D6 },
6127
6143
{ 0x22EF, 0x22EF, 0x2D7 },
6144
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
6128
6145
};
6129
6146
6130
6147
static const EpdFontData bookerly_16_bold = {
6131
6148
bookerly_16_boldBitmaps,
6132
6149
bookerly_16_boldGlyphs,
6133
6150
bookerly_16_boldIntervals,
6134
-
60,
6151
+
61,
6135
6152
44,
6136
6153
36,
6137
6154
-9,
+20
-2
lib/EpdFont/builtinFonts/bookerly_16_bolditalic.h
+20
-2
lib/EpdFont/builtinFonts/bookerly_16_bolditalic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_16_bolditalicBitmaps[88512] = {
10
+
static const uint8_t bookerly_16_bolditalicBitmaps[88760] = {
11
11
0x00, 0x06, 0xA0, 0x00, 0xBF, 0xC0, 0x07, 0xFD, 0x00, 0x3F, 0xF0, 0x00, 0xFF, 0x80, 0x07, 0xFD,
12
12
0x00, 0x1F, 0xF0, 0x00, 0xBF, 0x80, 0x03, 0xFD, 0x00, 0x0F, 0xF0, 0x00, 0x3F, 0xC0, 0x00, 0xFE,
13
13
0x00, 0x07, 0xF4, 0x00, 0x1F, 0xC0, 0x00, 0xBF, 0x00, 0x02, 0xF8, 0x00, 0x0B, 0xD0, 0x00, 0x3F,
···
5540
5540
0x7F, 0xE0, 0x15, 0x00, 0x0A, 0x90, 0x00, 0x2A, 0x40, 0x00, 0xA9, 0x0F, 0xFC, 0x00, 0x3F, 0xF0,
5541
5541
0x00, 0xFF, 0xC7, 0xFF, 0x40, 0x1F, 0xFD, 0x00, 0x7F, 0xF5, 0xFF, 0xD0, 0x07, 0xFF, 0x40, 0x1F,
5542
5542
0xFD, 0x3F, 0xF0, 0x00, 0xFF, 0xC0, 0x03, 0xFF, 0x01, 0x50, 0x00, 0x05, 0x40, 0x00, 0x15, 0x00,
5543
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,
5544
+
0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFC, 0x00, 0x00, 0x00, 0x00,
5545
+
0x00, 0x00, 0xFF, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xEF, 0xFC, 0x00, 0x00, 0x00, 0x00,
5546
+
0x00, 0xF0, 0x01, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0xBC, 0x00, 0x00, 0x00, 0x00,
5547
+
0xFC, 0x00, 0x00, 0xBC, 0x00, 0x00, 0x00, 0x0F, 0xF9, 0xBE, 0x40, 0xFC, 0x00, 0x00, 0x00, 0xFF,
5548
+
0xFF, 0xFF, 0x81, 0xFC, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0x43, 0xFC, 0x00, 0x00, 0xFF, 0xFF,
5549
+
0xFF, 0xFE, 0x0F, 0xFC, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0xFC, 0x2F, 0xFC, 0x00, 0xFF, 0xFF, 0xFF,
5550
+
0xFF, 0xD0, 0xFF, 0xFC, 0x0F, 0xFF, 0xFF, 0xFF, 0xE4, 0x03, 0xFF, 0xFC, 0x7F, 0xFF, 0xFF, 0xD0,
5551
+
0x00, 0x2F, 0xFF, 0xF4, 0x7F, 0xFF, 0xFE, 0x00, 0x02, 0xFF, 0xFF, 0x40, 0x7F, 0xFF, 0xF8, 0x00,
5552
+
0x7F, 0xFF, 0xF4, 0x00, 0x7F, 0xFF, 0xE0, 0x2F, 0xFF, 0xFF, 0x40, 0x00, 0x7F, 0xFF, 0xC2, 0xFF,
5553
+
0xFF, 0xF4, 0x00, 0x00, 0x7F, 0xFF, 0x07, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x7F, 0xFE, 0x7F, 0xFF,
5554
+
0xF4, 0x00, 0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x7F, 0xF4, 0x7F, 0xF4,
5555
+
0x00, 0x00, 0x00, 0x00, 0x7F, 0x80, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x03, 0xF4, 0x00,
5556
+
0x00, 0x00, 0x00, 0x00, 0x7D, 0x2F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xF4, 0x00, 0x00,
5557
+
0x00, 0x00, 0x00, 0x00, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00,
5558
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5543
5559
};
5544
5560
5545
5561
static const EpdGlyph bookerly_16_bolditalicGlyphs[] = {
···
6271
6287
{ 19, 23, 33, 7, 23, 110, 88347 }, // ⊥
6272
6288
{ 7, 6, 21, 7, 12, 11, 88457 }, // ⋅
6273
6289
{ 29, 6, 33, 2, 12, 44, 88468 }, // ⋯
6290
+
{ 31, 32, 33, 1, 28, 248, 88512 }, // �
6274
6291
};
6275
6292
6276
6293
static const EpdUnicodeInterval bookerly_16_bolditalicIntervals[] = {
···
6334
6351
{ 0x22A5, 0x22A5, 0x2D5 },
6335
6352
{ 0x22C5, 0x22C5, 0x2D6 },
6336
6353
{ 0x22EF, 0x22EF, 0x2D7 },
6354
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
6337
6355
};
6338
6356
6339
6357
static const EpdFontData bookerly_16_bolditalic = {
6340
6358
bookerly_16_bolditalicBitmaps,
6341
6359
bookerly_16_bolditalicGlyphs,
6342
6360
bookerly_16_bolditalicIntervals,
6343
-
60,
6361
+
61,
6344
6362
44,
6345
6363
36,
6346
6364
-9,
+21
-3
lib/EpdFont/builtinFonts/bookerly_16_italic.h
+21
-3
lib/EpdFont/builtinFonts/bookerly_16_italic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_16_italicBitmaps[82412] = {
10
+
static const uint8_t bookerly_16_italicBitmaps[82660] = {
11
11
0x00, 0x01, 0x40, 0x00, 0xFC, 0x00, 0x3F, 0x80, 0x03, 0xF0, 0x00, 0x7F, 0x00, 0x0B, 0xE0, 0x00,
12
12
0xFC, 0x00, 0x0F, 0xC0, 0x00, 0xF8, 0x00, 0x1F, 0x40, 0x02, 0xF0, 0x00, 0x2F, 0x00, 0x03, 0xE0,
13
13
0x00, 0x3D, 0x00, 0x03, 0xC0, 0x00, 0x7C, 0x00, 0x07, 0x80, 0x00, 0x74, 0x00, 0x0A, 0x00, 0x00,
···
5158
5158
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x00, 0x01, 0xFC, 0x3F, 0xE3, 0xFE,
5159
5159
0x2F, 0xC0, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x00, 0x03, 0xF0, 0x00, 0x0B,
5160
5160
0xDB, 0xFC, 0x00, 0x2F, 0xF0, 0x00, 0xBF, 0xFF, 0xF0, 0x00, 0xFF, 0xC0, 0x03, 0xFF, 0x7F, 0x40,
5161
-
0x01, 0xFD, 0x00, 0x07, 0xF4, 0x10, 0x00, 0x00, 0x40, 0x00, 0x01, 0x00,
5161
+
0x01, 0xFD, 0x00, 0x07, 0xF4, 0x10, 0x00, 0x00, 0x40, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
5162
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC,
5163
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFC,
5164
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xEF, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x01, 0xFC,
5165
+
0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0xBC, 0x00, 0x00, 0x00, 0x00, 0xFC, 0x00, 0x00, 0xBC,
5166
+
0x00, 0x00, 0x00, 0x0F, 0xF9, 0xBE, 0x40, 0xFC, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x81, 0xFC,
5167
+
0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0x43, 0xFC, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFE, 0x0F, 0xFC,
5168
+
0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0xFC, 0x2F, 0xFC, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xFF, 0xFC,
5169
+
0x0F, 0xFF, 0xFF, 0xFF, 0xE4, 0x03, 0xFF, 0xFC, 0x7F, 0xFF, 0xFF, 0xD0, 0x00, 0x2F, 0xFF, 0xF4,
5170
+
0x7F, 0xFF, 0xFE, 0x00, 0x02, 0xFF, 0xFF, 0x40, 0x7F, 0xFF, 0xF8, 0x00, 0x7F, 0xFF, 0xF4, 0x00,
5171
+
0x7F, 0xFF, 0xE0, 0x2F, 0xFF, 0xFF, 0x40, 0x00, 0x7F, 0xFF, 0xC2, 0xFF, 0xFF, 0xF4, 0x00, 0x00,
5172
+
0x7F, 0xFF, 0x07, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x7F, 0xFE, 0x7F, 0xFF, 0xF4, 0x00, 0x00, 0x00,
5173
+
0x7F, 0xFF, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x7F, 0xF4, 0x7F, 0xF4, 0x00, 0x00, 0x00, 0x00,
5174
+
0x7F, 0x80, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x03, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00,
5175
+
0x7D, 0x2F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5176
+
0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5177
+
0x00, 0x00, 0x00, 0x00,
5162
5178
};
5163
5179
5164
5180
static const EpdGlyph bookerly_16_italicGlyphs[] = {
···
5890
5906
{ 19, 23, 33, 7, 23, 110, 82252 }, // ⊥
5891
5907
{ 6, 6, 21, 7, 12, 9, 82362 }, // ⋅
5892
5908
{ 27, 6, 33, 3, 12, 41, 82371 }, // ⋯
5909
+
{ 31, 32, 33, 1, 28, 248, 82412 }, // �
5893
5910
};
5894
5911
5895
5912
static const EpdUnicodeInterval bookerly_16_italicIntervals[] = {
···
5953
5970
{ 0x22A5, 0x22A5, 0x2D5 },
5954
5971
{ 0x22C5, 0x22C5, 0x2D6 },
5955
5972
{ 0x22EF, 0x22EF, 0x2D7 },
5973
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
5956
5974
};
5957
5975
5958
5976
static const EpdFontData bookerly_16_italic = {
5959
5977
bookerly_16_italicBitmaps,
5960
5978
bookerly_16_italicGlyphs,
5961
5979
bookerly_16_italicIntervals,
5962
-
60,
5980
+
61,
5963
5981
44,
5964
5982
36,
5965
5983
-9,
+21
-3
lib/EpdFont/builtinFonts/bookerly_16_regular.h
+21
-3
lib/EpdFont/builtinFonts/bookerly_16_regular.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_16_regularBitmaps[79871] = {
10
+
static const uint8_t bookerly_16_regularBitmaps[80119] = {
11
11
0x0A, 0x83, 0xF8, 0x3F, 0x47, 0xF4, 0x7F, 0x07, 0xF0, 0x7F, 0x07, 0xF0, 0x3F, 0x03, 0xF0, 0x3F,
12
12
0x03, 0xF0, 0x3F, 0x03, 0xF0, 0x3F, 0x03, 0xF0, 0x2F, 0x02, 0xF0, 0x04, 0x00, 0x00, 0x00, 0x01,
13
13
0xA4, 0x3F, 0xC3, 0xFC, 0x3F, 0xC0, 0x50, 0x05, 0x01, 0x93, 0xE0, 0x7D, 0x7E, 0x0B, 0xD7, 0xE0,
···
4999
4999
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x00, 0x01, 0xFC,
5000
5000
0x3F, 0xE3, 0xFE, 0x2F, 0xC0, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x00, 0x03,
5001
5001
0xF0, 0x00, 0x0B, 0xDB, 0xFC, 0x00, 0x2F, 0xF0, 0x00, 0xBF, 0xFF, 0xF0, 0x00, 0xFF, 0xC0, 0x03,
5002
-
0xFF, 0x7F, 0x40, 0x01, 0xFD, 0x00, 0x07, 0xF4, 0x10, 0x00, 0x00, 0x40, 0x00, 0x01, 0x00,
5002
+
0xFF, 0x7F, 0x40, 0x01, 0xFD, 0x00, 0x07, 0xF4, 0x10, 0x00, 0x00, 0x40, 0x00, 0x01, 0x00, 0x00,
5003
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00,
5004
+
0x00, 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00,
5005
+
0x00, 0xFF, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xEF, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00,
5006
+
0xF0, 0x01, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0xBC, 0x00, 0x00, 0x00, 0x00, 0xFC,
5007
+
0x00, 0x00, 0xBC, 0x00, 0x00, 0x00, 0x0F, 0xF9, 0xBE, 0x40, 0xFC, 0x00, 0x00, 0x00, 0xFF, 0xFF,
5008
+
0xFF, 0x81, 0xFC, 0x00, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0x43, 0xFC, 0x00, 0x00, 0xFF, 0xFF, 0xFF,
5009
+
0xFE, 0x0F, 0xFC, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0xFC, 0x2F, 0xFC, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
5010
+
0xD0, 0xFF, 0xFC, 0x0F, 0xFF, 0xFF, 0xFF, 0xE4, 0x03, 0xFF, 0xFC, 0x7F, 0xFF, 0xFF, 0xD0, 0x00,
5011
+
0x2F, 0xFF, 0xF4, 0x7F, 0xFF, 0xFE, 0x00, 0x02, 0xFF, 0xFF, 0x40, 0x7F, 0xFF, 0xF8, 0x00, 0x7F,
5012
+
0xFF, 0xF4, 0x00, 0x7F, 0xFF, 0xE0, 0x2F, 0xFF, 0xFF, 0x40, 0x00, 0x7F, 0xFF, 0xC2, 0xFF, 0xFF,
5013
+
0xF4, 0x00, 0x00, 0x7F, 0xFF, 0x07, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x7F, 0xFE, 0x7F, 0xFF, 0xF4,
5014
+
0x00, 0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x7F, 0xF4, 0x7F, 0xF4, 0x00,
5015
+
0x00, 0x00, 0x00, 0x7F, 0x80, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x03, 0xF4, 0x00, 0x00,
5016
+
0x00, 0x00, 0x00, 0x7D, 0x2F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xF4, 0x00, 0x00, 0x00,
5017
+
0x00, 0x00, 0x00, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00, 0x00,
5018
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5003
5019
};
5004
5020
5005
5021
static const EpdGlyph bookerly_16_regularGlyphs[] = {
···
5731
5747
{ 19, 23, 33, 7, 23, 110, 79711 }, // ⊥
5732
5748
{ 6, 6, 21, 7, 12, 9, 79821 }, // ⋅
5733
5749
{ 27, 6, 33, 3, 12, 41, 79830 }, // ⋯
5750
+
{ 31, 32, 33, 1, 28, 248, 79871 }, // �
5734
5751
};
5735
5752
5736
5753
static const EpdUnicodeInterval bookerly_16_regularIntervals[] = {
···
5794
5811
{ 0x22A5, 0x22A5, 0x2D5 },
5795
5812
{ 0x22C5, 0x22C5, 0x2D6 },
5796
5813
{ 0x22EF, 0x22EF, 0x2D7 },
5814
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
5797
5815
};
5798
5816
5799
5817
static const EpdFontData bookerly_16_regular = {
5800
5818
bookerly_16_regularBitmaps,
5801
5819
bookerly_16_regularGlyphs,
5802
5820
bookerly_16_regularIntervals,
5803
-
60,
5821
+
61,
5804
5822
44,
5805
5823
36,
5806
5824
-9,
+25
-3
lib/EpdFont/builtinFonts/bookerly_18_bold.h
+25
-3
lib/EpdFont/builtinFonts/bookerly_18_bold.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_18_boldBitmaps[112410] = {
10
+
static const uint8_t bookerly_18_boldBitmaps[112734] = {
11
11
0x01, 0x54, 0x1F, 0xFC, 0x3F, 0xF8, 0x3F, 0xF8, 0x7F, 0xF4, 0x7F, 0xF4, 0x7F, 0xF0, 0x7F, 0xF0,
12
12
0x7F, 0xF0, 0x7F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0, 0x3F, 0xF0,
13
13
0x2F, 0xF0, 0x2F, 0xF0, 0x1F, 0xF0, 0x1F, 0xF0, 0x0F, 0xF0, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
···
7033
7033
0x00, 0x00, 0x54, 0x00, 0x00, 0x54, 0x01, 0xFF, 0xC0, 0x00, 0xBF, 0xF0, 0x00, 0x3F, 0xF4, 0x3F,
7034
7034
0xFE, 0x00, 0x0F, 0xFF, 0x40, 0x0B, 0xFF, 0xC3, 0xFF, 0xF0, 0x01, 0xFF, 0xF4, 0x00, 0xBF, 0xFC,
7035
7035
0x3F, 0xFE, 0x00, 0x1F, 0xFF, 0x00, 0x0B, 0xFF, 0xC1, 0xFF, 0xC0, 0x00, 0xFF, 0xE0, 0x00, 0x3F,
7036
-
0xF4, 0x01, 0x50, 0x00, 0x01, 0x50, 0x00, 0x00, 0x54, 0x00,
7036
+
0xF4, 0x01, 0x50, 0x00, 0x01, 0x50, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
7037
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
7038
+
0xBE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
7039
+
0x00, 0x0B, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xFF, 0xF8, 0x00, 0x00, 0x00,
7040
+
0x00, 0x00, 0x00, 0xBE, 0x56, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xE0, 0x00, 0x2F, 0x80,
7041
+
0x00, 0x00, 0x00, 0x00, 0x0B, 0xC0, 0x00, 0x07, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xC0, 0x00,
7042
+
0x01, 0xF8, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xD1, 0xA9, 0x00, 0xBE, 0x00, 0x00, 0x00, 0x02, 0xFF,
7043
+
0xFF, 0xFF, 0xD0, 0x3F, 0x80, 0x00, 0x00, 0x0B, 0xFF, 0xFF, 0xFF, 0xF0, 0x2F, 0xE0, 0x00, 0x00,
7044
+
0x2F, 0xFF, 0xFF, 0xFF, 0xF8, 0x1F, 0xF8, 0x00, 0x00, 0xBF, 0xFF, 0xFF, 0xFF, 0xFC, 0x0F, 0xFE,
7045
+
0x00, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x0F, 0xFF, 0x80, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4,
7046
+
0x1F, 0xFF, 0xE0, 0x2F, 0xFF, 0xFF, 0xFF, 0xFE, 0x40, 0x1F, 0xFF, 0xF8, 0x7F, 0xFF, 0xFF, 0xFF,
7047
+
0x80, 0x00, 0x3F, 0xFF, 0xFD, 0x1F, 0xFF, 0xFF, 0xF8, 0x00, 0x00, 0xFF, 0xFF, 0xF4, 0x07, 0xFF,
7048
+
0xFF, 0xF8, 0x00, 0x07, 0xFF, 0xFF, 0xD0, 0x01, 0xFF, 0xFF, 0xF8, 0x00, 0xBF, 0xFF, 0xFF, 0x40,
7049
+
0x00, 0x7F, 0xFF, 0xFC, 0x0B, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x1F, 0xFF, 0xFC, 0x0F, 0xFF, 0xFF,
7050
+
0xF4, 0x00, 0x00, 0x07, 0xFF, 0xFD, 0x0F, 0xFF, 0xFF, 0xD0, 0x00, 0x00, 0x01, 0xFF, 0xFE, 0x1F,
7051
+
0xFF, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x1F,
7052
+
0xFF, 0xEB, 0xFF, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFF, 0x00, 0xFF, 0xD0, 0x00, 0x00, 0x00,
7053
+
0x00, 0x01, 0xFE, 0x00, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x00, 0xFD, 0x00, 0x00,
7054
+
0x00, 0x00, 0x00, 0x00, 0x1F, 0x97, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFF, 0xD0,
7055
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
7056
+
0x7D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00,
7037
7057
};
7038
7058
7039
7059
static const EpdGlyph bookerly_18_boldGlyphs[] = {
···
7765
7785
{ 22, 27, 38, 8, 27, 149, 112187 }, // ⊥
7766
7786
{ 8, 7, 24, 8, 14, 14, 112336 }, // ⋅
7767
7787
{ 34, 7, 38, 2, 14, 60, 112350 }, // ⋯
7788
+
{ 36, 36, 38, 1, 32, 324, 112410 }, // �
7768
7789
};
7769
7790
7770
7791
static const EpdUnicodeInterval bookerly_18_boldIntervals[] = {
···
7828
7849
{ 0x22A5, 0x22A5, 0x2D5 },
7829
7850
{ 0x22C5, 0x22C5, 0x2D6 },
7830
7851
{ 0x22EF, 0x22EF, 0x2D7 },
7852
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
7831
7853
};
7832
7854
7833
7855
static const EpdFontData bookerly_18_bold = {
7834
7856
bookerly_18_boldBitmaps,
7835
7857
bookerly_18_boldGlyphs,
7836
7858
bookerly_18_boldIntervals,
7837
-
60,
7859
+
61,
7838
7860
49,
7839
7861
40,
7840
7862
-10,
+25
-3
lib/EpdFont/builtinFonts/bookerly_18_bolditalic.h
+25
-3
lib/EpdFont/builtinFonts/bookerly_18_bolditalic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_18_bolditalicBitmaps[115736] = {
10
+
static const uint8_t bookerly_18_bolditalicBitmaps[116060] = {
11
11
0x00, 0x00, 0x54, 0x00, 0x07, 0xFE, 0x00, 0x0F, 0xFC, 0x00, 0x2F, 0xFC, 0x00, 0x3F, 0xF4, 0x00,
12
12
0x7F, 0xF0, 0x00, 0xBF, 0xF0, 0x00, 0xFF, 0xD0, 0x00, 0xFF, 0xC0, 0x00, 0xFF, 0xC0, 0x01, 0xFF,
13
13
0x80, 0x01, 0xFF, 0x40, 0x02, 0xFF, 0x00, 0x02, 0xFE, 0x00, 0x03, 0xFD, 0x00, 0x03, 0xFC, 0x00,
···
7241
7241
0x54, 0x00, 0x00, 0x54, 0x01, 0xFF, 0xC0, 0x00, 0xBF, 0xF0, 0x00, 0x3F, 0xF4, 0x3F, 0xFE, 0x00,
7242
7242
0x0F, 0xFF, 0x40, 0x0B, 0xFF, 0xC3, 0xFF, 0xF0, 0x01, 0xFF, 0xF4, 0x00, 0xBF, 0xFC, 0x3F, 0xFE,
7243
7243
0x00, 0x1F, 0xFF, 0x00, 0x0B, 0xFF, 0xC1, 0xFF, 0xC0, 0x00, 0xFF, 0xE0, 0x00, 0x3F, 0xF4, 0x01,
7244
-
0x50, 0x00, 0x01, 0x50, 0x00, 0x00, 0x54, 0x00,
7244
+
0x50, 0x00, 0x01, 0x50, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
7245
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBE, 0x00,
7246
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B,
7247
+
0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xFF, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00,
7248
+
0x00, 0xBE, 0x56, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xE0, 0x00, 0x2F, 0x80, 0x00, 0x00,
7249
+
0x00, 0x00, 0x0B, 0xC0, 0x00, 0x07, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xC0, 0x00, 0x01, 0xF8,
7250
+
0x00, 0x00, 0x00, 0x00, 0xBF, 0xD1, 0xA9, 0x00, 0xBE, 0x00, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFF,
7251
+
0xD0, 0x3F, 0x80, 0x00, 0x00, 0x0B, 0xFF, 0xFF, 0xFF, 0xF0, 0x2F, 0xE0, 0x00, 0x00, 0x2F, 0xFF,
7252
+
0xFF, 0xFF, 0xF8, 0x1F, 0xF8, 0x00, 0x00, 0xBF, 0xFF, 0xFF, 0xFF, 0xFC, 0x0F, 0xFE, 0x00, 0x02,
7253
+
0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x0F, 0xFF, 0x80, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x1F, 0xFF,
7254
+
0xE0, 0x2F, 0xFF, 0xFF, 0xFF, 0xFE, 0x40, 0x1F, 0xFF, 0xF8, 0x7F, 0xFF, 0xFF, 0xFF, 0x80, 0x00,
7255
+
0x3F, 0xFF, 0xFD, 0x1F, 0xFF, 0xFF, 0xF8, 0x00, 0x00, 0xFF, 0xFF, 0xF4, 0x07, 0xFF, 0xFF, 0xF8,
7256
+
0x00, 0x07, 0xFF, 0xFF, 0xD0, 0x01, 0xFF, 0xFF, 0xF8, 0x00, 0xBF, 0xFF, 0xFF, 0x40, 0x00, 0x7F,
7257
+
0xFF, 0xFC, 0x0B, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x1F, 0xFF, 0xFC, 0x0F, 0xFF, 0xFF, 0xF4, 0x00,
7258
+
0x00, 0x07, 0xFF, 0xFD, 0x0F, 0xFF, 0xFF, 0xD0, 0x00, 0x00, 0x01, 0xFF, 0xFE, 0x1F, 0xFF, 0xFF,
7259
+
0x40, 0x00, 0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xFF, 0xEB,
7260
+
0xFF, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFF, 0x00, 0xFF, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x01,
7261
+
0xFE, 0x00, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00,
7262
+
0x00, 0x00, 0x1F, 0x97, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFF, 0xD0, 0x00, 0x00,
7263
+
0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0x00,
7264
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00,
7245
7265
};
7246
7266
7247
7267
static const EpdGlyph bookerly_18_bolditalicGlyphs[] = {
···
7973
7993
{ 22, 27, 38, 8, 27, 149, 115513 }, // ⊥
7974
7994
{ 8, 7, 24, 8, 14, 14, 115662 }, // ⋅
7975
7995
{ 34, 7, 38, 2, 14, 60, 115676 }, // ⋯
7996
+
{ 36, 36, 38, 1, 32, 324, 115736 }, // �
7976
7997
};
7977
7998
7978
7999
static const EpdUnicodeInterval bookerly_18_bolditalicIntervals[] = {
···
8036
8057
{ 0x22A5, 0x22A5, 0x2D5 },
8037
8058
{ 0x22C5, 0x22C5, 0x2D6 },
8038
8059
{ 0x22EF, 0x22EF, 0x2D7 },
8060
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
8039
8061
};
8040
8062
8041
8063
static const EpdFontData bookerly_18_bolditalic = {
8042
8064
bookerly_18_bolditalicBitmaps,
8043
8065
bookerly_18_bolditalicGlyphs,
8044
8066
bookerly_18_bolditalicIntervals,
8045
-
60,
8067
+
61,
8046
8068
49,
8047
8069
40,
8048
8070
-10,
+25
-3
lib/EpdFont/builtinFonts/bookerly_18_italic.h
+25
-3
lib/EpdFont/builtinFonts/bookerly_18_italic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_18_italicBitmaps[108017] = {
10
+
static const uint8_t bookerly_18_italicBitmaps[108341] = {
11
11
0x00, 0x00, 0x00, 0x00, 0xBE, 0x00, 0x2F, 0xD0, 0x03, 0xFC, 0x00, 0x7F, 0x80, 0x0B, 0xF0, 0x00,
12
12
0xFF, 0x00, 0x0F, 0xE0, 0x00, 0xFC, 0x00, 0x1F, 0xC0, 0x02, 0xF8, 0x00, 0x2F, 0x40, 0x03, 0xF0,
13
13
0x00, 0x3F, 0x00, 0x03, 0xE0, 0x00, 0x7D, 0x00, 0x07, 0xC0, 0x00, 0xBC, 0x00, 0x0F, 0x80, 0x00,
···
6759
6759
0x50, 0x0A, 0x80, 0x00, 0x02, 0x90, 0x00, 0x01, 0xA0, 0x3F, 0xF0, 0x00, 0x1F, 0xF4, 0x00, 0x0B,
6760
6760
0xFC, 0x7F, 0xF0, 0x00, 0x2F, 0xF8, 0x00, 0x0F, 0xFD, 0x7F, 0xF0, 0x00, 0x2F, 0xF8, 0x00, 0x0F,
6761
6761
0xFD, 0x3F, 0xD0, 0x00, 0x0F, 0xF0, 0x00, 0x07, 0xF8, 0x05, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00,
6762
-
0x40,
6762
+
0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00,
6763
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
6764
+
0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00,
6765
+
0x00, 0x2F, 0xFF, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBE, 0x56, 0xFE, 0x00, 0x00, 0x00,
6766
+
0x00, 0x00, 0x02, 0xE0, 0x00, 0x2F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xC0, 0x00, 0x07, 0xE0,
6767
+
0x00, 0x00, 0x00, 0x00, 0x2F, 0xC0, 0x00, 0x01, 0xF8, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xD1, 0xA9,
6768
+
0x00, 0xBE, 0x00, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFF, 0xD0, 0x3F, 0x80, 0x00, 0x00, 0x0B, 0xFF,
6769
+
0xFF, 0xFF, 0xF0, 0x2F, 0xE0, 0x00, 0x00, 0x2F, 0xFF, 0xFF, 0xFF, 0xF8, 0x1F, 0xF8, 0x00, 0x00,
6770
+
0xBF, 0xFF, 0xFF, 0xFF, 0xFC, 0x0F, 0xFE, 0x00, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x0F, 0xFF,
6771
+
0x80, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x1F, 0xFF, 0xE0, 0x2F, 0xFF, 0xFF, 0xFF, 0xFE, 0x40,
6772
+
0x1F, 0xFF, 0xF8, 0x7F, 0xFF, 0xFF, 0xFF, 0x80, 0x00, 0x3F, 0xFF, 0xFD, 0x1F, 0xFF, 0xFF, 0xF8,
6773
+
0x00, 0x00, 0xFF, 0xFF, 0xF4, 0x07, 0xFF, 0xFF, 0xF8, 0x00, 0x07, 0xFF, 0xFF, 0xD0, 0x01, 0xFF,
6774
+
0xFF, 0xF8, 0x00, 0xBF, 0xFF, 0xFF, 0x40, 0x00, 0x7F, 0xFF, 0xFC, 0x0B, 0xFF, 0xFF, 0xFD, 0x00,
6775
+
0x00, 0x1F, 0xFF, 0xFC, 0x0F, 0xFF, 0xFF, 0xF4, 0x00, 0x00, 0x07, 0xFF, 0xFD, 0x0F, 0xFF, 0xFF,
6776
+
0xD0, 0x00, 0x00, 0x01, 0xFF, 0xFE, 0x1F, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x7F, 0xFF, 0xFF,
6777
+
0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xFF, 0xEB, 0xFF, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x07,
6778
+
0xFF, 0x00, 0xFF, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFE, 0x00, 0xFF, 0x40, 0x00, 0x00, 0x00,
6779
+
0x00, 0x00, 0x7F, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x97, 0xF4, 0x00, 0x00,
6780
+
0x00, 0x00, 0x00, 0x00, 0x07, 0xFF, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x40,
6781
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6782
+
0x14, 0x00, 0x00, 0x00, 0x00,
6763
6783
};
6764
6784
6765
6785
static const EpdGlyph bookerly_18_italicGlyphs[] = {
···
7491
7511
{ 22, 27, 38, 8, 27, 149, 107811 }, // ⊥
7492
7512
{ 6, 6, 24, 9, 13, 9, 107960 }, // ⋅
7493
7513
{ 32, 6, 38, 3, 13, 48, 107969 }, // ⋯
7514
+
{ 36, 36, 38, 1, 32, 324, 108017 }, // �
7494
7515
};
7495
7516
7496
7517
static const EpdUnicodeInterval bookerly_18_italicIntervals[] = {
···
7554
7575
{ 0x22A5, 0x22A5, 0x2D5 },
7555
7576
{ 0x22C5, 0x22C5, 0x2D6 },
7556
7577
{ 0x22EF, 0x22EF, 0x2D7 },
7578
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
7557
7579
};
7558
7580
7559
7581
static const EpdFontData bookerly_18_italic = {
7560
7582
bookerly_18_italicBitmaps,
7561
7583
bookerly_18_italicGlyphs,
7562
7584
bookerly_18_italicIntervals,
7563
-
60,
7585
+
61,
7564
7586
49,
7565
7587
40,
7566
7588
-10,
+25
-3
lib/EpdFont/builtinFonts/bookerly_18_regular.h
+25
-3
lib/EpdFont/builtinFonts/bookerly_18_regular.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t bookerly_18_regularBitmaps[105210] = {
10
+
static const uint8_t bookerly_18_regularBitmaps[105534] = {
11
11
0x05, 0x43, 0xF8, 0xBF, 0x4F, 0xF4, 0xFF, 0x0F, 0xF0, 0xFF, 0x0F, 0xF0, 0xFF, 0x0F, 0xF0, 0xFE,
12
12
0x0F, 0xE0, 0xBE, 0x0B, 0xE0, 0xBE, 0x0B, 0xE0, 0x7E, 0x07, 0xE0, 0x7E, 0x03, 0xE0, 0x3E, 0x01,
13
13
0x00, 0x00, 0x00, 0x00, 0x04, 0x03, 0xFC, 0xBF, 0xCF, 0xFC, 0xBF, 0xC1, 0x90, 0x00, 0x00, 0x00,
···
6583
6583
0xF0, 0x1A, 0x47, 0xFC, 0xFF, 0xDF, 0xFD, 0x7F, 0xC0, 0x50, 0x0A, 0x80, 0x00, 0x02, 0x90, 0x00,
6584
6584
0x01, 0xA0, 0x3F, 0xF0, 0x00, 0x1F, 0xF4, 0x00, 0x0B, 0xFC, 0x7F, 0xF0, 0x00, 0x2F, 0xF8, 0x00,
6585
6585
0x0F, 0xFD, 0x7F, 0xF0, 0x00, 0x2F, 0xF8, 0x00, 0x0F, 0xFD, 0x3F, 0xD0, 0x00, 0x0F, 0xF0, 0x00,
6586
-
0x07, 0xF8, 0x05, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x40,
6586
+
0x07, 0xF8, 0x05, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6587
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6588
+
0xBE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
6589
+
0x00, 0x0B, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xFF, 0xF8, 0x00, 0x00, 0x00,
6590
+
0x00, 0x00, 0x00, 0xBE, 0x56, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xE0, 0x00, 0x2F, 0x80,
6591
+
0x00, 0x00, 0x00, 0x00, 0x0B, 0xC0, 0x00, 0x07, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xC0, 0x00,
6592
+
0x01, 0xF8, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xD1, 0xA9, 0x00, 0xBE, 0x00, 0x00, 0x00, 0x02, 0xFF,
6593
+
0xFF, 0xFF, 0xD0, 0x3F, 0x80, 0x00, 0x00, 0x0B, 0xFF, 0xFF, 0xFF, 0xF0, 0x2F, 0xE0, 0x00, 0x00,
6594
+
0x2F, 0xFF, 0xFF, 0xFF, 0xF8, 0x1F, 0xF8, 0x00, 0x00, 0xBF, 0xFF, 0xFF, 0xFF, 0xFC, 0x0F, 0xFE,
6595
+
0x00, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0x0F, 0xFF, 0x80, 0x0B, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4,
6596
+
0x1F, 0xFF, 0xE0, 0x2F, 0xFF, 0xFF, 0xFF, 0xFE, 0x40, 0x1F, 0xFF, 0xF8, 0x7F, 0xFF, 0xFF, 0xFF,
6597
+
0x80, 0x00, 0x3F, 0xFF, 0xFD, 0x1F, 0xFF, 0xFF, 0xF8, 0x00, 0x00, 0xFF, 0xFF, 0xF4, 0x07, 0xFF,
6598
+
0xFF, 0xF8, 0x00, 0x07, 0xFF, 0xFF, 0xD0, 0x01, 0xFF, 0xFF, 0xF8, 0x00, 0xBF, 0xFF, 0xFF, 0x40,
6599
+
0x00, 0x7F, 0xFF, 0xFC, 0x0B, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x1F, 0xFF, 0xFC, 0x0F, 0xFF, 0xFF,
6600
+
0xF4, 0x00, 0x00, 0x07, 0xFF, 0xFD, 0x0F, 0xFF, 0xFF, 0xD0, 0x00, 0x00, 0x01, 0xFF, 0xFE, 0x1F,
6601
+
0xFF, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x7F, 0xFF, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x1F,
6602
+
0xFF, 0xEB, 0xFF, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFF, 0x00, 0xFF, 0xD0, 0x00, 0x00, 0x00,
6603
+
0x00, 0x01, 0xFE, 0x00, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x00, 0xFD, 0x00, 0x00,
6604
+
0x00, 0x00, 0x00, 0x00, 0x1F, 0x97, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFF, 0xD0,
6605
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6606
+
0x7D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00,
6587
6607
};
6588
6608
6589
6609
static const EpdGlyph bookerly_18_regularGlyphs[] = {
···
7315
7335
{ 22, 27, 38, 8, 27, 149, 105004 }, // ⊥
7316
7336
{ 6, 6, 24, 9, 13, 9, 105153 }, // ⋅
7317
7337
{ 32, 6, 38, 3, 13, 48, 105162 }, // ⋯
7338
+
{ 36, 36, 38, 1, 32, 324, 105210 }, // �
7318
7339
};
7319
7340
7320
7341
static const EpdUnicodeInterval bookerly_18_regularIntervals[] = {
···
7378
7399
{ 0x22A5, 0x22A5, 0x2D5 },
7379
7400
{ 0x22C5, 0x22C5, 0x2D6 },
7380
7401
{ 0x22EF, 0x22EF, 0x2D7 },
7402
+
{ 0xFFFD, 0xFFFD, 0x2D8 },
7381
7403
};
7382
7404
7383
7405
static const EpdFontData bookerly_18_regular = {
7384
7406
bookerly_18_regularBitmaps,
7385
7407
bookerly_18_regularGlyphs,
7386
7408
bookerly_18_regularIntervals,
7387
-
60,
7409
+
61,
7388
7410
49,
7389
7411
40,
7390
7412
-10,
+13
-3
lib/EpdFont/builtinFonts/notosans_12_bold.h
+13
-3
lib/EpdFont/builtinFonts/notosans_12_bold.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_12_boldBitmaps[49639] = {
10
+
static const uint8_t notosans_12_boldBitmaps[49772] = {
11
11
0x7F, 0xAF, 0xE7, 0xF9, 0xFD, 0x7F, 0x5F, 0xD7, 0xF4, 0xFD, 0x3F, 0x0F, 0xC3, 0xF0, 0xFC, 0x00,
12
12
0x00, 0x02, 0xE2, 0xFE, 0xBF, 0x9F, 0xD0, 0x40, 0x7F, 0x0F, 0xD7, 0xF0, 0xFD, 0x7F, 0x0F, 0xC3,
13
13
0xF0, 0xFC, 0x3F, 0x0F, 0xC3, 0xE0, 0xBC, 0x29, 0x06, 0x80, 0x00, 0x0F, 0x43, 0xD0, 0x00, 0x1F,
···
3110
3110
0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xBF, 0x40, 0x00, 0x7F,
3111
3111
0xC0, 0x14, 0x3F, 0xFF, 0xF8, 0x0F, 0xFF, 0xF8, 0x02, 0xFF, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00,
3112
3112
0x00, 0xFF, 0xFF, 0xFC, 0xFF, 0xFF, 0xFC, 0x55, 0x55, 0x54, 0x00, 0x00, 0x00, 0x3F, 0xFF, 0xFF,
3113
-
0xDF, 0xFF, 0xFF, 0xF5, 0xAA, 0xAA, 0xA8,
3113
+
0xDF, 0xFF, 0xFF, 0xF5, 0xAA, 0xAA, 0xA8, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F,
3114
+
0x00, 0x00, 0x00, 0x00, 0x03, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xFF, 0x00, 0x00, 0x00, 0x03,
3115
+
0xFF, 0xFF, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x2F, 0x00, 0x00, 0x03, 0xE0, 0x00, 0x2F, 0x00, 0x00,
3116
+
0x3F, 0xC6, 0xD0, 0x7F, 0x00, 0x03, 0xFF, 0xFF, 0xC1, 0xFF, 0x00, 0x3F, 0xFF, 0xFE, 0x07, 0xFF,
3117
+
0x03, 0xFF, 0xFF, 0xE0, 0x3F, 0xFF, 0x2F, 0xFF, 0xFE, 0x03, 0xFF, 0xFE, 0x3F, 0xFF, 0xF0, 0x3F,
3118
+
0xFF, 0xF0, 0x3F, 0xFF, 0x82, 0xFF, 0xFF, 0x00, 0x3F, 0xFF, 0x5F, 0xFF, 0xF0, 0x00, 0x3F, 0xFF,
3119
+
0xFF, 0xFF, 0x00, 0x00, 0x3F, 0xF5, 0xFF, 0xF0, 0x00, 0x00, 0x3F, 0x41, 0xFF, 0x00, 0x00, 0x00,
3120
+
0x3D, 0x07, 0xF0, 0x00, 0x00, 0x00, 0x3E, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xF0, 0x00, 0x00,
3121
+
0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
3114
3122
};
3115
3123
3116
3124
static const EpdGlyph notosans_12_boldGlyphs[] = {
···
3948
3956
{ 12, 24, 14, 2, 21, 72, 49497 }, // ₿
3949
3957
{ 12, 19, 13, 1, 14, 57, 49569 }, // ⃀
3950
3958
{ 13, 4, 15, 1, 11, 13, 49626 }, // −
3959
+
{ 23, 23, 25, 1, 19, 133, 49639 }, // �
3951
3960
};
3952
3961
3953
3962
static const EpdUnicodeInterval notosans_12_boldIntervals[] = {
···
3962
3971
{ 0x2066, 0x206F, 0x316 },
3963
3972
{ 0x20A0, 0x20C0, 0x320 },
3964
3973
{ 0x2212, 0x2212, 0x341 },
3974
+
{ 0xFFFD, 0xFFFD, 0x342 },
3965
3975
};
3966
3976
3967
3977
static const EpdFontData notosans_12_bold = {
3968
3978
notosans_12_boldBitmaps,
3969
3979
notosans_12_boldGlyphs,
3970
3980
notosans_12_boldIntervals,
3971
-
11,
3981
+
12,
3972
3982
34,
3973
3983
27,
3974
3984
-8,
+14
-3
lib/EpdFont/builtinFonts/notosans_12_bolditalic.h
+14
-3
lib/EpdFont/builtinFonts/notosans_12_bolditalic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_12_bolditalicBitmaps[52863] = {
10
+
static const uint8_t notosans_12_bolditalicBitmaps[52996] = {
11
11
0x01, 0xFE, 0x02, 0xFE, 0x02, 0xFD, 0x03, 0xFC, 0x03, 0xFC, 0x03, 0xF8, 0x07, 0xF4, 0x0B, 0xF0,
12
12
0x0B, 0xF0, 0x0F, 0xE0, 0x0F, 0xD0, 0x0F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x00, 0x7F, 0x80,
13
13
0xBF, 0x80, 0x7F, 0x00, 0x04, 0x00, 0x2F, 0x4B, 0xD3, 0xF4, 0xFD, 0x3F, 0x0F, 0xC3, 0xE0, 0xF8,
···
3311
3311
0xFC, 0x0F, 0xE0, 0x3F, 0x82, 0xFD, 0x03, 0xFF, 0xFF, 0x40, 0x7F, 0xFF, 0x80, 0x0B, 0xFF, 0xFD,
3312
3312
0x00, 0xFF, 0x1F, 0xF0, 0x0F, 0xE0, 0x7F, 0x80, 0xFD, 0x03, 0xF8, 0x1F, 0xC0, 0x7F, 0x42, 0xFC,
3313
3313
0x1F, 0xF0, 0x3F, 0xFF, 0xFE, 0x03, 0xFF, 0xFF, 0x80, 0x3F, 0xFF, 0x90, 0x00, 0x34, 0xF0, 0x00,
3314
-
0x07, 0x0E, 0x00, 0x00, 0x50, 0x40, 0x00, 0x05, 0x54, 0x3F, 0xFD, 0x7F, 0xFC, 0x7F, 0xFC,
3314
+
0x07, 0x0E, 0x00, 0x00, 0x50, 0x40, 0x00, 0x05, 0x54, 0x3F, 0xFD, 0x7F, 0xFC, 0x7F, 0xFC, 0x00,
3315
+
0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x03, 0xFF, 0x00, 0x00,
3316
+
0x00, 0x00, 0x3F, 0xFF, 0x00, 0x00, 0x00, 0x03, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x2F,
3317
+
0x00, 0x00, 0x03, 0xE0, 0x00, 0x2F, 0x00, 0x00, 0x3F, 0xC6, 0xD0, 0x7F, 0x00, 0x03, 0xFF, 0xFF,
3318
+
0xC1, 0xFF, 0x00, 0x3F, 0xFF, 0xFE, 0x07, 0xFF, 0x03, 0xFF, 0xFF, 0xE0, 0x3F, 0xFF, 0x2F, 0xFF,
3319
+
0xFE, 0x03, 0xFF, 0xFE, 0x3F, 0xFF, 0xF0, 0x3F, 0xFF, 0xF0, 0x3F, 0xFF, 0x82, 0xFF, 0xFF, 0x00,
3320
+
0x3F, 0xFF, 0x5F, 0xFF, 0xF0, 0x00, 0x3F, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x3F, 0xF5, 0xFF, 0xF0,
3321
+
0x00, 0x00, 0x3F, 0x41, 0xFF, 0x00, 0x00, 0x00, 0x3D, 0x07, 0xF0, 0x00, 0x00, 0x00, 0x3E, 0xBF,
3322
+
0x00, 0x00, 0x00, 0x00, 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00,
3323
+
0x20, 0x00, 0x00, 0x00,
3315
3324
};
3316
3325
3317
3326
static const EpdGlyph notosans_12_bolditalicGlyphs[] = {
···
4148
4157
{ 18, 21, 15, -1, 21, 95, 52676 }, // ₾
4149
4158
{ 14, 24, 14, 0, 21, 84, 52771 }, // ₿
4150
4159
{ 8, 4, 8, 0, 9, 8, 52855 }, // −
4160
+
{ 23, 23, 25, 1, 19, 133, 52863 }, // �
4151
4161
};
4152
4162
4153
4163
static const EpdUnicodeInterval notosans_12_bolditalicIntervals[] = {
···
4162
4172
{ 0x2066, 0x206F, 0x316 },
4163
4173
{ 0x20A0, 0x20BF, 0x320 },
4164
4174
{ 0x2212, 0x2212, 0x340 },
4175
+
{ 0xFFFD, 0xFFFD, 0x341 },
4165
4176
};
4166
4177
4167
4178
static const EpdFontData notosans_12_bolditalic = {
4168
4179
notosans_12_bolditalicBitmaps,
4169
4180
notosans_12_bolditalicGlyphs,
4170
4181
notosans_12_bolditalicIntervals,
4171
-
11,
4182
+
12,
4172
4183
34,
4173
4184
27,
4174
4185
-8,
+14
-3
lib/EpdFont/builtinFonts/notosans_12_italic.h
+14
-3
lib/EpdFont/builtinFonts/notosans_12_italic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_12_italicBitmaps[48397] = {
10
+
static const uint8_t notosans_12_italicBitmaps[48530] = {
11
11
0x00, 0xB8, 0x03, 0xE0, 0x0F, 0x40, 0x7C, 0x02, 0xF0, 0x0F, 0x80, 0x3D, 0x00, 0xF0, 0x07, 0xC0,
12
12
0x1E, 0x00, 0xB4, 0x03, 0xC0, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x40, 0x7E, 0x01, 0xF4, 0x01,
13
13
0x00, 0x00, 0x1E, 0x0F, 0x0B, 0x87, 0xC2, 0xD1, 0xE0, 0xF0, 0xB4, 0x38, 0x2C, 0x0D, 0x0E, 0x02,
···
3032
3032
0x0F, 0x00, 0x2E, 0x07, 0xC0, 0x0B, 0x82, 0xE0, 0x07, 0xC0, 0xF9, 0x5B, 0xD0, 0x3F, 0xFF, 0x80,
3033
3033
0x0F, 0xAB, 0xF4, 0x07, 0xC0, 0x1F, 0x02, 0xE0, 0x03, 0xD0, 0xF4, 0x00, 0xF8, 0x3C, 0x00, 0x3D,
3034
3034
0x0F, 0x00, 0x1F, 0x07, 0xC0, 0x1F, 0x82, 0xFF, 0xFF, 0x80, 0xFF, 0xFE, 0x40, 0x03, 0x8B, 0x00,
3035
-
0x00, 0xD3, 0x80, 0x00, 0x10, 0x40, 0x00, 0x2A, 0xA8, 0xFF, 0xE1, 0x55, 0x00,
3035
+
0x00, 0xD3, 0x80, 0x00, 0x10, 0x40, 0x00, 0x2A, 0xA8, 0xFF, 0xE1, 0x55, 0x00, 0x00, 0x00, 0x03,
3036
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x03, 0xFF, 0x00, 0x00, 0x00, 0x00,
3037
+
0x3F, 0xFF, 0x00, 0x00, 0x00, 0x03, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x2F, 0x00, 0x00,
3038
+
0x03, 0xE0, 0x00, 0x2F, 0x00, 0x00, 0x3F, 0xC6, 0xD0, 0x7F, 0x00, 0x03, 0xFF, 0xFF, 0xC1, 0xFF,
3039
+
0x00, 0x3F, 0xFF, 0xFE, 0x07, 0xFF, 0x03, 0xFF, 0xFF, 0xE0, 0x3F, 0xFF, 0x2F, 0xFF, 0xFE, 0x03,
3040
+
0xFF, 0xFE, 0x3F, 0xFF, 0xF0, 0x3F, 0xFF, 0xF0, 0x3F, 0xFF, 0x82, 0xFF, 0xFF, 0x00, 0x3F, 0xFF,
3041
+
0x5F, 0xFF, 0xF0, 0x00, 0x3F, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x3F, 0xF5, 0xFF, 0xF0, 0x00, 0x00,
3042
+
0x3F, 0x41, 0xFF, 0x00, 0x00, 0x00, 0x3D, 0x07, 0xF0, 0x00, 0x00, 0x00, 0x3E, 0xBF, 0x00, 0x00,
3043
+
0x00, 0x00, 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00,
3044
+
0x00, 0x00,
3036
3045
};
3037
3046
3038
3047
static const EpdGlyph notosans_12_italicGlyphs[] = {
···
3869
3878
{ 17, 21, 15, -1, 21, 90, 48223 }, // ₾
3870
3879
{ 13, 24, 14, 1, 21, 78, 48313 }, // ₿
3871
3880
{ 7, 3, 8, 0, 8, 6, 48391 }, // −
3881
+
{ 23, 23, 25, 1, 19, 133, 48397 }, // �
3872
3882
};
3873
3883
3874
3884
static const EpdUnicodeInterval notosans_12_italicIntervals[] = {
···
3883
3893
{ 0x2066, 0x206F, 0x316 },
3884
3894
{ 0x20A0, 0x20BF, 0x320 },
3885
3895
{ 0x2212, 0x2212, 0x340 },
3896
+
{ 0xFFFD, 0xFFFD, 0x341 },
3886
3897
};
3887
3898
3888
3899
static const EpdFontData notosans_12_italic = {
3889
3900
notosans_12_italicBitmaps,
3890
3901
notosans_12_italicGlyphs,
3891
3902
notosans_12_italicIntervals,
3892
-
11,
3903
+
12,
3893
3904
34,
3894
3905
27,
3895
3906
-8,
+13
-2
lib/EpdFont/builtinFonts/notosans_12_regular.h
+13
-2
lib/EpdFont/builtinFonts/notosans_12_regular.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_12_regularBitmaps[45168] = {
10
+
static const uint8_t notosans_12_regularBitmaps[45301] = {
11
11
0x3E, 0x3E, 0x3E, 0x3E, 0x3D, 0x2D, 0x2D, 0x2D, 0x2D, 0x2C, 0x1C, 0x1C, 0x1C, 0x00, 0x00, 0x3E,
12
12
0x3F, 0x3E, 0x04, 0x7C, 0x2D, 0x7C, 0x2D, 0x3C, 0x2D, 0x38, 0x2D, 0x38, 0x1C, 0x38, 0x1C, 0x24,
13
13
0x08, 0x00, 0x0B, 0x01, 0xC0, 0x00, 0x0E, 0x02, 0xC0, 0x00, 0x0E, 0x03, 0xC0, 0x00, 0x1D, 0x03,
···
2831
2831
0x95, 0x93, 0xE0, 0x00, 0x7C, 0x00, 0x0B, 0x80, 0x00, 0xF8, 0x00, 0x0F, 0x40, 0x00, 0xB8, 0x00,
2832
2832
0x0B, 0x80, 0x00, 0x7C, 0x00, 0x03, 0xF0, 0x00, 0x0F, 0xEA, 0xF0, 0x2F, 0xFE, 0x00, 0x00, 0x00,
2833
2833
0x00, 0x00, 0xBF, 0xFF, 0xF6, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00,
2834
+
0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x03, 0xFF, 0x00,
2835
+
0x00, 0x00, 0x00, 0x3F, 0xFF, 0x00, 0x00, 0x00, 0x03, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x3D, 0x00,
2836
+
0x2F, 0x00, 0x00, 0x03, 0xE0, 0x00, 0x2F, 0x00, 0x00, 0x3F, 0xC6, 0xD0, 0x7F, 0x00, 0x03, 0xFF,
2837
+
0xFF, 0xC1, 0xFF, 0x00, 0x3F, 0xFF, 0xFE, 0x07, 0xFF, 0x03, 0xFF, 0xFF, 0xE0, 0x3F, 0xFF, 0x2F,
2838
+
0xFF, 0xFE, 0x03, 0xFF, 0xFE, 0x3F, 0xFF, 0xF0, 0x3F, 0xFF, 0xF0, 0x3F, 0xFF, 0x82, 0xFF, 0xFF,
2839
+
0x00, 0x3F, 0xFF, 0x5F, 0xFF, 0xF0, 0x00, 0x3F, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x3F, 0xF5, 0xFF,
2840
+
0xF0, 0x00, 0x00, 0x3F, 0x41, 0xFF, 0x00, 0x00, 0x00, 0x3D, 0x07, 0xF0, 0x00, 0x00, 0x00, 0x3E,
2841
+
0xBF, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00,
2842
+
0x00, 0x20, 0x00, 0x00, 0x00,
2834
2843
};
2835
2844
2836
2845
static const EpdGlyph notosans_12_regularGlyphs[] = {
···
3668
3677
{ 12, 24, 14, 2, 21, 72, 45042 }, // ₿
3669
3678
{ 10, 18, 12, 1, 14, 45, 45114 }, // ⃀
3670
3679
{ 12, 3, 14, 1, 10, 9, 45159 }, // −
3680
+
{ 23, 23, 25, 1, 19, 133, 45168 }, // �
3671
3681
};
3672
3682
3673
3683
static const EpdUnicodeInterval notosans_12_regularIntervals[] = {
···
3682
3692
{ 0x2066, 0x206F, 0x316 },
3683
3693
{ 0x20A0, 0x20C0, 0x320 },
3684
3694
{ 0x2212, 0x2212, 0x341 },
3695
+
{ 0xFFFD, 0xFFFD, 0x342 },
3685
3696
};
3686
3697
3687
3698
static const EpdFontData notosans_12_regular = {
3688
3699
notosans_12_regularBitmaps,
3689
3700
notosans_12_regularGlyphs,
3690
3701
notosans_12_regularIntervals,
3691
-
11,
3702
+
12,
3692
3703
34,
3693
3704
27,
3694
3705
-8,
+17
-3
lib/EpdFont/builtinFonts/notosans_14_bold.h
+17
-3
lib/EpdFont/builtinFonts/notosans_14_bold.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_14_boldBitmaps[67224] = {
10
+
static const uint8_t notosans_14_boldBitmaps[67413] = {
11
11
0x7F, 0xD7, 0xFE, 0x3F, 0xD3, 0xFD, 0x3F, 0xD3, 0xFD, 0x3F, 0xD3, 0xFC, 0x3F, 0xC3, 0xFC, 0x3F,
12
12
0xC3, 0xFC, 0x2F, 0xC2, 0xFC, 0x00, 0x00, 0x00, 0x05, 0x03, 0xFD, 0x7F, 0xE7, 0xFE, 0x3F, 0xC0,
13
13
0x50, 0x3F, 0xC3, 0xFC, 0x3F, 0xC3, 0xFC, 0x3F, 0xC3, 0xFC, 0x3F, 0x82, 0xFC, 0x3F, 0x82, 0xFC,
···
4209
4209
0x00, 0x00, 0x7F, 0xE0, 0x00, 0x03, 0xFF, 0x95, 0xB8, 0x1F, 0xFF, 0xFF, 0x80, 0x7F, 0xFF, 0xF8,
4210
4210
0x00, 0xBF, 0xFE, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x06, 0xAA, 0xAA, 0xA8, 0xBF, 0xFF,
4211
4211
0xFF, 0xCB, 0xFF, 0xFF, 0xFC, 0x00, 0x00, 0x00, 0x00, 0xBF, 0xFF, 0xFF, 0xF6, 0xFF, 0xFF, 0xFF,
4212
-
0xEB, 0xFF, 0xFF, 0xFF, 0x85, 0x55, 0x55, 0x54,
4212
+
0xEB, 0xFF, 0xFF, 0xFF, 0x85, 0x55, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4213
+
0x00, 0x00, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
4214
+
0xD0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xD0, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xD0, 0x00,
4215
+
0x00, 0x00, 0x0F, 0xE9, 0x6F, 0xD0, 0x00, 0x00, 0x00, 0xF4, 0x00, 0x0F, 0xD0, 0x00, 0x00, 0x0F,
4216
+
0xC0, 0x00, 0x0F, 0xD0, 0x00, 0x00, 0xFF, 0x86, 0xE0, 0x2F, 0xD0, 0x00, 0x0F, 0xFF, 0xFF, 0xC0,
4217
+
0x7F, 0xD0, 0x00, 0xFF, 0xFF, 0xFF, 0x02, 0xFF, 0xD0, 0x0F, 0xFF, 0xFF, 0xF4, 0x0F, 0xFF, 0xD0,
4218
+
0xFF, 0xFF, 0xFF, 0x40, 0xBF, 0xFF, 0xD7, 0xFF, 0xFF, 0xF4, 0x0B, 0xFF, 0xFF, 0x87, 0xFF, 0xFF,
4219
+
0x80, 0xFF, 0xFF, 0xF8, 0x07, 0xFF, 0xFE, 0x07, 0xFF, 0xFF, 0x80, 0x07, 0xFF, 0xF8, 0x2F, 0xFF,
4220
+
0xF8, 0x00, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0x80, 0x00, 0x07, 0xFF, 0xFF, 0xFF, 0xF8, 0x00, 0x00,
4221
+
0x07, 0xFD, 0x07, 0xFF, 0x80, 0x00, 0x00, 0x07, 0xF0, 0x0F, 0xF8, 0x00, 0x00, 0x00, 0x07, 0xD0,
4222
+
0x3F, 0x80, 0x00, 0x00, 0x00, 0x07, 0xD7, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFF, 0x80, 0x00,
4223
+
0x00, 0x00, 0x00, 0x07, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0x00, 0x00,
4224
+
0x00, 0x04, 0x00, 0x00, 0x00,
4213
4225
};
4214
4226
4215
4227
static const EpdGlyph notosans_14_boldGlyphs[] = {
···
5047
5059
{ 14, 27, 17, 2, 24, 95, 67033 }, // ₿
5048
5060
{ 14, 23, 15, 1, 17, 81, 67128 }, // ⃀
5049
5061
{ 15, 4, 17, 1, 12, 15, 67209 }, // −
5062
+
{ 27, 28, 29, 1, 23, 189, 67224 }, // �
5050
5063
};
5051
5064
5052
5065
static const EpdUnicodeInterval notosans_14_boldIntervals[] = {
···
5061
5074
{ 0x2066, 0x206F, 0x316 },
5062
5075
{ 0x20A0, 0x20C0, 0x320 },
5063
5076
{ 0x2212, 0x2212, 0x341 },
5077
+
{ 0xFFFD, 0xFFFD, 0x342 },
5064
5078
};
5065
5079
5066
5080
static const EpdFontData notosans_14_bold = {
5067
5081
notosans_14_boldBitmaps,
5068
5082
notosans_14_boldGlyphs,
5069
5083
notosans_14_boldIntervals,
5070
-
11,
5084
+
12,
5071
5085
40,
5072
5086
32,
5073
5087
-9,
+17
-3
lib/EpdFont/builtinFonts/notosans_14_bolditalic.h
+17
-3
lib/EpdFont/builtinFonts/notosans_14_bolditalic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_14_bolditalicBitmaps[71405] = {
10
+
static const uint8_t notosans_14_bolditalicBitmaps[71594] = {
11
11
0x00, 0xBF, 0xC0, 0x0F, 0xFC, 0x00, 0xFF, 0x80, 0x0F, 0xF4, 0x01, 0xFF, 0x00, 0x2F, 0xF0, 0x02,
12
12
0xFE, 0x00, 0x3F, 0xD0, 0x03, 0xFC, 0x00, 0x3F, 0xC0, 0x07, 0xF8, 0x00, 0xBF, 0x40, 0x0F, 0xF0,
13
13
0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0xFC, 0x00, 0xBF, 0xD0, 0x0B,
···
4470
4470
0x00, 0x1F, 0xE0, 0x7F, 0xD0, 0x0B, 0xF4, 0x0F, 0xF8, 0x03, 0xFC, 0x03, 0xFE, 0x00, 0xFF, 0x00,
4471
4471
0xFF, 0x80, 0x7F, 0xC0, 0xBF, 0xD0, 0x1F, 0xFA, 0xFF, 0xF0, 0x0B, 0xFF, 0xFF, 0xF4, 0x03, 0xFF,
4472
4472
0xFF, 0xF4, 0x00, 0xFF, 0xFF, 0xD0, 0x00, 0x03, 0xC3, 0xC0, 0x00, 0x00, 0xF0, 0xF0, 0x00, 0x00,
4473
-
0x38, 0x38, 0x00, 0x00, 0x2A, 0xAA, 0x4F, 0xFF, 0xE3, 0xFF, 0xF5, 0xFF, 0xFC,
4473
+
0x38, 0x38, 0x00, 0x00, 0x2A, 0xAA, 0x4F, 0xFF, 0xE3, 0xFF, 0xF5, 0xFF, 0xFC, 0x00, 0x00, 0x00,
4474
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xD0, 0x00,
4475
+
0x00, 0x00, 0x00, 0x00, 0xFF, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xD0, 0x00, 0x00, 0x00,
4476
+
0x00, 0xFF, 0xFF, 0xD0, 0x00, 0x00, 0x00, 0x0F, 0xE9, 0x6F, 0xD0, 0x00, 0x00, 0x00, 0xF4, 0x00,
4477
+
0x0F, 0xD0, 0x00, 0x00, 0x0F, 0xC0, 0x00, 0x0F, 0xD0, 0x00, 0x00, 0xFF, 0x86, 0xE0, 0x2F, 0xD0,
4478
+
0x00, 0x0F, 0xFF, 0xFF, 0xC0, 0x7F, 0xD0, 0x00, 0xFF, 0xFF, 0xFF, 0x02, 0xFF, 0xD0, 0x0F, 0xFF,
4479
+
0xFF, 0xF4, 0x0F, 0xFF, 0xD0, 0xFF, 0xFF, 0xFF, 0x40, 0xBF, 0xFF, 0xD7, 0xFF, 0xFF, 0xF4, 0x0B,
4480
+
0xFF, 0xFF, 0x87, 0xFF, 0xFF, 0x80, 0xFF, 0xFF, 0xF8, 0x07, 0xFF, 0xFE, 0x07, 0xFF, 0xFF, 0x80,
4481
+
0x07, 0xFF, 0xF8, 0x2F, 0xFF, 0xF8, 0x00, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0x80, 0x00, 0x07, 0xFF,
4482
+
0xFF, 0xFF, 0xF8, 0x00, 0x00, 0x07, 0xFD, 0x07, 0xFF, 0x80, 0x00, 0x00, 0x07, 0xF0, 0x0F, 0xF8,
4483
+
0x00, 0x00, 0x00, 0x07, 0xD0, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x07, 0xD7, 0xF8, 0x00, 0x00, 0x00,
4484
+
0x00, 0x07, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07,
4485
+
0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
4474
4486
};
4475
4487
4476
4488
static const EpdGlyph notosans_14_bolditalicGlyphs[] = {
···
5307
5319
{ 20, 24, 18, -1, 24, 120, 71161 }, // ₾
5308
5320
{ 17, 27, 16, 0, 24, 115, 71281 }, // ₿
5309
5321
{ 9, 4, 9, 0, 10, 9, 71396 }, // −
5322
+
{ 27, 28, 29, 1, 23, 189, 71405 }, // �
5310
5323
};
5311
5324
5312
5325
static const EpdUnicodeInterval notosans_14_bolditalicIntervals[] = {
···
5321
5334
{ 0x2066, 0x206F, 0x316 },
5322
5335
{ 0x20A0, 0x20BF, 0x320 },
5323
5336
{ 0x2212, 0x2212, 0x340 },
5337
+
{ 0xFFFD, 0xFFFD, 0x341 },
5324
5338
};
5325
5339
5326
5340
static const EpdFontData notosans_14_bolditalic = {
5327
5341
notosans_14_bolditalicBitmaps,
5328
5342
notosans_14_bolditalicGlyphs,
5329
5343
notosans_14_bolditalicIntervals,
5330
-
11,
5344
+
12,
5331
5345
40,
5332
5346
32,
5333
5347
-9,
+17
-3
lib/EpdFont/builtinFonts/notosans_14_italic.h
+17
-3
lib/EpdFont/builtinFonts/notosans_14_italic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_14_italicBitmaps[65135] = {
10
+
static const uint8_t notosans_14_italicBitmaps[65324] = {
11
11
0x00, 0x3F, 0x00, 0x1F, 0x80, 0x0B, 0xD0, 0x02, 0xF0, 0x00, 0xFC, 0x00, 0x3E, 0x00, 0x0F, 0x40,
12
12
0x07, 0xC0, 0x02, 0xF0, 0x00, 0xF8, 0x00, 0x3D, 0x00, 0x0F, 0x00, 0x07, 0xC0, 0x01, 0xE0, 0x00,
13
13
0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x40, 0x03, 0xF0, 0x01, 0xFC, 0x00, 0x7F, 0x00, 0x05,
···
4078
4078
0x0B, 0xFF, 0xFD, 0x00, 0x0F, 0xC0, 0x6F, 0x80, 0x0F, 0x80, 0x0B, 0xD0, 0x0F, 0x40, 0x03, 0xE0,
4079
4079
0x1F, 0x00, 0x03, 0xE0, 0x2F, 0x00, 0x03, 0xE0, 0x3E, 0x00, 0x07, 0xD0, 0x3E, 0x00, 0x0F, 0xC0,
4080
4080
0x7D, 0x01, 0xBF, 0x40, 0x7F, 0xFF, 0xFD, 0x00, 0xBF, 0xFF, 0xD0, 0x00, 0x07, 0x4B, 0x00, 0x00,
4081
-
0x0B, 0x0F, 0x00, 0x00, 0x0E, 0x0E, 0x00, 0x00, 0x3F, 0xFF, 0x0F, 0xFF, 0xC1, 0x55, 0x50,
4081
+
0x0B, 0x0F, 0x00, 0x00, 0x0E, 0x0E, 0x00, 0x00, 0x3F, 0xFF, 0x0F, 0xFF, 0xC1, 0x55, 0x50, 0x00,
4082
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F,
4083
+
0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xD0, 0x00,
4084
+
0x00, 0x00, 0x00, 0xFF, 0xFF, 0xD0, 0x00, 0x00, 0x00, 0x0F, 0xE9, 0x6F, 0xD0, 0x00, 0x00, 0x00,
4085
+
0xF4, 0x00, 0x0F, 0xD0, 0x00, 0x00, 0x0F, 0xC0, 0x00, 0x0F, 0xD0, 0x00, 0x00, 0xFF, 0x86, 0xE0,
4086
+
0x2F, 0xD0, 0x00, 0x0F, 0xFF, 0xFF, 0xC0, 0x7F, 0xD0, 0x00, 0xFF, 0xFF, 0xFF, 0x02, 0xFF, 0xD0,
4087
+
0x0F, 0xFF, 0xFF, 0xF4, 0x0F, 0xFF, 0xD0, 0xFF, 0xFF, 0xFF, 0x40, 0xBF, 0xFF, 0xD7, 0xFF, 0xFF,
4088
+
0xF4, 0x0B, 0xFF, 0xFF, 0x87, 0xFF, 0xFF, 0x80, 0xFF, 0xFF, 0xF8, 0x07, 0xFF, 0xFE, 0x07, 0xFF,
4089
+
0xFF, 0x80, 0x07, 0xFF, 0xF8, 0x2F, 0xFF, 0xF8, 0x00, 0x07, 0xFF, 0xFF, 0xFF, 0xFF, 0x80, 0x00,
4090
+
0x07, 0xFF, 0xFF, 0xFF, 0xF8, 0x00, 0x00, 0x07, 0xFD, 0x07, 0xFF, 0x80, 0x00, 0x00, 0x07, 0xF0,
4091
+
0x0F, 0xF8, 0x00, 0x00, 0x00, 0x07, 0xD0, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x07, 0xD7, 0xF8, 0x00,
4092
+
0x00, 0x00, 0x00, 0x07, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0xF8, 0x00, 0x00, 0x00, 0x00,
4093
+
0x00, 0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
4082
4094
};
4083
4095
4084
4096
static const EpdGlyph notosans_14_italicGlyphs[] = {
···
4915
4927
{ 20, 24, 17, -1, 24, 120, 64900 }, // ₾
4916
4928
{ 16, 27, 16, 1, 24, 108, 65020 }, // ₿
4917
4929
{ 9, 3, 9, 0, 9, 7, 65128 }, // −
4930
+
{ 27, 28, 29, 1, 23, 189, 65135 }, // �
4918
4931
};
4919
4932
4920
4933
static const EpdUnicodeInterval notosans_14_italicIntervals[] = {
···
4929
4942
{ 0x2066, 0x206F, 0x316 },
4930
4943
{ 0x20A0, 0x20BF, 0x320 },
4931
4944
{ 0x2212, 0x2212, 0x340 },
4945
+
{ 0xFFFD, 0xFFFD, 0x341 },
4932
4946
};
4933
4947
4934
4948
static const EpdFontData notosans_14_italic = {
4935
4949
notosans_14_italicBitmaps,
4936
4950
notosans_14_italicGlyphs,
4937
4951
notosans_14_italicIntervals,
4938
-
11,
4952
+
12,
4939
4953
40,
4940
4954
32,
4941
4955
-9,
+16
-3
lib/EpdFont/builtinFonts/notosans_14_regular.h
+16
-3
lib/EpdFont/builtinFonts/notosans_14_regular.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_14_regularBitmaps[61202] = {
10
+
static const uint8_t notosans_14_regularBitmaps[61391] = {
11
11
0xBD, 0xBD, 0xBD, 0x7D, 0x7D, 0x7C, 0x7C, 0x7C, 0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x3C, 0x00,
12
12
0x00, 0x14, 0xBE, 0xFE, 0xBD, 0x14, 0x3E, 0x0B, 0xCF, 0x82, 0xF3, 0xD0, 0xBC, 0xF4, 0x2E, 0x3D,
13
13
0x07, 0x8B, 0x41, 0xE2, 0xC0, 0x78, 0x60, 0x09, 0x00, 0x02, 0xC0, 0x1D, 0x00, 0x00, 0x0F, 0x00,
···
3833
3833
0x00, 0x00, 0xBC, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x1F, 0xD0,
3834
3834
0x05, 0x07, 0xFF, 0xFE, 0x00, 0xBF, 0xFD, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00, 0x7F, 0xFF, 0xFE,
3835
3835
0x7F, 0xFF, 0xFE, 0x15, 0x55, 0x54, 0x15, 0x55, 0x55, 0x52, 0xFF, 0xFF, 0xFF, 0xC7, 0xFF, 0xFF,
3836
-
0xFF, 0x00,
3836
+
0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, 0x00, 0x00, 0x00,
3837
+
0x00, 0x00, 0x0F, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x0F,
3838
+
0xFF, 0xD0, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xD0, 0x00, 0x00, 0x00, 0x0F, 0xE9, 0x6F, 0xD0,
3839
+
0x00, 0x00, 0x00, 0xF4, 0x00, 0x0F, 0xD0, 0x00, 0x00, 0x0F, 0xC0, 0x00, 0x0F, 0xD0, 0x00, 0x00,
3840
+
0xFF, 0x86, 0xE0, 0x2F, 0xD0, 0x00, 0x0F, 0xFF, 0xFF, 0xC0, 0x7F, 0xD0, 0x00, 0xFF, 0xFF, 0xFF,
3841
+
0x02, 0xFF, 0xD0, 0x0F, 0xFF, 0xFF, 0xF4, 0x0F, 0xFF, 0xD0, 0xFF, 0xFF, 0xFF, 0x40, 0xBF, 0xFF,
3842
+
0xD7, 0xFF, 0xFF, 0xF4, 0x0B, 0xFF, 0xFF, 0x87, 0xFF, 0xFF, 0x80, 0xFF, 0xFF, 0xF8, 0x07, 0xFF,
3843
+
0xFE, 0x07, 0xFF, 0xFF, 0x80, 0x07, 0xFF, 0xF8, 0x2F, 0xFF, 0xF8, 0x00, 0x07, 0xFF, 0xFF, 0xFF,
3844
+
0xFF, 0x80, 0x00, 0x07, 0xFF, 0xFF, 0xFF, 0xF8, 0x00, 0x00, 0x07, 0xFD, 0x07, 0xFF, 0x80, 0x00,
3845
+
0x00, 0x07, 0xF0, 0x0F, 0xF8, 0x00, 0x00, 0x00, 0x07, 0xD0, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x07,
3846
+
0xD7, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0xF8, 0x00,
3847
+
0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
3837
3848
};
3838
3849
3839
3850
static const EpdGlyph notosans_14_regularGlyphs[] = {
···
4671
4682
{ 14, 27, 17, 2, 24, 95, 61032 }, // ₿
4672
4683
{ 12, 21, 14, 1, 16, 63, 61127 }, // ⃀
4673
4684
{ 15, 3, 17, 1, 12, 12, 61190 }, // −
4685
+
{ 27, 28, 29, 1, 23, 189, 61202 }, // �
4674
4686
};
4675
4687
4676
4688
static const EpdUnicodeInterval notosans_14_regularIntervals[] = {
···
4685
4697
{ 0x2066, 0x206F, 0x316 },
4686
4698
{ 0x20A0, 0x20C0, 0x320 },
4687
4699
{ 0x2212, 0x2212, 0x341 },
4700
+
{ 0xFFFD, 0xFFFD, 0x342 },
4688
4701
};
4689
4702
4690
4703
static const EpdFontData notosans_14_regular = {
4691
4704
notosans_14_regularBitmaps,
4692
4705
notosans_14_regularGlyphs,
4693
4706
notosans_14_regularIntervals,
4694
-
11,
4707
+
12,
4695
4708
40,
4696
4709
32,
4697
4710
-9,
+20
-2
lib/EpdFont/builtinFonts/notosans_16_bold.h
+20
-2
lib/EpdFont/builtinFonts/notosans_16_bold.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_16_boldBitmaps[86944] = {
10
+
static const uint8_t notosans_16_boldBitmaps[87192] = {
11
11
0x3F, 0xF4, 0xFF, 0xD3, 0xFF, 0x4F, 0xFD, 0x3F, 0xF4, 0xFF, 0xD3, 0xFF, 0x0F, 0xFC, 0x2F, 0xF0,
12
12
0xBF, 0xC2, 0xFF, 0x0B, 0xFC, 0x1F, 0xF0, 0x7F, 0xC1, 0xFF, 0x07, 0xF8, 0x05, 0x40, 0x00, 0x00,
13
13
0x00, 0x07, 0xF8, 0x3F, 0xF4, 0xFF, 0xE3, 0xFF, 0x4B, 0xFC, 0x01, 0x40, 0xFF, 0x82, 0xFE, 0xFF,
···
5442
5442
0xFF, 0xE0, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x55, 0x55, 0x54, 0x7F, 0xFF,
5443
5443
0xFF, 0xFC, 0x7F, 0xFF, 0xFF, 0xFC, 0x7F, 0xFF, 0xFF, 0xFC, 0x2A, 0xAA, 0xAA, 0xAA, 0x5F, 0xFF,
5444
5444
0xFF, 0xFF, 0xE7, 0xFF, 0xFF, 0xFF, 0xF9, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00,
5445
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
5446
+
0x00, 0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFD, 0x00, 0x00, 0x00, 0x00,
5447
+
0x00, 0x00, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00,
5448
+
0x00, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xE4, 0x06, 0xFD, 0x00, 0x00, 0x00, 0x00,
5449
+
0xF8, 0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x0F, 0xE0, 0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0xFF,
5450
+
0xC1, 0xA8, 0x03, 0xFD, 0x00, 0x00, 0x0F, 0xFF, 0xBF, 0xF4, 0x0B, 0xFD, 0x00, 0x00, 0xFF, 0xFF,
5451
+
0xFF, 0xE0, 0x2F, 0xFD, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFD, 0x00, 0xFF, 0xFF, 0xFF,
5452
+
0xF0, 0x07, 0xFF, 0xFD, 0x0F, 0xFF, 0xFF, 0xFF, 0x00, 0x7F, 0xFF, 0xFD, 0x3F, 0xFF, 0xFF, 0xF0,
5453
+
0x07, 0xFF, 0xFF, 0xF4, 0x3F, 0xFF, 0xFF, 0x80, 0xBF, 0xFF, 0xFF, 0x40, 0x3F, 0xFF, 0xFD, 0x03,
5454
+
0xFF, 0xFF, 0xF4, 0x00, 0x3F, 0xFF, 0xF4, 0x1F, 0xFF, 0xFF, 0x40, 0x00, 0x3F, 0xFF, 0xFF, 0xFF,
5455
+
0xFF, 0xF4, 0x00, 0x00, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x3F, 0xFF, 0x5B, 0xFF,
5456
+
0xF4, 0x00, 0x00, 0x00, 0x3F, 0xF0, 0x0F, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x3F, 0xC0, 0x2F, 0xF4,
5457
+
0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x5B, 0xF4, 0x00,
5458
+
0x00, 0x00, 0x00, 0x00, 0x3F, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xF4, 0x00, 0x00,
5459
+
0x00, 0x00, 0x00, 0x00, 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
5460
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5445
5461
};
5446
5462
5447
5463
static const EpdGlyph notosans_16_boldGlyphs[] = {
···
6279
6295
{ 15, 32, 19, 3, 28, 120, 86702 }, // ₿
6280
6296
{ 16, 25, 17, 1, 19, 100, 86822 }, // ⃀
6281
6297
{ 17, 5, 19, 1, 14, 22, 86922 }, // −
6298
+
{ 31, 32, 33, 1, 26, 248, 86944 }, // �
6282
6299
};
6283
6300
6284
6301
static const EpdUnicodeInterval notosans_16_boldIntervals[] = {
···
6293
6310
{ 0x2066, 0x206F, 0x316 },
6294
6311
{ 0x20A0, 0x20C0, 0x320 },
6295
6312
{ 0x2212, 0x2212, 0x341 },
6313
+
{ 0xFFFD, 0xFFFD, 0x342 },
6296
6314
};
6297
6315
6298
6316
static const EpdFontData notosans_16_bold = {
6299
6317
notosans_16_boldBitmaps,
6300
6318
notosans_16_boldGlyphs,
6301
6319
notosans_16_boldIntervals,
6302
-
11,
6320
+
12,
6303
6321
45,
6304
6322
36,
6305
6323
-10,
+20
-3
lib/EpdFont/builtinFonts/notosans_16_bolditalic.h
+20
-3
lib/EpdFont/builtinFonts/notosans_16_bolditalic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_16_bolditalicBitmaps[92423] = {
10
+
static const uint8_t notosans_16_bolditalicBitmaps[92671] = {
11
11
0x00, 0x3F, 0xF4, 0x01, 0xFF, 0xD0, 0x07, 0xFF, 0x00, 0x2F, 0xF8, 0x00, 0xFF, 0xD0, 0x03, 0xFF,
12
12
0x00, 0x0F, 0xFC, 0x00, 0x7F, 0xE0, 0x01, 0xFF, 0x40, 0x0B, 0xFC, 0x00, 0x3F, 0xF0, 0x00, 0xFF,
13
13
0x80, 0x03, 0xFD, 0x00, 0x1F, 0xF0, 0x00, 0x7F, 0xC0, 0x02, 0xFE, 0x00, 0x01, 0x50, 0x00, 0x00,
···
5784
5784
0xFE, 0x07, 0xFF, 0xC0, 0x1F, 0xFF, 0xFF, 0xFE, 0x00, 0xBF, 0xFF, 0xFF, 0xF0, 0x03, 0xFF, 0xFF,
5785
5785
0xFE, 0x00, 0x0F, 0xFF, 0xFF, 0x40, 0x00, 0x01, 0xF0, 0xF4, 0x00, 0x00, 0x07, 0x83, 0xC0, 0x00,
5786
5786
0x00, 0x2E, 0x1F, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x2F, 0xFF, 0xF3, 0xFF, 0xFE, 0x3F,
5787
-
0xFF, 0xD7, 0xFF, 0xFD, 0x00, 0x00, 0x00,
5787
+
0xFF, 0xD7, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5788
+
0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00,
5789
+
0x00, 0x0F, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00,
5790
+
0x0F, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x0F,
5791
+
0xE4, 0x06, 0xFD, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x0F, 0xE0,
5792
+
0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0xFF, 0xC1, 0xA8, 0x03, 0xFD, 0x00, 0x00, 0x0F, 0xFF, 0xBF,
5793
+
0xF4, 0x0B, 0xFD, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xE0, 0x2F, 0xFD, 0x00, 0x0F, 0xFF, 0xFF, 0xFF,
5794
+
0x00, 0xFF, 0xFD, 0x00, 0xFF, 0xFF, 0xFF, 0xF0, 0x07, 0xFF, 0xFD, 0x0F, 0xFF, 0xFF, 0xFF, 0x00,
5795
+
0x7F, 0xFF, 0xFD, 0x3F, 0xFF, 0xFF, 0xF0, 0x07, 0xFF, 0xFF, 0xF4, 0x3F, 0xFF, 0xFF, 0x80, 0xBF,
5796
+
0xFF, 0xFF, 0x40, 0x3F, 0xFF, 0xFD, 0x03, 0xFF, 0xFF, 0xF4, 0x00, 0x3F, 0xFF, 0xF4, 0x1F, 0xFF,
5797
+
0xFF, 0x40, 0x00, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x00, 0x00, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF,
5798
+
0x40, 0x00, 0x00, 0x3F, 0xFF, 0x5B, 0xFF, 0xF4, 0x00, 0x00, 0x00, 0x3F, 0xF0, 0x0F, 0xFF, 0x40,
5799
+
0x00, 0x00, 0x00, 0x3F, 0xC0, 0x2F, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0xFF, 0x40, 0x00,
5800
+
0x00, 0x00, 0x00, 0x3F, 0x5B, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xFF, 0x40, 0x00, 0x00,
5801
+
0x00, 0x00, 0x00, 0x3F, 0xF4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x40, 0x00, 0x00, 0x00,
5802
+
0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5788
5803
};
5789
5804
5790
5805
static const EpdGlyph notosans_16_bolditalicGlyphs[] = {
···
6621
6636
{ 23, 28, 20, -1, 28, 161, 92097 }, // ₾
6622
6637
{ 19, 32, 18, 0, 28, 152, 92258 }, // ₿
6623
6638
{ 10, 5, 11, 0, 11, 13, 92410 }, // −
6639
+
{ 31, 32, 33, 1, 26, 248, 92423 }, // �
6624
6640
};
6625
6641
6626
6642
static const EpdUnicodeInterval notosans_16_bolditalicIntervals[] = {
···
6635
6651
{ 0x2066, 0x206F, 0x316 },
6636
6652
{ 0x20A0, 0x20BF, 0x320 },
6637
6653
{ 0x2212, 0x2212, 0x340 },
6654
+
{ 0xFFFD, 0xFFFD, 0x341 },
6638
6655
};
6639
6656
6640
6657
static const EpdFontData notosans_16_bolditalic = {
6641
6658
notosans_16_bolditalicBitmaps,
6642
6659
notosans_16_bolditalicGlyphs,
6643
6660
notosans_16_bolditalicIntervals,
6644
-
11,
6661
+
12,
6645
6662
45,
6646
6663
36,
6647
6664
-10,
+21
-3
lib/EpdFont/builtinFonts/notosans_16_italic.h
+21
-3
lib/EpdFont/builtinFonts/notosans_16_italic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_16_italicBitmaps[83982] = {
10
+
static const uint8_t notosans_16_italicBitmaps[84230] = {
11
11
0x00, 0x1F, 0xC0, 0x02, 0xFC, 0x00, 0x3F, 0x80, 0x03, 0xF4, 0x00, 0x3F, 0x00, 0x07, 0xF0, 0x00,
12
12
0xBE, 0x00, 0x0B, 0xD0, 0x00, 0xFC, 0x00, 0x0F, 0xC0, 0x00, 0xF8, 0x00, 0x1F, 0x40, 0x02, 0xF0,
13
13
0x00, 0x3F, 0x00, 0x03, 0xE0, 0x00, 0x3D, 0x00, 0x07, 0xC0, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00,
···
5256
5256
0x00, 0x7F, 0x01, 0xF8, 0x00, 0x07, 0xE0, 0x1F, 0x40, 0x00, 0xBE, 0x02, 0xF4, 0x00, 0x0F, 0xC0,
5257
5257
0x3F, 0x00, 0x07, 0xF8, 0x03, 0xFA, 0xAB, 0xFF, 0x00, 0x7F, 0xFF, 0xFF, 0x80, 0x0B, 0xFF, 0xFF,
5258
5258
0x80, 0x00, 0x03, 0xC2, 0xD0, 0x00, 0x00, 0x3C, 0x3C, 0x00, 0x00, 0x07, 0x83, 0xC0, 0x00, 0x00,
5259
-
0x10, 0x10, 0x00, 0x00, 0x05, 0x55, 0x42, 0xFF, 0xFC, 0x3F, 0xFF, 0xC1, 0x55, 0x54,
5259
+
0x10, 0x10, 0x00, 0x00, 0x05, 0x55, 0x42, 0xFF, 0xFC, 0x3F, 0xFF, 0xC1, 0x55, 0x54, 0x00, 0x00,
5260
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5261
+
0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5262
+
0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
5263
+
0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xE4, 0x06, 0xFD, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x00,
5264
+
0x00, 0xFD, 0x00, 0x00, 0x00, 0x0F, 0xE0, 0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0xFF, 0xC1, 0xA8,
5265
+
0x03, 0xFD, 0x00, 0x00, 0x0F, 0xFF, 0xBF, 0xF4, 0x0B, 0xFD, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xE0,
5266
+
0x2F, 0xFD, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFD, 0x00, 0xFF, 0xFF, 0xFF, 0xF0, 0x07,
5267
+
0xFF, 0xFD, 0x0F, 0xFF, 0xFF, 0xFF, 0x00, 0x7F, 0xFF, 0xFD, 0x3F, 0xFF, 0xFF, 0xF0, 0x07, 0xFF,
5268
+
0xFF, 0xF4, 0x3F, 0xFF, 0xFF, 0x80, 0xBF, 0xFF, 0xFF, 0x40, 0x3F, 0xFF, 0xFD, 0x03, 0xFF, 0xFF,
5269
+
0xF4, 0x00, 0x3F, 0xFF, 0xF4, 0x1F, 0xFF, 0xFF, 0x40, 0x00, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4,
5270
+
0x00, 0x00, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x3F, 0xFF, 0x5B, 0xFF, 0xF4, 0x00,
5271
+
0x00, 0x00, 0x3F, 0xF0, 0x0F, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x3F, 0xC0, 0x2F, 0xF4, 0x00, 0x00,
5272
+
0x00, 0x00, 0x3F, 0x00, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x5B, 0xF4, 0x00, 0x00, 0x00,
5273
+
0x00, 0x00, 0x3F, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xF4, 0x00, 0x00, 0x00, 0x00,
5274
+
0x00, 0x00, 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00,
5275
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5260
5276
};
5261
5277
5262
5278
static const EpdGlyph notosans_16_italicGlyphs[] = {
···
6093
6109
{ 22, 28, 20, -1, 28, 154, 83674 }, // ₾
6094
6110
{ 18, 32, 18, 1, 28, 144, 83828 }, // ₿
6095
6111
{ 10, 4, 10, 0, 11, 10, 83972 }, // −
6112
+
{ 31, 32, 33, 1, 26, 248, 83982 }, // �
6096
6113
};
6097
6114
6098
6115
static const EpdUnicodeInterval notosans_16_italicIntervals[] = {
···
6107
6124
{ 0x2066, 0x206F, 0x316 },
6108
6125
{ 0x20A0, 0x20BF, 0x320 },
6109
6126
{ 0x2212, 0x2212, 0x340 },
6127
+
{ 0xFFFD, 0xFFFD, 0x341 },
6110
6128
};
6111
6129
6112
6130
static const EpdFontData notosans_16_italic = {
6113
6131
notosans_16_italicBitmaps,
6114
6132
notosans_16_italicGlyphs,
6115
6133
notosans_16_italicIntervals,
6116
-
11,
6134
+
12,
6117
6135
45,
6118
6136
36,
6119
6137
-10,
+20
-2
lib/EpdFont/builtinFonts/notosans_16_regular.h
+20
-2
lib/EpdFont/builtinFonts/notosans_16_regular.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_16_regularBitmaps[78480] = {
10
+
static const uint8_t notosans_16_regularBitmaps[78728] = {
11
11
0x3F, 0x0F, 0xC3, 0xF0, 0xFC, 0x3F, 0x0F, 0xC3, 0xF0, 0xFC, 0x3F, 0x0F, 0xC3, 0xF0, 0xF8, 0x2E,
12
12
0x0B, 0x82, 0xE0, 0xB8, 0x2D, 0x01, 0x00, 0x00, 0x00, 0x3F, 0x2F, 0xDB, 0xF9, 0xFC, 0x04, 0x00,
13
13
0xBC, 0x0B, 0xDB, 0xC0, 0xBD, 0xBC, 0x0B, 0xDB, 0xC0, 0x7C, 0xBC, 0x07, 0xC7, 0xC0, 0x7C, 0x7C,
···
4913
4913
0x2F, 0x80, 0x00, 0x01, 0xFD, 0x00, 0x00, 0x0B, 0xF9, 0x06, 0xD0, 0x2F, 0xFF, 0xFD, 0x00, 0x7F,
4914
4914
0xFF, 0x80, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x01, 0x55, 0x55, 0x54, 0x3F, 0xFF, 0xFF, 0xE3,
4915
4915
0xFF, 0xFF, 0xFD, 0x7F, 0xFF, 0xFF, 0xFF, 0x5F, 0xFF, 0xFF, 0xFF, 0xD1, 0x55, 0x55, 0x55, 0x50,
4916
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
4917
+
0x00, 0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFD, 0x00, 0x00, 0x00, 0x00,
4918
+
0x00, 0x00, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00,
4919
+
0x00, 0xFF, 0xFF, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xE4, 0x06, 0xFD, 0x00, 0x00, 0x00, 0x00,
4920
+
0xF8, 0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0x0F, 0xE0, 0x00, 0x00, 0xFD, 0x00, 0x00, 0x00, 0xFF,
4921
+
0xC1, 0xA8, 0x03, 0xFD, 0x00, 0x00, 0x0F, 0xFF, 0xBF, 0xF4, 0x0B, 0xFD, 0x00, 0x00, 0xFF, 0xFF,
4922
+
0xFF, 0xE0, 0x2F, 0xFD, 0x00, 0x0F, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFD, 0x00, 0xFF, 0xFF, 0xFF,
4923
+
0xF0, 0x07, 0xFF, 0xFD, 0x0F, 0xFF, 0xFF, 0xFF, 0x00, 0x7F, 0xFF, 0xFD, 0x3F, 0xFF, 0xFF, 0xF0,
4924
+
0x07, 0xFF, 0xFF, 0xF4, 0x3F, 0xFF, 0xFF, 0x80, 0xBF, 0xFF, 0xFF, 0x40, 0x3F, 0xFF, 0xFD, 0x03,
4925
+
0xFF, 0xFF, 0xF4, 0x00, 0x3F, 0xFF, 0xF4, 0x1F, 0xFF, 0xFF, 0x40, 0x00, 0x3F, 0xFF, 0xFF, 0xFF,
4926
+
0xFF, 0xF4, 0x00, 0x00, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF, 0x40, 0x00, 0x00, 0x3F, 0xFF, 0x5B, 0xFF,
4927
+
0xF4, 0x00, 0x00, 0x00, 0x3F, 0xF0, 0x0F, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x3F, 0xC0, 0x2F, 0xF4,
4928
+
0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x5B, 0xF4, 0x00,
4929
+
0x00, 0x00, 0x00, 0x00, 0x3F, 0xFF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xF4, 0x00, 0x00,
4930
+
0x00, 0x00, 0x00, 0x00, 0x3F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00,
4931
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4916
4932
};
4917
4933
4918
4934
static const EpdGlyph notosans_16_regularGlyphs[] = {
···
5750
5766
{ 15, 32, 19, 3, 28, 120, 78263 }, // ₿
5751
5767
{ 14, 24, 16, 1, 19, 84, 78383 }, // ⃀
5752
5768
{ 17, 3, 19, 1, 13, 13, 78467 }, // −
5769
+
{ 31, 32, 33, 1, 26, 248, 78480 }, // �
5753
5770
};
5754
5771
5755
5772
static const EpdUnicodeInterval notosans_16_regularIntervals[] = {
···
5764
5781
{ 0x2066, 0x206F, 0x316 },
5765
5782
{ 0x20A0, 0x20C0, 0x320 },
5766
5783
{ 0x2212, 0x2212, 0x341 },
5784
+
{ 0xFFFD, 0xFFFD, 0x342 },
5767
5785
};
5768
5786
5769
5787
static const EpdFontData notosans_16_regular = {
5770
5788
notosans_16_regularBitmaps,
5771
5789
notosans_16_regularGlyphs,
5772
5790
notosans_16_regularIntervals,
5773
-
11,
5791
+
12,
5774
5792
45,
5775
5793
36,
5776
5794
-10,
+24
-3
lib/EpdFont/builtinFonts/notosans_18_bold.h
+24
-3
lib/EpdFont/builtinFonts/notosans_18_bold.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_18_boldBitmaps[108125] = {
10
+
static const uint8_t notosans_18_boldBitmaps[108432] = {
11
11
0xBF, 0xF7, 0xFF, 0xDF, 0xFF, 0x6F, 0xFD, 0xBF, 0xF2, 0xFF, 0xCB, 0xFF, 0x2F, 0xFC, 0x7F, 0xF1,
12
12
0xFF, 0xC7, 0xFF, 0x1F, 0xFC, 0x7F, 0xF0, 0xFF, 0xC3, 0xFE, 0x0F, 0xF8, 0x3F, 0xE0, 0xFF, 0x81,
13
13
0x54, 0x00, 0x00, 0x00, 0x00, 0x6E, 0x0B, 0xFF, 0x3F, 0xFD, 0xFF, 0xF7, 0xFF, 0xD7, 0xFE, 0x01,
···
6765
6765
0xF8, 0x00, 0x1F, 0xFF, 0xFD, 0x00, 0x00, 0x01, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6766
6766
0x00, 0x00, 0x00, 0x3F, 0xFF, 0xFF, 0xFF, 0xC3, 0xFF, 0xFF, 0xFF, 0xFC, 0x3F, 0xFF, 0xFF, 0xFF,
6767
6767
0xC2, 0xAA, 0xAA, 0xAA, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0xFF,
6768
-
0xFF, 0xFF, 0xFF, 0xCF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0xFF, 0xF8,
6768
+
0xFF, 0xFF, 0xFF, 0xCF, 0xFF, 0xFF, 0xFF, 0xFF, 0x3F, 0xFF, 0xFF, 0xFF, 0xF8, 0x00, 0x00, 0x00,
6769
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00,
6770
+
0x00, 0x00, 0x1F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xE0, 0x00, 0x00, 0x00,
6771
+
0x00, 0x00, 0x00, 0x1F, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xE0, 0x00,
6772
+
0x00, 0x00, 0x00, 0x00, 0x1F, 0xFF, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFA, 0xFF,
6773
+
0xE0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xE0, 0x00, 0x2F, 0xE0, 0x00, 0x00, 0x00, 0x01, 0xFC, 0x00,
6774
+
0x00, 0x0F, 0xE0, 0x00, 0x00, 0x00, 0x1F, 0xF0, 0x00, 0x00, 0x1F, 0xE0, 0x00, 0x00, 0x01, 0xFF,
6775
+
0xD0, 0x6A, 0x00, 0x3F, 0xE0, 0x00, 0x00, 0x1F, 0xFF, 0xDF, 0xFE, 0x00, 0xFF, 0xE0, 0x00, 0x01,
6776
+
0xFF, 0xFF, 0xFF, 0xFC, 0x03, 0xFF, 0xE0, 0x00, 0x1F, 0xFF, 0xFF, 0xFF, 0xE0, 0x0F, 0xFF, 0xE0,
6777
+
0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x7F, 0xFF, 0xE0, 0x1F, 0xFF, 0xFF, 0xFF, 0xE0, 0x03, 0xFF,
6778
+
0xFF, 0xE0, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x3F, 0xFF, 0xFF, 0xE2, 0xFF, 0xFF, 0xFF, 0xF0, 0x07,
6779
+
0xFF, 0xFF, 0xFF, 0x02, 0xFF, 0xFF, 0xFF, 0x40, 0x7F, 0xFF, 0xFF, 0xF0, 0x02, 0xFF, 0xFF, 0xFC,
6780
+
0x03, 0xFF, 0xFF, 0xFF, 0x00, 0x02, 0xFF, 0xFF, 0xF0, 0x0F, 0xFF, 0xFF, 0xF0, 0x00, 0x02, 0xFF,
6781
+
0xFF, 0xEA, 0xBF, 0xFF, 0xFF, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x00, 0x00,
6782
+
0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x02, 0xFF, 0xF4, 0x0F, 0xFF, 0xF0, 0x00,
6783
+
0x00, 0x00, 0x02, 0xFF, 0x80, 0x1F, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFE, 0x00, 0x7F, 0xF0,
6784
+
0x00, 0x00, 0x00, 0x00, 0x02, 0xFC, 0x02, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xF9, 0x6F,
6785
+
0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
6786
+
0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6787
+
0x00, 0x02, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
6769
6788
};
6770
6789
6771
6790
static const EpdGlyph notosans_18_boldGlyphs[] = {
···
7603
7622
{ 18, 35, 21, 3, 31, 158, 107817 }, // ₿
7604
7623
{ 18, 28, 20, 1, 21, 126, 107975 }, // ⃀
7605
7624
{ 19, 5, 22, 1, 16, 24, 108101 }, // −
7625
+
{ 35, 35, 38, 1, 29, 307, 108125 }, // �
7606
7626
};
7607
7627
7608
7628
static const EpdUnicodeInterval notosans_18_boldIntervals[] = {
···
7617
7637
{ 0x2066, 0x206F, 0x316 },
7618
7638
{ 0x20A0, 0x20C0, 0x320 },
7619
7639
{ 0x2212, 0x2212, 0x341 },
7640
+
{ 0xFFFD, 0xFFFD, 0x342 },
7620
7641
};
7621
7642
7622
7643
static const EpdFontData notosans_18_bold = {
7623
7644
notosans_18_boldBitmaps,
7624
7645
notosans_18_boldGlyphs,
7625
7646
notosans_18_boldIntervals,
7626
-
11,
7647
+
12,
7627
7648
51,
7628
7649
41,
7629
7650
-11,
+24
-3
lib/EpdFont/builtinFonts/notosans_18_bolditalic.h
+24
-3
lib/EpdFont/builtinFonts/notosans_18_bolditalic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_18_bolditalicBitmaps[115270] = {
10
+
static const uint8_t notosans_18_bolditalicBitmaps[115577] = {
11
11
0x00, 0x1F, 0xFE, 0x00, 0x2F, 0xFE, 0x00, 0x3F, 0xFD, 0x00, 0x3F, 0xFC, 0x00, 0x3F, 0xFC, 0x00,
12
12
0x7F, 0xF8, 0x00, 0x7F, 0xF4, 0x00, 0xBF, 0xF0, 0x00, 0xFF, 0xF0, 0x00, 0xFF, 0xE0, 0x00, 0xFF,
13
13
0xD0, 0x01, 0xFF, 0xC0, 0x02, 0xFF, 0x80, 0x02, 0xFF, 0x40, 0x03, 0xFF, 0x00, 0x03, 0xFF, 0x00,
···
7212
7212
0xFF, 0xFF, 0xFF, 0x40, 0x0B, 0xFF, 0xFF, 0xFF, 0x00, 0x03, 0xFF, 0xFF, 0xF8, 0x00, 0x00, 0x03,
7213
7213
0xE0, 0xF8, 0x00, 0x00, 0x00, 0xF8, 0x3E, 0x00, 0x00, 0x00, 0x3D, 0x0F, 0x40, 0x00, 0x00, 0x1A,
7214
7214
0x06, 0x80, 0x00, 0x00, 0x05, 0x55, 0x54, 0x2F, 0xFF, 0xFC, 0x3F, 0xFF, 0xFC, 0x3F, 0xFF, 0xF8,
7215
-
0x3F, 0xFF, 0xF4, 0x15, 0x55, 0x50,
7215
+
0x3F, 0xFF, 0xF4, 0x15, 0x55, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
7216
+
0x00, 0x00, 0x01, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xE0, 0x00, 0x00, 0x00,
7217
+
0x00, 0x00, 0x00, 0x01, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xFF, 0xE0, 0x00,
7218
+
0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xFF, 0xFF,
7219
+
0xE0, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFA, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xE0,
7220
+
0x00, 0x2F, 0xE0, 0x00, 0x00, 0x00, 0x01, 0xFC, 0x00, 0x00, 0x0F, 0xE0, 0x00, 0x00, 0x00, 0x1F,
7221
+
0xF0, 0x00, 0x00, 0x1F, 0xE0, 0x00, 0x00, 0x01, 0xFF, 0xD0, 0x6A, 0x00, 0x3F, 0xE0, 0x00, 0x00,
7222
+
0x1F, 0xFF, 0xDF, 0xFE, 0x00, 0xFF, 0xE0, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFC, 0x03, 0xFF, 0xE0,
7223
+
0x00, 0x1F, 0xFF, 0xFF, 0xFF, 0xE0, 0x0F, 0xFF, 0xE0, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x7F,
7224
+
0xFF, 0xE0, 0x1F, 0xFF, 0xFF, 0xFF, 0xE0, 0x03, 0xFF, 0xFF, 0xE0, 0xFF, 0xFF, 0xFF, 0xFE, 0x00,
7225
+
0x3F, 0xFF, 0xFF, 0xE2, 0xFF, 0xFF, 0xFF, 0xF0, 0x07, 0xFF, 0xFF, 0xFF, 0x02, 0xFF, 0xFF, 0xFF,
7226
+
0x40, 0x7F, 0xFF, 0xFF, 0xF0, 0x02, 0xFF, 0xFF, 0xFC, 0x03, 0xFF, 0xFF, 0xFF, 0x00, 0x02, 0xFF,
7227
+
0xFF, 0xF0, 0x0F, 0xFF, 0xFF, 0xF0, 0x00, 0x02, 0xFF, 0xFF, 0xEA, 0xBF, 0xFF, 0xFF, 0x00, 0x00,
7228
+
0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
7229
+
0x00, 0x00, 0x02, 0xFF, 0xF4, 0x0F, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x02, 0xFF, 0x80, 0x1F, 0xFF,
7230
+
0x00, 0x00, 0x00, 0x00, 0x02, 0xFE, 0x00, 0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFC, 0x02,
7231
+
0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xF9, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
7232
+
0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00,
7233
+
0x00, 0x02, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xF0, 0x00, 0x00, 0x00, 0x00,
7234
+
0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
7216
7235
};
7217
7236
7218
7237
static const EpdGlyph notosans_18_bolditalicGlyphs[] = {
···
8049
8068
{ 26, 31, 23, -1, 31, 202, 114866 }, // ₾
8050
8069
{ 21, 35, 21, 0, 31, 184, 115068 }, // ₿
8051
8070
{ 12, 6, 12, 0, 13, 18, 115252 }, // −
8071
+
{ 35, 35, 38, 1, 29, 307, 115270 }, // �
8052
8072
};
8053
8073
8054
8074
static const EpdUnicodeInterval notosans_18_bolditalicIntervals[] = {
···
8063
8083
{ 0x2066, 0x206F, 0x316 },
8064
8084
{ 0x20A0, 0x20BF, 0x320 },
8065
8085
{ 0x2212, 0x2212, 0x340 },
8086
+
{ 0xFFFD, 0xFFFD, 0x341 },
8066
8087
};
8067
8088
8068
8089
static const EpdFontData notosans_18_bolditalic = {
8069
8090
notosans_18_bolditalicBitmaps,
8070
8091
notosans_18_bolditalicGlyphs,
8071
8092
notosans_18_bolditalicIntervals,
8072
-
11,
8093
+
12,
8073
8094
51,
8074
8095
41,
8075
8096
-11,
+24
-3
lib/EpdFont/builtinFonts/notosans_18_italic.h
+24
-3
lib/EpdFont/builtinFonts/notosans_18_italic.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_18_italicBitmaps[105127] = {
10
+
static const uint8_t notosans_18_italicBitmaps[105434] = {
11
11
0x00, 0x0B, 0xF0, 0x00, 0x3F, 0xC0, 0x00, 0xFF, 0x00, 0x07, 0xF8, 0x00, 0x1F, 0xD0, 0x00, 0xBF,
12
12
0x00, 0x03, 0xFC, 0x00, 0x0F, 0xE0, 0x00, 0x3F, 0x40, 0x01, 0xFC, 0x00, 0x0B, 0xF0, 0x00, 0x2F,
13
13
0x80, 0x00, 0xFD, 0x00, 0x03, 0xF0, 0x00, 0x0F, 0xC0, 0x00, 0x7E, 0x00, 0x02, 0xF4, 0x00, 0x0F,
···
6578
6578
0xC0, 0x00, 0x3F, 0xC0, 0x2F, 0x80, 0x02, 0xFF, 0x40, 0x3F, 0xFF, 0xFF, 0xFD, 0x00, 0x3F, 0xFF,
6579
6579
0xFF, 0xF4, 0x00, 0x7F, 0xFF, 0xFE, 0x40, 0x00, 0x01, 0xF0, 0xB8, 0x00, 0x00, 0x02, 0xE0, 0xF4,
6580
6580
0x00, 0x00, 0x03, 0xD0, 0xF4, 0x00, 0x00, 0x02, 0x80, 0xA0, 0x00, 0x00, 0x0A, 0xAA, 0xA0, 0xBF,
6581
-
0xFF, 0xD3, 0xFF, 0xFF, 0x05, 0x55, 0x54,
6581
+
0xFF, 0xD3, 0xFF, 0xFF, 0x05, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6582
+
0x00, 0x00, 0x00, 0x01, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xE0, 0x00, 0x00,
6583
+
0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xFF, 0xE0,
6584
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xFF,
6585
+
0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x01, 0xFF, 0xFA, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1F,
6586
+
0xE0, 0x00, 0x2F, 0xE0, 0x00, 0x00, 0x00, 0x01, 0xFC, 0x00, 0x00, 0x0F, 0xE0, 0x00, 0x00, 0x00,
6587
+
0x1F, 0xF0, 0x00, 0x00, 0x1F, 0xE0, 0x00, 0x00, 0x01, 0xFF, 0xD0, 0x6A, 0x00, 0x3F, 0xE0, 0x00,
6588
+
0x00, 0x1F, 0xFF, 0xDF, 0xFE, 0x00, 0xFF, 0xE0, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFC, 0x03, 0xFF,
6589
+
0xE0, 0x00, 0x1F, 0xFF, 0xFF, 0xFF, 0xE0, 0x0F, 0xFF, 0xE0, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
6590
+
0x7F, 0xFF, 0xE0, 0x1F, 0xFF, 0xFF, 0xFF, 0xE0, 0x03, 0xFF, 0xFF, 0xE0, 0xFF, 0xFF, 0xFF, 0xFE,
6591
+
0x00, 0x3F, 0xFF, 0xFF, 0xE2, 0xFF, 0xFF, 0xFF, 0xF0, 0x07, 0xFF, 0xFF, 0xFF, 0x02, 0xFF, 0xFF,
6592
+
0xFF, 0x40, 0x7F, 0xFF, 0xFF, 0xF0, 0x02, 0xFF, 0xFF, 0xFC, 0x03, 0xFF, 0xFF, 0xFF, 0x00, 0x02,
6593
+
0xFF, 0xFF, 0xF0, 0x0F, 0xFF, 0xFF, 0xF0, 0x00, 0x02, 0xFF, 0xFF, 0xEA, 0xBF, 0xFF, 0xFF, 0x00,
6594
+
0x00, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
6595
+
0x00, 0x00, 0x00, 0x02, 0xFF, 0xF4, 0x0F, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x02, 0xFF, 0x80, 0x1F,
6596
+
0xFF, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFE, 0x00, 0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFC,
6597
+
0x02, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xF9, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00,
6598
+
0x02, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00,
6599
+
0x00, 0x00, 0x02, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xF0, 0x00, 0x00, 0x00,
6600
+
0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
6582
6601
};
6583
6602
6584
6603
static const EpdGlyph notosans_18_italicGlyphs[] = {
···
7415
7434
{ 25, 31, 22, -1, 31, 194, 104747 }, // ₾
7416
7435
{ 20, 35, 21, 1, 31, 175, 104941 }, // ₿
7417
7436
{ 11, 4, 12, 0, 12, 11, 105116 }, // −
7437
+
{ 35, 35, 38, 1, 29, 307, 105127 }, // �
7418
7438
};
7419
7439
7420
7440
static const EpdUnicodeInterval notosans_18_italicIntervals[] = {
···
7429
7449
{ 0x2066, 0x206F, 0x316 },
7430
7450
{ 0x20A0, 0x20BF, 0x320 },
7431
7451
{ 0x2212, 0x2212, 0x340 },
7452
+
{ 0xFFFD, 0xFFFD, 0x341 },
7432
7453
};
7433
7454
7434
7455
static const EpdFontData notosans_18_italic = {
7435
7456
notosans_18_italicBitmaps,
7436
7457
notosans_18_italicGlyphs,
7437
7458
notosans_18_italicIntervals,
7438
-
11,
7459
+
12,
7439
7460
51,
7440
7461
41,
7441
7462
-11,
+24
-3
lib/EpdFont/builtinFonts/notosans_18_regular.h
+24
-3
lib/EpdFont/builtinFonts/notosans_18_regular.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_18_regularBitmaps[98532] = {
10
+
static const uint8_t notosans_18_regularBitmaps[98839] = {
11
11
0x2F, 0xC3, 0xFC, 0x3F, 0xC3, 0xFC, 0x3F, 0xC2, 0xFC, 0x2F, 0x82, 0xF8, 0x2F, 0x82, 0xF8, 0x1F,
12
12
0x81, 0xF4, 0x1F, 0x41, 0xF4, 0x1F, 0x40, 0xF4, 0x0F, 0x40, 0xF0, 0x0F, 0x00, 0x50, 0x00, 0x00,
13
13
0x00, 0x05, 0x03, 0xFC, 0x7F, 0xD3, 0xFD, 0x3F, 0xC0, 0x50, 0x7F, 0x02, 0xF9, 0xFC, 0x0B, 0xF7,
···
6166
6166
0xBC, 0x00, 0xFF, 0xFF, 0xFC, 0x00, 0x1F, 0xFF, 0xF8, 0x00, 0x00, 0x55, 0x00, 0x00, 0x00, 0x00,
6167
6167
0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0xFF, 0xFF, 0xFD, 0x3F, 0xFF, 0xFF, 0xFD, 0x2A, 0xAA, 0xAA,
6168
6168
0xA8, 0x2A, 0xAA, 0xAA, 0xAA, 0xA4, 0xFF, 0xFF, 0xFF, 0xFF, 0xE3, 0xFF, 0xFF, 0xFF, 0xFF, 0x80,
6169
-
0x00, 0x00, 0x00, 0x00,
6169
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6170
+
0x01, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00,
6171
+
0x00, 0x01, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xFF, 0xE0, 0x00, 0x00, 0x00,
6172
+
0x00, 0x00, 0x01, 0xFF, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xFF, 0xFF, 0xE0, 0x00,
6173
+
0x00, 0x00, 0x00, 0x01, 0xFF, 0xFA, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xE0, 0x00, 0x2F,
6174
+
0xE0, 0x00, 0x00, 0x00, 0x01, 0xFC, 0x00, 0x00, 0x0F, 0xE0, 0x00, 0x00, 0x00, 0x1F, 0xF0, 0x00,
6175
+
0x00, 0x1F, 0xE0, 0x00, 0x00, 0x01, 0xFF, 0xD0, 0x6A, 0x00, 0x3F, 0xE0, 0x00, 0x00, 0x1F, 0xFF,
6176
+
0xDF, 0xFE, 0x00, 0xFF, 0xE0, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFC, 0x03, 0xFF, 0xE0, 0x00, 0x1F,
6177
+
0xFF, 0xFF, 0xFF, 0xE0, 0x0F, 0xFF, 0xE0, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x7F, 0xFF, 0xE0,
6178
+
0x1F, 0xFF, 0xFF, 0xFF, 0xE0, 0x03, 0xFF, 0xFF, 0xE0, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x3F, 0xFF,
6179
+
0xFF, 0xE2, 0xFF, 0xFF, 0xFF, 0xF0, 0x07, 0xFF, 0xFF, 0xFF, 0x02, 0xFF, 0xFF, 0xFF, 0x40, 0x7F,
6180
+
0xFF, 0xFF, 0xF0, 0x02, 0xFF, 0xFF, 0xFC, 0x03, 0xFF, 0xFF, 0xFF, 0x00, 0x02, 0xFF, 0xFF, 0xF0,
6181
+
0x0F, 0xFF, 0xFF, 0xF0, 0x00, 0x02, 0xFF, 0xFF, 0xEA, 0xBF, 0xFF, 0xFF, 0x00, 0x00, 0x02, 0xFF,
6182
+
0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x00, 0x00, 0x02, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00,
6183
+
0x02, 0xFF, 0xF4, 0x0F, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x02, 0xFF, 0x80, 0x1F, 0xFF, 0x00, 0x00,
6184
+
0x00, 0x00, 0x02, 0xFE, 0x00, 0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFC, 0x02, 0xFF, 0x00,
6185
+
0x00, 0x00, 0x00, 0x00, 0x02, 0xF9, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0xFF,
6186
+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
6187
+
0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6188
+
0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
6170
6189
};
6171
6190
6172
6191
static const EpdGlyph notosans_18_regularGlyphs[] = {
···
7004
7023
{ 18, 35, 21, 3, 31, 158, 98247 }, // ₿
7005
7024
{ 16, 27, 18, 1, 21, 108, 98405 }, // ⃀
7006
7025
{ 19, 4, 21, 1, 15, 19, 98513 }, // −
7026
+
{ 35, 35, 38, 1, 29, 307, 98532 }, // �
7007
7027
};
7008
7028
7009
7029
static const EpdUnicodeInterval notosans_18_regularIntervals[] = {
···
7018
7038
{ 0x2066, 0x206F, 0x316 },
7019
7039
{ 0x20A0, 0x20C0, 0x320 },
7020
7040
{ 0x2212, 0x2212, 0x341 },
7041
+
{ 0xFFFD, 0xFFFD, 0x342 },
7021
7042
};
7022
7043
7023
7044
static const EpdFontData notosans_18_regular = {
7024
7045
notosans_18_regularBitmaps,
7025
7046
notosans_18_regularGlyphs,
7026
7047
notosans_18_regularIntervals,
7027
-
11,
7048
+
12,
7028
7049
51,
7029
7050
41,
7030
7051
-11,
+7
-3
lib/EpdFont/builtinFonts/notosans_8_regular.h
+7
-3
lib/EpdFont/builtinFonts/notosans_8_regular.h
···
7
7
#pragma once
8
8
#include "EpdFontData.h"
9
9
10
-
static const uint8_t notosans_8_regularBitmaps[10949] = {
10
+
static const uint8_t notosans_8_regularBitmaps[10981] = {
11
11
0xDB, 0x6D, 0xB6, 0xC3, 0xF4, 0xDE, 0xF7, 0xBD, 0x80, 0x0D, 0x83, 0x30, 0x66, 0x3F, 0xF7, 0xFE,
12
12
0x36, 0x04, 0xC7, 0xFE, 0xFF, 0xC6, 0x40, 0xD8, 0x1B, 0x00, 0x18, 0x18, 0xFE, 0xFE, 0xD8, 0xF8,
13
13
0xFC, 0x3E, 0x1F, 0x1B, 0xFF, 0xFE, 0x38, 0x18, 0x00, 0x01, 0xE1, 0x86, 0xCC, 0x13, 0x30, 0xCD,
···
692
692
0x07, 0x01, 0xC0, 0x1B, 0x03, 0xE1, 0xFF, 0x3D, 0xED, 0xBF, 0xB6, 0xF6, 0xDE, 0x53, 0xC0, 0x1C,
693
693
0x01, 0x80, 0x3F, 0xE7, 0xFC, 0x3C, 0x3C, 0xFE, 0xFF, 0xE3, 0xE3, 0xE7, 0xFE, 0xFF, 0xE3, 0xE3,
694
694
0xE3, 0xFF, 0xFE, 0x3C, 0x3C, 0x00, 0x3F, 0x7E, 0x60, 0x60, 0xE0, 0xE0, 0x60, 0x7E, 0x3F, 0x0C,
695
-
0x7F, 0x7E, 0x7F, 0xFF, 0xC0,
695
+
0x7F, 0x7E, 0x7F, 0xFF, 0xC0, 0x00, 0x80, 0x01, 0xC0, 0x03, 0xE0, 0x07, 0xF0, 0x0C, 0x38, 0x1F,
696
+
0xDC, 0x3F, 0xDE, 0x7F, 0xBF, 0x7F, 0x7F, 0x3F, 0x7E, 0x1F, 0xFC, 0x0F, 0xF8, 0x06, 0x70, 0x03,
697
+
0xE0, 0x01, 0xC0, 0x00, 0x80,
696
698
};
697
699
698
700
static const EpdGlyph notosans_8_regularGlyphs[] = {
···
1530
1532
{ 8, 16, 10, 1, 14, 16, 10917 }, // ₿
1531
1533
{ 8, 13, 8, 0, 10, 13, 10933 }, // ⃀
1532
1534
{ 9, 2, 10, 0, 7, 3, 10946 }, // −
1535
+
{ 16, 16, 17, 0, 13, 32, 10949 }, // �
1533
1536
};
1534
1537
1535
1538
static const EpdUnicodeInterval notosans_8_regularIntervals[] = {
···
1544
1547
{ 0x2066, 0x206F, 0x316 },
1545
1548
{ 0x20A0, 0x20C0, 0x320 },
1546
1549
{ 0x2212, 0x2212, 0x341 },
1550
+
{ 0xFFFD, 0xFFFD, 0x342 },
1547
1551
};
1548
1552
1549
1553
static const EpdFontData notosans_8_regular = {
1550
1554
notosans_8_regularBitmaps,
1551
1555
notosans_8_regularGlyphs,
1552
1556
notosans_8_regularIntervals,
1553
-
11,
1557
+
12,
1554
1558
23,
1555
1559
18,
1556
1560
-5,
+3
lib/EpdFont/scripts/fontconvert.py
+3
lib/EpdFont/scripts/fontconvert.py
+2
-3
lib/GfxRenderer/GfxRenderer.cpp
+2
-3
lib/GfxRenderer/GfxRenderer.cpp
···
582
582
while ((cp = utf8NextCodepoint(reinterpret_cast<const uint8_t**>(&text)))) {
583
583
const EpdGlyph* glyph = font.getGlyph(cp, style);
584
584
if (!glyph) {
585
-
glyph = font.getGlyph('?', style);
585
+
glyph = font.getGlyph(REPLACEMENT_GLYPH, style);
586
586
}
587
587
if (!glyph) {
588
588
continue;
···
760
760
const bool pixelState, const EpdFontFamily::Style style) const {
761
761
const EpdGlyph* glyph = fontFamily.getGlyph(cp, style);
762
762
if (!glyph) {
763
-
// TODO: Replace with fallback glyph property?
764
-
glyph = fontFamily.getGlyph('?', style);
763
+
glyph = fontFamily.getGlyph(REPLACEMENT_GLYPH, style);
765
764
}
766
765
767
766
// no glyph?