From fca995c53ca9e726caec5455d0238bfd62df4a9b Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:24:15 +0000 Subject: [PATCH] lilypond-1.3.68 --- input/test/between-systems.ly | 11 +++++++++++ lily/line-of-score.cc | 12 +++++++++++- scm/lily.scm | 12 +++++++++--- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 input/test/between-systems.ly diff --git a/input/test/between-systems.ly b/input/test/between-systems.ly new file mode 100644 index 0000000000..1f72c7a90f --- /dev/null +++ b/input/test/between-systems.ly @@ -0,0 +1,11 @@ + +\score { +\notes { c1 + + \context Score \outputproperty #(make-type-checker 'paper-column-interface) + #'between-system-string = #"(pagebreak)\n\n" + \break + +c1 } + +} diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc index 62bd6a153d..274a558a07 100644 --- a/lily/line-of-score.cc +++ b/lily/line-of-score.cc @@ -101,6 +101,17 @@ Line_of_score::output_lines () progress_indication (to_str (i)); progress_indication ("]"); } + + if (i < broken_into_l_arr_.size () - 1) + { + SCM lastcol = gh_car (line_l->get_elt_pointer ("columns")); + Score_element* e = unsmob_element (lastcol); + SCM inter = e->get_elt_property ("between-system-string"); + if (gh_string_p (inter)) + { + pscore_l_->outputter_l_->output_string (inter); + } + } } } @@ -179,7 +190,6 @@ Line_of_score::add_column (Paper_column*p) set_elt_pointer ("columns", gh_cons (p->self_scm_, cs)); Axis_group_interface (this).add_element (p); - typeset_element (p); } diff --git a/scm/lily.scm b/scm/lily.scm index 80e3ffeb6a..7479ba214e 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -229,9 +229,15 @@ ; Make a function that checks score element for being of a specific type. -(define (make-type-checker name) +(define (make-type-checker symbol) (lambda (elt) - (not (not (memq name (ly-get-elt-property elt 'interfaces)))))) + (display symbol) + (if (eq? #t (ly-get-elt-property elt symbol)) + #t + #f) + )) + + ;;;;;;;;;;;;;;;;;;; TeX output @@ -373,7 +379,7 @@ (string-append"\\vbox to " (number->dim ht) "{\\hbox{%\n")) (define (stop-line) - "}\\vss}\\interscoreline") + "}\\vss}\\interscoreline\n") (define (stop-last-line) "}\\vss}") (define (filledbox breapth width depth height) -- 2.39.5