Add a default minimum-distance between lyrics.

[lilypond.git] / lily / span-bar.cc

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index a5602934f4928cd55e8487da602c4a9b2da64001..897acf0b31f4e0251e37b76069c5be12504e2202 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -128,7 +128,7 @@ Span_bar::width (SCM smob)
   SCM gn = me->get_property ("glyph-name");
   if (!me->is_live ())
     return ly_interval2scm (Interval ());
-  
+
   string gl = ly_scm2string (gn);
 
   /*
@@ -191,7 +191,7 @@ Span_bar::calc_glyph_name (SCM smob)
     }
 
   string type = ly_scm2string (gl);
-  if (type == "|:")
+  if (type == "|:" || type == "||:")
     type = ".|";
   else if (type == ":|")
     type = "|.";
@@ -201,6 +201,14 @@ Span_bar::calc_glyph_name (SCM smob)
     type = "|.|";
   else if (type == ":|.:")
     type = "|.";
+  else if (type == "S" || type == "S|" || type == "|S")
+    type = "||";
+  else if (type == "S|:" || type == ".S|:")
+    type = ".|";
+  else if (type == ":|S" || type == ":|S.")
+    type = "|.";
+    else if (type == ":|S|:" || type == ":|S.|:")
+    type = "|._.|";
   else if (type == "'")
     type = "";
 
@@ -236,5 +244,9 @@ ADD_INTERFACE (Span_bar,
               /* properties */
               "glyph-name "
               "elements "
+              "pure-Y-common "
+              "pure-relevant-grobs "
+              "pure-relevant-items "
+              "pure-relevant-spanners "
               );