Reviewers: ,
Message:
Please review. Thanks!
Description:
Issue 5097: reach HorizontalBracketText through directed tweak
HorizontalBracketText is now caused by HorizontalBracket, rather
than the same note-grouping event.
Fix a number of programming errors caused by commit for Issue
5064.
Please review this at https://codereview.appspot.com/317460043/
Affected files (+12, -11 lines):
M Documentation/changes.tely
M Documentation/snippets/new/analysis-brackets-with-labels.ly
M input/regression/horizontal-bracket-broken-texted.ly
M input/regression/horizontal-bracket-texted.ly
M lily/horizontal-bracket-engraver.cc
Index: Documentation/changes.tely
diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index
f205d0014cb270556d9d6c1bf52de721d4d0e13b..b9782edbb85486b12fc6cc9575408c4564771b0f
100644
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -75,7 +75,7 @@ It is now possible to add text to analysis brackets
through the
{
\once \override HorizontalBracketText.text = "a"
c''\startGroup d''\stopGroup
- e''-\tweak text "a'" \startGroup d''\stopGroup
+ e''-\tweak HorizontalBracketText.text "a'" \startGroup d''\stopGroup
}
@end lilypond
Index: Documentation/snippets/new/analysis-brackets-with-labels.ly
diff --git a/Documentation/snippets/new/analysis-brackets-with-labels.ly
b/Documentation/snippets/new/analysis-brackets-with-labels.ly
index
30ae349b05bfc5960454af299f53ed464afa8a4f..93f65ea49d413b9853c63684242653b28f298824
100644
--- a/Documentation/snippets/new/analysis-brackets-with-labels.ly
+++ b/Documentation/snippets/new/analysis-brackets-with-labels.ly
@@ -27,12 +27,12 @@ Bracket text will be parenthesized after a line break.
\once\override HorizontalBracketText.text = "a'"
e''\startGroup d''\stopGroup
c''
- -\tweak text \markup \bold \huge "b" \startGroup
- -\tweak text "a" \startGroup
+ -\tweak HorizontalBracketText.text \markup \bold \huge "b" \startGroup
+ -\tweak HorizontalBracketText.text "a" \startGroup
d''\stopGroup
- e''-\tweak text "a'" \startGroup
+ e''-\tweak HorizontalBracketText.text "a'" \startGroup
d''\stopGroup\stopGroup
- c''-\tweak text foo \startGroup d'' e'' f''
+ c''-\tweak HorizontalBracketText.text foo \startGroup d'' e'' f''
\break
g'' a'' b'' c'''\stopGroup
}
Index: input/regression/horizontal-bracket-broken-texted.ly
diff --git a/input/regression/horizontal-bracket-broken-texted.ly
b/input/regression/horizontal-bracket-broken-texted.ly
index
1f8455261e169d2273c480908bd48e986c7ac5e5..00bcac987f38a33e759cb3d981f3d3432e466dbd
100644
--- a/input/regression/horizontal-bracket-broken-texted.ly
+++ b/input/regression/horizontal-bracket-broken-texted.ly
@@ -15,11 +15,12 @@ breaks.
{
c''
- -\tweak text \markup \draw-circle #1 #0.5 ##f \startGroup
- -\tweak text "a" \startGroup
+ -\tweak HorizontalBracketText.text \markup \draw-circle #1 #0.5 ##f
+ \startGroup
+ -\tweak HorizontalBracketText.text "a" \startGroup
d'' e'' f''
g'' a'' b'' c'''\stopGroup
- c'''-\tweak text "a'" \startGroup b'' a'' g''
+ c'''-\tweak HorizontalBracketText.text "a'" \startGroup b'' a'' g''
\break
f'' e'' d'' c''\stopGroup\stopGroup
}
Index: input/regression/horizontal-bracket-texted.ly
diff --git a/input/regression/horizontal-bracket-texted.ly
b/input/regression/horizontal-bracket-texted.ly
index
dc1a673a08423ec037cb2a4c30f44a7c73845327..0ab4520236bb2240b89af8f7b3473dbfe3dcee8d
100644
--- a/input/regression/horizontal-bracket-texted.ly
+++ b/input/regression/horizontal-bracket-texted.ly
@@ -21,8 +21,8 @@ usual nesting order of brackets.
\time 3/4
\key f \major
c4
- -\tweak text "contrasting period" \startGroup
- -\tweak text "a" \startGroup
+ -\tweak HorizontalBracketText.text "contrasting period" \startGroup
+ -\tweak HorizontalBracketText.text "a" \startGroup
a8( bes c f)
f4( e d)
c d8( c bes c)
Index: lily/horizontal-bracket-engraver.cc
diff --git a/lily/horizontal-bracket-engraver.cc
b/lily/horizontal-bracket-engraver.cc
index
1f176a321591a5c18b5446e506ed8182c3266199..860495750ad4124c5cff1c9c0b432800b668dfb6
100644
--- a/lily/horizontal-bracket-engraver.cc
+++ b/lily/horizontal-bracket-engraver.cc
@@ -94,7 +94,7 @@ Horizontal_bracket_engraver::process_music ()
{
Spanner *sp = make_spanner ("HorizontalBracket",
events_[k]->self_scm ());
- Spanner *hbt = make_spanner ("HorizontalBracketText",
events_[k]->self_scm ());
+ Spanner *hbt = make_spanner ("HorizontalBracketText", sp->self_scm
());
sp->set_object ("bracket-text", hbt->self_scm ());
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel