Skip to content

Commit

Permalink
fix #109136, fix #33201: add some articulations
Browse files Browse the repository at this point in the history
stringHarmonics and a few fermatas as well as getting these and the ones
from dafb5f3 and ab354df translated. Also getting some of the previously
added articulations to play back properly and import from ove as well as
export to XML (import is missing)
  • Loading branch information
Jojo-Schmitz committed Oct 16, 2016
1 parent 7f9585a commit b417f7d
Show file tree
Hide file tree
Showing 7 changed files with 226 additions and 169 deletions.
35 changes: 24 additions & 11 deletions libmscore/articulation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -420,10 +420,18 @@ const char* Articulation::articulationName() const
switch (_symId) {
case SymId::articStaccatissimoAbove:
case SymId::articStaccatissimoBelow:
case SymId::articStaccatissimoStrokeAbove:
case SymId::articStaccatissimoStrokeBelow:
case SymId::articStaccatissimoWedgeAbove:
case SymId::articStaccatissimoWedgeBelow:
return "staccatissimo";

case SymId::articStaccatoAbove:
case SymId::articStaccatoBelow:
case SymId::articAccentStaccatoAbove:
case SymId::articAccentStaccatoBelow:
case SymId::articMarcatoStaccatoAbove:
case SymId::articMarcatoStaccatoBelow:
return "staccato";

case SymId::articTenutoStaccatoAbove:
Expand Down Expand Up @@ -516,11 +524,13 @@ qreal Articulation::mag() const

bool Articulation::isFermata() const
{
return _symId == SymId::fermataAbove || _symId == SymId::fermataBelow
|| _symId == SymId::fermataShortAbove || _symId == SymId::fermataShortBelow
|| _symId == SymId::fermataLongAbove || _symId == SymId::fermataLongBelow
|| _symId == SymId::fermataVeryLongAbove || _symId == SymId::fermataVeryLongBelow;
}
return _symId == SymId::fermataAbove || _symId == SymId::fermataBelow
|| _symId == SymId::fermataLongAbove || _symId == SymId::fermataLongBelow
|| _symId == SymId::fermataLongHenzeAbove || _symId == SymId::fermataLongHenzeBelow
|| _symId == SymId::fermataShortAbove || _symId == SymId::fermataShortBelow
|| _symId == SymId::fermataShortHenzeAbove || _symId == SymId::fermataShortHenzeBelow
|| _symId == SymId::fermataVeryLongAbove || _symId == SymId::fermataVeryLongBelow
|| _symId == SymId::fermataVeryShortAbove || _symId == SymId::fermataVeryShortBelow; }

bool Articulation::isTenuto() const
{
Expand All @@ -529,12 +539,15 @@ bool Articulation::isTenuto() const

bool Articulation::isStaccato() const
{
return _symId == SymId::articStaccatoAbove || _symId == SymId::articStaccatoBelow;
return _symId == SymId::articStaccatoAbove || _symId == SymId::articStaccatoBelow
|| _symId == SymId::articMarcatoStaccatoAbove || _symId == SymId::articMarcatoStaccatoBelow
|| _symId == SymId::articAccentStaccatoAbove || _symId == SymId::articAccentStaccatoBelow;
}

bool Articulation::isAccent() const
{
return _symId == SymId::articAccentAbove || _symId == SymId::articAccentBelow;
return _symId == SymId::articAccentAbove || _symId == SymId::articAccentBelow
|| _symId == SymId::articAccentStaccatoAbove || _symId == SymId::articAccentStaccatoBelow;
}

//---------------------------------------------------------
Expand All @@ -544,10 +557,10 @@ bool Articulation::isAccent() const
bool Articulation::isLuteFingering() const
{
return _symId == SymId::stringsThumbPosition
|| _symId == SymId::luteFingeringRHThumb
|| _symId == SymId::luteFingeringRHFirst
|| _symId == SymId::luteFingeringRHSecond
|| _symId == SymId::luteFingeringRHThird;
|| _symId == SymId::luteFingeringRHThumb
|| _symId == SymId::luteFingeringRHFirst
|| _symId == SymId::luteFingeringRHSecond
|| _symId == SymId::luteFingeringRHThird;
}

//---------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion libmscore/element.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1996,7 +1996,7 @@ Element* Element::prevElement()

QString Element::accessibleInfo() const
{
return userName();
return Element::userName();
}

//---------------------------------------------------------
Expand Down
Loading

0 comments on commit b417f7d

Please sign in to comment.