lilypond-1.3.133

diff --git a/CHANGES b/CHANGES
index 91841f2b9a14c45365e10e06f37ac1a492e3052a..0e693bb843b3582db6f077cf2e965110b4dc7b6b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,33 @@
+1.3.132.jcn3
+============
+
+* Tied notes at a linebreak repeat their accidental.
+
+* Removed some cruft from lily/include/.
+
+* Bugfix: tied notes in chords sometimes got stuck in MIDI output
+(thanks Mats).
+
+* Added some example bug files, taken from Coriolan
+
+* a2-engraver: \property noDirection: don't force direction when part-combining (for StaffCombining).
+
+* text-spanner: don't repeat edge text for broken edge.
+
+* Coriolan fixes, titling, font setting, header info, cello octave
+(yes, notated different from bass; all agree) at end.
+
+1.3.132.hwn1
+============
+
+* Allow declared repeat variant string
+
+* Bugfix: break alignment at right edge.
+
+* Easy-notation: letters in circular note heads.  
+
+* Debian patch by Anthony Fok.
+
 1.3.131.jcn2
 ============
 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index f882840e7e156773922c4a002156b0fe11474d03..955435ac637eb84a617c048f6c78c6f4320e792d 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -121,6 +121,7 @@ can enter and edit them in manageable chunks.
 * Defining pitch names::        
 * Durations::                   
 * Notes::                       
+* Note head tweaks::            
 * Rests::                       
 * Skip::                        
 @end menu
@@ -302,7 +303,7 @@ a quarter note is assumed.  The duration can be followed by a dot
 @cindex @code{.}
 
 @lilypond[fragment,verbatim,center]
-  a'4. b'4.
+  a'4. b'4. c'2..
 @end lilypond
 @cindex @code{r}
 @cindex @code{s}
@@ -338,6 +339,43 @@ question mark `@code{?}' after the pitch.
 @end lilypond
 
 
+@node Note head tweaks
+@subsection Note head tweaks
+
+[TODO]
+
+The note head style can be adjusted with  the @code{style} property of
+@code{NoteHead}.
+
+@lilypond[fragment,singleline,relative,verbatim]
+c'4
+\property Voice.NoteHead \set #'style = #'cross
+c'4
+@end lilypond
+
+[discuss more options]
+
+@cindex easy notation
+@cindex Hal Leonard
+
+A entirely different type of note head is the "easyplay" note head: a
+note head that includes a note name.  It is used in some publications by
+the Hal-Leonard Corporation (a music publishing company).
+
+@lilypond[singleline,verbatim]
+\score {
+        \notes { c'2 e'4 f' | g'1 }
+        \paper { \translator { \EasyNotation } } 
+}
+@end lilypond
+
+Note that @code{EasyNotation} overrides a @code{Score} context.  You
+probably will want to print it with magnification to make it better
+readable.
+
+Limitations: The staff-lines show through the letters.
+
+
 @c .  {Rests}
 @node  Rests
 @subsection Rests
@@ -1593,7 +1631,7 @@ The symbols that are printed can be modified by setting pedalXStrings,
 where one of the pedal types. Refer to the generaetd documentation for
 more information.
 
-Currently, brackets are not supported, only text markings (ie. Ped*
+Currently, brackets are not supported, only text markings (ie. *Ped
 style).
 
 
@@ -2753,7 +2791,7 @@ where each of the items is one of
   @item  An assignment.  The assignment must be terminated by a
        semicolon.  
 
-  @item  A context definition.  See Section @ref{Notation contexts} for
+  @item  A context definition.  See Section @ref{Notation Contexts} for
        more information on context definitions.
 
   @item  \stylesheet  declaration.  Its syntax is

diff --git a/VERSION b/VERSION
index ab4bed8b3f0cecac44a5ebb79710b46f28cef247..39268623d48817d504f624b31746ecff59a7d2e8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
-PATCH_LEVEL=132
+PATCH_LEVEL=133
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a

diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly
new file mode 100644 (file)
index 0000000..fc5a8f6
--- /dev/null
+++ b/input/regression/easy-notation.ly
@@ -0,0 +1,8 @@
+\header {
+texidoc  = " Ez-notation prints names in note heads."
+}
+
+\score {
+        \notes { c'2 e'4 f' | g'1 }
+        \paper { \translator { \EasyNotation } } 
+}

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 5fc28bbddb684c16dff65fa138ac490851f35201..954798be267a476d5b51d32568bbdb9949617b0d 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -3,6 +3,7 @@
 
   (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+#include <ctype.h>
 
 #include "rhythmic-head.hh"
 #include "paper-def.hh"
@@ -93,8 +94,18 @@ Note_heads_engraver::create_grobs ()
          dot_p_arr_.push (d);
        }
 
-      note_p->set_grob_property("staff-position",  gh_int2scm (unsmob_pitch (req->get_mus_property ("pitch"))->steps ()));
+      Pitch *pit =unsmob_pitch (req->get_mus_property ("pitch"));
+      note_p->set_grob_property("staff-position",  gh_int2scm (pit->steps ()));
 
+      if (to_boolean (get_property ("easyPlay")))
+       {
+         char s[2] = "a";
+         s[0] = (pit->notename_i_ + 2)%7 + 'a';
+
+         s[0] = toupper (s[0]);
+         note_p->set_grob_property ("note-character", ly_str02scm (s));
+       }
+      
       announce_grob (note_p,req);
       note_p_arr_.push (note_p);
     }

diff --git a/ly/engraver.ly b/ly/engraver.ly
index aad446c46e85a594709686bac168b13a1b43317d..c71b63ba58e9fec989323fd8a54ca3e547b5f388 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -372,9 +372,6 @@ ScoreContext = \translator {
        splitInterval = #'(0 . 1)
        changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512))
 
-       %devNullThread = #'unisolo
-       %devNullVoice = #'unisolo
-
        StaffMinimumVerticalExtent = #(cons -4.0 4.0)
 
        barAuto = ##t
@@ -442,4 +439,9 @@ ScoreContext = \translator {
 OrchestralScoreContext= \translator {
        \ScoreContext
 }
+EasyNotation =  \translator {
+       \ScoreContext
+       NoteHead \override #'molecule-callback = #Note_head::brew_ez_molecule
+       easyPlay = ##t
+}