From: fred <fred>
Date: Tue, 26 Mar 2002 21:50:12 +0000 (+0000)
Subject: lilypond-1.1.47
X-Git-Tag: release/1.5.59~2419
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bac497e77140bd168686f133796610de4cf1dbf2;p=lilypond.git

lilypond-1.1.47
---

diff --git a/input/test/multi-measure-rest.ly b/input/test/multi-measure-rest.ly
index 1e2e3195ab..696b9bad5b 100644
--- a/input/test/multi-measure-rest.ly
+++ b/input/test/multi-measure-rest.ly
@@ -1,5 +1,5 @@
 
-\score { \notes { \time 3/4; \key cis; R2. R2.*5 }
+\score { \notes { \time 3/4; \key cis; R2.*5 R2. R2.*5 }
 	\paper {
 	\translator { \ScoreContext skipBars = 1; }
 	linewidth = -1.;	
diff --git a/lily/g-script-engraver.cc b/lily/g-script-engraver.cc
index b7afb866f5..bac7b55cb2 100644
--- a/lily/g-script-engraver.cc
+++ b/lily/g-script-engraver.cc
@@ -73,10 +73,17 @@ G_script_engraver::do_process_requests()
       if (l->dir_)
 	ss->dir_ = l->dir_;
 
+      Real padding = 1.0;
+      Scalar paddingprop = get_property ("articulationScriptPadding", 0);
+      if (paddingprop.length_i() && paddingprop.isnum_b ())
+	{
+	  padding = (Real)paddingprop;
+	}
+      
       ss->staff_support_b_ = !follow_staff;
       p->set_staff_side (ss);
       ss->set_elt_property (script_priority_scm_sym, priority);
-      ss->set_elt_property (padding_scm_sym, gh_double2scm(1.0));
+      ss->set_elt_property (padding_scm_sym, gh_double2scm(padding));
       script_p_arr_.push (p);
       staff_side_p_arr_.push (ss);
       
diff --git a/mutopia/N.W.Gade/parts.ly b/mutopia/N.W.Gade/parts.ly
index e70c89dbe2..32616d92f0 100644
--- a/mutopia/N.W.Gade/parts.ly
+++ b/mutopia/N.W.Gade/parts.ly
@@ -8,6 +8,9 @@ copyright =	"Mats Bengtsson, 1999. Free circulation permitted and " +
 		"Statens Musikbibliotek, Stockholm, Sweden";
 }
 
+% Process with 'ly2dvi -s parts.ly' to get the separate parts.
+
+
 \version "1.0.20";
 
 \include "global.ly"
@@ -19,29 +22,26 @@ my_paper = \paper {
   textheight = 275.0 \mm;
   \translator {
     \OrchestralPartStaffContext
-    textScriptPadding = 5.0;
   }
   \translator { 
     \ScoreContext
     skipBars = 1;
     markScriptPadding = "6.0";
-    textstyle = "italic";
-    textEmptyDimension = 1;
-    oldTieBehavior = 1;
-  }
-  \translator { \VoiceContext
-    oldTieBehavior = 1;
+    barNumberScriptPadding = "11.0";
+    textScriptPadding = 5.0;
     textstyle = "italic";
     textEmptyDimension = 1;
   }
 }
-
+%{
 \score{
   \context Staff <
-    \global
-    \marks
-    \flauto
-    \flautohelp
+    \context Voice <
+      \global
+      \marks
+      \flauto
+    >
+    \context Voice = help \flautohelp
   >
   \header{
     instrument = "Flauto";
@@ -54,13 +54,15 @@ my_paper = \paper {
     \tempo 4=120;
   }
 }
-
+%}
 \score{
   \context Staff <
-    \global
-    \marks
-    \oboe
-    \oboehelp
+    \context Voice <
+      \global
+      \marks
+      \oboe
+    >
+    \context Voice = help \oboehelp
   >
   \header{
     instrument = "Oboe";
@@ -73,9 +75,9 @@ my_paper = \paper {
     \tempo 4=120;
   }
 }
-
+%{
 \score{
-  \context Staff <
+  \context Voice <
     \globalNoKey
     \marks
     \clarI
@@ -93,7 +95,7 @@ my_paper = \paper {
 }
 
 \score{
-  \context Staff <
+  \context Voice <
     \globalNoKey
     \marks
     \clarII
@@ -111,7 +113,7 @@ my_paper = \paper {
 }
 
 \score{
-  \context Staff <
+  \context Voice <
     \global
     \marks
     \fagotto
@@ -130,10 +132,12 @@ my_paper = \paper {
 
 \score{
   \context Staff <
-    \globalNoKey
-    \marks
-    \corI
-    \corIhelp
+    \context Voice <
+      \globalNoKey
+      \marks
+      \corI
+    >
+    \context Voice = help \corIhelp
   >
   \header{
     instrument = "Corno I in F";
@@ -149,10 +153,12 @@ my_paper = \paper {
 
 \score{
   \context Staff <
-    \globalNoKey
-    \marks
-    \corII
-    \corIIhelp
+    \context Voice <
+      \globalNoKey
+      \marks
+      \corII
+    >
+    \context Voice = help \corIIhelp
   >
   \header{
     instrument = "Corno II in F";
@@ -168,10 +174,12 @@ my_paper = \paper {
 
 \score{
   \context Staff <
-    \globalNoKey
-    \marks
-    \trpI
-    \trpIhelp
+    \context Voice <
+      \globalNoKey
+      \marks
+      \trpI
+      >
+    \context Voice = help \trpIhelp
   >
   \header{
     instrument = "Tromba I in B\\textflat";
@@ -187,10 +195,12 @@ my_paper = \paper {
 
 \score{
   \context Staff <
-    \globalNoKey
-    \marks
-    \trpII
-    \trpIIhelp
+    \context Voice <
+      \globalNoKey
+      \marks
+      \trpII
+    >
+    \context Voice = help \trpIIhelp
   >
   \header{
     instrument = "Tromba II in B\\textflat";
@@ -206,10 +216,12 @@ my_paper = \paper {
 
 \score{
   \context Staff <
-    \globalNoKey
-    \marks
-    \timpani
-    \timphelp
+    \context Voice <
+      \globalNoKey
+      \marks
+      \timpani
+    >
+    \context Voice = help \timphelp
   >
   \header{
     instrument = "Timpani \& Triangolo";
@@ -224,7 +236,7 @@ my_paper = \paper {
 }
 
 \score{
-  \context Staff <
+  \context Voice <
     \global
     \marks
     \viI
@@ -242,7 +254,7 @@ my_paper = \paper {
 }
 
 \score{
-  \context Staff <
+  \context Voice <
     \global
     \marks
     \viII
@@ -260,7 +272,7 @@ my_paper = \paper {
 }
 
 \score{
-  \context Staff <
+  \context Voice <
     \global
     \marks
     \notes{s2.*32 s2*142 \break}
@@ -279,7 +291,7 @@ my_paper = \paper {
 }
 
 \score{
-  \context Staff <
+  \context Voice <
     \global
     \marks
     \vlc
@@ -297,7 +309,7 @@ my_paper = \paper {
 }
 
 \score{
-  \context Staff <
+  \context Voice <
     \global
     \marks
     \cb
@@ -313,3 +325,4 @@ my_paper = \paper {
     \tempo 4=120;
   }
 }
+%}
\ No newline at end of file
diff --git a/mutopia/N.W.Gade/strings.ly b/mutopia/N.W.Gade/strings.ly
index 373cacafde..168c1fa52f 100644
--- a/mutopia/N.W.Gade/strings.ly
+++ b/mutopia/N.W.Gade/strings.ly
@@ -32,7 +32,7 @@ r8 [ c ( g' c, f c ] |
 [ bes c ] ) bes2 ~ |
 bes r4 |
 R2.*4 |
-r4 r^\fermata r8^\fermata [c'16 \pp ( d] | \time 2/4;
+r4 r r8 [c'16 \pp ( d] | \time 2/4;
 ) c8 r r [c16 ( d] |
 ) c8 r r [c16 ( d] |
 [c d c a][f a c d] |
@@ -255,7 +255,7 @@ c r a r |
 <a4 ) a'> r8 c, |
 f2 ~ |
 f ( |
-<f4 \fz c' ) a'> r^\fermata
+<f4 \fz c' ) a'> r
 
 }
 
@@ -291,7 +291,7 @@ c \< ~ |
 \! c \pp ~ |
 c2 r4 |
 R2.*4 |
-r4 r^\fermata r8^\fermata [c'16 \pp ( d] | \time 2/4;
+r4 r r8 [c'16 \pp ( d] | \time 2/4;
 ) c8 r r [c16 ( d] |
 ) c8 r r [c16 ( d] |
 [c d c a][f a c d] |
@@ -558,7 +558,7 @@ es \< es4 \! d8 \f |
 <a4 ) a'> r8 c, |
 [a16 ( gis a gis][a gis a gis] |
 [a gis a gis][a gis a gis] |
-<) a4 f' \fz > r^\fermata 
+<) a4 f' \fz > r 
 }
 
 vla=\notes\relative c' {
@@ -588,10 +588,10 @@ g2 \mf [a8 \< ( \! d ] |
 [ c \> b \! c g e ) c] |
 [e'8. \pp ( f16 d8 e f d ] |
 b4 [c8 \< a f \! ) a ] |
-c,2 \p ~ c'4 |
-c,2 ~ c'4 |
-c,2 ~ c'4 |
-c, ~ c' r |
+c,2 \p () c'4 |
+c,2 () c'4 |
+c,2 () c'4 |
+c, () c' r |
 [c,8 ( g' ][ c g c a ] |
 [bes c ] ) a4 r |
 R2. |
@@ -603,7 +603,7 @@ r4 r c, \pp ~ |
 c2. ~ |
 c4 r r |
 R2.*3 |
-r4 r^\fermata r8^\fermata r8 |
+r4 r r8 r8 |
 R2*4 |
 c'8-. \pp r bes-. r |
 c-. r bes-. r |
@@ -832,7 +832,7 @@ a r c-. r |
 <f4 ) c'> r8 c, |
 [c'16 ( b c b][c b c b] |
 [c b c b][c b c b] |
-<c4 \fz ) a'> r^\fermata 
+<c4 \fz ) a'> r 
 }
 
 vlc=\notes\relative c' {
@@ -869,7 +869,7 @@ g ) f f, ( \< | % added slur
 ) e2. ~ |
 e2 r4 |
 R2.*4 |
-r4 r4^\fermata r8^\fermata [c'16 \pp ( d] | \time 2/4; % \pp added
+r4 r4 r8 [c'16 \pp ( d] | \time 2/4; % \pp added
 ) c8 r r [c16 ( d] | 
 ) c8 r r [c16 ( d] |
 [c d c a][f a c d] |
@@ -1102,7 +1102,7 @@ f4 r8 c8 ( |
 ) f4 r8 c8 ( |
 ) f,2 ~ |
 f ( |
-) f'4 \fz r^\fermata
+) f'4 \fz r
 }
 
 cb=\notes\relative c {
@@ -1136,7 +1136,7 @@ r4 r f ( \< |
 r r dis ( \< |
 \! ) e2 r4 |
 R2.*6 |
-r4 r^\fermata r8^\fermata r |
+r4 r r8 r |
 R2*4 |
 d8-. \pp r g-. r |
 d-. r g-. r |
@@ -1331,5 +1331,5 @@ f4 r8 c8 ( |
 ) f4 r8 c8 ( |
 ) f,2 ~ |
 f ( |
-) f'4 \fz r^\fermata
+) f'4 \fz r
 }
diff --git a/mutopia/N.W.Gade/wood.ly b/mutopia/N.W.Gade/wood.ly
index 17ee152456..6276f9af7b 100644
--- a/mutopia/N.W.Gade/wood.ly
+++ b/mutopia/N.W.Gade/wood.ly
@@ -20,7 +20,7 @@ R2.*4 |
 [c8. ( d16] c4. ) a8 |
 [a8. ( g16 ] ) f4 r |
 R2.*13 |
-r4 r4^\fermata r8^\fermata r8 \time 2/4;
+r4 r4 r8 r8 \time 2/4;
 R2*4 |
 d'8-. \pp r d-. r |
 d-. r d-. r |
@@ -191,7 +191,7 @@ f4 r8 c ( |
 ) a'4 r8 c, ( |
 ) f4 r |
 R2 |
-f4-. \fz r^\fermata
+f4-. \fz r
 }
 
 
@@ -212,7 +212,7 @@ R2.*4 |
 [c8. ( d16] c4. ) a8 |
 [a8. ( g16 ] ) f4 r |
 R2.*13 |
-r4 r4^\fermata r8^\fermata r8 \time 2/4;
+r4 r4 r8 r8 \time 2/4;
 R2*4 |
 a'8-. \pp r g-. r |
 a8-. r g-. r |
@@ -233,7 +233,7 @@ dis,2 |
 c r d r |
 g, r r4 |
 R2*10 |
-R4 r8 e' \p |
+r4 r8 e' \p |
 e [es-. es-.] d-. |
 d-. [cis-. cis-.] c-. |
 c [c16 ( d] [es8 d16 c] | % slur added
@@ -370,7 +370,7 @@ f4 r8 c' ( |
 ) a4 r8 c ( |
 ) f4 r |
 R2 |
-f4 \fz r^\fermata
+f4 \fz r
 
 }
 
@@ -398,7 +398,7 @@ d4-> () b r |
 r r \times 2/3 { [d8 ( b ) d ] } |
 a4 () d r |
 R2.*6 |
-r4 r4^\fermata r8^\fermata r8 |
+r4 r4 r8 r8 |
 R2*4 |
 gis,8-. \pp r a-. r |
 gis-. r a-. r |
@@ -606,7 +606,7 @@ g r d r |
 ) b'4 r8 d, ( |
 ) g,2 ~ |
 g ( |
-) g'4-. \fz r^\fermata
+) g'4-. \fz r
 }
 
 
@@ -634,7 +634,7 @@ d4 () b r |
 r r \times 2/3 { [d8 \f ( b ) d ] } |
 a4 () d r |
 R2.*6 |
-r4 r4^\fermata r8^\fermata r8 |
+r4 r4 r8 r8 |
 R2*9 |
 r4 r8 d-. \p |
 [c-. b-. \< a-. g-. ] |
@@ -815,7 +815,7 @@ b4 r |
 d4 r8 d, ( |
 ) g2 ~ |
 g ( |
-) b4-. \fz r^\fermata 
+) b4-. \fz r 
 }
 
 fagotto=\notes\relative c' {
@@ -825,7 +825,7 @@ fagotto=\notes\relative c' {
 [c8. \f ( d16 ] ) c2_"dim." |
 [c8. ( d16 ] ) c4 r |
 R2.*29 |
-r4 r4^\fermata r8^\fermata r8 |
+r4 r4 r8 r8 |
 R2*4 |
 c8-. \pp r bes-. r |
 c8-. r bes-. r |
@@ -1032,14 +1032,14 @@ c-. r c-. r |
 ) f4 r8 c ( |
 ) f,2 ~ |
 f ( |
-) c'4 \fz r^\fermata
+) c'4 \fz r
 }
 
 oboehelp=\notes\relative c'' {
 \tiny
 
 s2.*32 |
-s2*32 |
+s2*32 | \stemdown
 [a8^"Vi. I" ( g f d] |
 [b g ) a ] s8 |
 s2*106 |
@@ -1051,16 +1051,16 @@ flautohelp=\notes\relative c'' {
 \tiny
 
 s2.*32 |
-s2*32 |
+s2*32 | \stemdown
 [a8^"Vi. I" ( g f d] |
-[b g ) a ] s8 |
+[b g ) a ] s8 | \stemboth
 s2*60 |
 f''2^"Oboe" ( |
 b,4 [c8 ) b] |
-s2*44 |
+s2*44 | \stemdown
 [d8^"Vi. I" ( c bes g] |
 [e c ) d] s |
-s2*54 |
+s2*54 | \stemup
 bes''4.^"Vi. I"  a8 |
 [g-. f-. e-. ] s8 | 
 }