X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mutopia%2FHymns%2Fdiademata.ly;h=b3310914a36f1fd70232c7dde711e11242ea554a;hb=refs%2Ftags%2Frelease%2F1.1.64;hp=57735bf9842bdc1d2d5bdce17424f11ff81fdf33;hpb=194ef0e7e19c7a7c0836b6bd3ed2788a56220d2f;p=lilypond.git

diff --git a/mutopia/Hymns/diademata.ly b/mutopia/Hymns/diademata.ly
index 57735bf984..b3310914a3 100644
--- a/mutopia/Hymns/diademata.ly
+++ b/mutopia/Hymns/diademata.ly
@@ -1,78 +1,84 @@
 \header {
-filename = "diademata.ly";
-enteredby = "Peter Chubb";
-composer = "Sir G. J. Elvey";
-date = "1868";
-title = "Diademata";
-metre = "6 6. 8 6. D";
+  filename = "diademata.ly";
+  enteredby = "Peter Chubb";
+  composer = "Sir G. J. Elvey";
+  date = "1868";
+  title = "Diademata";
+  metre = "6 6. 8 6. D";
 }
-\version "1.0.16";
+
+\version "1.1.52";
 
 sop=\notes \transpose c''{
-	ees2  | ees4 ees4 g2 g2 |  c'1.  \bar "||";
-	c'2 | bes2 ees aes g |  f1.  \bar "||";
-	f2 | g bes c' bes |  a g4 ~ f  bes2  
-	ees'2 | d' ees' c' c' |  bes1.  \bar "||";
-	bes2 | bes g f ees |  c'1.  \bar "||";
-	c'2 | c' a g f |  d'1.  \bar "||";
+	ees2  ees4 ees4 g2 g2 |  c'1.
+	c'2 | bes2 ees aes g |  f1.
+	f2 | g bes c' bes |  a g4( )f  bes2  
+	ees'2 | d' ees' c' c' |  bes1.
+	bes2 | bes g f ees |  c'1.
+	c'2 | c' a g f |  d'1.
 	d'2 | ees'2. d'4 c'2 bes |  aes f g 
-	bes2 | aes g f f | ees\breve \bar "||";
+	bes2 | aes g f f | ees\breve
 
 }
 
 alt=\notes \transpose c''{
-	bes,2 bes,4 bes,4 ees2 ees2 |  ees1.  \bar "||";
-	ees2 | ees ees d ees |  d1.  \bar "||";
+	bes,2 bes,4 bes,4 ees2 ees2 |  ees1.  
+	ees2 | ees ees d ees |  d1.  
 	d2 | ees f ees g |  ees c f 
-	ees2 | f g c f |  d1.  \bar "||";
-	d2 | ees ees d ees |  ees1.  \bar "||";
-	e2 | f f ees ees |  d1.  \bar "||";
+	ees2 | f g c f |  d1.  
+	d2 | ees ees d ees |  ees1.  
+	e2 | f f ees ees |  d1.  
 	f2 | ees ees ees ees |  ees d ees 
-	ees | ees ees ees d | ees\breve  \bar "||";
+	ees | ees ees ees d | ees\breve  
 }
 
 
 ten=\notes \transpose c' {
-	g2  g4 g4 g2 g2 |  aes1.  \bar "||";
-	aes2 | bes c' aes bes |  bes1.  \bar "||";
+	g2  g4 g4 g2 g2 |  aes1.  
+	aes2 | bes c' aes bes |  bes1.  
 	bes2 | bes bes g g  |  c' a bes 
-	a2 | bes bes bes a |  bes1.  \bar "||";
-	bes2 | bes bes aes bes |  c'1.  \bar "||";
-	bes2 | a c' bes c' |  bes1.  \bar "||";
+	a2 | bes bes bes a |  bes1.  
+	bes2 | bes bes aes bes |  c'1.  
+	bes2 | a c' bes c' |  bes1.  
 	bes2 | bes bes aes bes |  c' bes bes 
-	bes c' bes bes2. aes4 | g\breve  \bar "||";
+	bes c' bes bes2. aes4 | g\breve  
 }
 
 bass=\notes \transpose c' {
-	ees2 ees4 ees4 c2 c2 |  aes,1.  \bar "||";
-	aes2 | g aes f ees |  bes,1.  \bar "||";
+	ees2 ees4 ees4 c2 c2 |  aes,1.
+	aes2 | g aes f ees |  bes,1.  
 	bes,2 | ees d c ees |  f ees d 
-	c2 bes, ees f f |  bes,1.  \bar "||";
-	aes2 | g ees f g |  aes1.  \bar "||";
-	g2 | f f g a |  bes1.  \bar "||";
+	c2 bes, ees f f |  bes,1.  
+	aes2 | g ees f g |  aes1.  
+	g2 | f f g a |  bes1.  
 	aes2 | g g  aes g | f bes ees 
-	g,2 | aes, ees bes, bes, | ees\breve  \bar "||";
+	g,2 | aes, ees bes, bes, | ees\breve
 }
 
 global = \notes{
 	\time 4/2;
-	\property Staff.timeSignatureStyle="none"
 	\key ees;
+	\skip 2*4; \skip 1.; \bar "||";
+	\skip 2; \skip 2*4; \skip 1.; \bar "||";\break
+	\skip 2; \skip 2*12;\skip 1.; \bar "||";\break
+	\skip 2; \skip 2*4; \skip 1.; \bar "||";
+	\skip 2; \skip 2*4; \skip 1.; \bar "||";\break
+	\skip 2; \skip 2*12;\skip 1.; \bar "||";
 }
 
 $upper_staff = \context Staff = upper {
-	\global
 	\clef "treble";
 	\context Staff <
+		\global
 		{ \voiceone \sop }
 		{ \voicetwo \alt }
 	>
 }
 
 $lower_staff = \context Staff = lower {
-	\global
 	\clef "bass";
 	\context Staff <
+		\global
 		{ \voiceone \ten }
 		{ \voicetwo \bass }
 	>
@@ -84,7 +90,12 @@ $lower_staff = \context Staff = lower {
 		\$lower_staff
 	>
 	\paper {
+	        indent = 0.0\mm;
 		linewidth= 140.0\mm;
 		gourlay_maxmeasures = 6.0;
+		\translator{
+			\StaffContext
+			\remove "Time_signature_engraver";
+		}
 	}
 }