From 9e8a22b08a9ea3e746c4c16f0a06beabd2dd7294 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 1 Mar 2020 14:04:54 -0500
Subject: Add support for different sections for term content

---
 ext/mixed/css/display-dark.css    |  2 ++
 ext/mixed/css/display-default.css |  2 ++
 ext/mixed/css/display.css         | 13 +++++++++++++
 3 files changed, 17 insertions(+)

(limited to 'ext/mixed/css')

diff --git a/ext/mixed/css/display-dark.css b/ext/mixed/css/display-dark.css
index c9cd9f90..908d9cc5 100644
--- a/ext/mixed/css/display-dark.css
+++ b/ext/mixed/css/display-dark.css
@@ -19,6 +19,8 @@
 
 body { background-color: #1e1e1e; color: #d4d4d4; }
 
+h2 { border-bottom-color: #2f2f2f; }
+
 .navigation-header {
     background-color: #1e1e1e;
     border-bottom-color: #2f2f2f;
diff --git a/ext/mixed/css/display-default.css b/ext/mixed/css/display-default.css
index 6eee43c4..e43e3742 100644
--- a/ext/mixed/css/display-default.css
+++ b/ext/mixed/css/display-default.css
@@ -19,6 +19,8 @@
 
 body { background-color: #ffffff; color: #333333; }
 
+h2 { border-bottom-color: #eeeeee; }
+
 .navigation-header {
     background-color: #ffffff;
     border-bottom-color: #eeeeee;
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 688a357c..51015057 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -65,6 +65,14 @@ ol, ul {
     height: 2.28571428em; /* 14px => 32px */
 }
 
+h2 {
+    font-size: 1.25em;
+    font-weight: normal;
+    margin: 0.25em 0 0;
+    border-bottom-width: 0.05714285714285714em; /* 14px * 1.25em => 1px */
+    border-bottom-style: solid;
+}
+
 /*
  * Navigation
  */
@@ -422,6 +430,11 @@ button.action-button {
     display: inline;
 }
 
+.term-entry-body[data-section-count="0"] .term-entry-body-section-header,
+.term-entry-body[data-section-count="1"] .term-entry-body-section-header {
+    display: none;
+}
+
 
 /*
  * Kanji
-- 
cgit v1.2.3


From 97a520cc1595369dc18ddcf74ab7f0ba4e03f55b Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 1 Mar 2020 14:15:28 -0500
Subject: Add support for displaying pitch accents

---
 ext/mixed/css/display-dark.css    |   8 +-
 ext/mixed/css/display-default.css |   8 +-
 ext/mixed/css/display.css         | 101 ++++++++++++++++++++++++
 ext/mixed/display-templates.html  |   6 ++
 ext/mixed/js/display-generator.js | 159 +++++++++++++++++++++++++++++++++++++-
 5 files changed, 277 insertions(+), 5 deletions(-)

(limited to 'ext/mixed/css')

diff --git a/ext/mixed/css/display-dark.css b/ext/mixed/css/display-dark.css
index 908d9cc5..dc344099 100644
--- a/ext/mixed/css/display-dark.css
+++ b/ext/mixed/css/display-dark.css
@@ -59,12 +59,14 @@ h2 { border-bottom-color: #2f2f2f; }
     color: #666666;
 }
 
-.term-definition-container,
-.kanji-glossary-container {
+.term-definition-list,
+.term-pitch-accent-group-list,
+.kanji-glossary-list {
     color: #888888;
 }
 
 .term-glossary,
+.term-pitch-accent,
 .kanji-glossary {
     color: #d4d4d4;
 }
@@ -74,3 +76,5 @@ h2 { border-bottom-color: #2f2f2f; }
     background-color: #d4d4d4;
     color: #1e1e1e;
 }
+
+.term-pitch-accent-character:before { border-color: #ffffff; }
diff --git a/ext/mixed/css/display-default.css b/ext/mixed/css/display-default.css
index e43e3742..81623ebc 100644
--- a/ext/mixed/css/display-default.css
+++ b/ext/mixed/css/display-default.css
@@ -59,12 +59,14 @@ h2 { border-bottom-color: #eeeeee; }
     color: #999999;
 }
 
-.term-definition-container,
-.kanji-glossary-container {
+.term-definition-list,
+.term-pitch-accent-group-list,
+.kanji-glossary-list {
     color: #777777;
 }
 
 .term-glossary,
+.term-pitch-accent,
 .kanji-glossary {
     color: #000000;
 }
@@ -74,3 +76,5 @@ h2 { border-bottom-color: #eeeeee; }
     background-color: #333333;
     color: #ffffff;
 }
+
+.term-pitch-accent-character:before { border-color: #000000; }
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 51015057..0a1ba658 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -436,6 +436,107 @@ button.action-button {
 }
 
 
+/*
+ * Pitch accent styles
+ */
+
+.term-pitch-accent-group-list {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+}
+
+.term-pitch-accent-group-list:not([data-count="0"]):not([data-count="1"]) {
+    padding-left: 1.4em;
+    list-style-type: decimal;
+}
+
+.term-pitch-accent-list {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+    display: inline;
+}
+
+.term-pitch-accent-list:not([data-count="0"]):not([data-count="1"]) {
+    padding-left: 1.4em;
+    list-style-type: circle;
+    display: block;
+}
+
+.term-pitch-accent {
+    display: inline;
+    line-height: 1.5em;
+}
+
+.term-pitch-accent-list:not([data-count="0"]):not([data-count="1"])>.term-pitch-accent {
+    display: list-item;
+}
+
+.term-pitch-accent-group-tag-list {
+    margin-right: 0.375em;
+}
+.entry[data-unique-expression-count="1"] .term-pitch-accent-expression-list {
+    display: none;
+}
+.term-pitch-accent-expression:not(:last-of-type):after {
+    content: "\3001";
+}
+.term-pitch-accent-expression:last-of-type:after {
+    content: "\FF1A";
+}
+
+.term-pitch-accent-tag-list:not([data-count="0"]) {
+    margin-right: 0.375em;
+}
+
+.term-special-tags>.pitches {
+    display: inline;
+}
+
+.term-pitch-accent-character {
+    display: inline-block;
+    position: relative;
+}
+.term-pitch-accent-character[data-pitch='high']:before {
+    content: "";
+    display: block;
+    user-select: none;
+    pointer-events: none;
+    position: absolute;
+    top: 0.1em;
+    left: 0;
+    right: 0;
+    height: 0;
+    border-top-width: 0.1em;
+    border-top-style: solid;
+}
+.term-pitch-accent-character[data-pitch='high'][data-pitch-next='low']:before {
+    right: -0.1em;
+    height: 0.4em;
+    border-right-width: 0.1em;
+    border-right-style: solid;
+}
+.term-pitch-accent-character[data-pitch='high'][data-pitch-next='low'] {
+    padding-right: 0.1em;
+    margin-right: 0.1em;
+}
+
+.term-pitch-accent-position:before {
+    content: " [";
+}
+.term-pitch-accent-position:after {
+    content: "]";
+}
+
+.term-pitch-accent-details {
+    display: inline-block;
+    height: 0;
+    padding: 0 0.25em;
+    vertical-align: middle;
+}
+
+
 /*
  * Kanji
  */
diff --git a/ext/mixed/display-templates.html b/ext/mixed/display-templates.html
index 837245cf..c6f208a8 100644
--- a/ext/mixed/display-templates.html
+++ b/ext/mixed/display-templates.html
@@ -19,6 +19,7 @@
     </div>
     <div class="term-entry-body">
         <div class="term-entry-body-section term-pitch-accent-container"><h2 class="term-entry-body-section-header term-pitch-accent-header">Pitch Accents</h2><ol class="term-entry-body-section-content term-pitch-accent-group-list"></ol></div>
+        <div class="term-entry-body-section term-definition-container"><h2 class="term-entry-body-section-header term-definition-header">Definitions</h2><ol class="term-entry-body-section-content term-definition-list"></ol></div>
     </div>
     <pre class="debug-info"></pre>
 </div></template>
@@ -36,6 +37,11 @@
 <template id="term-glossary-item-template"><li class="term-glossary-item"><span class="term-glossary-separator"> </span><span class="term-glossary"></span></li></template>
 <template id="term-reason-template"><span class="term-reason"></span><span class="term-reason-separator"> </span></template>
 
+<template id="term-pitch-accent-group-template"><li class="term-pitch-accent-group"><span class="term-pitch-accent-group-tag-list tag-list"></span><ul class="term-pitch-accent-list"></ul></li></template>
+<template id="term-pitch-accent-expression-template"><span class="term-pitch-accent-expression"></span></template>
+<template id="term-pitch-accent-template"><li class="term-pitch-accent"><span class="term-pitch-accent-tag-list tag-list"></span><span class="term-pitch-accent-expression-list"></span><span class="term-pitch-accent-characters"></span><span class="term-pitch-accent-position"></span></li></template>
+<template id="term-pitch-accent-character-template"><span class="term-pitch-accent-character"><span class="term-pitch-accent-character-inner"></span></span></template>
+
 <template id="kanji-entry-template"><div class="entry" data-type="kanji">
     <div class="entry-header1">
         <div class="entry-header2">
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index fd7c5c1f..449bac1d 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -37,9 +37,14 @@ class DisplayGenerator {
 
         const expressionsContainer = node.querySelector('.term-expression-list');
         const reasonsContainer = node.querySelector('.term-reasons');
+        const pitchesContainer = node.querySelector('.term-pitch-accent-group-list');
         const frequenciesContainer = node.querySelector('.frequencies');
         const definitionsContainer = node.querySelector('.term-definition-list');
         const debugInfoContainer = node.querySelector('.debug-info');
+        const bodyContainer = node.querySelector('.term-entry-body');
+
+        const pitches = DisplayGenerator._getPitchInfos(details);
+        const pitchCount = pitches.reduce((i, v) => i + v[1].length, 0);
 
         const expressionMulti = Array.isArray(details.expressions);
         const definitionMulti = Array.isArray(details.definitions);
@@ -52,9 +57,12 @@ class DisplayGenerator {
         node.dataset.expressionCount = `${expressionCount}`;
         node.dataset.definitionCount = `${definitionCount}`;
         node.dataset.uniqueExpressionCount = `${uniqueExpressionCount}`;
+        node.dataset.pitchAccentDictionaryCount = `${pitches.length}`;
+        node.dataset.pitchAccentCount = `${pitchCount}`;
 
         bodyContainer.dataset.sectionCount = `${
-            (definitionCount > 0 ? 1 : 0)
+            (definitionCount > 0 ? 1 : 0) +
+            (pitches.length > 0 ? 1 : 0)
         }`;
 
         const termTags = details.termTags;
@@ -64,6 +72,7 @@ class DisplayGenerator {
         DisplayGenerator._appendMultiple(expressionsContainer, this.createTermExpression.bind(this), expressions, [[details, termTags]]);
         DisplayGenerator._appendMultiple(reasonsContainer, this.createTermReason.bind(this), details.reasons);
         DisplayGenerator._appendMultiple(frequenciesContainer, this.createFrequencyTag.bind(this), details.frequencies);
+        DisplayGenerator._appendMultiple(pitchesContainer, this.createPitches.bind(this), pitches);
         DisplayGenerator._appendMultiple(definitionsContainer, this.createTermDefinitionItem.bind(this), details.definitions, [details]);
 
         if (debugInfoContainer !== null) {
@@ -270,6 +279,73 @@ class DisplayGenerator {
         return node;
     }
 
+    createPitches(details) {
+        if (!this._termPitchAccentStaticTemplateIsSetup) {
+            this._termPitchAccentStaticTemplateIsSetup = true;
+            const t = this._templateHandler.instantiate('term-pitch-accent-static');
+            document.head.appendChild(t);
+        }
+
+        const [dictionary, dictionaryPitches] = details;
+
+        const node = this._templateHandler.instantiate('term-pitch-accent-group');
+        node.dataset.dictionary = dictionary;
+        node.dataset.pitchesMulti = 'true';
+        node.dataset.pitchesCount = `${dictionaryPitches.length}`;
+
+        const tag = this.createTag({notes: '', name: dictionary, category: 'dictionary'});
+        node.querySelector('.term-pitch-accent-group-tag-list').appendChild(tag);
+
+        const n = node.querySelector('.term-pitch-accent-list');
+        DisplayGenerator._appendMultiple(n, this.createPitch.bind(this), dictionaryPitches);
+
+        return node;
+    }
+
+    createPitch(details) {
+        const {expressions, reading, position, tags} = details;
+        const morae = DisplayGenerator._jpGetKanaMorae(reading);
+
+        const node = this._templateHandler.instantiate('term-pitch-accent');
+
+        node.dataset.pitchAccentPosition = `${position}`;
+        node.dataset.tagCount = `${tags.length}`;
+
+        let n = node.querySelector('.term-pitch-accent-position');
+        n.textContent = `${position}`;
+
+        n = node.querySelector('.term-pitch-accent-tag-list');
+        DisplayGenerator._appendMultiple(n, this.createTag.bind(this), tags);
+
+        n = node.querySelector('.term-pitch-accent-expression-list');
+        DisplayGenerator._appendMultiple(n, this.createPitchExpression.bind(this), expressions);
+
+        n = node.querySelector('.term-pitch-accent-characters');
+        for (let i = 0, ii = morae.length; i < ii; ++i) {
+            const mora = morae[i];
+            const highPitch = DisplayGenerator._jpIsMoraPitchHigh(i, position);
+            const highPitchNext = DisplayGenerator._jpIsMoraPitchHigh(i + 1, position);
+
+            const n1 = this._templateHandler.instantiate('term-pitch-accent-character');
+            const n2 = n1.querySelector('.term-pitch-accent-character-inner');
+
+            n1.dataset.position = `${i}`;
+            n1.dataset.pitch = highPitch ? 'high' : 'low';
+            n1.dataset.pitchNext = highPitchNext ? 'high' : 'low';
+            n2.textContent = mora;
+
+            n.appendChild(n1);
+        }
+
+        return node;
+    }
+
+    createPitchExpression(expression) {
+        const node = this._templateHandler.instantiate('term-pitch-accent-expression');
+        node.textContent = expression;
+        return node;
+    }
+
     createFrequencyTag(details) {
         const node = this._templateHandler.instantiate('tag-frequency');
 
@@ -356,4 +432,85 @@ class DisplayGenerator {
             container.appendChild(document.createTextNode(parts[i]));
         }
     }
+
+    static _getPitchInfos(definition) {
+        const results = new Map();
+
+        const expressions = definition.expressions;
+        const sources = Array.isArray(expressions) ? expressions : [definition];
+        for (const {pitches: expressionPitches, expression} of sources) {
+            for (const {reading, pitches, dictionary} of expressionPitches) {
+                let dictionaryResults = results.get(dictionary);
+                if (typeof dictionaryResults === 'undefined') {
+                    dictionaryResults = [];
+                    results.set(dictionary, dictionaryResults);
+                }
+
+                for (const {position, tags} of pitches) {
+                    let pitchInfo = DisplayGenerator._findExistingPitchInfo(reading, position, tags, dictionaryResults);
+                    if (pitchInfo === null) {
+                        pitchInfo = {expressions: new Set(), reading, position, tags};
+                        dictionaryResults.push(pitchInfo);
+                    }
+                    pitchInfo.expressions.add(expression);
+                }
+            }
+        }
+
+        return [...results.entries()];
+    }
+
+    static _findExistingPitchInfo(reading, position, tags, pitchInfoList) {
+        for (const pitchInfo of pitchInfoList) {
+            if (
+                pitchInfo.reading === reading &&
+                pitchInfo.position === position &&
+                DisplayGenerator._areTagListsEqual(pitchInfo.tags, tags)
+            ) {
+                return pitchInfo;
+            }
+        }
+        return null;
+    }
+
+    static _areTagListsEqual(tagList1, tagList2) {
+        const ii = tagList1.length;
+        if (tagList2.length !== ii) { return false; }
+
+        for (let i = 0; i < ii; ++i) {
+            const tag1 = tagList1[i];
+            const tag2 = tagList2[i];
+            if (tag1.name !== tag2.name || tag1.dictionary !== tag2.dictionary) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    static _jpGetKanaMorae(text) {
+        // This function splits Japanese kana reading into its individual mora
+        // components. It is assumed that the text is well-formed.
+        const smallKanaSet = DisplayGenerator._smallKanaSet;
+        const morae = [];
+        let i;
+        for (const c of text) {
+            if (smallKanaSet.has(c) && (i = morae.length) > 0) {
+                morae[i - 1] += c;
+            } else {
+                morae.push(c);
+            }
+        }
+        return morae;
+    }
+
+    static _jpCreateSmallKanaSet() {
+        return new Set(Array.from('ぁぃぅぇぉゃゅょゎァィゥェォャュョヮ'));
+    }
+
+    static _jpIsMoraPitchHigh(moraIndex, pitchAccentPosition) {
+        return pitchAccentPosition === 0 ? (moraIndex > 0) : (moraIndex < pitchAccentPosition);
+    }
 }
+
+DisplayGenerator._smallKanaSet = DisplayGenerator._jpCreateSmallKanaSet();
-- 
cgit v1.2.3


From 803a464fb9df5160a1be1e2b1b4d42fd2bbecf2d Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 1 Mar 2020 14:20:11 -0500
Subject: Add support for accent graph

---
 ext/mixed/css/display-dark.css    | 13 +++++++++++
 ext/mixed/css/display-default.css | 13 +++++++++++
 ext/mixed/css/display.css         | 38 +++++++++++++++++++++++++++++++++
 ext/mixed/display-templates.html  |  9 +++++++-
 ext/mixed/js/display-generator.js | 45 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 117 insertions(+), 1 deletion(-)

(limited to 'ext/mixed/css')

diff --git a/ext/mixed/css/display-dark.css b/ext/mixed/css/display-dark.css
index dc344099..8e5d2f51 100644
--- a/ext/mixed/css/display-dark.css
+++ b/ext/mixed/css/display-dark.css
@@ -78,3 +78,16 @@ h2 { border-bottom-color: #2f2f2f; }
 }
 
 .term-pitch-accent-character:before { border-color: #ffffff; }
+
+.term-pitch-accent-graph-line,
+.term-pitch-accent-graph-line-tail,
+#term-pitch-accent-graph-dot,
+#term-pitch-accent-graph-dot-downstep,
+#term-pitch-accent-graph-triangle {
+    stroke: #ffffff;
+}
+
+#term-pitch-accent-graph-dot,
+#term-pitch-accent-graph-dot-downstep>circle:last-of-type {
+    fill: #ffffff;
+}
diff --git a/ext/mixed/css/display-default.css b/ext/mixed/css/display-default.css
index 81623ebc..893e7bc1 100644
--- a/ext/mixed/css/display-default.css
+++ b/ext/mixed/css/display-default.css
@@ -78,3 +78,16 @@ h2 { border-bottom-color: #eeeeee; }
 }
 
 .term-pitch-accent-character:before { border-color: #000000; }
+
+.term-pitch-accent-graph-line,
+.term-pitch-accent-graph-line-tail,
+#term-pitch-accent-graph-dot,
+#term-pitch-accent-graph-dot-downstep,
+#term-pitch-accent-graph-triangle {
+    stroke: #000000;
+}
+
+#term-pitch-accent-graph-dot,
+#term-pitch-accent-graph-dot-downstep>circle:last-of-type {
+    fill: #000000;
+}
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 0a1ba658..7bd82785 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -537,6 +537,44 @@ button.action-button {
 }
 
 
+/*
+ * Pitch accent graph styles
+ */
+
+.term-pitch-accent-graph {
+    display: block;
+    height: 1.5em;
+    transform: translateY(-0.875em);
+}
+.term-pitch-accent-graph-line,
+.term-pitch-accent-graph-line-tail {
+    fill: none;
+    stroke: #000000;
+    stroke-width: 5;
+}
+.term-pitch-accent-graph-line-tail {
+    stroke-dasharray: 5 5;
+}
+#term-pitch-accent-graph-dot {
+    fill: #000000;
+    stroke: #000000;
+    stroke-width: 5;
+}
+#term-pitch-accent-graph-dot-downstep {
+    fill: none;
+    stroke: #000000;
+    stroke-width: 5;
+}
+#term-pitch-accent-graph-dot-downstep>circle:last-of-type {
+    fill: #000000;
+}
+#term-pitch-accent-graph-triangle {
+    fill: none;
+    stroke: #000000;
+    stroke-width: 5;
+}
+
+
 /*
  * Kanji
  */
diff --git a/ext/mixed/display-templates.html b/ext/mixed/display-templates.html
index c6f208a8..e2f55c22 100644
--- a/ext/mixed/display-templates.html
+++ b/ext/mixed/display-templates.html
@@ -37,9 +37,16 @@
 <template id="term-glossary-item-template"><li class="term-glossary-item"><span class="term-glossary-separator"> </span><span class="term-glossary"></span></li></template>
 <template id="term-reason-template"><span class="term-reason"></span><span class="term-reason-separator"> </span></template>
 
+<template id="term-pitch-accent-static-template"><svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
+    <defs>
+        <g id="term-pitch-accent-graph-dot"><circle cx="0" cy="0" r="15" /></g>
+        <g id="term-pitch-accent-graph-dot-downstep"><circle cx="0" cy="0" r="15" /><circle cx="0" cy="0" r="5" /></g>
+        <g id="term-pitch-accent-graph-triangle"><path d="M0 13 L15 -13 L-15 -13 Z" /></g>
+    </defs>
+</svg></template>
 <template id="term-pitch-accent-group-template"><li class="term-pitch-accent-group"><span class="term-pitch-accent-group-tag-list tag-list"></span><ul class="term-pitch-accent-list"></ul></li></template>
 <template id="term-pitch-accent-expression-template"><span class="term-pitch-accent-expression"></span></template>
-<template id="term-pitch-accent-template"><li class="term-pitch-accent"><span class="term-pitch-accent-tag-list tag-list"></span><span class="term-pitch-accent-expression-list"></span><span class="term-pitch-accent-characters"></span><span class="term-pitch-accent-position"></span></li></template>
+<template id="term-pitch-accent-template"><li class="term-pitch-accent"><span class="term-pitch-accent-tag-list tag-list"></span><span class="term-pitch-accent-expression-list"></span><span class="term-pitch-accent-characters"></span><span class="term-pitch-accent-position"></span><span class="term-pitch-accent-details"><svg class="term-pitch-accent-graph" xmlns="http://www.w3.org/2000/svg"><path class="term-pitch-accent-graph-line" /><path class="term-pitch-accent-graph-line-tail" /></svg></span></li></template>
 <template id="term-pitch-accent-character-template"><span class="term-pitch-accent-character"><span class="term-pitch-accent-character-inner"></span></span></template>
 
 <template id="kanji-entry-template"><div class="entry" data-type="kanji">
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index 449bac1d..326f3f54 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -25,6 +25,7 @@
 class DisplayGenerator {
     constructor() {
         this._templateHandler = null;
+        this._termPitchAccentStaticTemplateIsSetup = false;
     }
 
     async prepare() {
@@ -337,6 +338,10 @@ class DisplayGenerator {
             n.appendChild(n1);
         }
 
+        if (morae.length > 0) {
+            this.populatePitchGraph(node.querySelector('.term-pitch-accent-graph'), position, morae);
+        }
+
         return node;
     }
 
@@ -346,6 +351,46 @@ class DisplayGenerator {
         return node;
     }
 
+    populatePitchGraph(svg, position, morae) {
+        const svgns = svg.getAttribute('xmlns');
+        const ii = morae.length;
+        svg.setAttribute('viewBox', `0 0 ${50 * (ii + 1)} 100`);
+
+        const pathPoints = [];
+        for (let i = 0; i < ii; ++i) {
+            const highPitch = DisplayGenerator._jpIsMoraPitchHigh(i, position);
+            const highPitchNext = DisplayGenerator._jpIsMoraPitchHigh(i + 1, position);
+            const graphic = (highPitch && !highPitchNext ? '#term-pitch-accent-graph-dot-downstep' : '#term-pitch-accent-graph-dot');
+            const x = `${i * 50 + 25}`;
+            const y = highPitch ? '25' : '75';
+            const use = document.createElementNS(svgns, 'use');
+            use.setAttribute('href', graphic);
+            use.setAttribute('x', x);
+            use.setAttribute('y', y);
+            svg.appendChild(use);
+            pathPoints.push(`${x} ${y}`);
+        }
+
+        let path = svg.querySelector('.term-pitch-accent-graph-line');
+        path.setAttribute('d', `M${pathPoints.join(' L')}`);
+
+        pathPoints.splice(0, ii - 1);
+        {
+            const highPitch = DisplayGenerator._jpIsMoraPitchHigh(ii, position);
+            const x = `${ii * 50 + 25}`;
+            const y = highPitch ? '25' : '75';
+            const use = document.createElementNS(svgns, 'use');
+            use.setAttribute('href', '#term-pitch-accent-graph-triangle');
+            use.setAttribute('x', x);
+            use.setAttribute('y', y);
+            svg.appendChild(use);
+            pathPoints.push(`${x} ${y}`);
+        }
+
+        path = svg.querySelector('.term-pitch-accent-graph-line-tail');
+        path.setAttribute('d', `M${pathPoints.join(' L')}`);
+    }
+
     createFrequencyTag(details) {
         const node = this._templateHandler.instantiate('tag-frequency');
 
-- 
cgit v1.2.3


From cbc7e2646d2ce34f1aff7ca2b737fdb2db690c40 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 1 Mar 2020 14:38:16 -0500
Subject: Add options

---
 ext/bg/data/options-schema.json | 17 ++++++++++++++++-
 ext/bg/js/options.js            |  5 ++++-
 ext/bg/js/settings/main.js      |  6 ++++++
 ext/bg/settings.html            | 12 ++++++++++++
 ext/mixed/css/display.css       | 13 +++++++++++++
 ext/mixed/js/display.js         |  3 +++
 6 files changed, 54 insertions(+), 2 deletions(-)

(limited to 'ext/mixed/css')

diff --git a/ext/bg/data/options-schema.json b/ext/bg/data/options-schema.json
index d6207952..cb759b72 100644
--- a/ext/bg/data/options-schema.json
+++ b/ext/bg/data/options-schema.json
@@ -105,7 +105,10 @@
                                     "customPopupCss",
                                     "customPopupOuterCss",
                                     "enableWanakana",
-                                    "enableClipboardMonitor"
+                                    "enableClipboardMonitor",
+                                    "showPitchAccentDownstepNotation",
+                                    "showPitchAccentPositionNotation",
+                                    "showPitchAccentGraph"
                                 ],
                                 "properties": {
                                     "enable": {
@@ -227,6 +230,18 @@
                                     "enableClipboardMonitor": {
                                         "type": "boolean",
                                         "default": false
+                                    },
+                                    "showPitchAccentDownstepNotation": {
+                                        "type": "boolean",
+                                        "default": true
+                                    },
+                                    "showPitchAccentPositionNotation": {
+                                        "type": "boolean",
+                                        "default": true
+                                    },
+                                    "showPitchAccentGraph": {
+                                        "type": "boolean",
+                                        "default": false
                                     }
                                 }
                             },
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index bd0bbe0e..b36fe812 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -124,7 +124,10 @@ function profileOptionsCreateDefaults() {
             customPopupCss: '',
             customPopupOuterCss: '',
             enableWanakana: true,
-            enableClipboardMonitor: false
+            enableClipboardMonitor: false,
+            showPitchAccentDownstepNotation: true,
+            showPitchAccentPositionNotation: true,
+            showPitchAccentGraph: false
         },
 
         audio: {
diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index ebc443df..7caeaea0 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -84,6 +84,9 @@ async function formRead(options) {
     options.general.popupScalingFactor = parseFloat($('#popup-scaling-factor').val());
     options.general.popupScaleRelativeToPageZoom = $('#popup-scale-relative-to-page-zoom').prop('checked');
     options.general.popupScaleRelativeToVisualViewport = $('#popup-scale-relative-to-visual-viewport').prop('checked');
+    options.general.showPitchAccentDownstepNotation = $('#show-pitch-accent-downstep-notation').prop('checked');
+    options.general.showPitchAccentPositionNotation = $('#show-pitch-accent-position-notation').prop('checked');
+    options.general.showPitchAccentGraph = $('#show-pitch-accent-graph').prop('checked');
     options.general.popupTheme = $('#popup-theme').val();
     options.general.popupOuterTheme = $('#popup-outer-theme').val();
     options.general.customPopupCss = $('#custom-popup-css').val();
@@ -161,6 +164,9 @@ async function formWrite(options) {
     $('#popup-scaling-factor').val(options.general.popupScalingFactor);
     $('#popup-scale-relative-to-page-zoom').prop('checked', options.general.popupScaleRelativeToPageZoom);
     $('#popup-scale-relative-to-visual-viewport').prop('checked', options.general.popupScaleRelativeToVisualViewport);
+    $('#show-pitch-accent-downstep-notation').prop('checked', options.general.showPitchAccentDownstepNotation);
+    $('#show-pitch-accent-position-notation').prop('checked', options.general.showPitchAccentPositionNotation);
+    $('#show-pitch-accent-graph').prop('checked', options.general.showPitchAccentGraph);
     $('#popup-theme').val(options.general.popupTheme);
     $('#popup-outer-theme').val(options.general.popupOuterTheme);
     $('#custom-popup-css').val(options.general.customPopupCss);
diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index cfe20be4..0b2e4f9c 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -162,6 +162,18 @@
                     <label><input type="checkbox" id="popup-scale-relative-to-visual-viewport"> Change popup size relative to page viewport</label>
                 </div>
 
+                <div class="checkbox options-advanced">
+                    <label><input type="checkbox" id="show-pitch-accent-downstep-notation"> Show downstep notation for pitch accents</label>
+                </div>
+
+                <div class="checkbox options-position">
+                    <label><input type="checkbox" id="show-pitch-accent-position-notation"> Show position notation for pitch accents</label>
+                </div>
+
+                <div class="checkbox options-advanced">
+                    <label><input type="checkbox" id="show-pitch-accent-graph"> Show graph for pitch accents</label>
+                </div>
+
                 <div class="checkbox options-advanced">
                     <label><input type="checkbox" id="show-debug-info"> Show debug information</label>
                 </div>
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 7bd82785..cb2f045f 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -537,6 +537,19 @@ button.action-button {
 }
 
 
+:root[data-show-pitch-accent-downstep-notation=false] .term-pitch-accent-characters {
+    display: none;
+}
+
+:root[data-show-pitch-accent-position-notation=false] .term-pitch-accent-position {
+    display: none;
+}
+
+:root[data-show-pitch-accent-graph=false] .term-pitch-accent-details {
+    display: none;
+}
+
+
 /*
  * Pitch accent graph styles
  */
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index 6898a6eb..4a71efe0 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -385,6 +385,9 @@ class Display {
         data.audioEnabled = `${options.audio.enabled}`;
         data.compactGlossaries = `${options.general.compactGlossaries}`;
         data.enableSearchTags = `${options.scanning.enableSearchTags}`;
+        data.showPitchAccentDownstepNotation = `${options.general.showPitchAccentDownstepNotation}`;
+        data.showPitchAccentPositionNotation = `${options.general.showPitchAccentPositionNotation}`;
+        data.showPitchAccentGraph = `${options.general.showPitchAccentGraph}`;
         data.debug = `${options.general.debugInfo}`;
     }
 
-- 
cgit v1.2.3


From 431473d55c8b429370ae93aeb918455729dc7fc9 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 28 Mar 2020 12:01:55 -0400
Subject: Fix layering issue

---
 ext/mixed/css/display.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ext/mixed/css')

diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index cb2f045f..1e385abb 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -310,6 +310,7 @@ button.action-button {
     width: 0;
     height: 0;
     visibility: hidden;
+    z-index: 1;
 }
 
 .term-expression-list[data-multi=true] .term-expression:hover .term-expression-details {
-- 
cgit v1.2.3


From 2c4983da46c076298532f6357c594d81d4676eee Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 28 Mar 2020 12:31:41 -0400
Subject: Update styles

---
 ext/mixed/css/display-dark.css    |  3 +++
 ext/mixed/css/display-default.css |  3 +++
 ext/mixed/css/display.css         | 11 +++++++++++
 ext/mixed/display-templates.html  |  4 ++--
 ext/mixed/js/display-generator.js |  2 +-
 5 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'ext/mixed/css')

diff --git a/ext/mixed/css/display-dark.css b/ext/mixed/css/display-dark.css
index 8e5d2f51..7f49ca40 100644
--- a/ext/mixed/css/display-dark.css
+++ b/ext/mixed/css/display-dark.css
@@ -41,6 +41,7 @@ h2 { border-bottom-color: #2f2f2f; }
 .tag[data-category=frequency]    { background-color: #489148; }
 .tag[data-category=partOfSpeech] { background-color: #565656; }
 .tag[data-category=search]       { background-color: #69696e; }
+.tag[data-category=pitch-accent-dictionary] { background-color: #6640be; }
 
 .term-reasons { color: #888888; }
 
@@ -77,6 +78,8 @@ h2 { border-bottom-color: #2f2f2f; }
     color: #1e1e1e;
 }
 
+.term-pitch-accent-container { border-bottom-color: #2f2f2f; }
+
 .term-pitch-accent-character:before { border-color: #ffffff; }
 
 .term-pitch-accent-graph-line,
diff --git a/ext/mixed/css/display-default.css b/ext/mixed/css/display-default.css
index 893e7bc1..38e1bf19 100644
--- a/ext/mixed/css/display-default.css
+++ b/ext/mixed/css/display-default.css
@@ -41,6 +41,7 @@ h2 { border-bottom-color: #eeeeee; }
 .tag[data-category=frequency]    { background-color: #5cb85c; }
 .tag[data-category=partOfSpeech] { background-color: #565656; }
 .tag[data-category=search]       { background-color: #8a8a91; }
+.tag[data-category=pitch-accent-dictionary] { background-color: #6640be; }
 
 .term-reasons { color: #777777; }
 
@@ -77,6 +78,8 @@ h2 { border-bottom-color: #eeeeee; }
     color: #ffffff;
 }
 
+.term-pitch-accent-container { border-bottom-color: #eeeeee; }
+
 .term-pitch-accent-character:before { border-color: #000000; }
 
 .term-pitch-accent-graph-line,
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index 1e385abb..aeb88a1a 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -441,6 +441,17 @@ button.action-button {
  * Pitch accent styles
  */
 
+.entry[data-pitch-accent-count='0'] .term-pitch-accent-container {
+    display: none;
+}
+
+.term-pitch-accent-container {
+    border-bottom-width: 0.05714285714285714em; /* 14px * 1.25em => 1px */
+    border-bottom-style: solid;
+    padding-bottom: 0.25em;
+    margin-bottom: 0.25em;
+}
+
 .term-pitch-accent-group-list {
     margin: 0;
     padding: 0;
diff --git a/ext/mixed/display-templates.html b/ext/mixed/display-templates.html
index e2f55c22..09f173b4 100644
--- a/ext/mixed/display-templates.html
+++ b/ext/mixed/display-templates.html
@@ -18,8 +18,8 @@
         <div class="term-special-tags"><div class="frequencies tag-list"></div></div>
     </div>
     <div class="term-entry-body">
-        <div class="term-entry-body-section term-pitch-accent-container"><h2 class="term-entry-body-section-header term-pitch-accent-header">Pitch Accents</h2><ol class="term-entry-body-section-content term-pitch-accent-group-list"></ol></div>
-        <div class="term-entry-body-section term-definition-container"><h2 class="term-entry-body-section-header term-definition-header">Definitions</h2><ol class="term-entry-body-section-content term-definition-list"></ol></div>
+        <div class="term-entry-body-section term-pitch-accent-container"><ol class="term-entry-body-section-content term-pitch-accent-group-list"></ol></div>
+        <div class="term-entry-body-section term-definition-container"><ol class="term-entry-body-section-content term-definition-list"></ol></div>
     </div>
     <pre class="debug-info"></pre>
 </div></template>
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index 90361328..30c82472 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -294,7 +294,7 @@ class DisplayGenerator {
         node.dataset.pitchesMulti = 'true';
         node.dataset.pitchesCount = `${dictionaryPitches.length}`;
 
-        const tag = this.createTag({notes: '', name: dictionary, category: 'dictionary'});
+        const tag = this.createTag({notes: '', name: dictionary, category: 'pitch-accent-dictionary'});
         node.querySelector('.term-pitch-accent-group-tag-list').appendChild(tag);
 
         const n = node.querySelector('.term-pitch-accent-list');
-- 
cgit v1.2.3


From aa2a0c09f446aaa4ac5b052f5b9afb040e37afc2 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 28 Mar 2020 14:52:44 -0400
Subject: Update how pitch accent expressions are disambiguated

---
 ext/mixed/css/display-dark.css    |  1 +
 ext/mixed/css/display-default.css |  1 +
 ext/mixed/css/display.css         | 21 ++++++++++++++++-----
 ext/mixed/js/display-generator.js | 17 +++++++++++++++--
 4 files changed, 33 insertions(+), 7 deletions(-)

(limited to 'ext/mixed/css')

diff --git a/ext/mixed/css/display-dark.css b/ext/mixed/css/display-dark.css
index 7f49ca40..67fdb797 100644
--- a/ext/mixed/css/display-dark.css
+++ b/ext/mixed/css/display-dark.css
@@ -62,6 +62,7 @@ h2 { border-bottom-color: #2f2f2f; }
 
 .term-definition-list,
 .term-pitch-accent-group-list,
+.term-pitch-accent-expression-list,
 .kanji-glossary-list {
     color: #888888;
 }
diff --git a/ext/mixed/css/display-default.css b/ext/mixed/css/display-default.css
index 38e1bf19..be7a37a9 100644
--- a/ext/mixed/css/display-default.css
+++ b/ext/mixed/css/display-default.css
@@ -62,6 +62,7 @@ h2 { border-bottom-color: #eeeeee; }
 
 .term-definition-list,
 .term-pitch-accent-group-list,
+.term-pitch-accent-expression-list,
 .kanji-glossary-list {
     color: #777777;
 }
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index aeb88a1a..c150b12e 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -488,14 +488,25 @@ button.action-button {
 .term-pitch-accent-group-tag-list {
     margin-right: 0.375em;
 }
-.entry[data-unique-expression-count="1"] .term-pitch-accent-expression-list {
+
+.term-pitch-accent-expression-list {
+    padding-right: 0.25em;
+}
+
+.term-pitch-accent-expression-list[data-count="0"] {
     display: none;
 }
-.term-pitch-accent-expression:not(:last-of-type):after {
-    content: "\3001";
+
+.term-pitch-accent-expression-list:before {
+    content: "(";
 }
-.term-pitch-accent-expression:last-of-type:after {
-    content: "\FF1A";
+
+.term-pitch-accent-expression-list:after {
+    content: " only)";
+}
+
+.term-pitch-accent-expression+.term-pitch-accent-expression:before {
+    content: ", ";
 }
 
 .term-pitch-accent-tag-list:not([data-count="0"]) {
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index 30c82472..8177c31c 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -304,7 +304,7 @@ class DisplayGenerator {
     }
 
     createPitch(details) {
-        const {expressions, reading, position, tags} = details;
+        const {exclusiveExpressions, reading, position, tags} = 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-expression-list');
-        DisplayGenerator._appendMultiple(n, this.createPitchExpression.bind(this), expressions);
+        DisplayGenerator._appendMultiple(n, this.createPitchExpression.bind(this), exclusiveExpressions);
 
         n = node.querySelector('.term-pitch-accent-characters');
         for (let i = 0, ii = morae.length; i < ii; ++i) {
@@ -481,6 +481,7 @@ class DisplayGenerator {
     static _getPitchInfos(definition) {
         const results = new Map();
 
+        const allExpressions = new Set();
         const expressions = definition.expressions;
         const sources = Array.isArray(expressions) ? expressions : [definition];
         for (const {pitches: expressionPitches, expression} of sources) {
@@ -498,10 +499,22 @@ class DisplayGenerator {
                         dictionaryResults.push(pitchInfo);
                     }
                     pitchInfo.expressions.add(expression);
+                    allExpressions.add(expression);
                 }
             }
         }
 
+        for (const dictionaryResults of results.values()) {
+            for (const result of dictionaryResults) {
+                const exclusiveExpressions = [];
+                const resultExpressions = result.expressions;
+                if (!areSetsEqual(resultExpressions, allExpressions)) {
+                    exclusiveExpressions.push(...getSetIntersection(resultExpressions, allExpressions));
+                }
+                result.exclusiveExpressions = exclusiveExpressions;
+            }
+        }
+
         return [...results.entries()];
     }
 
-- 
cgit v1.2.3


From a7da4416d75871a0c42ecd91d8408f037ca1ed3e Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 29 Mar 2020 11:19:43 -0400
Subject: Change names

---
 ext/mixed/css/display-dark.css    |  2 +-
 ext/mixed/css/display-default.css |  2 +-
 ext/mixed/css/display.css         | 10 +++++-----
 ext/mixed/display-templates.html  |  4 ++--
 ext/mixed/js/display-generator.js |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'ext/mixed/css')

diff --git a/ext/mixed/css/display-dark.css b/ext/mixed/css/display-dark.css
index 67fdb797..550dff3e 100644
--- a/ext/mixed/css/display-dark.css
+++ b/ext/mixed/css/display-dark.css
@@ -62,7 +62,7 @@ h2 { border-bottom-color: #2f2f2f; }
 
 .term-definition-list,
 .term-pitch-accent-group-list,
-.term-pitch-accent-expression-list,
+.term-pitch-accent-disambiguation-list,
 .kanji-glossary-list {
     color: #888888;
 }
diff --git a/ext/mixed/css/display-default.css b/ext/mixed/css/display-default.css
index be7a37a9..487b8cb8 100644
--- a/ext/mixed/css/display-default.css
+++ b/ext/mixed/css/display-default.css
@@ -62,7 +62,7 @@ h2 { border-bottom-color: #eeeeee; }
 
 .term-definition-list,
 .term-pitch-accent-group-list,
-.term-pitch-accent-expression-list,
+.term-pitch-accent-disambiguation-list,
 .kanji-glossary-list {
     color: #777777;
 }
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index c150b12e..c351a34c 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -489,23 +489,23 @@ button.action-button {
     margin-right: 0.375em;
 }
 
-.term-pitch-accent-expression-list {
+.term-pitch-accent-disambiguation-list {
     padding-right: 0.25em;
 }
 
-.term-pitch-accent-expression-list[data-count="0"] {
+.term-pitch-accent-disambiguation-list[data-count="0"] {
     display: none;
 }
 
-.term-pitch-accent-expression-list:before {
+.term-pitch-accent-disambiguation-list:before {
     content: "(";
 }
 
-.term-pitch-accent-expression-list:after {
+.term-pitch-accent-disambiguation-list:after {
     content: " only)";
 }
 
-.term-pitch-accent-expression+.term-pitch-accent-expression:before {
+.term-pitch-accent-disambiguation+.term-pitch-accent-disambiguation:before {
     content: ", ";
 }
 
diff --git a/ext/mixed/display-templates.html b/ext/mixed/display-templates.html
index 09f173b4..b8d52d15 100644
--- a/ext/mixed/display-templates.html
+++ b/ext/mixed/display-templates.html
@@ -45,8 +45,8 @@
     </defs>
 </svg></template>
 <template id="term-pitch-accent-group-template"><li class="term-pitch-accent-group"><span class="term-pitch-accent-group-tag-list tag-list"></span><ul class="term-pitch-accent-list"></ul></li></template>
-<template id="term-pitch-accent-expression-template"><span class="term-pitch-accent-expression"></span></template>
-<template id="term-pitch-accent-template"><li class="term-pitch-accent"><span class="term-pitch-accent-tag-list tag-list"></span><span class="term-pitch-accent-expression-list"></span><span class="term-pitch-accent-characters"></span><span class="term-pitch-accent-position"></span><span class="term-pitch-accent-details"><svg class="term-pitch-accent-graph" xmlns="http://www.w3.org/2000/svg"><path class="term-pitch-accent-graph-line" /><path class="term-pitch-accent-graph-line-tail" /></svg></span></li></template>
+<template id="term-pitch-accent-disambiguation-template"><span class="term-pitch-accent-disambiguation"></span></template>
+<template id="term-pitch-accent-template"><li class="term-pitch-accent"><span class="term-pitch-accent-tag-list tag-list"></span><span class="term-pitch-accent-disambiguation-list"></span><span class="term-pitch-accent-characters"></span><span class="term-pitch-accent-position"></span><span class="term-pitch-accent-details"><svg class="term-pitch-accent-graph" xmlns="http://www.w3.org/2000/svg"><path class="term-pitch-accent-graph-line" /><path class="term-pitch-accent-graph-line-tail" /></svg></span></li></template>
 <template id="term-pitch-accent-character-template"><span class="term-pitch-accent-character"><span class="term-pitch-accent-character-inner"></span></span></template>
 
 <template id="kanji-entry-template"><div class="entry" data-type="kanji">
diff --git a/ext/mixed/js/display-generator.js b/ext/mixed/js/display-generator.js
index 8177c31c..cdf96867 100644
--- a/ext/mixed/js/display-generator.js
+++ b/ext/mixed/js/display-generator.js
@@ -318,7 +318,7 @@ class DisplayGenerator {
         n = node.querySelector('.term-pitch-accent-tag-list');
         DisplayGenerator._appendMultiple(n, this.createTag.bind(this), tags);
 
-        n = node.querySelector('.term-pitch-accent-expression-list');
+        n = node.querySelector('.term-pitch-accent-disambiguation-list');
         DisplayGenerator._appendMultiple(n, this.createPitchExpression.bind(this), exclusiveExpressions);
 
         n = node.querySelector('.term-pitch-accent-characters');
@@ -346,7 +346,7 @@ class DisplayGenerator {
     }
 
     createPitchExpression(expression) {
-        const node = this._templateHandler.instantiate('term-pitch-accent-expression');
+        const node = this._templateHandler.instantiate('term-pitch-accent-disambiguation');
         node.textContent = expression;
         return node;
     }
-- 
cgit v1.2.3


From 938b69646820482a958cd8e0a65a03400ee6a7ac Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 29 Mar 2020 11:27:35 -0400
Subject: Hide reading disambiguation if the downstep notation is visible

---
 ext/mixed/css/display.css | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'ext/mixed/css')

diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index c351a34c..a4432016 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -493,10 +493,6 @@ button.action-button {
     padding-right: 0.25em;
 }
 
-.term-pitch-accent-disambiguation-list[data-count="0"] {
-    display: none;
-}
-
 .term-pitch-accent-disambiguation-list:before {
     content: "(";
 }
@@ -509,6 +505,12 @@ button.action-button {
     content: ", ";
 }
 
+.term-pitch-accent-disambiguation-list[data-count="0"],
+:root[data-show-pitch-accent-downstep-notation=true] .term-pitch-accent-disambiguation-list[data-expression-count="0"],
+:root[data-show-pitch-accent-downstep-notation=true] .term-pitch-accent-disambiguation[data-type=reading] {
+    display: none;
+}
+
 .term-pitch-accent-tag-list:not([data-count="0"]) {
     margin-right: 0.375em;
 }
-- 
cgit v1.2.3