release commit

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index c5035cde4213bd59f4acd8d9f2a416723f7bc769..3e60fadbec96e753533aa9cccc199c08bf2fbc1e 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -45,6 +45,21 @@ This document is also available in @uref{NEWS.pdf,PDF}.
 
 
 @itemize @bullet
+
+@item 
+Vertical spacing for page layout can now be tuned for each system
+individually.  The dimensions that can be tuned can be visualized.
+
+@lilypond[verbatim]
+#(set-default-paper-size "a7" 'landscape)
+\book {
+ \score { { c4 } }
+ \paper { annotatespacing = ##t }
+}
+@end lilypond
+
+This feature was sponsored by Trevor Baca and Nicolas Sceaux.
+
 @item
 The slope of a stem-tremolo may be set manually
 
@@ -56,12 +71,6 @@ c:16 c:16 c:16 ]
 
 This feature was sponsored by Sven Axelsson.
 
-@item 
-Vertical spacing for page layout can now be tuned for each system
-individually.  
-
-This feature was sponsored by Trevor Baca and Nicolas Sceaux.
-
 @item
 Laissez vibrer ties can be created with @code{\laissezVibrer},
 

diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index 150b6d85c5fb08fcadd29708c3eebfadcaf77cfa..67d301ba035cee86f5b75e277bb5a846b333bbf8 100644 (file)
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -535,6 +535,7 @@ will graphically indicate the dimensions of properties that may be set
 for page spacing,
 
 @lilypond[verbatim]
+#(set-default-paper-size "a6")
 \paper { annotatespacing = ##t }
 { c4 }
 @end lilypond

diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly
index 0a541a5e2858699726f8c7783e65d894e3b0d085..ca3a36cc61d16b141ad7be2438dbebf15f9239ec 100644 (file)
--- a/input/regression/hara-kiri-pianostaff.ly
+++ b/input/regression/hara-kiri-pianostaff.ly
@@ -16,6 +16,7 @@ This example was done with a pianostaff, which has fixed distance
 alignment; this should not confuse the mechanism.
 "
          
+}
 
 \layout {
   raggedright= ##t

diff --git a/lily/laissez-vibrer-tie.cc b/lily/laissez-vibrer-tie.cc
index c63f3990e19de7ef47d71e15afb50b2319d201ea..7dcce699865c72af2747197c7ca91691f4cfb176 100644 (file)
--- a/lily/laissez-vibrer-tie.cc
+++ b/lily/laissez-vibrer-tie.cc
@@ -21,11 +21,11 @@ ADD_INTERFACE(Laissez_vibrer_tie,
 
              /* properties */
              "control-points "
+             "direction "
              "details "
+             "note-head "
              "thickness "
              "x-gap "
-             "details "
-             "note-head "
              );
 
 MAKE_SCHEME_CALLBACK (Laissez_vibrer_tie, print, 1);

diff --git a/make/lilypond.fedora.spec.in b/make/lilypond.fedora.spec.in
index 24995573a92e1b360323b711f4a801f6830b5909..be2d56bad830ba1b04d50a0feb60752d82fadcf2 100644 (file)
--- a/make/lilypond.fedora.spec.in
+++ b/make/lilypond.fedora.spec.in
@@ -156,7 +156,6 @@ scrollkeeper-update
 %{_bindir}/midi2ly
 %{_bindir}/lilypond-book
 %{_bindir}/mup2ly
-%{_bindir}/lilypond-ps2png
 %{_bindir}/lilypond-invoke-editor
 
 %doc THANKS
@@ -178,7 +177,6 @@ scrollkeeper-update
 %{_mandir}/man1/midi2ly.1.gz
 %{_mandir}/man1/lilypond-book.1.gz
 %{_mandir}/man1/mup2ly.1.gz
-%{_mandir}/man1/lilypond-ps2png.1.gz
 %{_mandir}/man1/lilypond-invoke-editor.1.gz
 
 %{_datadir}/lilypond/@TOPLEVEL_VERSION@/

diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 4c48fb6ceb060ed1a23a4c7851d6dbd512e154ec..51517bee407c409783371e580a74e534e430304f 100644 (file)
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -97,10 +97,14 @@
                     
        )
 
-    (if (number-pair? bbox-extent) 
-       (annotate-property "Y-extent"
-                          bbox-extent #f))
-
+    (if (number-pair? bbox-extent)
+       (begin
+         (annotate-property "Y-extent"
+                            bbox-extent #f)
+         (annotate-property "next-padding"
+                            (interval-translate (cons (- next-padding) 0) (car bbox-extent))
+                            #t)))
+    
     ;; titles don't have a refpoint-Y-extent.
     (if (number-pair? refp-extent)
        (begin
@@ -112,10 +116,6 @@
                       #t)))
        
     
-    (annotate-property "next-padding"
-                      (interval-translate (cons (- next-padding) 0) (car bbox-extent))
-                      #t)
-    
 
     (set! (ly:paper-system-property system 'stencil)
          (ly:stencil-add

diff --git a/scm/paper.scm b/scm/paper.scm
index f2e51647c26fdaa16ab4d30eab43b5644388685d..0085a158397d994fa7a429d139a2e6d7cc89c758 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -73,7 +73,8 @@
     (module-define! old-mod '$defaultpaper new-paper)))
 
 (define-public paper-alist
-  '(("a6" . (cons (* 105 mm) (* 148.95 mm)))
+  '(("a7" . (cons (* 74.48 mm) (* 148.95 mm)))
+    ("a6" . (cons (* 105 mm) (* 148.95 mm)))
     ("a5" . (cons (* 148.95 mm) (* 210 mm)))
     ("a4" . (cons (* 210 mm) (* 297.9 mm)))
     ("a3" . (cons (* 297.9 mm) (* 420 mm)))