From: fred <fred>
Date: Sun, 24 Mar 2002 19:30:29 +0000 (+0000)
Subject: lilypond-0.0.28
X-Git-Tag: release/1.5.59~5463
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8edd5350151d470e60085cc2f3605aa41a9eb444;p=lilypond.git

lilypond-0.0.28
---

diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly
new file mode 100644
index 0000000000..8401484811
--- /dev/null
+++ b/input/scsii-menuetto.ly
@@ -0,0 +1,153 @@
+% scsii-menuetto.ly
+%
+% Solo Cello Suites
+% J. S. Bach
+%
+% Suite II part v
+% Menuetto I
+%
+% Copyright (c) 1995,1996,1997 Jan Nieuwenhuizen <jan@digicash.com>
+% 
+% The purpose of this file is to demonstrate features of LilyPond.
+% (there is an accompanying LaTeX file, scsii-menuetto.tex)
+%
+
+% \lefttitle{Menuetto}
+% \tempo{Moderato}
+% \metron{4=120}
+%
+% \meter{3/4}
+% \key\F		% key is F ( f-major )
+% \clef\alto		% use alto clef
+% \duration8		% default duration is 'eight note
+%
+% \verb{\nobarnumbers}	% issue MusiXTeX command
+% \barnumbering0
+% \slope{30}		% Fool MusiXTeX into 30 / 10 steeper beam
+% \stemlength3		% shorter stemlength
+%		% because piece is set very tightly
+%%1		% double comments are included in .tex file
+ii_menuetto = music {
+	$
+	\octave{}
+	\duration{8}
+	{ a2 f2 d2_"\f" } bes4-.  |
+%%2
+	{ [ bes^"1" e c_"2"_"4" }
+%	(^ )
+	a bes-. g-. ] a4-.^"4" |
+%%3
+%	{ d4 `bes4-.\stemup } stemup: 2 voices?
+	{ d4 `bes4-. } g4-. [ f-. e-. ] |
+%%4
+%	{ f `a } (^ e ) d cis-. `b-. `a-. ]
+%	[ f ( e ) d cis-. `b-. `a-. ]
+	{ [ f `a } e d cis-. `b-. `a-. ]
+%%5
+	{ a2 f2 d2 } bes4-. | %   @bes4-. |
+%%6
+%	{  bes( e  }  ) a
+	{ [ bes e } a bes-. g-. ]
+	'c4-. | % ='c4-. |
+%%7
+	{ a4-. f4}
+%	{ 'd4-.-\upbow f4 `bes4\stemdown }
+	{ 'd4-.-\upbow f4 `bes4 }
+%	{ 'e4-.-\downbow g4 `g4\stemdown } |
+	{ 'e4-.-\downbow g4 `g4 } |
+%%8
+%	{ 'cis2.-\upbow e2. `a2.\stemdown } :||:
+	{ 'cis2.-\upbow e2. `a2. } | % :||:
+%%9
+%	\clef "violin"
+%	{ 'e2 a2_f\stemdown }
+	{ 'e2 a2_"\f" }
+	[ 'd( 'e16 )'f16 ] |
+%%10
+%	[ { 'e( g } ) 'd 'cis_{ }_{ }_2 'e
+	{ [ 'e g } 'd 'cis_"2" 'e a( )g ] |
+%%11
+%	{ a4\stemup( f2\stemdown } ) 'd4\stemup
+%	{ 'cis4\stemup-. e4\stemdown }
+	{ \music { a4 'd4 'cis4-. } \music { f2 e4 } } |
+%%12
+%	{ 'g^4 d\stemdown } (^  'f 'e ) 'f 'd^3(^ ) ='c ] |
+	{ [ 'g^"4" d } 'f 'e 'f 'd^"3"( ) 'c ] |
+% %13
+%	{ bes2\stemup g4\stemdown } ( )  f4
+%	{ 'c4\stemup e4\stemdown }
+%	{ bes2 g4 } f4 { 'c4 e4 } | % \clef "alto" |
+	{ \music { bes2 'c4 } \music { g4 f4 e4 } } |
+%%%14
+%%	[ { a( f } ) g a f ] { 'd4-\upbow e4 `bes4\stemdown } |
+	{ [ a f } g a f ] { 'd4-\upbow e4 `bes4 } |
+%%%15
+%%	{ 'c4-\downbow f4 `a4\stemdown } [ bes( )a g a ] |
+%	{ 'c4-\downbow f4 `a4 } [ bes( )a g a ] |
+%%%16
+	[ f( e )f a-. g-. bes-. ] |
+%% \tighten		% use one line less
+%% \newline		% start new line
+%%	|
+%%%17
+%%	{ a2^0^\tr fis2_3 } bes4 |
+	{ a2^"0" fis2_"3" } bes4 |
+%%%18
+%%	[ { 'c( es } ) bes 'c a ] fis4^\tr |
+	{ [ 'c es } bes 'c a ] fis4 |
+%%%19
+%%	{ 'd4-\downbow g4 `bes4\stemdown } { 'c4-\upbow g4 c4\stemdown } [ { bes d } a ] |
+	{ 'd4-\downbow g4 `bes4 } { 'c4-\upbow g4 c4 } { [ bes d } a ] |
+%%%20
+%%	[ { 'c( d `g } bes a ) bes g ( ) bes ] |
+	{ [ 'c d `g } bes a bes g( )bes ] |
+%%%21
+%%	{ 'd4\stemup g2\stemdown } (^ ) 'cis4\stemup { 'd4\stemup =f4\stemdown } |
+%	{ 'd4 g2 } 'cis4 { 'd4 f4 } |
+	{ \music { 'd4 'cis4 'd4 } \music { g2 f4 } } |
+%%%22
+%%	[ { g(  cis } )f g e ] { f4 d4 } |
+	{ [ g cis } f g e ] { f4 d4 } |
+%%%23
+%%	[ `g g ] { e4.\stemup^\tr `a4.\stemdown } d\stemup-\upbow |
+	[ `g g ] { e4. `a4. } d-\upbow |
+%%%24
+%%	{ d2.^{fine}  `a2. `d2.\stemup_{ }_{ }_{3 mins.}}	s4 :||
+%%	{ \textstyle "italic" d2.^"fine" `a2. \textstyle "roman" `d2._"3 mins."} | % :||
+	{ d2.^"fine" `a2. `d2._"3 mins."} | % :||
+%% \tighten		% use one line less
+	$
+}
+
+score {
+	staff { 
+		melodic
+		music { ii_menuetto }
+		commands {
+			key $bes$
+			clef "alto"	
+			skip 8:0
+			clef "violin"
+			skip 5:0
+			clef "alto"
+			skip 12:0
+		}
+	}
+	commands {
+		meter 3*4
+		skip 8:0
+		bar ":|:"
+%		clef "violin"
+		skip 5:0
+%		\clef "alto" 
+		skip 12:0
+		bar ":||"
+	}
+	paper {
+		symboltables { table_sixteen }
+		width 195mm
+%		unitspace 12mm % this should do, really
+		unitspace 8mm  % to get lily to use only three lines
+		output "scsii-menuetto.out"
+	}
+}
diff --git a/src/request.cc b/src/request.cc
index 3be4f8260e..0a5c8dc3d8 100644
--- a/src/request.cc
+++ b/src/request.cc
@@ -60,10 +60,27 @@ Request::Request()
     elt_l_ = 0;
     defined_ch_c_l_m = 0;
 }
-Request::Request(Request const&)
+Request::Request(Request const&src)
 {
     elt_l_ = 0;
-    defined_ch_c_l_m = 0;
+    defined_ch_c_l_m = src.defined_ch_c_l_m;
+}
+/****************/
+Spacing_req::Spacing_req()
+{
+    next = 0;
+    distance = 0;
+    strength = 0;
+}
+void
+Spacing_req::do_print()const
+{
+    mtor << "next " << next << "dist " << distance << "strength\n";
+}
+void
+Blank_req::do_print()const
+{
+    Spacing_req::do_print();
 }
 /****************/
 Melodic_req::Melodic_req()
diff --git a/src/timedescription.cc b/src/timedescription.cc
index cabaeb00cf..1a66b44a44 100644
--- a/src/timedescription.cc
+++ b/src/timedescription.cc
@@ -1,5 +1,6 @@
 #include "timedescription.hh"
 #include "debug.hh"
+
 String
 Time_description::str()const
 {
@@ -57,7 +58,7 @@ Time_description::Time_description(Moment dt, Time_description const *prev)
     } else {    			// default 4/4
 	whole_per_measure = 1;
 	whole_in_measure =0;
-	one_beat = 0.25;
+	one_beat = Moment(1,4);
 	when = 0.0;
 	bars = 0;
 	cadenza_b_ = false;