Code review

Author: mike-spa

src/engraving/rendering/score/tlayout.cpp

@@ -3280,13 +3280,8 @@ void TLayout::layoutHammerOnPullOffSegment(HammerOnPullOffSegment* item, LayoutC
             endX = endChord->systemPos().x();
         } else {
             // The last endChord of this segment is in next system. Use end barline instead.
-            Measure* lastMeas = system->lastMeasure();
-            for (Segment* seg = lastMeas->last(); seg; seg = seg->prev()) {
-                if (seg->isType(SegmentType::BarLineType)) {
-                    endX = seg->systemPos().x();
-                    break;
-                }
-            }
+            Segment* endSeg = system->lastMeasure()->last(SegmentType::BarLineType);
+            endX = endSeg ? endSeg->systemPos().x() : endX;
         }
         if (startChord->stem() && endChord->stem() && startChord->up() == above && endChord->up() == above) {
             // Mid-way between centered on the notes and centered on the stems

src/engraving/rw/write/twrite.cpp

@@ -1656,9 +1656,6 @@ void TWrite::write(const HammerOnPullOff* item, XmlWriter& xml, WriteContext& ct
     }
 
     xml.startElement(item);
-    if (ctx.clipboardmode()) {
-        xml.tag("stemArr", Slur::calcStemArrangement(item->startElement(), item->endElement()));
-    }
 
     writeProperty(item, xml, Pid::PARTIAL_SPANNER_DIRECTION);
 

src/engraving/types/typesconv.cpp

@@ -289,7 +289,6 @@ static const std::vector<Item<ElementType> > ELEMENT_TYPES = {
     { ElementType::SYSTEM,               "System",               muse::TranslatableString("engraving", "System") },
     { ElementType::CHORD,                "Chord",                muse::TranslatableString("engraving", "Chord") },
     { ElementType::SLUR,                 "Slur",                 muse::TranslatableString("engraving", "Slur") },
-    { ElementType::HAMMER_ON_PULL_OFF,   "HammerOnPullOff",      muse::TranslatableString("engraving",  "Hammer-on pull-off") },
     { ElementType::HBOX,                 "HBox",                 muse::TranslatableString("engraving", "Horizontal frame") },
     { ElementType::VBOX,                 "VBox",                 muse::TranslatableString("engraving", "Vertical frame") },
     { ElementType::TBOX,                 "TBox",                 muse::TranslatableString("engraving", "Text frame") },

src/notation/view/widgets/editstyle.cpp

@@ -887,8 +887,9 @@ EditStyle::EditStyle(QWidget* parent)
 
     // Define string here instead of in the .ui file to avoid MSVC compiler warning C4125, which would
     // be triggered by the decimal digit immediately following a non-ASCII character (curly quote).
-    oneMeasureRepeatShow1->setText(muse::qtrc("EditStyleBase", "Show ‘1’ on 1-measure repeats"));
-    singleMMRestShowNumber->setText(muse::qtrc("EditStyleBase", "Show number ‘1’"));
+    oneMeasureRepeatShow1->setText(muse::qtrc("EditStyleBase", "Show ‘1’ on 1-measure repeats"));
+    singleMMRestShowNumber->setText(muse::qtrc("EditStyleBase", "Show number ‘1’"));
+
 
     // ====================================================
     // BEAMS (QML)
@@ -1459,7 +1460,7 @@ void EditStyle::setHeaderFooterToolTip()
           + QString("</i></td></tr></table><p>")
           + muse::qtrc("notation/editstyle", "Available metadata tags and their current values")
           + QString("<br />")
-          + muse::qtrc("notation/editstyle", "(in File > Project properties…):")
+          + muse::qtrc("notation/editstyle", "(in File > Project properties…):")
           + QString("</p><table>");
 
     // show all tags for current score/part
@@ -1630,9 +1631,12 @@ QString EditStyle::pageCodeForElement(const EngravingItem* element)
     case ElementType::LAISSEZ_VIB_SEGMENT:
     case ElementType::PARTIAL_TIE:
     case ElementType::PARTIAL_TIE_SEGMENT:
+        return "slurs-and-ties";
+
     case ElementType::HAMMER_ON_PULL_OFF:
     case ElementType::HAMMER_ON_PULL_OFF_SEGMENT:
-        return "slurs-and-ties";
+    case ElementType::HAMMER_ON_PULL_OFF_TEXT:
+        return "hammer-ons-pull-offs-and-tapping";
 
     case ElementType::HAIRPIN:
     case ElementType::HAIRPIN_SEGMENT: