patch::: 1.1.21.jcn2: gnossienne-4 in pats

pl 21.jcn2
	- gnossienne: hmm, how to
	  * undisplay bars
	  * don't put 'grace notes' in beam
	  * put separator between  "] \translator Staff=x"

diff --git a/NEWS b/NEWS
index 1cd713eed32860759c62f047e31e8768a0d18a36..16b1c5fd353593aa48ad5b6595055f17c5ef2cc8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+pl 21.jcn2
+       - gnossienne: hmm, how to 
+         * undisplay bars
+         * don't put 'grace notes' in beam
+         * put separator between  "] \translator Staff=x" 
+
 pl 21.jcn1
        - gnossienne-4.ly (start of)
 pl 20.jcn2

diff --git a/VERSION b/VERSION
index 7594902a302e39667874642b64d5db3d6a72175f..5dd96385e4122c443511ec7c8f5aa17a65b56f45 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=21
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/mutopia/gnossienne-4.ly b/mutopia/gnossienne-4.ly
index 26c7c0306ac04a31a3c9e67512735185bc32c091..5545f5f9431e43b83b2d657eb61a9371aeb5e63d 100644 (file)
--- a/mutopia/gnossienne-4.ly
+++ b/mutopia/gnossienne-4.ly
@@ -19,52 +19,113 @@
 global = \notes {
   \key a \minor;
   \time 6/4;
-  \cadenza 1;
-  \property Staff.timeSignatureStyle = ""
+%  \cadenza 1;
+  \skip 1.*34;
+  \bar ".|";
 }
   
-one = \type Voice=one \notes \relative c'''{
+upper = \type Voice=one \notes \relative c''{
   \clef violin;
-  r2 r r r r r 
-  r4 [a8--(\< a--] [a-- a-- c-- \!b--] [a--\> fis g \!)e]
+  \stemup
+  r2 r r 
+  r2 r r 
+  r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> fis g \!e]
+  % grace hack
+  [es8 { \type Voice=urgnobeam \tiny b8*1/16 ~ \normalsize } )c*15/16] r4 r2 r
+  r2 r r
+  r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> fis g \!e]
+  [es8 { \type Voice=urgnobeam \tiny b8*1/16 ~ \normalsize } )c*15/16] r4 r2 r
+  r4 [g16( a bes a] [g a bes a g a bes a] [g a bes a g fis es fis] 
+  )d4 \tiny fis8*1/16 ~ \normalsize gis4*31/32 ~ gis8 r r4 r2
+  r4 [g16( a bes a] [g a bes a g a bes a] [g a bes a g fis es fis] 
+  )d4 \tiny fis8*1/16 ~ \normalsize gis4*31/32 ~ gis8 r r4 r2
+  \tiny a8*1/16 ~ \normalsize f4*31/32 ~ f8 r r2 r
+  r2 r4 [a8( b][c d c b] \tiny b8*1/16 ~ \normalsize [e8*15/16 
+  { \type Voice=urgnobeam \tiny a,8*1/16 ~ \normalsize } )g8*15/16] r4 r2 r
+  r2 r4 [a8( b][c d c b] [a b c d][c b a b][c d c b]
+  \tiny b8*1/16 ~ \normalsize [e8*15/16 
+  { \type Voice=urgnobeam \tiny a,8*1/16 ~ \normalsize } )g8*15/16] r4 r2 r
+  a2( \tiny e'8*1/16 ~ \normalsize f4*31/32 ~ )f8 r r2
+  r2 r r
+  fis,4( \tiny dis8*1/16 \normalsize <)cis4*31/32 ais> r2 r
+  \tiny b'8*1/16 ~ \normalsize [a8*15/16 
+  { \type Voice=urgnobeam \tiny b8*1/16 ~ \normalsize } a8*15/16] r4 r2 r
+  r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> fis g \!e]
+  [es8 { \type Voice=urgnobeam \tiny b8*1/16 ~ \normalsize } )c*15/16] r4 r2 r
+  d,4( \tiny fis8*1/16 ~ \normalsize gis4*31/32 ~ )gis8 r r4 r2
+  f4 ~ f8 r r2 r
+  [f'8( g a b][a g f g][a b a g]
+  \tiny f8*1/16 ~ \normalsize [g8*15/16 
+  { \type Voice=urgnobeam \tiny d8*1/16 ~ \normalsize } )e8*15/16] r4 r2 r
+  [f8( g a b][a g f g][a b a g]
+  \tiny f8*1/16 ~ \normalsize [g8*15/16 
+  { \type Voice=urgnobeam \tiny d8*1/16 ~ \normalsize } )e8*15/16] r4 r2 r
+  a,2( \tiny e'8*1/16 ~ \normalsize f4*31/32 ~ )f8 r r2
+  r2 r r
+  fis,4( \tiny dis8*1/16 \normalsize <)cis4*31/32 ais> r2 r
+  <e1 g b e> ~ <e g b e>
 }
 
-% upper staff
-us = {
-  \type Staff=treble
-  \skip 1*0;
+basloopje = \notes\relative c{
+  d,8( a' d f a d f d a f d )a
 }
 
-% lower staff
-ls = {
-  \type Staff=bass
-  \skip 1*0;
+bassbeam = \notes{
+  [s2] [s8 \translator Staff=treble s s s] [\translator Staff=bass s2]
+%   [s2] [s2] [s2]
 }
 
-two = \type Voice=two \notes \relative c{
+lower = \type Voice=two \notes \relative c{
   \stemdown
   \property Staff.slurydirection = 1
-% hmm
-%  [d,8( a' d f] [a \us d f d] \ls [a f d )a]
-  [d,8( a' d f] [a \translator Staff=treble d f d] 
-    \translator Staff=bass [a f d )a]
-  [d,8( a' d f] [a \translator Staff=treble d f d] 
-    \translator Staff=bass [a f d )a]
-  [d,8( a' d f] [a \translator Staff=treble d f d] 
-    \skip 8*0;
-    \translator Staff=bass [a f d )a]
+
+  % snapnie, hoevaak relative c heeft ze nodig?
+  < \notes\relative c \basloopje \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \transpose bes \notes\relative c{ \basloopje } \bassbeam >
+  < \transpose bes \notes\relative c{ \basloopje } \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \transpose bes \notes\relative c{ \basloopje } \bassbeam >
+  < \transpose bes \notes\relative c{ \basloopje } \bassbeam >
+  < \transpose a \notes\relative c{ \basloopje } \bassbeam >
+  < \transpose bes \notes\relative c{ \basloopje } \bassbeam >
+  < \transpose a \notes\relative c{ \basloopje } \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  % huh? d'
+  < \transpose d' \notes\relative c{ \basloopje } \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \transpose d' \notes\relative c{ \basloopje } \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \transpose e' \notes\relative c{ \basloopje } \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \transpose bes \notes\relative c{ \basloopje } \bassbeam >
+  < \transpose a \notes\relative c{ \basloopje } \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \transpose d' \notes\relative c{ \basloopje } \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \transpose d' \notes\relative c{ \basloopje } \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \notes\relative c \basloopje \bassbeam >
+  < \transpose e' \notes\relative c{ \basloopje } \bassbeam >
+  < e1 b' e> ~ < e b' e> 
 }
 
 \score {
     \type GrandStaff < 
       \type Staff = treble < 
         \global 
-       \one
+       \upper
       >
       \type Staff = bass <
         \global
        \clef bass;
-        \two
+        \lower
       >
     >
 
@@ -85,6 +146,15 @@ two = \type Voice=two \notes \relative c{
       \GrandStaffContext
       minVerticalAlign = 3.0*\staffheight;
       maxVerticalAlign = 3.0*\staffheight;
+      % don't display bars?
+      barAlways = 0.;
+    }
+    \translator{ 
+      \StaffContext
+% hmm, i don't want bars
+% but i do want the staffs to be connected
+%      \remove "Bar_engraver";
+      \remove "Time_signature_engraver";
     }
   }
 %  \header{