Skip to content

Commit

Permalink
Revert "X and <> symbols changed for tabs"
Browse files Browse the repository at this point in the history
  • Loading branch information
mikekirin authored Jul 18, 2023
1 parent 0870e8a commit 0c6d706
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions fonts/fonts_tablature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<fret value="15" letter="1">q</fret>
<fret value="16" letter="1">r</fret>
<mark value="x">X</mark>
<mark value="ghost"></mark>
<mark value="ghost">×</mark>
<mark value="slash" number="1">/</mark>
<mark value="slash" number="2">//</mark>
<mark value="slash" number="3">///</mark>
Expand Down Expand Up @@ -254,7 +254,7 @@
<fret value="15" letter="1">q</fret>
<fret value="16" letter="1">r</fret>
<mark value="x">X</mark>
<mark value="ghost"></mark>
<mark value="ghost">×</mark>
<mark value="slash" number="1">/</mark>
<mark value="slash" number="2">//</mark>
<mark value="slash" number="3">///</mark>
Expand Down
7 changes: 3 additions & 4 deletions src/engraving/layout/v0/tlayout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3546,12 +3546,11 @@ void TLayout::layout(Note* item, LayoutContext&)
if (item->negativeFretUsed()) {
item->setFretString(u"-" + item->fretString());
}
// Don't use regular less than or more than symbols
// they are not centered. Use these instead! <>

if (item->displayFret() == Note::DisplayFretOption::ArtificialHarmonic) {
item->setFretString(String(u"%1 <%2>").arg(item->fretString(), String::number(item->harmonicFret())));
item->setFretString(String(u"%1 <%2>").arg(item->fretString(), String::number(item->harmonicFret())));
} else if (item->displayFret() == Note::DisplayFretOption::NaturalHarmonic) {
item->setFretString(String(u"<%1>").arg(String::number(item->harmonicFret())));
item->setFretString(String(u"<%1>").arg(String::number(item->harmonicFret())));
}
}

Expand Down

0 comments on commit 0c6d706

Please sign in to comment.