*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index a17f2620cfd39f9f91e257ecbefd559b2df31162..52b485a52bdffd0d7d1f467ba967b89cd5a1a7c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,11 +9,15 @@
 
 2004-03-11  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 
 2004-03-11  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 

+       * lily/auto-beam-engraver.cc (create_beam): add Stem as
+       cause. This should fix warnings.
+
+       * mf/feta-slag.mf (trill_ne): fix upmordent size.
+

        * lily/accidental.cc (accurate_boxes): enlarge Y-extent of flat to
        prevent aligned 6ths.
 
        * lily/accidental.cc (accurate_boxes): enlarge Y-extent of flat to
        prevent aligned 6ths.
 

-       * lily/custos.cc (print): remove neutral position.
-       (print): remove adjust-if-on-staffline.
+       * lily/custos.cc (print): remove adjust-if-on-staffline.

 
 2004-03-11  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 
 2004-03-11  Jan Nieuwenhuizen  <janneke@gnu.org>
 

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 6be16b1766c7a9b743a934f3cd7aa65775fc3743..722a73c7bcfe84c9ad6a71c4a3a88776abf8b0c2 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -1078,11 +1078,10 @@ of the 20th century
 @lilypond
 \score {
     \notes {
 @lilypond
 \score {
     \notes {

-       \override Staff.Custos   #'neutral-position = #4
-       \override Staff.Custos   #'neutral-direction = #-1
-       \override Staff.Custos   #'adjust-if-on-staffline = ##t
+%      \override Staff.Custos #'neutral-position = #4
+       \override Staff.Custos #'neutral-direction = #-1

 
 

-       \override Staff.Custos   #'style = #'hufnagel
+       \override Staff.Custos #'style = #'hufnagel

        c'1
        \break < d' a' f''>1
     }
        c'1
        \break < d' a' f''>1
     }

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index a9f32c78b5790067830ebb775ef81df7f0c86e66..5187c581242c3b102264de3d2a5c0453fc9c8adf 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -2240,9 +2240,16 @@ care when you mix staves with grace notes and staves without, for example,
 
 @lilypond[relative=2,verbatim,fragment]
 << \new Staff { e4 \bar "|:" \grace c16 d4 }
 
 @lilypond[relative=2,verbatim,fragment]
 << \new Staff { e4 \bar "|:" \grace c16 d4 }

-  \new Staff { c4 \bar "|:"  d4 } >>
+   \new Staff { c4  \bar "|:"  d4 } >>

 @end lilypond
 
 @end lilypond
 

+@noindent
+This can be remedied by inserting grace skips, for the above example
+
+@verbatim
+   \new Staff { c4  \bar "|:"  \grace s16 d4 } >>
+@end verbatim
+

 Grace sections should only be used within sequential music
 expressions.  Nesting or juxtaposing grace sections is not supported,
 and might produce crashes or other errors.
 Grace sections should only be used within sequential music
 expressions.  Nesting or juxtaposing grace sections is not supported,
 and might produce crashes or other errors.

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 9f3926cd005592500125821bd95aa4dea801e673..a4c431ba5520f9baef6de30db2abbbbed0c7d7c6 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -284,7 +284,7 @@ Auto_beam_engraver::create_beam ()
       Beam::add_stem (beam, (*stems_)[i]);
     }
   
       Beam::add_stem (beam, (*stems_)[i]);
     }
   

-  announce_grob (beam, SCM_EOL);
+  announce_grob (beam, (*stems_)[0]->self_scm ());

 
   return beam;
 }
 
   return beam;
 }

diff --git a/lily/custos.cc b/lily/custos.cc
index cf77b605ef381d78f78dfc9be2af2ae3398bf7eb..64f93c2a13f6ba4a3cffdb1929ecd47efb4cc1be 100644 (file)
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -50,7 +50,7 @@ Custos::print (SCM smob)
    */
   bool adjust = true; 
 
    */
   bool adjust = true; 
 

-  int neutral_pos = 0;
+  int neutral_pos = robust_scm2int (me->get_property ("neutral-position"), 0);

   Direction neutral_direction =
     to_dir (me->get_property ("neutral-direction"));
 
   Direction neutral_direction =
     to_dir (me->get_property ("neutral-direction"));
 


@@ -103,4 +103,4 @@ Custos::print (SCM smob)
 
 ADD_INTERFACE (Custos, "custos-interface",
   "A custos object.",
 
 ADD_INTERFACE (Custos, "custos-interface",
   "A custos object.",

-  "style neutral-direction");
+  "style neutral-position neutral-direction");

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index c43a03166edcde0caccbb559d2da81a843087c6b..9ea43edbf1f882a86ea7e49285b469a36148f336 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -6,7 +6,6 @@
     \accepts Score
     \description "Hard coded entry point for LilyPond. Cannot be tuned."
     \grobdescriptions #all-grob-descriptions    
     \accepts Score
     \description "Hard coded entry point for LilyPond. Cannot be tuned."
     \grobdescriptions #all-grob-descriptions    

-

 }
 
 %
 }
 
 %


