From e60c63950a9acdb45883adbfca3eb0c9339bbd92 Mon Sep 17 00:00:00 2001
From: James Mizen <jamesmmizen@gmail.com>
Date: Wed, 22 Nov 2023 10:46:54 +0100
Subject: [PATCH] Fix GH#17625: Sync figured bass between parts & score

Backport of #20139 (of its pretty minimal first version, the rest introduces a crash on undo, and apparently Mu3 doesn't have the undo issue of Mu4/master)
---
 libmscore/figuredbass.cpp  | 12 ++++++------
 libmscore/figuredbass.h    |  4 ++--
 libmscore/scoreElement.cpp |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libmscore/figuredbass.cpp b/libmscore/figuredbass.cpp
index 9a94249fdce10..e31a48e5d0522 100644
--- a/libmscore/figuredbass.cpp
+++ b/libmscore/figuredbass.cpp
@@ -295,7 +295,7 @@ int FiguredBassItem::parseParenthesis(QString& str, int parenthIdx)
             code = Parenthesis::ROUNDCLOSED;
             break;
       case '[':
-            code =Parenthesis::SQUAREDOPEN;
+            code = Parenthesis::SQUAREDOPEN;
             break;
       case ']':
             code = Parenthesis::SQUAREDCLOSED;
@@ -1415,11 +1415,11 @@ qreal FiguredBass::additionalContLineX(qreal pagePosY) const
             // if item has cont.line but nothing before it
             // and item Y coord near enough to pagePosY
             if(fbi->contLine() != FiguredBassItem::ContLine::NONE
-                  && fbi->digit() == FBIDigitNone
-                     && fbi->prefix() == FiguredBassItem::Modifier::NONE
-                        && fbi->suffix() == FiguredBassItem::Modifier::NONE
-                           && fbi->parenth4() == FiguredBassItem::Parenthesis::NONE
-                              && qAbs(pgPos.y() + fbi->ipos().y() - pagePosY) < 0.05)
+               && fbi->digit() == FBIDigitNone
+               && fbi->prefix() == FiguredBassItem::Modifier::NONE
+               && fbi->suffix() == FiguredBassItem::Modifier::NONE
+               && fbi->parenth4() == FiguredBassItem::Parenthesis::NONE
+               && qAbs(pgPos.y() + fbi->ipos().y() - pagePosY) < 0.05)
                   return pgPos.x() + fbi->ipos().x();
 
       return 0.0;                               // no suitable line
diff --git a/libmscore/figuredbass.h b/libmscore/figuredbass.h
index 4028d4d859bce..b3141bd15ea5d 100644
--- a/libmscore/figuredbass.h
+++ b/libmscore/figuredbass.h
@@ -140,7 +140,7 @@ class FiguredBassItem final : public Element {
 
       void              setDisplayText(const QString& s)    { _displayText = s;       }
       // read / write MusicXML support
-      QString                   Modifier2MusicXML(FiguredBassItem::Modifier prefix) const;
+      QString           Modifier2MusicXML(FiguredBassItem::Modifier prefix) const;
 
    public:
       FiguredBassItem(Score * s = 0, int line = 0);
@@ -164,7 +164,7 @@ class FiguredBassItem final : public Element {
       bool              startsWithParenthesis() const;
 
       // specific API
-      const FiguredBass *    figuredBass() const      { return (FiguredBass*)(parent()); }
+      const FiguredBass*    figuredBass() const       { return (FiguredBass*)(parent()); }
       bool              parse(QString& text);
 
       // getters / setters
diff --git a/libmscore/scoreElement.cpp b/libmscore/scoreElement.cpp
index b2a438a0892d4..e21e6a840c5ec 100644
--- a/libmscore/scoreElement.cpp
+++ b/libmscore/scoreElement.cpp
@@ -25,7 +25,7 @@ namespace Ms {
 ElementStyle const ScoreElement::emptyStyle;
 
 //
-// list has to be synchronized with ElementType enum
+// list has to be synchronized with ElementType enum in types.h
 //
 static const ElementName elementNames[] = {
       { ElementType::INVALID,              "invalid",              QT_TRANSLATE_NOOP("elementName", "Invalid") },