From fd6622400f64b2d568d38bde72f9fd75f8d06beb Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 6 Nov 2016 17:10:31 -0800
Subject: Templates

---
 tmpl/dictionary.html | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 tmpl/dictionary.html

(limited to 'tmpl')

diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
new file mode 100644
index 00000000..21847722
--- /dev/null
+++ b/tmpl/dictionary.html
@@ -0,0 +1,21 @@
+<div class="dictionary well well-sm" data-name="{{name}}">
+    <div class="row">
+        <div class="col-xs-8">
+            <h4><span class="text-muted glyphicon glyphicon-book"></span> {{name}} <small>v.{{version}}</small></h4>
+        </div>
+        <div class="col-xs-4 text-right">
+            <button type="button" class="dict-delete btn btn-danger">Delete</button>
+        </div>
+    </div>
+
+    {{#if hasTerms}}
+    <div class="checkbox">
+        <label><input type="checkbox" class="dict-enable-terms"> Enable term search</label>
+    </div>
+    {{/if}}
+    {{#if hasKanji}}
+    <div class="checkbox">
+        <label><input type="checkbox" class="dict-enable-kanji"> Enable Kanji search</label>
+    </div>
+    {{/if}}
+</div>
-- 
cgit v1.2.3


From 712cd6a9ab4e627e3c1504740ff853a6d12025f4 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 6 Nov 2016 17:56:47 -0800
Subject: Simplify field code

---
 ext/bg/js/options-form.js | 56 ++++++++++++++++-------------------------------
 ext/bg/js/templates.js    | 17 ++++++++++++++
 tmpl/model.html           | 18 +++++++++++++++
 3 files changed, 54 insertions(+), 37 deletions(-)
 create mode 100644 tmpl/model.html

(limited to 'tmpl')

diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index ec603eed..98ec15a3 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -155,11 +155,11 @@ function populateAnkiDeckAndModel(opts) {
 }
 
 function populateDictionaries() {
-    const dictGroups = $('.dictionaries');
-    dictGroups.empty();
+    const container = $('.dictionaries');
+    container.empty();
 
     yomichan().translator.dictionary.getInfo().then(rows => {
-        for (const row of rows) {
+        rows.forEach(row => {
             const html = Handlebars.templates['dictionary.html']({
                 name: row.dictionary,
                 version: row.version,
@@ -167,14 +167,15 @@ function populateDictionaries() {
                 hasKanji: row.hasKanji
             });
 
-            dictGroups.append($(html));
-        }
+            container.append($(html));
+        });
     });
 }
 
 function populateAnkiFields(element, opts) {
-    const table = element.closest('.tab-pane').find('.anki-fields');
-    table.find('tbody').remove();
+    const tab = element.closest('.tab-pane');
+    const container = tab.find('.anki-fields tbody');
+    container.empty();
 
     const modelName = element.val();
     if (modelName === null) {
@@ -186,41 +187,22 @@ function populateAnkiFields(element, opts) {
     const markers = modelIdToMarkers(modelId);
 
     return anki().getModelFieldNames(modelName).then(names => {
-        const tbody = $('<tbody>');
         names.forEach(name => {
-            const button = $('<button>', {type: 'button', class: 'btn btn-default dropdown-toggle'});
-            button.attr('data-toggle', 'dropdown').dropdown();
-
-            const markerItems = $('<ul>', {class: 'dropdown-menu dropdown-menu-right'});
-            for (const marker of markers) {
-                const link = $('<a>', {href: '#'}).text(`{${marker}}`);
-                link.click(e => {
-                    e.preventDefault();
-                    link.closest('.input-group').find('.anki-field-value').val(link.text()).trigger('change');
-                });
-                markerItems.append($('<li>').append(link));
-            }
-
-            const groupBtn = $('<div>', {class: 'input-group-btn'});
-            groupBtn.append(button.append($('<span>', {class: 'caret'})));
-            groupBtn.append(markerItems);
-
-            const group = $('<div>', {class: 'input-group'});
-            group.append($('<input>', {
-                type: 'text',
-                class: 'anki-field-value form-control',
+            const html = Handlebars.templates['model.html']({
+                name,
+                markers,
                 value: opts[optKey][name] || ''
-            }).data('field', name).change(onOptionsChanged));
-            group.append(groupBtn);
-
-            const row = $('<tr>');
-            row.append($('<td>', {class: 'col-sm-2'}).text(name));
-            row.append($('<td>', {class: 'col-sm-10'}).append(group));
+            });
 
-            tbody.append(row);
+            container.append($(html));
         });
 
-        table.append(tbody);
+        tab.find('.anki-field-value').change(onOptionsChanged);
+        tab.find('.marker-link').click(e => {
+            e.preventDefault();
+            const link = e.target;
+            $(link).closest('.input-group').find('.anki-field-value').val(`{${link.text}}`).trigger('change');
+        });
     });
 }
 
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index d9825914..7e78db3b 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -104,6 +104,23 @@ templates['kanji-list.html'] = template({"1":function(container,depth0,helpers,p
     + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + ((stack1 = container.invokePartial(partials["footer.html"],depth0,{"name":"footer.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"usePartial":true,"useData":true,"useDepths":true});
+templates['model.html'] = template({"1":function(container,depth0,helpers,partials,data) {
+    return "                    <li><a class=\"marker-link\" href=\"#\">"
+    + container.escapeExpression(container.lambda(depth0, depth0))
+    + "</a></li>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "<tr>\n    <td class=\"col-sm-2\">"
+    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+    + "</td>\n    <td class=\"col-sm-10\">\n        <div class=\"input-group\">\n            <input type=\"text\" class=\"anki-field-value form-control\" data-field=\""
+    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+    + "\" value=\""
+    + alias4(((helper = (helper = helpers.value || (depth0 != null ? depth0.value : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"value","hash":{},"data":data}) : helper)))
+    + "\">\n            <div class=\"input-group-btn\">\n                <button type=\"button\" class=\"btn btn-default dropdown-toggle\" data-toggle=\"dropdown\">\n                    <span class=\"caret\"></span>\n                </button>\n                <ul class=\"dropdown-menu dropdown-menu-right\">\n"
+    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.markers : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "                </ul>\n            </div>\n        </div>\n    </td>\n</tr>\n";
+},"useData":true});
 templates['term.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
diff --git a/tmpl/model.html b/tmpl/model.html
new file mode 100644
index 00000000..94772316
--- /dev/null
+++ b/tmpl/model.html
@@ -0,0 +1,18 @@
+<tr>
+    <td class="col-sm-2">{{name}}</td>
+    <td class="col-sm-10">
+        <div class="input-group">
+            <input type="text" class="anki-field-value form-control" data-field="{{name}}" value="{{value}}">
+            <div class="input-group-btn">
+                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                    <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu dropdown-menu-right">
+                    {{#each markers}}
+                    <li><a class="marker-link" href="#">{{.}}</a></li>
+                    {{/each}}
+                </ul>
+            </div>
+        </div>
+    </td>
+</tr>
-- 
cgit v1.2.3


From 20304b5460e54621511a98b9dba9236d4d192ac3 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 6 Nov 2016 18:09:12 -0800
Subject: WIP

---
 ext/bg/js/options-form.js |  9 ++++++---
 ext/bg/js/options.js      |  2 ++
 ext/bg/js/templates.js    | 21 +++++++++++++++------
 tmpl/dictionary.html      | 12 ++++--------
 4 files changed, 27 insertions(+), 17 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index 98ec15a3..3ea850b7 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -154,17 +154,20 @@ function populateAnkiDeckAndModel(opts) {
     });
 }
 
-function populateDictionaries() {
+function populateDictionaries(opts) {
     const container = $('.dictionaries');
     container.empty();
 
     yomichan().translator.dictionary.getInfo().then(rows => {
         rows.forEach(row => {
+            const dictOpts = opts.dictionaries[row.dictionary] || {enableTerms: true, enableKanji: false};
             const html = Handlebars.templates['dictionary.html']({
                 name: row.dictionary,
                 version: row.version,
                 hasTerms: row.hasTerms,
-                hasKanji: row.hasKanji
+                hasKanji: row.hasKanji,
+                enableTerms: dictOpts.enableTerms,
+                enableKanji: dictOpts.enableKanji
             });
 
             container.append($(html));
@@ -276,7 +279,7 @@ $(document).ready(() => {
         $('input, select').not('.anki-model').change(onOptionsChanged);
         $('.anki-model').change(onAnkiModelChanged);
 
-        populateDictionaries();
+        populateDictionaries(opts);
         populateAnkiDeckAndModel(opts);
         updateVisibility(opts);
     });
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 15288afc..28448b96 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -28,6 +28,8 @@ function sanitizeOptions(options) {
         scanDelay: 15,
         scanLength: 20,
 
+        dictionaries: {},
+
         ankiMethod: 'disabled',
         ankiUsername: '',
         ankiPassword: '',
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 7e78db3b..fe4d95ca 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -1,9 +1,9 @@
 (function() {
   var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
 templates['dictionary.html'] = template({"1":function(container,depth0,helpers,partials,data) {
-    return "    <div class=\"checkbox\">\n        <label><input type=\"checkbox\" class=\"dict-enable-terms\"> Enable term search</label>\n    </div>\n";
+    return "disabled";
 },"3":function(container,depth0,helpers,partials,data) {
-    return "    <div class=\"checkbox\">\n        <label><input type=\"checkbox\" class=\"dict-enable-kanji\"> Enable Kanji search</label>\n    </div>\n";
+    return "checked";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
@@ -13,10 +13,19 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
     + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
     + " <small>v."
     + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
-    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right\">\n            <button type=\"button\" class=\"dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n\n"
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.hasKanji : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "</div>\n";
+    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right\">\n            <button type=\"button\" class=\"dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n\n    <div class=\"checkbox "
+    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-terms\" "
+    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + " "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.enableTerms : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "> Enable term search</label>\n    </div>\n    <div class=\"checkbox "
+    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasKanji : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-kanji\" "
+    + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasKanji : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + " "
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.enableKanji : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "> Enable Kanji search</label>\n    </div>\n</div>\n";
 },"useData":true});
 templates['footer.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var helper;
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 21847722..77493d94 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -8,14 +8,10 @@
         </div>
     </div>
 
-    {{#if hasTerms}}
-    <div class="checkbox">
-        <label><input type="checkbox" class="dict-enable-terms"> Enable term search</label>
+    <div class="checkbox {{#unless hasTerms}}disabled{{/unless}}">
+        <label><input type="checkbox" class="dict-enable-terms" {{#unless hasTerms}}disabled{{/unless}} {{#if enableTerms}}checked{{/if}}> Enable term search</label>
     </div>
-    {{/if}}
-    {{#if hasKanji}}
-    <div class="checkbox">
-        <label><input type="checkbox" class="dict-enable-kanji"> Enable Kanji search</label>
+    <div class="checkbox {{#unless hasKanji}}disabled{{/unless}}">
+        <label><input type="checkbox" class="dict-enable-kanji" {{#unless hasKanji}}disabled{{/unless}} {{#if enableKanji}}checked{{/if}}> Enable Kanji search</label>
     </div>
-    {{/if}}
 </div>
-- 
cgit v1.2.3


From 7fa51d682f29fbf51ed1228ca8840ff60be48e5e Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 6 Nov 2016 18:58:00 -0800
Subject: More work on options

---
 ext/bg/js/options-form.js | 23 ++++++++++++++++++++---
 ext/bg/js/templates.js    |  2 +-
 ext/bg/options.html       | 16 ++++++++--------
 tmpl/dictionary.html      |  2 +-
 4 files changed, 30 insertions(+), 13 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index f9346d7d..9919031a 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -91,7 +91,7 @@ function getFormValues() {
         optsNew.ankiKanjiModel = $('#anki-kanji-model').val();
         optsNew.ankiKanjiFields = fieldsToDict($('#kanji .anki-field-value'));
 
-        $('.dictionary').each((index, element) => {
+        $('.dict').each((index, element) => {
             const dictionary = $(element);
             const name = dictionary.data('name');
             const enableTerms = dictionary.find('.dict-enable-terms').prop('checked');
@@ -163,7 +163,7 @@ function populateAnkiDeckAndModel(opts) {
 }
 
 function populateDictionaries(opts) {
-    const container = $('.dictionaries');
+    const container = $('.dicts');
     container.empty();
 
     yomichan().translator.dictionary.getInfo().then(rows => {
@@ -181,7 +181,7 @@ function populateDictionaries(opts) {
             container.append($(html));
         });
 
-        container.find('.dictionary input').change(onOptionsChanged);
+        container.find('.dict input').change(onOptionsChanged);
     });
 }
 
@@ -289,6 +289,23 @@ $(document).ready(() => {
         $('input, select').not('.anki-model').change(onOptionsChanged);
         $('.anki-model').change(onAnkiModelChanged);
 
+        $('#dict-import a').click(e => {
+            e.preventDefault();
+            const control = $('#dict-import-url');
+            const url = $(e.target).data('url');
+            if (url.includes('/')) {
+                control.val(url);
+            } else {
+                control.val(chrome.extension.getURL(`bg/data/${url}`));
+            }
+            control.trigger('change');
+        });
+
+        $('#dict-import-url').on('change keyup paste', () => {
+            const disable = $('#dict-import-url').val().trim().length === 0;
+            $('#dict-import-start').prop('disabled', disable);
+        });
+
         populateDictionaries(opts);
         populateAnkiDeckAndModel(opts);
         updateVisibility(opts);
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index fe4d95ca..2caf6ba8 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -7,7 +7,7 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
-  return "<div class=\"dictionary well well-sm\" data-name=\""
+  return "<div class=\"dict well well-sm\" data-name=\""
     + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
     + "\">\n    <div class=\"row\">\n        <div class=\"col-xs-8\">\n            <h4><span class=\"text-muted glyphicon glyphicon-book\"></span> "
     + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
diff --git a/ext/bg/options.html b/ext/bg/options.html
index bc87d654..800fe8e9 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -6,7 +6,7 @@
         <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap.min.css">
         <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css">
         <style>
-            #anki-spinner, #anki-general, #anki-error, #options-advanced {
+            #anki-spinner, #anki-general, #anki-error, #dict-error, #dict-import-progress, #options-advanced {
                 display: none;
             }
 
@@ -65,7 +65,7 @@
             <div>
                 <h3>Dictionaries</h3>
 
-                <div class="dictionaries"></div>
+                <div class="dicts"></div>
 
                 <div class="alert alert-danger" id="dict-error">
                     <strong>Error:</strong>
@@ -80,16 +80,16 @@
                     <div class="input-group-btn">
                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
                         <ul class="dropdown-menu">
-                            <li><a href="#" id="dict-import-jmdict">JMdict</a></li>
-                            <li><a href="#" id="dict-import-jmnedict">JMnedict</a></li>
-                            <li><a href="#" id="dict-import-kanjidic2">KANJIDIC2</a></li>
+                            <li><a href="#" data-url="edict">JMdict</a></li>
+                            <li><a href="#" data-url="enamdict">JMnedict</a></li>
+                            <li><a href="#" data-url="kanjidic">KANJIDIC2</a></li>
                             <li role="separator" class="divider"></li>
-                            <li><a href="#" id="dict-import-local">Local dictionary</a></li>
+                            <li><a href="#" data-url="http://localhost:9876">Local dictionary</a></li>
                         </ul>
                     </div>
                     <input type="text" id="dict-import-url" class="form-control" placeholder="Dictionary import URL">
-                    <div class="input-group-btn">
-                        <button type="button" id="dict-import-start" class="btn btn-primary">Import</button>
+                    <div class="input-group-btn disabled">
+                        <button type="button" id="dict-import-start" class="btn btn-primary" disabled>Import</button>
                     </div>
                 </div>
             </div>
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 77493d94..760fd3d2 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -1,4 +1,4 @@
-<div class="dictionary well well-sm" data-name="{{name}}">
+<div class="dict well well-sm" data-name="{{name}}">
     <div class="row">
         <div class="col-xs-8">
             <h4><span class="text-muted glyphicon glyphicon-book"></span> {{name}} <small>v.{{version}}</small></h4>
-- 
cgit v1.2.3


From 3655e5a8204232fa85c35515edaa0b1b6da66e66 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 6 Nov 2016 19:14:43 -0800
Subject: Cleanup

---
 ext/bg/import.html        |  2 +-
 ext/bg/js/dictionary.js   | 22 +++++++++++-----------
 ext/bg/js/options-form.js |  8 ++++----
 ext/bg/js/templates.js    |  6 +++---
 tmpl/dictionary.html      |  4 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/import.html b/ext/bg/import.html
index 7f30b491..c2e9682e 100644
--- a/ext/bg/import.html
+++ b/ext/bg/import.html
@@ -39,7 +39,7 @@
 
                 <p>
                     Please read the steps outlined below to get quickly get up and running with Yomichan. For complete documentation,
-                    visit the <a href="https://foosoft.net/projects/yomichan-chrome/">official homepage</a>.
+                    visit the <a href="https://foosoft.net/projects/yomichan-chrome/" target="_blank">official homepage</a>.
                 </p>
 
                 <ol>
diff --git a/ext/bg/js/dictionary.js b/ext/bg/js/dictionary.js
index 008bc483..fe0284c9 100644
--- a/ext/bg/js/dictionary.js
+++ b/ext/bg/js/dictionary.js
@@ -34,7 +34,7 @@ class Dictionary {
             terms: '++id, dictionary, expression, reading',
             kanji: '++, dictionary, character',
             entities: '++, dictionary',
-            dictionaries: '++, dictionary, version',
+            dictionaries: '++, title, version',
             meta: 'name, value',
         });
     }
@@ -144,16 +144,16 @@ class Dictionary {
             return Promise.reject('database not initialized');
         }
 
-        const indexLoaded = (dictionary, version, entities, hasTerms, hasKanji) => {
-            return this.db.dictionaries.add({dictionary, version, hasTerms, hasKanji}).then(() => {
+        const indexLoaded = (title, version, entities, hasTerms, hasKanji) => {
+            return this.db.dictionaries.add({title, version, hasTerms, hasKanji}).then(() => {
                 this.entities = entities || {};
 
                 const rows = [];
                 for (const name in entities || {}) {
                     rows.push({
-                        dictionary,
                         name,
-                        value: entities[name]
+                        value: entities[name],
+                        dictionary: title
                     });
                 }
 
@@ -161,15 +161,15 @@ class Dictionary {
             });
         };
 
-        const termsLoaded = (dictionary, entries, total, current) => {
+        const termsLoaded = (title, entries, total, current) => {
             const rows = [];
             for (const [expression, reading, tags, ...glossary] of entries) {
                 rows.push({
-                    dictionary,
                     expression,
                     reading,
                     tags,
-                    glossary
+                    glossary,
+                    dictionary: title
                 });
             }
 
@@ -180,16 +180,16 @@ class Dictionary {
             });
         };
 
-        const kanjiLoaded = (dictionary, entries, total, current)  => {
+        const kanjiLoaded = (title, entries, total, current)  => {
             const rows = [];
             for (const [character, onyomi, kunyomi, tags, ...meanings] of entries) {
                 rows.push({
-                    dictionary,
                     character,
                     onyomi,
                     kunyomi,
                     tags,
-                    meanings
+                    meanings,
+                    dictionary: title
                 });
             }
 
diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index 9919031a..a37ebbaf 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -93,10 +93,10 @@ function getFormValues() {
 
         $('.dict').each((index, element) => {
             const dictionary = $(element);
-            const name = dictionary.data('name');
+            const title = dictionary.data('title');
             const enableTerms = dictionary.find('.dict-enable-terms').prop('checked');
             const enableKanji = dictionary.find('.dict-enable-kanji').prop('checked');
-            optsNew.dictionaries[name] = {enableTerms, enableKanji};
+            optsNew.dictionaries[title] = {enableTerms, enableKanji};
         });
 
         return {
@@ -168,9 +168,9 @@ function populateDictionaries(opts) {
 
     yomichan().translator.dictionary.getInfo().then(rows => {
         rows.forEach(row => {
-            const dictOpts = opts.dictionaries[row.dictionary] || {enableTerms: true, enableKanji: false};
+            const dictOpts = opts.dictionaries[row.title] || {enableTerms: true, enableKanji: false};
             const html = Handlebars.templates['dictionary.html']({
-                name: row.dictionary,
+                title: row.title,
                 version: row.version,
                 hasTerms: row.hasTerms,
                 hasKanji: row.hasKanji,
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 2caf6ba8..d42d972d 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -7,10 +7,10 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
-  return "<div class=\"dict well well-sm\" data-name=\""
-    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+  return "<div class=\"dict well well-sm\" data-title=\""
+    + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + "\">\n    <div class=\"row\">\n        <div class=\"col-xs-8\">\n            <h4><span class=\"text-muted glyphicon glyphicon-book\"></span> "
-    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+    + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + " <small>v."
     + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
     + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right\">\n            <button type=\"button\" class=\"dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n\n    <div class=\"checkbox "
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 760fd3d2..73bce769 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -1,7 +1,7 @@
-<div class="dict well well-sm" data-name="{{name}}">
+<div class="dict well well-sm" data-title="{{title}}">
     <div class="row">
         <div class="col-xs-8">
-            <h4><span class="text-muted glyphicon glyphicon-book"></span> {{name}} <small>v.{{version}}</small></h4>
+            <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4>
         </div>
         <div class="col-xs-4 text-right">
             <button type="button" class="dict-delete btn btn-danger">Delete</button>
-- 
cgit v1.2.3


From 8f995194bbf23a074a901c8fdaf4ddad22370dd3 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 7 Nov 2016 09:16:38 -0800
Subject: WIP

---
 ext/bg/js/options-form.js | 47 +++++++++++++++++++++++++++++++++++++++++++----
 ext/bg/js/templates.js    |  2 +-
 ext/bg/js/util.js         |  1 +
 ext/bg/options.html       |  6 +++---
 tmpl/dictionary.html      |  2 +-
 5 files changed, 49 insertions(+), 9 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index 14143d81..ce829698 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -166,6 +166,9 @@ function populateDictionaries(opts) {
     const container = $('.dicts');
     container.empty();
 
+    const dictError = $('#dict-error');
+    dictError.hide();
+
     yomichan().translator.database.getDictionaries().then(rows => {
         rows.forEach(row => {
             const dictOpts = opts.dictionaries[row.title] || {enableTerms: true, enableKanji: false};
@@ -182,13 +185,47 @@ function populateDictionaries(opts) {
         });
 
         $('.dict-delete').click(e => {
-            const dict = $(e.target).closest('.dict');
+            const button = $(e.target);
+            const dict = button.closest('.dict');
             const title = dict.data('title');
-            yomichan().translator.database.deleteDictionary(title);
-            dict.slideUp();
+
+            button.prop('disabled', true);
+            yomichan().translator.database.deleteDictionary(title).then(() => {
+                dict.slideUp();
+            }).catch(error => {
+                dictError.show().find('span').text(error);
+            }).then(() => {
+                button.prop('disabled', false);
+            });
         });
 
         container.find('.dict input').change(onOptionsChanged);
+    }).catch(error => {
+        dictError.show().find('span').text(error);
+    });
+}
+
+function onImportDictionary() {
+    const dictInputs = $('#dict-import').find('input');
+    dictInputs.prop('disabled', true);
+
+    const dictError = $('#dict-error');
+    dictError.hide();
+
+    const progressbar = $('#dict-import-progress');
+    const progressValue = progressbar.find('div');
+    progressbar.show();
+
+    const callback = (total, current) => {
+        $('.progress-bar').css('width', `${current / total * 100.0}%`);
+    };
+
+    const dictUrl = $('#dict-import-url').val();
+    yomichan().translator.database.importDictionary(dictUrl, callback).catch(error => {
+        dictError.show().find('span').text(error);
+    }).then(() => {
+        dictInputs.prop('disabled', false);
+        progressbar.hide();
     });
 }
 
@@ -303,7 +340,7 @@ $(document).ready(() => {
             if (url.includes('/')) {
                 control.val(url);
             } else {
-                control.val(chrome.extension.getURL(`bg/data/${url}`));
+                control.val(chrome.extension.getURL(`bg/data/${url}/index.json`));
             }
             control.trigger('input');
         });
@@ -314,6 +351,8 @@ $(document).ready(() => {
             $('#dict-import-start').prop('disabled', disable);
         });
 
+        $('#dict-import-start').click(onImportDictionary);
+
         populateDictionaries(opts);
         populateAnkiDeckAndModel(opts);
         updateVisibility(opts);
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index d42d972d..ce44de8d 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -13,7 +13,7 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + " <small>v."
     + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
-    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right\">\n            <button type=\"button\" class=\"dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n\n    <div class=\"checkbox "
+    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n\n    <div class=\"checkbox "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-terms\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index e99cdeab..8a21b264 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -112,6 +112,7 @@ function loadJson(url) {
     return new Promise((resolve, reject) => {
         const xhr = new XMLHttpRequest();
         xhr.addEventListener('load', () => resolve(JSON.parse(xhr.responseText)));
+        xhr.addEventListener('error', () => reject('failed to execute network request'));
         xhr.open('GET', chrome.extension.getURL(url));
         xhr.send();
     });
diff --git a/ext/bg/options.html b/ext/bg/options.html
index 800fe8e9..8c19ac8f 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -69,11 +69,11 @@
 
                 <div class="alert alert-danger" id="dict-error">
                     <strong>Error:</strong>
-                    <span>Something went wrong!</span>
+                    <span></span>
                 </div>
 
                 <div class="progress" id="dict-import-progress">
-                    <div id="dict-import-progress-value" class="progress-bar progress-bar-striped" style="width: 45%"></div>
+                    <div class="progress-bar progress-bar-striped" style="width: 0%"></div>
                 </div>
 
                 <div class="input-group" id="dict-import">
@@ -84,7 +84,7 @@
                             <li><a href="#" data-url="enamdict">JMnedict</a></li>
                             <li><a href="#" data-url="kanjidic">KANJIDIC2</a></li>
                             <li role="separator" class="divider"></li>
-                            <li><a href="#" data-url="http://localhost:9876">Local dictionary</a></li>
+                            <li><a href="#" data-url="http://localhost:9876/index.json">Local dictionary</a></li>
                         </ul>
                     </div>
                     <input type="text" id="dict-import-url" class="form-control" placeholder="Dictionary import URL">
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 73bce769..526e856b 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -3,7 +3,7 @@
         <div class="col-xs-8">
             <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4>
         </div>
-        <div class="col-xs-4 text-right">
+        <div class="col-xs-4 text-right disabled">
             <button type="button" class="dict-delete btn btn-danger">Delete</button>
         </div>
     </div>
-- 
cgit v1.2.3


From bd29cc0c16567df3bafe95f4d02cdbf741547e99 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 7 Nov 2016 20:55:06 -0800
Subject: WIP

---
 ext/bg/js/database.js     |   4 +-
 ext/bg/js/options-form.js | 196 ++++++++++++++++++++++------------------------
 ext/bg/js/templates.js    |   2 +-
 ext/bg/options.html       |  16 ++--
 tmpl/dictionary.html      |   2 +-
 5 files changed, 110 insertions(+), 110 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 7cf92c44..79a0a7a1 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -20,7 +20,7 @@
 class Database {
     constructor() {
         this.db = null;
-        this.dbVer = 7;
+        this.dbVer = 6;
         this.entities = null;
     }
 
@@ -37,6 +37,8 @@ class Database {
             dictionaries: '++, title, version',
             meta: 'name, value',
         });
+
+        return Promise.resolve();
     }
 
     prepare() {
diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index ce829698..795cdaff 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -21,6 +21,10 @@ function yomichan() {
     return chrome.extension.getBackgroundPage().yomichan;
 }
 
+function database() {
+    return yomichan().translator.database;
+}
+
 function anki() {
     return yomichan().anki;
 }
@@ -43,25 +47,8 @@ function modelIdToFieldOptKey(id) {
 
 function modelIdToMarkers(id) {
     return {
-        'anki-term-model': [
-            'audio',
-            'expression',
-            'expression-furigana',
-            'glossary',
-            'glossary-list',
-            'reading',
-            'sentence',
-            'tags',
-            'url'
-        ],
-        'anki-kanji-model': [
-            'character',
-            'glossary',
-            'glossary-list',
-            'kunyomi',
-            'onyomi',
-            'url'
-        ],
+        'anki-term-model': ['audio', 'expression', 'expression-furigana', 'glossary', 'glossary-list', 'reading', 'sentence', 'tags', 'url'],
+        'anki-kanji-model': ['character', 'glossary', 'glossary-list', 'kunyomi', 'onyomi', 'url'],
     }[id];
 }
 
@@ -91,7 +78,7 @@ function getFormValues() {
         optsNew.ankiKanjiModel = $('#anki-kanji-model').val();
         optsNew.ankiKanjiFields = fieldsToDict($('#kanji .anki-field-value'));
 
-        $('.dict').each((index, element) => {
+        $('.dict-group').each((index, element) => {
             const dictionary = $(element);
             const title = dictionary.data('title');
             const enableTerms = dictionary.find('.dict-enable-terms').prop('checked');
@@ -128,48 +115,17 @@ function updateVisibility(opts) {
     }
 }
 
-function populateAnkiDeckAndModel(opts) {
-    const ankiSpinner = $('#anki-spinner');
-    ankiSpinner.show();
-
-    const ankiFormat = $('#anki-format');
-    ankiFormat.hide();
-
-    const ankiDeck = $('.anki-deck');
-    ankiDeck.find('option').remove();
-
-    const ankiModel = $('.anki-model');
-    ankiModel.find('option').remove();
-
-    return anki().getDeckNames().then(names => {
-        names.forEach(name => ankiDeck.append($('<option/>', {value: name, text: name})));
-        $('#anki-term-deck').val(opts.ankiTermDeck);
-        $('#anki-kanji-deck').val(opts.ankiKanjiDeck);
-    }).then(() => {
-        return anki().getModelNames();
-    }).then(names => {
-        names.forEach(name => ankiModel.append($('<option/>', {value: name, text: name})));
-        return populateAnkiFields($('#anki-term-model').val(opts.ankiTermModel), opts);
-    }).then(() => {
-        return populateAnkiFields($('#anki-kanji-model').val(opts.ankiKanjiModel), opts);
-    }).then(() => {
-        $('#anki-error').hide();
-        ankiFormat.show();
-    }).catch(error => {
-        $('#anki-error').show().find('span').text(error);
-    }).then(() => {
-        ankiSpinner.hide();
-    });
-}
-
 function populateDictionaries(opts) {
-    const container = $('.dicts');
-    container.empty();
+    const dictGroups = $('.dict-groups');
+    dictGroups.empty();
 
     const dictError = $('#dict-error');
     dictError.hide();
 
-    yomichan().translator.database.getDictionaries().then(rows => {
+    const dictLaggy = $('#dict-laggy');
+    dictLaggy.show();
+
+    database().getDictionaries().then(rows => {
         rows.forEach(row => {
             const dictOpts = opts.dictionaries[row.title] || {enableTerms: true, enableKanji: false};
             const html = Handlebars.templates['dictionary.html']({
@@ -181,51 +137,105 @@ function populateDictionaries(opts) {
                 enableKanji: dictOpts.enableKanji
             });
 
-            container.append($(html));
+            dictGroups.append($(html));
         });
 
-        $('.dict-delete').click(e => {
-            const button = $(e.target);
-            const dict = button.closest('.dict');
-            const title = dict.data('title');
-
-            button.prop('disabled', true);
-            yomichan().translator.database.deleteDictionary(title).then(() => {
-                dict.slideUp();
-            }).catch(error => {
-                dictError.show().find('span').text(error);
-            }).then(() => {
-                button.prop('disabled', false);
-            });
-        });
+        $('.dict-enable-terms, .dict-enable.kanji').change(onOptionsChanged);
+        $('.dict-delete').click(onDictionaryDelete);
+    }).catch(error => {
+        dictError.show().find('span').text(error);
+    }).then(() => {
+        dictLaggy.hide();
+    });
+}
 
-        container.find('.dict input').change(onOptionsChanged);
+function onDictionaryDelete() {
+    const dictDelete = $(this);
+    dictDelete.prop('disabled', true);
+
+    const dictGroup = dictDelete.closest('.dict-group');
+    database().deleteDictionary(dictGroup.data('title')).then(() => {
+        dictGroup.slideUp();
     }).catch(error => {
         dictError.show().find('span').text(error);
+        dictDelete.prop('disabled', false);
     });
 }
 
-function onImportDictionary() {
-    const dictInputs = $('#dict-import').find('input');
-    dictInputs.prop('disabled', true);
+function onDictionaryImport() {
+    const dictImport = $(this);
+    dictImport.prop('disabled', true);
 
     const dictError = $('#dict-error');
     dictError.hide();
 
-    const progressbar = $('#dict-import-progress');
-    const progressValue = progressbar.find('div');
+    const progressbar = $('#dict-progress');
     progressbar.show();
 
     const callback = (total, current) => {
-        $('.progress-bar').css('width', `${current / total * 100.0}%`);
+        progressbar.find('div').css('width', `${current / total * 100.0}%`);
     };
 
-    const dictUrl = $('#dict-import-url').val();
-    yomichan().translator.database.importDictionary(dictUrl, callback).catch(error => {
+    database().importDictionary($('#dict-url').val(), callback).then(() => {
+        return loadOptions().then(opts => populateDictionaries(opts));
+    }).catch(error => {
         dictError.show().find('span').text(error);
     }).then(() => {
-        dictInputs.prop('disabled', false);
         progressbar.hide();
+        dictImport.prop('disabled', false);
+    });
+}
+
+function onDictionarySetUrl(e) {
+    e.preventDefault();
+
+    const dictUrl = $('#dict-url');
+    const url = $(this).data('url');
+
+    if (url.includes('/')) {
+        dictUrl.val(url);
+    } else {
+        dictUrl.val(chrome.extension.getURL(`bg/data/${url}/index.json`));
+    }
+
+    dictUrl.trigger('input');
+}
+
+function onDictionaryUpdateUrl() {
+    $('#dict-import').prop('disabled', $(this).val().length === 0);
+}
+
+function populateAnkiDeckAndModel(opts) {
+    const ankiSpinner = $('#anki-spinner');
+    ankiSpinner.show();
+
+    const ankiFormat = $('#anki-format');
+    ankiFormat.hide();
+
+    const ankiDeck = $('.anki-deck');
+    ankiDeck.find('option').remove();
+
+    const ankiModel = $('.anki-model');
+    ankiModel.find('option').remove();
+
+    return anki().getDeckNames().then(names => {
+        names.forEach(name => ankiDeck.append($('<option/>', {value: name, text: name})));
+        $('#anki-term-deck').val(opts.ankiTermDeck);
+        $('#anki-kanji-deck').val(opts.ankiKanjiDeck);
+    }).then(() => {
+        return anki().getModelNames();
+    }).then(names => {
+        names.forEach(name => ankiModel.append($('<option/>', {value: name, text: name})));
+        return populateAnkiFields($('#anki-term-model').val(opts.ankiTermModel), opts);
+    }).then(() => {
+        return populateAnkiFields($('#anki-kanji-model').val(opts.ankiKanjiModel), opts);
+    }).then(() => {
+        $('#anki-error').hide();
+        ankiFormat.show();
+    }).catch(error => {
+        $('#anki-error').show().find('span').text(error);
+    }).then(() => {
+        ankiSpinner.hide();
     });
 }
 
@@ -333,25 +343,9 @@ $(document).ready(() => {
         $('input, select').not('.anki-model').change(onOptionsChanged);
         $('.anki-model').change(onAnkiModelChanged);
 
-        $('#dict-import a').click(e => {
-            e.preventDefault();
-            const control = $('#dict-import-url');
-            const url = $(e.target).data('url');
-            if (url.includes('/')) {
-                control.val(url);
-            } else {
-                control.val(chrome.extension.getURL(`bg/data/${url}/index.json`));
-            }
-            control.trigger('input');
-        });
-
-        const dictImportUrl = $('#dict-import-url');
-        dictImportUrl.on('input', () => {
-            const disable = dictImportUrl.val().trim().length === 0;
-            $('#dict-import-start').prop('disabled', disable);
-        });
-
-        $('#dict-import-start').click(onImportDictionary);
+        $('#dict-importer a').click(onDictionarySetUrl);
+        $('#dict-import').click(onDictionaryImport);
+        $('#dict-url').on('input', onDictionaryUpdateUrl);
 
         populateDictionaries(opts);
         populateAnkiDeckAndModel(opts);
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index ce44de8d..206ed605 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -7,7 +7,7 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
-  return "<div class=\"dict well well-sm\" data-title=\""
+  return "<div class=\"dict-group well well-sm\" data-title=\""
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + "\">\n    <div class=\"row\">\n        <div class=\"col-xs-8\">\n            <h4><span class=\"text-muted glyphicon glyphicon-book\"></span> "
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
diff --git a/ext/bg/options.html b/ext/bg/options.html
index 8c19ac8f..651f5723 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -6,7 +6,7 @@
         <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap.min.css">
         <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css">
         <style>
-            #anki-spinner, #anki-general, #anki-error, #dict-error, #dict-import-progress, #options-advanced {
+            #anki-spinner, #anki-general, #anki-error, #dict-error, #dict-progress, #dict-laggy, #options-advanced {
                 display: none;
             }
 
@@ -65,18 +65,22 @@
             <div>
                 <h3>Dictionaries</h3>
 
-                <div class="dicts"></div>
+                <div class="dict-groups"></div>
 
                 <div class="alert alert-danger" id="dict-error">
                     <strong>Error:</strong>
                     <span></span>
                 </div>
 
-                <div class="progress" id="dict-import-progress">
+                <div class="alert alert-warning" id="dict-laggy">
+                    The dictionary database appears to be busy; please wait for currently executing tasks to complete.
+                </div>
+
+                <div class="progress" id="dict-progress">
                     <div class="progress-bar progress-bar-striped" style="width: 0%"></div>
                 </div>
 
-                <div class="input-group" id="dict-import">
+                <div class="input-group" id="dict-importer">
                     <div class="input-group-btn">
                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
                         <ul class="dropdown-menu">
@@ -87,9 +91,9 @@
                             <li><a href="#" data-url="http://localhost:9876/index.json">Local dictionary</a></li>
                         </ul>
                     </div>
-                    <input type="text" id="dict-import-url" class="form-control" placeholder="Dictionary import URL">
+                    <input type="text" id="dict-url" class="form-control" placeholder="Dictionary import URL">
                     <div class="input-group-btn disabled">
-                        <button type="button" id="dict-import-start" class="btn btn-primary" disabled>Import</button>
+                        <button type="button" id="dict-import" class="btn btn-primary" disabled>Import</button>
                     </div>
                 </div>
             </div>
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 526e856b..035c0755 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -1,4 +1,4 @@
-<div class="dict well well-sm" data-title="{{title}}">
+<div class="dict-group well well-sm" data-title="{{title}}">
     <div class="row">
         <div class="col-xs-8">
             <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4>
-- 
cgit v1.2.3


From 885f508edafdcf7f060dde73b6bae65f56bed3d2 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Tue, 8 Nov 2016 19:41:03 -0800
Subject: WIP

---
 ext/bg/js/options-form.js | 2 +-
 ext/bg/js/templates.js    | 2 +-
 ext/bg/options.html       | 4 ++--
 tmpl/dictionary.html      | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index f5ca3ce2..8bb60808 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -172,7 +172,7 @@ function onDictionaryImport() {
     const dictError = $('#dict-error');
     dictError.hide();
 
-    const progressbar = $('#dict-progress');
+    const progressbar = $('#dict-import-progress');
     progressbar.show();
 
     const callback = (total, current) => {
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 206ed605..d198a76f 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -13,7 +13,7 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + " <small>v."
     + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
-    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n\n    <div class=\"checkbox "
+    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n    <div class=\"progress\" id=\"dict-delete-progress\">\n        <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n    </div>\n    <div class=\"checkbox "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-terms\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
diff --git a/ext/bg/options.html b/ext/bg/options.html
index d7aead07..a3c66ce3 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -6,7 +6,7 @@
         <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap.min.css">
         <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css">
         <style>
-            #anki-spinner, #anki-general, #anki-error, #dict-error, #dict-progress, #dict-laggy, #options-advanced {
+            #anki-spinner, #anki-general, #anki-error, #dict-error, #dict-import-progress, #dict-delete-progress, #dict-laggy, #options-advanced {
                 display: none;
             }
 
@@ -76,7 +76,7 @@
                     The dictionary database appears to be busy; please wait for currently executing tasks to complete.
                 </div>
 
-                <div class="progress" id="dict-progress">
+                <div class="progress" id="dict-import-progress">
                     <div class="progress-bar progress-bar-striped" style="width: 0%"></div>
                 </div>
 
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 035c0755..4f2d9790 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -7,7 +7,9 @@
             <button type="button" class="dict-delete btn btn-danger">Delete</button>
         </div>
     </div>
-
+    <div class="progress" id="dict-delete-progress">
+        <div class="progress-bar progress-bar-striped progress-bar-danger" style="width: 0%"></div>
+    </div>
     <div class="checkbox {{#unless hasTerms}}disabled{{/unless}}">
         <label><input type="checkbox" class="dict-enable-terms" {{#unless hasTerms}}disabled{{/unless}} {{#if enableTerms}}checked{{/if}}> Enable term search</label>
     </div>
-- 
cgit v1.2.3


From 1b1f4a3ed7eaf29379be576e31ec4116347c6140 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Tue, 8 Nov 2016 21:02:12 -0800
Subject: WIP

---
 ext/bg/js/options-form.js | 23 ++++++++++++++---------
 ext/bg/js/templates.js    |  4 ++--
 ext/bg/options.html       |  4 +++-
 tmpl/dictionary.html      |  8 ++++----
 4 files changed, 23 insertions(+), 16 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index 808aa941..1fcd0838 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -150,8 +150,7 @@ function populateDictionaries(opts) {
 }
 
 function onDictionaryDelete() {
-    const dictDelete = $(this);
-    dictDelete.prop('disabled', true);
+    const dictGroup = $(this).closest('.dict-group');
 
     const dictError = $('#dict-error');
     dictError.hide();
@@ -159,14 +158,20 @@ function onDictionaryDelete() {
     const dictSpinner = $('#dict-spinner');
     dictSpinner.show();
 
-    const dictGroup = dictDelete.closest('.dict-group');
+    const dictProgress = dictGroup.find('.dict-delete-progress');
+    dictProgress.show();
+
+    const dictControls = dictGroup.find('.dict-controls');
+    dictControls.hide();
+
     database().deleteDictionary(dictGroup.data('title')).then(() => {
         dictGroup.slideUp();
     }).catch(error => {
         dictError.show().find('span').text(error);
-        dictDelete.prop('disabled', false);
     }).then(() => {
         dictSpinner.hide();
+        dictProgress.hide();
+        dictControls.show();
     });
 }
 
@@ -177,14 +182,14 @@ function onDictionaryImport() {
     const dictError = $('#dict-error');
     dictError.hide();
 
+    const dictProgress = $('#dict-import-progress');
+    dictProgress.show();
+
     const dictSpinner = $('#dict-spinner');
     dictSpinner.show();
 
-    const progressbar = $('#dict-import-progress');
-    progressbar.show();
-
     const callback = (total, current) => {
-        progressbar.find('div').css('width', `${current / total * 100.0}%`);
+        dictProgress.find('div').css('width', `${current / total * 100.0}%`);
     };
 
     const dictUrl = $('#dict-url');
@@ -196,7 +201,7 @@ function onDictionaryImport() {
         dictImport.prop('disabled', false);
         dictUrl.val('');
         dictUrl.trigger('input');
-        progressbar.hide();
+        dictProgress.hide();
         dictSpinner.hide();
     });
 }
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index d198a76f..34347100 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -13,13 +13,13 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + " <small>v."
     + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
-    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n    <div class=\"progress\" id=\"dict-delete-progress\">\n        <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n    </div>\n    <div class=\"checkbox "
+    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-controls dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n    <div class=\"progress dict-delete-progress\">\n        <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n    </div>\n    <div class=\"checkbox dict-controls "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-terms\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + " "
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.enableTerms : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "> Enable term search</label>\n    </div>\n    <div class=\"checkbox "
+    + "> Enable term search</label>\n    </div>\n    <div class=\"checkbox dict-controls "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasKanji : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-kanji\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasKanji : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
diff --git a/ext/bg/options.html b/ext/bg/options.html
index e3f95bd4..57c6a482 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -6,7 +6,9 @@
         <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap.min.css">
         <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css">
         <style>
-            #anki-spinner, #anki-general, #anki-error, #dict-spinner, #dict-import-progress, #dict-delete-progress, #dict-laggy, #options-advanced {
+            #anki-spinner, #anki-general, #anki-error,
+            #dict-spinner, #dict-import-progress, .dict-delete-progress,
+            #options-advanced {
                 display: none;
             }
 
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 4f2d9790..9b6a6d1d 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -4,16 +4,16 @@
             <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4>
         </div>
         <div class="col-xs-4 text-right disabled">
-            <button type="button" class="dict-delete btn btn-danger">Delete</button>
+            <button type="button" class="dict-controls dict-delete btn btn-danger">Delete</button>
         </div>
     </div>
-    <div class="progress" id="dict-delete-progress">
+    <div class="progress dict-delete-progress">
         <div class="progress-bar progress-bar-striped progress-bar-danger" style="width: 0%"></div>
     </div>
-    <div class="checkbox {{#unless hasTerms}}disabled{{/unless}}">
+    <div class="checkbox dict-controls {{#unless hasTerms}}disabled{{/unless}}">
         <label><input type="checkbox" class="dict-enable-terms" {{#unless hasTerms}}disabled{{/unless}} {{#if enableTerms}}checked{{/if}}> Enable term search</label>
     </div>
-    <div class="checkbox {{#unless hasKanji}}disabled{{/unless}}">
+    <div class="checkbox dict-controls {{#unless hasKanji}}disabled{{/unless}}">
         <label><input type="checkbox" class="dict-enable-kanji" {{#unless hasKanji}}disabled{{/unless}} {{#if enableKanji}}checked{{/if}}> Enable Kanji search</label>
     </div>
 </div>
-- 
cgit v1.2.3


From 45877c460235e1578b01d46bae331979dd8d887f Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Tue, 8 Nov 2016 21:08:36 -0800
Subject: WIP

---
 ext/bg/js/templates.js | 2 +-
 tmpl/dictionary.html   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 34347100..c959af2a 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -13,7 +13,7 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + " <small>v."
     + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
-    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-controls dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n    <div class=\"progress dict-delete-progress\">\n        <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n    </div>\n    <div class=\"checkbox dict-controls "
+    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-controls dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n    <div class=\"progress dict-delete-progress\">\n        <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n    </div>\n    <div class=\"dict-delete-progress\">Deleting dictionary data, please be patient.</div>\n    <div class=\"checkbox dict-controls "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-terms\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 9b6a6d1d..99fd220e 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -10,6 +10,7 @@
     <div class="progress dict-delete-progress">
         <div class="progress-bar progress-bar-striped progress-bar-danger" style="width: 0%"></div>
     </div>
+    <div class="dict-delete-progress">Deleting dictionary data, please be patient.</div>
     <div class="checkbox dict-controls {{#unless hasTerms}}disabled{{/unless}}">
         <label><input type="checkbox" class="dict-enable-terms" {{#unless hasTerms}}disabled{{/unless}} {{#if enableTerms}}checked{{/if}}> Enable term search</label>
     </div>
-- 
cgit v1.2.3


From cbe1b2e2a303b54762c71a8c03e1e8656352e6c4 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Tue, 8 Nov 2016 21:10:46 -0800
Subject: WIP

---
 ext/bg/js/templates.js | 2 +-
 tmpl/dictionary.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index c959af2a..cbfa932c 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -13,7 +13,7 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + " <small>v."
     + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
-    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-controls dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n    <div class=\"progress dict-delete-progress\">\n        <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n    </div>\n    <div class=\"dict-delete-progress\">Deleting dictionary data, please be patient.</div>\n    <div class=\"checkbox dict-controls "
+    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-controls dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n    <div class=\"dict-delete-progress\">Deleting dictionary data, please be patient.</div>\n    <div class=\"progress dict-delete-progress\">\n        <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n    </div>\n    <div class=\"checkbox dict-controls "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-terms\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 99fd220e..09102b51 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -7,10 +7,10 @@
             <button type="button" class="dict-controls dict-delete btn btn-danger">Delete</button>
         </div>
     </div>
+    <div class="dict-delete-progress">Deleting dictionary data, please be patient.</div>
     <div class="progress dict-delete-progress">
         <div class="progress-bar progress-bar-striped progress-bar-danger" style="width: 0%"></div>
     </div>
-    <div class="dict-delete-progress">Deleting dictionary data, please be patient.</div>
     <div class="checkbox dict-controls {{#unless hasTerms}}disabled{{/unless}}">
         <label><input type="checkbox" class="dict-enable-terms" {{#unless hasTerms}}disabled{{/unless}} {{#if enableTerms}}checked{{/if}}> Enable term search</label>
     </div>
-- 
cgit v1.2.3


From 121d5e7c5eef4f0ae8badeab61101f48ddec02c9 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Tue, 8 Nov 2016 21:16:51 -0800
Subject: WIP

---
 ext/bg/js/templates.js | 2 +-
 tmpl/dictionary.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index cbfa932c..f80824f9 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -13,7 +13,7 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + " <small>v."
     + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
-    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-controls dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n    <div class=\"dict-delete-progress\">Deleting dictionary data, please be patient.</div>\n    <div class=\"progress dict-delete-progress\">\n        <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n    </div>\n    <div class=\"checkbox dict-controls "
+    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-controls dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n    <div class=\"dict-delete-progress\">Dictionary data is being deleted, please be patient...</div>\n    <div class=\"progress dict-delete-progress\">\n        <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n    </div>\n    <div class=\"checkbox dict-controls "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-terms\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 09102b51..134209c8 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -7,7 +7,7 @@
             <button type="button" class="dict-controls dict-delete btn btn-danger">Delete</button>
         </div>
     </div>
-    <div class="dict-delete-progress">Deleting dictionary data, please be patient.</div>
+    <div class="dict-delete-progress">Dictionary data is being deleted, please be patient...</div>
     <div class="progress dict-delete-progress">
         <div class="progress-bar progress-bar-striped progress-bar-danger" style="width: 0%"></div>
     </div>
-- 
cgit v1.2.3


From 0ff41d5843b3bf39994ae32e4ab623bfe0e4e3ca Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Thu, 10 Nov 2016 19:36:45 -0800
Subject: Delete dictionary deletion

---
 ext/bg/js/database.js     | 73 -----------------------------------------------
 ext/bg/js/options-form.js | 33 +--------------------
 ext/bg/js/templates.js    |  6 ++--
 ext/bg/options.html       |  6 ++--
 tmpl/dictionary.html      | 17 ++---------
 5 files changed, 10 insertions(+), 125 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index e3a62886..24ee7c03 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -141,79 +141,6 @@ class Database {
         return this.db.dictionaries.toArray();
     }
 
-    deleteDictionary(title, callback) {
-        if (this.db === null) {
-            return Promise.reject('database not initialized');
-        }
-
-        return this.db.dictionaries.where('title').equals(title).first(info => {
-            if (!info) {
-                return;
-            }
-
-            let termCounter = Promise.resolve(0);
-            if (info.hasTerms) {
-                termCounter = this.db.terms.where('dictionary').equals(title).count();
-            }
-
-            let kanjiCounter = Promise.resolve(0);
-            if (info.hasKanji) {
-                kanjiCounter = this.db.kanji.where('dictionary').equals(title).count();
-            }
-
-            return Promise.all([termCounter, kanjiCounter]).then(([termCount, kanjiCount]) => {
-                const totalCount = termCount + kanjiCount;
-                let deletedCount = 0;
-
-                let termDeleter = Promise.resolve();
-                if (info.hasTerms) {
-                    const termDeleterFunc = () => {
-                        return this.db.terms.where('dictionary').equals(title).limit(1000).delete().then(count => {
-                            if (count === 0) {
-                                return Promise.resolve();
-                            }
-
-                            deletedCount += count;
-                            if (callback) {
-                                callback(totalCount, deletedCount);
-                            }
-
-                            return termDeleterFunc();
-                        });
-                    };
-
-                    termDeleter = termDeleterFunc();
-                }
-
-                let kanjiDeleter = Promise.resolve();
-                if (info.hasKanji) {
-                    const kanjiDeleterFunc = () => {
-                        return this.db.kanji.where('dictionary').equals(title).limit(1000).delete().then(count => {
-                            if (count === 0) {
-                                return Promise.resolve();
-                            }
-
-                            deletedCount += count;
-                            if (callback) {
-                                callback(totalCount, deletedCount);
-                            }
-
-                            return kanjiDeleterFunc();
-                        });
-                    };
-
-                    kanjiDeleter = kanjiDeleterFunc();
-                }
-
-                return Promise.all([termDeleter, kanjiDeleter]);
-            });
-        }).then(() => {
-            return this.db.entities.where('dictionary').equals(title).delete();
-        }).then(() => {
-            return this.db.dictionaries.where('title').equals(title).delete();
-        });
-    }
-
     importDictionary(indexUrl, callback) {
         if (this.db === null) {
             return Promise.reject('database not initialized');
diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index 1f64f8d0..501848ad 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -141,7 +141,6 @@ function populateDictionaries(opts) {
         });
 
         $('.dict-enable-terms, .dict-enable.kanji').change(onOptionsChanged);
-        $('.dict-delete').click(onDictionaryDelete);
     }).catch(error => {
         dictError.show().find('span').text(error);
     }).then(() => {
@@ -149,36 +148,6 @@ function populateDictionaries(opts) {
     });
 }
 
-function onDictionaryDelete() {
-    const dictGroup = $(this).closest('.dict-group');
-
-    const dictError = $('#dict-error');
-    dictError.hide();
-
-    const dictSpinner = $('#dict-spinner');
-    dictSpinner.show();
-
-    const dictProgress = dictGroup.find('.dict-delete-progress');
-    dictProgress.show();
-
-    const dictControls = dictGroup.find('.dict-controls');
-    dictControls.hide();
-
-    const callback = (total, current) => {
-        dictProgress.find('div').css('width', `${current / total * 100.0}%`);
-    };
-
-    database().deleteDictionary(dictGroup.data('title'), callback).then(() => {
-        dictGroup.slideUp();
-    }).catch(error => {
-        dictError.show().find('span').text(error);
-    }).then(() => {
-        dictSpinner.hide();
-        dictProgress.hide();
-        dictControls.show();
-    });
-}
-
 function onDictionaryImport() {
     const dictImport = $(this);
     dictImport.prop('disabled', true);
@@ -186,7 +155,7 @@ function onDictionaryImport() {
     const dictError = $('#dict-error');
     dictError.hide();
 
-    const dictProgress = $('.dict-import-progress');
+    const dictProgress = $('.dict-progress');
     dictProgress.show();
 
     const dictSpinner = $('#dict-spinner');
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index f80824f9..988533fb 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -9,17 +9,17 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
 
   return "<div class=\"dict-group well well-sm\" data-title=\""
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
-    + "\">\n    <div class=\"row\">\n        <div class=\"col-xs-8\">\n            <h4><span class=\"text-muted glyphicon glyphicon-book\"></span> "
+    + "\">\n    <h4><span class=\"text-muted glyphicon glyphicon-book\"></span> "
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + " <small>v."
     + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
-    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-controls dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n    <div class=\"dict-delete-progress\">Dictionary data is being deleted, please be patient...</div>\n    <div class=\"progress dict-delete-progress\">\n        <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n    </div>\n    <div class=\"checkbox dict-controls "
+    + "</small></h4>\n    <div class=\"checkbox "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-terms\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + " "
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.enableTerms : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "> Enable term search</label>\n    </div>\n    <div class=\"checkbox dict-controls "
+    + "> Enable term search</label>\n    </div>\n    <div class=\"checkbox "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasKanji : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-kanji\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasKanji : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
diff --git a/ext/bg/options.html b/ext/bg/options.html
index 4f74a58e..9026520b 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -7,7 +7,7 @@
         <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css">
         <style>
             #anki-spinner, #anki-general, #anki-error,
-            #dict-spinner, .dict-import-progress, .dict-delete-progress,
+            #dict-spinner, .dict-progress,
             #options-advanced {
                 display: none;
             }
@@ -75,8 +75,8 @@
                     <span></span>
                 </div>
 
-                <div class="dict-import-progress">Dictionary data is being imported, please be patient...</div>
-                <div class="progress dict-import-progress">
+                <div class="dict-progress">Dictionary data is being imported, please be patient...</div>
+                <div class="progress dict-progress">
                     <div class="progress-bar progress-bar-striped" style="width: 0%"></div>
                 </div>
 
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 134209c8..7da9f660 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -1,20 +1,9 @@
 <div class="dict-group well well-sm" data-title="{{title}}">
-    <div class="row">
-        <div class="col-xs-8">
-            <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4>
-        </div>
-        <div class="col-xs-4 text-right disabled">
-            <button type="button" class="dict-controls dict-delete btn btn-danger">Delete</button>
-        </div>
-    </div>
-    <div class="dict-delete-progress">Dictionary data is being deleted, please be patient...</div>
-    <div class="progress dict-delete-progress">
-        <div class="progress-bar progress-bar-striped progress-bar-danger" style="width: 0%"></div>
-    </div>
-    <div class="checkbox dict-controls {{#unless hasTerms}}disabled{{/unless}}">
+    <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4>
+    <div class="checkbox {{#unless hasTerms}}disabled{{/unless}}">
         <label><input type="checkbox" class="dict-enable-terms" {{#unless hasTerms}}disabled{{/unless}} {{#if enableTerms}}checked{{/if}}> Enable term search</label>
     </div>
-    <div class="checkbox dict-controls {{#unless hasKanji}}disabled{{/unless}}">
+    <div class="checkbox {{#unless hasKanji}}disabled{{/unless}}">
         <label><input type="checkbox" class="dict-enable-kanji" {{#unless hasKanji}}disabled{{/unless}} {{#if enableKanji}}checked{{/if}}> Enable Kanji search</label>
     </div>
 </div>
-- 
cgit v1.2.3


From 371c07ab1fb6125c065589d71c93477e0456aada Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 12 Nov 2016 19:34:02 -0800
Subject: Revert "Delete dictionary deletion"

This reverts commit 0ff41d5843b3bf39994ae32e4ab623bfe0e4e3ca.
---
 ext/bg/js/database.js     | 73 +++++++++++++++++++++++++++++++++++++++++++++++
 ext/bg/js/options-form.js | 33 ++++++++++++++++++++-
 ext/bg/js/templates.js    |  6 ++--
 ext/bg/options.html       |  6 ++--
 tmpl/dictionary.html      | 17 +++++++++--
 5 files changed, 125 insertions(+), 10 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 7f4c6ac6..06786881 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -148,6 +148,79 @@ class Database {
         return this.db.dictionaries.toArray();
     }
 
+    deleteDictionary(title, callback) {
+        if (this.db === null) {
+            return Promise.reject('database not initialized');
+        }
+
+        return this.db.dictionaries.where('title').equals(title).first(info => {
+            if (!info) {
+                return;
+            }
+
+            let termCounter = Promise.resolve(0);
+            if (info.hasTerms) {
+                termCounter = this.db.terms.where('dictionary').equals(title).count();
+            }
+
+            let kanjiCounter = Promise.resolve(0);
+            if (info.hasKanji) {
+                kanjiCounter = this.db.kanji.where('dictionary').equals(title).count();
+            }
+
+            return Promise.all([termCounter, kanjiCounter]).then(([termCount, kanjiCount]) => {
+                const totalCount = termCount + kanjiCount;
+                let deletedCount = 0;
+
+                let termDeleter = Promise.resolve();
+                if (info.hasTerms) {
+                    const termDeleterFunc = () => {
+                        return this.db.terms.where('dictionary').equals(title).limit(1000).delete().then(count => {
+                            if (count === 0) {
+                                return Promise.resolve();
+                            }
+
+                            deletedCount += count;
+                            if (callback) {
+                                callback(totalCount, deletedCount);
+                            }
+
+                            return termDeleterFunc();
+                        });
+                    };
+
+                    termDeleter = termDeleterFunc();
+                }
+
+                let kanjiDeleter = Promise.resolve();
+                if (info.hasKanji) {
+                    const kanjiDeleterFunc = () => {
+                        return this.db.kanji.where('dictionary').equals(title).limit(1000).delete().then(count => {
+                            if (count === 0) {
+                                return Promise.resolve();
+                            }
+
+                            deletedCount += count;
+                            if (callback) {
+                                callback(totalCount, deletedCount);
+                            }
+
+                            return kanjiDeleterFunc();
+                        });
+                    };
+
+                    kanjiDeleter = kanjiDeleterFunc();
+                }
+
+                return Promise.all([termDeleter, kanjiDeleter]);
+            });
+        }).then(() => {
+            return this.db.entities.where('dictionary').equals(title).delete();
+        }).then(() => {
+            return this.db.dictionaries.where('title').equals(title).delete();
+        });
+    }
+
     importDictionary(indexUrl, callback) {
         if (this.db === null) {
             return Promise.reject('database not initialized');
diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index 3d1530ad..3a201bc5 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -141,6 +141,7 @@ function populateDictionaries(opts) {
         });
 
         $('.dict-enable-terms, .dict-enable-kanji').change(onOptionsChanged);
+        $('.dict-delete').click(onDictionaryDelete);
     }).catch(error => {
         dictError.show().find('span').text(error);
     }).then(() => {
@@ -148,6 +149,36 @@ function populateDictionaries(opts) {
     });
 }
 
+function onDictionaryDelete() {
+    const dictGroup = $(this).closest('.dict-group');
+
+    const dictError = $('#dict-error');
+    dictError.hide();
+
+    const dictSpinner = $('#dict-spinner');
+    dictSpinner.show();
+
+    const dictProgress = dictGroup.find('.dict-delete-progress');
+    dictProgress.show();
+
+    const dictControls = dictGroup.find('.dict-controls');
+    dictControls.hide();
+
+    const callback = (total, current) => {
+        dictProgress.find('div').css('width', `${current / total * 100.0}%`);
+    };
+
+    database().deleteDictionary(dictGroup.data('title'), callback).then(() => {
+        dictGroup.slideUp();
+    }).catch(error => {
+        dictError.show().find('span').text(error);
+    }).then(() => {
+        dictSpinner.hide();
+        dictProgress.hide();
+        dictControls.show();
+    });
+}
+
 function onDictionaryImport() {
     const dictImport = $(this);
     dictImport.prop('disabled', true);
@@ -155,7 +186,7 @@ function onDictionaryImport() {
     const dictError = $('#dict-error');
     dictError.hide();
 
-    const dictProgress = $('.dict-progress');
+    const dictProgress = $('.dict-import-progress');
     dictProgress.show();
 
     const dictSpinner = $('#dict-spinner');
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 988533fb..f80824f9 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -9,17 +9,17 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
 
   return "<div class=\"dict-group well well-sm\" data-title=\""
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
-    + "\">\n    <h4><span class=\"text-muted glyphicon glyphicon-book\"></span> "
+    + "\">\n    <div class=\"row\">\n        <div class=\"col-xs-8\">\n            <h4><span class=\"text-muted glyphicon glyphicon-book\"></span> "
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + " <small>v."
     + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
-    + "</small></h4>\n    <div class=\"checkbox "
+    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-controls dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n    <div class=\"dict-delete-progress\">Dictionary data is being deleted, please be patient...</div>\n    <div class=\"progress dict-delete-progress\">\n        <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n    </div>\n    <div class=\"checkbox dict-controls "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-terms\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + " "
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.enableTerms : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "> Enable term search</label>\n    </div>\n    <div class=\"checkbox "
+    + "> Enable term search</label>\n    </div>\n    <div class=\"checkbox dict-controls "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasKanji : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-kanji\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasKanji : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
diff --git a/ext/bg/options.html b/ext/bg/options.html
index 9026520b..4f74a58e 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -7,7 +7,7 @@
         <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css">
         <style>
             #anki-spinner, #anki-general, #anki-error,
-            #dict-spinner, .dict-progress,
+            #dict-spinner, .dict-import-progress, .dict-delete-progress,
             #options-advanced {
                 display: none;
             }
@@ -75,8 +75,8 @@
                     <span></span>
                 </div>
 
-                <div class="dict-progress">Dictionary data is being imported, please be patient...</div>
-                <div class="progress dict-progress">
+                <div class="dict-import-progress">Dictionary data is being imported, please be patient...</div>
+                <div class="progress dict-import-progress">
                     <div class="progress-bar progress-bar-striped" style="width: 0%"></div>
                 </div>
 
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 7da9f660..134209c8 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -1,9 +1,20 @@
 <div class="dict-group well well-sm" data-title="{{title}}">
-    <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4>
-    <div class="checkbox {{#unless hasTerms}}disabled{{/unless}}">
+    <div class="row">
+        <div class="col-xs-8">
+            <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4>
+        </div>
+        <div class="col-xs-4 text-right disabled">
+            <button type="button" class="dict-controls dict-delete btn btn-danger">Delete</button>
+        </div>
+    </div>
+    <div class="dict-delete-progress">Dictionary data is being deleted, please be patient...</div>
+    <div class="progress dict-delete-progress">
+        <div class="progress-bar progress-bar-striped progress-bar-danger" style="width: 0%"></div>
+    </div>
+    <div class="checkbox dict-controls {{#unless hasTerms}}disabled{{/unless}}">
         <label><input type="checkbox" class="dict-enable-terms" {{#unless hasTerms}}disabled{{/unless}} {{#if enableTerms}}checked{{/if}}> Enable term search</label>
     </div>
-    <div class="checkbox {{#unless hasKanji}}disabled{{/unless}}">
+    <div class="checkbox dict-controls {{#unless hasKanji}}disabled{{/unless}}">
         <label><input type="checkbox" class="dict-enable-kanji" {{#unless hasKanji}}disabled{{/unless}} {{#if enableKanji}}checked{{/if}}> Enable Kanji search</label>
     </div>
 </div>
-- 
cgit v1.2.3


From d95d607c19c0888ca96a693de541e2961bd8f4d9 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 13 Nov 2016 18:06:49 -0800
Subject: Handle no definitions

---
 ext/bg/js/templates.js | 20 ++++++++++++++++----
 ext/manifest.json      |  2 +-
 tmpl/kanji-list.html   | 10 +++++++---
 tmpl/term-list.html    | 10 +++++++---
 4 files changed, 31 insertions(+), 11 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index f80824f9..5edc5288 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -105,12 +105,18 @@ templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":functi
 templates['kanji-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = container.invokePartial(partials["kanji.html"],depth0,{"name":"kanji.html","hash":{"sequence":(depths[1] != null ? depths[1].sequence : depths[1]),"options":(depths[1] != null ? depths[1].options : depths[1]),"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"2":function(container,depth0,helpers,partials,data,blockParams,depths) {
+    var stack1;
+
+  return ((stack1 = container.invokePartial(partials["kanji.html"],depth0,{"name":"kanji.html","hash":{"sequence":(depths[1] != null ? depths[1].sequence : depths[1]),"options":(depths[1] != null ? depths[1].options : depths[1]),"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":"    ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+},"4":function(container,depth0,helpers,partials,data) {
+    return "    <p>No results found</p>\n";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return ((stack1 = container.invokePartial(partials["header.html"],depth0,{"name":"header.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
     + ((stack1 = container.invokePartial(partials["footer.html"],depth0,{"name":"footer.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"usePartial":true,"useData":true,"useDepths":true});
 templates['model.html'] = template({"1":function(container,depth0,helpers,partials,data) {
@@ -215,12 +221,18 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
 templates['term-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = container.invokePartial(partials["term.html"],depth0,{"name":"term.html","hash":{"sequence":(depths[1] != null ? depths[1].sequence : depths[1]),"options":(depths[1] != null ? depths[1].options : depths[1]),"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"2":function(container,depth0,helpers,partials,data,blockParams,depths) {
+    var stack1;
+
+  return ((stack1 = container.invokePartial(partials["term.html"],depth0,{"name":"term.html","hash":{"sequence":(depths[1] != null ? depths[1].sequence : depths[1]),"options":(depths[1] != null ? depths[1].options : depths[1]),"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":"    ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+},"4":function(container,depth0,helpers,partials,data) {
+    return "    <p>No results found</p>\n";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return ((stack1 = container.invokePartial(partials["header.html"],depth0,{"name":"header.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
-    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
     + ((stack1 = container.invokePartial(partials["footer.html"],depth0,{"name":"footer.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"usePartial":true,"useData":true,"useDepths":true});
 })();
\ No newline at end of file
diff --git a/ext/manifest.json b/ext/manifest.json
index c9730046..b182f1ea 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Yomichan",
-    "version": "0.996",
+    "version": "1.00",
 
     "description": "Japanese dictionary with Anki integration",
     "icons": {"16": "img/icon16.png", "48": "img/icon48.png", "128": "img/icon128.png"},
diff --git a/tmpl/kanji-list.html b/tmpl/kanji-list.html
index d418eafd..af38d485 100644
--- a/tmpl/kanji-list.html
+++ b/tmpl/kanji-list.html
@@ -1,5 +1,9 @@
 {{> header.html}}
-{{#each definitions}}
-{{> kanji.html addable=../addable root=../root options=../options sequence=../sequence}}
-{{/each}}
+{{#if definitions}}
+    {{#each definitions}}
+    {{> kanji.html addable=../addable root=../root options=../options sequence=../sequence}}
+    {{/each}}
+{{else}}
+    <p>No results found</p>
+{{/if}}
 {{> footer.html}}
diff --git a/tmpl/term-list.html b/tmpl/term-list.html
index d0b060c8..2088ac71 100644
--- a/tmpl/term-list.html
+++ b/tmpl/term-list.html
@@ -1,5 +1,9 @@
 {{> header.html}}
-{{#each definitions}}
-{{> term.html addable=../addable root=../root options=../options sequence=../sequence}}
-{{/each}}
+{{#if definitions}}
+    {{#each definitions}}
+    {{> term.html addable=../addable root=../root options=../options sequence=../sequence}}
+    {{/each}}
+{{else}}
+    <p>No results found</p>
+{{/if}}
 {{> footer.html}}
-- 
cgit v1.2.3


From 984a3ad756732201c043232443e1d2b28dac043d Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 14 Nov 2016 08:15:08 -0800
Subject: Cleanup

---
 ext/bg/js/options-form.js | 16 +++++++++-------
 ext/bg/js/templates.js    |  4 ++--
 ext/bg/options.html       | 20 +++++++++++++-------
 tmpl/dictionary.html      | 16 ++++++++++------
 4 files changed, 34 insertions(+), 22 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js
index d1e6fa18..ddb709d6 100644
--- a/ext/bg/js/options-form.js
+++ b/ext/bg/js/options-form.js
@@ -127,14 +127,16 @@ function onDictionaryDelete() {
     const dictProgress = dictGroup.find('.dict-delete-progress');
     dictProgress.show();
 
-    const dictControls = dictGroup.find('.dict-controls');
+    const dictControls = dictGroup.find('.dict-group-controls');
     dictControls.hide();
 
-    const callback = (total, current) => {
-        dictProgress.find('div').css('width', `${current / total * 100.0}%`);
+    const setProgress = percent => {
+        dictProgress.find('.progress-bar').css('width', `${percent}%`);
     };
 
-    database().deleteDictionary(dictGroup.data('title'), callback).catch(error => {
+    setProgress(0.0);
+
+    database().deleteDictionary(dictGroup.data('title'), (total, current) => setProgress(current / total * 100.0)).catch(error => {
         dictError.show().find('span').text(error);
     }).then(() => {
         dictSpinner.hide();
@@ -151,14 +153,14 @@ function onDictionaryImport() {
     const dictError = $('#dict-error');
     dictError.hide();
 
-    const dictProgress = $('.dict-import-progress');
+    const dictProgress = $('#dict-import-progress');
     dictProgress.show();
 
     const dictSpinner = $('#dict-spinner');
     dictSpinner.show();
 
     const setProgress = percent => {
-        dictProgress.find('div').css('width', `${percent}%`);
+        dictProgress.find('.progress-bar').css('width', `${percent}%`);
     };
 
     setProgress(0.0);
@@ -316,7 +318,7 @@ function onPurgeDb() {
     const dictControls = $('#dict-importer, #dict-groups');
     dictControls.hide();
 
-    const dictProgress = $('.dict-purge-progress');
+    const dictProgress = $('#dict-purge-progress');
     dictProgress.show();
 
     const dictError = $('#dict-error');
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 5edc5288..598d8641 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -13,13 +13,13 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + " <small>v."
     + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
-    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-controls dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n    <div class=\"dict-delete-progress\">Dictionary data is being deleted, please be patient...</div>\n    <div class=\"progress dict-delete-progress\">\n        <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n    </div>\n    <div class=\"checkbox dict-controls "
+    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-group-controls dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n\n    <div class=\"dict-delete-progress\">\n        Dictionary data is being deleted, please be patient...\n        <div class=\"progress\">\n            <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n        </div>\n    </div>\n\n    <div class=\"checkbox dict-group-controls "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-terms\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + " "
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.enableTerms : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "> Enable term search</label>\n    </div>\n    <div class=\"checkbox dict-controls "
+    + "> Enable term search</label>\n    </div>\n    <div class=\"checkbox dict-group-controls "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasKanji : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-kanji\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasKanji : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
diff --git a/ext/bg/options.html b/ext/bg/options.html
index 5b6301c6..e7a122c8 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -7,7 +7,7 @@
         <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.6-dist/css/bootstrap-theme.min.css">
         <style>
             #anki-spinner, #anki-general, #anki-error,
-            #dict-spinner, #dict-error, #dict-warning, .dict-purge-progress, .dict-import-progress, .dict-delete-progress,
+            #dict-spinner, #dict-error, #dict-warning, #dict-purge-progress, #dict-import-progress, .dict-delete-progress,
             #options-advanced {
                 display: none;
             }
@@ -77,13 +77,17 @@
                     wait for import and delete operations to complete before closing this page.
                 </p>
 
-                <div class="dict-purge-progress">Dictionary data is being purged, please be patient...</div>
+                <div id="dict-purge-progress">
+                    Dictionary data is being purged, please be patient...
+                </div>
 
                 <div id="dict-groups"></div>
 
                 <div class="alert alert-warning" id="dict-warning">
-                    <strong>No dictionaries found:</strong>
-                    <span>please use the drop down below to install packaged and external dictionaries</span>
+                    <strong>Warning:</strong>
+                    <span>
+                        No dictionaries found, use the importer below to install packaged and external dictionaries
+                    </span>
                 </div>
 
                 <div class="alert alert-danger" id="dict-error">
@@ -91,9 +95,11 @@
                     <span></span>
                 </div>
 
-                <div class="dict-import-progress">Dictionary data is being imported, please be patient...</div>
-                <div class="progress dict-import-progress">
-                    <div class="progress-bar progress-bar-striped" style="width: 0%"></div>
+                <div id="dict-import-progress">
+                    Dictionary data is being imported, please be patient...
+                    <div class="progress">
+                        <div class="progress-bar progress-bar-striped" style="width: 0%"></div>
+                    </div>
                 </div>
 
                 <div class="input-group" id="dict-importer">
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 134209c8..824dc2cf 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -4,17 +4,21 @@
             <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4>
         </div>
         <div class="col-xs-4 text-right disabled">
-            <button type="button" class="dict-controls dict-delete btn btn-danger">Delete</button>
+            <button type="button" class="dict-group-controls dict-delete btn btn-danger">Delete</button>
         </div>
     </div>
-    <div class="dict-delete-progress">Dictionary data is being deleted, please be patient...</div>
-    <div class="progress dict-delete-progress">
-        <div class="progress-bar progress-bar-striped progress-bar-danger" style="width: 0%"></div>
+
+    <div class="dict-delete-progress">
+        Dictionary data is being deleted, please be patient...
+        <div class="progress">
+            <div class="progress-bar progress-bar-striped progress-bar-danger" style="width: 0%"></div>
+        </div>
     </div>
-    <div class="checkbox dict-controls {{#unless hasTerms}}disabled{{/unless}}">
+
+    <div class="checkbox dict-group-controls {{#unless hasTerms}}disabled{{/unless}}">
         <label><input type="checkbox" class="dict-enable-terms" {{#unless hasTerms}}disabled{{/unless}} {{#if enableTerms}}checked{{/if}}> Enable term search</label>
     </div>
-    <div class="checkbox dict-controls {{#unless hasKanji}}disabled{{/unless}}">
+    <div class="checkbox dict-group-controls {{#unless hasKanji}}disabled{{/unless}}">
         <label><input type="checkbox" class="dict-enable-kanji" {{#unless hasKanji}}disabled{{/unless}} {{#if enableKanji}}checked{{/if}}> Enable Kanji search</label>
     </div>
 </div>
-- 
cgit v1.2.3


From d98f4566bc856e04f2f6a7d9a7bf49e30867551e Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 17 Dec 2016 18:45:19 -0800
Subject: WIP

---
 ext/bg/data/deinflect.json | 2807 ++++++++++++++++++++++++++++++++++++++++++++
 ext/bg/data/rules.json     | 2807 --------------------------------------------
 ext/bg/js/database.js      |   18 +-
 ext/bg/js/deinflector.js   |   46 +-
 ext/bg/js/templates.js     |   12 +-
 ext/bg/js/translator.js    |   68 +-
 ext/bg/js/util.js          |    4 +-
 tmpl/kanji.html            |    2 +-
 tmpl/term.html             |    2 +-
 9 files changed, 2881 insertions(+), 2885 deletions(-)
 create mode 100644 ext/bg/data/deinflect.json
 delete mode 100644 ext/bg/data/rules.json

(limited to 'tmpl')

diff --git a/ext/bg/data/deinflect.json b/ext/bg/data/deinflect.json
new file mode 100644
index 00000000..3fd45771
--- /dev/null
+++ b/ext/bg/data/deinflect.json
@@ -0,0 +1,2807 @@
+{
+    "-ba": [
+        {
+            "kanaIn": "えば",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "けば",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "げば",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "せば",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "てば",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ねば",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "べば",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "めば",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "れば",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "v5",
+                "vk",
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "ければ",
+            "kanaOut": "い",
+            "tagsIn": [],
+            "tagsOut": [
+                "adj-i"
+            ]
+        }
+    ],
+    "-chau": [
+        {
+            "kanaIn": "ちゃう",
+            "kanaOut": "る",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いじゃう",
+            "kanaOut": "ぐ",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "いちゃう",
+            "kanaOut": "く",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きちゃう",
+            "kanaOut": "くる",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "しちゃう",
+            "kanaOut": "す",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しちゃう",
+            "kanaOut": "する",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "っちゃう",
+            "kanaOut": "う",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "っちゃう",
+            "kanaOut": "く",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "っちゃう",
+            "kanaOut": "つ",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "っちゃう",
+            "kanaOut": "る",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んじゃう",
+            "kanaOut": "ぬ",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んじゃう",
+            "kanaOut": "ぶ",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んじゃう",
+            "kanaOut": "む",
+            "tagsIn": [
+                "v5"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "-nasai": [
+        {
+            "kanaIn": "なさい",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いなさい",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きなさい",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きなさい",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "ぎなさい",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しなさい",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しなさい",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "ちなさい",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "になさい",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "びなさい",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "みなさい",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "りなさい",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "-sou": [
+        {
+            "kanaIn": "そう",
+            "kanaOut": "い",
+            "tagsIn": [],
+            "tagsOut": [
+                "adj-i"
+            ]
+        },
+        {
+            "kanaIn": "そう",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いそう",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きそう",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きそう",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "ぎそう",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しそう",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しそう",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "ちそう",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "にそう",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "びそう",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "みそう",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "りそう",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "-sugiru": [
+        {
+            "kanaIn": "すぎる",
+            "kanaOut": "い",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "adj-i"
+            ]
+        },
+        {
+            "kanaIn": "すぎる",
+            "kanaOut": "る",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いすぎる",
+            "kanaOut": "う",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きすぎる",
+            "kanaOut": "く",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きすぎる",
+            "kanaOut": "くる",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "ぎすぎる",
+            "kanaOut": "ぐ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しすぎる",
+            "kanaOut": "す",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しすぎる",
+            "kanaOut": "する",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "ちすぎる",
+            "kanaOut": "つ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "にすぎる",
+            "kanaOut": "ぬ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "びすぎる",
+            "kanaOut": "ぶ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "みすぎる",
+            "kanaOut": "む",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "りすぎる",
+            "kanaOut": "る",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "-tai": [
+        {
+            "kanaIn": "たい",
+            "kanaOut": "る",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いたい",
+            "kanaOut": "う",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きたい",
+            "kanaOut": "く",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きたい",
+            "kanaOut": "くる",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "ぎたい",
+            "kanaOut": "ぐ",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "したい",
+            "kanaOut": "す",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "したい",
+            "kanaOut": "する",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "ちたい",
+            "kanaOut": "つ",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "にたい",
+            "kanaOut": "ぬ",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "びたい",
+            "kanaOut": "ぶ",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "みたい",
+            "kanaOut": "む",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "りたい",
+            "kanaOut": "る",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "-tara": [
+        {
+            "kanaIn": "たら",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いたら",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "いだら",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きたら",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "したら",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "したら",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "ったら",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ったら",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ったら",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んだら",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んだら",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んだら",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "かったら",
+            "kanaOut": "い",
+            "tagsIn": [],
+            "tagsOut": [
+                "adj-i"
+            ]
+        }
+    ],
+    "-tari": [
+        {
+            "kanaIn": "たり",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いたり",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "いだり",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きたり",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "したり",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "したり",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "ったり",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ったり",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ったり",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んだり",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んだり",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んだり",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "かったり",
+            "kanaOut": "い",
+            "tagsIn": [],
+            "tagsOut": [
+                "adj-i"
+            ]
+        }
+    ],
+    "-te": [
+        {
+            "kanaIn": "て",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いて",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "いで",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きて",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "くて",
+            "kanaOut": "い",
+            "tagsIn": [],
+            "tagsOut": [
+                "adj-i"
+            ]
+        },
+        {
+            "kanaIn": "して",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "して",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "って",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "って",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "って",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "って",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んで",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んで",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んで",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "-zu": [
+        {
+            "kanaIn": "ず",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "かず",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "がず",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "こず",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "さず",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "せず",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "たず",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "なず",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ばず",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "まず",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "らず",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "わず",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "-nu": [
+        {
+            "kanaIn": "ぬ",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "かぬ",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "がぬ",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "こぬ",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "さぬ",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "せぬ",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "たぬ",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "なぬ",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ばぬ",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "まぬ",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "らぬ",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "わぬ",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "adv": [
+        {
+            "kanaIn": "く",
+            "kanaOut": "い",
+            "tagsIn": [],
+            "tagsOut": [
+                "adj-i"
+            ]
+        }
+    ],
+    "causative": [
+        {
+            "kanaIn": "かせる",
+            "kanaOut": "く",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "がせる",
+            "kanaOut": "ぐ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "させる",
+            "kanaOut": "する",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "させる",
+            "kanaOut": "る",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "たせる",
+            "kanaOut": "つ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "なせる",
+            "kanaOut": "ぬ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ばせる",
+            "kanaOut": "ぶ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ませる",
+            "kanaOut": "む",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "らせる",
+            "kanaOut": "る",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "わせる",
+            "kanaOut": "う",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "こさせる",
+            "kanaOut": "くる",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "vk"
+            ]
+        }
+    ],
+    "imperative": [
+        {
+            "kanaIn": "い",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "え",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "け",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "げ",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "せ",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "て",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ね",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "べ",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "め",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "よ",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "れ",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ろ",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "こい",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "しろ",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "せよ",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        }
+    ],
+    "imperative negative": [
+        {
+            "kanaIn": "な",
+            "kanaOut": "",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "v5",
+                "vk",
+                "vs"
+            ]
+        }
+    ],
+    "masu stem": [
+        {
+            "kanaIn": "い",
+            "kanaOut": "いる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "い",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "え",
+            "kanaOut": "える",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "き",
+            "kanaOut": "きる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "き",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ぎ",
+            "kanaOut": "ぎる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "ぎ",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "け",
+            "kanaOut": "ける",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "げ",
+            "kanaOut": "げる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "し",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "じ",
+            "kanaOut": "じる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "せ",
+            "kanaOut": "せる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "ぜ",
+            "kanaOut": "ぜる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "ち",
+            "kanaOut": "ちる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "ち",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "て",
+            "kanaOut": "てる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "で",
+            "kanaOut": "でる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "に",
+            "kanaOut": "にる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "に",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ね",
+            "kanaOut": "ねる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "ひ",
+            "kanaOut": "ひる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "び",
+            "kanaOut": "びる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "び",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "へ",
+            "kanaOut": "へる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "べ",
+            "kanaOut": "べる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "み",
+            "kanaOut": "みる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "み",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "め",
+            "kanaOut": "める",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "り",
+            "kanaOut": "りる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        },
+        {
+            "kanaIn": "り",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "れ",
+            "kanaOut": "れる",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1"
+            ]
+        }
+    ],
+    "negative": [
+        {
+            "kanaIn": "ない",
+            "kanaOut": "る",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "かない",
+            "kanaOut": "く",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "がない",
+            "kanaOut": "ぐ",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "くない",
+            "kanaOut": "い",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "adj-i"
+            ]
+        },
+        {
+            "kanaIn": "こない",
+            "kanaOut": "くる",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "さない",
+            "kanaOut": "す",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しない",
+            "kanaOut": "する",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "たない",
+            "kanaOut": "つ",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "なない",
+            "kanaOut": "ぬ",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ばない",
+            "kanaOut": "ぶ",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "まない",
+            "kanaOut": "む",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "らない",
+            "kanaOut": "る",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "わない",
+            "kanaOut": "う",
+            "tagsIn": [
+                "adj-i"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "noun": [
+        {
+            "kanaIn": "さ",
+            "kanaOut": "い",
+            "tagsIn": [],
+            "tagsOut": [
+                "adj-i"
+            ]
+        }
+    ],
+    "passive": [
+        {
+            "kanaIn": "かれる",
+            "kanaOut": "く",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "がれる",
+            "kanaOut": "ぐ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "される",
+            "kanaOut": "する",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "たれる",
+            "kanaOut": "つ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "なれる",
+            "kanaOut": "ぬ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ばれる",
+            "kanaOut": "ぶ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "まれる",
+            "kanaOut": "む",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "われる",
+            "kanaOut": "う",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "passive or causative": [
+        {
+            "kanaIn": "される",
+            "kanaOut": "す",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "past": [
+        {
+            "kanaIn": "た",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いた",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "いだ",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きた",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "した",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "した",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "った",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "った",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "った",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "った",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んだ",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んだ",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "んだ",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "かった",
+            "kanaOut": "い",
+            "tagsIn": [],
+            "tagsOut": [
+                "adj-i"
+            ]
+        }
+    ],
+    "polite": [
+        {
+            "kanaIn": "ます",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "います",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きます",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きます",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "ぎます",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "します",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "します",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "ちます",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "にます",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "びます",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "みます",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ります",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "polite negative": [
+        {
+            "kanaIn": "ません",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いません",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きません",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きません",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "ぎません",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しません",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しません",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "ちません",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "にません",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "びません",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "みません",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "りません",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "くありません",
+            "kanaOut": "い",
+            "tagsIn": [],
+            "tagsOut": [
+                "adj-i"
+            ]
+        }
+    ],
+    "polite past": [
+        {
+            "kanaIn": "ました",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いました",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きました",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きました",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "ぎました",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しました",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しました",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "ちました",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "にました",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "びました",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "みました",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "りました",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "polite past negative": [
+        {
+            "kanaIn": "ませんでした",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いませんでした",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きませんでした",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きませんでした",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "ぎませんでした",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しませんでした",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しませんでした",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "ちませんでした",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "にませんでした",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "びませんでした",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "みませんでした",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "りませんでした",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "くありませんでした",
+            "kanaOut": "い",
+            "tagsIn": [],
+            "tagsOut": [
+                "adj-i"
+            ]
+        }
+    ],
+    "polite volitional": [
+        {
+            "kanaIn": "ましょう",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "いましょう",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きましょう",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "きましょう",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "ぎましょう",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しましょう",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "しましょう",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        },
+        {
+            "kanaIn": "ちましょう",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "にましょう",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "びましょう",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "みましょう",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "りましょう",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        }
+    ],
+    "potential": [
+        {
+            "kanaIn": "える",
+            "kanaOut": "う",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ける",
+            "kanaOut": "く",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "げる",
+            "kanaOut": "ぐ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "せる",
+            "kanaOut": "す",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "てる",
+            "kanaOut": "つ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ねる",
+            "kanaOut": "ぬ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "べる",
+            "kanaOut": "ぶ",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "める",
+            "kanaOut": "む",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "れる",
+            "kanaOut": "る",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v1",
+                "v5",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "これる",
+            "kanaOut": "くる",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "vk"
+            ]
+        }
+    ],
+    "potential or passive": [
+        {
+            "kanaIn": "られる",
+            "kanaOut": "る",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "v1",
+                "v5",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "こられる",
+            "kanaOut": "くる",
+            "tagsIn": [
+                "v1"
+            ],
+            "tagsOut": [
+                "vk"
+            ]
+        }
+    ],
+    "volitional": [
+        {
+            "kanaIn": "おう",
+            "kanaOut": "う",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "こう",
+            "kanaOut": "く",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ごう",
+            "kanaOut": "ぐ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "そう",
+            "kanaOut": "す",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "とう",
+            "kanaOut": "つ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "のう",
+            "kanaOut": "ぬ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "ぼう",
+            "kanaOut": "ぶ",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "もう",
+            "kanaOut": "む",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "よう",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v1",
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "ろう",
+            "kanaOut": "る",
+            "tagsIn": [],
+            "tagsOut": [
+                "v5"
+            ]
+        },
+        {
+            "kanaIn": "こよう",
+            "kanaOut": "くる",
+            "tagsIn": [],
+            "tagsOut": [
+                "vk"
+            ]
+        },
+        {
+            "kanaIn": "しよう",
+            "kanaOut": "する",
+            "tagsIn": [],
+            "tagsOut": [
+                "vs"
+            ]
+        }
+    ]
+}
diff --git a/ext/bg/data/rules.json b/ext/bg/data/rules.json
deleted file mode 100644
index 3fd45771..00000000
--- a/ext/bg/data/rules.json
+++ /dev/null
@@ -1,2807 +0,0 @@
-{
-    "-ba": [
-        {
-            "kanaIn": "えば",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "けば",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "げば",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "せば",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "てば",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ねば",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "べば",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "めば",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "れば",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "v5",
-                "vk",
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "ければ",
-            "kanaOut": "い",
-            "tagsIn": [],
-            "tagsOut": [
-                "adj-i"
-            ]
-        }
-    ],
-    "-chau": [
-        {
-            "kanaIn": "ちゃう",
-            "kanaOut": "る",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いじゃう",
-            "kanaOut": "ぐ",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "いちゃう",
-            "kanaOut": "く",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きちゃう",
-            "kanaOut": "くる",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "しちゃう",
-            "kanaOut": "す",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しちゃう",
-            "kanaOut": "する",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "っちゃう",
-            "kanaOut": "う",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "っちゃう",
-            "kanaOut": "く",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "っちゃう",
-            "kanaOut": "つ",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "っちゃう",
-            "kanaOut": "る",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んじゃう",
-            "kanaOut": "ぬ",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んじゃう",
-            "kanaOut": "ぶ",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んじゃう",
-            "kanaOut": "む",
-            "tagsIn": [
-                "v5"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "-nasai": [
-        {
-            "kanaIn": "なさい",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いなさい",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きなさい",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きなさい",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "ぎなさい",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しなさい",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しなさい",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "ちなさい",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "になさい",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "びなさい",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "みなさい",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "りなさい",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "-sou": [
-        {
-            "kanaIn": "そう",
-            "kanaOut": "い",
-            "tagsIn": [],
-            "tagsOut": [
-                "adj-i"
-            ]
-        },
-        {
-            "kanaIn": "そう",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いそう",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きそう",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きそう",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "ぎそう",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しそう",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しそう",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "ちそう",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "にそう",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "びそう",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "みそう",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "りそう",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "-sugiru": [
-        {
-            "kanaIn": "すぎる",
-            "kanaOut": "い",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "adj-i"
-            ]
-        },
-        {
-            "kanaIn": "すぎる",
-            "kanaOut": "る",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いすぎる",
-            "kanaOut": "う",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きすぎる",
-            "kanaOut": "く",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きすぎる",
-            "kanaOut": "くる",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "ぎすぎる",
-            "kanaOut": "ぐ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しすぎる",
-            "kanaOut": "す",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しすぎる",
-            "kanaOut": "する",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "ちすぎる",
-            "kanaOut": "つ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "にすぎる",
-            "kanaOut": "ぬ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "びすぎる",
-            "kanaOut": "ぶ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "みすぎる",
-            "kanaOut": "む",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "りすぎる",
-            "kanaOut": "る",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "-tai": [
-        {
-            "kanaIn": "たい",
-            "kanaOut": "る",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いたい",
-            "kanaOut": "う",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きたい",
-            "kanaOut": "く",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きたい",
-            "kanaOut": "くる",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "ぎたい",
-            "kanaOut": "ぐ",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "したい",
-            "kanaOut": "す",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "したい",
-            "kanaOut": "する",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "ちたい",
-            "kanaOut": "つ",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "にたい",
-            "kanaOut": "ぬ",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "びたい",
-            "kanaOut": "ぶ",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "みたい",
-            "kanaOut": "む",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "りたい",
-            "kanaOut": "る",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "-tara": [
-        {
-            "kanaIn": "たら",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いたら",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "いだら",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きたら",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "したら",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "したら",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "ったら",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ったら",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ったら",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んだら",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んだら",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んだら",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "かったら",
-            "kanaOut": "い",
-            "tagsIn": [],
-            "tagsOut": [
-                "adj-i"
-            ]
-        }
-    ],
-    "-tari": [
-        {
-            "kanaIn": "たり",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いたり",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "いだり",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きたり",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "したり",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "したり",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "ったり",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ったり",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ったり",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んだり",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んだり",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んだり",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "かったり",
-            "kanaOut": "い",
-            "tagsIn": [],
-            "tagsOut": [
-                "adj-i"
-            ]
-        }
-    ],
-    "-te": [
-        {
-            "kanaIn": "て",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いて",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "いで",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きて",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "くて",
-            "kanaOut": "い",
-            "tagsIn": [],
-            "tagsOut": [
-                "adj-i"
-            ]
-        },
-        {
-            "kanaIn": "して",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "して",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "って",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "って",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "って",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "って",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んで",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んで",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んで",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "-zu": [
-        {
-            "kanaIn": "ず",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "かず",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "がず",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "こず",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "さず",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "せず",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "たず",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "なず",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ばず",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "まず",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "らず",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "わず",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "-nu": [
-        {
-            "kanaIn": "ぬ",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "かぬ",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "がぬ",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "こぬ",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "さぬ",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "せぬ",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "たぬ",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "なぬ",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ばぬ",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "まぬ",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "らぬ",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "わぬ",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "adv": [
-        {
-            "kanaIn": "く",
-            "kanaOut": "い",
-            "tagsIn": [],
-            "tagsOut": [
-                "adj-i"
-            ]
-        }
-    ],
-    "causative": [
-        {
-            "kanaIn": "かせる",
-            "kanaOut": "く",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "がせる",
-            "kanaOut": "ぐ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "させる",
-            "kanaOut": "する",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "させる",
-            "kanaOut": "る",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "たせる",
-            "kanaOut": "つ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "なせる",
-            "kanaOut": "ぬ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ばせる",
-            "kanaOut": "ぶ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ませる",
-            "kanaOut": "む",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "らせる",
-            "kanaOut": "る",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "わせる",
-            "kanaOut": "う",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "こさせる",
-            "kanaOut": "くる",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "vk"
-            ]
-        }
-    ],
-    "imperative": [
-        {
-            "kanaIn": "い",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "え",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "け",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "げ",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "せ",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "て",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ね",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "べ",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "め",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "よ",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "れ",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ろ",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "こい",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "しろ",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "せよ",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        }
-    ],
-    "imperative negative": [
-        {
-            "kanaIn": "な",
-            "kanaOut": "",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "v5",
-                "vk",
-                "vs"
-            ]
-        }
-    ],
-    "masu stem": [
-        {
-            "kanaIn": "い",
-            "kanaOut": "いる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "い",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "え",
-            "kanaOut": "える",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "き",
-            "kanaOut": "きる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "き",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ぎ",
-            "kanaOut": "ぎる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "ぎ",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "け",
-            "kanaOut": "ける",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "げ",
-            "kanaOut": "げる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "し",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "じ",
-            "kanaOut": "じる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "せ",
-            "kanaOut": "せる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "ぜ",
-            "kanaOut": "ぜる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "ち",
-            "kanaOut": "ちる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "ち",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "て",
-            "kanaOut": "てる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "で",
-            "kanaOut": "でる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "に",
-            "kanaOut": "にる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "に",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ね",
-            "kanaOut": "ねる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "ひ",
-            "kanaOut": "ひる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "び",
-            "kanaOut": "びる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "び",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "へ",
-            "kanaOut": "へる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "べ",
-            "kanaOut": "べる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "み",
-            "kanaOut": "みる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "み",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "め",
-            "kanaOut": "める",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "り",
-            "kanaOut": "りる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        },
-        {
-            "kanaIn": "り",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "れ",
-            "kanaOut": "れる",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1"
-            ]
-        }
-    ],
-    "negative": [
-        {
-            "kanaIn": "ない",
-            "kanaOut": "る",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "かない",
-            "kanaOut": "く",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "がない",
-            "kanaOut": "ぐ",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "くない",
-            "kanaOut": "い",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "adj-i"
-            ]
-        },
-        {
-            "kanaIn": "こない",
-            "kanaOut": "くる",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "さない",
-            "kanaOut": "す",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しない",
-            "kanaOut": "する",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "たない",
-            "kanaOut": "つ",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "なない",
-            "kanaOut": "ぬ",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ばない",
-            "kanaOut": "ぶ",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "まない",
-            "kanaOut": "む",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "らない",
-            "kanaOut": "る",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "わない",
-            "kanaOut": "う",
-            "tagsIn": [
-                "adj-i"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "noun": [
-        {
-            "kanaIn": "さ",
-            "kanaOut": "い",
-            "tagsIn": [],
-            "tagsOut": [
-                "adj-i"
-            ]
-        }
-    ],
-    "passive": [
-        {
-            "kanaIn": "かれる",
-            "kanaOut": "く",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "がれる",
-            "kanaOut": "ぐ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "される",
-            "kanaOut": "する",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "たれる",
-            "kanaOut": "つ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "なれる",
-            "kanaOut": "ぬ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ばれる",
-            "kanaOut": "ぶ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "まれる",
-            "kanaOut": "む",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "われる",
-            "kanaOut": "う",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "passive or causative": [
-        {
-            "kanaIn": "される",
-            "kanaOut": "す",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "past": [
-        {
-            "kanaIn": "た",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いた",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "いだ",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きた",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "した",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "した",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "った",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "った",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "った",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "った",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んだ",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んだ",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "んだ",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "かった",
-            "kanaOut": "い",
-            "tagsIn": [],
-            "tagsOut": [
-                "adj-i"
-            ]
-        }
-    ],
-    "polite": [
-        {
-            "kanaIn": "ます",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "います",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きます",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きます",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "ぎます",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "します",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "します",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "ちます",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "にます",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "びます",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "みます",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ります",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "polite negative": [
-        {
-            "kanaIn": "ません",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いません",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きません",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きません",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "ぎません",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しません",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しません",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "ちません",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "にません",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "びません",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "みません",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "りません",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "くありません",
-            "kanaOut": "い",
-            "tagsIn": [],
-            "tagsOut": [
-                "adj-i"
-            ]
-        }
-    ],
-    "polite past": [
-        {
-            "kanaIn": "ました",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いました",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きました",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きました",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "ぎました",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しました",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しました",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "ちました",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "にました",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "びました",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "みました",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "りました",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "polite past negative": [
-        {
-            "kanaIn": "ませんでした",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いませんでした",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きませんでした",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きませんでした",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "ぎませんでした",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しませんでした",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しませんでした",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "ちませんでした",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "にませんでした",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "びませんでした",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "みませんでした",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "りませんでした",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "くありませんでした",
-            "kanaOut": "い",
-            "tagsIn": [],
-            "tagsOut": [
-                "adj-i"
-            ]
-        }
-    ],
-    "polite volitional": [
-        {
-            "kanaIn": "ましょう",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "いましょう",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きましょう",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "きましょう",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "ぎましょう",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しましょう",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "しましょう",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        },
-        {
-            "kanaIn": "ちましょう",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "にましょう",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "びましょう",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "みましょう",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "りましょう",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        }
-    ],
-    "potential": [
-        {
-            "kanaIn": "える",
-            "kanaOut": "う",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ける",
-            "kanaOut": "く",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "げる",
-            "kanaOut": "ぐ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "せる",
-            "kanaOut": "す",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "てる",
-            "kanaOut": "つ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ねる",
-            "kanaOut": "ぬ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "べる",
-            "kanaOut": "ぶ",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "める",
-            "kanaOut": "む",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "れる",
-            "kanaOut": "る",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v1",
-                "v5",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "これる",
-            "kanaOut": "くる",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "vk"
-            ]
-        }
-    ],
-    "potential or passive": [
-        {
-            "kanaIn": "られる",
-            "kanaOut": "る",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "v1",
-                "v5",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "こられる",
-            "kanaOut": "くる",
-            "tagsIn": [
-                "v1"
-            ],
-            "tagsOut": [
-                "vk"
-            ]
-        }
-    ],
-    "volitional": [
-        {
-            "kanaIn": "おう",
-            "kanaOut": "う",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "こう",
-            "kanaOut": "く",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ごう",
-            "kanaOut": "ぐ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "そう",
-            "kanaOut": "す",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "とう",
-            "kanaOut": "つ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "のう",
-            "kanaOut": "ぬ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "ぼう",
-            "kanaOut": "ぶ",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "もう",
-            "kanaOut": "む",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "よう",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v1",
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "ろう",
-            "kanaOut": "る",
-            "tagsIn": [],
-            "tagsOut": [
-                "v5"
-            ]
-        },
-        {
-            "kanaIn": "こよう",
-            "kanaOut": "くる",
-            "tagsIn": [],
-            "tagsOut": [
-                "vk"
-            ]
-        },
-        {
-            "kanaIn": "しよう",
-            "kanaOut": "する",
-            "tagsIn": [],
-            "tagsOut": [
-                "vs"
-            ]
-        }
-    ]
-}
diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 561da7d8..c8820f4e 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -117,15 +117,15 @@ class Database {
             }
 
             const tagMeta = this.tagMetaCache[dictionary] = {};
-            const promise = this.db.tagMeta.where('dictionary').equals(dictionary).each(row => {
-                tagMeta[row.tag] = {
-                    category: row.category,
-                    notes: row.notes,
-                    order: row.order
-                };
-            });
-
-            promises.push(promise);
+            promises.push(
+                this.db.tagMeta.where('dictionary').equals(dictionary).each(row => {
+                    tagMeta[row.tag] = {
+                        category: row.category,
+                        notes: row.notes,
+                        order: row.order
+                    };
+                })
+            );
         }
 
         return Promise.all(promises).then(() => this.tagMetaCache);
diff --git a/ext/bg/js/deinflector.js b/ext/bg/js/deinflector.js
index 1474e56d..b8646e73 100644
--- a/ext/bg/js/deinflector.js
+++ b/ext/bg/js/deinflector.js
@@ -18,22 +18,22 @@
 
 
 class Deinflection {
-    constructor(term, tags=[], rule='') {
+    constructor(term, rules=[], reason='') {
         this.children = [];
         this.term = term;
-        this.tags = tags;
-        this.rule = rule;
+        this.rules = rules;
+        this.reason = reason;
     }
 
     validate(validator) {
         return validator(this.term).then(sets => {
-            for (const tags of sets) {
-                if (this.tags.length === 0) {
+            for (const rules of sets) {
+                if (this.rules.length === 0) {
                     return true;
                 }
 
-                for (const tag of this.tags) {
-                    if (tags.includes(tag)) {
+                for (const rule of this.rules) {
+                    if (rules.includes(rule)) {
                         return true;
                     }
                 }
@@ -43,19 +43,19 @@ class Deinflection {
         });
     }
 
-    deinflect(validator, rules) {
+    deinflect(validator, reasons) {
         const promises = [
             this.validate(validator).then(valid => {
-                const child = new Deinflection(this.term, this.tags);
+                const child = new Deinflection(this.term, this.rules);
                 this.children.push(child);
             })
         ];
 
-        for (const rule in rules) {
-            for (const variant of rules[rule]) {
-                let allowed = this.tags.length === 0;
-                for (const tag of this.tags) {
-                    if (variant.tagsIn.includes(tag)) {
+        for (const reason in reasons) {
+            for (const variant of reasons[reason]) {
+                let allowed = this.rules.length === 0;
+                for (const rule of this.rules) {
+                    if (variant.rulesIn.includes(rule)) {
                         allowed = true;
                         break;
                     }
@@ -70,9 +70,9 @@ class Deinflection {
                     continue;
                 }
 
-                const child = new Deinflection(term, variant.tagsOut, rule);
+                const child = new Deinflection(term, variant.rulesOut, reason);
                 promises.push(
-                    child.deinflect(validator, rules).then(valid => {
+                    child.deinflect(validator, reasons).then(valid => {
                         if (valid) {
                             this.children.push(child);
                         }
@@ -88,14 +88,14 @@ class Deinflection {
 
     gather() {
         if (this.children.length === 0) {
-            return [{root: this.term, tags: this.tags, rules: []}];
+            return [{root: this.term, rules: this.rules, reasons: []}];
         }
 
         const paths = [];
         for (const child of this.children) {
             for (const path of child.gather()) {
-                if (this.rule.length > 0) {
-                    path.rules.push(this.rule);
+                if (this.reason.length > 0) {
+                    path.reasons.push(this.reason);
                 }
 
                 path.source = this.term;
@@ -110,15 +110,15 @@ class Deinflection {
 
 class Deinflector {
     constructor() {
-        this.rules = {};
+        this.reasons = {};
     }
 
-    setRules(rules) {
-        this.rules = rules;
+    setReasons(reasons) {
+        this.reasons = reasons;
     }
 
     deinflect(term, validator) {
         const node = new Deinflection(term);
-        return node.deinflect(validator, this.rules).then(success => success ? node.gather() : []);
+        return node.deinflect(validator, this.reasons).then(success => success ? node.gather() : []);
     }
 }
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 598d8641..2070f276 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -66,11 +66,11 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "        <span class=\"tag tag-"
-    + alias4(((helper = (helper = helpers["class"] || (depth0 != null ? depth0["class"] : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"class","hash":{},"data":data}) : helper)))
+    + alias4(((helper = (helper = helpers.category || (depth0 != null ? depth0.category : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"category","hash":{},"data":data}) : helper)))
     + "\" title=\""
-    + alias4(((helper = (helper = helpers.desc || (depth0 != null ? depth0.desc : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"desc","hash":{},"data":data}) : helper)))
+    + alias4(((helper = (helper = helpers.notes || (depth0 != null ? depth0.notes : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"notes","hash":{},"data":data}) : helper)))
     + "\">"
-    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+    + alias4(((helper = (helper = helpers.tag || (depth0 != null ? depth0.tag : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tag","hash":{},"data":data}) : helper)))
     + "</span>\n";
 },"8":function(container,depth0,helpers,partials,data) {
     return "            <li><span>"
@@ -190,11 +190,11 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
     var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
   return "        <span class=\"tag tag-"
-    + alias4(((helper = (helper = helpers["class"] || (depth0 != null ? depth0["class"] : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"class","hash":{},"data":data}) : helper)))
+    + alias4(((helper = (helper = helpers.category || (depth0 != null ? depth0.category : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"category","hash":{},"data":data}) : helper)))
     + "\" title=\""
-    + alias4(((helper = (helper = helpers.desc || (depth0 != null ? depth0.desc : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"desc","hash":{},"data":data}) : helper)))
+    + alias4(((helper = (helper = helpers.notes || (depth0 != null ? depth0.notes : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"notes","hash":{},"data":data}) : helper)))
     + "\">"
-    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+    + alias4(((helper = (helper = helpers.tag || (depth0 != null ? depth0.tag : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tag","hash":{},"data":data}) : helper)))
     + "</span>\n";
 },"15":function(container,depth0,helpers,partials,data) {
     return "            <li><span>"
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index e7a739b3..50f9f510 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -20,7 +20,7 @@
 class Translator {
     constructor() {
         this.loaded = false;
-        this.tagMeta = null;
+        this.ruleMeta = null;
         this.database = new Database();
         this.deinflector = new Deinflector();
     }
@@ -31,21 +31,21 @@ class Translator {
         }
 
         const promises = [
-            loadJsonInt('bg/data/rules.json'),
+            loadJsonInt('bg/data/reasons.json'),
             this.database.prepare()
         ];
 
-        return Promise.all(promises).then(([rules]) => {
-            this.deinflector.setRules(rules);
+        return Promise.all(promises).then(([reasons]) => {
+            this.deinflector.setReasons(reasons);
             this.loaded = true;
         });
     }
 
     findTerm(text, dictionaries, enableSoftKatakanaSearch) {
-        return this.findTermGroups(text, dictionaries).then(groups => {
+        return this.findDeinflectGroups(text, dictionaries).then(groups => {
             const textHiragana = wanakana._katakanaToHiragana(text);
             if (text !== textHiragana && enableSoftKatakanaSearch) {
-                return this.findTermGroups(textHiragana, dictionaries).then(groupsHiragana => {
+                return this.findDeinflectGroups(textHiragana, dictionaries).then(groupsHiragana => {
                     for (const key in groupsHiragana) {
                         groups[key] = groups[key] || groupsHiragana[key];
                     }
@@ -87,25 +87,27 @@ class Translator {
         return Promise.all(promises).then(sets => this.processKanji(sets.reduce((a, b) => a.concat(b), [])));
     }
 
-    findTermGroups(text, dictionaries) {
+    findDeinflectGroups(text, dictionaries) {
         const deinflectGroups = {};
         const deinflectPromises = [];
 
         for (let i = text.length; i > 0; --i) {
             deinflectPromises.push(
                 this.deinflector.deinflect(text.slice(0, i), term => {
-                    return this.database.findTerm(term, dictionaries).then(definitions => definitions.map(definition => definition.tags));
+                    return this.database.findTerm(term, dictionaries).then(definitions => definitions.map(definition => definition.rules));
                 }).then(deinflects => {
                     const processPromises = [];
                     for (const deinflect of deinflects) {
-                        processPromises.push(this.processTerm(
-                            deinflectGroups,
-                            deinflect.source,
-                            deinflect.tags,
-                            deinflect.rules,
-                            deinflect.root,
-                            dictionaries
-                        ));
+                        processPromises.push(
+                            this.processDeinflection(
+                                deinflectGroups,
+                                deinflect.source,
+                                deinflect.rules,
+                                deinflect.reasons,
+                                deinflect.root,
+                                dictionaries
+                            )
+                        );
                     }
 
                     return Promise.all(processPromises);
@@ -116,16 +118,16 @@ class Translator {
         return Promise.all(deinflectPromises).then(() => deinflectGroups);
     }
 
-    processTerm(groups, source, tags, rules, root, dictionaries) {
+    processDeinflection(groups, source, rules, reasons, root, dictionaries) {
         return this.database.findTerm(root, dictionaries).then(definitions => {
             for (const definition of definitions) {
                 if (definition.id in groups) {
                     continue;
                 }
 
-                let matched = tags.length === 0;
-                for (const tag of tags) {
-                    if (definition.tags.includes(tag)) {
+                let matched = rules.length === 0;
+                for (const rule of rules) {
+                    if (definition.rules.includes(rule)) {
                         matched = true;
                         break;
                     }
@@ -138,26 +140,20 @@ class Translator {
                 const tagItems = [];
                 for (const tag of definition.tags) {
                     const tagItem = {
-                        name: tag,
-                        class: 'default',
+                        tag,
+                        category: 'default',
                         order: Number.MAX_SAFE_INTEGER,
-                        score: 0,
-                        desc: definition.entities[tag] || '',
+                        notes: ''
                     };
 
-                    applyTagMeta(tagItem, this.tagMeta);
+                    applyTagMeta(tagItem, definition.tagMeta);
                     tagItems.push(tagItem);
                 }
 
-                let score = 0;
-                for (const tagItem of tagItems) {
-                    score += tagItem.score;
-                }
-
                 groups[definition.id] = {
-                    score,
                     source,
-                    rules,
+                    reasons,
+                    score: definition.score,
                     expression: definition.expression,
                     reading: definition.reading,
                     glossary: definition.glossary,
@@ -172,13 +168,13 @@ class Translator {
             const tagItems = [];
             for (const tag of definition.tags) {
                 const tagItem = {
-                    name: tag,
-                    class: 'default',
+                    tag,
+                    category: 'default',
                     order: Number.MAX_SAFE_INTEGER,
-                    desc: '',
+                    notes: ''
                 };
 
-                applyTagMeta(tagItem, this.tagMeta);
+                applyTagMeta(tagItem, definition.tagMeta);
                 tagItems.push(tagItem);
             }
 
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 3ec80350..dc606a73 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -84,8 +84,8 @@ function sortTermDefs(definitions) {
             return 1;
         }
 
-        const rl1 = v1.rules.length;
-        const rl2 = v2.rules.length;
+        const rl1 = v1.reasons.length;
+        const rl2 = v2.reasons.length;
         if (rl1 < rl2) {
             return -1;
         } else if (rl1 > rl2) {
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index daa825be..c40bb3bc 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -30,7 +30,7 @@
 
     <div class="kanji-tags">
         {{#each tags}}
-        <span class="tag tag-{{class}}" title="{{desc}}">{{name}}</span>
+        <span class="tag tag-{{category}}" title="{{notes}}">{{tag}}</span>
         {{/each}}
     </div>
 
diff --git a/tmpl/term.html b/tmpl/term.html
index 7d60e42a..fb50e7d7 100644
--- a/tmpl/term.html
+++ b/tmpl/term.html
@@ -23,7 +23,7 @@
 
     <div class="term-tags">
         {{#each tags}}
-        <span class="tag tag-{{class}}" title="{{desc}}">{{name}}</span>
+        <span class="tag tag-{{category}}" title="{{notes}}">{{tag}}</span>
         {{/each}}
     </div>
 
-- 
cgit v1.2.3


From 5c755043fa2fb23f94f898fc57828277d7b02049 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 17 Dec 2016 19:30:26 -0800
Subject: CWIP

---
 ext/bg/js/database.js   | 4 ++--
 ext/bg/js/templates.js  | 4 ++--
 ext/bg/js/translator.js | 4 ++--
 ext/bg/js/util.js       | 2 +-
 tmpl/kanji.html         | 2 +-
 tmpl/term.html          | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 05cb8acd..980e9e40 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -231,7 +231,7 @@ class Database {
                     for (const tag in tagMeta || {}) {
                         const meta = tagMeta[tag];
                         rows.push({
-                            tag,
+                            name: tag,
                             category: meta.category,
                             notes: meta.notes,
                             order: meta.order,
@@ -252,8 +252,8 @@ class Database {
                     reading,
                     tags,
                     rules,
+                    score,
                     glossary,
-                    score: parseInt(score),
                     dictionary: title
                 });
             }
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 2070f276..1e35f17e 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -70,7 +70,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     + "\" title=\""
     + alias4(((helper = (helper = helpers.notes || (depth0 != null ? depth0.notes : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"notes","hash":{},"data":data}) : helper)))
     + "\">"
-    + alias4(((helper = (helper = helpers.tag || (depth0 != null ? depth0.tag : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tag","hash":{},"data":data}) : helper)))
+    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
     + "</span>\n";
 },"8":function(container,depth0,helpers,partials,data) {
     return "            <li><span>"
@@ -194,7 +194,7 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
     + "\" title=\""
     + alias4(((helper = (helper = helpers.notes || (depth0 != null ? depth0.notes : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"notes","hash":{},"data":data}) : helper)))
     + "\">"
-    + alias4(((helper = (helper = helpers.tag || (depth0 != null ? depth0.tag : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"tag","hash":{},"data":data}) : helper)))
+    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
     + "</span>\n";
 },"15":function(container,depth0,helpers,partials,data) {
     return "            <li><span>"
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index 1d143320..13bf1427 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -140,7 +140,7 @@ class Translator {
                 const tagItems = [];
                 for (const tag of definition.tags) {
                     const tagItem = {
-                        tag,
+                        name: tag,
                         category: 'default',
                         order: Number.MAX_SAFE_INTEGER,
                         notes: ''
@@ -168,7 +168,7 @@ class Translator {
             const tagItems = [];
             for (const tag of definition.tags) {
                 const tagItem = {
-                    tag,
+                    name: tag,
                     category: 'default',
                     order: Number.MAX_SAFE_INTEGER,
                     notes: ''
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index a28692dc..dc606a73 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -97,7 +97,7 @@ function sortTermDefs(definitions) {
 }
 
 function applyTagMeta(tag, meta) {
-    const symbol = tag.tag.split(':')[0];
+    const symbol = tag.name.split(':')[0];
     for (const prop in meta[symbol] || {}) {
         tag[prop] = meta[symbol][prop];
     }
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index c40bb3bc..380e16ff 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -30,7 +30,7 @@
 
     <div class="kanji-tags">
         {{#each tags}}
-        <span class="tag tag-{{category}}" title="{{notes}}">{{tag}}</span>
+        <span class="tag tag-{{category}}" title="{{notes}}">{{name}}</span>
         {{/each}}
     </div>
 
diff --git a/tmpl/term.html b/tmpl/term.html
index fb50e7d7..36f8f4fc 100644
--- a/tmpl/term.html
+++ b/tmpl/term.html
@@ -23,7 +23,7 @@
 
     <div class="term-tags">
         {{#each tags}}
-        <span class="tag tag-{{category}}" title="{{notes}}">{{tag}}</span>
+        <span class="tag tag-{{category}}" title="{{notes}}">{{name}}</span>
         {{/each}}
     </div>
 
-- 
cgit v1.2.3


From 04ff83cc6cc03c5ca868fcc86eeaa85d8f4e0bc8 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 18 Dec 2016 12:24:07 -0800
Subject: Don't show list numbering on glossary lists with only one item

---
 ext/bg/js/templates.js | 36 ++++++++++++++++++++++++++++++------
 tmpl/kanji.html        |  6 ++++++
 tmpl/term.html         |  6 ++++++
 3 files changed, 42 insertions(+), 6 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 1e35f17e..c9d0052c 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -73,9 +73,21 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
     + "</span>\n";
 },"8":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "        <ol>\n"
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "        </ol>\n";
+},"9":function(container,depth0,helpers,partials,data) {
     return "            <li><span>"
     + container.escapeExpression(container.lambda(depth0, depth0))
     + "</span></li>\n";
+},"11":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "        <p>\n            "
+    + container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0))
+    + "\n        </p>\n";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
@@ -91,9 +103,9 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.onyomi : depth0),{"name":"each","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "                </td>\n            </tr>\n        </table>\n    </div>\n\n    <div class=\"kanji-tags\">\n"
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </div>\n\n    <div class=\"kanji-glossary\">\n        <ol>\n"
-    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(8, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "        </ol>\n    </div>\n</div>\n";
+    + "    </div>\n\n    <div class=\"kanji-glossary\">\n"
+    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.program(11, data, 0),"data":data})) != null ? stack1 : "")
+    + "    </div>\n</div>\n";
 },"useData":true});
 templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var helper;
@@ -197,9 +209,21 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
     + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
     + "</span>\n";
 },"15":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "        <ol>\n"
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(16, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "        </ol>\n";
+},"16":function(container,depth0,helpers,partials,data) {
     return "            <li><span>"
     + container.escapeExpression(container.lambda(depth0, depth0))
     + "</span></li>\n";
+},"18":function(container,depth0,helpers,partials,data) {
+    var stack1;
+
+  return "        <p>\n            "
+    + container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0))
+    + "\n        </p>\n";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : {};
 
@@ -214,9 +238,9 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.rules : depth0),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "    </div>\n\n    <div class=\"term-tags\">\n"
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    </div>\n\n    <div class=\"term-glossary\">\n        <ol>\n"
-    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "        </ol>\n    </div>\n</div>\n";
+    + "    </div>\n\n    <div class=\"term-glossary\">\n"
+    + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.program(18, data, 0),"data":data})) != null ? stack1 : "")
+    + "    </div>\n</div>\n";
 },"useData":true});
 templates['term-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index 380e16ff..e22dd660 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -35,10 +35,16 @@
     </div>
 
     <div class="kanji-glossary">
+        {{#if glossary.[1]}}
         <ol>
             {{#each glossary}}
             <li><span>{{.}}</span></li>
             {{/each}}
         </ol>
+        {{else}}
+        <p>
+            {{glossary.[0]}}
+        </p>
+        {{/if}}
     </div>
 </div>
diff --git a/tmpl/term.html b/tmpl/term.html
index 36f8f4fc..6185ca25 100644
--- a/tmpl/term.html
+++ b/tmpl/term.html
@@ -28,10 +28,16 @@
     </div>
 
     <div class="term-glossary">
+        {{#if glossary.[1]}}
         <ol>
             {{#each glossary}}
             <li><span>{{.}}</span></li>
             {{/each}}
         </ol>
+        {{else}}
+        <p>
+            {{glossary.[0]}}
+        </p>
+        {{/if}}
     </div>
 </div>
-- 
cgit v1.2.3


From 238c9e340e5f42f12e6f7f16b1da7b87652aa821 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sun, 18 Dec 2016 22:24:34 -0800
Subject: WIP

---
 ext/bg/js/database.js  | 17 ++++------
 ext/bg/js/templates.js | 88 +++++++++++++++++++++++++-------------------------
 ext/fg/css/frame.css   |  2 +-
 tmpl/term.html         |  6 ++--
 4 files changed, 55 insertions(+), 58 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/database.js b/ext/bg/js/database.js
index 73acd1ae..7ad7d410 100644
--- a/ext/bg/js/database.js
+++ b/ext/bg/js/database.js
@@ -30,10 +30,10 @@ class Database {
 
         this.db = new Dexie('dict');
         this.db.version(1).stores({
-            terms: '++id, dictionary, expression, reading',
-            kanji: '++, dictionary, character',
-            tagMeta: '++, dictionary',
-            dictionaries: '++, title, version',
+            terms: '++id,dictionary,expression,reading',
+            kanji: '++,dictionary,character',
+            tagMeta: '++,dictionary',
+            dictionaries: '++,title,version',
         });
 
         return this.db.open();
@@ -48,7 +48,7 @@ class Database {
         return this.db.delete().then(() => {
             this.db = null;
             this.tagMetaCache = {};
-            this.prepare();
+            return this.prepare();
         });
     }
 
@@ -64,6 +64,7 @@ class Database {
                     expression: row.expression,
                     reading: row.reading,
                     tags: splitField(row.tags),
+                    rules: splitField(row.rules),
                     glossary: row.glossary,
                     score: row.score,
                     dictionary: row.dictionary,
@@ -123,11 +124,7 @@ class Database {
             const tagMeta = {};
             promises.push(
                 this.db.tagMeta.where('dictionary').equals(dictionary).each(row => {
-                    tagMeta[row.name] = {
-                        category: row.category,
-                        notes: row.notes,
-                        order: row.order
-                    };
+                    tagMeta[row.name] = {category: row.category, notes: row.notes, order: row.order};
                 }).then(() => {
                     this.tagMetaCache[dictionary] = tagMeta;
                 })
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index c9d0052c..94dfd4ee 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -45,6 +45,30 @@ templates['header.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(c
     + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper)))
     + "/css/frame.css\">\n    </head>\n    <body>\n";
 },"useData":true});
+templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var helper;
+
+  return "<a href=\"#\" class=\"kanji-link\">"
+    + container.escapeExpression(((helper = (helper = helpers.kanji || (depth0 != null ? depth0.kanji : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"kanji","hash":{},"data":data}) : helper)))
+    + "</a>\n";
+},"useData":true});
+templates['kanji-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
+    var stack1;
+
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"2":function(container,depth0,helpers,partials,data,blockParams,depths) {
+    var stack1;
+
+  return ((stack1 = container.invokePartial(partials["kanji.html"],depth0,{"name":"kanji.html","hash":{"sequence":(depths[1] != null ? depths[1].sequence : depths[1]),"options":(depths[1] != null ? depths[1].options : depths[1]),"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":"    ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+},"4":function(container,depth0,helpers,partials,data) {
+    return "    <p>No results found</p>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
+    var stack1;
+
+  return ((stack1 = container.invokePartial(partials["header.html"],depth0,{"name":"header.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
+    + ((stack1 = container.invokePartial(partials["footer.html"],depth0,{"name":"footer.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+},"usePartial":true,"useData":true,"useDepths":true});
 templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
@@ -107,30 +131,6 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.program(11, data, 0),"data":data})) != null ? stack1 : "")
     + "    </div>\n</div>\n";
 },"useData":true});
-templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var helper;
-
-  return "<a href=\"#\" class=\"kanji-link\">"
-    + container.escapeExpression(((helper = (helper = helpers.kanji || (depth0 != null ? depth0.kanji : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"kanji","hash":{},"data":data}) : helper)))
-    + "</a>\n";
-},"useData":true});
-templates['kanji-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1;
-
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"2":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1;
-
-  return ((stack1 = container.invokePartial(partials["kanji.html"],depth0,{"name":"kanji.html","hash":{"sequence":(depths[1] != null ? depths[1].sequence : depths[1]),"options":(depths[1] != null ? depths[1].options : depths[1]),"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":"    ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
-},"4":function(container,depth0,helpers,partials,data) {
-    return "    <p>No results found</p>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1;
-
-  return ((stack1 = container.invokePartial(partials["header.html"],depth0,{"name":"header.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
-    + ((stack1 = container.invokePartial(partials["footer.html"],depth0,{"name":"footer.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
-},"usePartial":true,"useData":true,"useDepths":true});
 templates['model.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     return "                    <li><a class=\"marker-link\" href=\"#\">"
     + container.escapeExpression(container.lambda(depth0, depth0))
@@ -148,6 +148,23 @@ templates['model.html'] = template({"1":function(container,depth0,helpers,partia
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.markers : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "                </ul>\n            </div>\n        </div>\n    </td>\n</tr>\n";
 },"useData":true});
+templates['term-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
+    var stack1;
+
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"2":function(container,depth0,helpers,partials,data,blockParams,depths) {
+    var stack1;
+
+  return ((stack1 = container.invokePartial(partials["term.html"],depth0,{"name":"term.html","hash":{"sequence":(depths[1] != null ? depths[1].sequence : depths[1]),"options":(depths[1] != null ? depths[1].options : depths[1]),"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":"    ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+},"4":function(container,depth0,helpers,partials,data) {
+    return "    <p>No results found</p>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
+    var stack1;
+
+  return ((stack1 = container.invokePartial(partials["header.html"],depth0,{"name":"header.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
+    + ((stack1 = container.invokePartial(partials["footer.html"],depth0,{"name":"footer.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+},"usePartial":true,"useData":true,"useDepths":true});
 templates['term.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
@@ -191,7 +208,7 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
 },"10":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return "        <span class=\"rule\">"
+  return "        <span class=\"reasons\">"
     + container.escapeExpression(container.lambda(depth0, depth0))
     + "</span> "
     + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
@@ -234,29 +251,12 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.addable : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "    </div>\n\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reading : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.program(8, data, 0),"data":data})) != null ? stack1 : "")
-    + "\n    <div class=\"term-rules\">\n"
-    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.rules : depth0),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "\n    <div class=\"term-reasons\">\n"
+    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.reasons : depth0),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "    </div>\n\n    <div class=\"term-tags\">\n"
     + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "    </div>\n\n    <div class=\"term-glossary\">\n"
     + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.program(18, data, 0),"data":data})) != null ? stack1 : "")
     + "    </div>\n</div>\n";
 },"useData":true});
-templates['term-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1;
-
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"2":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1;
-
-  return ((stack1 = container.invokePartial(partials["term.html"],depth0,{"name":"term.html","hash":{"sequence":(depths[1] != null ? depths[1].sequence : depths[1]),"options":(depths[1] != null ? depths[1].options : depths[1]),"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":"    ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
-},"4":function(container,depth0,helpers,partials,data) {
-    return "    <p>No results found</p>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1;
-
-  return ((stack1 = container.invokePartial(partials["header.html"],depth0,{"name":"header.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
-    + ((stack1 = container.invokePartial(partials["footer.html"],depth0,{"name":"footer.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
-},"usePartial":true,"useData":true,"useDepths":true});
 })();
\ No newline at end of file
diff --git a/ext/fg/css/frame.css b/ext/fg/css/frame.css
index e7b5dedc..597646f2 100644
--- a/ext/fg/css/frame.css
+++ b/ext/fg/css/frame.css
@@ -100,7 +100,7 @@ body {
     text-decoration: none;
 }
 
-.term-rules {
+.term-reasons {
     color:   #777;
     display: inline-block;
 }
diff --git a/tmpl/term.html b/tmpl/term.html
index 6185ca25..ce5ade84 100644
--- a/tmpl/term.html
+++ b/tmpl/term.html
@@ -15,9 +15,9 @@
     <div class="term-expression">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div>
     {{/if}}
 
-    <div class="term-rules">
-        {{#each rules}}
-        <span class="rule">{{.}}</span> {{#unless @last}}&laquo;{{/unless}}
+    <div class="term-reasons">
+        {{#each reasons}}
+        <span class="reasons">{{.}}</span> {{#unless @last}}&laquo;{{/unless}}
         {{/each}}
     </div>
 
-- 
cgit v1.2.3


From e973788f7d245fcbcbc85783e4cf67c2e8670b4e Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Wed, 21 Dec 2016 18:56:03 -0800
Subject: Remove dictionary delete button

---
 ext/bg/js/templates.js |  8 ++++++--
 tmpl/dictionary.html   | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 94dfd4ee..b46d8813 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -9,11 +9,15 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p
 
   return "<div class=\"dict-group well well-sm\" data-title=\""
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
-    + "\">\n    <div class=\"row\">\n        <div class=\"col-xs-8\">\n            <h4><span class=\"text-muted glyphicon glyphicon-book\"></span> "
+    + "\">\n    <h4><span class=\"text-muted glyphicon glyphicon-book\"></span> "
     + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
     + " <small>v."
     + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
-    + "</small></h4>\n        </div>\n        <div class=\"col-xs-4 text-right disabled\">\n            <button type=\"button\" class=\"dict-group-controls dict-delete btn btn-danger\">Delete</button>\n        </div>\n    </div>\n\n    <div class=\"dict-delete-progress\">\n        Dictionary data is being deleted, please be patient...\n        <div class=\"progress\">\n            <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n        </div>\n    </div>\n\n    <div class=\"checkbox dict-group-controls "
+    + "</small></h4>\n\n    <!-- <div class=\"row\"> -->\n    <!--     <div class=\"col-xs-8\"> -->\n    <!--         <h4><span class=\"text-muted glyphicon glyphicon-book\"></span> "
+    + alias4(((helper = (helper = helpers.title || (depth0 != null ? depth0.title : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"title","hash":{},"data":data}) : helper)))
+    + " <small>v."
+    + alias4(((helper = (helper = helpers.version || (depth0 != null ? depth0.version : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"version","hash":{},"data":data}) : helper)))
+    + "</small></h4> -->\n    <!--     </div> -->\n    <!--     <div class=\"col-xs-4 text-right disabled\"> -->\n    <!--         <button type=\"button\" class=\"dict-group-controls dict-delete btn btn-danger\">Delete</button> -->\n    <!--     </div> -->\n    <!-- </div> -->\n\n    <div class=\"dict-delete-progress\">\n        Dictionary data is being deleted, please be patient...\n        <div class=\"progress\">\n            <div class=\"progress-bar progress-bar-striped progress-bar-danger\" style=\"width: 0%\"></div>\n        </div>\n    </div>\n\n    <div class=\"checkbox dict-group-controls "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\">\n        <label><input type=\"checkbox\" class=\"dict-enable-terms\" "
     + ((stack1 = helpers.unless.call(alias1,(depth0 != null ? depth0.hasTerms : depth0),{"name":"unless","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
diff --git a/tmpl/dictionary.html b/tmpl/dictionary.html
index 824dc2cf..af0a6d28 100644
--- a/tmpl/dictionary.html
+++ b/tmpl/dictionary.html
@@ -1,12 +1,14 @@
 <div class="dict-group well well-sm" data-title="{{title}}">
-    <div class="row">
-        <div class="col-xs-8">
-            <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4>
-        </div>
-        <div class="col-xs-4 text-right disabled">
-            <button type="button" class="dict-group-controls dict-delete btn btn-danger">Delete</button>
-        </div>
-    </div>
+    <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4>
+
+    <!-- <div class="row"> -->
+    <!--     <div class="col-xs-8"> -->
+    <!--         <h4><span class="text-muted glyphicon glyphicon-book"></span> {{title}} <small>v.{{version}}</small></h4> -->
+    <!--     </div> -->
+    <!--     <div class="col-xs-4 text-right disabled"> -->
+    <!--         <button type="button" class="dict-group-controls dict-delete btn btn-danger">Delete</button> -->
+    <!--     </div> -->
+    <!-- </div> -->
 
     <div class="dict-delete-progress">
         Dictionary data is being deleted, please be patient...
-- 
cgit v1.2.3


From 4c5f93c7a75a7bcfd61dc557ccbd7e8e143e4a9d Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Wed, 21 Dec 2016 19:47:50 -0800
Subject: better output for epwing

---
 ext/bg/js/templates.js | 86 +++++++++++++++++++++++++-------------------------
 ext/fg/css/frame.css   | 10 ++++++
 tmpl/term.html         |  4 +--
 3 files changed, 54 insertions(+), 46 deletions(-)

(limited to 'tmpl')

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index b46d8813..1480bb17 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -49,30 +49,6 @@ templates['header.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(c
     + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper)))
     + "/css/frame.css\">\n    </head>\n    <body>\n";
 },"useData":true});
-templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var helper;
-
-  return "<a href=\"#\" class=\"kanji-link\">"
-    + container.escapeExpression(((helper = (helper = helpers.kanji || (depth0 != null ? depth0.kanji : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"kanji","hash":{},"data":data}) : helper)))
-    + "</a>\n";
-},"useData":true});
-templates['kanji-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1;
-
-  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
-},"2":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1;
-
-  return ((stack1 = container.invokePartial(partials["kanji.html"],depth0,{"name":"kanji.html","hash":{"sequence":(depths[1] != null ? depths[1].sequence : depths[1]),"options":(depths[1] != null ? depths[1].options : depths[1]),"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":"    ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
-},"4":function(container,depth0,helpers,partials,data) {
-    return "    <p>No results found</p>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
-    var stack1;
-
-  return ((stack1 = container.invokePartial(partials["header.html"],depth0,{"name":"header.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
-    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
-    + ((stack1 = container.invokePartial(partials["footer.html"],depth0,{"name":"footer.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
-},"usePartial":true,"useData":true,"useDepths":true});
 templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
@@ -135,31 +111,21 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
     + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(8, data, 0),"inverse":container.program(11, data, 0),"data":data})) != null ? stack1 : "")
     + "    </div>\n</div>\n";
 },"useData":true});
-templates['model.html'] = template({"1":function(container,depth0,helpers,partials,data) {
-    return "                    <li><a class=\"marker-link\" href=\"#\">"
-    + container.escapeExpression(container.lambda(depth0, depth0))
-    + "</a></li>\n";
-},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var helper;
 
-  return "<tr>\n    <td class=\"col-sm-2\">"
-    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
-    + "</td>\n    <td class=\"col-sm-10\">\n        <div class=\"input-group\">\n            <input type=\"text\" class=\"anki-field-value form-control\" data-field=\""
-    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
-    + "\" value=\""
-    + alias4(((helper = (helper = helpers.value || (depth0 != null ? depth0.value : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"value","hash":{},"data":data}) : helper)))
-    + "\">\n            <div class=\"input-group-btn\">\n                <button type=\"button\" class=\"btn btn-default dropdown-toggle\" data-toggle=\"dropdown\">\n                    <span class=\"caret\"></span>\n                </button>\n                <ul class=\"dropdown-menu dropdown-menu-right\">\n"
-    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.markers : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "                </ul>\n            </div>\n        </div>\n    </td>\n</tr>\n";
+  return "<a href=\"#\" class=\"kanji-link\">"
+    + container.escapeExpression(((helper = (helper = helpers.kanji || (depth0 != null ? depth0.kanji : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"kanji","hash":{},"data":data}) : helper)))
+    + "</a>\n";
 },"useData":true});
-templates['term-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
+templates['kanji-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
   return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
 },"2":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1;
 
-  return ((stack1 = container.invokePartial(partials["term.html"],depth0,{"name":"term.html","hash":{"sequence":(depths[1] != null ? depths[1].sequence : depths[1]),"options":(depths[1] != null ? depths[1].options : depths[1]),"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":"    ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+  return ((stack1 = container.invokePartial(partials["kanji.html"],depth0,{"name":"kanji.html","hash":{"sequence":(depths[1] != null ? depths[1].sequence : depths[1]),"options":(depths[1] != null ? depths[1].options : depths[1]),"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":"    ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"4":function(container,depth0,helpers,partials,data) {
     return "    <p>No results found</p>\n";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
@@ -169,6 +135,23 @@ templates['term-list.html'] = template({"1":function(container,depth0,helpers,pa
     + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
     + ((stack1 = container.invokePartial(partials["footer.html"],depth0,{"name":"footer.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
 },"usePartial":true,"useData":true,"useDepths":true});
+templates['model.html'] = template({"1":function(container,depth0,helpers,partials,data) {
+    return "                    <li><a class=\"marker-link\" href=\"#\">"
+    + container.escapeExpression(container.lambda(depth0, depth0))
+    + "</a></li>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "<tr>\n    <td class=\"col-sm-2\">"
+    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+    + "</td>\n    <td class=\"col-sm-10\">\n        <div class=\"input-group\">\n            <input type=\"text\" class=\"anki-field-value form-control\" data-field=\""
+    + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper)))
+    + "\" value=\""
+    + alias4(((helper = (helper = helpers.value || (depth0 != null ? depth0.value : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"value","hash":{},"data":data}) : helper)))
+    + "\">\n            <div class=\"input-group-btn\">\n                <button type=\"button\" class=\"btn btn-default dropdown-toggle\" data-toggle=\"dropdown\">\n                    <span class=\"caret\"></span>\n                </button>\n                <ul class=\"dropdown-menu dropdown-menu-right\">\n"
+    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.markers : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "                </ul>\n            </div>\n        </div>\n    </td>\n</tr>\n";
+},"useData":true});
 templates['term.html'] = template({"1":function(container,depth0,helpers,partials,data) {
     var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
 
@@ -242,9 +225,9 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
 },"18":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return "        <p>\n            "
+  return "        <p>"
     + container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0))
-    + "\n        </p>\n";
+    + "</p>\n";
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : {};
 
@@ -263,4 +246,21 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
     + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(15, data, 0),"inverse":container.program(18, data, 0),"data":data})) != null ? stack1 : "")
     + "    </div>\n</div>\n";
 },"useData":true});
+templates['term-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) {
+    var stack1;
+
+  return ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "");
+},"2":function(container,depth0,helpers,partials,data,blockParams,depths) {
+    var stack1;
+
+  return ((stack1 = container.invokePartial(partials["term.html"],depth0,{"name":"term.html","hash":{"sequence":(depths[1] != null ? depths[1].sequence : depths[1]),"options":(depths[1] != null ? depths[1].options : depths[1]),"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":"    ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+},"4":function(container,depth0,helpers,partials,data) {
+    return "    <p>No results found</p>\n";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
+    var stack1;
+
+  return ((stack1 = container.invokePartial(partials["header.html"],depth0,{"name":"header.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : "")
+    + ((stack1 = container.invokePartial(partials["footer.html"],depth0,{"name":"footer.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "");
+},"usePartial":true,"useData":true,"useDepths":true});
 })();
\ No newline at end of file
diff --git a/ext/fg/css/frame.css b/ext/fg/css/frame.css
index 597646f2..d519d4b7 100644
--- a/ext/fg/css/frame.css
+++ b/ext/fg/css/frame.css
@@ -117,6 +117,11 @@ body {
     color: #000;
 }
 
+.term-glossary p {
+    overflow-x:  auto;
+    white-space: pre;
+}
+
 /* kanji styles */
 
 .kanji-glyph {
@@ -153,3 +158,8 @@ body {
 .kanji-glossary li span {
     color: #000;
 }
+
+.kanji-glossary p {
+    overflow-x:  auto;
+    white-space: pre;
+}
diff --git a/tmpl/term.html b/tmpl/term.html
index ce5ade84..e4a0d02b 100644
--- a/tmpl/term.html
+++ b/tmpl/term.html
@@ -35,9 +35,7 @@
             {{/each}}
         </ol>
         {{else}}
-        <p>
-            {{glossary.[0]}}
-        </p>
+        <p>{{glossary.[0]}}</p>
         {{/if}}
     </div>
 </div>
-- 
cgit v1.2.3