From 874fecc2e70c51d2ad34f1677496292a5c56e63d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 9 Mar 2004 13:37:50 +0000 Subject: [PATCH] * lily/system.cc (get_line): * lily/paper-outputter.cc (output_line): Fix `between-system-string'. --- lily/include/paper-book.hh | 2 +- lily/paper-outputter.cc | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh index 9fd93ffcbe..42945d5434 100644 --- a/lily/include/paper-book.hh +++ b/lily/include/paper-book.hh @@ -9,7 +9,7 @@ #ifndef PAPER_BOOK_HH #define PAPER_BOOK_HH -// #define PAGE_LAYOUT 1 +//#define PAGE_LAYOUT 1 #include "parray.hh" class Page; diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 51135a7e9c..dead824a55 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -103,16 +103,29 @@ Paper_outputter::output_line (SCM line, bool is_last) output_scheme (scm_list_3 (ly_symbol2scm ("start-system"), gh_double2scm (width), gh_double2scm (height))); + SCM between = SCM_EOL; for (SCM s = ly_cdr (line); gh_pair_p (s); s = ly_cdr (s)) { Stencil *stil = unsmob_stencil (ly_cdar (s)); - output_expr (stil->get_expr (), ly_scm2offset (ly_caar (s))); + SCM head = ly_caar (s); +#ifndef PAGE_LAYOUT + if (head == ly_symbol2scm ("between-system-string")) + { + between = stil->get_expr (); + continue; + } +#endif + output_expr (stil->get_expr (), ly_scm2offset (head)); } if (is_last) output_scheme (scm_list_1 (ly_symbol2scm ("stop-last-system"))); else - output_scheme (scm_list_1 (ly_symbol2scm ("stop-system"))); + { + output_scheme (scm_list_1 (ly_symbol2scm ("stop-system"))); + if (between != SCM_EOL) + output_scheme (between); + } } void -- 2.39.5