UAT round: hymnal bar, read gates, plan chip + pause, viz grouping, portrait weave map (v0.49.0)

BIBLIOGRAPHY.md

@@ -94,4 +94,8 @@ what promotes it out of the queue into the library.
 
 Scripture renders in **EB Garamond** (SIL Open Font License), bundled with the
 web shell under `apps/web/public/fonts/`; the Compose shell asks for the same
-family from `assets/fonts/` and falls back to the platform serif.
+family from `assets/fonts/` and falls back to the platform serif. The picker
+offers four more faces, all bundled the same way and all OFL: **Literata**
+(Type Together, for Google Fonts), **Inter** (Rasmus Andersson), **Fira Code**
+(Nikita Prokopov et al.), and **Atkinson Hyperlegible** (Braille Institute of
+America — the low-vision face).

Cargo.toml

@@ -21,7 +21,7 @@ default-members = [
 # shells — About renders it as `engine ` + this number. The workflow refuses a tag
 # whose version disagrees with this line (and with apps/web/package.json), so a
 # release ships one number, not three.
-version = "0.48.0"
+version = "0.49.0"
 edition = "2021"
 license = "MIT"
 authors = ["Glendon Klassen <gjklassen@proton.me>"]

README.md

@@ -38,6 +38,11 @@ canon](assets/readme/reader-weaves.png)
 - German language support
 - Canon strip "minimap" under the reader to show where you're at in the Bible
 
+![Acts 7 and Genesis 15 side by side in a deep indigo theme, weave connectors
+between the quoted passages, and the weave's own note with its cited verses
+in the study panel — the same reader, re-inked by a
+theme](assets/readme/themeable.png)
+
 ### Study
 
 - Add notes to words/verses
@@ -116,7 +121,7 @@ steps, all on the phone.
    open **Plumbline** from your app drawer: the whole Bible is inside the file
    you just installed, so it opens with the network off.
 
