X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpage-turn-page-breaking.cc;h=85a090f6eab69ed97e3c233ea0cc904de4c4777f;hb=f127e14af04f474d20406ca0e0f76f05061ee103;hp=9008def09ab408f985bd086210585c8078edc660;hpb=058370efc7e9710f149d0f444328bb1fcd7bdec1;p=lilypond.git diff --git a/lily/page-turn-page-breaking.cc b/lily/page-turn-page-breaking.cc index 9008def09a..85a090f6ea 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--2014 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 @@ -29,6 +29,9 @@ #include "system.hh" #include "warn.hh" +using std::string; +using std::vector; + template static bool is_break (T *g) @@ -138,7 +141,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_)