Merge branch 'lilypond/translation' of ssh://trettig@git.sv.gnu.org/srv/git/lilypond...

[lilypond.git] / lily / stem.cc

diff --git a/lily/stem.cc b/lily/stem.cc
index 6016eebbb439b7b067201225a0f7adcdd84d85b0..b517b6ec9f69f323dfa97fdea5a52f1781187b92 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -241,6 +241,7 @@ Stem::pure_height (SCM smob, SCM start, SCM end)
     return ly_interval2scm (iv);
 
   Real ss = Staff_symbol_referencer::staff_space (me);
+  Real rad = Staff_symbol_referencer::staff_radius (me);
 
   if (!to_boolean (me->get_property ("cross-staff")))
     {
@@ -255,12 +256,15 @@ Stem::pure_height (SCM smob, SCM start, SCM end)
 
       if (!hp.is_empty ())
        iv.translate (hp[dir] * ss / 2);
-    }
 
-  /* at a minimum, make the pure-height cover the staff symbol */
-  Real rad = Staff_symbol_referencer::staff_radius (me);
-  iv.add_point (-rad * ss);
-  iv.add_point (rad * ss);
+      /* extend the stem (away from the head) to cover the staff */
+      if (dir == UP)
+       iv[UP] = max (iv[UP], rad * ss);
+      else
+       iv[DOWN] = min (iv[DOWN], -rad * ss);
+    }
+  else
+    iv = Interval (-rad * ss, rad * ss);
 
   return ly_interval2scm (iv);
 }
@@ -309,7 +313,7 @@ Stem::calc_length (SCM smob)
 
   Real ss = Staff_symbol_referencer::staff_space (me);
   Real length = 7;
-  SCM s = scm_cdr (scm_assq (ly_symbol2scm ("lengths"), details));
+  SCM s = ly_assoc_get (ly_symbol2scm ("lengths"), details, SCM_EOL);
   if (scm_is_pair (s))
     length = 2 * scm_to_double (robust_list_ref (durlog - 2, s));
 
@@ -320,7 +324,7 @@ Stem::calc_length (SCM smob)
   Interval hp = head_positions (me);
   if (dir && dir * hp[dir] >= 0)
     {
-      SCM sshorten = scm_cdr (scm_assq (ly_symbol2scm ("stem-shorten"), details));
+      SCM sshorten = ly_assoc_get (ly_symbol2scm ("stem-shorten"), details, SCM_EOL);
       SCM scm_shorten = scm_is_pair (sshorten)
        ? robust_list_ref (max (duration_log (me) - 2, 0), sshorten) : SCM_EOL;
       Real shorten = 2* robust_scm2double (scm_shorten, 0);
@@ -698,6 +702,9 @@ Stem::print (SCM smob)
   if (!lh && stemlet && !beam)
     return SCM_EOL;
 
+  if (lh && robust_scm2int (lh->get_property ("duration-log"), 0) < 1) 
+    return SCM_EOL;
+
   if (is_invisible (me))
     return SCM_EOL;
 
@@ -861,7 +868,7 @@ Stem::calc_stem_info (SCM smob)
 
   /* Simple standard stem length */
   SCM details = me->get_property ("details");
-  SCM lengths = scm_cdr (scm_assq (ly_symbol2scm ("beamed-lengths"), details));
+  SCM lengths = ly_assoc_get (ly_symbol2scm ("beamed-lengths"), details, SCM_EOL);
   
   Real ideal_length
     = scm_to_double (robust_list_ref (beam_count - 1, lengths))
@@ -873,7 +880,7 @@ Stem::calc_stem_info (SCM smob)
     - 0.5 * beam_thickness;
 
   /* Condition: sane minimum free stem length (chord to beams) */
-  lengths = scm_cdr (scm_assq (ly_symbol2scm ("beamed-minimum-free-lengths"), details));
+  lengths = ly_assoc_get (ly_symbol2scm ("beamed-minimum-free-lengths"), details, SCM_EOL);
 
   Real ideal_minimum_free
     = scm_to_double (robust_list_ref (beam_count - 1, lengths))
@@ -945,8 +952,8 @@ Stem::calc_stem_info (SCM smob)
 
   ideal_y -= robust_scm2double (beam->get_property ("shorten"), 0);
 
-  SCM bemfl = scm_cdr (scm_assq (ly_symbol2scm ("beamed-extreme-minimum-free-lengths"),
-                                details));
+  SCM bemfl = ly_assoc_get (ly_symbol2scm ("beamed-extreme-minimum-free-lengths"),
+                           details, SCM_EOL);
   
   Real minimum_free
     = scm_to_double (robust_list_ref (beam_count - 1, bemfl))
@@ -992,27 +999,30 @@ Stem::calc_cross_staff (SCM smob)
 
 /* FIXME:  Too many properties  */
 ADD_INTERFACE (Stem,
-              "The stem represent the graphical stem.  "
-              "In addition, it internally connects note heads, beams and"
-              "tremolos. "
-              "Rests and whole notes have invisible stems."
-
-              "\n\nThe following properties may be set in the details list." 
+              "The stem represents the graphical stem.  In addition, it"
+              " internally connects note heads, beams, and tremolos.  Rests"
+              " and whole notes have invisible stems.\n"
+              "\n"
+              "The following properties may be set in the @code{details}"
+              " list.\n"
+              "\n"
               "@table @code\n"
-              "@item  beamed-lengths \n"
-              "list of stem lengths given beam multiplicity. \n"
-              "@item beamed-minimum-free-lengths \n"
-              "list of normal minimum free stem lengths (chord to beams) given beam multiplicity.\n"
+              "@item beamed-lengths\n"
+              "List of stem lengths given beam multiplicity.\n"
+              "@item beamed-minimum-free-lengths\n"
+              "List of normal minimum free stem lengths (chord to beams)"
+              " given beam multiplicity.\n"
               "@item beamed-extreme-minimum-free-lengths\n"
-              "list of extreme minimum free stem lengths (chord to beams) given beam multiplicity.\n"
+              "List of extreme minimum free stem lengths (chord to beams)"
+              " given beam multiplicity.\n"
               "@item lengths\n"
-              "Default stem lengths. The list gives a length for each flag-count.\n"
+              "Default stem lengths.  The list gives a length for each"
+              " flag count.\n"
               "@item stem-shorten\n"
-              "How much a stem in a forced direction "
-              "should be shortened. The list gives an amount depending on the number "
-              "of flags/beams."
-              "@end table\n"
-              ,
+              "How much a stem in a forced direction should be shortened."
+              "  The list gives an amount depending on the number of flags"
+              " and beams.\n"
+              "@end table\n",
 
               /* properties */
               "avoid-note-head "