rv-bible-cli 0.1.6 → 0.1.7

package/README.md

@@ -134,7 +134,7 @@ When you read a chapter in a terminal, rvb opens a full-screen interactive reade
 
 Deep-dive into footnotes and cross-references. Press `d` while reading any chapter.
 
-- A cursor highlights the current verse
+- A cursor highlights the current verse — the chapter view auto-scrolls to keep it vertically centered as you move
 - The bottom panel shows the **full** footnote text for that verse — header line with marker + word + numbered cross-references, then the wrapped commentary body underneath
 - **Type a number** to follow a cross-reference — you'll jump to that chapter and land on the exact verse
 - Press `[` to go back to where you were

package/dist/format.d.ts

@@ -8,6 +8,7 @@ export declare function getZoom(): number;
 export declare function zoomIn(): void;
 export declare function zoomOut(): void;
 export declare function zoomReset(): void;
+export declare function getMargin(): number;
 export declare function wrapWords(text: string, maxWidth: number, ansi?: boolean): string[];
 export declare function renderFootnoteBlock(footnotes: Footnote[]): string;
 export declare function renderNoteDisplayAll(verse: Verse, footnotes: Footnote[], bookName: string): string;

package/dist/format.js

@@ -109,6 +109,9 @@ function contentWidth() {
 function margin() {
     return ' '.repeat(ZOOM_LEVELS[currentZoom].margin);
 }
+export function getMargin() {
+    return ZOOM_LEVELS[currentZoom].margin;
+}
 // ── Visible-length helper ────────────────────────────────────────────────────
 // Strip ANSI escape codes before measuring — needed for word-wrap width checks
 // on text that may contain chalk styling (e.g. highlighted markers in notes mode).

package/dist/index.js

@@ -397,9 +397,7 @@ program
             const bookName = getBookInfo(v.book)?.full_name ?? v.book;
             const ref = `${bookName} ${v.chapter}:${v.verse}`;
             const cleanText = stripMarkers(v.text);
-            // Truncate to ~150 chars for scanability
-            const truncated = cleanText.length > 150 ? cleanText.substring(0, 147) + '...' : cleanText;
-            const highlighted = highlightTerms(truncated, terms);
+            const highlighted = highlightTerms(cleanText, terms);
             // Wrap the text at ~76 chars with 4-space indent
             const maxW = Math.min((process.stdout.columns ?? 80) - 4, 76);
             const words = highlighted.split(' ');

package/dist/ui/Pager.js

@@ -4,7 +4,7 @@ import { render, Box, Text, useInput, useApp, useStdout } from 'ink';
 import chalk from 'chalk';
 import clipboard from 'clipboardy';
 import { getVersesByRef, getSectionHeaders, getFootnotesForChapter, getFootnotesForVerses, getCrossRefsForVerse, getBookInfo, getAllBooks, } from '../db.js';
-import { renderVerses, stripMarkers, highlightTerms, toSuperscript, wrapWords, zoomIn, zoomOut, zoomReset, getZoom } from '../format.js';
+import { renderVerses, stripMarkers, highlightTerms, toSuperscript, wrapWords, zoomIn, zoomOut, zoomReset, getZoom, getMargin } from '../format.js';
 import { saveLastRead, getLastRead } from '../state.js';
 import { resolveBook } from '../parser.js';
 import { getNextChapter, getPrevChapter } from './nav.js';
@@ -12,6 +12,20 @@ import { getNextChapter, getPrevChapter } from './nav.js';
 function stripAnsi(s) {
     return s.replace(/\x1b\[[0-9;]*m/g, '');
 }
+// Footer keybind helpers: magenta for the key, dim for the description,
+// dim middle dot as separator. Keeps "this is a key you can press" visually
+// distinct from the prose around it. When `/` separates two keys in a
+// compound (e.g. `[/]`, `g/G`, `Tab/⇧Tab`), the slash itself drops to dim so
+// the keys stand out. A lone `/` (e.g. the find command) stays magenta.
+function kb(key, desc) {
+    const parts = key.split('/');
+    const isCompound = parts.length > 1 && parts.every(p => p.length > 0);
+    const styledKey = isCompound
+        ? parts.map(k => chalk.magenta(k)).join(chalk.dim('/'))
+        : chalk.magenta(key);
+    return `${styledKey} ${chalk.dim(desc)}`;
+}
+const FOOTER_SEP = chalk.dim(' · ');
 // Detect verse-number lines by checking for chalk.dim() ANSI code (\x1b[2m) before
 // a superscript character. This distinguishes verse numbers (dim) from inline footnote
 // markers (cyan) that could appear at the start of word-wrapped continuation lines.
@@ -277,31 +291,42 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
     useEffect(() => {
         setPanelScrollOffset(0);
     }, [studyCursorIdx, book, chapter, mode]);
-    // Clamp scroll when content or viewport changes
+    // Clamp scroll when content or viewport changes. Normal mode uses the strict
+    // maxScroll clamp (can't scroll past content). Study mode allows overscroll so
+    // the last verse can still center — the visible slice is padded with empty rows
+    // when scrollOffset > maxScroll, keeping the panel anchored to the bottom.
     const maxScroll = Math.max(0, lines.length - viewportH);
+    const overscrollLimit = Math.max(0, lines.length - 1);
     useEffect(() => {
-        setScrollOffset(prev => Math.min(prev, maxScroll));
-    }, [maxScroll]);
-    // Keep the study-mode cursor verse fully visible above the footnote panel.
-    // Triggers when cursor moves OR viewport shrinks (panel grew with longer notes).
+        if (mode !== 'study') {
+            setScrollOffset(prev => Math.min(prev, maxScroll));
+        }
+        else {
+            setScrollOffset(prev => Math.min(prev, overscrollLimit));
+        }
+    }, [maxScroll, overscrollLimit, mode]);
+    // Center the cursor verse in study mode. If the verse fits in the viewport,
+    // place its midpoint at viewportH/2. If the verse is taller than the viewport
+    // (rare — long verse with markers wrapping), pin its start to the top so the
+    // beginning is always visible. Triggers on cursor move and viewport resize.
     useEffect(() => {
         if (mode !== 'study' || verseMap.length === 0)
             return;
         const entry = verseMap[studyCursorIdx];
         if (!entry)
             return;
-        setScrollOffset(prev => {
-            // Cursor verse extends below the visible viewport — pull it in from the bottom
-            if (entry.endLine >= prev + viewportH) {
-                return Math.max(0, entry.endLine - viewportH + 1);
-            }
-            // Cursor verse starts above the visible viewport — pull it in from the top
-            if (entry.startLine < prev) {
-                return entry.startLine;
-            }
-            return prev;
-        });
-    }, [studyCursorIdx, viewportH, mode, verseMap]);
+        const verseH = entry.endLine - entry.startLine + 1;
+        let target;
+        if (verseH >= viewportH) {
+            target = entry.startLine;
+        }
+        else {
+            const verseMid = entry.startLine + Math.floor(verseH / 2);
+            target = verseMid - Math.floor(viewportH / 2);
+        }
+        target = Math.max(0, Math.min(target, overscrollLimit));
+        setScrollOffset(target);
+    }, [studyCursorIdx, viewportH, mode, verseMap, overscrollLimit]);
     // ── Search highlights ────────────────────────────────────────────────────
     const displayLines = useMemo(() => {
         if (!searchSubmitted || searchMatches.length === 0)
@@ -1003,18 +1028,34 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
         const homeContent = homeLines.join('\n');
         let homeFooter;
         if (mode === 'home-chapter') {
-            homeFooter = `  ${chalk.dim('←/→ or type number · Enter go · Esc back')}`;
+            homeFooter = `  ${[
+                kb('←/→', 'ch'),
+                kb('0-9', 'jump'),
+                kb('Enter', 'go'),
+                kb('Esc', 'back'),
+            ].join(FOOTER_SEP)}`;
         }
         else {
             const lastRead = getLastRead();
-            const continueHint = lastRead ? 'Space continue · ' : '';
-            homeFooter = `  ${chalk.dim(`↑↓←→ navigate · Enter select · ${continueHint}type letter to jump · q quit`)}`;
+            const parts = [
+                kb('↑↓←→', 'navigate'),
+                kb('Enter', 'select'),
+            ];
+            if (lastRead)
+                parts.push(kb('Space', 'continue'));
+            parts.push(kb('a-z', 'jump'));
+            parts.push(kb('q', 'quit'));
+            homeFooter = `  ${parts.join(FOOTER_SEP)}`;
         }
         const homeSep = chalk.dim('─'.repeat(cols));
         return (_jsxs(Box, { flexDirection: "column", height: rows, children: [_jsx(Text, { children: chalk.bold('  rv') }), _jsx(Text, { children: homeSep }), _jsx(Box, { flexGrow: 1, overflow: "hidden", children: _jsx(Text, { children: homeContent }) }), _jsx(Text, { children: homeSep }), _jsx(Text, { children: homeFooter })] }));
     }
     // ── Chapter view: build visible content ──────────────────────────────────
     const visibleSlice = displayLines.slice(scrollOffset, scrollOffset + viewportH);
+    // Pad to exactly viewportH rows so the panel stays anchored to the bottom even
+    // when scrollOffset > maxScroll (study-mode overscroll for centering).
+    while (visibleSlice.length < viewportH)
+        visibleSlice.push('');
     // Apply cursor highlight for copy mode and study mode
     const contentLines = (mode === 'copy' || mode === 'study') ? visibleSlice.map((line, viewIdx) => {
         const absLine = scrollOffset + viewIdx;
@@ -1032,9 +1073,12 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
                         ? chalk.inverse(`› ${stripAnsi(line)}`)
                         : chalk.inverse(`  ${stripAnsi(line)}`);
                 }
-                // Study mode: subtle — just a › marker on first line, no bg change
+                // Study mode: subtle — just a › marker on first line, no bg change.
+                // Place cursor 3 columns left of the verse number so the gap stays
+                // constant regardless of margin (zoom level).
                 if (absLine === entry.startLine) {
-                    return `${chalk.cyan('›')}${line.substring(1)}`;
+                    const cursorCol = Math.max(0, getMargin() - 3);
+                    return `${line.slice(0, cursorCol)}${chalk.cyan('›')}${line.slice(cursorCol + 1)}`;
                 }
                 return line;
             }
@@ -1063,6 +1107,8 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
     const headerPad = Math.max(1, cols - stripAnsi(titleLeft).length - position.length - 2);
     const header = `${titleLeft}${' '.repeat(headerPad)}${chalk.dim(position)}`;
     // ── Footer (two lines for normal/study, one line for modal modes) ──────
+    // Toggle indicator: cyan when active (state cue), magenta key + dim desc when off.
+    const toggleHint = (on, key, desc) => on ? chalk.cyan(`${key} ${desc}`) : kb(key, desc);
     let footer1;
     let footer2 = null;
     if (flash) {
@@ -1073,33 +1119,67 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
             const countLabel = searchMatches.length === 0
                 ? 'no matches'
                 : `match ${matchIdx + 1}/${searchMatches.length}`;
-            footer1 = `  / ${searchQuery}  ${chalk.dim(countLabel)}  ${chalk.dim('n/N cycle · Esc clear')}`;
+            footer1 = `  / ${searchQuery}  ${chalk.dim(countLabel)}  ${[kb('n/N', 'cycle'), kb('Esc', 'clear')].join(FOOTER_SEP)}`;
         }
         else {
-            footer1 = `  / ${searchQuery}${chalk.dim('_')}  ${chalk.dim('Enter search · Esc cancel')}`;
+            footer1 = `  / ${searchQuery}${chalk.dim('_')}  ${[kb('Enter', 'search'), kb('Esc', 'cancel')].join(FOOTER_SEP)}`;
         }
     }
     else if (mode === 'goto') {
-        footer1 = `  : ${gotoInput}${chalk.dim('_')}  ${chalk.dim('e.g. rom 8 · Enter go · Esc cancel')}`;
+        footer1 = `  : ${gotoInput}${chalk.dim('_')}  ${chalk.dim('e.g. rom 8')}${FOOTER_SEP}${[kb('Enter', 'go'), kb('Esc', 'cancel')].join(FOOTER_SEP)}`;
     }
     else if (mode === 'study') {
         const inputHint = studyRefInput ? ` ${chalk.yellow(studyRefInput)}${chalk.dim('_')}` : '';
         const rangeHint = studySelStart !== null ? chalk.dim(' (range)') : '';
-        const sNoteFlag = notes ? chalk.cyan('f notes') : chalk.dim('f notes');
-        const sOutlineFlag = outline ? chalk.cyan('o outline') : chalk.dim('o outline');
-        footer1 = `  ${chalk.cyan('STUDY')}${inputHint}${rangeHint}  ${chalk.dim('# ref · v range · c copy ·')} ${sNoteFlag} ${chalk.dim('·')} ${sOutlineFlag} ${chalk.dim('· / find')}`;
-        const panelHint = panelOverflow ? chalk.dim(' · ,/. note') : '';
-        footer2 = `  ${chalk.dim('↑↓ verse · Tab/⇧Tab quarter · g/G top/bot · ←→ ch · : goto · [/] back/fwd · d exit')}${panelHint}`;
+        footer1 = `  ${chalk.cyan('STUDY')}${inputHint}${rangeHint}  ${[
+            kb('#', 'ref'),
+            kb('v', 'range'),
+            kb('c', 'copy'),
+            toggleHint(notes, 'f', 'notes'),
+            toggleHint(outline, 'o', 'outline'),
+            kb('/', 'find'),
+        ].join(FOOTER_SEP)}`;
+        const f2Parts = [
+            kb('↑↓', 'verse'),
+            kb('Tab/⇧Tab', 'quarter'),
+            kb('g/G', 'top/bot'),
+            kb('←→', 'ch'),
+            kb(':', 'goto'),
+            kb('[/]', 'back/fwd'),
+            kb('d', 'exit'),
+        ];
+        if (panelOverflow)
+            f2Parts.push(kb(',/.', 'note'));
+        footer2 = `  ${f2Parts.join(FOOTER_SEP)}`;
     }
     else if (mode === 'copy') {
         const rangeHint = selStart !== null ? chalk.dim(' (range active)') : '';
-        footer1 = `  ${chalk.cyan('COPY')}${rangeHint}  ${chalk.dim('↑↓ move · v range · Enter copy · Esc cancel')}`;
+        footer1 = `  ${chalk.cyan('COPY')}${rangeHint}  ${[
+            kb('↑↓', 'move'),
+            kb('v', 'range'),
+            kb('Enter', 'copy'),
+            kb('Esc', 'cancel'),
+        ].join(FOOTER_SEP)}`;
     }
     else {
-        const noteFlag = notes ? chalk.cyan('f notes') : chalk.dim('f notes');
-        const outlineFlag = outline ? chalk.cyan('o outline') : chalk.dim('o outline');
-        footer1 = `  ${noteFlag} ${chalk.dim('·')} ${outlineFlag} ${chalk.dim('· d study · c copy · / find')}`;
-        footer2 = `  ${chalk.dim('↑↓ scroll · Tab/⇧Tab quarter · g/G top/bot · ←→ ch · +/- width · : goto · H home · [/] back/fwd · q quit')}`;
+        footer1 = `  ${[
+            toggleHint(notes, 'f', 'notes'),
+            toggleHint(outline, 'o', 'outline'),
+            kb('d', 'study'),
+            kb('c', 'copy'),
+            kb('/', 'find'),
+        ].join(FOOTER_SEP)}`;
+        footer2 = `  ${[
+            kb('↑↓', 'scroll'),
+            kb('Tab/⇧Tab', 'quarter'),
+            kb('g/G', 'top/bot'),
+            kb('←→', 'ch'),
+            kb('+/-', 'width'),
+            kb(':', 'goto'),
+            kb('H', 'home'),
+            kb('[/]', 'back/fwd'),
+            kb('q', 'quit'),
+        ].join(FOOTER_SEP)}`;
     }
     const separator = chalk.dim('· '.repeat(Math.floor(cols / 2)));
     // ── Render ───────────────────────────────────────────────────────────────
@@ -1110,7 +1190,7 @@ function Pager({ initialBook, initialChapter, initialNotes, initialOutline, star
             const lo = panelScrollClamped + 1;
             const hi = panelScrollClamped + panelVisibleLines.length;
             const total = panelLinesAll.length;
-            parts.push(chalk.dim(`  ── ${lo}–${hi} of ${total} · ,/. scroll ──`));
+            parts.push(`  ${chalk.dim(`── ${lo}–${hi} of ${total} ·`)} ${kb(',/.', 'scroll')} ${chalk.dim('──')}`);
         }
         studyPanelContent = parts.join('\n');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rv-bible-cli",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Fast, offline terminal Bible reader for the Recovery Version. Footnotes, cross-references, concordance search, interactive pager.",
   "type": "module",
   "main": "dist/index.js",