Exception to "Omit dash"

musescore · May 14, 2024 · b5fbd42 · b5fbd42
1 parent 2c7d509
commit b5fbd42
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/engraving/rendering/dev/lyricslayout.cpp b/src/engraving/rendering/dev/lyricslayout.cpp
@@ -357,16 +357,18 @@ void LyricsLayout::layoutDashes(LyricsLineSegment* item)
  item->setPos(startX, y);
  item->setPos2(PointF(endX - startX, 0.0));
 
+ bool isDashOnFirstSyllable = lyricsLine->tick2() == system->firstMeasure()->tick();
  double curLength = endX - startX;
  double dashMinLength = style.styleMM(Sid::lyricsDashMinLength);
  int dashCount = std::floor(curLength / style.styleMM(Sid::lyricsDashMaxDistance));
- if (curLength > dashMinLength || style.styleB(Sid::lyricsDashForce)) {
+ bool forceDash = style.styleB(Sid::lyricsDashForce)
+ || (style.styleB(Sid::lyricsShowDashIfSyllableOnFirstNote) && isDashOnFirstSyllable);
+ if (curLength > dashMinLength || forceDash) {
  dashCount = std::max(dashCount, 1);
  }
 
  if (curLength < dashMinLength && dashCount > 0) {
  double diff = dashMinLength - curLength;
- bool isDashOnFirstSyllable = lyricsLine->tick2() == system->firstMeasure()->tick();
  if (isDashOnFirstSyllable) {
  startX -= diff;
  } else {