Create small parenthesis option

Author: miiizen

src/engraving/dom/parenthesis.h

@@ -47,6 +47,8 @@ class Parenthesis : public EngravingItem
     struct LayoutData : public EngravingItem::LayoutData
     {
         ld_field<muse::draw::PainterPath> path = "path";
+        ld_field<double> startY = "startY";
+        ld_field<double> height = "height";
     };
     DECLARE_LAYOUTDATA_METHODS(Parenthesis);
 };

src/engraving/rendering/score/measurelayout.cpp

@@ -1914,30 +1914,38 @@ void MeasureLayout::setCourtesyClef(Measure* m, const Fraction& refClefTick, con
     }
 }
 
-void MeasureLayout::createParenthesis(Segment* segment, const DirectionH direction, const track_idx_t track)
+Parenthesis* MeasureLayout::findOrCreateParenthesis(Segment* segment, const DirectionH direction, const track_idx_t track)
 {
     if (!segment->element(track)) {
-        return;
+        return nullptr;
     }
 
     std::vector<EngravingItem*> parens = segment->findAnnotations(ElementType::PARENTHESIS, track, track);
-    bool foundMatchingParen = false;
+
     for (EngravingItem* el : parens) {
         if (!el->isParenthesis() || toParenthesis(el)->direction() != direction) {
             continue;
         }
-        foundMatchingParen = true;
-        break;
-    }
-
-    if (foundMatchingParen) {
-        return;
+        return toParenthesis(el);
     }
 
     Parenthesis* paren = Factory::createParenthesis(segment);
     paren->setTrack(track);
     paren->setDirection(direction);
     segment->add(paren);
+
+    return paren;
+}
+
+static void calcParenTopBottom(Parenthesis* item, double& top, double& bottom)
+{
+    Segment* seg = item->segment();
+    EngravingItem* el = seg->element(item->track());
+    const double spatium = item->spatium();
+    if (el) {
+        top = std::min(top, el->shape().top() + el->pos().y() + spatium / 2);
+        bottom = std::max(bottom, el->shape().bottom() + el->pos().y() - spatium / 2);
+    }
 }
 
 void MeasureLayout::addRepeatCourtesyParentheses(Measure* m, const bool continuation, LayoutContext& ctx)
@@ -1949,6 +1957,8 @@ void MeasureLayout::addRepeatCourtesyParentheses(Measure* m, const bool continua
     const Fraction sigTick = continuation ? Fraction(0, 0) : m->ticks();
 
     for (track_idx_t track = 0; track <= ctx.dom().nstaves() * VOICES; track += VOICES) {
+        double top = DBL_MAX;
+        double bottom = -DBL_MAX;
         Segment* leftMostSeg = m->findSegmentR(clefSegType, sigTick);
 
         if (!leftMostSeg || !leftMostSeg->enabled() || !leftMostSeg->element(track)) {
@@ -1964,7 +1974,7 @@ void MeasureLayout::addRepeatCourtesyParentheses(Measure* m, const bool continua
             return;
         }
 
-        createParenthesis(leftMostSeg, DirectionH::LEFT, track);
+        Parenthesis* leftParen = findOrCreateParenthesis(leftMostSeg, DirectionH::LEFT, track);
 
         Segment* rightMostSeg = m->findSegmentR(tsSegType, sigTick);
         if (!rightMostSeg || !rightMostSeg->enabled() || !rightMostSeg->element(track)) {
@@ -1980,7 +1990,17 @@ void MeasureLayout::addRepeatCourtesyParentheses(Measure* m, const bool continua
             return;
         }
 
-        createParenthesis(rightMostSeg, DirectionH::RIGHT, track);
+        Parenthesis* rightParen = findOrCreateParenthesis(rightMostSeg, DirectionH::RIGHT, track);
+        if (ctx.conf().styleB(Sid::smallParens)) {
+            calcParenTopBottom(leftParen, top, bottom);
+            calcParenTopBottom(rightParen, top, bottom);
+
+            const double height = bottom - top;
+            rightParen->mutldata()->startY.set_value(top);
+            rightParen->mutldata()->height.set_value(height);
+            leftParen->mutldata()->startY.set_value(top);
+            leftParen->mutldata()->height.set_value(height);
+        }
     }
 }
 

src/engraving/rendering/score/measurelayout.h

@@ -27,6 +27,7 @@
 namespace mu::engraving {
 class Measure;
 class MeasureBase;
+class Parenthesis;
 class Score;
 class Segment;
 class StaffLines;
@@ -107,7 +108,7 @@ class MeasureLayout
     static void setCourtesyClef(Measure* m, const Fraction& refSigTick, const Fraction& courtesySigTick, const SegmentType segType,
                                 LayoutContext& ctx);
 
-    static void createParenthesis(Segment* segment, const DirectionH direction, const track_idx_t track);
+    static Parenthesis* findOrCreateParenthesis(Segment* segment, const DirectionH direction, const track_idx_t track);
     static void removeRepeatCourtesyParenthesesSegment(Segment* seg, const track_idx_t track,
                                                        const DirectionH direction = DirectionH::AUTO);
 };

src/engraving/rendering/score/tlayout.cpp

@@ -4508,15 +4508,20 @@ void TLayout::layoutParenthesis(Parenthesis* item, LayoutContext& ctx)
     const double mag = item->mag();
     const bool leftBracket = item->direction() == DirectionH::LEFT;
 
-    const double height = staff->staffHeight(item->tick()) + 2 * spatium * mag;
-    const double heightInSpatium = height / spatium;
+    double startY = -spatium;
+    double height = staff->staffHeight(item->tick()) + 2 * spatium * mag;       // 6sp for a standard 5 line stave
 
-    const double shoulderX = 1.25 * spatium * mag;
-    const double thickness = 0.1 * spatium * mag; // THICKNESS - ADJUST
+    if (ctx.conf().styleB(Sid::smallParens)) {
+        startY = ldata->startY;
+        height = ldata->height;
+    }
 
+    const double heightInSpatium = height / spatium;
     const double shoulderYOffset = 0.2 * height;
+    const double thickness = height / 60 * mag;
+    const double shoulderX = 0.2 * height * mag;
 
-    PointF start = PointF(0.0, -spatium);
+    PointF start = PointF(0.0, startY);
     const PointF end = PointF(0.0, start.y() + height);
     const PointF endNormalised = end - start;
 

src/engraving/style/styledef.cpp

@@ -1787,6 +1787,7 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
     styleDef(useParensRepeatCourtesiesAfterCancelling,   true),
     styleDef(showCourtesiesAfterCancellingOtherJumps,    true),
     styleDef(useParensOtherJumpCourtesiesAfterCancelling, true),
+    styleDef(smallParens,                                false),
 } };
 
 #undef styleDef

