diff --git a/src/Controller/KanjiController.php b/src/Controller/KanjiController.php index 8aef246..1d8babd 100644 --- a/src/Controller/KanjiController.php +++ b/src/Controller/KanjiController.php @@ -38,6 +38,7 @@ class KanjiController extends AbstractController $file = fopen($path, 'r'); while (($kanji = fgets($file)) !== false) { $kanji = mb_trim($kanji); + $ret[$kanji] = ''; if (mb_strlen($kanji) !== 1) throw new \Exception(sprintf( 'Kanji expected, got "%s"', @@ -45,7 +46,7 @@ class KanjiController extends AbstractController )); while (($explanation = fgets($file)) !== false) { if ($explanation === "\n") continue 2; - $ret[$kanji] = mb_trim(fgets($file)); + $ret[$kanji] .= mb_trim($explanation); } } @@ -156,12 +157,13 @@ class KanjiController extends AbstractController $ebookRef = require "$this->varBasepath/ebook-ref.php"; return $this->render(self::tmpl('view'), [ - 'char' => $charStr, - 'codepoint' => $codepoint, - 'info' => $charInfo, - 'terms' => $terms, - 'ref' => $ebookRef[$charStr] ?? [], - 'jiten_href' => key_exists($charStr, $jiten) + 'ignored_text' => $this->getIgnoredList()[$charStr] ?? null, + 'char' => $charStr, + 'codepoint' => $codepoint, + 'info' => $charInfo, + 'terms' => $terms, + 'ref' => $ebookRef[$charStr] ?? [], + 'jiten_href' => key_exists($charStr, $jiten) ? "https://kanji.jitenon.jp/kanji{$jiten[$charStr]}" : null ]); diff --git a/templates/kanji/view.html.twig b/templates/kanji/view.html.twig index 7592884..c186639 100644 --- a/templates/kanji/view.html.twig +++ b/templates/kanji/view.html.twig @@ -1,4 +1,4 @@ -