Garamond initial

lib/EpdFont/builtinFonts/all.h

@@ -33,22 +33,22 @@
 #include <builtinFonts/notosans_18_bolditalic.h>
 #include <builtinFonts/notosans_18_italic.h>
 #include <builtinFonts/notosans_18_regular.h>
-#include <builtinFonts/opendyslexic_10_bold.h>
-#include <builtinFonts/opendyslexic_10_bolditalic.h>
-#include <builtinFonts/opendyslexic_10_italic.h>
-#include <builtinFonts/opendyslexic_10_regular.h>
-#include <builtinFonts/opendyslexic_12_bold.h>
-#include <builtinFonts/opendyslexic_12_bolditalic.h>
-#include <builtinFonts/opendyslexic_12_italic.h>
-#include <builtinFonts/opendyslexic_12_regular.h>
-#include <builtinFonts/opendyslexic_14_bold.h>
-#include <builtinFonts/opendyslexic_14_bolditalic.h>
-#include <builtinFonts/opendyslexic_14_italic.h>
-#include <builtinFonts/opendyslexic_14_regular.h>
-#include <builtinFonts/opendyslexic_8_bold.h>
-#include <builtinFonts/opendyslexic_8_bolditalic.h>
-#include <builtinFonts/opendyslexic_8_italic.h>
-#include <builtinFonts/opendyslexic_8_regular.h>
+#include <builtinFonts/absinthe_16_bold.h>
+#include <builtinFonts/absinthe_16_bolditalic.h>
+#include <builtinFonts/absinthe_16_italic.h>
+#include <builtinFonts/absinthe_16_regular.h>
+#include <builtinFonts/absinthe_12_bold.h>
+#include <builtinFonts/absinthe_12_bolditalic.h>
+#include <builtinFonts/absinthe_12_italic.h>
+#include <builtinFonts/absinthe_12_regular.h>
+#include <builtinFonts/absinthe_14_bold.h>
+#include <builtinFonts/absinthe_14_bolditalic.h>
+#include <builtinFonts/absinthe_14_italic.h>
+#include <builtinFonts/absinthe_14_regular.h>
+#include <builtinFonts/absinthe_18_bold.h>
+#include <builtinFonts/absinthe_18_bolditalic.h>
+#include <builtinFonts/absinthe_18_italic.h>
+#include <builtinFonts/absinthe_18_regular.h>
 #include <builtinFonts/ubuntu_10_bold.h>
 #include <builtinFonts/ubuntu_10_regular.h>
 #include <builtinFonts/ubuntu_12_bold.h>

lib/EpdFont/scripts/build-font-ids.sh

@@ -80,39 +80,39 @@ ruby -rdigest -e 'puts [
 ].map{|f| Digest::SHA256.hexdigest(File.read(f)).to_i(16) }.sum % (2 ** 32) - (2 ** 31)'
 ))"
 
-echo "#define OPENDYSLEXIC_8_FONT_ID ($(
+echo "#define ABSINTHE_12_FONT_ID ($(
 ruby -rdigest -e 'puts [
-  "./opendyslexic_8_regular.h",
-  "./opendyslexic_8_bold.h",
-  "./opendyslexic_8_bolditalic.h",
-  "./opendyslexic_8_italic.h",
+  "./absinthe_12_regular.h",
+  "./absinthe_12_bold.h",
+  "./absinthe_12_bolditalic.h",
+  "./absinthe_12_italic.h",
 ].map{|f| Digest::SHA256.hexdigest(File.read(f)).to_i(16) }.sum % (2 ** 32) - (2 ** 31)'
 ))"
 
-echo "#define OPENDYSLEXIC_10_FONT_ID ($(
+echo "#define ABSINTHE_14_FONT_ID ($(
 ruby -rdigest -e 'puts [
-  "./opendyslexic_10_regular.h",
-  "./opendyslexic_10_bold.h",
-  "./opendyslexic_10_bolditalic.h",
-  "./opendyslexic_10_italic.h",
+  "./absinthe_14_regular.h",
+  "./absinthe_14_bold.h",
+  "./absinthe_14_bolditalic.h",
+  "./absinthe_14_italic.h",
 ].map{|f| Digest::SHA256.hexdigest(File.read(f)).to_i(16) }.sum % (2 ** 32) - (2 ** 31)'
 ))"
 
-echo "#define OPENDYSLEXIC_12_FONT_ID ($(
+echo "#define ABSINTHE_16_FONT_ID ($(
 ruby -rdigest -e 'puts [
-  "./opendyslexic_12_regular.h",
-  "./opendyslexic_12_bold.h",
-  "./opendyslexic_12_bolditalic.h",
-  "./opendyslexic_12_italic.h",
+  "./absinthe_16_regular.h",
+  "./absinthe_16_bold.h",
+  "./absinthe_16_bolditalic.h",
+  "./absinthe_16_italic.h",
 ].map{|f| Digest::SHA256.hexdigest(File.read(f)).to_i(16) }.sum % (2 ** 32) - (2 ** 31)'
 ))"
 
-echo "#define OPENDYSLEXIC_14_FONT_ID ($(
+echo "#define ABSINTHE_18_FONT_ID ($(
 ruby -rdigest -e 'puts [
-  "./opendyslexic_14_regular.h",
-  "./opendyslexic_14_bold.h",
-  "./opendyslexic_14_bolditalic.h",
-  "./opendyslexic_14_italic.h",
+  "./absinthe_18_regular.h",
+  "./absinthe_18_bold.h",
+  "./absinthe_18_bolditalic.h",
+  "./absinthe_18_italic.h",
 ].map{|f| Digest::SHA256.hexdigest(File.read(f)).to_i(16) }.sum % (2 ** 32) - (2 ** 31)'
 ))"
 

lib/EpdFont/scripts/convert-builtin-fonts.sh

@@ -7,7 +7,7 @@ cd "$(dirname "$0")"
 READER_FONT_STYLES=("Regular" "Italic" "Bold" "BoldItalic")
 BOOKERLY_FONT_SIZES=(12 14 16 18)
 NOTOSANS_FONT_SIZES=(12 14 16 18)
-OPENDYSLEXIC_FONT_SIZES=(8 10 12 14)
+ABSINTHE_FONT_SIZES=(12 14 16 18)
 
 for size in ${BOOKERLY_FONT_SIZES[@]}; do
   for style in ${READER_FONT_STYLES[@]}; do
@@ -29,10 +29,10 @@ for size in ${NOTOSANS_FONT_SIZES[@]}; do
   done
 done
 
-for size in ${OPENDYSLEXIC_FONT_SIZES[@]}; do
+for size in ${ABSINTHE_FONT_SIZES[@]}; do
   for style in ${READER_FONT_STYLES[@]}; do
-    font_name="opendyslexic_${size}_$(echo $style | tr '[:upper:]' '[:lower:]')"
-    font_path="../builtinFonts/source/OpenDyslexic/OpenDyslexic-${style}.otf"
+    font_name="absinthe_${size}_$(echo $style | tr '[:upper:]' '[:lower:]')"
+    font_path="../builtinFonts/source/Absinthe/Absinthe-${style}.ttf"
     output_path="../builtinFonts/${font_name}.h"
     python fontconvert.py $font_name $size $font_path --2bit > $output_path
     echo "Generated $output_path"

src/CrossPointSettings.cpp

@@ -140,15 +140,15 @@ float CrossPointSettings::getReaderLineCompression() const {
         case WIDE:
           return 1.0f;
       }
-    case OPENDYSLEXIC:
+    case ABSINTHE:
       switch (lineSpacing) {
         case TIGHT:
-          return 0.90f;
+          return 1.0f;
         case NORMAL:
         default:
-          return 0.95f;
+          return 1.1f;
         case WIDE:
-          return 1.0f;
+          return 1.2f;
       }
   }
 }
@@ -212,17 +212,17 @@ int CrossPointSettings::getReaderFontId() const {
         case EXTRA_LARGE:
           return NOTOSANS_18_FONT_ID;
       }
-    case OPENDYSLEXIC:
+    case ABSINTHE:
       switch (fontSize) {
         case SMALL:
-          return OPENDYSLEXIC_8_FONT_ID;
+          return ABSINTHE_12_FONT_ID;
         case MEDIUM:
         default:
-          return OPENDYSLEXIC_10_FONT_ID;
+          return ABSINTHE_14_FONT_ID;
         case LARGE:
-          return OPENDYSLEXIC_12_FONT_ID;
+          return ABSINTHE_16_FONT_ID;
         case EXTRA_LARGE:
-          return OPENDYSLEXIC_14_FONT_ID;
+          return ABSINTHE_18_FONT_ID;
       }
   }
 }

src/CrossPointSettings.h

