Init adjustyrelfortranscriptionfunction

bindings/iOS/all.h

@@ -28,6 +28,7 @@
 #import <VerovioFramework/adjustxposfunctor.h>
 #import <VerovioFramework/adjustxrelfortranscriptionfunctor.h>
 #import <VerovioFramework/adjustyposfunctor.h>
+#import <VerovioFramework/adjustyrelfortranscriptionfunctor.h>
 #import <VerovioFramework/alignfunctor.h>
 #import <VerovioFramework/altsyminterface.h>
 #import <VerovioFramework/anchoredtext.h>

include/vrv/adjustyrelfortranscriptionfunctor.h

@@ -0,0 +1,56 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        adjustyrelfortranscriptionfunctor.h
+// Author:      Yinan Zhou
+// Created:     2024
+// Copyright (c) Authors and others. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __VRV_ADJUSTYRELFORTRANSCRIPTIONFUNCTOR_H__
+#define __VRV_ADJUSTYRELFORTRANSCRIPTIONFUNCTOR_H__
+
+#include "functor.h"
+
+namespace vrv {
+
+//----------------------------------------------------------------------------
+// AdjustYRelForTranscriptionFunctor
+//----------------------------------------------------------------------------
+
+/**
+ * This class adjusts the YRel positions taking into account the bounding boxes.
+ */
+class AdjustYRelForTranscriptionFunctor : public Functor {
+public:
+    /**
+     * @name Constructors, destructors
+     */
+    ///@{
+    AdjustYRelForTranscriptionFunctor();
+    virtual ~AdjustYRelForTranscriptionFunctor() = default;
+    ///@}
+
+    /*
+     * Abstract base implementation
+     */
+    bool ImplementsEndInterface() const override { return false; }
+
+    /*
+     * Functor interface
+     */
+    ///@{
+    FunctorCode VisitLayerElement(LayerElement *layerElement) override;
+    ///@}
+
+protected:
+    //
+private:
+    //
+public:
+    //
+private:
+    //
+};
+
+} // namespace vrv
+
+#endif // __VRV_ADJUSTYRELFORTRANSCRIPTIONFUNCTOR_H__

src/adjustxrelfortranscriptionfunctor.cpp

@@ -28,7 +28,6 @@ FunctorCode AdjustXRelForTranscriptionFunctor::VisitLayerElement(LayerElement *l
     if (!layerElement->HasSelfBB()) return FUNCTOR_CONTINUE;
 
     layerElement->SetDrawingXRel(-layerElement->GetSelfX1());
-    layerElement->SetDrawingYRel(-layerElement->GetSelfY1());
 
     return FUNCTOR_CONTINUE;
 }

src/adjustyrelfortranscriptionfunctor.cpp

@@ -0,0 +1,35 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        adjustyrelfortranscriptionfunctor.cpp
+// Author:      Yinan Zhou
+// Created:     2024
+// Copyright (c) Authors and others. All rights reserved.
+/////////////////////////////////////////////////////////////////////////////
+
+#include "adjustyrelfortranscriptionfunctor.h"
+
+//----------------------------------------------------------------------------
+
+//----------------------------------------------------------------------------
+
+namespace vrv {
+
+//----------------------------------------------------------------------------
+// AdjustYRelForTranscriptionFunctor
+//----------------------------------------------------------------------------
+
+AdjustYRelForTranscriptionFunctor::AdjustYRelForTranscriptionFunctor() : Functor() {}
+
+FunctorCode AdjustYRelForTranscriptionFunctor::VisitLayerElement(LayerElement *layerElement)
+{
+    if (layerElement->m_drawingFacsY == VRV_UNSET) return FUNCTOR_CONTINUE;
+
+    if (layerElement->IsScoreDefElement()) return FUNCTOR_SIBLINGS;
+
+    if (!layerElement->HasSelfBB()) return FUNCTOR_CONTINUE;
+
+    layerElement->SetDrawingYRel(-layerElement->GetSelfY1());
+
+    return FUNCTOR_CONTINUE;
+}
+
+} // namespace vrv

src/layerelement.cpp

@@ -127,6 +127,7 @@ void LayerElement::Reset()
     this->ResetLabelled();
     this->ResetTyped();
 
+    m_drawingFacsY = VRV_UNSET;
     m_drawingFacsX = VRV_UNSET;
     m_drawingYRel = 0;
     m_drawingXRel = 0;

src/page.cpp

@@ -33,6 +33,7 @@
 #include "adjustxposfunctor.h"
 #include "adjustxrelfortranscriptionfunctor.h"
 #include "adjustyposfunctor.h"
+#include "adjustyrelfortranscriptionfunctor.h"
 #include "alignfunctor.h"
 #include "bboxdevicecontext.h"
 #include "cachehorizontallayoutfunctor.h"
@@ -271,6 +272,9 @@ void Page::LayOutTranscription(bool force)
     AdjustXRelForTranscriptionFunctor adjustXRelForTranscription;
     this->Process(adjustXRelForTranscription);
 
+    AdjustYRelForTranscriptionFunctor adjustYRelForTranscription;
+    this->Process(adjustYRelForTranscription);
+
     CalcLedgerLinesFunctor calcLedgerLines(doc);
     this->Process(calcLedgerLines);