From 190c749527c5c5f8afec7ead6956a5f3d7c1a422 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 26 Aug 2017 11:57:34 -0700
Subject: improved furigana support

---
 tmpl/fields.html | 16 +---------------
 tmpl/terms.html  |  6 +-----
 2 files changed, 2 insertions(+), 20 deletions(-)

(limited to 'tmpl')

diff --git a/tmpl/fields.html b/tmpl/fields.html
index 8bd94dc0..df3f3a96 100644
--- a/tmpl/fields.html
+++ b/tmpl/fields.html
@@ -43,21 +43,7 @@
 {{/inline}}
 
 {{#*inline "furigana"}}
-    {{~#if html~}}
-        {{~#definition.furigana~}}
-            {{~#if furigana~}}
-                <ruby>{{text}}<rt>{{furigana}}</rt></ruby>
-            {{~else~}}
-                {{text}}
-            {{/if~}}
-        {{~/definition.furigana~}}
-    {{~else~}}
-        {{#definition.furigana}}
-            {{~#furigana}} {{/furigana~}}
-            {{text}}
-            {{~#furigana}}[{{.}}]{{/furigana~}}
-        {{/definition.furigana}} 
-    {{~/if~}}
+    {{#furigana}}{{{definition}}}{{/furigana}}
 {{/inline}}
 
 {{#*inline "glossary"}}
diff --git a/tmpl/terms.html b/tmpl/terms.html
index db36e5cc..ffe52ab8 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -31,11 +31,7 @@
         <img src="/mixed/img/entry-current.png" class="current" title="Current entry (Alt + Up/Down/Home/End/PgUp/PgDn)" alt>
     </div>
 
-    {{#if reading}}
-    <div class="expression"><ruby>{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}<rt>{{reading}}</rt></ruby></div>
-    {{else}}
-    <div class="expression">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div>
-    {{/if}}
+    <div class="expression">{{#kanjiLinks}}{{#furigana}}{{{.}}}{{/furigana}}{{/kanjiLinks}}</div>
 
     {{#if reasons}}
     <div class="reasons">
-- 
cgit v1.2.3