+
authormirabilos <tg@debian.org>
Sat, 24 Oct 2020 00:06:04 +0000 (02:06 +0200)
committermirabilos <mirabilos@evolvis.org>
Sat, 24 Oct 2020 00:06:04 +0000 (02:06 +0200)
debian/changelog
debian/patches/fix-accidental-paren-pos.diff [new file with mode: 0644]
debian/patches/series

index a1d1bdd..3ca7df2 100644 (file)
@@ -1,8 +1,9 @@
 musescore3 (3.2.3+dfsg1-6exp1) UNRELEASED; urgency=medium
 
   * Test Emmentaler font change
+  * + accidental-in-parens fix
 
- -- Thorsten Glaser <tg@mirbsd.de>  Thu, 22 Oct 2020 05:20:23 +0200
+ -- Thorsten Glaser <tg@mirbsd.de>  Sat, 24 Oct 2020 02:05:53 +0200
 
 musescore3 (3.2.3+dfsg1-6) unstable; urgency=low
 
diff --git a/debian/patches/fix-accidental-paren-pos.diff b/debian/patches/fix-accidental-paren-pos.diff
new file mode 100644 (file)
index 0000000..36110cd
--- /dev/null
@@ -0,0 +1,29 @@
+--- a/libmscore/accidental.cpp
++++ b/libmscore/accidental.cpp
+@@ -284,23 +284,24 @@ void Accidental::layout()
+       setMag(m);
+       m = magS();
++      qreal x = 0;
+       if (_bracket != AccidentalBracket::NONE) {
+             SymId id = _bracket == AccidentalBracket::PARENTHESIS ? SymId::accidentalParensLeft : SymId::accidentalBracketLeft;
+             SymElement e(id, 0.0);
+             el.append(e);
+             r |= symBbox(id);
++            x += symAdvance(id);
+             }
+       SymId s = symbol();
+-      qreal x = r.x()+r.width();
+       SymElement e(s, x);
+       el.append(e);
+       r |= symBbox(s).translated(x, 0.0);
+       if (_bracket != AccidentalBracket::NONE) {
++            x += symAdvance(s);
+             SymId id = _bracket == AccidentalBracket::PARENTHESIS ? SymId::accidentalParensRight : SymId::accidentalBracketRight;
+-            x = r.x()+r.width();
+             SymElement e1(id, x);
+             el.append(e1);
+             r |= symBbox(id).translated(x, 0.0);
index 73d9a0b..9f5adc9 100644 (file)
@@ -1,3 +1,4 @@
+fix-accidental-paren-pos.diff
 fontx.diff
 debian-specific/dfsg-exclusions.diff
 experiments/no-sql.diff