From: Han-Wen Nienhuys Date: Mon, 18 Apr 2005 00:36:45 +0000 (+0000) Subject: * lily/include/paper-score.hh (class Paper_score): remove unused prototypes. X-Git-Tag: release/2.5.20~20 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=813ef8712c3026794399ff1425a245ffe075efaf;p=lilypond.git * lily/include/paper-score.hh (class Paper_score): remove unused prototypes. * lily/book.cc (process): add -COUNT to midi output. * lily/score.cc (book_rendering): remove outname argument (book_rendering): return list of Music_outputs. * lily/global-context-scheme.cc (LY_DEFINE): remove outname argument. * lily/book.cc (process): loop over Music_outputs returned from Score::book_rendering(). * lily/include/music-output.hh (class Music_output): smobify class. * lily/include/paper-score.hh (class Paper_score): make members private. * lily/performance.cc (process): return #f iso. #. This prevents # leaking into GUILE-userspace. --- diff --git a/ChangeLog b/ChangeLog index 68f8a806dd..8f3bc2eb1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,23 @@ 2005-04-18 Han-Wen Nienhuys + * lily/include/paper-score.hh (class Paper_score): remove unused prototypes. + + * lily/book.cc (process): add -COUNT to midi output. + + * lily/score.cc (book_rendering): remove outname argument + (book_rendering): return list of Music_outputs. + + * lily/global-context-scheme.cc (LY_DEFINE): remove outname argument. + + * lily/book.cc (process): loop over Music_outputs returned from Score::book_rendering(). + + * lily/*.cc (width_callback): remove spurious "unused" warnings + for assert (axis==[XY]_AXIS); + + * lily/include/music-output.hh (class Music_output): smobify class. + + * lily/include/paper-score.hh (class Paper_score): make members private. + * lily/performance.cc (process): return #f iso. #. This prevents # leaking into GUILE-userspace. diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 2a1a32b533..7fede4a5ab 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -140,8 +140,9 @@ SCM Arpeggio::width_callback (SCM smob, SCM axis) { Grob *me = unsmob_grob (smob); - Axis a = (Axis)scm_to_int (axis); - assert (a == X_AXIS); + (void) axis; + + assert (scm_to_int (axis) == X_AXIS); Stencil arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts.arpeggio"); return ly_interval2scm (arpeggio.extent (X_AXIS)); diff --git a/lily/beam.cc b/lily/beam.cc index d8b2a37887..7d277dac50 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -1287,12 +1287,12 @@ SCM Beam::rest_collision_callback (SCM element_smob, SCM axis) { Grob *rest = unsmob_grob (element_smob); - Axis a = (Axis) scm_to_int (axis); + (void) axis; if (scm_is_number (rest->get_property ("staff-position"))) return scm_int2num (0); - assert (a == Y_AXIS); + assert (scm_to_int (axis) == Y_AXIS); Grob *st = unsmob_grob (rest->get_property ("stem")); Grob *stem = st; diff --git a/lily/book.cc b/lily/book.cc index 7e3d29b778..e0388c00c3 100644 --- a/lily/book.cc +++ b/lily/book.cc @@ -23,6 +23,9 @@ #include "text-item.hh" #include "warn.hh" +#include "performance.hh" +#include "paper-score.hh" + #include "ly-smobs.icc" Book::Book () @@ -95,20 +98,36 @@ Book::process (String outname, Output_def *default_def) paper_book->header_ = header_; /* Render in order of parsing. */ + int midi_count = 0; for (SCM s = scm_reverse (scores_); s != SCM_EOL; s = scm_cdr (s)) { if (Score *score = unsmob_score (scm_car (s))) { - SCM systems = score - ->book_rendering (outname, paper_book->paper_, default_def, key); + SCM outputs = score + ->book_rendering (paper_book->paper_, default_def, key); - /* If the score is empty, generate no output. Should we do - titling? */ - if (scm_is_vector (systems)) + while (scm_is_pair (outputs)) { - if (ly_c_module_p (score->header_)) - paper_book->add_score (score->header_); - paper_book->add_score (systems); + Music_output *output = unsmob_music_output (scm_car (outputs)); + + if (Performance *perf = dynamic_cast (output)) + { + String fn = outname; + if (midi_count) + fn += "-" + to_string (midi_count); + + midi_count ++; + perf->write_output (fn); + } + else if (Paper_score *pscore = dynamic_cast (output)) + { + SCM systems = pscore->get_systems (); + if (ly_c_module_p (score->header_)) + paper_book->add_score (score->header_); + paper_book->add_score (systems); + } + + outputs = scm_cdr (outputs); } } else if (Text_interface::markup_p (scm_car (s))) diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc index 66be64c8df..96f4031a08 100644 --- a/lily/break-algorithm.cc +++ b/lily/break-algorithm.cc @@ -19,7 +19,7 @@ Array Break_algorithm::find_break_indices () const { - Link_array all = pscore_->system_->columns (); + Link_array all = pscore_->root_system ()->columns (); Array retval; for (int i = 0; i < all.size (); i++) @@ -36,7 +36,7 @@ Break_algorithm::find_break_indices () const Link_array Break_algorithm::find_breaks () const { - Link_array all = pscore_->system_->columns (); + Link_array all = pscore_->root_system ()->columns (); Link_array retval; for (int i = 0; i < all.size (); i++) @@ -88,7 +88,7 @@ void Break_algorithm::set_pscore (Paper_score *s) { pscore_ = s; - linewidth_ = s->layout_->get_dimension (ly_symbol2scm ("linewidth")); + linewidth_ = s->layout ()->get_dimension (ly_symbol2scm ("linewidth")); } Array diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc index 1b3daecdb3..c2d4b09828 100644 --- a/lily/break-align-interface.cc +++ b/lily/break-align-interface.cc @@ -43,8 +43,8 @@ SCM Break_align_interface::self_align_callback (SCM element_smob, SCM axis) { Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) scm_to_int (axis); - assert (a == X_AXIS); + (void) axis; + assert (scm_to_int (axis) == X_AXIS); Item *item = dynamic_cast (me); Direction bsd = item->break_status_dir (); diff --git a/lily/dot-column.cc b/lily/dot-column.cc index 005651a123..2b0e59494c 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -29,8 +29,8 @@ SCM Dot_column::force_shift_callback (SCM element_smob, SCM axis) { Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) scm_to_int (axis); - assert (a == Y_AXIS); + (void) axis; + assert (scm_to_int (axis) == Y_AXIS); me = me->get_parent (X_AXIS); if (!to_boolean (me->get_property ("positioning-done"))) @@ -47,8 +47,8 @@ SCM Dot_column::side_position (SCM element_smob, SCM axis) { Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) scm_to_int (axis); - assert (a == X_AXIS); + (void) axis; + assert (scm_to_int (axis) == X_AXIS); Grob *stem = unsmob_grob (me->get_property ("stem")); if (stem diff --git a/lily/global-context-scheme.cc b/lily/global-context-scheme.cc index 4f71756153..c98a6fd8e4 100644 --- a/lily/global-context-scheme.cc +++ b/lily/global-context-scheme.cc @@ -17,19 +17,17 @@ #include "main.hh" LY_DEFINE (ly_format_output, "ly:format-output", - 2, 0, 0, (SCM context, SCM outname), + 1, 0, 0, (SCM context), "Given a Global context in its final state, " - "process it and return the (rendered) result.") + "process it and return the @code{Music_output} object in its final state.") { Global_context *g = dynamic_cast (unsmob_context (context)); SCM_ASSERT_TYPE (g, context, SCM_ARG1, __FUNCTION__, "Global context"); - SCM_ASSERT_TYPE (scm_is_string (outname), outname, SCM_ARG2, __FUNCTION__, "output file name"); Music_output *output = g->get_output (); progress_indication ("\n"); - - /* ugh, midi still wants outname */ - return output->process (ly_scm2string (outname)); + output->process (); + return output->self_scm (); } LY_DEFINE (ly_run_translator, "ly:run-translator", diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc index 4143f0f11c..3c7ed01a97 100644 --- a/lily/gourlay-breaking.cc +++ b/lily/gourlay-breaking.cc @@ -77,15 +77,15 @@ Gourlay_breaking::do_solve () const { Array optimal_paths; Link_array all - = pscore_->system_->columns (); + = pscore_->root_system ()->columns (); Array breaks = find_break_indices (); Break_node first_node; optimal_paths.push (first_node); - bool ragged_right = to_boolean (pscore_->layout_->c_variable ("raggedright")); - bool ragged_last = to_boolean (pscore_->layout_->c_variable ("raggedlast")); + bool ragged_right = to_boolean (pscore_->layout ()->c_variable ("raggedright")); + bool ragged_last = to_boolean (pscore_->layout ()->c_variable ("raggedlast")); Real worst_force = 0.0; for (int break_idx = 1; break_idx < breaks.size (); break_idx++) @@ -111,7 +111,7 @@ Gourlay_breaking::do_solve () const cp.cols_ = line; Interval line_dims - = line_dimensions_int (pscore_->layout_, optimal_paths[start_idx].line_); + = line_dimensions_int (pscore_->layout (), optimal_paths[start_idx].line_); Simple_spacer_wrapper *sp = generate_spacing_problem (line, line_dims); bool last_line = break_idx == breaks.size () - 1; bool ragged = ragged_right diff --git a/lily/grob.cc b/lily/grob.cc index 31c5add458..fca538fb7e 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -172,7 +172,7 @@ robust_relative_extent (Grob *me, Grob *refp, Axis a) Output_def * Grob::get_layout () const { - return pscore_ ? pscore_->layout_ : 0; + return pscore_ ? pscore_->layout () : 0; } /* Recursively track all dependencies of this Grob. The status_ field @@ -663,8 +663,8 @@ Grob::mark_smob (SCM ses) if (s->original_) scm_gc_mark (s->original_->self_scm ()); - if (s->pscore_ && s->pscore_->layout_) - scm_gc_mark (s->pscore_->layout_->self_scm ()); + if (s->pscore_ && s->pscore_->layout ()) + scm_gc_mark (s->pscore_->layout ()->self_scm ()); s->do_derived_mark (); return s->mutable_property_alist_; diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index 6ff6f4a95c..22975589cb 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -19,9 +19,9 @@ SCM Hara_kiri_group_spanner::y_extent (SCM element_smob, SCM scm_axis) { Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) scm_to_int (scm_axis); + (void) scm_axis; - assert (a == Y_AXIS); + assert (scm_to_int (scm_axis) == Y_AXIS); consider_suicide (me); return Axis_group_interface::group_extent_callback (me->self_scm (), scm_axis); } @@ -59,8 +59,9 @@ SCM Hara_kiri_group_spanner::force_hara_kiri_callback (SCM element_smob, SCM axis) { Grob *me = unsmob_grob (element_smob); - Axis a = (Axis) scm_to_int (axis); - assert (a == Y_AXIS); + (void) axis; + + assert (scm_to_int (axis) == Y_AXIS); consider_suicide (me); return scm_make_real (0.0); } diff --git a/lily/include/global-context.hh b/lily/include/global-context.hh index a51859f3a5..adc0b07932 100644 --- a/lily/include/global-context.hh +++ b/lily/include/global-context.hh @@ -44,6 +44,6 @@ protected: Moment now_mom_; }; -SCM ly_format_output (SCM, SCM); +SCM ly_format_output (SCM); #endif // GLOBAL_CONTEXT_HH diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh index cb75cc7061..c185f62247 100644 --- a/lily/include/music-output.hh +++ b/lily/include/music-output.hh @@ -12,12 +12,20 @@ #include "string.hh" #include "lily-proto.hh" #include "protected-scm.hh" +#include "smobs.hh" class Music_output { + DECLARE_SMOBS(Music_output, foo); + +protected: + Music_output (); + public: - virtual SCM process (String); - virtual ~Music_output (); + virtual void derived_mark () const; + virtual void process (); }; +DECLARE_UNSMOB (Music_output, music_output); + #endif /* MUSIC_OUTPUT_HH */ diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh index bd90ec1de2..10f6004242 100644 --- a/lily/include/paper-score.hh +++ b/lily/include/paper-score.hh @@ -15,27 +15,25 @@ /* LAYOUT output */ class Paper_score : public Music_output { -public: Output_def *layout_; System *system_; + SCM systems_; - Paper_score (); +public: + Paper_score (Output_def *); - int find_col_idx (Paper_column const *) const; - Link_array broken_col_range (Item const *, Item const *) const; - void typeset_line (System *); - void output (); + Output_def *layout () const; + System *root_system () const; + + void typeset_system (System *); + Array calc_breaking (); + SCM get_systems () const; protected: - virtual SCM process (String); + virtual void process (); + virtual void derived_mark () const; private: - Protected_scm systems_; - - void preprocess (); - void calc_idealspacing (); - Array calc_breaking (); - void postprocess (); Paper_score (Paper_score const &); }; diff --git a/lily/include/performance.hh b/lily/include/performance.hh index 1d46cd8f66..2fad187dcb 100644 --- a/lily/include/performance.hh +++ b/lily/include/performance.hh @@ -24,7 +24,7 @@ public: void output_header_track (Midi_stream &midi_stream_r); void print () const; - SCM process (String); + void write_output (String filename); Link_array audio_staffs_; Cons *audio_element_list_; diff --git a/lily/include/score.hh b/lily/include/score.hh index f1c42fb1a6..ed6aecddd2 100644 --- a/lily/include/score.hh +++ b/lily/include/score.hh @@ -35,7 +35,7 @@ public: SCM get_music () const; void set_music (SCM music, SCM parser); - SCM book_rendering (String, Output_def *, Output_def *, Object_key *); + SCM book_rendering (Output_def *, Output_def *, Object_key *); }; DECLARE_UNSMOB (Score, score); diff --git a/lily/include/system.hh b/lily/include/system.hh index 5eaa2bed66..ea31faa752 100644 --- a/lily/include/system.hh +++ b/lily/include/system.hh @@ -21,8 +21,8 @@ class System : public Spanner public: int rank_; void post_processing (); - SCM get_line (); - SCM get_lines (); + SCM get_paper_system (); + SCM get_paper_systems (); System (SCM, Object_key const *); System (System const &, int); diff --git a/lily/item.cc b/lily/item.cc index 369d4f5178..d478d682e2 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -74,7 +74,7 @@ Item::copy_breakable_items () { Grob *dolly = clone (count++); Item *item = dynamic_cast (dolly); - pscore_->system_->typeset_grob (item); + pscore_->root_system ()->typeset_grob (item); new_copies[i] = item; } while (flip (&i) != LEFT); diff --git a/lily/music-output.cc b/lily/music-output.cc index 67b95303e4..958a78a887 100644 --- a/lily/music-output.cc +++ b/lily/music-output.cc @@ -8,14 +8,16 @@ */ #include "music-output.hh" +#include "ly-smobs.icc" -/* - Just stubs. - */ -SCM +Music_output::Music_output () +{ + smobify_self (); +} + +void Music_output::process () { - return SCM_EOL; } Music_output::~Music_output () @@ -23,3 +25,28 @@ Music_output::~Music_output () } +void +Music_output::derived_mark () const +{ +} + +IMPLEMENT_SMOBS (Music_output); +IMPLEMENT_DEFAULT_EQUAL_P (Music_output); +IMPLEMENT_TYPE_P (Music_output, "ly:score?"); + +SCM +Music_output::mark_smob (SCM s) +{ + Music_output *sc = (Music_output *) SCM_CELL_WORD_1 (s); + + sc->derived_mark (); + return SCM_EOL; +} + +int +Music_output::print_smob (SCM, SCM p, scm_print_state*) +{ + scm_puts ("#", p); + + return 1; +} diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 800aa132ed..c6ff9edcfb 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -21,10 +21,11 @@ #include "system.hh" #include "warn.hh" -Paper_score::Paper_score () +Paper_score::Paper_score (Output_def *layout) { - layout_ = 0; + layout_ = layout; system_ = 0; + systems_ = SCM_EOL; } Paper_score::Paper_score (Paper_score const &s) @@ -33,8 +34,15 @@ Paper_score::Paper_score (Paper_score const &s) assert (false); } + +void +Paper_score::derived_mark () const +{ + scm_gc_mark (systems_); +} + void -Paper_score::typeset_line (System *system) +Paper_score::typeset_system (System *system) { if (!system_) system_ = system; @@ -59,8 +67,8 @@ Paper_score::calc_breaking () return sol; } -SCM -Paper_score::process (String) +void +Paper_score::process () { if (be_verbose_global) message (_f ("Element count %d (spanners %d) ", @@ -81,12 +89,24 @@ Paper_score::process (String) Array breaking = calc_breaking (); system_->break_into_pieces (breaking); - SCM lines = system_->get_lines (); - - /* - retain Grobs, since they are pointed to by the point & click data - structures, and are not marked fully, because child -> parent - links aren't marked. - */ - return lines; + system_->get_paper_systems (); +} + +System * +Paper_score::root_system () const +{ + return system_; +} + +Output_def * +Paper_score::layout () const +{ + return layout_; +} + + +SCM +Paper_score::get_systems () const +{ + return root_system ()->get_paper_systems (); } diff --git a/lily/performance.cc b/lily/performance.cc index f030631acc..6735f025a7 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -149,8 +149,9 @@ Performance::add_element (Audio_element *p) audio_element_list_ = new Killing_cons (p, audio_element_list_); } -SCM -Performance::process (String out) + +void +Performance::write_output (String out) { if (out == "-") out = "lelie.midi"; @@ -165,5 +166,4 @@ Performance::process (String out) output (midi_stream); progress_indication ("\n"); - return SCM_BOOL_F; } diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 648cc6a758..4425741254 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -111,15 +111,14 @@ Score_engraver::initialize () + _ ("Aborting")); } - pscore_ = new Paper_score; - pscore_->layout_ = dynamic_cast (get_output_def ()); + pscore_ = new Paper_score (dynamic_cast (get_output_def ())); SCM props = updated_grob_properties (context (), ly_symbol2scm ("System")); Object_key const *sys_key = context ()->get_grob_key ("System"); - pscore_->typeset_line (new System (props, sys_key)); + pscore_->typeset_system (new System (props, sys_key)); - system_ = pscore_->system_; + system_ = pscore_->root_system (); make_columns (); system_->set_bound (LEFT, command_column_); command_column_->set_property ("breakable", SCM_BOOL_T); @@ -156,7 +155,7 @@ void Score_engraver::announce_grob (Grob_info info) { announce_infos_.push (info); - pscore_->system_->typeset_grob (info.grob_); + pscore_->root_system ()->typeset_grob (info.grob_); elems_.push (info.grob_); } diff --git a/lily/score-scheme.cc b/lily/score-scheme.cc index 3c7f5c9a27..56a175149e 100644 --- a/lily/score-scheme.cc +++ b/lily/score-scheme.cc @@ -62,7 +62,7 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format", SCM context = ly_run_translator (sc->get_music (), score_def->self_scm (), key); - SCM lines = ly_format_output (context, scm_makfrom0str ("")); + SCM lines = ly_format_output (context); scm_remember_upto_here_1 (prot); return lines; diff --git a/lily/score.cc b/lily/score.cc index d00b774ec6..68146c1676 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -119,7 +119,7 @@ default_rendering (SCM music, SCM outdef, if (Global_context *g = dynamic_cast (unsmob_context (context))) { - SCM systems = ly_format_output (context, outname); + SCM systems = ly_format_output (context); Music_output *output = g->get_output (); if (systems != SCM_UNDEFINED) { @@ -135,7 +135,7 @@ default_rendering (SCM music, SCM outdef, paper_book->classic_output (ly_scm2string (outname)); scm_gc_unprotect_object (paper_book->self_scm ()); } - delete output; + scm_gc_unprotect_object (output->self_scm ()); } scm_remember_upto_here_1 (scaled_def); @@ -143,14 +143,12 @@ default_rendering (SCM music, SCM outdef, } /* - Format score, return systems. OUTNAME is still passed to create a midi - file. + Format score, return list of Music_output objects. LAYOUTBOOK should be scaled already. */ SCM -Score::book_rendering (String outname, - Output_def *layoutbook, +Score::book_rendering (Output_def *layoutbook, Output_def *default_def, Object_key *book_key) { @@ -163,8 +161,9 @@ Score::book_rendering (String outname, if (layoutbook && layoutbook->c_variable ("is-paper") == SCM_BOOL_T) scale = scm_to_double (layoutbook->c_variable ("outputscale")); - SCM out = scm_makfrom0str (outname.to_str0 ()); - SCM systems = SCM_EOL; + SCM outputs = SCM_EOL; + SCM *tail = &outputs; + int outdef_count = defs_.size (); Object_key *key = new Lilypond_general_key (book_key, user_key_, 0); @@ -175,6 +174,7 @@ Score::book_rendering (String outname, { Output_def *def = outdef_count ? defs_[i] : default_def; SCM scaled = SCM_EOL; + if (def->c_variable ("is-layout") == SCM_BOOL_T) { def = scale_output_def (def, scale); @@ -187,9 +187,10 @@ Score::book_rendering (String outname, SCM context = ly_run_translator (music_, def->self_scm (), scm_key); if (dynamic_cast (unsmob_context (context))) { - SCM s = ly_format_output (context, out); - if (s != SCM_UNDEFINED) - systems = s; + SCM s = ly_format_output (context); + + *tail = scm_cons (s, SCM_EOL); + tail = SCM_CDRLOC(*tail); } scm_remember_upto_here_1 (scaled); @@ -197,7 +198,7 @@ Score::book_rendering (String outname, scm_remember_upto_here_1 (scm_key); scm_remember_upto_here_1 (scaled_bookdef); - return systems; + return outputs; } void diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 8f83e656ab..fa48551ab9 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -360,7 +360,7 @@ Spacing_spanner::set_springs (SCM smob) /* can't use get_system() ? --hwn. */ - Link_array all (me->pscore_->system_->columns ()); + Link_array all (me->pscore_->root_system ()->columns ()); set_explicit_neighbor_columns (all); diff --git a/lily/spanner.cc b/lily/spanner.cc index 05f1443e78..adaa648a14 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -81,7 +81,7 @@ Spanner::do_break_processing () } else { - Link_array break_points = pscore_->system_->broken_col_range (left, right); + Link_array break_points = pscore_->root_system ()->broken_col_range (left, right); break_points.insert (left, 0); break_points.push (right); diff --git a/lily/system.cc b/lily/system.cc index e6b034251b..cf011b16ce 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -83,7 +83,7 @@ fixup_refpoints (SCM s) } SCM -System::get_lines () +System::get_paper_systems () { for (SCM s = get_property ("all-elements"); scm_is_pair (s); s = scm_cdr (s)) { @@ -154,7 +154,7 @@ System::get_lines () System *system = dynamic_cast (broken_intos_[i]); system->post_processing (); - scm_vector_set_x (lines, scm_int2num (i), system->get_line ()); + scm_vector_set_x (lines, scm_int2num (i), system->get_paper_system ()); if (be_verbose_global) progress_indication (to_string (i) + "]"); @@ -171,7 +171,7 @@ System::break_into_pieces (Array const &breaking) system->rank_ = i; Link_array c (breaking[i].cols_); - pscore_->typeset_line (system); + pscore_->typeset_system (system); system->set_bound (LEFT, c[0]); system->set_bound (RIGHT, c.top ()); @@ -282,7 +282,7 @@ System::post_processing () } SCM -System::get_line () +System::get_paper_system () { static int const LAYER_COUNT = 3;