From: fred <fred>
Date: Sun, 24 Mar 2002 19:37:11 +0000 (+0000)
Subject: lilypond-0.0.46.jcn1
X-Git-Tag: release/1.5.59~5080
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b48409f86d097bc8e6a97e9d0ab9891b83bf92b9;p=lilypond.git

lilypond-0.0.46.jcn1
---

diff --git a/input/scales.ly b/input/scales.ly
index 0c210cbf77..1fe1f39875 100644
--- a/input/scales.ly
+++ b/input/scales.ly
@@ -1,41 +1,42 @@
 
-blah = \staff{\melodic{    \meter {6/8}
-                \skip {36*8}
-		\meter {4/4}}
-	\melodic{ 	
-\duration { 8 }
-			\octave{ }
-			 |[ a a a a a a a a a ]6/9 
-			\octave{ 1 }
-			 |[ a a a a a a a a a ]6/9 
-			\octave { ' } 
+blah = \staff{  "melodic" 
+	\melodic {
+		\duration { 8 }		  \meter {6/8}	
+ 		
+		\octave{ c }
+			 |[ a cr a a a a a a a rc a ]6/9 
+			\octave{ c }
+			 |[ a decr a a a a a a a rc a ]6/9 
+			\octave { c' } 
 			 [ 'c 'g d a e' b' f'' c''' g''' ]6/9
 			 [ g''' c''' f'' b' e' a d 'g 'c ]6/9
-			\octave{ 1 }
+			\octave{ c'' }
 			 [ 'c 'g d a e' b' f'' c''' g''' ]6/9
 			 [ g''' c''' f'' b' e' a d 'g 'c ]6/9
-			\octave { } 
+			\octave { ''c}   
 			 [ c g d' ]2/3 
 			 [ d' g c ]2/3  
 			 [ f c' g' ]2/3 
 			 [ g' c' f ]2/3  
-			\octave{ 1 }
+			\octave{ c }
 			 [ c g d' ]2/3 
 			 [ d' g c ]2/3  
 			 [ f c' g' ]2/3 
 			 [ g' c' f ]2/3 
-
+ [ g' c' f ]2/3 
+  \meter {4/4}
+	
 c1
 	\duration { 8}
 	[c-> d-> e-> f->][g-> a-> b-> c'->] % 1
-\octave{'}	[c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
-\octave{}	[c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
+\octave{c'}	[c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
+\octave{c}	[c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]
 	[c-. d-. e-. f-.][g-. a-. b-. c'-.]
 	[c'-- b-- a-- g][f-- e-- d c--] % 5
-	[c-\portato d-\portato e-\portato f-\portato]
-		[g-\portato a-\portato b-\portato c'-\portato]
-	[c'-\upbow b-\upbow a-\downbow g-\downbow]
-		[f-\downbow e-\downbow d-\upbow c-\upbow]
+	[c-portato d-portato e-portato f-portato]
+		[g-portato a-portato b-portato c'-portato]
+	[c'-upbow b-upbow a-downbow g-downbow]
+		[f-downbow e-downbow d-upbow c-upbow]
 	[c-| d-| e-| f-|][g-| a-| b-| c'-|]
 	[c' b a g][f e d c]
 	[c d e f][g a b c'] % 10 
diff --git a/lily/include/crescendo.hh b/lily/include/crescendo.hh
index 858cd44075..cb6b159ad7 100644
--- a/lily/include/crescendo.hh
+++ b/lily/include/crescendo.hh
@@ -11,12 +11,19 @@
 #define CRESCENDO_HH
 
 #include "spanner.hh"
-
+/**
+  The hairpin symbol. (cresc)
+ */
 class Crescendo : public Spanner {
     int staff_size_i_;
 public:
     int grow_dir_i_;
     int dir_i_;
+    /// if there is a dynamic at the end, make the sign smaller.
+    bool right_dyn_b_;
+
+    /// if there is a dynamic at the end, make the sign smaller.
+    bool left_dyn_b_;
     Crescendo(int staff_size_i);
 private:
     Spanner* do_break_at( PCol*, PCol*) const;
diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 2237f63806..3325743dbe 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -41,6 +41,7 @@
         \font\hslurdfont=xslhd20
         \font\hslurhfont=xslhz20
         \font\musicfnt=musix20
+        \font\musicdraw=musixsps
         \font\italicfont=cmti10
         \font\dynfont=cmbxti10 scaled \magstep1
         \balkhoog=20pt
@@ -63,6 +64,7 @@
         \font\hslurhfont=xslhz20
         \font\musicfnt=musix16
         \font\dynfont=cmbxti10
+        \font\musicdraw=musixsps
         \balkhoog=16pt
         \staffrulethickness=0.4pt
         \notewidth=5pt
@@ -246,8 +248,8 @@
 
 \def\beamslope#1#2{{\count0=#2\advance\count0 by#1\musicfnt\char\count0}}
 \def\rulesym#1#2{\vrule height #1 width #2}
-\def\crescendosym#1{\count0=84\advance\count0 by #1}
-\def\decrescendosym#1{\count0=116\advance\count0 by #1}
+\def\crescendosym#1{\count0=84\advance\count0 by #1\musicdraw\char\count0}
+\def\decrescendosym#1{\count0=116\advance\count0 by #1\musicdraw\char\count0}
 \def\settext#1{\textfont #1}
 \def\setitalic#1{\italicfont #1}
 \def\setdynamic#1{\dynfont #1}