aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2020-03-29 11:27:13 -0400
committertoasted-nutbread <toasted-nutbread@users.noreply.github.com>2020-03-29 11:27:13 -0400
commit1f84280ea0dd348770b70c03a8cba7c9b165add7 (patch)
tree41798958704d68d2cf41ced659d90bda7217cac9
parenta7da4416d75871a0c42ecd91d8408f037ca1ed3e (diff)
Include readings in disambiguations
-rw-r--r--ext/mixed/js/display-generator.js37
1 files changed, 30 insertions, 7 deletions
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index cdf96867..f1122e3d 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -304,7 +304,7 @@ class DisplayGenerator {
}
createPitch(details) {
- const {exclusiveExpressions, reading, position, tags} = details;
+ const {reading, position, tags, exclusiveExpressions, exclusiveReadings} = details;
const morae = jp.getKanaMorae(reading);
const node = this._templateHandler.instantiate('term-pitch-accent');
@@ -319,7 +319,7 @@ class DisplayGenerator {
DisplayGenerator._appendMultiple(n, this.createTag.bind(this), tags);
n = node.querySelector('.term-pitch-accent-disambiguation-list');
- DisplayGenerator._appendMultiple(n, this.createPitchExpression.bind(this), exclusiveExpressions);
+ this.createPitchAccentDisambiguations(n, exclusiveExpressions, exclusiveReadings);
n = node.querySelector('.term-pitch-accent-characters');
for (let i = 0, ii = morae.length; i < ii; ++i) {
@@ -345,10 +345,26 @@ class DisplayGenerator {
return node;
}
- createPitchExpression(expression) {
- const node = this._templateHandler.instantiate('term-pitch-accent-disambiguation');
- node.textContent = expression;
- return node;
+ createPitchAccentDisambiguations(container, exclusiveExpressions, exclusiveReadings) {
+ const templateName = 'term-pitch-accent-disambiguation';
+ for (const exclusiveExpression of exclusiveExpressions) {
+ const node = this._templateHandler.instantiate(templateName);
+ node.dataset.type = 'expression';
+ node.textContent = exclusiveExpression;
+ container.appendChild(node);
+ }
+
+ for (const exclusiveReading of exclusiveReadings) {
+ const node = this._templateHandler.instantiate(templateName);
+ node.dataset.type = 'reading';
+ node.textContent = exclusiveReading;
+ container.appendChild(node);
+ }
+
+ container.dataset.multi = 'true';
+ container.dataset.count = `${exclusiveExpressions.length + exclusiveReadings.length}`;
+ container.dataset.expressionCount = `${exclusiveExpressions.length}`;
+ container.dataset.readingCount = `${exclusiveReadings.length}`;
}
populatePitchGraph(svg, position, morae) {
@@ -482,10 +498,13 @@ class DisplayGenerator {
const results = new Map();
const allExpressions = new Set();
+ const allReadings = new Set();
const expressions = definition.expressions;
const sources = Array.isArray(expressions) ? expressions : [definition];
for (const {pitches: expressionPitches, expression} of sources) {
+ allExpressions.add(expression);
for (const {reading, pitches, dictionary} of expressionPitches) {
+ allReadings.add(reading);
let dictionaryResults = results.get(dictionary);
if (typeof dictionaryResults === 'undefined') {
dictionaryResults = [];
@@ -499,7 +518,6 @@ class DisplayGenerator {
dictionaryResults.push(pitchInfo);
}
pitchInfo.expressions.add(expression);
- allExpressions.add(expression);
}
}
}
@@ -507,11 +525,16 @@ class DisplayGenerator {
for (const dictionaryResults of results.values()) {
for (const result of dictionaryResults) {
const exclusiveExpressions = [];
+ const exclusiveReadings = [];
const resultExpressions = result.expressions;
if (!areSetsEqual(resultExpressions, allExpressions)) {
exclusiveExpressions.push(...getSetIntersection(resultExpressions, allExpressions));
}
+ if (allReadings.size > 1) {
+ exclusiveReadings.push(result.reading);
+ }
result.exclusiveExpressions = exclusiveExpressions;
+ result.exclusiveReadings = exclusiveReadings;
}
}