only use the publisher's font or atkinson hyperlegible next

diff --git a/README.md b/README.md
index 3cc41c0aac5e2921e1e1119456c44616e70365d3..aa39ebdd990e3fbe8f9185daf5f7e52a6dc20564 100644 (file)
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ The app requests no network or shared-storage permission. It imports each select
 - Bookmarks
 - Text selection, highlights, notes, annotation editing, and annotation export
 - System dictionary and text-processing integration
-- Typeface, text size, line height, margin, alignment, publisher-style, and hyphenation controls
+- Publisher or Atkinson Hyperlegible Next typeface, plus text size, line height, margin, alignment, publisher-style, and hyphenation controls
 - One high-contrast e-ink appearance with colors aligned to the display's 16 grayscale levels, plus contrast and screen-brightness controls
 - Fixed-page fit-to-page, fit-to-width page streams with line-preserving cuts, and 50–400% custom zoom and bounded pan
 - Shared or separate even/odd crop margins with a visual crop editor

diff --git a/app/src/main/assets/fonts/LibertinusSerif-Bold.otf b/app/src/main/assets/fonts/LibertinusSerif-Bold.otf
deleted file mode 100644 (file)
index 39a8ee5..0000000
Binary files a/app/src/main/assets/fonts/LibertinusSerif-Bold.otf and /dev/null differ

diff --git a/app/src/main/assets/fonts/LibertinusSerif-BoldItalic.otf b/app/src/main/assets/fonts/LibertinusSerif-BoldItalic.otf
deleted file mode 100644 (file)
index d63f36e..0000000
Binary files a/app/src/main/assets/fonts/LibertinusSerif-BoldItalic.otf and /dev/null differ

diff --git a/app/src/main/assets/fonts/LibertinusSerif-Italic.otf b/app/src/main/assets/fonts/LibertinusSerif-Italic.otf
deleted file mode 100644 (file)
index ddf1996..0000000
Binary files a/app/src/main/assets/fonts/LibertinusSerif-Italic.otf and /dev/null differ

diff --git a/app/src/main/assets/fonts/LibertinusSerif-Regular.otf b/app/src/main/assets/fonts/LibertinusSerif-Regular.otf
deleted file mode 100644 (file)
index e42f25c..0000000
Binary files a/app/src/main/assets/fonts/LibertinusSerif-Regular.otf and /dev/null differ

diff --git a/app/src/main/assets/fonts/NotoSans-Bold.ttf b/app/src/main/assets/fonts/NotoSans-Bold.ttf
deleted file mode 100644 (file)
index 1db7886..0000000
Binary files a/app/src/main/assets/fonts/NotoSans-Bold.ttf and /dev/null differ

diff --git a/app/src/main/assets/fonts/NotoSans-Regular.ttf b/app/src/main/assets/fonts/NotoSans-Regular.ttf
deleted file mode 100644 (file)
index 0a01a06..0000000
Binary files a/app/src/main/assets/fonts/NotoSans-Regular.ttf and /dev/null differ

diff --git a/app/src/main/assets/fonts/SourceCode-Regular.otf b/app/src/main/assets/fonts/SourceCode-Regular.otf
deleted file mode 100644 (file)
index 3004698..0000000
Binary files a/app/src/main/assets/fonts/SourceCode-Regular.otf and /dev/null differ

diff --git a/app/src/main/java/com/alexandria/reader/EpubParser.kt b/app/src/main/java/com/alexandria/reader/EpubParser.kt
index b9023726eddd52c4cb41a3c5f877c19a7a79eaeb..a803a71e001ab498b6d7623ffe6b8ef3bdbb887b 100644 (file)
--- a/app/src/main/java/com/alexandria/reader/EpubParser.kt
+++ b/app/src/main/java/com/alexandria/reader/EpubParser.kt
@@ -586,17 +586,23 @@ object EpubHtmlBuilder {
 $publisherCss
 </style>
 <style id="alex-reader-styles">
-@font-face { font-family:'Alexandria Serif'; src:url('file:///android_asset/fonts/LibertinusSerif-Regular.otf'); font-style:normal; font-weight:400; }
-@font-face { font-family:'Alexandria Serif'; src:url('file:///android_asset/fonts/LibertinusSerif-Bold.otf'); font-style:normal; font-weight:700; }
-@font-face { font-family:'Alexandria Serif'; src:url('file:///android_asset/fonts/LibertinusSerif-Italic.otf'); font-style:italic; font-weight:400; }
-@font-face { font-family:'Alexandria Serif'; src:url('file:///android_asset/fonts/LibertinusSerif-BoldItalic.otf'); font-style:italic; font-weight:700; }
-@font-face { font-family:'Alexandria Sans'; src:url('file:///android_asset/fonts/NotoSans-Regular.ttf'); font-style:normal; font-weight:400; }
-@font-face { font-family:'Alexandria Sans'; src:url('file:///android_asset/fonts/NotoSans-Bold.ttf'); font-style:normal; font-weight:700; }
-@font-face { font-family:'Atkinson Hyperlegible'; src:url('file:///android_asset/fonts/Atkinson.otf'); }
-@font-face { font-family:'Alexandria Mono'; src:url('file:///android_asset/fonts/SourceCode-Regular.otf'); }
-:root { --alex-side:32px; --alex-v:22px; --alex-font-size:20px; --alex-line-height:1.32; --alex-font:'Alexandria Serif'; --alex-paper:#fff; --alex-ink:#000; --alex-link:#111; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_extra_light.otf') format('opentype'); font-style:normal; font-weight:200; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_extra_light_italic.otf') format('opentype'); font-style:italic; font-weight:200; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_light.otf') format('opentype'); font-style:normal; font-weight:300; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_light_italic.otf') format('opentype'); font-style:italic; font-weight:300; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_regular.otf') format('opentype'); font-style:normal; font-weight:400; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_regular_italic.otf') format('opentype'); font-style:italic; font-weight:400; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_medium.otf') format('opentype'); font-style:normal; font-weight:500; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_medium_italic.otf') format('opentype'); font-style:italic; font-weight:500; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_semi_bold.otf') format('opentype'); font-style:normal; font-weight:600; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_semi_bold_italic.otf') format('opentype'); font-style:italic; font-weight:600; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_bold.otf') format('opentype'); font-style:normal; font-weight:700; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_bold_italic.otf') format('opentype'); font-style:italic; font-weight:700; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_extra_bold.otf') format('opentype'); font-style:normal; font-weight:800; }
+@font-face { font-family:'Atkinson Hyperlegible Next'; src:url('file:///android_res/font/atkinson_hyperlegible_next_extra_bold_italic.otf') format('opentype'); font-style:italic; font-weight:800; }
+:root { --alex-side:32px; --alex-v:22px; --alex-font-size:20px; --alex-line-height:1.32; --alex-font:'Atkinson Hyperlegible Next'; --alex-paper:#fff; --alex-ink:#000; --alex-link:#111; }
 html { margin:0 !important; padding:0 !important; width:100%; height:100%; overflow:hidden; background:var(--alex-paper); color:var(--alex-ink); }
-body { margin:0 !important; width:100%; color:var(--alex-ink); background:var(--alex-paper); font-family:var(--alex-font), serif; font-size:var(--alex-font-size); line-height:var(--alex-line-height); text-rendering:optimizeLegibility; -webkit-font-smoothing:antialiased; }
+body { margin:0 !important; width:100%; color:var(--alex-ink); background:var(--alex-paper); font-size:var(--alex-font-size); line-height:var(--alex-line-height); text-rendering:optimizeLegibility; -webkit-font-smoothing:antialiased; }
 body.alex-paged { box-sizing:border-box; height:100vh; padding:var(--alex-v) var(--alex-side) !important; column-width:calc(100vw - (2 * var(--alex-side))); column-gap:calc(2 * var(--alex-side)); column-fill:auto; overflow:visible !important; }
 body.alex-continuous { box-sizing:border-box; min-height:100%; height:auto; padding:var(--alex-v) var(--alex-side) !important; overflow:visible !important; }
 html.alex-continuous { overflow-x:hidden; overflow-y:auto; }
@@ -615,11 +621,11 @@ body.alex-fixed .alex-chapter > svg:only-child { display:block; width:100%; heig
 body.alex-paged .x-ebookmaker-cover { height:calc(100vh - (2 * var(--alex-v))) !important; max-height:calc(100vh - (2 * var(--alex-v))) !important; overflow:hidden; }
 svg[height="100%"], .x-ebookmaker-cover svg { display:block; height:calc(100vh - (2 * var(--alex-v))) !important; max-height:calc(100vh - (2 * var(--alex-v))) !important; }
 table { max-width:100%; border-collapse:collapse; }
-pre, code { font-family:'Alexandria Mono', monospace; white-space:pre-wrap; overflow-wrap:anywhere; }
+pre, code { white-space:pre-wrap; overflow-wrap:anywhere; }
 a { color:var(--alex-link); text-decoration:underline; }
 body.alex-hyphenate { -webkit-hyphens:auto; hyphens:auto; }
 body.alex-no-hyphenate { -webkit-hyphens:none !important; hyphens:none !important; }
-body.alex-font-override, body.alex-font-override p, body.alex-font-override div, body.alex-font-override h1, body.alex-font-override h2, body.alex-font-override h3, body.alex-font-override h4, body.alex-font-override h5, body.alex-font-override h6 { font-family:var(--alex-font), serif !important; }
+body.alex-font-override, body.alex-font-override p, body.alex-font-override div, body.alex-font-override h1, body.alex-font-override h2, body.alex-font-override h3, body.alex-font-override h4, body.alex-font-override h5, body.alex-font-override h6 { font-family:var(--alex-font), sans-serif !important; }
 body.alex-align-left .alex-chapter, body.alex-align-left p { text-align:left !important; }
 body.alex-align-right .alex-chapter, body.alex-align-right p { text-align:right !important; }
 body.alex-align-center .alex-chapter, body.alex-align-center p { text-align:center !important; }
@@ -737,7 +743,7 @@ ${if (publication.fixedLayout) fixedReaderScript() else readerScript()}
   function applySettings(settings, keep) {
     state.settings = settings || {};
     var root = document.documentElement, body = document.body;
-    var family = settings.fontFamily || 'Alexandria Serif';
+    var family = settings.fontFamily || 'Atkinson Hyperlegible Next';
     root.style.setProperty('--alex-font', "'" + family.replace(/'/g, '') + "'");
     root.style.setProperty('--alex-font-size', Math.max(12, Math.min(38, settings.fontSize || 20)) + 'px');
     root.style.setProperty('--alex-line-height', Math.max(1, Math.min(2, settings.lineHeight || 1.32)));

diff --git a/app/src/main/java/com/alexandria/reader/Models.kt b/app/src/main/java/com/alexandria/reader/Models.kt
index eb97ee53245392aaef466efc8fdc5f1e9d3d5cc6..17936c394f6f3bc2d829c1b68338b0ee2cd2c9c9 100644 (file)
--- a/app/src/main/java/com/alexandria/reader/Models.kt
+++ b/app/src/main/java/com/alexandria/reader/Models.kt
@@ -142,7 +142,7 @@ data class CropMargins(
 }
 
 data class ReaderSettings(
-    val fontFamily: String = "Alexandria Serif",
+    val fontFamily: String = ATKINSON_HYPERLEGIBLE_NEXT,
     val fontSize: Int = 20,
     val lineHeight: Float = 1.32f,
     val margin: Int = 32,
@@ -187,8 +187,15 @@ data class ReaderSettings(
     }
 
     companion object {
+        const val PUBLISHER = "Publisher"
+        const val ATKINSON_HYPERLEGIBLE_NEXT = "Atkinson Hyperlegible Next"
+        val FONT_FAMILIES = listOf(PUBLISHER, ATKINSON_HYPERLEGIBLE_NEXT)
+
         fun fromJson(value: JSONObject): ReaderSettings = ReaderSettings(
-            fontFamily = value.optString("fontFamily", "Alexandria Serif"),
+            fontFamily = when (value.optString("fontFamily", ATKINSON_HYPERLEGIBLE_NEXT)) {
+                PUBLISHER -> PUBLISHER
+                else -> ATKINSON_HYPERLEGIBLE_NEXT
+            },
             fontSize = value.optInt("fontSize", 20).coerceIn(12, 38),
             lineHeight = value.optDouble("lineHeight", 1.32).toFloat().coerceIn(1f, 2f),
             margin = value.optInt("margin", 32).coerceIn(0, 96),

diff --git a/app/src/main/java/com/alexandria/reader/ReaderScreen.kt b/app/src/main/java/com/alexandria/reader/ReaderScreen.kt
index cf81da34a3f5771c2d48a3fa325639f3e1864968..706934cd097ce9e96e4c9a0ffcb583631d289ab3 100644 (file)
--- a/app/src/main/java/com/alexandria/reader/ReaderScreen.kt
+++ b/app/src/main/java/com/alexandria/reader/ReaderScreen.kt
@@ -638,8 +638,8 @@ class ReaderScreen(
                 })
             })
         }
-        val families = listOf("Publisher", "Alexandria Serif", "Alexandria Sans", "Atkinson Hyperlegible", "Alexandria Mono")
-        spinner("Typeface", families, families.indexOf(settings.fontFamily).coerceAtLeast(1)) { updateSettings(settings.copy(fontFamily = families[it])) }
+        val families = ReaderSettings.FONT_FAMILIES
+        spinner("Typeface", families, families.indexOf(settings.fontFamily).coerceAtLeast(0)) { updateSettings(settings.copy(fontFamily = families[it])) }
         slider("Text size", 26, settings.fontSize - 12, { "${it + 12} sp" }) { updateSettings(settings.copy(fontSize = it + 12)) }
         slider("Line height", 10, ((settings.lineHeight - 1f) * 10).roundToInt(), { String.format(java.util.Locale.getDefault(), "%.1f", 1f + it / 10f) }) {
             updateSettings(settings.copy(lineHeight = 1f + it / 10f))

diff --git a/app/src/main/java/com/alexandria/reader/ReaderWebView.kt b/app/src/main/java/com/alexandria/reader/ReaderWebView.kt
index 26ed88c917585203b8c6fb33d9b4dd65d5ec4f57..018cd3ea8236455e2b788c10ae07be8e2ad65217 100644 (file)
--- a/app/src/main/java/com/alexandria/reader/ReaderWebView.kt
+++ b/app/src/main/java/com/alexandria/reader/ReaderWebView.kt
@@ -138,6 +138,7 @@ class ReaderWebView(context: Context) : WebView(context) {
             builtInZoomControls = false
             displayZoomControls = false
             setSupportZoom(false)
+            standardFontFamily = "serif"
             defaultTextEncodingName = "utf-8"
             mediaPlaybackRequiresUserGesture = true
             mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW

diff --git a/app/src/main/res/font/atkinson.otf b/app/src/main/res/font/atkinson.otf
deleted file mode 100644 (file)
index ba345b5..0000000
Binary files a/app/src/main/res/font/atkinson.otf and /dev/null differ

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next.xml b/app/src/main/res/font/atkinson_hyperlegible_next.xml
new file mode 100644 (file)
index 0000000..ebda0c5
--- /dev/null
+++ b/app/src/main/res/font/atkinson_hyperlegible_next.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Native UI and reader WebView share these resources; do not duplicate them under assets. -->
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font android:font="@font/atkinson_hyperlegible_next_extra_light" android:fontStyle="normal" android:fontWeight="200"/>
+    <font android:font="@font/atkinson_hyperlegible_next_extra_light_italic" android:fontStyle="italic" android:fontWeight="200"/>
+    <font android:font="@font/atkinson_hyperlegible_next_light" android:fontStyle="normal" android:fontWeight="300"/>
+    <font android:font="@font/atkinson_hyperlegible_next_light_italic" android:fontStyle="italic" android:fontWeight="300"/>
+    <font android:font="@font/atkinson_hyperlegible_next_regular" android:fontStyle="normal" android:fontWeight="400"/>
+    <font android:font="@font/atkinson_hyperlegible_next_regular_italic" android:fontStyle="italic" android:fontWeight="400"/>
+    <font android:font="@font/atkinson_hyperlegible_next_medium" android:fontStyle="normal" android:fontWeight="500"/>
+    <font android:font="@font/atkinson_hyperlegible_next_medium_italic" android:fontStyle="italic" android:fontWeight="500"/>
+    <font android:font="@font/atkinson_hyperlegible_next_semi_bold" android:fontStyle="normal" android:fontWeight="600"/>
+    <font android:font="@font/atkinson_hyperlegible_next_semi_bold_italic" android:fontStyle="italic" android:fontWeight="600"/>
+    <font android:font="@font/atkinson_hyperlegible_next_bold" android:fontStyle="normal" android:fontWeight="700"/>
+    <font android:font="@font/atkinson_hyperlegible_next_bold_italic" android:fontStyle="italic" android:fontWeight="700"/>
+    <font android:font="@font/atkinson_hyperlegible_next_extra_bold" android:fontStyle="normal" android:fontWeight="800"/>
+    <font android:font="@font/atkinson_hyperlegible_next_extra_bold_italic" android:fontStyle="italic" android:fontWeight="800"/>
+</font-family>

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_bold.otf b/app/src/main/res/font/atkinson_hyperlegible_next_bold.otf
new file mode 100644 (file)
index 0000000..2d10468
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_bold.otf differ

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_bold_italic.otf b/app/src/main/res/font/atkinson_hyperlegible_next_bold_italic.otf
new file mode 100644 (file)
index 0000000..6de50d5
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_bold_italic.otf differ

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_extra_bold.otf b/app/src/main/res/font/atkinson_hyperlegible_next_extra_bold.otf
new file mode 100644 (file)
index 0000000..87caabd
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_extra_bold.otf differ

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_extra_bold_italic.otf b/app/src/main/res/font/atkinson_hyperlegible_next_extra_bold_italic.otf
new file mode 100644 (file)
index 0000000..9aab257
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_extra_bold_italic.otf differ

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_extra_light.otf b/app/src/main/res/font/atkinson_hyperlegible_next_extra_light.otf
new file mode 100644 (file)
index 0000000..f7ea93a
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_extra_light.otf differ

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_extra_light_italic.otf b/app/src/main/res/font/atkinson_hyperlegible_next_extra_light_italic.otf
new file mode 100644 (file)
index 0000000..5f390d9
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_extra_light_italic.otf differ

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_light.otf b/app/src/main/res/font/atkinson_hyperlegible_next_light.otf
new file mode 100644 (file)
index 0000000..3da55e9
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_light.otf differ

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_light_italic.otf b/app/src/main/res/font/atkinson_hyperlegible_next_light_italic.otf
new file mode 100644 (file)
index 0000000..9e38842
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_light_italic.otf differ

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_medium.otf b/app/src/main/res/font/atkinson_hyperlegible_next_medium.otf
new file mode 100644 (file)
index 0000000..83b808d
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_medium.otf differ

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_medium_italic.otf b/app/src/main/res/font/atkinson_hyperlegible_next_medium_italic.otf
new file mode 100644 (file)
index 0000000..48153e3
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_medium_italic.otf differ

diff --git a/app/src/main/assets/fonts/Atkinson.otf b/app/src/main/res/font/atkinson_hyperlegible_next_regular.otf
similarity index 100%
rename from app/src/main/assets/fonts/Atkinson.otf
rename to app/src/main/res/font/atkinson_hyperlegible_next_regular.otf

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_regular_italic.otf b/app/src/main/res/font/atkinson_hyperlegible_next_regular_italic.otf
new file mode 100644 (file)
index 0000000..49c0897
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_regular_italic.otf differ

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_semi_bold.otf b/app/src/main/res/font/atkinson_hyperlegible_next_semi_bold.otf
new file mode 100644 (file)
index 0000000..33c5b11
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_semi_bold.otf differ

diff --git a/app/src/main/res/font/atkinson_hyperlegible_next_semi_bold_italic.otf b/app/src/main/res/font/atkinson_hyperlegible_next_semi_bold_italic.otf
new file mode 100644 (file)
index 0000000..ea86fdd
Binary files /dev/null and b/app/src/main/res/font/atkinson_hyperlegible_next_semi_bold_italic.otf differ

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8c61d033fc08979f814a704876ad49b181762498..6efac44fe37a55017a2d367ad5c3dc59940a2c27 100644 (file)
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
     <style name="EInkTheme" parent="android:style/Theme.Material.Light.NoActionBar">
-        <item name="android:fontFamily">@font/atkinson</item>
+        <item name="android:fontFamily">@font/atkinson_hyperlegible_next</item>
         <item name="android:colorAccent">@color/eink_gray_02</item>
         <item name="android:colorControlNormal">@color/eink_gray_01</item>
         <item name="android:colorControlActivated">@color/eink_gray_00</item>