47 lines
2.8 KiB
Markdown
47 lines
2.8 KiB
Markdown
|
# Dictionary Feature Bug Fixes
|
||
|
|
|
||
|
|
**Date:** 2026-02-12
|
||
|
|
**Branch:** mod/add-dictionary
|
||
|
|
|
||
|
|
## Task
|
||
|
|
|
||
|
|
Fix three bugs reported after initial implementation of PR #857 dictionary word lookup feature.
|
||
|
|
|
||
|
|
## Changes Made
|
||
|
|
|
||
|
|
### 1. Fix: Lookup fails after first successful lookup (Dictionary.cpp)
|
||
|
|
|
||
|
|
**Root cause:** `cleanWord()` lowercases the search term, but the dictionary index is sorted case-sensitively (uppercase entries sort before lowercase). The binary search lands in the wrong segment on the second pass because the index is already loaded and the sparse offset table was built for a case-sensitive sort order.
|
||
|
|
|
||
|
|
**Fix:** Extracted the binary-search + linear-scan logic into a new `searchIndex()` private helper. The `lookup()` method now performs a **two-pass search**: first with the lowercased word, then with the first-letter-capitalized variant. This handles dictionaries that store headwords as "Hello" instead of "hello". Also removed `stripHtml` from the header since HTML is now rendered, not stripped.
|
||
|
|
|
||
|
|
**Files:** `src/util/Dictionary.h`, `src/util/Dictionary.cpp`
|
||
|
|
|
||
|
|
### 2. Fix: Raw HTML displayed in definitions (DictionaryDefinitionActivity)
|
||
|
|
|
||
|
|
**Root cause:** Dictionary uses `sametypesequence=h` (HTML format). The original activity rendered definitions as plain text.
|
||
|
|
|
||
|
|
**Fix:** Complete rewrite of the definition activity to **render HTML with styled text**:
|
||
|
|
- New `parseHtml()` method tokenizes HTML into `TextAtom` structs (word + style + newline directives)
|
||
|
|
- Supports bold (`<b>`, `<strong>`, headings), italic (`<i>`, `<em>`), and mixed bold-italic via `EpdFontFamily::Style`
|
||
|
|
- Handles `<ol>` (numbered with digit/alpha support), `<ul>` (bullet points), nested lists with indentation
|
||
|
|
- Decodes HTML entities (named + numeric/hex → UTF-8)
|
||
|
|
- Skips `<svg>` content, treats `</html>` as section separators
|
||
|
|
- `wrapText()` flows styled atoms into positioned line segments (`Segment` struct with x-offset and style)
|
||
|
|
- `renderScreen()` draws each segment with correct position and style via `renderer.drawText(fontId, x, y, text, true, style)`
|
||
|
|
|
||
|
|
**Files:** `src/activities/reader/DictionaryDefinitionActivity.h`, `src/activities/reader/DictionaryDefinitionActivity.cpp`
|
||
|
|
|
||
|
|
### 3. Fix: No button hints on word selection screen (DictionaryWordSelectActivity)
|
||
|
|
|
||
|
|
**Fix:** Added `GUI.drawButtonHints()` call at the end of `renderScreen()` with labels: "« Back", "✓ Lookup", "↕ Row", "↔ Word".
|
||
|
|
|
||
|
|
**Files:** `src/activities/reader/DictionaryWordSelectActivity.cpp`
|
||
|
|
|
||
|
|
## Follow-up Items
|
||
|
|
|
||
|
|
- If the reader font doesn't include bold/italic variants, styled text gracefully falls back to regular style
|
||
|
|
- Nested list indentation uses 15px per level after the first
|
||
|
|
- Alpha list numbering (`list-style-type: lower-alpha`) is supported; other custom list styles fall back to numeric
|
||
|
|
- Button hint labels may need tuning once tested on device (especially in landscape orientation)
|