set optimal-page-breaks as default

diff --git a/ChangeLog b/ChangeLog
index 53ff4ebc7909ae60fcea35eb58e7dfd6dca83fcd..3ebbab8f1664a2760c9542a11d3433cfaf80fde2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-07  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * ly/book-paper-defaults.ly: set optimal-page-breaks as default
+
 2004-06-06  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * ly/engraver-init.ly (AncientRemoveEmptyStaffContext): remove

diff --git a/lily/page.cc b/lily/page.cc
index b84131a6776a73a4c91b5018450ef34ddcc49edc..b40d80565496f1c50208ef69ec3957e56322efde 100644 (file)
--- a/lily/page.cc
+++ b/lily/page.cc
@@ -202,6 +202,11 @@ Page::text_height () const
   return h;
 }
 
+
+/*
+  TODO: unused?
+  
+ */
 LY_DEFINE (ly_page_paper_lines, "ly:page-paper-lines",
           1, 0, 0, (SCM page),
           "Return paper-lines from @var{page}.")

diff --git a/lily/paper-line.cc b/lily/paper-line.cc
index eda36f62ebe89eb6ffe17be8cc2eceb6ac2a9590..21c51439c1c029cd0d008a9602b0c329f1f74baf 100644 (file)
--- a/lily/paper-line.cc
+++ b/lily/paper-line.cc
@@ -18,8 +18,6 @@ IMPLEMENT_TYPE_P (Paper_line, "ly:paper-line?");
 IMPLEMENT_DEFAULT_EQUAL_P (Paper_line);
 
 
-#define TITLE_PENALTY -1
-
 
 Paper_line::Paper_line (Stencil s, int penalty, bool is_title)
 {

diff --git a/ly/book-paper-defaults.ly b/ly/book-paper-defaults.ly
index b4e81fcae3be88e28af2a286e3a16352222dd2dd..561231be411f576b4b16c2ac81e50e6eac85e516 100644 (file)
--- a/ly/book-paper-defaults.ly
+++ b/ly/book-paper-defaults.ly
@@ -36,8 +36,8 @@
        (baseline-skip . 2)
        (word-space . 0.6)))
 
-    #(define page-breaking ly:ragged-page-breaks)
-    %%#(define page-breaking ly:optimal-page-breaks)
+    % #(define page-breaking ly:ragged-page-breaks)
+    #(define page-breaking ly:optimal-page-breaks)
 
     #(define page-to-stencil ly:page-header-lines-footer-stencil)