From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 20 Oct 2006 18:06:59 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.10.0-2~124
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f00f6f9ca6642e34075252e5675bf174c0575496;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index f934b3bb42..e0ee0a34dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,12 @@
 
 2006-10-20  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* lily/page-turn-engraver.cc (acknowledge_note_head): don't look
+	at typography, rather analyse stream event duration. 
+
+	* Documentation/user/page.itely (Page formatting): set a6 paper
+	for system separator example.
+	
 	* lily/arpeggio.cc (Module): idem.
 
 	* lily/accidental-placement.cc: add script-priority property.
diff --git a/Documentation/user/page.itely b/Documentation/user/page.itely
index 5fe418b596..c555384ef3 100644
--- a/Documentation/user/page.itely
+++ b/Documentation/user/page.itely
@@ -241,6 +241,7 @@ The markup command @code{\slashSeparator} is provided as a sensible
 default,  for example
 
 @lilypond[ragged-right]
+#(set-default-paper-size "a6" 'landscape)
 \book {
   \score {
     \relative { c1 \break c1 }
diff --git a/THANKS b/THANKS
index 971565329a..d1a096a93e 100644
--- a/THANKS
+++ b/THANKS
@@ -73,6 +73,7 @@ Karl Hammar
 Keith Packard
 Kieren MacMillan
 Lee T. Wilkirson
+Lieke van der Meer
 Mark Dewey
 Marcus Macauley
 Markus Schneider
diff --git a/lily/page-turn-engraver.cc b/lily/page-turn-engraver.cc
index c67d57a750..c2817479d3 100644
--- a/lily/page-turn-engraver.cc
+++ b/lily/page-turn-engraver.cc
@@ -134,12 +134,14 @@ Page_turn_engraver::penalty (Rational rest_len)
 void
 Page_turn_engraver::acknowledge_note_head (Grob_info gi)
 {
-  SCM dur_log_scm = gi.grob ()->get_property ("duration-log");
-  if (!scm_is_number (dur_log_scm))
-    return;
+  Stream_event *cause = gi.event_cause ();
 
-  int dur_log = scm_to_int (dur_log_scm);
-  int dot_count = robust_scm2int (gi.grob ()->get_property ("dot-count"), 0);
+  Duration *dur_ptr = cause
+    ? unsmob_duration (cause->get_property ("duration"))
+    : 0;
+  
+  if (!dur_ptr)
+    return;
 
   if (rest_begin_ < now_mom ())
     {
@@ -152,7 +154,7 @@ Page_turn_engraver::acknowledge_note_head (Grob_info gi)
 
   if (rest_begin_ <= repeat_begin_)
     repeat_begin_rest_length_ = (now_mom () - repeat_begin_).main_part_;
-  note_end_ = now_mom () + Moment (Duration (dur_log, dot_count).get_length ());
+  note_end_ = now_mom () + dur_ptr->get_length ();
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Page_turn_engraver, break);