From be9c1b2ae1ec847eb06cd34aeb7f1dc69d3bdabd Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:42:09 +0000 Subject: [PATCH] lilypond-0.0.59 --- input/error.ly | 4 ++-- input/pedal.ly | 2 +- input/rhythm.ly | 4 ++-- input/scales.ly | 2 +- input/toccata-fuga-E.ly | 16 ++++++++-------- lily/item.cc | 6 ++++++ 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/input/error.ly b/input/error.ly index 4e05238f4c..351ba8725a 100644 --- a/input/error.ly +++ b/input/error.ly @@ -1,4 +1,4 @@ -\version "0.0.56"; +\version "0.0.57"; \include "this-is-hopefully-a-nonexisting-file" @@ -9,7 +9,7 @@ mwa = \melodic{ [ a8 a8 a8 a8 a8 ] % [ a8 ] % % segfault - < { [ bes^"1"( )a bes-. g-. ] a4-.^"4" } { [ e ] } { [ c ] } > | + < { [ bes^"1"~ a bes-. g-. ] a4-.^"4" } { [ e ] } { [ c ] } > | a ) b ] c % warning & % ok; error a b ) ] % ok; error diff --git a/input/pedal.ly b/input/pedal.ly index abebc0fccc..5e760771fe 100644 --- a/input/pedal.ly +++ b/input/pedal.ly @@ -24,7 +24,7 @@ % \lbheel \lbheel \lfheel \lftoe % \rbheel \rbtoe \rfheel \rftoe -\version "0.0.56"; +\version "0.0.57"; \score{ \staff{ melodicregs diff --git a/input/rhythm.ly b/input/rhythm.ly index 2447023f81..8205a45d5b 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -3,7 +3,7 @@ % % add any impressive examples here, please -\version "0.0.56"; +\version "0.0.57"; ritme = \staff { melodicregs @@ -12,7 +12,7 @@ ritme = \staff { \meter 4/4; c8 | - [a8() a8. a8 a16 a16 a16] c4. | % watch the beams! + [a8~ a8. a8 a16 a16 a16] c4. | % watch the beams! r32 r32 r16 r8 r4 r2 | \meter 5/16; diff --git a/input/scales.ly b/input/scales.ly index f819c24026..1a46c21337 100644 --- a/input/scales.ly +++ b/input/scales.ly @@ -2,7 +2,7 @@ % scales with accents. % -\version "0.0.56"; +\version "0.0.57"; blah = \staff{ melodicregs \melodic { \meter 6/8; diff --git a/input/toccata-fuga-E.ly b/input/toccata-fuga-E.ly index 0220b0f89d..4cdeb0a2f2 100644 --- a/input/toccata-fuga-E.ly +++ b/input/toccata-fuga-E.ly @@ -13,7 +13,7 @@ % * organ staff... % -\version "0.0.56"; +\version "0.0.57"; toccata_commands = \melodic{ \meter 4/4; @@ -26,8 +26,8 @@ toccata_right = \melodic{ % 13 -- how to type -- where to split -- this more neatly ? \octave c'; <\multivoice - { \stem 1; \hshift 1; r4 dis'4 e'4.-. e'8( | )e'4 [d'8 fis'8] gis'4 [gis'8 fis'16 e'16] | fis'4( )[fis'8 e'16 dis'16] e'4 r8 e'8 } - { \stem 1; r4 bis4 cis'4-. cis'4 | ais'4( )[ais'16 gis'16 ais'16 b'16] dis'4 cis'4( | )[cis'8 dis'16 ais16] bis4 cis'4 r8 b8 } + { \stem 1; \hshift 1; r4 dis'4 e'4.-. e'8~ e'4 [d'8 fis'8] gis'4 [gis'8 fis'16 e'16] | fis'4~ [fis'8 e'16 dis'16] e'4 r8 e'8 } + { \stem 1; r4 bis4 cis'4-. cis'4 | ais'4~ [ais'16 gis'16 ais'16 b'16] dis'4 cis'4~ [cis'8 dis'16 ais16] bis4 cis'4 r8 b8 } { \stem -1; r4 < gis4 fis4 dis4 > gis4-. gis4 | ais4. cis'8 gis2 | fis4 gis4 gis4 r8 e8 } > | % 16 @@ -39,8 +39,8 @@ toccata_left = \melodic{ \clef bass; % 13 <\multivoice - { \stem 1; bis2 cis'4-. cis'4( | )[cis'8 ais'8 d'8 cis'8] [bis8 gis8] cis'4 | dis'2 cis'4 r8 cis'8 } - { \stem 1; \hshift 1; r4 gis4. gis8( )gis4 | \stem -1; \hshift 0; ais4. fis8 gis4. ais8( | )ais4 gis4-. gis4 r8 gis8 } + { \stem 1; bis2 cis'4-. cis'4~ [cis'8 ais'8 d'8 cis'8] [bis8 gis8] cis'4 | dis'2 cis'4 r8 cis'8 } + { \stem 1; \hshift 1; r4 gis4. gis8~ gis4 | \stem -1; \hshift 0; ais4. fis8 gis4. ais8~ ais4 gis4-. gis4 r8 gis8 } { \stem -1; r4 < dis4 fis4 > < cis4 e4 > } > | % 16 @@ -80,9 +80,9 @@ fuga2_right = \melodic{ > | % 16 <\multivoice - { \stem 1; dis'2 dis'4 | cis'2 cis'4 | b4( )[b8 cis'8 dis'8 e'8] } - { \stem 1; \hshift 1; b8 fis8 b2( | )[b8 a16 g16] a2 | a4 gis2 } - { \stem -1; fis2.( | )fis2.( | )fis4 e2 } + { \stem 1; dis'2 dis'4 | cis'2 cis'4 | b4~ [b8 cis'8 dis'8 e'8] } + { \stem 1; \hshift 1; b8 fis8 b2~ [b8 a16 g16] a2 | a4 gis2 } + { \stem -1; fis2.~ fis2.~ fis4 e2 } > | % 19 } diff --git a/lily/item.cc b/lily/item.cc index e35ab29446..e586547d80 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -31,3 +31,9 @@ Item::hpos_f()const { return pcol_l_->hpos + offset().x; } + +Line_of_score * +Item::line_l()const +{ + return pcol_l_->line_l_; +} -- 2.39.5