From f120ad5d2b42aa7078d248df3213f6520ddc165b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 18 Sep 2003 23:23:14 +0000 Subject: [PATCH] *** empty log message *** --- .../{allfontstyle.ly => allfontstyle.lyinc} | 0 input/regression/arpeggio-bracket.ly | 20 ++++++++++ input/regression/arpeggio-collision.ly | 38 ++----------------- input/regression/arpeggio.ly | 18 ++++----- input/regression/size11.ly | 2 +- input/regression/size13.ly | 2 +- input/regression/size16.ly | 2 +- input/regression/size20.ly | 2 +- input/regression/size23.ly | 2 +- input/regression/size26.ly | 2 +- 10 files changed, 39 insertions(+), 49 deletions(-) rename input/regression/{allfontstyle.ly => allfontstyle.lyinc} (100%) create mode 100644 input/regression/arpeggio-bracket.ly diff --git a/input/regression/allfontstyle.ly b/input/regression/allfontstyle.lyinc similarity index 100% rename from input/regression/allfontstyle.ly rename to input/regression/allfontstyle.lyinc diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly new file mode 100644 index 0000000000..cef27558f5 --- /dev/null +++ b/input/regression/arpeggio-bracket.ly @@ -0,0 +1,20 @@ + + +\version "1.9.7" +\header{ +texidoc=" +A square bracket on the left indicates that the player should not +arpeggiate the chord. +" +} + +\score{ + \notes\relative c''{ + \property Staff.Arpeggio \override #'molecule-callback = \arpeggioBracket + + \arpeggio + } + + \paper { raggedright= ##t } +} + diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index 8e335b282a..d177748ca3 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -1,44 +1,14 @@ -#(ly:set-option 'old-relative) \version "1.9.4" \header { -texidoc = "Arpeggio stays clear of accidentals and flipped note heads. -Since Arpeggio engraver is Voice, it does nothing for voice collisions." +texidoc = "Arpeggio stays clear of accidentals and flipped note heads." } -hairyChord = \context Staff \notes\relative c' << - \new Voice { - \property Voice.Stem \override #'direction = #1 - \property Voice.NoteColumn \override #'horizontal-shift = #0 - e4\arpeggio - } - - \new Voice { - \property Voice.Stem \override #'direction = #1 - \property Voice.NoteColumn \override #'horizontal-shift = #1 - cis\arpeggio - } - - \new Voice { - \property Voice.Stem \override #'direction = #1 - \property Voice.NoteColumn \override #'horizontal-shift = #2 - ais\arpeggio - } - - \new Voice { - \property Voice.Stem \override #'direction = #-1 - \property Voice.NoteColumn \override #'horizontal-shift = #-1 - fis\arpeggio - } ->> - - \score{ \notes \transpose c c' { - < fis'' g d a >\arpeggio - < fis, g d a >\arpeggio - < fis'' g d a >\arpeggio - \hairyChord + \arpeggio + \arpeggio + \arpeggio } \paper { raggedright = ##t diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index 26fd62f56c..b8f95cfbb7 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -9,20 +9,20 @@ Arpeggios are supported, both cross-staff and broken single staff. \score{ - \context PianoStaff << - \new Staff \notes\relative c''{ - \context Voice < fis, d a >\arpeggio + \context PianoStaff\notes << + \new Staff \relative c''{ + \arpeggio \property Staff.Arpeggio \override #'arpeggio-direction = #1 - \context Voice < fis, d a >\arpeggio + \arpeggio %%\property PianoStaff.SpanArpeggio \override #'connect = ##t \property PianoStaff.connectArpeggios = ##t - \arpeggio + \arpeggio } - \new Staff \notes\relative c{ + \new Staff\relative c{ \clef bass - \context Voice < g b d >\arpeggio - \property Staff.Arpeggio \override #'arpeggio-direction = #-1 - \context Voice < g b d >\arpeggio + \arpeggio + \property Staff.Arpeggio \override #'arpeggio-direction = #-1 + \arpeggio \arpeggio } >> diff --git a/input/regression/size11.ly b/input/regression/size11.ly index c2eb7ddfde..d3c45a6055 100644 --- a/input/regression/size11.ly +++ b/input/regression/size11.ly @@ -15,4 +15,4 @@ foollilypondbook = " \include "paper11.ly" -\include "allfontstyle.ly" +\include "allfontstyle.lyinc" diff --git a/input/regression/size13.ly b/input/regression/size13.ly index 02c156191e..69c02e7b38 100644 --- a/input/regression/size13.ly +++ b/input/regression/size13.ly @@ -8,4 +8,4 @@ foollilypondbook = " } \include "paper13.ly" -\include "allfontstyle.ly" +\include "allfontstyle.lyinc" diff --git a/input/regression/size16.ly b/input/regression/size16.ly index e776b0bf72..1062cfea24 100644 --- a/input/regression/size16.ly +++ b/input/regression/size16.ly @@ -10,4 +10,4 @@ foollilypondbook = " \include "paper16.ly" -\include "allfontstyle.ly" +\include "allfontstyle.lyinc" diff --git a/input/regression/size20.ly b/input/regression/size20.ly index 35ffafafb3..0b7f457ce8 100644 --- a/input/regression/size20.ly +++ b/input/regression/size20.ly @@ -10,4 +10,4 @@ foollilypondbook = " \include "paper20.ly" -\include "allfontstyle.ly" +\include "allfontstyle.lyinc" diff --git a/input/regression/size23.ly b/input/regression/size23.ly index 5462cd3c3f..ed09fe2f3e 100644 --- a/input/regression/size23.ly +++ b/input/regression/size23.ly @@ -9,4 +9,4 @@ foollilypondbook = " \include "paper23.ly" -\include "allfontstyle.ly" +\include "allfontstyle.lyinc" diff --git a/input/regression/size26.ly b/input/regression/size26.ly index 90380143ab..3bc653c6a0 100644 --- a/input/regression/size26.ly +++ b/input/regression/size26.ly @@ -10,4 +10,4 @@ foollilypondbook = " \include "paper26.ly" -\include "allfontstyle.ly" +\include "allfontstyle.lyinc" -- 2.39.5