Issue 4636: lilypond-mode.el: consult LilyPond-lilypond-command et al at runtime

[lilypond.git] / lily / system-start-delimiter.cc

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 6a898559b317e7eb1fdaba6d93a8197100807474..7eb8c998718a9810bd0258c57282c096eec70d8f 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -93,7 +93,7 @@ MAKE_SCHEME_CALLBACK (System_start_delimiter, print, 1);
 SCM
 System_start_delimiter::print (SCM smob)
 {
-  Spanner *me = Spanner::unsmob (smob);
+  Spanner *me = unsmob<Spanner> (smob);
   extract_grob_set (me, "elements", elts);
   Grob *common = common_refpoint_of_array (elts, me, Y_AXIS);
 
@@ -129,13 +129,13 @@ System_start_delimiter::print (SCM smob)
     }
 
   Stencil m;
-  if (glyph_sym == ly_symbol2scm ("bracket"))
+  if (scm_is_eq (glyph_sym, ly_symbol2scm ("bracket")))
     m = staff_bracket (me, len);
-  else if (glyph_sym == ly_symbol2scm ("brace"))
+  else if (scm_is_eq (glyph_sym, ly_symbol2scm ("brace")))
     m = staff_brace (me, len);
-  else if (glyph_sym == ly_symbol2scm ("bar-line"))
+  else if (scm_is_eq (glyph_sym, ly_symbol2scm ("bar-line")))
     m = simple_bar (me, len);
-  else if (glyph_sym == ly_symbol2scm ("line-bracket"))
+  else if (scm_is_eq (glyph_sym, ly_symbol2scm ("line-bracket")))
     m = line_bracket (me, len);
 
   m.translate_axis (ext.center (), Y_AXIS);
@@ -154,7 +154,7 @@ System_start_delimiter::staff_brace (Grob *me, Real y)
 
   int
   lo = 0;
-  int hi = max ((int) fm->count () - 1, 2);
+  int hi = std::max ((int) fm->count () - 1, 2);
 
   /* do a binary search for each Y, not very efficient, but passable?  */
   Box b;