Manually merged musescore#6351 to master

iveshenry18 · Aug 26, 2020 · e78d19e · e78d19e
1 parent 63696c5
commit e78d19e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/libmscore/chordlist.cpp b/libmscore/chordlist.cpp
@@ -1870,7 +1870,7 @@ void ChordList::write(XmlWriter& xml) const
         writeRenderList(xml, &renderListRoot, "renderRoot");
     }
     if (!renderListFunction.empty()) {
-        writeRenderList(xml, &renderListRoot, "renderFunction");
+        writeRenderList(xml, &renderListFunction, "renderFunction");
     }
     if (!renderListBase.empty()) {
         writeRenderList(xml, &renderListBase, "renderBase");

diff --git a/libmscore/harmony.cpp b/libmscore/harmony.cpp
@@ -1288,6 +1288,7 @@ const RealizedHarmony& Harmony::getRealizedHarmony() const
     }
 
     //Adjust for Nashville Notation, might be temporary
+    // TODO: set dirty on add/remove of keysig
     if (_harmonyType == HarmonyType::NASHVILLE && !_realizedHarmony.valid()) {
         Key key = staff()->key(tick());
         //parse root

diff --git a/libmscore/realizedharmony.cpp b/libmscore/realizedharmony.cpp
@@ -224,7 +224,9 @@ void RealizedHarmony::update(int rootTpc, int bassTpc, int transposeOffset /*= 0
         return;
     }
 
-    _notes = generateNotes(rootTpc, bassTpc, _literal, _voicing, transposeOffset);
+    if (tpcIsValid(rootTpc)) {
+        _notes = generateNotes(rootTpc, bassTpc, _literal, _voicing, transposeOffset);
+    }
     _dirty = false;
 }
 

diff --git a/share/styles/chords_jazz.xml b/share/styles/chords_jazz.xml
@@ -455,6 +455,7 @@
     </token>
 
   <renderRoot>:n :a </renderRoot>
+  <renderFunction>:a :n</renderFunction>
   <renderBase>/ m:0:1 :n :a m:0:-1</renderBase>
 
 <!--