first-system-spacing -> top-system-spacing
first-system-title-spacing -> top-title-spacing
last-system-spacing -> bottom-system-spacing
+++ /dev/null
-\version "2.13.2"
-
-#(set-default-paper-size "a6")
-
-\book {
-
- \header {
- texidoc = "first-system-spacing controls the spacing to the first
-non-title staff on every page."
- title = "Title"
- }
-
- \paper {
- first-system-spacing = #'((minimum-distance . 30))
- ragged-bottom = ##t
- }
-
- { c'1 \pageBreak c'1 }
-}
\ No newline at end of file
+++ /dev/null
-\version "2.13.2"
-
-#(set-default-paper-size "a6")
-
-\book {
-
- \header {
- texidoc = "first-system-title-spacing controls the spacing to the title,
-provided that it is the first system on a page."
- title = "Title"
- }
-
- \paper {
- first-system-title-spacing = #'((minimum-distance . 30))
- ragged-bottom = ##t
- }
-
- { c'1 \pageBreak c'1 }
-}
\ No newline at end of file
- first-system-spacing = #'((space . 1) (padding . 10))
- last-system-spacing = #'((space . 1) (padding . 10))
+ top-system-spacing = #'((space . 1) (padding . 10))
+ bottom-system-spacing = #'((space . 1) (padding . 10))
annotate-spacing = ##t
ragged-last-bottom = ##f
}
annotate-spacing = ##t
ragged-last-bottom = ##f
}
--- /dev/null
+\version "2.13.2"
+
+#(set-default-paper-size "a6")
+
+\book {
+
+ \header {
+ texidoc = "top-system-spacing controls the spacing to the first
+non-title staff on every page."
+ title = "Title"
+ }
+
+ \paper {
+ top-system-spacing = #'((minimum-distance . 30))
+ ragged-bottom = ##t
+ }
+
+ { c'1 \pageBreak c'1 }
+}
\ No newline at end of file
--- /dev/null
+\version "2.13.2"
+
+#(set-default-paper-size "a6")
+
+\book {
+
+ \header {
+ texidoc = "@var{top-title-spacing} controls the spacing
+from the top margin to a title (or markup), provided that it is
+the first system on a page."
+ title = "Title" }
+
+ \paper {
+ top-title-spacing = #'((minimum-distance . 30))
+ ragged-bottom = ##t
+ }
+
+ { c'1 \pageBreak c'1 }
+}
\ No newline at end of file
Real
Page_breaking::min_whitespace_at_top_of_page (Line_details const &line) const
{
Real
Page_breaking::min_whitespace_at_top_of_page (Line_details const &line) const
{
- SCM first_system_spacing = book_->paper_->c_variable ("first-system-spacing");
+ SCM first_system_spacing = book_->paper_->c_variable ("top-system-spacing");
- first_system_spacing = book_->paper_->c_variable ("first-system-title-spacing");
+ first_system_spacing = book_->paper_->c_variable ("top-title-spacing");
Real min_distance = -infinity_f;
Real padding = 0;
Real min_distance = -infinity_f;
Real padding = 0;
Real
Page_breaking::min_whitespace_at_bottom_of_page (Line_details const &line) const
{
Real
Page_breaking::min_whitespace_at_bottom_of_page (Line_details const &line) const
{
- SCM last_system_spacing = book_->paper_->c_variable ("last-system-spacing");
+ SCM last_system_spacing = book_->paper_->c_variable ("bottom-system-spacing");
Real min_distance = -infinity_f;
Real padding = 0;
Real min_distance = -infinity_f;
Real padding = 0;
after_title_spacing = paper->c_variable ("after-title-spacing");
before_title_spacing = paper->c_variable ("before-title-spacing");
between_title_spacing = paper->c_variable ("between-title-spacing");
after_title_spacing = paper->c_variable ("after-title-spacing");
before_title_spacing = paper->c_variable ("before-title-spacing");
between_title_spacing = paper->c_variable ("between-title-spacing");
- last_system_spacing = paper->c_variable ("last-system-spacing");
- first_system_spacing = paper->c_variable ("first-system-spacing");
+ last_system_spacing = paper->c_variable ("bottom-system-spacing");
+ first_system_spacing = paper->c_variable ("top-system-spacing");
if (scm_is_pair (systems) && unsmob_prob (scm_car (systems)))
if (scm_is_pair (systems) && unsmob_prob (scm_car (systems)))
- first_system_spacing = paper->c_variable ("first-system-title-spacing");
+ first_system_spacing = paper->c_variable ("top-title-spacing");
// Note: the page height here does _not_ reserve space for headers and
// Note: the page height here does _not_ reserve space for headers and
- // footers. This is because we want to anchor the first-system-spacing
+ // footers. This is because we want to anchor the top-system-spacing
// spring at the _top_ of the header.
page_height_ -= robust_scm2double (paper->c_variable ("top-margin"), 0)
+ robust_scm2double (paper->c_variable ("bottom-margin"), 0);
// spring at the _top_ of the header.
page_height_ -= robust_scm2double (paper->c_variable ("top-margin"), 0)
+ robust_scm2double (paper->c_variable ("bottom-margin"), 0);
- // TODO: junk bottom-space now that we have last-system-spacing?
+ // TODO: junk bottom-space now that we have bottom-system-spacing?
// bottom-space has the flexibility that one can do it per-system.
// NOTE: bottom-space is misnamed since it is not stretchable space.
if (Prob *p = elements_.back ().prob)
// bottom-space has the flexibility that one can do it per-system.
// NOTE: bottom-space is misnamed since it is not stretchable space.
if (Prob *p = elements_.back ().prob)
after-title-spacing = #'((space . 2) (padding . 0.5))
before-title-spacing = #'((space . 5) (padding . 0.5))
between-title-spacing = #'((space . 1) (padding . 0.5))
after-title-spacing = #'((space . 2) (padding . 0.5))
before-title-spacing = #'((space . 5) (padding . 0.5))
between-title-spacing = #'((space . 1) (padding . 0.5))
- first-system-spacing = #'((space . 1) (padding . 1) (min-distance . 0))
- first-system-title-spacing = #'((space . 1) (padding . 1) (min-distance . 0))
- last-system-spacing = #'((space . 1) (padding . 1) (min-distance . 0) (stretchability . 5))
+ top-system-spacing = #'((space . 1) (padding . 1) (min-distance . 0))
+ top-title-spacing = #'((space . 1) (padding . 1) (min-distance . 0))
+ bottom-system-spacing = #'((space . 1) (padding . 1) (min-distance . 0) (stretchability . 5))
(define (annotate-top-space first-system layout header-stencil stencil)
(let* ((top-margin (ly:output-def-lookup layout 'top-margin))
(sym (if (paper-system-title? first-system)
(define (annotate-top-space first-system layout header-stencil stencil)
(let* ((top-margin (ly:output-def-lookup layout 'top-margin))
(sym (if (paper-system-title? first-system)
- 'first-system-title-spacing
- 'first-system-spacing))
+ 'top-title-spacing
+ 'top-system-spacing))
(spacing-spec (ly:output-def-lookup layout sym))
(X-offset (ly:prob-property first-system 'X-offset 5))
(header-extent (ly:stencil-extent header-stencil Y)))
(spacing-spec (ly:output-def-lookup layout sym))
(X-offset (ly:prob-property first-system 'X-offset 5))
(header-extent (ly:stencil-extent header-stencil Y)))