src/engraving/style/styledef.h

@@ -1805,6 +1805,8 @@ enum class Sid {
     showCourtesiesAfterCancellingOtherJumps,
     useParensOtherJumpCourtesiesAfterCancelling,
 
+    smallParens,
+
     STYLES
     ///\}
 };

src/notation/qml/MuseScore/NotationScene/internal/EditStyle/ClefKeyTimeSigPage.qml

@@ -731,6 +731,14 @@ StyledFlickable {
 
                             text: qsTrc("notation/editstyle/timesignatures", "Show when cancelling a change before all other jumps")
                         }
+
+                        CheckBox {
+                            Layout.column: 0
+                            Layout.row: 2
+                            text: qsTrc("notation", "Small parentheses")
+                            checked: pageModel.smallParens.value === true
+                            onClicked: pageModel.smallParens.value = !pageModel.smallParens.value
+                        }
                     }
                 }
             }

src/notation/view/styledialog/clefkeytimesigpagemodel.cpp

@@ -64,7 +64,8 @@ ClefKeyTimeSigPageModel::ClefKeyTimeSigPageModel(QObject* parent)
                                          StyleId::showCourtesiesAfterCancellingRepeats,
                                          StyleId::useParensRepeatCourtesiesAfterCancelling,
                                          StyleId::showCourtesiesAfterCancellingOtherJumps,
-                                         StyleId::useParensOtherJumpCourtesiesAfterCancelling })
+                                         StyleId::useParensOtherJumpCourtesiesAfterCancelling,
+                                         StyleId::smallParens })
 {
 }
 
@@ -306,3 +307,8 @@ StyleItem* ClefKeyTimeSigPageModel::useParensOtherJumpCourtesiesAfterCancelling(
 {
     return styleItem(StyleId::useParensOtherJumpCourtesiesAfterCancelling);
 }
+
+StyleItem* ClefKeyTimeSigPageModel::smallParens() const
+{
+    return styleItem(StyleId::smallParens);
+}

src/notation/view/styledialog/clefkeytimesigpagemodel.h

@@ -80,6 +80,8 @@ class ClefKeyTimeSigPageModel : public AbstractStyleDialogModel
     Q_PROPERTY(StyleItem * showCourtesiesAfterCancellingOtherJumps READ showCourtesiesAfterCancellingOtherJumps CONSTANT)
     Q_PROPERTY(StyleItem * useParensOtherJumpCourtesiesAfterCancelling READ useParensOtherJumpCourtesiesAfterCancelling CONSTANT)
 
+    Q_PROPERTY(StyleItem * smallParens READ smallParens CONSTANT)
+
 public:
     explicit ClefKeyTimeSigPageModel(QObject* parent = nullptr);
 
@@ -135,5 +137,7 @@ class ClefKeyTimeSigPageModel : public AbstractStyleDialogModel
     StyleItem* useParensRepeatCourtesiesAfterCancelling() const;
     StyleItem* showCourtesiesAfterCancellingOtherJumps() const;
     StyleItem* useParensOtherJumpCourtesiesAfterCancelling() const;
+
+    StyleItem* smallParens() const;
 };
 }