input/regression/bookparts.ly fails at PDF conversion stage

[lilypond.git] / lily / include / page-breaking.hh

diff --git a/lily/include/page-breaking.hh b/lily/include/page-breaking.hh
index 7d50db2524e9eaffc55705ce1fc2be206067aadc..cab51e001cd4a7ec188567339f2db9ebfc093cc9 100644 (file)
--- a/lily/include/page-breaking.hh
+++ b/lily/include/page-breaking.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2011 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2006--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
@@ -101,7 +101,7 @@ class Page_breaking
 public:
   typedef bool (*Break_predicate) (Grob *);
   typedef bool (*Prob_break_predicate) (Prob *);
-  typedef vector<vsize> Line_division;
+  typedef std::vector<vsize> Line_division;
 
   /*
     TODO: naming.
@@ -126,6 +126,7 @@ public:
   vsize system_count () const;
   Real footnote_separator_stencil_height () const;
   Real footnote_padding () const;
+  Real in_note_padding () const;
   Real footnote_number_raise () const;
   Real footnote_footer_padding () const;
   Real line_count_penalty (int line_count) const;
@@ -141,7 +142,7 @@ protected:
 
   vsize next_system (Break_position const &break_pos) const;
 
-  SCM make_pages (vector<vsize> lines_per_page, SCM lines);
+  SCM make_pages (std::vector<vsize> lines_per_page, SCM lines);
 
   vsize min_system_count (vsize start, vsize end);
   vsize max_system_count (vsize start, vsize end);
@@ -177,11 +178,12 @@ protected:
   SCM breakpoint_property (vsize breakpoint, char const *str);
 
   vsize last_break_position () const;
+
+  std::vector<System_spec> system_specs_;
 private:
-  vector<Break_position> breaks_;
-  vector<Break_position> chunks_;
-  vector<System_spec> system_specs_;
-  vector<Constrained_breaking> line_breaking_;
+  std::vector<Break_position> breaks_;
+  std::vector<Break_position> chunks_;
+  std::vector<Constrained_breaking> line_breaking_;
   bool ragged_;
   bool ragged_last_;
   int systems_per_page_;
@@ -190,12 +192,13 @@ private:
   vsize system_count_;
   Real footnote_separator_stencil_height_;
   Real footnote_padding_;
+  Real in_note_padding_;
   Real footnote_number_raise_;
   Real footnote_footer_padding_;
   int orphan_penalty_;
 
-  vector<Line_division> current_configurations_;
-  vector<Break_position> current_chunks_;
+  std::vector<Line_division> current_configurations_;
+  std::vector<Break_position> current_chunks_;
   vsize current_start_breakpoint_;
   vsize current_end_breakpoint_;
 
@@ -203,15 +206,15 @@ private:
   void compute_line_heights ();
   void clear_line_details_cache ();
   vsize cached_configuration_index_;
-  vector<Line_details> cached_line_details_;
-  vector<Line_details> uncompressed_line_details_;
+  std::vector<Line_details> cached_line_details_;
+  std::vector<Line_details> uncompressed_line_details_;
 
   Real paper_height_;
-  mutable vector<Real> page_height_cache_;
-  mutable vector<Real> last_page_height_cache_;
+  mutable std::vector<Real> page_height_cache_;
+  mutable std::vector<Real> last_page_height_cache_;
 
-  vector<Break_position> chunk_list (vsize start, vsize end);
-  Line_division system_count_bounds (vector<Break_position> const &chunks, bool min);
+  std::vector<Break_position> chunk_list (vsize start, vsize end);
+  Line_division system_count_bounds (std::vector<Break_position> const &chunks, bool min);
   void line_breaker_args (vsize i,
                           Break_position const &start,
                           Break_position const &end,
@@ -223,14 +226,14 @@ private:
                            Line_division const &max,
                            Line_division *cur);
 
-  vector<Line_details> line_details (vsize start, vsize end, Line_division const &div);
-  Page_spacing_result space_systems_on_1_page (vector<Line_details> const &lines, Real page_height, bool ragged);
+  std::vector<Line_details> line_details (vsize start, vsize end, Line_division const &div);
+  Page_spacing_result space_systems_on_1_page (std::vector<Line_details> const &lines, Real page_height, bool ragged);
   Page_spacing_result space_systems_on_2_pages (vsize configuration_index, vsize first_page_num);
   Page_spacing_result finalize_spacing_result (vsize configuration_index, Page_spacing_result);
   void create_system_list ();
   void find_chunks_and_breaks (Break_predicate, Prob_break_predicate);
   SCM make_page (int page_num, bool last) const;
-  SCM get_page_configuration (SCM systems, int page_num, int footnote_count, bool ragged, bool last);
-  SCM draw_page (SCM systems, SCM config, int page_num, int footnote_num, bool last);
+  SCM get_page_configuration (SCM systems, int page_num, bool ragged, bool last);
+  SCM draw_page (SCM systems, SCM config, int page_num, bool last);
 };
 #endif /* PAGE_BREAKING_HH */