X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpage-turn-page-breaking.cc;h=09545020c482ca4277de5b888e96c6f31f1df3bc;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=3d9799cd7c32417eb11a5c4024f9936873d1d31a;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git diff --git a/lily/page-turn-page-breaking.cc b/lily/page-turn-page-breaking.cc index 3d9799cd7c..09545020c4 100644 --- a/lily/page-turn-page-breaking.cc +++ b/lily/page-turn-page-breaking.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2006--2011 Joe Neeman + Copyright (C) 2006--2015 Joe Neeman LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -138,7 +138,8 @@ Page_turn_page_breaking::calc_subproblem (vsize ending_breakpoint) for (vsize start = end; start--;) { if (start < end - 1 - && breakpoint_property (start + 1, "page-turn-permission") == ly_symbol2scm ("force")) + && scm_is_eq (breakpoint_property (start + 1, "page-turn-permission"), + ly_symbol2scm ("force"))) break; if (start > 0 && best.demerits_ < state_[start - 1].demerits_) @@ -232,7 +233,7 @@ Page_turn_page_breaking::solve () for (vsize i = 0; i < last_break_position (); i++) { calc_subproblem (i); - progress_indication (string ("[") + to_string (i + 1) + "]"); + progress_indication (string ("[") + ::to_string (i + 1) + "]"); } progress_indication ("\n");