From 1d29117649b9c635e6fda19a6c3003f5f31770f8 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 12 Aug 2002 10:44:56 +0000 Subject: [PATCH] * VERSION: 1.5.72 released * lily/lily-guile.cc (to_dir): return CENTER if not a direction. * lily/include/grob.hh: remove remove_grob_property() * lily/stem-engraver.cc (stop_translation_timestep): remove dir-forced grob property --- ChangeLog | 11 +- Documentation/user/glossary.tely | 4 +- VERSION | 4 +- input/GNUmakefile | 2 +- input/SondagMorgen/SondagMorgen.ly | 194 ---- input/SondagMorgen/SondagMorgenFolded.ly | 10 - input/SondagMorgen/SondagMorgenIntro.ly | 170 --- input/SondagMorgen/SondagMorgenLyrics.ly | 66 -- input/SondagMorgen/SondagMorgenNotes.ly | 981 ------------------ input/SondagMorgen/SondagMorgenOmkvaed.ly | 218 ---- .../SondagMorgen/SondagMorgenOmkvaedVolta1.ly | 139 --- input/SondagMorgen/SondagMorgenUnfolded.ly | 15 - input/SondagMorgen/SondagMorgenVers.ly | 313 ------ input/SondagMorgen/SondagMorgenVersVolta1.ly | 89 -- input/SondagMorgen/SondagMorgenVersVolta2.ly | 93 -- .../{auto-knee.ly => beam-auto-knee.ly} | 0 ...sknee.ly => beam-cross-staff-auto-knee.ly} | 16 +- lily/beam.cc | 46 +- lily/grob-property.cc | 15 - lily/include/grob.hh | 2 - lily/lily-guile.cc | 2 +- lily/note-collision.cc | 2 +- lily/score-engraver.cc | 2 +- lily/script-column.cc | 2 +- lily/side-position-interface.cc | 4 +- lily/spaceable-grob.cc | 6 +- lily/stem-engraver.cc | 18 - lily/stem.cc | 4 +- scm/grob-property-description.scm | 1 - 29 files changed, 49 insertions(+), 2380 deletions(-) delete mode 100644 input/SondagMorgen/SondagMorgen.ly delete mode 100644 input/SondagMorgen/SondagMorgenFolded.ly delete mode 100644 input/SondagMorgen/SondagMorgenIntro.ly delete mode 100644 input/SondagMorgen/SondagMorgenLyrics.ly delete mode 100644 input/SondagMorgen/SondagMorgenNotes.ly delete mode 100644 input/SondagMorgen/SondagMorgenOmkvaed.ly delete mode 100644 input/SondagMorgen/SondagMorgenOmkvaedVolta1.ly delete mode 100644 input/SondagMorgen/SondagMorgenUnfolded.ly delete mode 100644 input/SondagMorgen/SondagMorgenVers.ly delete mode 100644 input/SondagMorgen/SondagMorgenVersVolta1.ly delete mode 100644 input/SondagMorgen/SondagMorgenVersVolta2.ly rename input/regression/{auto-knee.ly => beam-auto-knee.ly} (100%) rename input/regression/{auto-isknee.ly => beam-cross-staff-auto-knee.ly} (57%) diff --git a/ChangeLog b/ChangeLog index 688d51e9c7..3fcb6045e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,16 @@ 2002-08-12 Han-Wen Nienhuys + * VERSION: 1.5.72 released + + * lily/lily-guile.cc (to_dir): return CENTER if not a direction. + + * lily/include/grob.hh: remove remove_grob_property() + + * lily/stem-engraver.cc (stop_translation_timestep): remove + dir-forced grob property + * Documentation/user/refman.itely (Grace notes): explain grace - after main note. + after main note. * input/test/ : small convert-ly mishaps. diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely index 6d25a07f78..cc92f3aa5d 100644 --- a/Documentation/user/glossary.tely +++ b/Documentation/user/glossary.tely @@ -144,8 +144,8 @@ N: andante. walking tempo/character @item appoggiatura -ES: apoyatura, I: appoggiatura, F: appogiature, (port de voix), D: Vorschlag, NL: voorslag, -DK: forslag, S: f@"orslag, N: +ES: apoyatura, I: appoggiatura, F: appogiature, (port de voix), +D: Vorschlag, NL: voorslag, DK: forslag, S: f@"orslag, N: Ornamental note, usually a second, that is melodically connected with the main note that follows it. In music before the 19'th century a. were usually diff --git a/VERSION b/VERSION index 57aed782e0..0011bd5b13 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 -PATCH_LEVEL=71 -MY_PATCH_LEVEL=jcn2 +PATCH_LEVEL=72 +MY_PATCH_LEVEL= # Use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/GNUmakefile b/input/GNUmakefile index 6931442c2b..96a399cfa5 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -1,6 +1,6 @@ depth = .. -SUBDIRS=test regression tutorial no-notation ascii-art template mutopia +SUBDIRS=test regression tutorial no-notation ascii-art template mutopia sondag-morgen # nereides is tweaked a lot, can't do (read webpage) examples=trip star-spangled-banner paddy twinkle font20 diff --git a/input/SondagMorgen/SondagMorgen.ly b/input/SondagMorgen/SondagMorgen.ly deleted file mode 100644 index 3e59a8c8dc..0000000000 --- a/input/SondagMorgen/SondagMorgen.ly +++ /dev/null @@ -1,194 +0,0 @@ -\version "1.5.68" -\include "paper13.ly" - -mu = {} -ac = \accent -su = \translator Staff = up -sd = \translator Staff = down -\include "SondagMorgenLyrics.ly" -\include "SondagMorgenFolded.ly" - -\include "deutsch.ly" -\header { - title = "Søndag Morgen" - composer = "Van Morrison (Moon Dance)\\\\Rune Zedeler 2002.06.20" - piece = "Score" - tagline = "\\Large{Form: Intro Vers$_1$ Vers$_2$ Omkvæd Vers$_1$ Omkvæd Omkvæd Outro }" -} -\score { - \notes < - \property Score.automaticMelismata = ##t - \property Score.TimeSignature \override #'style = #'() - \context Lyrics=marks { \marks } - \context Lyrics = akk \akk - \context StaffGroup = melo < - \context Lyrics = korlyr { "" } - \context Staff=mel < - \clef "G_8" - \property Staff.instrument = #'(lines "Kor" "Lead") - \property Staff.instr = "voc" - { s1*8 \break } - \global - < - \addlyrics - \context Voice = kor < - \voiceOne - \property Voice.MultiMeasureRest \override #'transparent = ##t - \transpose c \kormel - > - \context Lyrics=korlyr \korlyr - > - < - \addlyrics - \context Voice = mel < - \voiceTwo - \transpose c \mel - > - \context Lyrics=lyr \lyr - > - - > - > - \context StaffGroup = sax < - \context Staff = sax < - \property Staff.instrument = #'(lines "Sop. sax" "Alt sax" "Ten. sax") - \property Staff.instr = "sax" - \clef "G" - \global - \context Voice = sop < \voiceOne \sopsax > - \context Voice = alt < \voiceFour \altsax > - \context Voice = ten < \voiceTwo \tensax > - > - > - \context StaffGroup = akk < - \context PianoStaff = pia < - \property GrandStaff.instrument = "Piano " - \property GrandStaff.instr = "pia " - \context Staff = up < - \clef "G" - \global - \context Voice \piar - > - \context Staff = down < - \global - \context Voice \pial - > - - > - \context TabStaff=gui < - \property Staff.instrument = "Guitar " - \property Staff.instr = "gt " - \context TabVoice \guitar - > - \context Staff = cello < - \property Staff.instrument = "Cello" - \property Staff.instr = "cel" - \clef "F" - \global - \context Voice \cello - > - \context Staff = bas < - \property Staff.instrument = "Bas" - \property Staff.instr = "bas" - - \clef "F_8" - \global - \transpose c \bas - > - \context Staff = drums < - \property Staff.instrument = "Trommer" - \property Staff.instr = "tr" - \clef "percussion" - \global - \apply #(drums->paper 'drums) < - \context Voice=hi { \voiceOne \drhi } - \context Voice=lo { \voiceTwo \drlo } - > - > - > - > - \paper { - % linewidth = 26.5\cm - % textheight = 38.0\cm - linewidth = 18.8\cm - indent = 1.0\cm - \translator { - \TabStaffContext - \remove "Key_engraver" - \consists "Rest_engraver" - } - \translator { - \GrandStaffContext - \accepts "TabStaff" - \consists "Instrument_name_engraver" - } - \translator { - \ScoreContext - BarNumber \override #'padding = #2.0 - } - \translator { - \StaffContext - minimumVerticalExtent = #'(-4.0 . 4.0) - \remove "Piano_pedal_engraver" - } - \translator { - \PianoStaffContext - VerticalAlignment \override #'forced-distance = #10 - } - } - -} - - -mu = \p -ac = \f -su = {} -sd = {} -\include "SondagMorgenUnfolded.ly" -\include "deutsch.ly" - -\score { - \apply #unfold-repeats - \notes < - \context Staff = lead < - \property Staff.instrument = "drawbar organ" - \context Voice < \mel s1\ff > - > - \context Staff = sopsax < - \property Staff.instrument = "soprano sax" - \sopsax - > - \context Staff = altsax < - \property Staff.instrument = "alto sax" - \altsax - > - \context Staff = tensax < - \property Staff.instrument = "tenor sax" - \tensax - > - \context Staff = pia < - \property Staff.instrument = "electric grand" - \piar \pial - > - \context Staff = gt < - \property Staff.instrument = "electric guitar (clean)" - \guitar - > - \context Staff = cel < - \property Staff.instrument = "cello" - \cello - > - \context Staff = bas < - \property Staff.instrument = "electric bass (finger)" - < \transpose c \bas s1-\ff > - > - \context Staff = trom < - \property Staff.instrument = "drums" - \drhi \drlo - > - - - > - \midi { \tempo 4 = 128 } -} - diff --git a/input/SondagMorgen/SondagMorgenFolded.ly b/input/SondagMorgen/SondagMorgenFolded.ly deleted file mode 100644 index 13dc5c91ee..0000000000 --- a/input/SondagMorgen/SondagMorgenFolded.ly +++ /dev/null @@ -1,10 +0,0 @@ -\version "1.5.68" -\include "SondagMorgenIntro.ly" -\include "SondagMorgenVers.ly" -\include "SondagMorgenVersVolta1.ly" -\include "SondagMorgenVersVolta2.ly" -\include "SondagMorgenOmkvaed.ly" -\include "SondagMorgenOmkvaedVolta1.ly" -\include "SondagMorgenOmkvaedVolta2.ly" -\include "SondagMorgenOmkvaedVolta3.ly" -\include "SondagMorgenOutro.ly" diff --git a/input/SondagMorgen/SondagMorgenIntro.ly b/input/SondagMorgen/SondagMorgenIntro.ly deleted file mode 100644 index 51ee1f1430..0000000000 --- a/input/SondagMorgen/SondagMorgenIntro.ly +++ /dev/null @@ -1,170 +0,0 @@ -\version "1.5.68" -\include "deutsch.ly" - -marks = \lyrics { - "\large\framebox{\bf{INTRO}}"1*12 -} - -ned = \downbow -op = \upbow - -#(define meter '(rows (music "noteheads-2" ((kern . -0.1) "flags-stem")) " = 128")) - -global = \notes { - s8 - \mark #meter - s2.. - s1*11 -} - -akk = \lyrics { - "Em7"1 "Hm7" "Em7" "Hm7" "Em7" "Hm7" - "Em7"1 "Hm7" "Em7" "Hm7" "Em7" "Hm7" -} - -mel = \notes \relative g' { - \time 2/2 - \key e \minor - R1*4 - g2 ~ g8 a g fis ~ | - fis h,2.. | - e1 | - fis2. r4 | - g2 ~ g8 a g fis ~ | - fis h,2.. | - e1 | - fis2 - - r8 d8 [g a] | -} - -kormel = \notes \relative g' { - \time 2/2 - \key e \minor - R1*4 - h2.. a8 ~ | - a d,2.. | - g1 | - d2. r4 | - h'2.. a8 ~ | - a d,2.. | - g1 | - d2 R2 | -} - -sopsax = \notes \relative c''' { - % INTRO - \key e \minor - \time 2/2 - r2 g(-\p fis d )h1~h1 - h2.. a8~ a fis2.. | - g2( a )a2 d | - h2.. a8 ~ a fis2.. | - g2( a )a2 r2 -} -altsax = \notes \relative c'' { - % INTRO - \key e \minor - \time 2/2 - r1 r1 r1 r1 - g2-\p~g8 a g fis ~ fis d2..| - e2( g )fis a | - g2~g8 a g fis ~ fis d2..| - e2( g )fis r2 -} -tensax = \notes \relative c'' { - % INTRO - \key e \minor - \time 2/2 - r1 r1 r2 g-\p( fis d - )e2.. d8 ~ d h2.. | - h2( d )d d | - e2.. d8 ~ d h2.. | - h2( d )d r -} - -piar = \notes \relative c' { - \time 2/2 - \key e \minor - % a1*0-\p - \repeat unfold 2 { - - R1 - fis8( g d' fis, g d' fis, )g | - - R1 - } - \alternative { - { fis8( g d' fis, g d' fis, )g | } - { fis8( g d' fis, g d fis )a | } - } - -} -U = \sustainUp -D = \sustainDown -pial = \notes { - \clef "F" - \property Staff.SustainPedal \override #'pedal-type = #'mixed - \relative c { - \time 2/2 - \key e \minor - \repeat unfold 2 { - - - - - - - s8 \U - } - } -} -guitar = \notes \transpose c' { - \time 2/2 - \key e \minor - \property Staff.Arpeggio \override #'arpeggio-direction = #1 - g'8-5_"FLANGE" fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - -} - -cello = \notes \relative c { - \time 2/2 - \key e \minor - e1 d2( fis g h d fis )e1 fis2( d - )e1 d2( h g e fis d )e1 h -} - -bas = \notes { - \time 2/2 - \key e \minor - \repeat unfold 2 { - e2 r8 a,4 h,8 ~ | - h,2 r8 a h4 | - e2 r8 a,4 h,8 | - r h a fis a h g4 | - e2 r8 d4 h,8 ~ | - h,2 r2 - } -} - -\include "drumpitch-init.ly" -drhi = \notes { - \time 2/2 - \repeat percent 12 { cymr2 cymr } | - -} -drlo = \notes { - \time 2/2 - s1*12 -} diff --git a/input/SondagMorgen/SondagMorgenLyrics.ly b/input/SondagMorgen/SondagMorgenLyrics.ly deleted file mode 100644 index 1185994d41..0000000000 --- a/input/SondagMorgen/SondagMorgenLyrics.ly +++ /dev/null @@ -1,66 +0,0 @@ -\version "1.5.68" -lyr = \lyrics { - \context LyricsVoice = va { - Nu er det søn -- dag, - uh, wah, - fug -- le -- ne kvid -- rer, - uh, wah, - } - < - \context LyricsVoice = va { - Nu er det søn -- dag og folk de er gla -- de, - de har fri ef -- ter u -- gen der gik. - Jeg sku' ta -- ge til stran -- den og ba -- de, - men jeg sve -- der i tysk gra -- ma -- tik. - Min eng -- elsk -- læ- rer si'r jeg bør dum -- pe - og fy -- sik -- ken den sort -- ner som blæk. - I gym -- na -- si -- et er jeg en tum -- pe, - som der ik -- ke kan fat -- te et kvæk. - På ba -- re kvæk. - } - \context LyricsVoice = vb { - "" "" "" seks da -- ge skab -- te Han ver -- den, - syv' -- nde dag slap -- ped' Ska -- be -- ren af. - Men som var jeg prin -- ses -- sen på ær -- ten, - er jeg gul, grøn og blå i min bag. - Mit vær'l -- se lig -- ner et bom -- bet lo -- kum, - og jeg fø -- ler mig selv li -- ge så. - Jeg er træt af det fuc -- king gym -- na -- sium, - hvor jeg alt -- så er nødt til at "" "" "" "" gå! - } - > - \context LyricsVoice = va { - Hvor -- for kan jeg ik -- ke - ba -- re slap -- pe af når det er søn -- dag i dag? - Jeg tror at jeg krad -- ser af - hvis ikk' jeg ta'r den lidt med ro! - Hvor -- for kan jeg ik -- ke - ba -- re hol -- de fri på den -- ne søn -- dag i dag? - - Jeg tror at jeg krad -- ser af... Nu er det - - Jeg kan da ikk' hol -- de ud at sid -- de her når det er - søn -- dag, søn -- dag, søn -- dag, søn -- dag, åh, søn -- dag, - søn -- dag. Hvor -- for - - Jeg tror at jeg krad -- ser af hvis ikk' jeg ta'r den lidt med ro... - - Nu er det søn -- dag, - uh, wah, - fug -- le -- ne kvid -- rer, - uh. - } -} - -korlyr = \lyrics { - Uh søn -- dag, uh, wah, - uh, kvid -- rer, uh, wah. - "" "" "" "" "" "" "" "" "" - "" "" "" "" "" "" "" "" "" "" - "" "" "" "" "" "" "" - "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" - Uh søn -- dag, uh, wah, - uh, kvid -- rer, uh. - -} - diff --git a/input/SondagMorgen/SondagMorgenNotes.ly b/input/SondagMorgen/SondagMorgenNotes.ly deleted file mode 100644 index 2dccd0e512..0000000000 --- a/input/SondagMorgen/SondagMorgenNotes.ly +++ /dev/null @@ -1,981 +0,0 @@ -\version "1.5.68" -\include "deutsch.ly" - -marks = \lyrics { - "\large\framebox{\bf{INTRO}}"1*12 - "\large\framebox{\bf{VERS}}"1*7/8*16 ""2 ""1 - "\large\framebox{\bf{OMKVÆD}}"1*26 - "\large\framebox{\bf{OUTRO}}"1 -} - -ned = \downbow -op = \upbow - -#(define meter '(rows (music "noteheads-2" ((kern . -0.1) "flags-stem")) " = 125")) - -global = \notes { - \global - s8 - \mark #meter - s2.. - s1*11 - \mark #'(music "scripts-segno") - \bar "|:" - s4*54 - \property Score.repeatCommands = #'((volta "1")) - s1 - \property Score.repeatCommands = #'((volta #f)(volta "2, 3")) - \bar ":|" - s1 - \property Score.repeatCommands = #'((volta #f)) - \bar ".|" - % OMKVÆD - s1*11 - \property Score.repeatCommands = #'((volta "1")) - s1*4 s2.. - \mark #'(rows "D. S. " (music "scripts-segno")) - %\mark "D. S." - s8 - \bar "|." - \property Score.repeatCommands = #'((volta #f)(volta "2")) - s1*9 - \property Score.repeatCommands = #'((volta #f)(volta "3")) - \bar ":|" - s1*1 - \property Score.repeatCommands = #'((volta #f)) - \bar ".|" - s1*11 - \bar "|." -} - -akk = \lyrics { - \akk - "Em7"1 "Hm7" "Em7" "Hm7" "Em7" "Hm7" - "Em7"1 "Hm7" "Em7" "Hm7" "Em7" "Hm7" - - "Gm7"4. "Dm7"2 - "Cm7"4. ""4 "Dm7"4 - "Gm7"4. "Dm7"2 - "Cm7"4. ""4 "Dm7"4 - "Gm7"4. "Dm7"2 - "Cm7"4. ""4 "Dm7"4 - "E$\\flat\\Delta$"4. "F6"2 - "D11"8*7 "D/fis"4 - "G"4. "D"2 - "C$\\Delta$"4. ""4 "D" - "G"4. "D"2 - "C$\\Delta$"4. ""4 "D" - "Em7"4. "Hm7"2 - "Am9"4. ""4 "Hm7" - "C$\\Delta$"2 "Am9" - "D11"1 - "H+9$\\sharp$" - - % OMKVÆD - "Em7"2 "G$\\Delta$" "A11" "H11" - "Em7"2 "G$\\Delta$" "A11" "H11" - "Em7"2 "G$\\Delta$" "A11" "H11" - "Em7"2 "G$\\Delta$" "A11" "H11" - "Em7"2 "G$\\Delta$" "A11" "H11" - "Em7"2 "G$\\Delta$" - "A11"2 "H11" - "Em7" "G$\\Delta$" "Am7"1 "Dsus4" "D" - "A11"2 "H11" - "Em7" "G$\\Delta$" "A11" "H11" - "C$\\Delta$"1 "D6" "Am9" "Hm7" "C$\\Delta$"1 "H9$\\sharp$" - "A11"2 "H11" - - %OUTRO - "Em7"2 "G"2 "Hm7"1 "Em7" "Hm7" "Em7" "Hm7" - "Em7"1 "Hm7" "Em7" "Hm7" "Em7" - - -} - - -mel = \notes \relative g' { - \mel - \time 2/2 - \key e \minor - R1*4 - g2 ~ g8 a g fis ~ | - fis h,2.. | - e1 | - fis2. r4 | - g2 ~ g8 a g fis ~ | - fis h,2.. | - e1 | - fis2 - - r8 d8 [g a] | - \time 7/8 - \key g \minor - [b a g] a4 [g8 f] | - g4 d8 g4 a | - b4 a8 [g a] [g f] | - g4. r8 g a4 | - [b8 a g] a4 [g8 f] | - g4 d8 g4 a | - [b8 a g] a4 [g8 f]| - \time 9/8 - g4. r4 r8 d [g a] | - \time 7/8 - \key g \major - [h8 a g] a4 d | - h g8 g4 a | - h4 a8 [g a] [h d] | - g,4. r8 g a4 | - [h8 a g] a4 [h8 d] | - h4 g8 g4 a | - \time 4/4 - \repeat unfold 2 \times 2/3 { h4 a g }| - a2 r8 d,8 [g a] | - h2 - - % OMKVÆD - r8 e4 d8 ~ | - \key e \minor - d8 h4 e8~e h g a ~| - a g a g a b a g | - h4 e, r8 e4 e8 | - r2 - r8 e'4 d8 ~ | - d8 h4 e8~e h g a ~| - a b a g a b a g | - h2 r2 | - r2 - r8 e4 d8 ~ | - d8 h4 e8~e h g a ~| - a g a g a b a g | - h4 e, r8 e4 e8 | - - r2 r8 e'4 d8 ~ | - d8 h4 e8~e h g a ~| - a1 ~ | - a1 ~ | - a2 r8 d, g a - - r2 r8 e'4 d8 ~ | - d8 h4 e8~e h g a ~| - a g a g a g a g | - h4. e,8~e2 | - h'4. e,8~e2 | - h'4. e,8~e2 | - h'4. d8~d4 c | - h4. e,8~e2 | - h'4 h r8 e4 d8 | - - r2 r8 e4 d8 ~ | - - % OUTRO - \time 2/2 - d8 h4 e8~e h g a ~| - a b a g a b a g | - e1 - R1 - g2 ~ g8 a g fis ~ | - fis h,2.. | - e1 | - fis2. r4 | - g2 ~ g8 a g fis ~ | - fis h,2.. | - e1 | - - -} - -kormel = \notes \relative g' { - \kormel - \time 2/2 - \key e \minor - R1*4 - h2.. a8 ~ | - a d,2.. | - g1 | - d2. r4 | - h'2.. a8 ~ | - a d,2.. | - g1 | - d2 R2 | - \time 7/8 - R1*7/8*5 | - r4 r8 b'4 c | - [d8 c b] c4 [b8 c] | - \time 9/8 - d4. R4 R4 R4 - \time 7/8 - R1*7/8*5 | - r4 r8 h4 c | - \time 4/4 - \repeat unfold 2 \times 2/3 {d4 c h} - d2 R2 - cisis2 R2 - % OMKVÆD - \key e \minor - R1*11 - r2 r8 e4 d8~ - d h4 e8~e d h d~ - d1~d1~d2 r2 - R1*2 - r2 r8 e e e - \repeat unfold 5 { e4. e8~e2 } - cisis4 cisis r2 - R1 - \time 2/2 - R1*4 - h2.. a8 ~ | - a d,2.. | - g1 | - d2. r4 | - h'2.. a8 ~ | - a d,2.. | - g1 | - -} - -sopsax = \notes \relative c''' { - \sopsax - % INTRO - \key e \minor - \time 2/2 - r2 g(-\p fis d )h1~h1 - h2.. a8~ a fis2.. | - g2( a )a2 d | - h2.. a8 ~ a fis2.. | - g2( a )a2 r2 - % VERS - \context Voice=sax { - \key g \minor - \time 7/8 - s1*0_"1 $\\times$ tacet" R1*7/8 - r4. g4-\mf a | - b4. r2 | - R1*7/8*2 - r4. b4 c | - d4. \< d4 d | - \time 9/8 - e4.~ \! e4 r4 d | - \time 7/8 - \key g \major - \repeat percent 3 { - h4.-\mf a4 d | - g,4. g4 a | - } - \time 4/4 - \tupletUp - \times 2/3 { h4 \-\f d8()e r4 | - a,8 h4 d8 r d4 e8-\sfz | - r4 g,8-\mf r r fis r8 d8~ | - d4. e8 ~e4. e'8->-\f | - r e d4 g8->()e r4 | - a,8 h4 d8 r dis4 e8-\sfz | - r4 g,8-\mf r r fis r4 | - r8 d r4 r8 e r4 | - r4 e'->-\f d8()e r4 | - %volte 1 - a,8 h4 d8 r d4 e8-\sfz | - r4 g,8-\mf r r fis r8 e8~ | - e4. g'8->-\f ~g \> g e4 | - g-> a8 d, ~ d4 \! d | - d2-\p r | - %volte 2 - a8 h4 d8 r d4 e8-\sfz | - r4 g,8-\mf r r fis r4 | - r8 d r4 r8 e r4 | - s1*0-\mp - \repeat unfold 2{ - g4.-. g8 \< ~g4 \! r4*1/2 \> \! s4*1/2 | - a4.-. a8 \< ~a4 \! r4*1/2 \> \! s4*1/2 | - } - g4.-. g8 \< ~g4 \! r4*1/2 \> \! s4*1/2 | - cisis4-\ff cisis8 d r dis4 e8 | - %volte 3 - a,8 h4 d8 r d4 e8 | - - } - %OUTRO - \key e \minor - \time 2/2 - r2 g-\p( fis d )h1~h1 - h2.. a8~ a fis2.. | - g2( a )a2 d | - h2.. a8 ~ a fis2.. | - g2 r2 -} -altsax = \notes \relative c'' { - \altsax - % INTRO - \key e \minor - \time 2/2 - r1 r1 r1 r1 - g2-\p~g8 a g fis ~ fis d2..| - e2( g )fis a | - g2~g8 a g fis ~ fis d2..| - e2( g )fis r2 - - %VERS - \context Voice=sax { - \key g \minor - \time 7/8 - s1*0_"1 $\\times$ tacet" R1*7/8 - r4. es4-\mf f | - g4. r2 | - R1*7/8*2 - r4. g4 a | - b4. \< c4 c | - \time 9/8 - c4.~ \! c4 r4 a | - \time 7/8 - \key g \major - \repeat percent 3 { - g4.-\mf fis4 a | - e4. e4 fis | - } - \time 4/4 - \tupletUp - \times 2/3 { g4 \< g g }\times 2/3 { g4 g \! g } - e2 r2 | - a4 r8 d8 r dis4 e8 - - % OMKVÆD - \key e \minor - r4 e,8-\mf r r d r4 | - r8 h r4 r8 cis r4 | - r4 e'->-\f d8()e r4 | - a,8 h4 d8 r d4 e8-\sfz | - r4 e,8-\mf r r d r8 h8~ | - h4. cis8 ~cis4. e'8->-\f | - r e d4 d8()h r4 | - a8 h4 d8 r dis4 e8-\sfz | - r4 e,8-\mf r r d r4 | - r8 h r4 r8 cis r4 | - r4 e'->-\f d8()e r4 | - %volte 1 - a,8 h4 d8 r d4 e8-\sfz | - r4 e,8-\mf r r d r8 c | - ~ c4. d'8->-\f ~d8 \> d c4 | - d4 e8 d ~ d4 \! h | - a2-\p r | - %volte 2 - a8 h4 d8 r d4 e8-\sfz | - r4 e,8-\mf r r d r4 | - r8 h r4 r8 cis r4 | - s1*0-\mp - \repeat unfold 2{ - e4.-. e8 \< ~e4 \! r4*1/2 \> \! s4*1/2 | - fis4.-. fis8 \< ~fis4 \! r4*1/2 \> \! s4*1/2 | - } - e4.-. e8 \< ~e4 \! r4*1/2 \> \! s4*1/2 | - a4-\ff a8 d r dis4 e8 | - %volte 3 - a,8 h4 d8 r d4 e8 | - } - % OUTRO - \key e \minor - \time 2/2 - r1 r1 r1 r1 - g,2-\p ~g8 a g fis ~ fis d2..| - e2( g )fis a | - g2~g8 a g fis ~ fis d2..| - e2 r - -} -tensax = \notes \relative c'' { - \tensax - % INTRO - \key e \minor - \time 2/2 - r1 r1 r2 g-\p( fis d - )e2.. d8 ~ d h2.. | - h2( d )d d | - e2.. d8 ~ d h2.. | - h2( d )d r - - % VERS - \context Voice=sax { - \key g \minor - \time 7/8 - s1*0_"1 $\\times$ tacet" R1*7/8 - r4. b4-\mf c | - d4. r2 | - R1*7/8*2 - r4. es4 f | - g4. \< a4 a | - \time 9/8 - g4.~ \! g4 r4 d | - \time 7/8 - \key g \major - \repeat percent 3 { - d4.-\mf d4 d | - c4. c4 d | - } - \time 4/4 - \tupletUp - \times 2/3 { d4 \< d d }\times 2/3 { d4 d \! d } - c2 r2 | - dis4 r8 d8 r dis4 e8 | - - % OMKVÆD - \key e \minor - r4 h8-\mf r r a r4 | - r8 g r4 r8 a r4 | - r4 e'->-\f d8()e r4 | - a,8 h4 d8 r d4 e8-\sfz | - r4 h8-\mf r r a r8 g8 | - ~g4. a8 ~a4. e'8->-\f | - r e d4 g8 e r4 | - a,8 h4 d8 r dis4 e8-\sfz | - r4 h8-\mf r r a r4 | - r8 g r4 r8 a r4 | - r4 e'4->-\f d8 e r4 | - %volte 1 - a,8 h4 d8 r d4 e8-\sf | - r4 h8-\mf r r a r g | - ~ g4. a'8->-\f ~ a \> a g4 | - a4-> a8 a ~ a4 \! g | - fis2-\p r| - %volte 2 - a,8 h4 d8 r d4 e8-\sfz | - r4 h8-\mf r r a r4 | - r8 g r4 r8 a r4 | - s1*0-\mp - \repeat unfold 2{ - d4.-. d8 \< ~d4 \! r4*1/2 \> \! s4*1/2 | - e4.-. e8 \< ~e4 \! r4*1/2 \> \! s4*1/2 | - } - d4.-. d8 \< ~d4 \! r4*1/2 \> \! s4*1/2 | - dis4-\ff dis8 d r dis4 e8 | - %volte 3 - a,8 h4 d8 r d4 e8 | - } - % OUTRO - \key e \minor - \time 2/2 - r1 r1 r2 g-\p( fis d - )e2.. d8 ~ d h2.. | - h2( d )d d | - e2.. d8 ~ d h2.. | - h2 r - -} - -piar = \notes \relative c' { - \piar - \time 2/2 - \key e \minor - % a1*0-\p - \repeat unfold 2 { - - R1 - fis8( g d' fis, g d' fis, )g | - - R1 - } - \alternative { - { fis8( g d' fis, g d' fis, )g | } - { fis8( g d' fis, g d fis )a | } - } - - % VERS - \time 7/8 - \key g \minor - \repeat percent 3 { - [ g d] [ f][ f] | - [ es b] [ es][ f] | - } - [ g d] [ f][ f] | - \time 9/8 - ~ | - \time 7/8 - \key g \major - s1*0-\mf - \repeat percent 3 { - [ g d] | - [ g' e] | - } - \time 4/4 - | - r8 d g a | - r8 r | - % OMKVÆD - \key e \minor - s1*3 - r8 r8 | - - r2 r4 r8 ~| - ~ | - s1 - r8 r - s1*3 - %volte 1 - r8 r8 | - r2 r4 r8 ~| - | - | - r8 d g a | - %volte 2 - r8 r8 | - s1*2 - - - - - | - r8 | - %volte 3 - r8 r8 | - % OUTRO - r2 - % s1*0-\p - - fis'8( g d' fis, g d' fis, )g | - - R1 - fis8( g d' fis, g d' fis, )g | - - R1 - fis8( g d' fis, g d' fis, )g | - - \clef "G^8" - \property PianoStaff.Arpeggio \override #'arpeggio-direction = #1 - \property PianoStaff.connectArpeggios = ##t - -} -U = \sustainUp -D = \sustainDown -pial = \notes { - \pial - \context Voice - \clef "F" - \property Staff.SustainPedal \override #'pedal-type = #'mixed - \relative c { - \time 2/2 - \key e \minor - \repeat unfold 2 { - - - - - - - s8 \U - } - } - % VERS - \key g \minor - \time 7/8 - \repeat unfold 3 { - g4.\D d4 \U \D d4*1/2 \U \D s8 \U - c4.\D c4 \U \D d4*1/2 \U \D s8 \U - } - es4. \D f4 \U \D f4*1/2 \U \D s8 \U - \time 9/8 - d4. \D ~d4 d \U \D fis4*1/2 \U \D s8 \U - \time 7/8 - \key g \major - \repeat unfold 2 { - g4.\D d4 \U \D d4*1/2 \U \D s8 \U - c4.\D c4 \U \D d4*1/2 \U \D s8 \U - } - e4. \D h,4 \U \D h,4*1/2 \U \D s8 \U - a,4.\D a,4 \U \D h,4*1/2 \U \D s8 \U | - \time 4/4 - c2 \D a,2 \U \D | - d1*1/2 \U \D s2 \U | - h,4 r8 d8 r dis4 e8 | - - - % OMKVÆD - \key e \minor - \clef "F_8" - e,,8 e, \su \sd g, g,, \su \sd e, a, | - a,, \su \sd e, h, h,, \su \sd d, e, | - e,,8 e, \su \sd g, g,, \su \sd e, a, | - a,, a, e, r e,8 | - - e,,8 e, \su \sd g, g,, \su \sd e, ~ - ~ e,8 | - e,,8 e, \su \sd g, g,, \su \sd e, a, - a,, a, a,, r | - - e,,8 e, \su \sd g, g,, \su \sd e, a, - a,, \su \sd e, h, h,, \su \sd d, e, | - e,,8 e, \su \sd g, g,, \su \sd e, a, - % volte 1 - a,, a, e, r e,8 | - e,,8 e, \su \sd g, g,, \su \sd e, ~ - | - | - r | - % volte 2 - a,,8 a, e, r e,8 | - e,,8 e, \su \sd g, g,, \su \sd e, a, - a,, \su \sd e, h, h,, \su \sd d, e, | - - - - - - r | - - a,,8 a, e, r e,8 | - \clef "F" - - \relative e { -

- - - - - - - - s8 \U - s2 \U - } - -} -guitar = \notes \transpose c' { - \guitar - \time 2/2 - \key e \minor - \property Staff.Arpeggio \override #'arpeggio-direction = #1 - g'8-5_"FLANGE" fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - % VERS - \relative c' { - \key g \minor - \time 7/8 - s1*0_"NO FLANGE" - \repeat percent 3 { - [ ] [ ] []| - [ ] [ ][ ] | - } - [ ] [ ] []| - \time 9/8 - - r4 [ ] [ ] | - \time 7/8 - \key g \major - \repeat percent 3 { - [ ] [ ] []| - [ ] [ ][ ] | - } - \time 4/4 - s1*0-\mf \repeat unfold 2 - - - r2 | - } - r4 e8-2 < a-3 d'-4> e-2 < ais-3 dis'-4> e-2 < h-3 e'-4> | - % OMKVÆD - \key e \minor - \time 4/4 - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 < a-3 d'-4> e-2 e-2 e-2 < h-3 e'-4> e-2 | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 < a-3 d'-4> e-2 e-2 < a-3 d'-4> e-2 < h-3 e'-4> | - e8-2 < d'-4 g'-5> e-2 e-2 < e'8-4 a'-5> e-2 r8 ~ | - ~ | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 e-2 < a-3 d'-4> e-2 < ais-3 dis'-4> e-2 < h-3 e'-4> | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 < a-3 d'-4> e-2 e-2 e-2 < h-3 e'-4> e-2 | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - % volte1 - e-2 e-2 < a-3 d'-4> e-2 e-2 < a-3 d'-4> e-2 < h-3 e'-4> | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 e-2 ~ | - - ~ - r | - %volte2 - e8-2 e-2 < a-3 d'-4> e-2 e-2 < a-3 d'-4> e-2 < h-3 e'-4> | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 < a-3 d'-4> e-2 e-2 e-2 < h-3 e'-4> e-2 | - s1*0_"FLANGE" - \repeat unfold 2 { - r8 d'-4 d'-4 a'-5 d'-4 e'-4 d'-4 - r8 d'-4 d'-4 a'-5 d'-4 e'-4 d'-4 - } - r8 d'-4 d'-4 a'-5 d'-4 e'-4 d'-4 - r8 < a-3 d'-4> e-2 < ais-3 dis'-4> e-2 < h-3 e'-4> | - %volte3 - e8-2 e-2 < a-3 d'-4> e-2 e-2 < a-3 d'-4> e-2 < h-3 e'-4> | - % OUTRO - \time 2/2 - \key e \minor - r2 | - \property Staff.Arpeggio \override #'arpeggio-direction = #1 - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - - - -} - -cello = \notes \relative c { - \cello - \time 2/2 - \key e \minor - e1 d2( fis g h d fis )e1 fis2( d - )e1 d2( h g e fis d )e1 h - \time 7/8 - \key g \minor - R1*7/8*7 - \time 9/8 - R1*9/8 - \time 7/8 - \key g \major - R1*7/8*6 - \time 4/4 - R1 R1 R1 - \key e \minor - \property Score.skipBars = ##t - R1*11 - R1*5 - R1*9 - R1 - \time 2/2 - e1 d2( fis g h d fis )e1 fis2( d - )e1 d2( h g e fis d )e1 -} - -bas = \notes { - \bas - \time 2/2 - \key e \minor - \repeat unfold 2 { - e2 r8 a,4 h,8 ~ | - h,2 r8 a h4 | - e2 r8 a,4 h,8 | - r h a fis a h g4 | - e2 r8 d4 h,8 ~ | - h,2 r2 - } - % VERS - \key g \minor - \time 7/8 - g4. d4 d - c4. c4 d - g4. d4 d - c4. c4 d - g4. d4 d - c4. c4 d - es4. f4 f - \time 9/8 - d4.~d4 d fis - \time 7/8 - \key g \major - g4. d4 d - c4. c4 d - g4. d4 d - c4. c4 d - e4. h,4 h, - a,4. a,4 h, | - \time 4/4 - c2 a,2 | - d1 | - h,4 r8 d8 r dis4 e8 | - - %OMKVÆD - \key e \minor - e,8 e, r8 g, g, g, r a, | - a, a, r h, h, h, r e | - e,8 e, r8 g, g, g, r a, | - a, a, r h, r d4 e8 | - e,8 e, r8 g, g, g, r a, | - ~a,4. h,8~h,4. e8 | - e,8 e, r8 g, g, g, r a, | - a, a, r d8 r dis4 e8 | - e,8 e, r8 g, g, g, r a, | - a, a, r h, h, h, r e | - e,8 e, r8 g, g, g, r a, | - - a, a, r h, r d4 e8 | - e,8 e, r8 g, g, g, r a,~ | - a,2. ~ a,4 \glissando | - d1 | - r2 d4 d | - - a,8 a, r h, r d4 e8 | - e,8 e, r8 g, g, g, r a, | - a, a, r h, h, h, r4 | - c4. c'8 r c'4. - d4. d'8 r d'4. - a,4. a8 r a4. - h,4. h8 r h4. - c4. c'8 r c'4. - h,4 h,8 d8 r dis4 e8 | - - a,8 a, r h, r d4 e8~ | - e2 g, | - - - - h,2 r8 a h4 | - e2 r8 a,4 h,8 | - r h a fis a h g4 | - e2 r8 d4 h,8 ~ | - h,2 r2 - e2 r8 a,4 h,8 ~ | - h,2 r8 a h4 | - e2 r8 a,4 h,8 | - r h a fis a h g4 | - e1 | - - - -} - -\include "drumpitch-init.ly" -drhi = \notes { - \drhi - \time 2/2 - \repeat percent 12 { cymr2 cymr } | - \time 7/8 - cymc4 hh8 r hh r hh - r8 hh4 hhc hho | - \repeat percent 2 { - hh4 hh8 r hh r hh - r8 hh4 hhc hho | - } - hh4 hh8 r hh r hh | - \time 9/8 - r8 hh4 hh hhc hho | - \repeat percent 3 { - hh4 hh8 r hh r hh - r8 hh4 hhc hho | - } - \repeat unfold 2 \times 2/3 { hh4 hhc4 hho4 } - cymc4 tommh8 toml sn hho sn sn | - cymc4. cymc8 ~ cymc cymc4 cymc8 | - - % OMKVÆD - hh8 hh hh hh hh hh hh hh - hh8 hh hh hh hh hh hh hho | - hh8 hh hh hh hh hh hh hh - hh hh hh hho r cymc4 cymc8 - hh8 hh hh hh hh hh hh cymc ~| - cymc4. cymc8 ~cymc4. hho8 | - hh8 hh hh hh hh hh hh hh - hh hh hho cymc8~cymc cymc4 cymc8 | - - hh8 hh hh hh hh hh hh hh - hh8 hh hh hh hh hh hh hho | - hh8 hh hh hh hh hh hh hh - - %volte 1 - hh hh hh hho r cymc4 cymc8 - hh8 hh hh hh hh hh hh cymc ~ - cymc4. tommh8 r tommh toml4 | - cymr4. cymr8~cymr4 cymr4 | - cymr2 hhc4 hho | - - %volte 2 - hh8 hh hh hho r cymc4 cymc8 | - hh8 hh hh hh hh hh hh hh | - hh8 hh hh hh hh hh hh hho | - \repeat percent 5 { hh8 hh hh hho hh hho hh hh16 hh } - hh8 hh hho cymc8~cymc cymc4 cymc8 | - - %volte 3 - hh8 hh hh hho r cymc4 cymc8 | - - \repeat percent 10 { cymr2 cymr } - cymr1 - -} -drlo = \notes { - \drlo - \time 2/2 - s1*12 - \time 7/8 - bd4 sn8 bd4 [bd8 sn] | - bd4 sn8 bd4 [bd8 sn] | - \repeat percent 2 { - bd4 sn8 bd4 [bd8 sn] | - bd4 sn8 bd4 [bd8 sn] | - } - bd4 sn8 bd4 [bd8 sn] | - \time 9/8 - bd4. r4 bd [< - bd8 sn - > sn] | - \time 7/8 - \repeat percent 3 { - bd4 sn8 bd4 [bd8 sn] | - bd4 sn8 bd4 [bd8 sn] | - } - \time 4/4 - bd4 bd bd bd | - bd4. bd8 bd4 bd4 - bd4 sn8 bd r bd4 bd8 | - - - %OMKVÆD - bd4 sn8 bd bd4 sn8 bd | - bd4 sn8 bd bd4 < - bd sn - > | - bd4 sn8 bd bd4 sn8 bd | - bd8 sn bd bd hhp bd4 bd8 | - bd4 sn8 bd bd4 sn8 bd | - r4 r8 bd r4 r8 bd | - bd4 sn8 bd bd4 sn8 bd | - bd8 sn bd bd hhp bd4 bd8 | - - bd4 sn8 bd bd4 sn8 bd | - bd4 sn8 bd bd4 < - bd sn - > | - bd4 sn8 bd bd4 sn8 bd | - - %volte 1 - bd8 sn bd bd hhp bd4 bd8 | - bd4 sn8 bd bd4 sn8 bd | - bd4. bd8 r bd bd4 | - bd4. bd8 r2 | - r2 bd4 < - bd8 sn - > sn | - - %volte 2 - bd8 sn bd bd hhp bd4 bd8 | - bd4 sn8 bd bd4 sn8 bd | - bd4 sn8 bd bd4 < - bd sn - > | - \repeat percent 5 { bd4 bd8 bd bd4 bd } | - bd8 sn bd bd r bd4 bd8 | - - %volte 3 - bd8 sn bd bd hhp bd4 bd8 | - - - -} diff --git a/input/SondagMorgen/SondagMorgenOmkvaed.ly b/input/SondagMorgen/SondagMorgenOmkvaed.ly deleted file mode 100644 index cf9b0970bf..0000000000 --- a/input/SondagMorgen/SondagMorgenOmkvaed.ly +++ /dev/null @@ -1,218 +0,0 @@ -\version "1.5.68" -\include "deutsch.ly" - -marks = \lyrics { - \marks - "\large\framebox{\bf{OMKVÆD}}"1*11 -} - -ned = \downbow -op = \upbow - -global = \notes { - \global - \property Score.repeatCommands = #'((volta #f)) - \bar "|:" - s1*11 -} - -akk = \lyrics { - \akk - "Em7"2 "G$\\Delta$" "A11" "H11" - "Em7"2 "G$\\Delta$" "A11" "H11" - "Em7"2 "G$\\Delta$" "A11" "H11" - "Em7"2 "G$\\Delta$" "A11" "H11" - "Em7"2 "G$\\Delta$" "A11" "H11" - "Em7"2 "G$\\Delta$" -} - - -mel = \notes { - \mel - \relative c'' { - \key e \minor - d8 h4 e8~e h g a ~| - a g a g a b a g | - h4 e, r8 e4 e8 | - r2 - r8 e'4 d8 ~ | - d8 h4 e8~e h g a ~| - a b a g a b a g | - h2 r2 | - r2 - r8 e4 d8 ~ | - d8 h4 e8~e h g a ~| - a g a g a b a g | - h4 e, r8 e4 e8 | - } -} - -kormel = \notes { - \kormel - \key e \minor - R1*11 -} - -sopsax = \notes { - \sopsax - \context Voice=sax \relative c'' { - \key e \minor - r4 g8-\mf r r fis r4 | - r8 d r4 r8 e r4 | - r4 e'->-\f d8()e r4 | - a,8 h4 d8 r d4 e8-\sfz | - r4 g,8-\mf r r fis r8 d8~ | - d4. e8 ~e4. e'8->-\f | - r e d4 g8->()e r4 | - a,8 h4 d8 r dis4 e8-\sfz | - r4 g,8-\mf r r fis r4 | - r8 d r4 r8 e r4 | - r4 e'->-\f d8()e r4 | - } -} -altsax = \notes { - \altsax - \context Voice=sax \relative c'' { - \key e \minor - r4 e,8-\mf r r d r4 | - r8 h r4 r8 cis r4 | - r4 e'->-\f d8()e r4 | - a,8 h4 d8 r d4 e8-\sfz | - r4 e,8-\mf r r d r8 h8~ | - h4. cis8 ~cis4. e'8->-\f | - r e d4 d8()h r4 | - a8 h4 d8 r dis4 e8-\sfz | - r4 e,8-\mf r r d r4 | - r8 h r4 r8 cis r4 | - r4 e'->-\f d8()e r4 | - } -} -tensax = \notes { - \tensax - \context Voice=sax \relative c' { - \key e \minor - r4 h8-\mf r r a r4 | - r8 g r4 r8 a r4 | - r4 e'->-\f d8()e r4 | - a,8 h4 d8 r d4 e8-\sfz | - r4 h8-\mf r r a r8 g8 | - ~g4. a8 ~a4. e'8->-\f | - r e d4 g8 e r4 | - a,8 h4 d8 r dis4 e8-\sfz | - r4 h8-\mf r r a r4 | - r8 g r4 r8 a r4 | - r4 e'4->-\f d8 e r4 | - } -} - -piar = \notes { - \piar - \relative c' { - \key e \minor - s1*3 - r8 r8 | - - r2 r4 r8 ~| - ~ | - s1 - r8 r - s1*3 - } -} -U = \sustainUp -D = \sustainDown -pial = \notes { - \pial - \key e \minor - \clef "F_8" - e,,8 e, \su \sd g, g,, \su \sd e, a, | - a,, \su \sd e, h, h,, \su \sd d, e, | - e,,8 e, \su \sd g, g,, \su \sd e, a, | - a,, a, e, r e,8 | - - e,,8 e, \su \sd g, g,, \su \sd e, ~ - ~ e,8 | - e,,8 e, \su \sd g, g,, \su \sd e, a, - a,, a, a,, r | - - e,,8 e, \su \sd g, g,, \su \sd e, a, - a,, \su \sd e, h, h,, \su \sd d, e, | - e,,8 e, \su \sd g, g,, \su \sd e, a, -} -guitar = \notes { - \guitar - \key e \minor - \time 4/4 - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 < a-3 d'-4> e-2 e-2 e-2 < h-3 e'-4> e-2 | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 < a-3 d'-4> e-2 e-2 < a-3 d'-4> e-2 < h-3 e'-4> | - e8-2 < d'-4 g'-5> e-2 e-2 < e'8-4 a'-5> e-2 r8 ~ | - ~ | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 e-2 < a-3 d'-4> e-2 < ais-3 dis'-4> e-2 < h-3 e'-4> | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 < a-3 d'-4> e-2 e-2 e-2 < h-3 e'-4> e-2 | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | -} - -cello = \notes { - \cello - \key e \minor - \property Score.skipBars = ##t - R1*11 -} - -bas = \notes { - \bas - \key e \minor - e,8 e, r8 g, g, g, r a, | - a, a, r h, h, h, r e | - e,8 e, r8 g, g, g, r a, | - a, a, r h, r d4 e8 | - e,8 e, r8 g, g, g, r a, | - ~a,4. h,8~h,4. e8 | - e,8 e, r8 g, g, g, r a, | - a, a, r d8 r dis4 e8 | - e,8 e, r8 g, g, g, r a, | - a, a, r h, h, h, r e | - e,8 e, r8 g, g, g, r a, | -} - -\include "drumpitch-init.ly" -drhi = \notes { - \drhi - hh8 hh hh hh hh hh hh hh - hh8 hh hh hh hh hh hh hho | - hh8 hh hh hh hh hh hh hh - hh hh hh hho r cymc4 cymc8 - hh8 hh hh hh hh hh hh cymc ~| - cymc4. cymc8 ~cymc4. hho8 | - hh8 hh hh hh hh hh hh hh - hh hh hho cymc8~cymc cymc4 cymc8 | - - hh8 hh hh hh hh hh hh hh - hh8 hh hh hh hh hh hh hho | - hh8 hh hh hh hh hh hh hh - -} -drlo = \notes { - \drlo - bd4 sn8 bd bd4 sn8 bd | - bd4 sn8 bd bd4 < - bd sn - > | - bd4 sn8 bd bd4 sn8 bd | - bd8 sn bd bd hhp bd4 bd8 | - bd4 sn8 bd bd4 sn8 bd | - r4 r8 bd r4 r8 bd | - bd4 sn8 bd bd4 sn8 bd | - bd8 sn bd bd hhp bd4 bd8 | - - bd4 sn8 bd bd4 sn8 bd | - bd4 sn8 bd bd4 < - bd sn - > | - bd4 sn8 bd bd4 sn8 bd | - -} diff --git a/input/SondagMorgen/SondagMorgenOmkvaedVolta1.ly b/input/SondagMorgen/SondagMorgenOmkvaedVolta1.ly deleted file mode 100644 index ba2ebd3ca1..0000000000 --- a/input/SondagMorgen/SondagMorgenOmkvaedVolta1.ly +++ /dev/null @@ -1,139 +0,0 @@ -\version "1.5.68" -\include "deutsch.ly" - -marks = \lyrics { - \marks - ""1*5 -} - -ned = \downbow -op = \upbow - -global = \notes { - \global - \property Score.repeatCommands = #'((volta "1")) - s1*4 s2.. - \mark #'(rows "D. S. " (music "scripts-segno")) - s8 -} - -akk = \lyrics { - \akk - "A11"2 "H11" - "Em7" "G$\\Delta$" "Am7"1 "Dsus4" "D" -} - - -mel = \notes { - \mel - \relative g' { - r2 r8 e'4 d8 ~ | - d8 h4 e8~e h g a ~| - a1 ~ | - a1 ~ | - a2 r8 d, g a - } -} - -kormel = \notes { - \kormel - \relative c'' { - r2 r8 e4 d8~ - d h4 e8~e d h d~ - d1~d1~d2 r2 - } -} - -sopsax = \notes { - \sopsax - \context Voice=sax \relative c'' { - a8 h4 d8 r d4 e8-\sfz | - r4 g,8-\mf r r fis r8 e8~ | - e4. g'8->-\f ~g \> g e4 | - g-> a8 d, ~ d4 \! d | - d2-\p r | - } -} -altsax = \notes { - \altsax - \context Voice=sax \relative c'' { - a8 h4 d8 r d4 e8-\sfz | - r4 e,8-\mf r r d r8 c | - ~ c4. d'8->-\f ~d8 \> d c4 | - d4 e8 d ~ d4 \! h | - a2-\p r | - } -} -tensax = \notes { - \tensax - \context Voice=sax \relative c' { - a8 h4 d8 r d4 e8-\sf | - r4 h8-\mf r r a r g | - ~ g4. a'8->-\f ~ a \> a g4 | - a4-> a8 a ~ a4 \! g | - fis2-\p r| - } -} - -piar = \notes { - \piar - \relative c'' { - r8 r8 | - r2 r4 r8 ~| - | - | - r8 d g a | - } -} -U = \sustainUp -D = \sustainDown -pial = \notes { - \pial - a,, a, e, r e,8 | - e,,8 e, \su \sd g, g,, \su \sd e, ~ - | - | - r | -} -guitar = \notes { - \guitar - e8-2 e-2 < a-3 d'-4> e-2 e-2 < a-3 d'-4> e-2 < h-3 e'-4> | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 e-2 ~ | - - ~ - r | -} - -cello = \notes { - \cello - R1*5 -} - -bas = \notes { - \bas - a,8 a, r h, r d4 e8 | - e,8 e, r8 g, g, g, r a,~ | - a,2. ~ a,4 \glissando | - d1 | - r2 d4 d | -} - -\include "drumpitch-init.ly" -drhi = \notes { - \drhi - hh8 hh hh hho r cymc4 cymc8 - hh8 hh hh hh hh hh hh cymc ~ - cymc4. tommh8 r tommh toml4 | - cymr4. cymr8~cymr4 cymr4 | - cymr2 hhc4 hho | -} -drlo = \notes { - \drlo - bd8 sn bd bd hhp bd4 bd8 | - bd4 sn8 bd bd4 sn8 bd | - bd4. bd8 r bd bd4 | - bd4. bd8 r2 | - r2 bd4 < - bd8 sn - > sn | -} diff --git a/input/SondagMorgen/SondagMorgenUnfolded.ly b/input/SondagMorgen/SondagMorgenUnfolded.ly deleted file mode 100644 index 0369802262..0000000000 --- a/input/SondagMorgen/SondagMorgenUnfolded.ly +++ /dev/null @@ -1,15 +0,0 @@ -\version "1.5.68" -\include "SondagMorgenIntro.ly" -\include "SondagMorgenVers.ly" -\include "SondagMorgenVersVolta1.ly" -\include "SondagMorgenVers.ly" -\include "SondagMorgenVersVolta2.ly" -\include "SondagMorgenOmkvaed.ly" -\include "SondagMorgenOmkvaedVolta1.ly" -\include "SondagMorgenVers.ly" -\include "SondagMorgenVersVolta2.ly" -\include "SondagMorgenOmkvaed.ly" -\include "SondagMorgenOmkvaedVolta2.ly" -\include "SondagMorgenOmkvaed.ly" -\include "SondagMorgenOmkvaedVolta3.ly" -\include "SondagMorgenOutro.ly" diff --git a/input/SondagMorgen/SondagMorgenVers.ly b/input/SondagMorgen/SondagMorgenVers.ly deleted file mode 100644 index 7438a03bda..0000000000 --- a/input/SondagMorgen/SondagMorgenVers.ly +++ /dev/null @@ -1,313 +0,0 @@ -\version "1.5.68" -\include "deutsch.ly" - -marks = \lyrics { - \marks - "\large\framebox{\bf{VERS}}"4*54 -} - -ned = \downbow -op = \upbow - -#(define meter '(rows (music "noteheads-2" ((kern . -0.1) "flags-stem")) " = 125")) - -global = \notes { - \global - \mark #'(music "scripts-segno") - \bar "|:" - s4*54 -} - -akk = \lyrics { - \akk - "Gm7"4. "Dm7"2 - "Cm7"4. ""4 "Dm7"4 - "Gm7"4. "Dm7"2 - "Cm7"4. ""4 "Dm7"4 - "Gm7"4. "Dm7"2 - "Cm7"4. ""4 "Dm7"4 - "E$\\flat\\Delta$"4. "F6"2 - "D11"8*7 "D/fis"4 - "G"4. "D"2 - "C$\\Delta$"4. ""4 "D" - "G"4. "D"2 - "C$\\Delta$"4. ""4 "D" - "Em7"4. "Hm7"2 - "Am9"4. ""4 "Hm7" - "C$\\Delta$"2 "Am9" -} - - -mel = \notes { - \mel - \time 7/8 - \key g \minor - \relative c'' { - [b8 a g] a4 [g8 f] | - g4 d8 g4 a | - b4 a8 [g a] [g f] | - g4. r8 g a4 | - [b8 a g] a4 [g8 f] | - g4 d8 g4 a | - [b8 a g] a4 [g8 f]| - \time 9/8 - g4. r4 r8 d [g a] | - \time 7/8 - \key g \major - [h8 a g] a4 d | - h g8 g4 a | - h4 a8 [g a] [h d] | - g,4. r8 g a4 | - [h8 a g] a4 [h8 d] | - h4 g8 g4 a | - \time 4/4 - \repeat unfold 2 \times 2/3 { h4 a g }| - } -} - -kormel = \notes { - \kormel - \time 7/8 - \relative c' { - R1*7/8*5 | - r4 r8 b'4 c | - [d8 c b] c4 [b8 c] | - \time 9/8 - d4. R4 R4 R4 - \time 7/8 - R1*7/8*5 | - r4 r8 h4 c | - \time 4/4 - \repeat unfold 2 \times 2/3 {d4 c h} - } -} - -sopsax = \notes { - \sopsax - \context Voice=sax \relative c'' { - \key g \minor - \time 7/8 - % s1*0_"1 $\\times$ tacet" - R1*7/8 - r4. g4-\mf a | - b4. r2 | - R1*7/8*2 - r4. b4 c | - d4. \< d4 d | - \time 9/8 - e4.~ \! e4 r4 d | - \time 7/8 - \key g \major - \repeat percent 3 { - h4.-\mf a4 d | - g,4. g4 a | - } - \time 4/4 - \tupletUp - \times 2/3 { h4 \ g d] [ f][ f] | - [ es b] [ es][ f] | - } - [ g d] [ f][ f] | - \time 9/8 - ~ | - \time 7/8 - \key g \major - s1*0-\mf - \repeat percent 3 { - [ g d] | - [ g' e] | - } - \time 4/4 - | - } -} -U = \sustainUp -D = \sustainDown -pial = \notes { - \pial - \key g \minor - \time 7/8 - \repeat unfold 3 { - g4.\D d4 \U \D d4*1/2 \U \D s8 \U - c4.\D c4 \U \D d4*1/2 \U \D s8 \U - } - es4. \D f4 \U \D f4*1/2 \U \D s8 \U - \time 9/8 - d4. \D ~d4 d \U \D fis4*1/2 \U \D s8 \U - \time 7/8 - \key g \major - \repeat unfold 2 { - g4.\D d4 \U \D d4*1/2 \U \D s8 \U - c4.\D c4 \U \D d4*1/2 \U \D s8 \U - } - e4. \D h,4 \U \D h,4*1/2 \U \D s8 \U - a,4.\D a,4 \U \D h,4*1/2 \U \D s8 \U | - \time 4/4 - c2 \D a,2 \U | -} -guitar = \notes { - \guitar - \relative c' { - \key g \minor - \time 7/8 - s1*0_"NO FLANGE" - \repeat percent 3 { - [ ] [ ] []| - [ ] [ ][ ] | - } - [ ] [ ] []| - \time 9/8 - - r4 [ ] [ ] | - \time 7/8 - \key g \major - \repeat percent 3 { - [ ] [ ] []| - [ ] [ ][ ] | - } - \time 4/4 - s1*0-\mf \repeat unfold 2 - - - } -} - -cello = \notes { - \cello - \time 7/8 - \key g \minor - R1*7/8*7 - \time 9/8 - R1*9/8 - \time 7/8 - \key g \major - R1*7/8*6 - \time 4/4 - R1 -} - -bas = \notes { - \bas - \key g \minor - \time 7/8 - g4. d4 d - c4. c4 d - g4. d4 d - c4. c4 d - g4. d4 d - c4. c4 d - es4. f4 f - \time 9/8 - d4.~d4 d fis - \time 7/8 - \key g \major - g4. d4 d - c4. c4 d - g4. d4 d - c4. c4 d - e4. h,4 h, - a,4. a,4 h, | - \time 4/4 - c2 a,2 | -} - -\include "drumpitch-init.ly" -drhi = \notes { - \drhi - \time 7/8 - cymc4 hh8 r hh r hh - r8 hh4 hhc hho | - \repeat percent 2 { - hh4 hh8 r hh r hh - r8 hh4 hhc hho | - } - hh4 hh8 r hh r hh | - \time 9/8 - r8 hh4 hh hhc hho | - \repeat percent 3 { - hh4 hh8 r hh r hh - r8 hh4 hhc hho | - } - \repeat unfold 2 \times 2/3 { hh4 hhc4 hho4 } - -} -drlo = \notes { - \drlo - \time 7/8 - bd4 sn8 bd4 [bd8 sn] | - bd4 sn8 bd4 [bd8 sn] | - \repeat percent 2 { - bd4 sn8 bd4 [bd8 sn] | - bd4 sn8 bd4 [bd8 sn] | - } - bd4 sn8 bd4 [bd8 sn] | - \time 9/8 - bd4. r4 bd [< - bd8 sn - > sn] | - \time 7/8 - \repeat percent 3 { - bd4 sn8 bd4 [bd8 sn] | - bd4 sn8 bd4 [bd8 sn] | - } - \time 4/4 - bd4 bd bd bd | -} diff --git a/input/SondagMorgen/SondagMorgenVersVolta1.ly b/input/SondagMorgen/SondagMorgenVersVolta1.ly deleted file mode 100644 index f24d27e25a..0000000000 --- a/input/SondagMorgen/SondagMorgenVersVolta1.ly +++ /dev/null @@ -1,89 +0,0 @@ -\version "1.5.68" -\include "deutsch.ly" - -marks = \lyrics { - \marks - ""1 -} - -ned = \downbow -op = \upbow - -global = \notes { - \global - \property Score.repeatCommands = #'((volta "1")) - s1 -} - -akk = \lyrics { - \akk - "D11"1 -} - - -mel = \notes { - \mel - \relative g' { - a2 r8 d,8 [g a] | - } -} - -kormel = \notes { - \kormel - \relative c'' { - d2 R2 - } -} - -sopsax = \notes { - \sopsax - \context Voice = sax \relative c'' { a2 r2 } -} -altsax = \notes { - \altsax - \context Voice = sax \relative c' {e2 r2 } -} -tensax = \notes { - \tensax - \context Voice = sax \relative c' {c2 r2 } -} - -piar = \notes { - \piar - \relative c' { - r8 d g a - } -} -U = \sustainUp -D = \sustainDown -pial = \notes { - \pial - s1*0 \D d1*1/2 \U \D s2 \U | - -} -guitar = \notes { - \guitar - \relative c' { - r2 | - } -} - -cello = \notes { - \cello - R1 -} - -bas = \notes { - \bas - d1 | -} - -\include "drumpitch-init.ly" -drhi = \notes { - \drhi - cymc4 tommh8 toml sn hho sn sn | -} -drlo = \notes { - \drlo - bd4. bd8 bd4 bd4 -} diff --git a/input/SondagMorgen/SondagMorgenVersVolta2.ly b/input/SondagMorgen/SondagMorgenVersVolta2.ly deleted file mode 100644 index 897e37c4d6..0000000000 --- a/input/SondagMorgen/SondagMorgenVersVolta2.ly +++ /dev/null @@ -1,93 +0,0 @@ -\version "1.5.68" -\include "deutsch.ly" - -marks = \lyrics { - \marks - ""1 -} - -ned = \downbow -op = \upbow - -global = \notes { - \global - \property Score.repeatCommands = #'((volta #f)(volta "2, 3")) - \bar ":|" - s1 -} - -akk = \lyrics { - \akk - "H+9$\\sharp$" -} - - -mel = \notes { - \mel - \relative g' { - h2 r8 e4 d8 ~ | - } -} - -kormel = \notes { - \kormel - \relative g' { - cisis2 R2 - } -} - -sopsax = \notes { - \sopsax - \context Voice=sax \relative c'' { - cisis4 r8 d8 r dis4 e8 - } -} -altsax = \notes { - \altsax - \context Voice=sax \relative c'' { - a4 r8 d8 r dis4 e8 - } -} -tensax = \notes { - \tensax - \context Voice=sax \relative c' { - dis4 r8 d8 r dis4 e8 | - } -} - -piar = \notes { - \piar - \relative c' { - r8 r | - } -} -U = \sustainUp -D = \sustainDown -pial = \notes { - \pial - h,4 r8 d8 r dis4 e8 | -} -guitar = \notes { - \guitar - r4 e8-2 < a-3 d'-4> e-2 < ais-3 dis'-4> e-2 < h-3 e'-4> | -} - -cello = \notes { - \cello - R1 -} - -bas = \notes { - \bas - h,4 r8 d8 r dis4 e8 | -} - -\include "drumpitch-init.ly" -drhi = \notes { - \drhi - cymc4. cymc8 ~ cymc cymc4 cymc8 | -} -drlo = \notes { - \drlo - bd4 sn8 bd r bd4 bd8 | -} diff --git a/input/regression/auto-knee.ly b/input/regression/beam-auto-knee.ly similarity index 100% rename from input/regression/auto-knee.ly rename to input/regression/beam-auto-knee.ly diff --git a/input/regression/auto-isknee.ly b/input/regression/beam-cross-staff-auto-knee.ly similarity index 57% rename from input/regression/auto-isknee.ly rename to input/regression/beam-cross-staff-auto-knee.ly index fe173b687f..0d8b3176fe 100644 --- a/input/regression/auto-isknee.ly +++ b/input/regression/beam-cross-staff-auto-knee.ly @@ -1,15 +1,18 @@ \version "1.5.68" \header{ -texidoc="Two automatic knees" -} + + texidoc="Automatic cross-staff knees also work (here we see them +with explicit staff switches)." + + } \score { \notes \context PianoStaff < \context Staff = "up" \notes\relative c''{ [ b8 \translator Staff="down" d,, ] [ c \translator Staff="up" c'' ] - [ b, \translator Staff="down" d ] + [ b, \translator Staff="down" d^"no knee" ] } \context Staff = "down" { \clef bass @@ -17,11 +20,6 @@ texidoc="Two automatic knees" } > \paper{ - linewidth = 40*\staffspace -% Now by default -% \translator{ -% \VoiceContext -% Beam \override #'auto-knee-gap = #7 -% } + linewidth = -1.0 } } diff --git a/lily/beam.cc b/lily/beam.cc index 0ecb3bfa22..dc7cd4cced 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -146,7 +146,7 @@ Beam::before_line_breaking (SCM smob) { me->warning (_ ("Beam has less than two stems. Removing beam.")); - unsmob_grob (gh_car (stems))->remove_grob_property ("beam"); + unsmob_grob (gh_car (stems))->set_grob_property ("beam", SCM_EOL); me->suicide (); return SCM_UNSPECIFIED; @@ -539,25 +539,12 @@ Beam::set_stem_directions (Grob *me, Direction d) for (int i=0; i remove_grob_property ("dir-forced"); - if (!gh_boolean_p (force) || !gh_scm2bool (force)) - Directional_element_interface::set (s, d); - } + + SCM forcedir = s->get_grob_property ("direction"); + if (!to_dir (forcedir)) + Directional_element_interface::set (s, d); } -} +} /* A union of intervals in the real line. @@ -649,20 +636,25 @@ Beam::consider_auto_knees (Grob* me) Grob* stem = stems[i]; if (Stem::invisible_b (stem)) continue; - Interval hps = Stem::head_positions (stem); - if(!hps.empty_b()) { hps[LEFT] += -1; hps[RIGHT] += 1; hps *= staff_space * 0.5 ; + + /* + We could subtract beam Y position, but this routine only + sets stem directions, a constant shift does not have an + influence. + + */ hps += stem->relative_coordinate (common, Y_AXIS); - - if (to_boolean (stem->get_grob_property ("dir-forced"))) + + if (to_dir (stem->get_grob_property ("direction"))) { - Direction stemdir =Directional_element_interface::get (stem); + Direction stemdir = to_dir (stem->get_grob_property ("direction")); hps[-stemdir] = - stemdir * infinity_f; } } @@ -707,12 +699,6 @@ Beam::consider_auto_knees (Grob* me) UP : DOWN ; stem->set_grob_property ("direction", scm_int2num (d)); - - /* - UGH. Check why we still need dir-forced; I think we can - junk it. - */ - stem->set_grob_property ("dir-forced", SCM_BOOL_T); hps.intersect (max_gap); assert (hps.empty_b () || hps.length () < 1e-6 ); diff --git a/lily/grob-property.cc b/lily/grob-property.cc index d4a0272734..d7158d6df5 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -59,21 +59,6 @@ alists (but not the entries). // #define HASHING_FOR_MUTABLE_PROPS -/* - Remove the value associated with KEY, and return it. The result is - that a next call will yield SCM_EOL (and not the underlying - `basic' property. -*/ -SCM -Grob::remove_grob_property (const char* key) -{ - SCM val = get_grob_property (key); - if (val != SCM_EOL) - set_grob_property (key, SCM_EOL); - return val; -} - - SCM Grob::get_property_alist_chain (SCM def) const { diff --git a/lily/include/grob.hh b/lily/include/grob.hh index 0b3c277d22..ff8308ad14 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -77,8 +77,6 @@ public: void set_elt_pointer (const char*, SCM val); friend class Property_engraver; // UGHUGHUGH. - SCM remove_grob_property (const char* nm); - /* related classes. */ diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 37eaf37dd6..dc4886681c 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -254,7 +254,7 @@ ly_axis_p (SCM s) Direction to_dir (SCM s) { - return (Direction) gh_scm2int (s); + return SCM_INUMP (s) ? (Direction) gh_scm2int (s) : CENTER; } Interval diff --git a/lily/note-collision.cc b/lily/note-collision.cc index 911d8332d3..8ed94be51f 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -411,7 +411,7 @@ Note_collision_interface::forced_shift (Grob *me) { Grob * se = unsmob_grob (ly_car (s)); - SCM force = se->remove_grob_property ("force-hshift"); + SCM force = se->get_grob_property ("force-hshift"); if (gh_number_p (force)) { tups = gh_cons (gh_cons (se->self_scm (), force), diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 66b95a2518..bcea695963 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -317,7 +317,7 @@ Score_engraver::forbid_breaks () result is junked. */ if (command_column_) - command_column_->remove_grob_property ("breakable"); + command_column_->set_grob_property ("breakable", SCM_EOL); } void diff --git a/lily/script-column.cc b/lily/script-column.cc index 5556d71520..deab16f026 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -70,7 +70,7 @@ Script_column::before_line_breaking (SCM smob) if (last) Side_position_interface::add_support (arr[i],last); - arr[i]->remove_grob_property ("script-priority"); + arr[i]->set_grob_property ("script-priority", SCM_EOL); last = arr[i]; } diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 2b7ae5f9d8..ad7f50b903 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -103,10 +103,10 @@ Side_position_interface::general_side_position (Grob * me, Axis a, bool use_exte Direction dir = Side_position_interface::get_direction (me); Real off = me->get_parent (a)->relative_coordinate (common, a); - SCM minimum = me->remove_grob_property ("minimum-space"); + SCM minimum = me->get_grob_property ("minimum-space"); Real total_off = dim.linear_combination (dir) - off; - SCM padding = me->remove_grob_property ("padding"); + SCM padding = me->get_grob_property ("padding"); if (gh_number_p (padding)) { total_off += gh_scm2double (padding) * dir; diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc index 5be0e8ded7..ddce45c946 100644 --- a/lily/spaceable-grob.cc +++ b/lily/spaceable-grob.cc @@ -94,9 +94,9 @@ Spaceable_grob::add_spring (Grob*me, Grob * p, Real d, Real strength, bool expan void Spaceable_grob::remove_interface (Grob*me) { - me->remove_grob_property ("minimum-distances"); - me->remove_grob_property ("spacing-wishes"); - me->remove_grob_property ("ideal-distances"); + me->set_grob_property ("minimum-distances" , SCM_EOL); + me->set_grob_property ("spacing-wishes", SCM_EOL); + me->set_grob_property ("ideal-distances", SCM_EOL); } diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index eb2bf92e11..07ff23e07e 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -146,24 +146,6 @@ Stem_engraver::stop_translation_timestep () daddy_trans_->unset_property (ly_symbol2scm ("stemRightBeamCount")); } - - // UGH. Should mark non-forced instead. - /* - aargh: I don't get it. direction is being set (and then set - to forced), if we have a Chord_tremolo. - */ - - /* - Why the separate check for forced directions? --hwn. - - (docme) - */ - SCM dir = stem_->get_grob_property ("direction"); - if (gh_number_p (dir) && to_dir (dir)) - { - stem_->set_grob_property ("dir-forced", SCM_BOOL_T); - } - typeset_grob (stem_); stem_ = 0; } diff --git a/lily/stem.cc b/lily/stem.cc index 47300d7a82..b17f0a383a 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -491,7 +491,7 @@ Stem::before_line_breaking (SCM smob) } else { - me->remove_grob_property ("molecule-callback"); + me->set_grob_property ("molecule-callback", SCM_EOL); } return SCM_UNSPECIFIED; @@ -896,6 +896,6 @@ Stem::beam_multiplicity (Grob *stem) ADD_INTERFACE (Stem,"stem-interface", "A stem", - "up-to-staff avoid-note-head adjust-if-on-staffline thickness stem-info beamed-lengths beamed-minimum-lengths lengths beam stem-shorten duration-log beaming neutral-direction stem-end-position support-head note-heads direction length style no-stem-extend flag-style dir-forced"); + "up-to-staff avoid-note-head adjust-if-on-staffline thickness stem-info beamed-lengths beamed-minimum-lengths lengths beam stem-shorten duration-log beaming neutral-direction stem-end-position support-head note-heads direction length style no-stem-extend flag-style"); diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index 7835edc96b..ab79c1ce4e 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -150,7 +150,6 @@ square of the inner notes involved.") (grob-property-description 'neutral-position number? "Position (in half staff spaces) where to flip the direction of stems: by default, custodes above this position get their stems downwards; custodes below this position get their stems upwards. A value of 0 designates the center of the staff. Use property neutral-direction to control the behaviour of stems on the neutral position itself. (Note: currently, neutral-position is supported only for custodes; for stems of note heads, neutral-position is currently fixed to 0, i.e. the middle of the staff.)") (grob-property-description 'dependencies grob-list? "list of score-grob pointers that indicate who to compute first for certain global passes.") (grob-property-description 'details list? "alist of parameters for detailed grob behavior.") -(grob-property-description 'dir-forced boolean? "set if direction has been forced; read by Beam.") (grob-property-description 'dir-function procedure? "function of type (count total)->direction. Default value: beam-dir-majority, also available: beam-dir-mean, beam-dir-median. The ways to calculate the direction of a beam work as follows: -- 2.39.2