Merge pull request rism-digital#3682 from rism-digital/develop-facsim…

…ile-neume-line Fix regrassion introduce by facsimile-neume-line
DDMAL · May 16, 2024 · a7d0721 · a7d0721
2 parents dc4b31e + 3e7deb0
commit a7d0721
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/measure.cpp b/src/measure.cpp
@@ -95,7 +95,7 @@ Measure::Measure(bool measureMusic, int logMeasureNb)
 
     this->Reset();
 
-    if (!measureMusic) this->SetRight(BARRENDITION_invis);
+    if (!this->IsMeasuredMusic()) this->SetRight(BARRENDITION_invis);
 }
 
 Measure::~Measure()
@@ -149,10 +149,8 @@ void Measure::Reset()
     m_rightBarLine.SetForm(this->GetRight());
     m_leftBarLine.SetForm(this->GetLeft());
 
-    if (!m_measuredMusic) {
-        m_drawingFacsX1 = VRV_UNSET;
-        m_drawingFacsX2 = VRV_UNSET;
-    }
+    m_drawingFacsX1 = VRV_UNSET;
+    m_drawingFacsX2 = VRV_UNSET;
 
     m_drawingEnding = NULL;
     m_hasAlignmentRefWithMultipleLayers = false;

diff --git a/src/view_element.cpp b/src/view_element.cpp
@@ -1778,7 +1778,9 @@ void View::DrawSyl(DeviceContext *dc, LayerElement *element, Layer *layer, Staff
         return;
     }
 
-    syl->SetDrawingYRel(this->GetSylYRel(syl->m_drawingVerse, staff));
+    if (!m_doc->IsFacs()) {
+        syl->SetDrawingYRel(this->GetSylYRel(syl->m_drawingVerse, staff));
+    }
 
     dc->StartGraphic(syl, "", syl->GetID());
     dc->DeactivateGraphicY();