diff --git a/README.md b/README.md index 0c21cdf8..5fceea43 100644 --- a/README.md +++ b/README.md @@ -169,6 +169,7 @@ Flashcard fields can be configured with the following steps: `{furigana-plain}` | Term expressed as kanji with furigana displayed next to it in brackets (e.g. 日本語[にほんご]). `{glossary}` | List of definitions for the term (output format depends on whether running in *grouped* mode). `{glossary-brief}` | List of definitions for the term in a more compact format. + `{glossary-no-dictionary}` | List of definitions for the term, except the dictionary tag is omitted. `{pitch-accents}` | List of pitch accent downstep notations for the term. `{pitch-accent-graphs}` | List of pitch accent graphs for the term. `{pitch-accent-positions}` | List of accent downstep positions for the term as a number. diff --git a/ext/bg/data/anki-field-templates-upgrade-v8.handlebars b/ext/bg/data/anki-field-templates-upgrade-v8.handlebars index 32c61343..b3aed45f 100644 --- a/ext/bg/data/anki-field-templates-upgrade-v8.handlebars +++ b/ext/bg/data/anki-field-templates-upgrade-v8.handlebars @@ -52,6 +52,13 @@ {{~#set "any" true}}{{/set~}} {{~/if~}} {{~/each~}} + {{~#unless noDictionaryTag~}} + {{~#if (op "||" (op "!" @root.compactTags) (op "!==" dictionary (get "previousDictionary")))~}} + {{~#if (get "any")}}, {{else}}({{/if~}} + {{dictionary}} + {{~#set "any" true}}{{/set~}} + {{~/if~}} + {{~/unless~}} {{~#if (get "any")}}) {{/if~}} {{~/scope~}} {{~#if only~}}({{#each only}}{{.}}{{#unless @last}}, {{/unless}}{{/each}} only) {{/if~}} @@ -63,6 +70,7 @@ {{~else~}} {{~/if~}} + {{~#set "previousDictionary" dictionary~}}{{~/set~}} {{/inline}} {{>>>>>>>}} @@ -99,12 +107,12 @@
{{~#scope~}} {{~#if (op "===" definition.type "term")~}} - {{~> glossary-single definition brief=brief ~}} + {{~> glossary-single definition brief=brief noDictionaryTag=noDictionaryTag ~}} {{~else if (op "||" (op "===" definition.type "termGrouped") (op "===" definition.type "termMerged"))~}} {{~#if (op ">" definition.definitions.length 1)~}} -
    {{~#each definition.definitions~}}
  1. {{~> glossary-single . brief=../brief ~}}
    2. {{~/each~}}
+
    {{~#each definition.definitions~}}
  1. {{~> glossary-single . brief=../brief noDictionaryTag=../noDictionaryTag ~}}
    2. {{~/each~}}
{{~else~}} - {{~#each definition.definitions~}}{{~> glossary-single . brief=../brief ~}}{{~/each~}} + {{~#each definition.definitions~}}{{~> glossary-single . brief=../brief noDictionaryTag=../noDictionaryTag ~}}{{~/each~}} {{~/if~}} {{~else if (op "===" definition.type "kanji")~}} {{~#if (op ">" definition.glossary.length 1)~}} @@ -116,4 +124,8 @@ {{~/scope~}}
{{~/inline~}} + +{{#*inline "glossary-no-dictionary"}} + {{~> glossary noDictionaryTag=true ~}} +{{/inline}} {{>>>>>>>}} diff --git a/ext/bg/data/default-anki-field-templates.handlebars b/ext/bg/data/default-anki-field-templates.handlebars index 94553183..8ee2e00d 100644 --- a/ext/bg/data/default-anki-field-templates.handlebars +++ b/ext/bg/data/default-anki-field-templates.handlebars @@ -9,6 +9,13 @@ {{~#set "any" true}}{{/set~}} {{~/if~}} {{~/each~}} + {{~#unless noDictionaryTag~}} + {{~#if (op "||" (op "!" @root.compactTags) (op "!==" dictionary (get "previousDictionary")))~}} + {{~#if (get "any")}}, {{else}}({{/if~}} + {{dictionary}} + {{~#set "any" true}}{{/set~}} + {{~/if~}} + {{~/unless~}} {{~#if (get "any")}}) {{/if~}} {{~/scope~}} {{~#if only~}}({{#each only}}{{.}}{{#unless @last}}, {{/unless}}{{/each}} only) {{/if~}} @@ -20,6 +27,7 @@ {{~else~}} {{~/if~}} + {{~#set "previousDictionary" dictionary~}}{{~/set~}} {{/inline}} {{#*inline "audio"}} @@ -93,12 +101,12 @@
{{~#scope~}} {{~#if (op "===" definition.type "term")~}} - {{~> glossary-single definition brief=brief ~}} + {{~> glossary-single definition brief=brief noDictionaryTag=noDictionaryTag ~}} {{~else if (op "||" (op "===" definition.type "termGrouped") (op "===" definition.type "termMerged"))~}} {{~#if (op ">" definition.definitions.length 1)~}} -
    {{~#each definition.definitions~}}
  1. {{~> glossary-single . brief=../brief ~}}
    2. {{~/each~}}
+
    {{~#each definition.definitions~}}
  1. {{~> glossary-single . brief=../brief noDictionaryTag=../noDictionaryTag ~}}
    2. {{~/each~}}
{{~else~}} - {{~#each definition.definitions~}}{{~> glossary-single . brief=../brief ~}}{{~/each~}} + {{~#each definition.definitions~}}{{~> glossary-single . brief=../brief noDictionaryTag=../noDictionaryTag ~}}{{~/each~}} {{~/if~}} {{~else if (op "===" definition.type "kanji")~}} {{~#if (op ">" definition.glossary.length 1)~}} @@ -111,6 +119,10 @@
{{~/inline~}} +{{#*inline "glossary-no-dictionary"}} + {{~> glossary2 noDictionaryTag=true ~}} +{{/inline}} + {{#*inline "glossary-brief"}} {{~> glossary brief=true ~}} {{/inline}} diff --git a/ext/bg/js/settings/anki-controller.js b/ext/bg/js/settings/anki-controller.js index c2292bc9..e7c8db15 100644 --- a/ext/bg/js/settings/anki-controller.js +++ b/ext/bg/js/settings/anki-controller.js @@ -94,6 +94,7 @@ class AnkiController { 'furigana-plain', 'glossary', 'glossary-brief', + 'glossary-no-dictionary', 'pitch-accents', 'pitch-accent-graphs', 'pitch-accent-positions', diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js index 7242ec56..729c8294 100644 --- a/ext/bg/js/translator.js +++ b/ext/bg/js/translator.js @@ -133,7 +133,6 @@ class Translator { for (const {character, onyomi, kunyomi, tags, glossary, stats, dictionary} of databaseDefinitions) { const expandedStats = await this._expandStats(stats, dictionary); const expandedTags = await this._expandTags(tags, dictionary); - expandedTags.push(this._createDictionaryTag(dictionary)); this._sortTags(expandedTags); const definition = this._createKanjiDefinition(character, dictionary, onyomi, kunyomi, glossary, expandedTags, expandedStats); @@ -541,17 +540,14 @@ class Translator { } _flagRedundantDefinitionTags(definitions) { - let lastDictionary = ''; + let lastDictionary = null; let lastPartOfSpeech = ''; const removeCategoriesSet = new Set(); - for (const {definitionTags} of definitions) { - const dictionary = this._createMapKey(this._getTagNamesWithCategory(definitionTags, 'dictionary')); + for (const {dictionary, definitionTags} of definitions) { const partOfSpeech = this._createMapKey(this._getTagNamesWithCategory(definitionTags, 'partOfSpeech')); - if (lastDictionary === dictionary) { - removeCategoriesSet.add('dictionary'); - } else { + if (lastDictionary !== dictionary) { lastDictionary = dictionary; lastPartOfSpeech = ''; } @@ -1054,10 +1050,6 @@ class Translator { return JSON.stringify(array); } - _createDictionaryTag(name) { - return this._createTag(name, 'dictionary', '', 100, 0, name, false); - } - _createTag(name, category, notes, order, score, dictionary, redundant) { return { name, @@ -1101,7 +1093,6 @@ class Translator { const dictionaryPriority = this._getDictionaryPriority(dictionary, enabledDictionaryMap); const termTagsExpanded = await this._expandTags(termTags, dictionary); const definitionTagsExpanded = await this._expandTags(definitionTags, dictionary); - definitionTagsExpanded.push(this._createDictionaryTag(dictionary)); this._sortTags(definitionTagsExpanded); this._sortTags(termTagsExpanded); diff --git a/ext/bg/settings2.html b/ext/bg/settings2.html index d557d366..d29bd4a1 100644 --- a/ext/bg/settings2.html +++ b/ext/bg/settings2.html @@ -2626,6 +2626,10 @@ {glossary-brief} List of definitions for the term in a more compact format. + + {glossary-no-dictionary} + List of definitions for the term, except the dictionary tag is omitted. + {pitch-accents} List of pitch accent downstep notations for the term. diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js index e9eaa68f..d7cc5bd4 100644 --- a/ext/mixed/js/display-generator.js +++ b/ext/mixed/js/display-generator.js @@ -91,9 +91,28 @@ class DisplayGenerator { this._appendMultiple(reasonsContainer, this._createTermReason.bind(this), reasons); this._appendMultiple(frequencyGroupListContainer, this._createFrequencyGroup.bind(this), groupedFrequencies, false); this._appendMultiple(pitchesContainer, this._createPitches.bind(this), pitches); - this._appendMultiple(definitionsContainer, this._createTermDefinitionItem.bind(this), definitions); this._appendMultiple(termTagsContainer, this._createTermTag.bind(this), termTags, expressions.length); + // Add definitions + const dictionaryTag = this._createDictionaryTag(null); + for (let i = 0, ii = definitions.length; i < ii; ++i) { + const definition = definitions[i]; + const {dictionary} = definition; + + if (dictionaryTag.dictionary === dictionary) { + dictionaryTag.redundant = true; + } else { + dictionaryTag.redundant = false; + dictionaryTag.dictionary = dictionary; + dictionaryTag.name = dictionary; + } + + const node2 = this._createTermDefinitionItem(definition, dictionaryTag); + node2.dataset.index = `${i}`; + definitionsContainer.appendChild(node2); + } + definitionsContainer.dataset.count = `${definitions.length}`; + return node; } @@ -114,8 +133,10 @@ class DisplayGenerator { glyphContainer.textContent = details.character; const groupedFrequencies = DictionaryDataUtil.groupKanjiFrequencies(details.frequencies); + const dictionaryTag = this._createDictionaryTag(details.dictionary); + this._appendMultiple(frequencyGroupListContainer, this._createFrequencyGroup.bind(this), groupedFrequencies, true); - this._appendMultiple(tagContainer, this._createTag.bind(this), details.tags); + this._appendMultiple(tagContainer, this._createTag.bind(this), [...details.tags, dictionaryTag]); this._appendMultiple(glossaryContainer, this._createKanjiGlossaryItem.bind(this), details.glossary); this._appendMultiple(chineseReadingsContainer, this._createKanjiReading.bind(this), details.onyomi); this._appendMultiple(japaneseReadingsContainer, this._createKanjiReading.bind(this), details.kunyomi); @@ -211,17 +232,17 @@ class DisplayGenerator { return fragment; } - _createTermDefinitionItem(details) { + _createTermDefinitionItem(details, dictionaryTag) { const node = this._templates.instantiate('term-definition-item'); const tagListContainer = node.querySelector('.term-definition-tag-list'); const onlyListContainer = node.querySelector('.term-definition-disambiguation-list'); const glossaryContainer = node.querySelector('.term-glossary-list'); - const dictionary = details.dictionary; + const {dictionary, definitionTags} = details; node.dataset.dictionary = dictionary; - this._appendMultiple(tagListContainer, this._createTag.bind(this), details.definitionTags); + this._appendMultiple(tagListContainer, this._createTag.bind(this), [...definitionTags, dictionaryTag]); this._appendMultiple(onlyListContainer, this._createTermDisambiguation.bind(this), details.only); this._appendMultiple(glossaryContainer, this._createTermGlossaryItem.bind(this), details.glossary, dictionary); @@ -645,4 +666,16 @@ class DisplayGenerator { container.appendChild(document.createTextNode(parts[i])); } } + + _createDictionaryTag(dictionary) { + return { + name: dictionary, + category: 'dictionary', + notes: '', + order: 100, + score: 0, + dictionary, + redundant: false + }; + } } diff --git a/test/data/test-translator-data.json b/test/data/test-translator-data.json index 2a568141..651b87d1 100644 --- a/test/data/test-translator-data.json +++ b/test/data/test-translator-data.json @@ -80,15 +80,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "stats": { @@ -203,15 +194,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "stats": { @@ -404,15 +386,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -567,15 +540,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -750,15 +714,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -921,15 +876,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -1092,15 +1038,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -1263,15 +1200,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -1426,15 +1354,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -1589,15 +1508,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -1804,15 +1714,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -2023,15 +1924,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -2242,15 +2134,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -2461,15 +2344,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -2650,15 +2524,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -2823,15 +2688,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -2996,15 +2852,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -3169,15 +3016,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -3332,15 +3170,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -3495,15 +3324,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -3664,15 +3484,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -3824,15 +3635,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -3999,15 +3801,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -4182,15 +3975,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -4353,15 +4137,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -4536,15 +4311,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -4707,15 +4473,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -4922,15 +4679,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -5141,15 +4889,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -5330,15 +5069,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -5503,15 +5233,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -5718,15 +5439,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -5937,15 +5649,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -6126,15 +5829,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -6299,15 +5993,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -6468,15 +6153,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -6659,15 +6335,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -6816,15 +6483,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -6973,15 +6631,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -7130,15 +6779,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -7273,15 +6913,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -7416,15 +7047,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -7559,15 +7181,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -7702,15 +7315,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -7835,15 +7439,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -7968,15 +7563,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -8354,15 +7940,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -8573,15 +8150,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": true } ], "termTags": [ @@ -8978,15 +8546,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -9197,15 +8756,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": true } ], "termTags": [ @@ -9542,15 +9092,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -9715,15 +9256,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": true } ], "termTags": [ @@ -10028,15 +9560,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -10201,15 +9724,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": true } ], "termTags": [ @@ -10494,15 +10008,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -10787,15 +10292,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -11216,15 +10712,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "definitions": [ @@ -11372,15 +10859,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -11613,15 +11091,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": true } ], "definitions": [ @@ -11769,15 +11238,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -12010,15 +11470,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": true } ], "definitions": [ @@ -12166,15 +11617,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -12407,15 +11849,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": true } ], "definitions": [ @@ -12563,15 +11996,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -12992,15 +12416,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "definitions": [ @@ -13118,15 +12533,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -13303,15 +12709,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": true } ], "definitions": [ @@ -13429,15 +12826,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -13614,15 +13002,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": true } ], "definitions": [ @@ -13740,15 +13119,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -13925,15 +13295,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": true } ], "definitions": [ @@ -14051,15 +13412,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -14344,15 +13696,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "definitions": [ @@ -14460,15 +13803,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -14737,15 +14071,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "definitions": [ @@ -14853,15 +14178,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -15113,15 +14429,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -15336,15 +14643,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -15559,15 +14857,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -15782,15 +15071,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -15971,15 +15251,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -16144,15 +15415,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -16317,15 +15579,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -16490,15 +15743,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -16653,15 +15897,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -16816,15 +16051,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -17046,15 +16272,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -17265,15 +16482,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -17484,15 +16692,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -17703,15 +16902,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -17892,15 +17082,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -18065,15 +17246,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -18238,15 +17410,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -18411,15 +17574,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -18574,15 +17728,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -18737,15 +17882,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -18967,15 +18103,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -19186,15 +18313,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -19405,15 +18523,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -19624,15 +18733,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -19813,15 +18913,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -19986,15 +19077,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -20159,15 +19241,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -20332,15 +19405,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -20495,15 +19559,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ @@ -20658,15 +19713,6 @@ "score": 0, "dictionary": "Test Dictionary 2", "redundant": false - }, - { - "name": "Test Dictionary 2", - "category": "dictionary", - "notes": "", - "order": 100, - "score": 0, - "dictionary": "Test Dictionary 2", - "redundant": false } ], "termTags": [ diff --git a/test/test-options-util.js b/test/test-options-util.js index 587cb9ee..310e3d88 100644 --- a/test/test-options-util.js +++ b/test/test-options-util.js @@ -833,6 +833,13 @@ ${update8} {{~#set "any" true}}{{/set~}} {{~/if~}} {{~/each~}} + {{~#unless noDictionaryTag~}} + {{~#if (op "||" (op "!" @root.compactTags) (op "!==" dictionary (get "previousDictionary")))~}} + {{~#if (get "any")}}, {{else}}({{/if~}} + {{dictionary}} + {{~#set "any" true}}{{/set~}} + {{~/if~}} + {{~/unless~}} {{~#if (get "any")}}) {{/if~}} {{~/scope~}} {{~#if only~}}({{#each only}}{{.}}{{#unless @last}}, {{/unless}}{{/each}} only) {{/if~}} @@ -844,6 +851,7 @@ ${update8} {{~else~}} {{~/if~}} + {{~#set "previousDictionary" dictionary~}}{{~/set~}} {{/inline}} {{#*inline "character"}} @@ -854,12 +862,12 @@ ${update8}
{{~#scope~}} {{~#if (op "===" definition.type "term")~}} - {{~> glossary-single definition brief=brief ~}} + {{~> glossary-single definition brief=brief noDictionaryTag=noDictionaryTag ~}} {{~else if (op "||" (op "===" definition.type "termGrouped") (op "===" definition.type "termMerged"))~}} {{~#if (op ">" definition.definitions.length 1)~}} -
    {{~#each definition.definitions~}}
  1. {{~> glossary-single . brief=../brief ~}}
    2. {{~/each~}}
+
    {{~#each definition.definitions~}}
  1. {{~> glossary-single . brief=../brief noDictionaryTag=../noDictionaryTag ~}}
    2. {{~/each~}}
{{~else~}} - {{~#each definition.definitions~}}{{~> glossary-single . brief=../brief ~}}{{~/each~}} + {{~#each definition.definitions~}}{{~> glossary-single . brief=../brief noDictionaryTag=../noDictionaryTag ~}}{{~/each~}} {{~/if~}} {{~else if (op "===" definition.type "kanji")~}} {{~#if (op ">" definition.glossary.length 1)~}} @@ -872,6 +880,10 @@ ${update8}
{{~/inline~}} +{{#*inline "glossary-no-dictionary"}} + {{~> glossary noDictionaryTag=true ~}} +{{/inline}} + {{#*inline "glossary-brief"}} {{~> glossary brief=true ~}} {{/inline}}