Skip to content

Commit

Permalink
Fix PAE output from Volpiano input
Browse files Browse the repository at this point in the history
(cherry picked from commit eb414b9b0263799acb335254ec062aa6745986d2)
  • Loading branch information
lpugin committed Jul 23, 2024
1 parent 7b5abaa commit ae08e3a
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions src/iopae.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,6 @@ void PAEOutput::WriteMultiRest(MultiRest *multiRest)
void PAEOutput::WriteNote(Note *note)
{
assert(note);
assert(m_currentMeasure);

if (m_skip) return;

Expand Down Expand Up @@ -478,13 +477,15 @@ void PAEOutput::WriteNote(Note *note)

if (fermata) m_streamStringOutput << ")";

PointingToComparison pointingToComparisonTrill(TRILL, note);
Trill *trill = vrv_cast<Trill *>(m_currentMeasure->FindDescendantByComparison(&pointingToComparisonTrill, 1));
if (trill) m_streamStringOutput << "t";
if (m_currentMeasure) {
PointingToComparison pointingToComparisonTrill(TRILL, note);
Trill *trill = vrv_cast<Trill *>(m_currentMeasure->FindDescendantByComparison(&pointingToComparisonTrill, 1));
if (trill) m_streamStringOutput << "t";

PointingToComparison pointingToComparisonTie(TIE, note);
Tie *tie = vrv_cast<Tie *>(m_currentMeasure->FindDescendantByComparison(&pointingToComparisonTie, 1));
if (tie) m_streamStringOutput << "+";
PointingToComparison pointingToComparisonTie(TIE, note);
Tie *tie = vrv_cast<Tie *>(m_currentMeasure->FindDescendantByComparison(&pointingToComparisonTie, 1));
if (tie) m_streamStringOutput << "+";
}
}

void PAEOutput::WriteRest(Rest *rest)
Expand Down Expand Up @@ -613,6 +614,8 @@ void PAEOutput::WriteGrace(AttGraced *attGraced)

bool PAEOutput::HasFermata(Object *object)
{
if (!m_currentMeasure) return false;

PointingToComparison pointingToComparisonFermata(FERMATA, object);
Fermata *fermata
= vrv_cast<Fermata *>(m_currentMeasure->FindDescendantByComparison(&pointingToComparisonFermata, 1));
Expand Down

0 comments on commit ae08e3a

Please sign in to comment.