diff options
author | Benkő Pál <benko.pal@gmail.com> | 2012-09-07 19:39:21 +0200 |
---|---|---|
committer | Benkő Pál <benko.pal@gmail.com> | 2012-09-17 20:20:27 +0200 |
commit | 022af0522a3409299d908365b679a6df71f93b4f (patch) | |
tree | b53828ec9c426656560aa704749c7165e7326d0c /input | |
parent | 6f5b323d446706a1f98414eacc3d899a0f1cc691 (diff) |
new regtests for dots of a repeat sign
- test default tablature
- test set-global-staff-size and layout-set-staff-size combinations
in default and extreme circumstances to make sure that real world
usage is not hindered
Diffstat (limited to 'input')
-rw-r--r-- | input/regression/repeat-sign-global-size-10.ly | 22 | ||||
-rw-r--r-- | input/regression/repeat-sign-global-size-30.ly | 18 | ||||
-rw-r--r-- | input/regression/repeat-sign-global-size-5.ly | 53 | ||||
-rw-r--r-- | input/regression/repeat-sign-layout-size.ly | 8 | ||||
-rw-r--r-- | input/regression/repeat-sign.ly | 37 | ||||
-rw-r--r-- | input/regression/tablature-repeat.ly | 15 |
6 files changed, 131 insertions, 22 deletions
diff --git a/input/regression/repeat-sign-global-size-10.ly b/input/regression/repeat-sign-global-size-10.ly index 130a37f88a..3fea78a4a8 100644 --- a/input/regression/repeat-sign-global-size-10.ly +++ b/input/regression/repeat-sign-global-size-10.ly @@ -10,31 +10,39 @@ Test set-global-staff size 10 (with layout-set-staff-size)." \score { << \context Staff = "s1" \with { - \override StaffSymbol #'line-positions = #'(-4 -2 0 2) - \override StaffSymbol #'staff-space = #0.7 + \override StaffSymbol #'staff-space = #0.6 } { s1 \bar ":|" } \context Staff = "s2" \with { - \override StaffSymbol #'staff-space = #0.6 + \override StaffSymbol #'line-positions = #'(-4 -2 0 2) + \override StaffSymbol #'staff-space = #0.7 } { s1 \bar ":|" } + + \context Staff = "s3" { + s1 \bar ":|" + } >> } \score { << - \context Staff = "s1" \with { - \override StaffSymbol #'staff-space = #1.6 - } { + \context Staff = "s1" { s1 \bar ":|" } \context Staff = "s2" \with { \override StaffSymbol #'staff-space = #1.7 - \override StaffSymbol #'line-count = #4 + \override StaffSymbol #'line-positions = #'(-4 -2 0 2) + } { + s1 \bar ":|" + } + + \context Staff = "s3" \with { + \override StaffSymbol #'staff-space = #3 } { s1 \bar ":|" } diff --git a/input/regression/repeat-sign-global-size-30.ly b/input/regression/repeat-sign-global-size-30.ly index e7c404f0fa..f3ac22d60a 100644 --- a/input/regression/repeat-sign-global-size-30.ly +++ b/input/regression/repeat-sign-global-size-30.ly @@ -21,20 +21,28 @@ Test set-global-staff size 30 (with layout-set-staff-size)." } { s1 \bar ":|" } + + \context Staff = "s3" { + s1 \bar ":|" + } >> } \score { << - \context Staff = "s1" \with { - \override StaffSymbol #'staff-space = #0.25 - } { + \context Staff = "s1" { s1 \bar ":|" } \context Staff = "s2" \with { - \override StaffSymbol #'staff-space = #0.2 - \override StaffSymbol #'line-count = #4 + \override StaffSymbol #'staff-space = #0.33 + } { + s1 \bar ":|" + } + + \context Staff = "s3" \with { + \override StaffSymbol #'staff-space = #0.33 + \override StaffSymbol #'line-positions = #'(-4 -2 0 2) } { s1 \bar ":|" } diff --git a/input/regression/repeat-sign-global-size-5.ly b/input/regression/repeat-sign-global-size-5.ly new file mode 100644 index 0000000000..cccfd56892 --- /dev/null +++ b/input/regression/repeat-sign-global-size-5.ly @@ -0,0 +1,53 @@ +\version "2.17.2" +\header { + texidoc = "The two dots of a repeat sign should be symmetric +to the staff centre and avoid staff lines even for exotic staves. +Test set-global-staff size 10 (with layout-set-staff-size)." +} + +#(set-global-staff-size 5) + +\score { + << + \context Staff = "s1" \with { + \override StaffSymbol #'staff-space = #0.7 + } { + s1 \bar ":|" + } + + \context Staff = "s2" \with { + \override StaffSymbol #'line-positions = #'(-4 -2 0 2) + } { + s1 \bar ":|" + } + + \context Staff = "s3" { + s1 \bar ":|" + } + >> +} + +\score { + << + \context Staff = "s1" { + s1 \bar ":|" + } + + \context Staff = "s2" \with { + \override StaffSymbol #'staff-space = #3 + \override StaffSymbol #'line-positions = #'(-4 -2 0 2) + } { + s1 \bar ":|" + } + + \context Staff = "s3" \with { + \override StaffSymbol #'staff-space = #6 + } { + s1 \bar ":|" + } + >> + + \layout { + #(layout-set-staff-size 30) + } +} diff --git a/input/regression/repeat-sign-layout-size.ly b/input/regression/repeat-sign-layout-size.ly index 2cc5988a7d..0856984dd7 100644 --- a/input/regression/repeat-sign-layout-size.ly +++ b/input/regression/repeat-sign-layout-size.ly @@ -18,6 +18,10 @@ Test layout-set-staff-size." } { s1 \bar ":|" } + + \context Staff = "s3" { + s1 \bar ":|" + } >> \layout { @@ -39,5 +43,9 @@ Test layout-set-staff-size." } { s1 \bar ":|" } + + \context Staff = "s3" { + s1 \bar ":|" + } >> } diff --git a/input/regression/repeat-sign.ly b/input/regression/repeat-sign.ly index 01775e2922..b40c08d590 100644 --- a/input/regression/repeat-sign.ly +++ b/input/regression/repeat-sign.ly @@ -43,7 +43,7 @@ mus = \context Voice { \relative f' { d e f g \bar ":|" } } } \new Staff \with { - \override StaffSymbol #'line-positions = #'(-7 -4) + \override StaffSymbol #'line-positions = #'(-8 -4) } { << \clef french @@ -53,45 +53,44 @@ mus = \context Voice { \relative f' { d e f g \bar ":|" } } } \new Staff \with { - \override StaffSymbol #'staff-space = #1.5 \override StaffSymbol #'line-positions = #'(-2 0) + \override StaffSymbol #'staff-space = #1.5 } { << \mus - \context Voice { s1^"as wide as previous" } + \context Voice { s1^"widened by staff-space" } >> } \new Staff \with { - \override StaffSymbol #'line-positions = #'(-2.9 -2) + \override StaffSymbol #'line-positions = #'(-2 0) } { << \mus - \context Voice { s1^"narrow staff" } + \context Voice { s1^"dots outside" } >> } \new Staff \with { - \override StaffSymbol #'line-positions = #'(-4 -3 -2) + \override StaffSymbol #'line-positions = #'(-2.9 -2) } { << \mus - \context Voice { s1^"dense staff" } + \context Voice { s1^"narrow staff" } >> } \new Staff \with { \override StaffSymbol #'line-positions = #'(-4 -3 -2) - \override StaffSymbol #'staff-space = #0.8 } { << \mus - \context Voice { s1^"denser staff" } + \context Voice { s1^"dense staff" } >> } \new Staff \with { - \override StaffSymbol #'line-positions = #'(-6 -2 0 5) + \override StaffSymbol #'line-positions = #'(-6 -5 -2 0 3 5) } { << \mus @@ -110,6 +109,24 @@ mus = \context Voice { \relative f' { d e f g \bar ":|" } } } \new Staff \with { + \override StaffSymbol #'line-positions = #'(-10 -2 6 14) +} { + << + \mus + \context Voice { s1^"dots in outer spaces" } + >> +} + +\new Staff \with { + \override StaffSymbol #'line-positions = #'(-5 -4 -2 2 4 6) +} { + << + \mus + \context Voice { s1^"dots in the middle" } + >> +} + +\new Staff \with { \override StaffSymbol #'thickness = #4 } { << diff --git a/input/regression/tablature-repeat.ly b/input/regression/tablature-repeat.ly new file mode 100644 index 0000000000..fc3d8a94e5 --- /dev/null +++ b/input/regression/tablature-repeat.ly @@ -0,0 +1,15 @@ +\header +{ + texidoc = "How a repeat sign looks in tablature." +} + +\version "2.17.2" +\paper +{ + ragged-right = ##t +} + +\new TabStaff +{ + \repeat volta 2 s1 +} |