-## Getting started (60 seconds)
+## Getting started
 
 First launch asks who's opening the Book — **new in the faith** (a welcome
 with next steps, landing in John), **curious about the Bible** (for someone
@@ -233,13 +238,6 @@ public-domain Textus Receptus tagging; cross-references from the TSK via
 openbible.info. Full credits and licenses: **[BIBLIOGRAPHY.md](BIBLIOGRAPHY.md)**.
 Scripture renders in EB Garamond (OFL, bundled).
 
-## License
-
-The code is MIT — **[LICENSE](LICENSE)**. The text and the lexical data keep
-their own terms (public domain, CC-BY 4.0, CC-BY-SA); the carve-out at the end
-of LICENSE names them directory by directory, and
-[BIBLIOGRAPHY.md](BIBLIOGRAPHY.md) has it file by file.
-
 ## Translation selection
 
 This application is built with the 1769 King James Version of the Bible, which
@@ -312,7 +310,14 @@ additions:
 - John 7:53–8:11
 - 1 John 5:7–8
 
+## License
+
+The code is MIT — **[LICENSE](LICENSE)**. The text and the lexical data keep
+their own terms (public domain, CC-BY 4.0, CC-BY-SA); the carve-out at the end
+of LICENSE names them directory by directory, and
+[BIBLIOGRAPHY.md](BIBLIOGRAPHY.md) has it file by file.
+
 ## Final note
 
-May God bless you as you read his Word, whether here or elsewhere, and don't
+May God bless you as you read His Word, whether here or elsewhere, and don't
 fail to share it with others.

apps/android/app/src/main/assets/fonts/OFL-AtkinsonHyperlegible.txt

@@ -0,0 +1,92 @@
+Copyright 2020 Braille Institute of America, Inc.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

apps/android/app/src/main/java/dev/plumbline/Wire.kt

@@ -478,6 +478,11 @@ data class ConfigState(
     val firstRun: Boolean = false,
     // Frozen additive field shared with GTK's config.json — must round-trip.
     val versePerLine: Boolean = false,
+    // The two reader-typography switches (additive). Defaulted TRUE, not false:
+    // an absent key is an engine or a config from before they existed, and
+    // reading that as "off" would strip a chapter of its numbers.
+    val verseNumbers: Boolean = true,
+    val addedItalics: Boolean = true,
     // Colour theme choice: "system" | "light" | "dark" | "night". Additive.
     val theme: String = "system",
     // The two TYPE axes (additive, core::font tokens): the face scripture is

apps/android/app/src/main/java/dev/plumbline/ui/Fonts.kt

@@ -35,6 +35,11 @@ internal data class FontSpec(
     val regular: String,
     val italic: String?,
     val scale: Float,
+    /** Static-bold files, for a family with no `wght` axis (Atkinson — see
+     *  `Font::static_bold` in the core). Null for the variable families, whose
+     *  bold is the same file driven to 700. */
+    val bold: String? = null,
+    val boldItalic: String? = null,
 )
 
 /**
@@ -51,6 +56,16 @@ internal val BUNDLED_FONTS: List<FontSpec> = listOf(
     FontSpec("inter", "Inter", "fonts/Inter-Regular.ttf", "fonts/Inter-Italic.ttf", scale = 0.87f),
     // No italic entry: the file does not exist, and asking for one would get a shear.
     FontSpec("fira-code", "Fira Code", "fonts/FiraCode-Regular.ttf", null, scale = 0.88f),
+    // STATIC family (no wght axis) — its bold is its own file, carried in
+    // [bold]/[boldItalic]; driving its regular to 700 would paint bold text
+    // regular. The low-vision face (Braille Institute, OFL).
+    FontSpec(
+        "atkinson-hyperlegible", "Atkinson Hyperlegible",
+        "fonts/AtkinsonHyperlegible-Regular.ttf", "fonts/AtkinsonHyperlegible-Italic.ttf",
+        scale = 0.90f,
+        bold = "fonts/AtkinsonHyperlegible-Bold.ttf",
+        boldItalic = "fonts/AtkinsonHyperlegible-BoldItalic.ttf",
+    ),
 )
 
 /** The face everything falls back to — the shipped default. */

apps/android/app/src/main/java/dev/plumbline/ui/Maps.kt

@@ -51,6 +51,7 @@ import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.TransformOrigin
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.drawscope.withTransform
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.nativeCanvas
 import androidx.compose.ui.input.pointer.pointerInput
@@ -543,16 +544,39 @@ fun ChordMap(
                             onDoubleTap = { zoom.reset() },
                             onTap = { screen ->
                                 val bc = max(1, map.bookCount)
-                                val cx = zoom.toContent(screen).x
-                                val idx = (cx / max(1f, canvasSize.width.toFloat()) * bc).toInt().coerceIn(0, bc - 1)
+                                // The position ALONG the canon axis: screen x in
+                                // landscape, screen y when the portrait flip below
+                                // runs the axis down the left edge.
+                                val c = zoom.toContent(screen)
+                                val portrait = canvasSize.height > canvasSize.width
+                                val along =
+                                    if (portrait) c.y / max(1f, canvasSize.height.toFloat())
+                                    else c.x / max(1f, canvasSize.width.toFloat())
+                                val idx = (along * bc).toInt().coerceIn(0, bc - 1)
                                 if (idx in books.indices) onPickBook(books[idx].id)
                             },
                         )
                     }
                     .zoomable(zoom),
             ) {
-                val w = size.width
-                val h = size.height
+                // A phone held upright gives the canon axis a thumb's span for 66
+                // books — useless (maintainer UAT, 2026-08-12). PORTRAIT flips the
+                // whole map: the axis runs DOWN the left edge (top = Genesis) and
+                // the ribbons bulge right; labels read spine-wise. Everything
+                // below paints in landscape logic against (lw, lh) and the
+                // transform does the rest, so the two orientations cannot drift.
+                val portrait = size.height > size.width
+                val lw = if (portrait) size.height else size.width
+                val lh = if (portrait) size.width else size.height
+                withTransform({
+                    if (portrait) {
+                        // Logical (x, y) → screen (w − y, x).
+                        translate(left = size.width)
+                        rotate(degrees = 90f, pivot = Offset.Zero)
+                    }
+                }) {
+                val w = lw
+                val h = lh
                 val bc = max(1, map.bookCount).toFloat()
                 val y0 = h - 26.dp.toPx()
                 val maxC = max(1, map.max).toFloat()
@@ -626,6 +650,7 @@ fun ChordMap(
                     262.dp.toPx(), 7.dp.toPx(), Paint.Align.LEFT,
                     Color(red = 89, green = 77, blue = 56, alpha = 160).toArgbInt(),
                 )
+                }
             }
         }
     }