@@ -40,7 +40,7 @@ class CrossPointSettings {
   enum SIDE_BUTTON_LAYOUT { PREV_NEXT = 0, NEXT_PREV = 1 };
 
   // Font family options
-  enum FONT_FAMILY { BOOKERLY = 0, NOTOSANS = 1, OPENDYSLEXIC = 2 };
+  enum FONT_FAMILY { BOOKERLY = 0, NOTOSANS = 1, ABSINTHE = 2 };
   // Font size options
   enum FONT_SIZE { SMALL = 0, MEDIUM = 1, LARGE = 2, EXTRA_LARGE = 3 };
   enum LINE_COMPRESSION { TIGHT = 0, NORMAL = 1, WIDE = 2 };

src/activities/settings/SettingsActivity.cpp

@@ -29,7 +29,7 @@ const SettingInfo settingsList[settingsCount] = {
     SettingInfo::Enum("Disp. des bout. droite", &CrossPointSettings::sideButtonLayout,
                       {"Prcdent, Prochne", "Prochne, Prcdent"}),
     SettingInfo::Enum("Police", &CrossPointSettings::fontFamily,
-                      {"Bookerly", "Noto Sans", "Open Dyslexic"}),
+                      {"Bookerly", "Noto Sans", "Absinthe"}),
     SettingInfo::Enum("Taille de police", &CrossPointSettings::fontSize, {"Petit", "Medium", "Large", "Très Large"}),
     SettingInfo::Enum("Espacement des lignes", &CrossPointSettings::lineSpacing, {"Fin", "Normal", "Large"}),
     SettingInfo::Value("Marge d'écran", &CrossPointSettings::screenMargin, {5, 40, 5}),

src/fontIds.h

@@ -5,14 +5,14 @@
 #define BOOKERLY_14_FONT_ID (104246423)
 #define BOOKERLY_16_FONT_ID (1909382491)
 #define BOOKERLY_18_FONT_ID (2056549737)
-#define NOTOSANS_12_FONT_ID (-1646794343)
-#define NOTOSANS_14_FONT_ID (-890242897)
-#define NOTOSANS_16_FONT_ID (241925189)
-#define NOTOSANS_18_FONT_ID (1503221336)
-#define OPENDYSLEXIC_8_FONT_ID (875216341)
-#define OPENDYSLEXIC_10_FONT_ID (-1234231183)
-#define OPENDYSLEXIC_12_FONT_ID (1682200414)
-#define OPENDYSLEXIC_14_FONT_ID (-1851285286)
+#define NOTOSANS_12_FONT_ID (1506593721)
+#define NOTOSANS_14_FONT_ID (-1701127890)
+#define NOTOSANS_16_FONT_ID (-820144870)
+#define NOTOSANS_18_FONT_ID (1497203550)
+#define ABSINTHE_12_FONT_ID (-7161170)
+#define ABSINTHE_14_FONT_ID (832200121)
+#define ABSINTHE_16_FONT_ID (1019705264)
+#define ABSINTHE_18_FONT_ID (1741564762)
 #define UI_10_FONT_ID (-823541435)
 #define UI_12_FONT_ID (-126318184)
-#define SMALL_FONT_ID (-874196069)
+#define SMALL_FONT_ID (-139281519)

src/main.cpp

@@ -93,30 +93,30 @@ EpdFont notosans18BoldItalicFont(&notosans_18_bolditalic);
 EpdFontFamily notosans18FontFamily(&notosans18RegularFont, &notosans18BoldFont, &notosans18ItalicFont,
                                    &notosans18BoldItalicFont);
 
-EpdFont opendyslexic8RegularFont(&opendyslexic_8_regular);
-EpdFont opendyslexic8BoldFont(&opendyslexic_8_bold);
-EpdFont opendyslexic8ItalicFont(&opendyslexic_8_italic);
-EpdFont opendyslexic8BoldItalicFont(&opendyslexic_8_bolditalic);
-EpdFontFamily opendyslexic8FontFamily(&opendyslexic8RegularFont, &opendyslexic8BoldFont, &opendyslexic8ItalicFont,
-                                      &opendyslexic8BoldItalicFont);
-EpdFont opendyslexic10RegularFont(&opendyslexic_10_regular);
-EpdFont opendyslexic10BoldFont(&opendyslexic_10_bold);
-EpdFont opendyslexic10ItalicFont(&opendyslexic_10_italic);
-EpdFont opendyslexic10BoldItalicFont(&opendyslexic_10_bolditalic);
-EpdFontFamily opendyslexic10FontFamily(&opendyslexic10RegularFont, &opendyslexic10BoldFont, &opendyslexic10ItalicFont,
-                                       &opendyslexic10BoldItalicFont);
-EpdFont opendyslexic12RegularFont(&opendyslexic_12_regular);
-EpdFont opendyslexic12BoldFont(&opendyslexic_12_bold);
-EpdFont opendyslexic12ItalicFont(&opendyslexic_12_italic);
-EpdFont opendyslexic12BoldItalicFont(&opendyslexic_12_bolditalic);
-EpdFontFamily opendyslexic12FontFamily(&opendyslexic12RegularFont, &opendyslexic12BoldFont, &opendyslexic12ItalicFont,
-                                       &opendyslexic12BoldItalicFont);
-EpdFont opendyslexic14RegularFont(&opendyslexic_14_regular);
-EpdFont opendyslexic14BoldFont(&opendyslexic_14_bold);
-EpdFont opendyslexic14ItalicFont(&opendyslexic_14_italic);
-EpdFont opendyslexic14BoldItalicFont(&opendyslexic_14_bolditalic);
-EpdFontFamily opendyslexic14FontFamily(&opendyslexic14RegularFont, &opendyslexic14BoldFont, &opendyslexic14ItalicFont,
-                                       &opendyslexic14BoldItalicFont);
+EpdFont absinthe18RegularFont(&absinthe_18_regular);
+EpdFont absinthe18BoldFont(&absinthe_18_bold);
+EpdFont absinthe18ItalicFont(&absinthe_18_italic);
+EpdFont absinthe18BoldItalicFont(&absinthe_18_bolditalic);
+EpdFontFamily absinthe18FontFamily(&absinthe18RegularFont, &absinthe18BoldFont, &absinthe18ItalicFont,
+                                      &absinthe18BoldItalicFont);
+EpdFont absinthe16RegularFont(&absinthe_16_regular);
+EpdFont absinthe16BoldFont(&absinthe_16_bold);
+EpdFont absinthe16ItalicFont(&absinthe_16_italic);
+EpdFont absinthe16BoldItalicFont(&absinthe_16_bolditalic);
+EpdFontFamily absinthe16FontFamily(&absinthe16RegularFont, &absinthe16BoldFont, &absinthe16ItalicFont,
+                                       &absinthe16BoldItalicFont);
+EpdFont absinthe12RegularFont(&absinthe_12_regular);
+EpdFont absinthe12BoldFont(&absinthe_12_bold);
+EpdFont absinthe12ItalicFont(&absinthe_12_italic);
+EpdFont absinthe12BoldItalicFont(&absinthe_12_bolditalic);
+EpdFontFamily absinthe12FontFamily(&absinthe12RegularFont, &absinthe12BoldFont, &absinthe12ItalicFont,
+                                       &absinthe12BoldItalicFont);
+EpdFont absinthe14RegularFont(&absinthe_14_regular);
+EpdFont absinthe14BoldFont(&absinthe_14_bold);
+EpdFont absinthe14ItalicFont(&absinthe_14_italic);
+EpdFont absinthe14BoldItalicFont(&absinthe_14_bolditalic);
+EpdFontFamily absinthe14FontFamily(&absinthe14RegularFont, &absinthe14BoldFont, &absinthe14ItalicFont,
+                                       &absinthe14BoldItalicFont);
 
 EpdFont smallFont(&notosans_8_regular);
 EpdFontFamily smallFontFamily(&smallFont);
@@ -247,10 +247,10 @@ void setupDisplayAndFonts() {
   renderer.insertFont(NOTOSANS_14_FONT_ID, notosans14FontFamily);
   renderer.insertFont(NOTOSANS_16_FONT_ID, notosans16FontFamily);
   renderer.insertFont(NOTOSANS_18_FONT_ID, notosans18FontFamily);
-  renderer.insertFont(OPENDYSLEXIC_8_FONT_ID, opendyslexic8FontFamily);
-  renderer.insertFont(OPENDYSLEXIC_10_FONT_ID, opendyslexic10FontFamily);
-  renderer.insertFont(OPENDYSLEXIC_12_FONT_ID, opendyslexic12FontFamily);
-  renderer.insertFont(OPENDYSLEXIC_14_FONT_ID, opendyslexic14FontFamily);
+  renderer.insertFont(ABSINTHE_18_FONT_ID, absinthe18FontFamily);
+  renderer.insertFont(ABSINTHE_16_FONT_ID, absinthe16FontFamily);
+  renderer.insertFont(ABSINTHE_12_FONT_ID, absinthe12FontFamily);
+  renderer.insertFont(ABSINTHE_14_FONT_ID, absinthe14FontFamily);
   renderer.insertFont(UI_10_FONT_ID, ui10FontFamily);
   renderer.insertFont(UI_12_FONT_ID, ui12FontFamily);
   renderer.insertFont(SMALL_FONT_ID, smallFontFamily);