Dictionary alias

docs/anki-integration.md

@@ -34,7 +34,8 @@ Flashcard fields can be configured with the following steps:
     | `{cloze-prefix}`                            | Fragment of the containing `{sentence}` starting at the beginning of `{sentence}` until the beginning of `{cloze-body}`.                                               |
     | `{cloze-suffix}`                            | Fragment of the containing `{sentence}` starting at the end of `{cloze-body}` until the end of `{sentence}`.                                                           |
     | `{conjugation}`                             | Conjugation path from the raw inflected term to the source term.                                                                                                       |
-    | `{dictionary}`                              | Name of the dictionary from which the card is being created (unavailable in _grouped_ mode).                                                                           |
+    | `{dictionary}`                              | Original name of the dictionary from which the card is being created (unavailable in _grouped_ mode).                                                                  |
+    | `{dictionary-alias}`                        | Display name of the dictionary from which the card is being created (unavailable in _grouped_ mode).                                                                   |
     | `{document-title}`                          | Title of the web page that the term appeared in.                                                                                                                       |
     | `{expression}`                              | Term expressed as kanji (will be displayed in kana if kanji is not available).                                                                                         |
     | `{frequencies}`                             | Frequency information for the term.                                                                                                                                    |
@@ -79,7 +80,8 @@ Flashcard fields can be configured with the following steps:
     | `{cloze-body}`                    | Raw, inflected parent term as it appeared before being reduced to dictionary form by Yomitan.                                                                            |
     | `{cloze-prefix}`                  | Fragment of the containing `{sentence}` starting at the beginning of `{sentence}` until the beginning of `{cloze-body}`.                                                 |
     | `{cloze-suffix}`                  | Fragment of the containing `{sentence}` starting at the end of `{cloze-body}` until the end of `{sentence}`.                                                             |
-    | `{dictionary}`                    | Name of the dictionary from which the card is being created.                                                                                                             |
+    | `{dictionary}`                    | Original name of the dictionary from which the card is being created.                                                                                                    |
+    | `{dictionary-alias}`              | Display name of the dictionary from which the card is being created.                                                                                                     |
     | `{document-title}`                | Title of the web page that the kanji appeared in.                                                                                                                        |
     | `{frequencies}`                   | Frequency information for the kanji.                                                                                                                                     |
     | `{frequency-harmonic-rank}`       | The harmonic mean of frequency data for the current kanji. Defaults to rank 9999999 when frequency data is not found, indicating extremely low rank-based kanji usage.   |

ext/css/settings.css

@@ -2404,6 +2404,10 @@ input[type=number].dictionary-priority {
     overflow: auto;
 }
 
+#dictionary-alias-input {
+    width: 100%;
+}
+
 #dictionary-move-up>span.icon-button-inner,
 #dictionary-move-down>span.icon-button-inner {
     width: 26px;

ext/data/schemas/options-schema.json

@@ -831,6 +831,7 @@
                                     "type": "object",
                                     "required": [
                                         "name",
+                                        "alias",
                                         "priority",
                                         "enabled",
                                         "allowSecondarySearches",
@@ -843,6 +844,10 @@
                                             "type": "string",
                                             "default": ""
                                         },
