Merge branch 'master' into translation

[lilypond.git] / lily / paper-column.cc

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index f4721e92518f46f60ac101576d4f9940369ef1c1..155e37bdec40d1afa45c35d94d2497c7ac9cbecc 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -198,11 +198,11 @@ Paper_column::break_align_width (Grob *me, SCM align_syms)
   for (;!align && scm_is_pair (align_syms); align_syms = scm_cdr (align_syms))
     {
       SCM align_sym = scm_car (align_syms);
-      if (align_sym == ly_symbol2scm ("staff-bar")
-          || align_sym == ly_symbol2scm ("break-alignment"))
+      if (scm_is_eq (align_sym, ly_symbol2scm ("staff-bar"))
+          || scm_is_eq (align_sym, ly_symbol2scm ("break-alignment")))
         align = Pointer_group_interface::find_grob
           (me, ly_symbol2scm ("elements"),
-           (align_sym == ly_symbol2scm ("staff-bar")
+           (scm_is_eq (align_sym, ly_symbol2scm ("staff-bar"))
             ? Bar_line::non_empty_barline
             : Break_alignment_interface::has_interface));
       else