adds Atkinson Hyperlegible Next
This commit is contained in:
parent
67494a7c90
commit
e3ae125f3c
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1555
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_12_bold.h
Normal file
1555
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_12_bold.h
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
1588
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_12_italic.h
Normal file
1588
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_12_italic.h
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
1986
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_14_bold.h
Normal file
1986
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_14_bold.h
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
2012
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_14_italic.h
Normal file
2012
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_14_italic.h
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
2393
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_16_bold.h
Normal file
2393
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_16_bold.h
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
2427
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_16_italic.h
Normal file
2427
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_16_italic.h
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
2978
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_18_bold.h
Normal file
2978
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_18_bold.h
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
3018
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_18_italic.h
Normal file
3018
lib/EpdFont/builtinFonts/custom/atkinsonhyperlegiblenext_18_italic.h
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -9,13 +9,30 @@
|
||||
|
||||
class GfxRenderer;
|
||||
|
||||
#define CUSTOM_FONT_COUNT 1
|
||||
#define CUSTOM_FONT_COUNT 2
|
||||
|
||||
static const char* CUSTOM_FONT_NAMES[] = {
|
||||
"AtkinsonHyperlegibleNext",
|
||||
"FernMicro"
|
||||
};
|
||||
|
||||
// Include all custom font headers
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_12_regular.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_12_italic.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_12_bold.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_12_bolditalic.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_14_regular.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_14_italic.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_14_bold.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_14_bolditalic.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_16_regular.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_16_italic.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_16_bold.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_16_bolditalic.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_18_regular.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_18_italic.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_18_bold.h>
|
||||
#include <builtinFonts/custom/atkinsonhyperlegiblenext_18_bolditalic.h>
|
||||
#include <builtinFonts/custom/fernmicro_12_regular.h>
|
||||
#include <builtinFonts/custom/fernmicro_12_italic.h>
|
||||
#include <builtinFonts/custom/fernmicro_12_bold.h>
|
||||
@ -34,6 +51,22 @@ static const char* CUSTOM_FONT_NAMES[] = {
|
||||
#include <builtinFonts/custom/fernmicro_18_bolditalic.h>
|
||||
|
||||
// Extern EpdFont declarations for custom fonts
|
||||
extern EpdFont atkinsonhyperlegiblenext12RegularFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext12ItalicFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext12BoldFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext12BoldItalicFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext14RegularFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext14ItalicFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext14BoldFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext14BoldItalicFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext16RegularFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext16ItalicFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext16BoldFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext16BoldItalicFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext18RegularFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext18ItalicFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext18BoldFont;
|
||||
extern EpdFont atkinsonhyperlegiblenext18BoldItalicFont;
|
||||
extern EpdFont fernmicro12RegularFont;
|
||||
extern EpdFont fernmicro12ItalicFont;
|
||||
extern EpdFont fernmicro12BoldFont;
|
||||
@ -52,6 +85,10 @@ extern EpdFont fernmicro18BoldFont;
|
||||
extern EpdFont fernmicro18BoldItalicFont;
|
||||
|
||||
// Extern EpdFontFamily declarations for custom fonts
|
||||
extern EpdFontFamily atkinsonhyperlegiblenext12FontFamily;
|
||||
extern EpdFontFamily atkinsonhyperlegiblenext14FontFamily;
|
||||
extern EpdFontFamily atkinsonhyperlegiblenext16FontFamily;
|
||||
extern EpdFontFamily atkinsonhyperlegiblenext18FontFamily;
|
||||
extern EpdFontFamily fernmicro12FontFamily;
|
||||
extern EpdFontFamily fernmicro14FontFamily;
|
||||
extern EpdFontFamily fernmicro16FontFamily;
|
||||
|
||||
3517
lib/EpdFont/builtinFonts/opendyslexic_10_bold.h
Normal file
3517
lib/EpdFont/builtinFonts/opendyslexic_10_bold.h
Normal file
File diff suppressed because it is too large
Load Diff
4091
lib/EpdFont/builtinFonts/opendyslexic_10_bolditalic.h
Normal file
4091
lib/EpdFont/builtinFonts/opendyslexic_10_bolditalic.h
Normal file
File diff suppressed because it is too large
Load Diff
3655
lib/EpdFont/builtinFonts/opendyslexic_10_italic.h
Normal file
3655
lib/EpdFont/builtinFonts/opendyslexic_10_italic.h
Normal file
File diff suppressed because it is too large
Load Diff
3187
lib/EpdFont/builtinFonts/opendyslexic_10_regular.h
Normal file
3187
lib/EpdFont/builtinFonts/opendyslexic_10_regular.h
Normal file
File diff suppressed because it is too large
Load Diff
4684
lib/EpdFont/builtinFonts/opendyslexic_12_bold.h
Normal file
4684
lib/EpdFont/builtinFonts/opendyslexic_12_bold.h
Normal file
File diff suppressed because it is too large
Load Diff
5505
lib/EpdFont/builtinFonts/opendyslexic_12_bolditalic.h
Normal file
5505
lib/EpdFont/builtinFonts/opendyslexic_12_bolditalic.h
Normal file
File diff suppressed because it is too large
Load Diff
4777
lib/EpdFont/builtinFonts/opendyslexic_12_italic.h
Normal file
4777
lib/EpdFont/builtinFonts/opendyslexic_12_italic.h
Normal file
File diff suppressed because it is too large
Load Diff
4172
lib/EpdFont/builtinFonts/opendyslexic_12_regular.h
Normal file
4172
lib/EpdFont/builtinFonts/opendyslexic_12_regular.h
Normal file
File diff suppressed because it is too large
Load Diff
6048
lib/EpdFont/builtinFonts/opendyslexic_14_bold.h
Normal file
6048
lib/EpdFont/builtinFonts/opendyslexic_14_bold.h
Normal file
File diff suppressed because it is too large
Load Diff
7094
lib/EpdFont/builtinFonts/opendyslexic_14_bolditalic.h
Normal file
7094
lib/EpdFont/builtinFonts/opendyslexic_14_bolditalic.h
Normal file
File diff suppressed because it is too large
Load Diff
6143
lib/EpdFont/builtinFonts/opendyslexic_14_italic.h
Normal file
6143
lib/EpdFont/builtinFonts/opendyslexic_14_italic.h
Normal file
File diff suppressed because it is too large
Load Diff
5246
lib/EpdFont/builtinFonts/opendyslexic_14_regular.h
Normal file
5246
lib/EpdFont/builtinFonts/opendyslexic_14_regular.h
Normal file
File diff suppressed because it is too large
Load Diff
2590
lib/EpdFont/builtinFonts/opendyslexic_8_bold.h
Normal file
2590
lib/EpdFont/builtinFonts/opendyslexic_8_bold.h
Normal file
File diff suppressed because it is too large
Load Diff
2923
lib/EpdFont/builtinFonts/opendyslexic_8_bolditalic.h
Normal file
2923
lib/EpdFont/builtinFonts/opendyslexic_8_bolditalic.h
Normal file
File diff suppressed because it is too large
Load Diff
2690
lib/EpdFont/builtinFonts/opendyslexic_8_italic.h
Normal file
2690
lib/EpdFont/builtinFonts/opendyslexic_8_italic.h
Normal file
File diff suppressed because it is too large
Load Diff
2371
lib/EpdFont/builtinFonts/opendyslexic_8_regular.h
Normal file
2371
lib/EpdFont/builtinFonts/opendyslexic_8_regular.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -7,6 +7,22 @@
|
||||
#include "fontIds.h"
|
||||
|
||||
// EpdFont definitions for custom fonts
|
||||
EpdFont atkinsonhyperlegiblenext12RegularFont(&atkinsonhyperlegiblenext_12_regular);
|
||||
EpdFont atkinsonhyperlegiblenext12ItalicFont(&atkinsonhyperlegiblenext_12_italic);
|
||||
EpdFont atkinsonhyperlegiblenext12BoldFont(&atkinsonhyperlegiblenext_12_bold);
|
||||
EpdFont atkinsonhyperlegiblenext12BoldItalicFont(&atkinsonhyperlegiblenext_12_bolditalic);
|
||||
EpdFont atkinsonhyperlegiblenext14RegularFont(&atkinsonhyperlegiblenext_14_regular);
|
||||
EpdFont atkinsonhyperlegiblenext14ItalicFont(&atkinsonhyperlegiblenext_14_italic);
|
||||
EpdFont atkinsonhyperlegiblenext14BoldFont(&atkinsonhyperlegiblenext_14_bold);
|
||||
EpdFont atkinsonhyperlegiblenext14BoldItalicFont(&atkinsonhyperlegiblenext_14_bolditalic);
|
||||
EpdFont atkinsonhyperlegiblenext16RegularFont(&atkinsonhyperlegiblenext_16_regular);
|
||||
EpdFont atkinsonhyperlegiblenext16ItalicFont(&atkinsonhyperlegiblenext_16_italic);
|
||||
EpdFont atkinsonhyperlegiblenext16BoldFont(&atkinsonhyperlegiblenext_16_bold);
|
||||
EpdFont atkinsonhyperlegiblenext16BoldItalicFont(&atkinsonhyperlegiblenext_16_bolditalic);
|
||||
EpdFont atkinsonhyperlegiblenext18RegularFont(&atkinsonhyperlegiblenext_18_regular);
|
||||
EpdFont atkinsonhyperlegiblenext18ItalicFont(&atkinsonhyperlegiblenext_18_italic);
|
||||
EpdFont atkinsonhyperlegiblenext18BoldFont(&atkinsonhyperlegiblenext_18_bold);
|
||||
EpdFont atkinsonhyperlegiblenext18BoldItalicFont(&atkinsonhyperlegiblenext_18_bolditalic);
|
||||
EpdFont fernmicro12RegularFont(&fernmicro_12_regular);
|
||||
EpdFont fernmicro12ItalicFont(&fernmicro_12_italic);
|
||||
EpdFont fernmicro12BoldFont(&fernmicro_12_bold);
|
||||
@ -25,6 +41,10 @@ EpdFont fernmicro18BoldFont(&fernmicro_18_bold);
|
||||
EpdFont fernmicro18BoldItalicFont(&fernmicro_18_bolditalic);
|
||||
|
||||
// EpdFontFamily definitions for custom fonts
|
||||
EpdFontFamily atkinsonhyperlegiblenext12FontFamily(&atkinsonhyperlegiblenext12RegularFont, &atkinsonhyperlegiblenext12BoldFont, &atkinsonhyperlegiblenext12ItalicFont, &atkinsonhyperlegiblenext12BoldItalicFont);
|
||||
EpdFontFamily atkinsonhyperlegiblenext14FontFamily(&atkinsonhyperlegiblenext14RegularFont, &atkinsonhyperlegiblenext14BoldFont, &atkinsonhyperlegiblenext14ItalicFont, &atkinsonhyperlegiblenext14BoldItalicFont);
|
||||
EpdFontFamily atkinsonhyperlegiblenext16FontFamily(&atkinsonhyperlegiblenext16RegularFont, &atkinsonhyperlegiblenext16BoldFont, &atkinsonhyperlegiblenext16ItalicFont, &atkinsonhyperlegiblenext16BoldItalicFont);
|
||||
EpdFontFamily atkinsonhyperlegiblenext18FontFamily(&atkinsonhyperlegiblenext18RegularFont, &atkinsonhyperlegiblenext18BoldFont, &atkinsonhyperlegiblenext18ItalicFont, &atkinsonhyperlegiblenext18BoldItalicFont);
|
||||
EpdFontFamily fernmicro12FontFamily(&fernmicro12RegularFont, &fernmicro12BoldFont, &fernmicro12ItalicFont, &fernmicro12BoldItalicFont);
|
||||
EpdFontFamily fernmicro14FontFamily(&fernmicro14RegularFont, &fernmicro14BoldFont, &fernmicro14ItalicFont, &fernmicro14BoldItalicFont);
|
||||
EpdFontFamily fernmicro16FontFamily(&fernmicro16RegularFont, &fernmicro16BoldFont, &fernmicro16ItalicFont, &fernmicro16BoldItalicFont);
|
||||
@ -32,6 +52,10 @@ EpdFontFamily fernmicro18FontFamily(&fernmicro18RegularFont, &fernmicro18BoldFon
|
||||
|
||||
void registerCustomFonts(GfxRenderer& renderer) {
|
||||
#if CUSTOM_FONT_COUNT > 0
|
||||
renderer.insertFont(ATKINSONHYPERLEGIBLENEXT_12_FONT_ID, atkinsonhyperlegiblenext12FontFamily);
|
||||
renderer.insertFont(ATKINSONHYPERLEGIBLENEXT_14_FONT_ID, atkinsonhyperlegiblenext14FontFamily);
|
||||
renderer.insertFont(ATKINSONHYPERLEGIBLENEXT_16_FONT_ID, atkinsonhyperlegiblenext16FontFamily);
|
||||
renderer.insertFont(ATKINSONHYPERLEGIBLENEXT_18_FONT_ID, atkinsonhyperlegiblenext18FontFamily);
|
||||
renderer.insertFont(FERNMICRO_12_FONT_ID, fernmicro12FontFamily);
|
||||
renderer.insertFont(FERNMICRO_14_FONT_ID, fernmicro14FontFamily);
|
||||
renderer.insertFont(FERNMICRO_16_FONT_ID, fernmicro16FontFamily);
|
||||
|
||||
@ -9,11 +9,19 @@
|
||||
#define NOTOSANS_14_FONT_ID (-1014561631)
|
||||
#define NOTOSANS_16_FONT_ID (-1422711852)
|
||||
#define NOTOSANS_18_FONT_ID (1237754772)
|
||||
#define OPENDYSLEXIC_8_FONT_ID (1331369208)
|
||||
#define OPENDYSLEXIC_10_FONT_ID (-1374689004)
|
||||
#define OPENDYSLEXIC_12_FONT_ID (-795539541)
|
||||
#define OPENDYSLEXIC_14_FONT_ID (-1676627620)
|
||||
#define UI_10_FONT_ID (-1246724383)
|
||||
#define UI_12_FONT_ID (-359249323)
|
||||
#define SMALL_FONT_ID (1073217904)
|
||||
|
||||
// Custom font IDs
|
||||
#define ATKINSONHYPERLEGIBLENEXT_12_FONT_ID (420000884)
|
||||
#define ATKINSONHYPERLEGIBLENEXT_14_FONT_ID (549694336)
|
||||
#define ATKINSONHYPERLEGIBLENEXT_16_FONT_ID (-963532652)
|
||||
#define ATKINSONHYPERLEGIBLENEXT_18_FONT_ID (943776025)
|
||||
#define FERNMICRO_12_FONT_ID (-887081534)
|
||||
#define FERNMICRO_14_FONT_ID (1772642890)
|
||||
#define FERNMICRO_16_FONT_ID (1785643080)
|
||||
@ -22,5 +30,6 @@
|
||||
// Custom font ID lookup array: CUSTOM_FONT_IDS[fontIndex][sizeIndex]
|
||||
// Size indices: 0=12pt, 1=14pt, 2=16pt, 3=18pt
|
||||
static const int CUSTOM_FONT_IDS[][4] = {
|
||||
{ATKINSONHYPERLEGIBLENEXT_12_FONT_ID, ATKINSONHYPERLEGIBLENEXT_14_FONT_ID, ATKINSONHYPERLEGIBLENEXT_16_FONT_ID, ATKINSONHYPERLEGIBLENEXT_18_FONT_ID},
|
||||
{FERNMICRO_12_FONT_ID, FERNMICRO_14_FONT_ID, FERNMICRO_16_FONT_ID, FERNMICRO_18_FONT_ID},
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user