Release: bump Welcome versions.

[lilypond.git] / lily / one-line-page-breaking.cc

diff --git a/lily/one-line-page-breaking.cc b/lily/one-line-page-breaking.cc
index a96b37fc008610e4fce7c7a677c6e91e74acbf3d..a3276f4216c6b876274f8def526188ebaf60a733 100644 (file)
--- a/lily/one-line-page-breaking.cc
+++ b/lily/one-line-page-breaking.cc
@@ -30,8 +30,6 @@
 #include "simple-spacer.hh"
 #include "system.hh"
 
-using std::vector;
-
 One_line_page_breaking::One_line_page_breaking (Paper_book *pb)
   : Page_breaking (pb, 0, 0)
 {
@@ -43,10 +41,9 @@ One_line_page_breaking::~One_line_page_breaking ()
 
 /*
   This is a somewhat unconventional page-breaking algorithm.  Every
-  score will be put on a single page, whose width is enough
-  to fit the entire score one one line.  Line breaks and page breaks
-  are ignored, and the paper-width setting in the paper block
-  will be modified to fit the music.
+  score is put on a single page, whose width is enough to fit the entire
+  score on one line.  Line breaks and page breaks are ignored, and the
+  paper-width setting in the paper block is modified to fit the music.
 */
 SCM
 One_line_page_breaking::solve ()
@@ -60,7 +57,7 @@ One_line_page_breaking::solve ()
           vector<Grob *> cols = ps->root_system ()->used_columns ();
 
           // No indent, "infinite" line width, ragged.
-          Column_x_positions pos = get_line_configuration (cols, std::numeric_limits<Real>::max (), 0, true);
+          Column_x_positions pos = get_line_configuration (cols, numeric_limits<Real>::max (), 0, true);
           vector<Column_x_positions> positions;
           positions.push_back (pos);
 
@@ -73,7 +70,7 @@ One_line_page_breaking::solve ()
           SCM systems = scm_list_1 (system->self_scm ());
           SCM pages = make_pages (lines_per_page, systems);
 
-          max_width = std::max (max_width, system->extent (system, X_AXIS).length ());
+          max_width = max (max_width, system->extent (system, X_AXIS).length ());
           all_pages = scm_cons (scm_car (pages), all_pages);
         }
       else if (Prob *pb = system_specs_[i].prob_)