+                                        "alias": {
+                                            "type": "string",
+                                            "default": ""
+                                        },
                                         "priority": {
                                             "type": "number",
                                             "default": 0

ext/data/templates/anki-field-templates-upgrade-v49.handlebars

@@ -0,0 +1,115 @@
+{{<<<<<<<}}
+{{#*inline "glossary-single"}}
+    {{~#unless brief~}}
+        {{~#scope~}}
+            {{~set "any" false~}}
+            {{~#each definitionTags~}}
+                {{~#if (op "||" (op "!" @root.compactTags) (op "!" redundant))~}}
+                    {{~#if (get "any")}}, {{else}}<i>({{/if~}}
+                    {{name}}
+                    {{~set "any" true~}}
+                {{~/if~}}
+            {{~/each~}}
+            {{~#unless noDictionaryTag~}}
+                {{~#if (op "||" (op "!" @root.compactTags) (op "!==" dictionary (get "previousDictionary")))~}}
+                    {{~#if (get "any")}}, {{else}}<i>({{/if~}}
+                    {{dictionary}}
+                    {{~set "any" true~}}
+                {{~/if~}}
+            {{~/unless~}}
+            {{~#if (get "any")}})</i> {{/if~}}
+        {{~/scope~}}
+        {{~#if only~}}({{#each only}}{{.}}{{#unless @last}}, {{/unless}}{{/each}} only) {{/if~}}
+    {{~/unless~}}
+    {{~#if (op "<=" glossary.length 1)~}}
+        {{#each glossary}}{{formatGlossary ../dictionary .}}{{/each}}
+    {{~else if @root.compactGlossaries~}}
+        {{#each glossary}}{{formatGlossary ../dictionary .}}{{#unless @last}} | {{/unless}}{{/each}}
+    {{~else~}}
+        <ul>{{#each glossary}}<li>{{formatGlossary ../dictionary .}}</li>{{/each}}</ul>
+    {{~/if~}}
+    {{~set "previousDictionary" dictionary~}}
+{{/inline}}
+{{=======}}
+{{#*inline "glossary-single"}}
+    {{~#unless brief~}}
+        {{~#scope~}}
+            {{~set "any" false~}}
+            {{~#each definitionTags~}}
+                {{~#if (op "||" (op "!" @root.compactTags) (op "!" redundant))~}}
+                    {{~#if (get "any")}}, {{else}}<i>({{/if~}}
+                    {{name}}
+                    {{~set "any" true~}}
+                {{~/if~}}
+            {{~/each~}}
+            {{~#unless noDictionaryTag~}}
+                {{~#if (op "||" (op "!" @root.compactTags) (op "!==" dictionary (get "previousDictionary")))~}}
+                    {{~#if (get "any")}}, {{else}}<i>({{/if~}}
+                    {{dictionaryAlias}}
+                    {{~set "any" true~}}
+                {{~/if~}}
+            {{~/unless~}}
+            {{~#if (get "any")}})</i> {{/if~}}
+        {{~/scope~}}
+        {{~#if only~}}({{#each only}}{{.}}{{#unless @last}}, {{/unless}}{{/each}} only) {{/if~}}
+    {{~/unless~}}
+    {{~#if (op "<=" glossary.length 1)~}}
+        {{#each glossary}}{{formatGlossary ../dictionary .}}{{/each}}
+    {{~else if @root.compactGlossaries~}}
+        {{#each glossary}}{{formatGlossary ../dictionary .}}{{#unless @last}} | {{/unless}}{{/each}}
+    {{~else~}}
+        <ul>{{#each glossary}}<li>{{formatGlossary ../dictionary .}}</li>{{/each}}</ul>
+    {{~/if~}}
+    {{~set "previousDictionary" dictionary~}}
+{{/inline}}
+{{>>>>>>>}}
+
+{{<<<<<<<}}
+{{#*inline "dictionary"}}
+    {{~definition.dictionary~}}
+{{/inline}}
+{{=======}}
+{{#*inline "dictionary"}}
+    {{~definition.dictionary~}}
+{{/inline}}
+
+{{#*inline "dictionary-alias"}}
+    {{~definition.dictionaryAlias~}}
+{{/inline}}
+{{>>>>>>>}}
+
+{{<<<<<<<}}
+{{#*inline "frequencies"}}
+    {{~#if (op ">" definition.frequencies.length 0)~}}
+        <ul style="text-align: left;">
+        {{~#each definition.frequencies~}}
+            <li>
+            {{~#if (op "!==" ../definition.type "kanji")~}}
+                {{~#if (op "||" (op ">" ../uniqueExpressions.length 1) (op ">" ../uniqueReadings.length 1))~}}(
+                    {{~furigana expression reading~}}
+                ) {{/if~}}
+            {{~/if~}}
+            {{~dictionary}}: {{frequency~}}
+            </li>
+        {{~/each~}}
+        </ul>
+    {{~/if~}}
+{{/inline}}
+{{=======}}
+{{#*inline "frequencies"}}
+    {{~#if (op ">" definition.frequencies.length 0)~}}
+        <ul style="text-align: left;">
+        {{~#each definition.frequencies~}}
+            <li>
+            {{~#if (op "!==" ../definition.type "kanji")~}}
+                {{~#if (op "||" (op ">" ../uniqueExpressions.length 1) (op ">" ../uniqueReadings.length 1))~}}(
+                    {{~furigana expression reading~}}
+                ) {{/if~}}
+            {{~/if~}}
+            {{~dictionaryAlias}}: {{frequency~}}
+            </li>
+        {{~/each~}}
+        </ul>
+    {{~/if~}}
+{{/inline}}
+{{>>>>>>>}}

ext/data/templates/default-anki-field-templates.handlebars

@@ -12,7 +12,7 @@
             {{~#unless noDictionaryTag~}}
                 {{~#if (op "||" (op "!" @root.compactTags) (op "!==" dictionary (get "previousDictionary")))~}}
                     {{~#if (get "any")}}, {{else}}<i>({{/if~}}
-                    {{dictionary}}
+                    {{dictionaryAlias}}
                     {{~set "any" true~}}
                 {{~/if~}}
             {{~/unless~}}
@@ -44,6 +44,10 @@
     {{~definition.dictionary~}}
 {{/inline}}
 
+{{#*inline "dictionary-alias"}}
+    {{~definition.dictionaryAlias~}}
+{{/inline}}
+
 {{#*inline "expression"}}
     {{~#if merge~}}
         {{~#if modeTermKana~}}
@@ -365,7 +369,7 @@
                     {{~furigana expression reading~}}
                 ) {{/if~}}
             {{~/if~}}
-            {{~dictionary}}: {{frequency~}}
+            {{~dictionaryAlias}}: {{frequency~}}
             </li>
         {{~/each~}}
         </ul>

ext/js/background/backend.js

@@ -2472,6 +2472,7 @@ export class Backend {
         if (mode === 'merge' && !enabledDictionaryMap.has(mainDictionary)) {
             enabledDictionaryMap.set(mainDictionary, {
                 index: enabledDictionaryMap.size,
+                alias: mainDictionary,
                 priority: 0,
                 allowSecondarySearches: false,
                 partsOfSpeechFilter: true,
@@ -2516,9 +2517,10 @@ export class Backend {
         const enabledDictionaryMap = new Map();
         for (const dictionary of options.dictionaries) {
             if (!dictionary.enabled) { continue; }
-            const {name, priority, allowSecondarySearches, partsOfSpeechFilter, useDeinflections} = dictionary;
+            const {name, alias, priority, allowSecondarySearches, partsOfSpeechFilter, useDeinflections} = dictionary;
             enabledDictionaryMap.set(name, {
                 index: enabledDictionaryMap.size,
+                alias,
                 priority,
                 allowSecondarySearches,
                 partsOfSpeechFilter,