Dictionary alias

docs/anki-integration.md

@@ -35,6 +35,7 @@ Flashcard fields can be configured with the following steps:
     | `{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-alias}`                        | Alias 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.                                                                                                                                    |
@@ -80,6 +81,7 @@ 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}`.                                                             |
     | `{dictionary}`                    | Name of the dictionary from which the card is being created.                                                                                                             |
+    | `{dictionary-alias}`              | Alias 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,

ext/js/data/anki-note-data-creator.js

@@ -327,7 +327,7 @@ function getDefinition(dictionaryEntry, context, resultOutputMode, dictionarySty
  * @returns {import('anki-templates').KanjiDictionaryEntry}
  */
 function getKanjiDefinition(dictionaryEntry, context) {
-    const {character, dictionary, onyomi, kunyomi, definitions} = dictionaryEntry;
+    const {character, dictionary, dictionaryAlias, onyomi, kunyomi, definitions} = dictionaryEntry;
 
     let {url} = context;
     if (typeof url !== 'string') { url = ''; }
@@ -343,6 +343,7 @@ function getKanjiDefinition(dictionaryEntry, context) {
         type: 'kanji',
         character,
         dictionary,
+        dictionaryAlias,
         onyomi,
         kunyomi,
         glossary: definitions,
@@ -392,10 +393,11 @@ function convertKanjiStat({name, category, content, order, score, dictionary, va
 function getKanjiFrequencies(dictionaryEntry) {
     /** @type {import('anki-templates').KanjiFrequency[]} */
     const results = [];
-    for (const {index, dictionary, dictionaryIndex, dictionaryPriority, character, frequency, displayValue} of dictionaryEntry.frequencies) {
+    for (const {index, dictionary, dictionaryAlias, dictionaryIndex, dictionaryPriority, character, frequency, displayValue} of dictionaryEntry.frequencies) {
         results.push({
             index,
             dictionary,
+            dictionaryAlias,
             dictionaryOrder: {
                 index: dictionaryIndex,
                 priority: dictionaryPriority,
@@ -429,6 +431,7 @@ function getTermDefinition(dictionaryEntry, context, resultOutputMode, dictionar
 
     const primarySource = getPrimarySource(dictionaryEntry);
 
+    const dictionaryAliases = createCachedValue(getTermDictionaryAliases.bind(null, dictionaryEntry));
     const dictionaryNames = createCachedValue(getTermDictionaryNames.bind(null, dictionaryEntry));
     const commonInfo = createCachedValue(getTermDictionaryEntryCommonInfo.bind(null, dictionaryEntry, type, dictionaryStylesMap));
     const termTags = createCachedValue(getTermTags.bind(null, dictionaryEntry, type));
@@ -455,6 +458,7 @@ function getTermDefinition(dictionaryEntry, context, resultOutputMode, dictionar
         isPrimary: (type === 'term' ? dictionaryEntry.isPrimary : void 0),
         get sequence() { return getCachedValue(sequence); },
         get dictionary() { return getCachedValue(dictionaryNames)[0]; },
+        get dictionaryAlias() { return getCachedValue(dictionaryAliases)[0]; },
         dictionaryOrder: {
             index: dictionaryIndex,
             priority: dictionaryPriority,
@@ -499,6 +503,18 @@ function getTermDictionaryNames(dictionaryEntry) {
     return [...dictionaryNames];
 }
 
+/**
+ * @param {import('dictionary').TermDictionaryEntry} dictionaryEntry
+ * @returns {string[]}
+ */
+function getTermDictionaryAliases(dictionaryEntry) {
+    const dictionaryAliases = new Set();
+    for (const {dictionaryAlias} of dictionaryEntry.definitions) {
+        dictionaryAliases.add(dictionaryAlias);
+    }
+    return [...dictionaryAliases];
+}
+
 /**
  * @param {import('dictionary').TermDictionaryEntry} dictionaryEntry
  * @param {import('anki-templates').TermDictionaryEntryType} type
@@ -524,7 +540,7 @@ function getTermDictionaryEntryCommonInfo(dictionaryEntry, type, dictionaryStyle
     const definitions = [];
     /** @type {import('anki-templates').Tag[]} */
     const definitionTags = [];
-    for (const {tags, headwordIndices, entries, dictionary, sequences} of dictionaryEntry.definitions) {
+    for (const {tags, headwordIndices, entries, dictionary, dictionaryAlias, sequences} of dictionaryEntry.definitions) {
         const dictionaryStyles = dictionaryStylesMap.get(dictionary);
         let glossaryScopedStyles = '';
         let dictScopedStyles = '';
@@ -542,6 +558,7 @@ function getTermDictionaryEntryCommonInfo(dictionaryEntry, type, dictionaryStyle
         definitions.push({
             sequence: sequences[0],
             dictionary,
+            dictionaryAlias,
             glossaryScopedStyles,
             dictScopedStyles,
             glossary: entries,
@@ -598,12 +615,13 @@ function addScopeToCss(css, scopeSelector) {
 function getTermFrequencies(dictionaryEntry) {
     const results = [];
     const {headwords} = dictionaryEntry;
-    for (const {headwordIndex, dictionary, dictionaryIndex, dictionaryPriority, hasReading, frequency, displayValue} of dictionaryEntry.frequencies) {
+    for (const {headwordIndex, dictionary, dictionaryAlias, dictionaryIndex, dictionaryPriority, hasReading, frequency, displayValue} of dictionaryEntry.frequencies) {
         const {term, reading} = headwords[headwordIndex];
         results.push({
             index: results.length,
             expressionIndex: headwordIndex,
             dictionary,
+            dictionaryAlias,
             dictionaryOrder: {
                 index: dictionaryIndex,
                 priority: dictionaryPriority,
@@ -624,14 +642,15 @@ function getTermFrequencies(dictionaryEntry) {
 function getTermPitches(dictionaryEntry) {
     const results = [];
     const {headwords} = dictionaryEntry;
-    for (const {headwordIndex, dictionary, dictionaryIndex, dictionaryPriority, pronunciations} of dictionaryEntry.pronunciations) {
+    for (const {headwordIndex, dictionary, dictionaryAlias, dictionaryIndex, dictionaryPriority, pronunciations} of dictionaryEntry.pronunciations) {
         const {term, reading} = headwords[headwordIndex];
         const pitches = getPronunciationsOfType(pronunciations, 'pitch-accent');
         const cachedPitches = createCachedValue(getTermPitchesInner.bind(null, pitches));
         results.push({
             index: results.length,
             expressionIndex: headwordIndex,
             dictionary,
+            dictionaryAlias,
             dictionaryOrder: {
                 index: dictionaryIndex,
                 priority: dictionaryPriority,
@@ -667,14 +686,15 @@ function getTermPitchesInner(pitches) {
 function getTermPhoneticTranscriptions(dictionaryEntry) {
     const results = [];
     const {headwords} = dictionaryEntry;
-    for (const {headwordIndex, dictionary, dictionaryIndex, dictionaryPriority, pronunciations} of dictionaryEntry.pronunciations) {
+    for (const {headwordIndex, dictionary, dictionaryAlias, dictionaryIndex, dictionaryPriority, pronunciations} of dictionaryEntry.pronunciations) {
         const {term, reading} = headwords[headwordIndex];
         const phoneticTranscriptions = getPronunciationsOfType(pronunciations, 'phonetic-transcription');
         const termPhoneticTranscriptions = getTermPhoneticTranscriptionsInner(phoneticTranscriptions);
         results.push({
             index: results.length,
             expressionIndex: headwordIndex,
             dictionary,
+            dictionaryAlias,
             dictionaryOrder: {
                 index: dictionaryIndex,
                 priority: dictionaryPriority,
@@ -742,13 +762,14 @@ function getTermExpressions(dictionaryEntry) {
 function getTermExpressionFrequencies(dictionaryEntry, i) {
     const results = [];
     const {headwords, frequencies} = dictionaryEntry;
-    for (const {headwordIndex, dictionary, dictionaryIndex, dictionaryPriority, hasReading, frequency, displayValue} of frequencies) {
+    for (const {headwordIndex, dictionary, dictionaryAlias, dictionaryIndex, dictionaryPriority, hasReading, frequency, displayValue} of frequencies) {
         if (headwordIndex !== i) { continue; }
         const {term, reading} = headwords[headwordIndex];
         results.push({
             index: results.length,
             expressionIndex: headwordIndex,
             dictionary,
+            dictionaryAlias,
             dictionaryOrder: {
                 index: dictionaryIndex,
                 priority: dictionaryPriority,
@@ -770,7 +791,7 @@ function getTermExpressionFrequencies(dictionaryEntry, i) {
 function getTermExpressionPitches(dictionaryEntry, i) {
     const results = [];
     const {headwords, pronunciations: termPronunciations} = dictionaryEntry;
-    for (const {headwordIndex, dictionary, dictionaryIndex, dictionaryPriority, pronunciations} of termPronunciations) {
+    for (const {headwordIndex, dictionary, dictionaryAlias, dictionaryIndex, dictionaryPriority, pronunciations} of termPronunciations) {
         if (headwordIndex !== i) { continue; }
         const {term, reading} = headwords[headwordIndex];
         const pitches = getPronunciationsOfType(pronunciations, 'pitch-accent');
@@ -779,6 +800,7 @@ function getTermExpressionPitches(dictionaryEntry, i) {
             index: results.length,
             expressionIndex: headwordIndex,
             dictionary,
+            dictionaryAlias,
             dictionaryOrder: {
                 index: dictionaryIndex,
                 priority: dictionaryPriority,

ext/js/data/anki-template-util.js

@@ -34,6 +34,7 @@ export function getStandardFieldMarkers(type) {
                 'cloze-suffix',
                 'conjugation',
                 'dictionary',
+                'dictionary-alias',
                 'document-title',
                 'expression',
                 'frequencies',
@@ -74,6 +75,7 @@ export function getStandardFieldMarkers(type) {
                 'cloze-prefix',
                 'cloze-suffix',
                 'dictionary',
+                'dictionary-alias',
                 'document-title',
                 'frequencies',
                 'frequency-harmonic-rank',