From a5d6bbfae1b53af26a28a65f4b3da585f27ffa15 Mon Sep 17 00:00:00 2001 From: Laurent Pugin Date: Thu, 16 May 2024 14:42:14 +0200 Subject: [PATCH 1/3] Fix broken lyric position and barline default --- src/measure.cpp | 8 +++----- src/view_element.cpp | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/measure.cpp b/src/measure.cpp index d5e48b679f7..0c02901da1b 100644 --- a/src/measure.cpp +++ b/src/measure.cpp @@ -95,7 +95,7 @@ Measure::Measure(MeasureType 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_measureType) { - 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 index a2bba2eefea..0abc4eb7b12 100644 --- a/src/view_element.cpp +++ b/src/view_element.cpp @@ -1733,7 +1733,7 @@ void View::DrawSyl(DeviceContext *dc, LayerElement *element, Layer *layer, Staff return; } - if (m_doc->IsFacs()) { + if (!m_doc->IsFacs()) { syl->SetDrawingYRel(this->GetSylYRel(syl->m_drawingVerse, staff)); } From d4d4359cd4b61ab8f3e1f026f195f7bea5a7b403 Mon Sep 17 00:00:00 2001 From: Laurent Pugin Date: Thu, 16 May 2024 14:43:16 +0200 Subject: [PATCH 2/3] Adjust xcode deployment target --- Verovio.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Verovio.xcodeproj/project.pbxproj b/Verovio.xcodeproj/project.pbxproj index 06ae5b7bc23..9c99a0a38a6 100644 --- a/Verovio.xcodeproj/project.pbxproj +++ b/Verovio.xcodeproj/project.pbxproj @@ -5172,7 +5172,7 @@ "$(inherited)", NO_HUMDRUM_SUPPORT, ); - MACOSX_DEPLOYMENT_TARGET = ""; + MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = "$(TARGET_NAME)"; USER_HEADER_SEARCH_PATHS = ""; }; @@ -5184,7 +5184,7 @@ CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; GCC_PREPROCESSOR_DEFINITIONS = NO_HUMDRUM_SUPPORT; - MACOSX_DEPLOYMENT_TARGET = ""; + MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = "$(TARGET_NAME)"; USER_HEADER_SEARCH_PATHS = ""; }; From 3e7deb0365f3009eccab5eba19e771fcca61b9e5 Mon Sep 17 00:00:00 2001 From: Laurent Pugin Date: Thu, 16 May 2024 15:06:53 +0200 Subject: [PATCH 3/3] update