add another patch from upstream
authormirabilos <tg@debian.org>
Sun, 31 Jan 2021 18:35:48 +0000 (19:35 +0100)
committermirabilos <mirabilos@evolvis.org>
Sun, 31 Jan 2021 18:35:48 +0000 (19:35 +0100)
debian/changelog
debian/patches/series
debian/patches/upstream/5507.patch [new file with mode: 0644]

index 3197025..13e2551 100644 (file)
@@ -3,8 +3,10 @@ musescore2 (2.3.2+dfsg4-12) unstable; urgency=medium
   * Fix CFLAGS/CXXFLAGS extras to disable upstream-only warnings
   * Update list of MScore.ttf copyright holders, again
   * Explicitly debundle GNU FreeFont
+  * Merge patches from upstream or submitted:
+    - Do not delete courtesy accidentals on octave changes
 
- -- Thorsten Glaser <tg@mirbsd.de>  Sun, 31 Jan 2021 17:32:29 +0100
+ -- Thorsten Glaser <tg@mirbsd.de>  Sun, 31 Jan 2021 19:34:58 +0100
 
 musescore2 (2.3.2+dfsg3-11) unstable; urgency=medium
 
index 01ec19a..32e471e 100644 (file)
@@ -29,6 +29,7 @@ upstream/wmclass.diff
 upstream/fix-accidental-paren-pos.diff
 upstream/statusline-pitch-onofftime.diff
 upstream/improve-mscore-font.diff
+upstream/5507.patch
 debian-specific/fixup-AppData.diff
 experiments/upstream-backend-fixes.diff
 experiments/lyrics-hyphen-5sp.diff
diff --git a/debian/patches/upstream/5507.patch b/debian/patches/upstream/5507.patch
new file mode 100644 (file)
index 0000000..da9cfa2
--- /dev/null
@@ -0,0 +1,31 @@
+Origin: backport, commit:431961b43657eb8463f358f53bdfdd802a8bde4d
+Author: Howard-C <howardc@pku.edu.cn>
+Description: fix #292648: make courtesy accidentals stay if notes are
+ changed using Ctrl+Up/Down
+
+--- a/libmscore/cmd.cpp
++++ b/libmscore/cmd.cpp
+@@ -1564,12 +1564,17 @@ void Score::upDown(bool up, UpDownMode mode)
+             if ((oNote->pitch() != newPitch) || (oNote->tpc1() != newTpc1) || oNote->tpc2() != newTpc2) {
+                   // remove accidental if present to make sure
+-                  // user added accidentals are removed here.
+-                  auto l = oNote->linkList();
+-                  for (ScoreElement* e : l) {
+-                        Note* ln = toNote(e);
+-                        if (ln->accidental())
+-                              undo(new RemoveElement(ln->accidental()));
++                  // user added accidentals are removed here
++                  // unless it's an octave change
++                  // in this case courtesy accidentals are preserved
++                  // because they're now harder to be re-entered due to the revised note-input workflow
++                  if (mode != UpDownMode::OCTAVE) {
++                        auto l = oNote->linkList();
++                        for (ScoreElement* e : l) {
++                              Note* ln = toNote(e);
++                              if (ln->accidental())
++                                    undo(new RemoveElement(ln->accidental()));
++                              }
+                         }
+                   undoChangePitch(oNote, newPitch, newTpc1, newTpc2);
+                   }