More accurate segment start pos

Author: XiaoMigros

src/importexport/finale/internal/importfinaleparser.h

@@ -375,6 +375,7 @@ class FinaleParser : public muse::Injectable
                                               std::vector<std::pair<engraving::staff_idx_t, musx::dom::StaffCmper> >& links);
     musx::dom::MusxInstance<musx::dom::others::LayerAttributes> layerAttributes(const engraving::Fraction& tick,
                                                                                 engraving::track_idx_t track);
+    double musicStartPosForMeasure(const engraving::Measure* m) const;
 
     IFinaleConfiguration::ImportPositionsType importPositionsType() const { return m_importPositionsType; }
     bool importCustomPositions() const { return m_importPositionsType != IFinaleConfiguration::ImportPositionsType::None; }

src/importexport/finale/internal/importfinalesmartshapes.cpp

@@ -359,6 +359,55 @@ static char32_t usedOttavaSymbol(const FinaleParser& ctx, OttavaType ottavaType)
     return ctx.score()->engravingFont()->symCode(SymId::ottavaAlta);
 }
 
+double FinaleParser::musicStartPosForMeasure(const Measure* m) const
+{
+    double pos = 0.0;
+    for (Segment* s = m->first(SegmentType::ChordRest)->prevActive(); s;
+         s = s->prevActive(SegmentType::TimeSig | SegmentType::KeySig | SegmentType::HeaderClef
+                           | SegmentType::StartRepeatBarLine | SegmentType::BeginBarLine)) {
+        if (s->allElementsInvisible() || s->hasTimeSigAboveStaves()) {
+            continue;
+        }
+        if (s->isTimeSigType()) {
+            for (staff_idx_t i = 0; i < score()->nstaves(); ++i) {
+                if (!m->system()->staff(i)->show()) {
+                    continue;
+                }
+                pos = std::max(pos, score()->staff(i)->spatium(m->tick()));
+            }
+            pos *= evpuToSp(partScore() ? musxOptions().timeOptions->timeBackParts : musxOptions().timeOptions->timeBack);
+        } else if (s->isKeySigType()) {
+            for (staff_idx_t i = 0; i < score()->nstaves(); ++i) {
+                if (!m->system()->staff(i)->show()) {
+                    continue;
+                }
+                pos = std::max(pos, score()->staff(i)->spatium(m->tick()));
+            }
+            pos *= evpuToSp(musxOptions().keyOptions->keyBack);
+        } else if (s->isHeaderClefType()) {
+            for (staff_idx_t i = 0; i < score()->nstaves(); ++i) {
+                if (!m->system()->staff(i)->show()) {
+                    continue;
+                }
+                pos = std::max(pos, score()->staff(i)->spatium(m->tick()));
+            }
+            pos *= evpuToSp(musxOptions().clefOptions->clefBackSepar);
+        }
+        pos += s->x() + s->minRight();
+        if (m->isFirstInSystem()) {
+            MeasCmper measId = muse::value(m_tick2Meas, m->tick(), MeasCmper());
+            if (const auto staffSystem = musxDocument()->calcSystemFromMeasure(currentMusxPartId(), measId)) {
+                if (!staffSystem->placeEndSpaceBeforeBarline || !s->isStartRepeatBarLineType()) {
+                    pos += evpuToSp(staffSystem->extraStartSystemSpace)
+                           * staffSystem->calcEffectiveScaling().toDouble() * FINALE_DEFAULT_SPATIUM;
+                }
+            }
+        }
+        break;
+    }
+    return pos;
+}
+
 void FinaleParser::importSmartShapes()
 {
     const MusxInstanceList<others::SmartShape> smartShapes = m_doc->getOthers()->getArray<others::SmartShape>(m_currentMusxPartId);
@@ -834,16 +883,8 @@ void FinaleParser::importSmartShapes()
                 System* s;
                 ss->rxoffset() += startSeg->x() + startSeg->measure()->x() - toSLine(newSpanner)->linePos(Grip::START, &s).x();
             } else {
-                ss->rxoffset() += firstMeasureOfSystem->x() - ss->system()->firstNoteRestSegmentX(true);
-                for (Segment* s = firstMeasureOfSystem->first(SegmentType::ChordRest)->prevActive(); s;
-                     s = s->prev(SegmentType::TimeSig | SegmentType::KeySig | SegmentType::HeaderClef
-                                 | SegmentType::StartRepeatBarLine | SegmentType::BeginBarLine)) {
-                    if (s->allElementsInvisible() || s->hasTimeSigAboveStaves()) {
-                        continue;
-                    }
-                    ss->rxoffset() += s->x() + s->minRight();
-                    break;
-                }
+                ss->rxoffset() += firstMeasureOfSystem->x() + musicStartPosForMeasure(firstMeasureOfSystem)
+                                  - ss->system()->firstNoteRestSegmentX(true);
             }
 
             // In MuseScore, userOff2 is relative/added to offset

src/importexport/finale/internal/importfinaletext.cpp

@@ -874,13 +874,10 @@ void FinaleParser::importTextExpressions()
                     staffShape.remove_if([](ShapeElement& el) { return el.height() == 0; });
                     p.rx() = staffShape.right() + s->pageX();
                 } else if (expressionDef->horzMeasExprAlign == others::HorizontalMeasExprAlign::StartTimeSig) {
-                    // Observed: Elements placed .45sp too far left when there is a custom offset
                     Segment* seg = measure->findSegmentR(SegmentType::TimeSig, rTick);
                     p.rx() = seg ? seg->pageX() : s->pageX();
                 } else if (expressionDef->horzMeasExprAlign == others::HorizontalMeasExprAlign::AfterClefKeyTime) {
-                    Segment* seg = s->prev(SegmentType::TimeSig | SegmentType::KeySig | SegmentType::HeaderClef
-                                           | SegmentType::StartRepeatBarLine | SegmentType::BeginBarLine);
-                    p.rx() = seg ? seg->pageX() + seg->minRight() : s->pageX();
+                    p.rx() = s->measure()->pageX() + musicStartPosForMeasure(s->measure());
                 } else if (expressionDef->horzMeasExprAlign == others::HorizontalMeasExprAlign::CenterOverMusic
                            || expressionDef->horzMeasExprAlign == others::HorizontalMeasExprAlign::CenterOverBarlines) {
                     p.rx() = measure->findSegmentR(SegmentType::ChordRest, Fraction(0, 1))->x() / 2;