* lily/font-select.cc (get_font_by_design_size): revert

pango_description_string as well.

* lily/system.cc (set_loose_columns): put loose column just left
of next column.

diff --git a/ChangeLog b/ChangeLog
index da0021e5a8b1730fee2c955d6025e49bee90b589..01967b3883f4a1ead701852a483239cfd148657e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-03-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/font-select.cc (get_font_by_design_size): revert
+       pango_description_string as well.
+
+       * lily/system.cc (set_loose_columns): put loose column just left
+       of next column.
+
        * lily/include/group-interface.hh (extract_grob_array): rename
        from Pointer_group_interface__extract_grobs
 

diff --git a/lily/font-select.cc b/lily/font-select.cc
index 189421e339681dbd3af9ecf7430dc285efa9a2c5..262930983e3ff82919c39cbdae9f96c3fd99e9c1 100644 (file)
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -27,6 +27,7 @@ get_font_by_design_size (Output_def *layout, Real requested,
   int i = 0;
 
   SCM pango_description_string = SCM_EOL;
+  SCM last_pango_description_string = SCM_EOL;
   for (; i < n; i++)
     {
       SCM entry = scm_c_vector_ref (font_vector, i);
@@ -50,6 +51,7 @@ get_font_by_design_size (Output_def *layout, Real requested,
       if (size > requested)
        break;
       last_size = size;
+      last_pango_description_string = pango_description_string;
     }
 
   if (i == n)
@@ -60,6 +62,7 @@ get_font_by_design_size (Output_def *layout, Real requested,
        {
          i--;
          size = last_size;
+         pango_description_string = last_pango_description_string;
        }
     }
   

diff --git a/lily/system.cc b/lily/system.cc
index 176c1da2e48481954b5ab0b9437c44776f5acfbb..2cb82cb99f8036a7d0345912ea7eee50b82f5708 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -230,9 +230,8 @@ set_loose_columns (System* which, Column_x_positions const *posns)
     }
 }
 
-// const?
 void
-System::break_into_pieces (Array<Column_x_positions> const &breaking)
+System::break_into_pieces (Array<Column_x_positions> const &breaking) 
 {
   for (int i = 0; i < breaking.size (); i++)
     {