Issue 4550 (2/2) Avoid "using namespace std;" in included files

[lilypond.git] / lily / include / page-layout-problem.hh

diff --git a/lily/include/page-layout-problem.hh b/lily/include/page-layout-problem.hh
index 12455c6fe76d494352372a0b41c30e655e5f24e5..f2b5d6a961184588b368d7887412f55f240a9ba0 100644 (file)
--- a/lily/include/page-layout-problem.hh
+++ b/lily/include/page-layout-problem.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2009--2012 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2009--2015 Joe Neeman <joeneeman@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 
 #include "simple-spacer.hh"
 #include "skyline.hh"
+#include "stencil.hh"
 
 class Page_layout_problem
 {
@@ -36,14 +37,14 @@ public:
   static bool read_spacing_spec (SCM spec, Real *dest, SCM sym);
   static bool is_spaceable (Grob *g);
   static SCM get_details (Grob *g);
-  static vector<Grob *> get_footnote_grobs (SCM lines);
+  static std::vector<Grob *> get_footnote_grobs (SCM lines);
   static vsize get_footnote_count (SCM lines);
   static SCM get_footnotes_from_lines (SCM lines);
   static void add_footnotes_to_lines (SCM lines, int counter, Paper_book *pb);
-  static Stencil *get_footnote_separator_stencil (Output_def *paper);
+  static Stencil get_footnote_separator_stencil (Output_def *paper);
   static SCM get_spacing_spec (Grob *before, Grob *after, bool pure, int start, int end);
   static Real get_fixed_spacing (Grob *before, Grob *after, int spaceable_index, bool pure, int start, int end);
-  static void add_footnotes_to_footer (SCM footnotes, Stencil *foot, Paper_book *pb);
+  static Stencil add_footnotes_to_footer (SCM footnotes, Stencil foot, Paper_book *pb);
 
 protected:
   void append_system (System *, Spring const &, Real indent, Real padding);
@@ -51,26 +52,28 @@ protected:
 
   void solve_rod_spring_problem (bool ragged, Real fixed_force);
   SCM find_system_offsets ();
-  void distribute_loose_lines (vector<Grob *> const &, vector<Real> const &, Real, Real);
+  void distribute_loose_lines (std::vector<Grob *> const &, std::vector<Real> const &, Real, Real);
 
-  static void build_system_skyline (vector<Grob *> const &, vector<Real> const &, Skyline *up, Skyline *down);
-  static vector<Grob *> filter_dead_elements (vector<Grob *> const &);
+  static void build_system_skyline (std::vector<Grob *> const &, std::vector<Real> const &, Skyline *up, Skyline *down);
+  static std::vector<Grob *> filter_dead_elements (std::vector<Grob *> const &);
 
   // This is a union (in spirit).
   // Either staves must be empty or prob must be null.
   typedef struct Element
   {
     Prob *prob;
-    vector<Grob *> staves;
-    vector<Real> min_offsets;
-    // Store the appropriate '*-*-spacing 'padding,
-    //  for spacing any adjacent loose line
+    std::vector<Grob *> staves;
+    std::vector<Real> min_offsets;
+    // Store the appropriate '*-*-spacing 'padding, and skyline-distance,
+    //  considering indentation, from the previous system.
+    Real min_distance;
     Real padding;
 
-    Element (vector<Grob *> const &a, vector<Real> const &o, Real p)
+    Element (std::vector<Grob *> const &a, std::vector<Real> const &o, Real m, Real p)
     {
       staves = a;
       min_offsets = o;
+      min_distance = m;
       padding = p;
       prob = 0;
     }
@@ -90,9 +93,9 @@ protected:
   static void alter_spring_from_spacing_spec (SCM spec, Spring *spring);
   static void mark_as_spaceable (Grob *);
 
-  vector<Spring> springs_;
-  vector<Element> elements_;
-  vector<Real> solution_;
+  std::vector<Spring> springs_;
+  std::vector<Element> elements_;
+  std::vector<Real> solution_;
   Real force_;
   Skyline bottom_skyline_;
   Real bottom_loose_baseline_;