@@ -721,7 +720,6 @@ EasyNotation = \context {
   \override Custos #'style = #'vaticana
   \override Custos #'neutral-position = #3
   \override Custos #'neutral-direction = #-1
   \override Custos #'style = #'vaticana
   \override Custos #'neutral-position = #3
   \override Custos #'neutral-direction = #-1

-  \override Custos #'adjust-if-on-staffline = ##t

 
   % Score.timing = ##f
   % Score.barAlways = ##t
 
   % Score.timing = ##f
   % Score.barAlways = ##t

diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf
index 96b4db54fdc0fb6f7c4d7d12a5229861a86ba4e4..bc74235e10aec0509419843cbbc19eb3ae55cbba 100644 (file)
--- a/mf/feta-slag.mf
+++ b/mf/feta-slag.mf
@@ -125,7 +125,7 @@ fet_endchar;
 
 fet_beginchar("upmordent", "upmordent", "upmordent")
        set_char_box(3 trill_width#, 3 trill_width#,
 
 fet_beginchar("upmordent", "upmordent", "upmordent")
        set_char_box(3 trill_width#, 3 trill_width#,

-                     trill_height#, trill_height#);
+                     4/3 trill_height#, 4/3 trill_height#);

 
        currentpicture := remember_pic;
 
 
        currentpicture := remember_pic;
 

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 577deb64c380df86f6144b93aa5cf22066e8136f..8c96d894ca343036e9af0f2a07074d8da3a005e0 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -151,7 +151,10 @@ line).")
      (dashed ,number? " number representing the length of the dashes.")
      (neutral-direction ,ly:dir? "Which direction to take in the
 center of the staff.")
      (dashed ,number? " number representing the length of the dashes.")
      (neutral-direction ,ly:dir? "Which direction to take in the
 center of the staff.")

+     (neutral-position ,number? "Position (in half staff spaces) where
+to flip the direction of custos stem.")

 
 

+ 

      ;; todo: why is this tunable?
      (dir-function ,procedure? "The function to determine the
 direction of a beam. Choices include: 
      ;; todo: why is this tunable?
      (dir-function ,procedure? "The function to determine the
 direction of a beam. Choices include: 

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 5f7d3619880739bb7771dc0303e906ab22f35e7d..ba97c623d9e060f84b4b3e5aa2f20ad60abe7f65 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -283,8 +283,8 @@ OTTAVATION to `8va', or whatever appropriate."
              (let ((where (ly:context-property-where-defined context 'middleCPosition))
                    (oc0 (ly:context-property context 'originalCentralCPosition)))
                (ly:context-set-property! context 'middleCPosition oc0)
              (let ((where (ly:context-property-where-defined context 'middleCPosition))
                    (oc0 (ly:context-property context 'originalCentralCPosition)))
                (ly:context-set-property! context 'middleCPosition oc0)

-               (ly:unset-context-property where 'originalCentralCPosition)
-               (ly:unset-context-property where 'ottavation))
+               (ly:context-unset-property where 'originalCentralCPosition)
+               (ly:context-unset-property where 'ottavation))

              (let* ((where (ly:context-property-where-defined context 'middleCPosition))
                     (c0 (ly:context-property context 'middleCPosition))
                     (new-c0 (+ c0 (* -7 octavation)))
              (let* ((where (ly:context-property-where-defined context 'middleCPosition))
                     (c0 (ly:context-property context 'middleCPosition))
                     (new-c0 (+ c0 (* -7 octavation)))

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index d5f46f42b60f6923a03c300837cc4550cead7f0e..8e2cf832500474a319703f5803e01a63945923ee 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1995,8 +1995,8 @@ def conv (str):
                      'ly:stencil-extent', str)
        str = re.sub (r'ly:translator-find',
                      'ly:context-find', str)
                      'ly:stencil-extent', str)
        str = re.sub (r'ly:translator-find',
                      'ly:context-find', str)

-       str = re.sub ('ly:context-unset-property',
-                    'ly:unset-context-property', str)
+       str = re.sub ('ly:unset-context-property','ly:context-unset-property',
+                     str)

                     
        str = re.sub (r'ly:get-mutable-properties',
                      'ly:mutable-music-properties',str)
                     
        str = re.sub (r'ly:get-mutable-properties',
                      'ly:mutable-music-properties',str)


@@ -2008,7 +2008,7 @@ conversions.append (((2,1,30), conv,
                     '''\\threeq{flat,sharp} -> \\sesqui{flat,sharp}
 ly:get-mutable-properties -> ly:mutable-music-properties
 centralCPosition -> middleCPosition
                     '''\\threeq{flat,sharp} -> \\sesqui{flat,sharp}
 ly:get-mutable-properties -> ly:mutable-music-properties
 centralCPosition -> middleCPosition

-ly:unset-context-property -> ly:unset-context-property
+ly:unset-context-property -> ly:context-unset-property

 ly:translator-find -> ly:context-find
 ly:get-stencil-extent -> ly:stencil-extent
 '''))
 ly:translator-find -> ly:context-find
 ly:get-stencil-extent -> ly:stencil-extent
 '''))