From d8ddee6490dd1bb4965980d3e952a390493bfffd Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 22 Oct 2000 22:14:46 +0200 Subject: [PATCH] release: 1.3.98 ====== * Backend documentation updates and related cleanups * Removed \property bracketCollapseHeight, systemStartDelimiterGlyph * Bugfix: instrument-name on grandstaffs, see input/test/instrument-name-grandstaff.ly * Bugfix for tie/staffline collision. * Bugfix: also send out end-repeat if there are no alternatives. * Small solo cello suite fixes. 1.3.97.j --- CHANGES | 30 +- VERSION | 4 +- flower/include/interval.hh | 4 + input/test/instrument-name-grandstaff.ly | 18 ++ input/test/instrument-name.ly | 12 + input/test/lyrics-multi-stanza.ly | 17 +- input/test/staff-margin.ly | 4 +- input/trip.ly | 2 +- lily/auto-beam-engraver.cc | 18 +- lily/break-align-item.cc | 2 - lily/clef-item.cc | 19 +- lily/include/axis-group-interface.hh | 3 - lily/include/chord-name.hh | 7 +- lily/include/clef.hh | 1 + lily/include/hara-kiri-group-spanner.hh | 13 - lily/include/item.hh | 14 +- lily/include/key-item.hh | 6 - lily/include/line-of-score.hh | 16 - lily/include/rest-collision.hh | 29 +- lily/include/score-element.hh | 22 +- lily/include/separation-item.hh | 13 +- lily/include/side-position-interface.hh | 13 +- lily/include/slur.hh | 2 - lily/include/stem.hh | 34 --- lily/include/tuplet-spanner.hh | 9 +- lily/input-smob.cc | 9 + lily/instrument-name-engraver.cc | 13 +- lily/lily-guile.cc | 10 + lily/property-engraver.cc | 7 +- lily/repeat-acknowledge-engraver.cc | 12 +- lily/score-element.cc | 25 +- lily/side-position-interface.cc | 3 +- lily/slur-bezier-bow.cc | 2 +- lily/slur.cc | 1 + lily/stem.cc | 10 +- lily/system-start-delimiter-engraver.cc | 16 +- lily/system-start-delimiter.cc | 1 - lily/text-item.cc | 1 + lily/tie.cc | 43 ++- lily/translator-group.cc | 6 +- lily/unfolded-repeat-iterator.cc | 8 +- lily/volta-engraver.cc | 4 + ly/engraver.ly | 11 +- make/out/lilypond.lsm | 6 +- make/out/lilypond.spec | 4 +- .../Solo-Cello-Suites/allemande-urtext.ly | 1 + .../Solo-Cello-Suites/courante-urtext.ly | 1 + .../Solo-Cello-Suites/gigue-urtext.ly | 1 + .../Solo-Cello-Suites/menuetto-cello.ly | 5 +- .../Solo-Cello-Suites/menuetto-urtext.ly | 2 + .../Solo-Cello-Suites/menuetto-viola.ly | 5 +- .../Solo-Cello-Suites/sarabande-urtext.ly | 1 + scm/basic-properties.scm | 2 +- scm/element-descriptions.scm | 12 +- scm/font.scm | 7 +- scm/generate-documentation.scm | 22 +- scm/interface.scm | 280 +++++++++++------- scm/lily.scm | 26 ++ scm/slur.scm | 2 +- 59 files changed, 438 insertions(+), 433 deletions(-) create mode 100644 input/test/instrument-name-grandstaff.ly create mode 100644 input/test/instrument-name.ly diff --git a/CHANGES b/CHANGES index ee34e3cab6..374d366791 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,18 @@ -1.3.97.jcn2 -=========== +1.3.98 +====== + +* Backend documentation updates and related cleanups + +* Removed \property bracketCollapseHeight, systemStartDelimiterGlyph -* Quick bugfix for regtest. +* Bugfix: instrument-name on grandstaffs, see +input/test/instrument-name-grandstaff.ly + +* Bugfix for tie/staffline collision. + +* Bugfix: also send out end-repeat if there are no alternatives. + +* Small solo cello suite fixes. 1.3.97.jcn1 =========== @@ -10,9 +21,8 @@ * Added raise and kern to markup. This should make Chord names usable. - -1.3.96.jcn10 -============ +1.3.97 +====== * Made small fixes to basic properties: regression-test compiles. @@ -54,9 +64,8 @@ inclusive) is now in Scheme. * Self-documenting backend using ly/generate-documentation.ly - -1.3.95.jcn5 -=========== +1.3.96 +====== * Added friendly message for the clueless dvips user. @@ -353,8 +362,6 @@ INCOMPATIBLE CHANGE) * added input/test/bagpipe.ly - - 1.3.87 ====== @@ -405,7 +412,6 @@ lists. * Separated definition and implementation of contexts (moved definition out of Translator_group into Translator_def) - * pmx2ly.py fixes: now handles text at beginning of block correctly. diff --git a/VERSION b/VERSION index 195c80f7cb..4ec85b0d8c 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=97 -MY_PATCH_LEVEL=jcn2 +PATCH_LEVEL=98 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/flower/include/interval.hh b/flower/include/interval.hh index e00db6914e..0e1bae6600 100644 --- a/flower/include/interval.hh +++ b/flower/include/interval.hh @@ -67,6 +67,10 @@ struct Interval_t : public Drul_array { } return *this; } + + Real linear_combination (Real x) const { + return ((1.0 - x) * Real (elem (LEFT)) + (x + 1.0) * Real (elem(RIGHT))) * 0.5; + } String str() const; void print () const; bool elem_b (T r); diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly new file mode 100644 index 0000000000..4e4017467e --- /dev/null +++ b/input/test/instrument-name-grandstaff.ly @@ -0,0 +1,18 @@ +\version "1.3.96"; + +\score { + \notes + \notes \context GrandStaff < + \context Staff = treble { + \property GrandStaff.instrument = "Violini " + \property Staff.instrument = " vn I" { c''4 }} + \context Staff = bass { \property Staff.instrument = " vn II" c''4 }> + + +\paper { +linewidth=-1.0; +\translator { \StaffContext + \consists "Instrument_name_engraver"; + } +\translator { \GrandStaffContext \consists "Instrument_name_engraver"; } +}} diff --git a/input/test/instrument-name.ly b/input/test/instrument-name.ly new file mode 100644 index 0000000000..b9df662586 --- /dev/null +++ b/input/test/instrument-name.ly @@ -0,0 +1,12 @@ +\version "1.3.96"; + +\score { + + \notes \context Staff = treble { + \property Staff.instrument = "instr " { c''4 }} + +\paper { +linewidth=-1.0; +\translator { \StaffContext \consists "Instrument_name_engraver"; } +}} + diff --git a/input/test/lyrics-multi-stanza.ly b/input/test/lyrics-multi-stanza.ly index d80bcba78b..dba9d1e56a 100644 --- a/input/test/lyrics-multi-stanza.ly +++ b/input/test/lyrics-multi-stanza.ly @@ -13,17 +13,18 @@ } allup = \notes{ - \property Voice.verticalDirection = \up - \property Voice.slurVerticalDirection = \up - \property Voice.tieVerticalDirection = \up - \property Voice.dynamicDirection = \up + \stemUp + \slurUp + \tieUp + \property Voice.DynamicLineSpanner \push #'direction = #1 \autoBeamOff } + alldown = \notes{ - \property Voice.verticalDirection = \down - \property Voice.slurVerticalDirection = \down - \property Voice.tieVerticalDirection = \down - \property Voice.dynamicDirection = \down + \stemDown + \slurDown + \tieDown + \property Voice.DynamicLineSpanner \push #'direction = #-1 \autoBeamOff } diff --git a/input/test/staff-margin.ly b/input/test/staff-margin.ly index 981b2a598f..315d115473 100644 --- a/input/test/staff-margin.ly +++ b/input/test/staff-margin.ly @@ -13,10 +13,8 @@ \paper { linewidth=-1.0; \translator { \ScoreContext - %textVerticalAlignment = #0 + } -%\translator { \StaffContext \consists "Instrument_name_engraver"; } -%\translator { \PianoStaffContext \consists "Instrument_name_engraver"; } \translator { \StaffContext \consists "Instrument_name_engraver"; } \translator { \PianoStaffContext \consists "Instrument_name_engraver"; } }} diff --git a/input/trip.ly b/input/trip.ly index 071311620e..f943744f35 100644 --- a/input/trip.ly +++ b/input/trip.ly @@ -205,7 +205,7 @@ fugaIIPedal = \notes \relative c { c2^^^-^\f \time 3/4; - \fugaIIPedal } + \fugaIIPedal \bar "|." ; } > > diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 4481ce67b3..62fa32579a 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -1,4 +1,3 @@ - /* auto-beam-engraver.cc -- implement Auto_beam_engraver @@ -7,6 +6,7 @@ (c) 1999--2000 Jan Nieuwenhuizen */ + #include "beaming.hh" #include "musical-request.hh" #include "beam.hh" @@ -19,6 +19,9 @@ #include "item.hh" #include "spanner.hh" +/* + TODO: figure what to do in grace? + */ class Auto_beam_engraver : public Engraver { public: @@ -56,16 +59,8 @@ private: Beaming_info_list*finished_grouping_p_; }; - - - ADD_THIS_TRANSLATOR (Auto_beam_engraver); - -/* - TODO: remove all references to Timing_engraver; should read properties. - - */ Auto_beam_engraver::Auto_beam_engraver () { stem_l_arr_p_ = 0; @@ -75,7 +70,6 @@ Auto_beam_engraver::Auto_beam_engraver () grouping_p_ = 0; } - bool Auto_beam_engraver::do_try_music (Music*) { @@ -95,7 +89,6 @@ Auto_beam_engraver::consider_end_and_begin (Moment test_mom) int num = *unsmob_moment (get_property("measureLength")) / one_beat; int den = one_beat.den_i (); - String time_str = String ("time") + to_str (num) + "_" + to_str (den); @@ -219,7 +212,7 @@ Auto_beam_engraver::consider_end_and_begin (Moment test_mom) return; if (begin_mom) - r = unsmob_moment (get_property ("measurePosition"))->mod_rat (begin_mom); + r = unsmob_moment (get_property ("measurePosition"))->mod_rat (begin_mom); if (!stem_l_arr_p_ && (!begin_mom || !r)) begin_beam (); } @@ -449,4 +442,3 @@ Auto_beam_engraver::process_acknowledged () } } } - diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc index 1ffdb1325c..5eed84b17c 100644 --- a/lily/break-align-item.cc +++ b/lily/break-align-item.cc @@ -213,8 +213,6 @@ Break_align_interface::do_alignment (Score_element *me) column->set_elt_property ("stretch-distance", gh_cons (gh_double2scm (-dists[0]), gh_double2scm (stretch_distance))); - - } diff --git a/lily/clef-item.cc b/lily/clef-item.cc index faf226af33..44d716424e 100644 --- a/lily/clef-item.cc +++ b/lily/clef-item.cc @@ -11,10 +11,10 @@ #include "string.hh" #include "molecule.hh" #include "item.hh" +#include "lookup.hh" /* FIXME: should use symbol for #'style. - */ MAKE_SCHEME_CALLBACK(Clef,before_line_breaking,1); SCM @@ -66,3 +66,20 @@ Clef::set_interface (Score_element* me) } + + +MAKE_SCHEME_CALLBACK(Clef,brew_molecule,1) +SCM +Clef::brew_molecule (SCM smob) +{ + Score_element * sc = unsmob_element (smob); + SCM glyph = sc->get_elt_property ("glyph"); + if (gh_string_p (glyph)) + { + return sc->lookup_l ()->afm_find (String (ly_scm2string (glyph))).create_scheme (); + } + else + { + return SCM_EOL; + } +} diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh index 3c4676b989..62b6581078 100644 --- a/lily/include/axis-group-interface.hh +++ b/lily/include/axis-group-interface.hh @@ -13,10 +13,7 @@ #include "group-interface.hh" /** - Treat a group of elements as a union. This sets the parent of any S - added to ELT_L_ to ELT_L_. - Properties: */ struct Axis_group_interface { diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh index d0f620a2c4..729af54e49 100644 --- a/lily/include/chord-name.hh +++ b/lily/include/chord-name.hh @@ -12,12 +12,7 @@ #include "lily-guile.hh" #include "molecule.hh" -/** - elt_properties: - pitches: list of musical-pitch - inversion(optional): musical-pitch - bass(optional): musical-pitch - */ + class Chord_name { public: diff --git a/lily/include/clef.hh b/lily/include/clef.hh index e5308818df..f5fabe24f1 100644 --- a/lily/include/clef.hh +++ b/lily/include/clef.hh @@ -15,6 +15,7 @@ struct Clef { DECLARE_SCHEME_CALLBACK(before_line_breaking, (SCM )); + DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); static bool has_interface (Score_element*); static void set_interface (Score_element*); }; diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh index 0c3268ea20..7bee6ca508 100644 --- a/lily/include/hara-kiri-group-spanner.hh +++ b/lily/include/hara-kiri-group-spanner.hh @@ -13,20 +13,7 @@ #include "lily-guile.hh" #include "lily-proto.hh" -/** - As Vertical_group_spanner, but keep track of interesting items. If - we don't contain any interesting items after linebreaking, then - gracefully commit suicide. Objective: don't disgrace Lily by - typesetting empty lines in orchestral scores. - properties: - - items-worth-living -- list of interesting items. If empty in a particular system, - clear this line - - - todo: naming -*/ class Hara_kiri_group_spanner { public: diff --git a/lily/include/item.hh b/lily/include/item.hh index 85c58aa4a9..ce597312c7 100644 --- a/lily/include/item.hh +++ b/lily/include/item.hh @@ -20,19 +20,7 @@ Item is the datastructure for printables whose width is known before the spacing is calculated - NB. This doesn't mean an Item has to initialize the output field before - spacing calculation. - - - Element properties - - visibility-lambda -- a function that takes the break - direction and returns a (transparent, empty) cons - - breakable -- boolean indicating if this is a breakable item (clef, - barline, key sig, etc.) - - */ +*/ class Item : public Score_element { Drul_array broken_to_drul_; diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh index 3f48ff410d..0f2c4d14df 100644 --- a/lily/include/key-item.hh +++ b/lily/include/key-item.hh @@ -10,13 +10,7 @@ #include "lily-guile.hh" #include "lily-proto.hh" -/** - - Properties: - - - */ struct Key_item { static int calculate_position(Score_element*,SCM pair) ; diff --git a/lily/include/line-of-score.hh b/lily/include/line-of-score.hh index bd1186d54e..330df38719 100644 --- a/lily/include/line-of-score.hh +++ b/lily/include/line-of-score.hh @@ -11,22 +11,6 @@ #include "column-x-positions.hh" #include "spanner.hh" -/** - The columns of a score that form one line. The toplevel element. - Any element has a Line_of_score as both X and Y reference - point. The Paper_score contains one element of this type. Control - enters the Score_element dependency calculation from this single - Line_of_score object. - - - properties: - - all-elements -- list of all score elements in this line. Needed - for protecting elements from GC. - - columns -- list of all paper columns - - */ class Line_of_score : public Spanner { public: diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh index 94055324c7..23ba1a6963 100644 --- a/lily/include/rest-collision.hh +++ b/lily/include/rest-collision.hh @@ -16,34 +16,7 @@ -/* - Move rests in note-columns so that they do not collide. - - properties: - - read-only - - maximum-rest-count -- kill off rests so we don't more than this - number left. - - minimum-distance -- minimum distance between notes and rests. - - read/write - - elements -- list of elts (both rests and notes) participating in the - collision. - - - sets in elements: - - rest-collision -- pointer to self. - - - - -*/ - -class Rest_collision // interface +class Rest_collision { public: static void add_column (Score_element*me,Score_element*); diff --git a/lily/include/score-element.hh b/lily/include/score-element.hh index 81fa3115fc..90a056b60f 100644 --- a/lily/include/score-element.hh +++ b/lily/include/score-element.hh @@ -24,30 +24,12 @@ enum Score_element_status { PRECALCED, // calcs before spacing done POSTCALCING, // busy calculating. This is used to trap cyclic deps. POSTCALCED, // after spacing calcs done - BREWING, - BREWED, }; typedef void (Score_element::*Score_element_method_pointer) (void); -/** +/* Basic output object. - - Element Properties: - - transparent -- boolean: if true, do not print anything black. - - dependencies -- list of score-element pointers that indicate who to - compute first. - - interfaces -- list of symbols indicating the interfaces supported - by this object. - - extra-offset -- pair of reals (a cons) forcing an extra offset - before outputting - - glyph -- afm character name to output. - */ class Score_element { /** @@ -138,8 +120,6 @@ public: bool has_interface (SCM intf); void set_interface (SCM intf); - - DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); virtual void handle_broken_dependencies (); virtual void handle_prebroken_dependencies (); diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh index 74c0b0b4d3..51e0b18760 100644 --- a/lily/include/separation-item.hh +++ b/lily/include/separation-item.hh @@ -12,18 +12,7 @@ #include "lily-proto.hh" -/** Calc dimensions for the Separating_group_spanner; this has to be - an item to get dependencies correct. It can't be an element_group - since these usually are in a different X_group - - Properties: - - - elements -- list of items. - - no-spacing-rods -- read from elements: boolean that makes Separation_item ignore - this item - +/** */ struct Separation_item { diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh index 6c9cb6e5ed..d5392ee73d 100644 --- a/lily/include/side-position-interface.hh +++ b/lily/include/side-position-interface.hh @@ -13,17 +13,10 @@ #include "spanner.hh" #include "item.hh" -/** - Position victim object (ELT_L_) next to other objects (the support). +/* + TODO: move out unrelated callbacks. - side-support -- list of score elements - - direction-source -- in case side-relative-direction is set, where - to get the direction - - TODO: move out unrelated callbacks. - - TODO: reduce number of methods. + TODO: reduce number of methods. */ struct Side_position { diff --git a/lily/include/slur.hh b/lily/include/slur.hh index c788b68e0f..d4f2e11c01 100644 --- a/lily/include/slur.hh +++ b/lily/include/slur.hh @@ -11,8 +11,6 @@ #include "lily-proto.hh" #include "rod.hh" -/** -*/ class Slur { public: diff --git a/lily/include/stem.hh b/lily/include/stem.hh index 55e30a0f5c..dfc939ab71 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -11,50 +11,18 @@ #include "lily-guile.hh" #include "stem-info.hh" -/**the rule attached to the ball. - takes care of: - - \begin{itemize} - \item the rule - \item the flag - \item up/down position. - \end{itemize} - - should move beam_{left, right} into Beam - - TODO. - - Stem size depends on flag. - - elt properties: - - beam_dir: direction of the beam (int) - - dir_force: is direction explicitely specified? (bool) - - /// how many abbrev beam don't reach stem? - int beam_gap_i_; - - */ class Stem { public: DECLARE_SCHEME_CALLBACK(brew_molecule, (SCM )); - /// log of the duration. Eg. 4 -> 16th note -> 2 flags static int flag_i (Score_element*) ; static int beam_count (Score_element*,Direction) ; static void set_beaming (Score_element*,int, Direction d); - /** - don't print flag when in beam. - our beam, for aligning abbrev flags - */ static Score_element * beam_l (Score_element*); static Score_element * first_head (Score_element*) ; static Drul_array extremal_heads (Score_element*); static Score_element * support_head (Score_element*) ; - - /// ensure that this Stem also encompasses the Notehead #n# static void add_head (Score_element*me, Score_element*n); static Stem_info calc_stem_info (Score_element *) ; static Real chord_start_f (Score_element *) ; @@ -65,8 +33,6 @@ public: static int get_center_distance(Score_element *,Direction) ; static int heads_i (Score_element *) ; static bool invisible_b(Score_element *) ; - - /// heads that the stem encompasses (positions) static Interval head_positions(Score_element *) ; static Real get_default_stem_end_position (Score_element*me) ; static void position_noteheads(Score_element*); diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh index 5d317cda25..8e96b27683 100644 --- a/lily/include/tuplet-spanner.hh +++ b/lily/include/tuplet-spanner.hh @@ -9,20 +9,13 @@ #include "lily-guile.hh" -/** supportable plet: triplets, eentweetjes, ottava, etc. +/* TODO: quantise, we don't want to collide with staff lines. (or should we be above staff?) todo: handle breaking elegantly. -properties: - - beams -- list of beam ptrs. - - columns -- list of note-columns. - */ - class Tuplet_spanner { public: diff --git a/lily/input-smob.cc b/lily/input-smob.cc index 992c0e5baf..4b6f455a55 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -35,6 +35,12 @@ scm_sizet free_smob (SCM s) return 0; } +SCM +ly_input_p (SCM x) +{ + return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F ; +} + static void start_input_smobs() { @@ -42,6 +48,8 @@ void start_input_smobs() = scm_make_smob_type_mfpe ("input", 0, mark_smob, free_smob, print_smob, 0); + scm_make_gsubr ("ly-input-location?", 1, 0, 0, (Scheme_function_unknown)ly_input_p); + } SCM @@ -73,3 +81,4 @@ ADD_SCM_INIT_FUNC(input, start_input_smobs); Input dummy_input_global; + diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 131c67ad3b..69f29134b7 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -1,4 +1,3 @@ - /* new-staff-margin-engraver.cc -- implement Instrument_name_engraver @@ -13,11 +12,12 @@ #include "bar.hh" #include "system-start-delimiter.hh" #include "side-position-interface.hh" +#include "align-interface.hh" class Instrument_name_engraver : public Engraver { Item *text_; - Spanner * delim_ ; + Score_element * delim_ ; void create_text (SCM s); public: @@ -55,9 +55,6 @@ Instrument_name_engraver::create_text (SCM txt) text_ = new Item (get_property ("InstrumentName")); text_->set_elt_property ("text", txt); - /* - TODO: use more lispish names for break-align-symbols - */ if (delim_) text_->set_parent (delim_, Y_AXIS); @@ -81,10 +78,12 @@ Instrument_name_engraver::acknowledge_element (Score_element_info i) } } - if (System_start_delimiter::has_interface (i.elem_l_) + if (Align_interface::has_interface (i.elem_l_) + && Align_interface::axis (i.elem_l_) == Y_AXIS + //System_start_delimiter::has_interface (i.elem_l_) && i.origin_trans_l_->daddy_trans_l_ == daddy_trans_l_) { - delim_ = dynamic_cast (i.elem_l_); + delim_ = i.elem_l_; } } diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 4a6e26d5d1..7b722ba511 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -396,11 +396,21 @@ undefd () return SCM_UNDEFINED; } +#include "version.hh" +SCM +ly_version () +{ + char const* vs = "\'(" MAJOR_VERSION " " MINOR_VERSION " " PATCH_LEVEL " " MY_PATCH_LEVEL ")" ; + + + return gh_eval_str (vs); +} static void init_functions () { scm_make_gsubr ("ly-warn", 1, 0, 0, (Scheme_function_unknown)ly_warning); + scm_make_gsubr ("ly-version", 0, 0, 0, (Scheme_function_unknown)ly_warning); scm_make_gsubr ("ly-gulp-file", 1,0, 0, (Scheme_function_unknown)ly_gulp_file); scm_make_gsubr ("dir?", 1,0, 0, (Scheme_function_unknown)ly_isdir_p); scm_make_gsubr ("undefd", 0,0, 0, (Scheme_function_unknown)undefd); diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc index 67b48089a3..bebdabbad5 100644 --- a/lily/property-engraver.cc +++ b/lily/property-engraver.cc @@ -153,8 +153,11 @@ Property_engraver::apply_properties (SCM p, Score_element *e, Translator_group*o SCM errport = scm_current_error_port (); warning (_("Wrong type for property")); scm_display (prop_sym, errport); - scm_puts (", type predicate: ", errport); - scm_display (type_p, errport); + scm_puts (", type: ", errport); + + SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL); + + scm_display (gh_call1 (typefunc, type_p), errport); scm_puts (", value found: ", errport); scm_display (val, errport); scm_puts (" type: ", errport); diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc index bf888bc1b0..e119ab714a 100644 --- a/lily/repeat-acknowledge-engraver.cc +++ b/lily/repeat-acknowledge-engraver.cc @@ -64,10 +64,11 @@ Repeat_acknowledge_engraver::do_process_music () return ; SCM cs = get_property ("repeatCommands"); - + String s = ""; - bool start = false; + bool start = false; bool end = false; + bool volta_found = false; while (gh_pair_p (cs)) { SCM command = gh_car (cs); @@ -75,6 +76,8 @@ Repeat_acknowledge_engraver::do_process_music () start = true; else if (command == ly_symbol2scm ("end-repeat")) end = true; + else if (gh_pair_p (command) && gh_car (command) == ly_symbol2scm ("volta")) + volta_found = true; cs = gh_cdr (cs); } @@ -85,7 +88,10 @@ Repeat_acknowledge_engraver::do_process_music () else if (end) s = ":|"; - if (s != "") + /* + TODO: line breaks might be allowed if we set whichBar to "". + */ + if (s != "" || (volta_found && !gh_string_p (get_property ("whichBar")))) { daddy_trans_l_->set_property ("whichBar", ly_str02scm(s.ch_C())); } diff --git a/lily/score-element.cc b/lily/score-element.cc index 4a4c59d60d..6f5f97bd65 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -296,9 +296,8 @@ Score_element::get_molecule () const Molecule m (create_molecule (mol)); /* - This is almost the same as setting molecule-callback to #f, but - this retains the dimensions of this element, which means that you - can erase elements individually. */ + transparent retains dimensions of element. + */ if (to_boolean (get_elt_property ("transparent"))) m = Molecule (m.extent_box (), SCM_EOL); @@ -320,26 +319,6 @@ Score_element::do_break_processing() -MAKE_SCHEME_CALLBACK(Score_element,brew_molecule,1) - -/* - ugh. - */ -SCM -Score_element::brew_molecule (SCM smob) -{ - Score_element * sc = unsmob_element (smob); - SCM glyph = sc->get_elt_property ("glyph"); - if (gh_string_p (glyph)) - { - return sc->lookup_l ()->afm_find (String (ly_scm2string (glyph))).create_scheme (); - } - else - { - return SCM_EOL; - } -} - Line_of_score * Score_element::line_l() const diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index 756993387e..c7bbf78aaa 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -129,8 +129,7 @@ Side_position::aligned_on_self (SCM element_smob, SCM axis) } else { - Real lambda = (0.5 - gh_scm2double (align) / 2.0); - return gh_double2scm (- (lambda * ext[LEFT] + (1 - lambda) * ext[RIGHT])); + return gh_double2scm (- ext.linear_combination (gh_scm2double (align))); } } else if (unsmob_element (align)) diff --git a/lily/slur-bezier-bow.cc b/lily/slur-bezier-bow.cc index b9f3396206..5e611e7c17 100644 --- a/lily/slur-bezier-bow.cc +++ b/lily/slur-bezier-bow.cc @@ -186,7 +186,7 @@ Slur_bezier_bow::minimise_enclosed_area (Paper_def* paper_l, Real beauty) curve_.control_[2][X_AXIS] -= da[1] * u * pct; } - Real area = enclosed_area_f (); + // Real area = enclosed_area_f (); } diff --git a/lily/slur.cc b/lily/slur.cc index 1ac4b5cf79..f52240d327 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -10,6 +10,7 @@ /* [TODO] * fix broken interstaff slurs + * should avoid stafflines with horizontal part. * begin and end should be treated as a/acknowledge Scripts. * smart changing of endings * smart changing of (Y-?)offsets to avoid ugly beziers diff --git a/lily/stem.cc b/lily/stem.cc index a7fe2500b3..f0a78fa277 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -238,16 +238,10 @@ Stem::get_default_dir (Score_element*me) return to_dir (me->get_elt_property ("default-neutral-direction")); } -/* - ugh. A is used for different purposes. This functionality should be - moved into scheme at some point to get rid of the silly - conversions. (but lets wait till we have namespaces in SCM) - */ Real Stem::get_default_stem_end_position (Score_element*me) { bool grace_b = to_boolean (me->get_elt_property ("grace")); - String type_str = grace_b ? "grace-" : ""; SCM s; Array a; @@ -301,14 +295,14 @@ Stem::get_default_stem_end_position (Score_element*me) Real st = head_positions(me)[dir] + dir * length_f; bool no_extend_b = to_boolean (me->get_elt_property ("no-stem-extend")); - if (!grace_b && !no_extend_b && dir * st < 0) + if (!grace_b && !no_extend_b && dir * st < 0) // junkme? st = 0.0; return st; } /* - FIXME: wrong name + Number of hooks on the flag, ie. the log of the duration. */ int Stem::flag_i (Score_element*me) diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index a6955147cb..e5abe9cdf4 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -66,18 +66,9 @@ void System_start_delimiter_engraver::do_creation_processing() { delim_ = new Spanner (get_property ("SystemStartDelimiter")); - System_start_delimiter::set_interface (delim_); + delim_->set_bound (LEFT, unsmob_element (get_property ("currentCommandColumn"))); - /* - You can't override the glyph using \property, you must do it in - the predefined context (ie. \translator { ... } ) - */ - SCM s = get_property ("systemStartDelimiterGlyph"); - if (gh_symbol_p (s)) - { - delim_->set_elt_property ("glyph", s); - } announce_element (delim_,0); } @@ -85,11 +76,6 @@ System_start_delimiter_engraver::do_creation_processing() void System_start_delimiter_engraver::do_removal_processing () { - // ugh, should have naming without bracket - SCM collapse = get_property ("bracketCollapseHeight"); - if (gh_number_p (collapse)) - delim_->set_elt_property ("collapse-height", collapse); - delim_->set_bound (RIGHT, unsmob_element (get_property ("currentCommandColumn"))); typeset_element (delim_); } diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 957dd429ee..d085267e11 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -44,7 +44,6 @@ System_start_delimiter::staff_bracket (Score_element*me,Real height) void System_start_delimiter::set_interface (Score_element*me) { - me->set_extent_callback (SCM_EOL, Y_AXIS); me->set_interface (ly_symbol2scm ("system-start-delimiter-interface")); } diff --git a/lily/text-item.cc b/lily/text-item.cc index 420e2b17a6..deada62d30 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -17,6 +17,7 @@ #include "all-font-metrics.hh" #include "afm.hh" + /* text: string | (markup sentence) markup: markup-symbol | (markup-symbol . parameter) diff --git a/lily/tie.cc b/lily/tie.cc index 39bc2306de..ffbf5f40fa 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -129,17 +129,27 @@ Tie::get_control_points (SCM smob) Real x_gap_f = gh_scm2double (me->get_elt_property ("x-gap")); - Score_element* commonx = me->common_refpoint (me->get_bound (LEFT), X_AXIS); - commonx = me->common_refpoint (me->get_bound (RIGHT), X_AXIS); - Score_element* l = me->get_bound (LEFT); Score_element* r = me->get_bound (RIGHT); + Score_element* commonx = me->common_refpoint (l, X_AXIS); + commonx = me->common_refpoint (r, X_AXIS); + Real left_x; + + /* + this is a kludge: the tie has to be long enough to be + visible, but should not go through key sigs. + + (please fixme) + */ + Real lambda = 0.5; + if (Note_head::has_interface (me->get_bound (LEFT))) left_x = l->extent (l, X_AXIS)[RIGHT] + x_gap_f; else - left_x = l->extent (l, X_AXIS).length () / 2; + left_x = l->extent (l, X_AXIS).linear_combination (lambda); + Real width; if (Note_head::has_interface (me->get_bound (LEFT)) @@ -157,10 +167,9 @@ Tie::get_control_points (SCM smob) - l->extent (commonx, X_AXIS)[RIGHT] - 2 * x_gap_f; else - width = - - l->extent (l, X_AXIS).length () / 2 + width = + - l->extent (commonx, X_AXIS).linear_combination (lambda) + r->extent (commonx, X_AXIS)[LEFT] - - l->relative_coordinate (commonx, X_AXIS) - 2 * x_gap_f; } @@ -212,9 +221,12 @@ Tie::get_control_points (SCM smob) /* Avoid colliding of the horizontal part with stafflines. + - should do me for slurs as well. + TODO: redo this, heuristic is half-baken, and ties often look ugly + as a result. + TODO: doesn't work when on staff with even number of lines. */ Array horizontal (b.solve_derivative (Offset (1,0))); if (horizontal.size ()) @@ -233,7 +245,20 @@ Tie::get_control_points (SCM smob) if (fabs (y) <= Staff_symbol_referencer::staff_radius (me) && fabs (diff) < clear) { - newy = ry - 0.5 * staff_space * sign (diff) ; + Real y1 = ry + clear; + Real y2 = ry - clear; + + newy = (fabs (y1 - y) < fabs (y2 - y)) ? y1 : y2; + + // newy = ry - 0.5 * staff_space * sign (diff) ; + + /* + we don't want horizontal ties + */ + if (fabs (newy - b.control_[0][Y_AXIS]) < 1e-2) + { + newy = newy + dir * staff_space; + } } Real y0 = b.control_ [0][Y_AXIS]; diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 6b735ad953..6e455d8e5c 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -371,8 +371,10 @@ Translator_group::execute_single_pushpop_property (SCM prop, SCM eltprop, SCM va scm_display (eltprop,errport); scm_puts ( _(", value ").ch_C (), errport); scm_display (val, errport); - scm_puts (_(" must satisfy ").ch_C (), errport); - scm_display (predicate, errport); + scm_puts (_(" must be of type ").ch_C (), errport); + SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL); + + scm_display (gh_call1 (typefunc, predicate), errport); scm_puts ("\n", errport); } } diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc index 47eabef881..044ba7e842 100644 --- a/lily/unfolded-repeat-iterator.cc +++ b/lily/unfolded-repeat-iterator.cc @@ -53,6 +53,8 @@ Unfolded_repeat_iterator::next_element (bool side_effect) - go to alternative if we're a volta + - make a :| if there are no alternatives + - do something intelligent when we're fully unfolding (fixcomment) */ @@ -74,7 +76,11 @@ Unfolded_repeat_iterator::next_element (bool side_effect) ly_str02scm (repstr.ch_C()), SCM_UNDEFINED)); } } - else if (done_count_ < repmus->repeats_i_ && !repmus->volta_fold_b_) + else if (repmus->volta_fold_b_) + { + add_repeat_command (ly_symbol2scm ("end-repeat")); + } + else if (done_count_ < repmus->repeats_i_) { current_iter_p_ = get_iterator_p (repmus->body ()); do_main_b_ = true; diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index d80304ad9b..d208b44a10 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -162,3 +162,7 @@ Volta_engraver::do_pre_move_processing () end_volta_span_p_ =0; } } + +/* + TODO: should attach volta to paper-column if no bar is found. + */ diff --git a/ly/engraver.ly b/ly/engraver.ly index 8d5be1e064..60c71da796 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -55,7 +55,7 @@ ChoirStaffContext = \translator { \name ChoirStaff; alignmentReference = \center; \consists "System_start_delimiter_engraver"; - systemStartDelimiterGlyph = #'bracket + SystemStartDelimiter \push #'glyph = #'bracket \accepts "Staff"; \accepts "RhythmicStaff"; @@ -142,7 +142,7 @@ GraceContext=\translator { \consists "Stem_engraver"; \consists "Beam_engraver"; \consists "Slur_engraver"; - + \consists "Auto_beam_engraver"; \consists "Align_note_column_engraver"; @@ -194,7 +194,7 @@ GrandStaffContext=\translator{ \consists "Span_bar_engraver"; \consists "Span_arpeggio_engraver"; \consists "System_start_delimiter_engraver"; - systemStartDelimiterGlyph = #'brace + SystemStartDelimiter \push #'glyph = #'brace \consists "Property_engraver"; Generic_property_list = #generic-grand-staff-properties @@ -220,7 +220,8 @@ StaffGroupContext= \translator { \consists "Span_bar_engraver"; \consists "Span_arpeggio_engraver"; \consists "Output_property_engraver"; - systemStartDelimiterGlyph = #'bracket + SystemStartDelimiter \push #'glyph = #'bracket + \consists "System_start_delimiter_engraver"; \accepts "Staff"; \accepts "RhythmicStaff"; @@ -398,7 +399,7 @@ ScoreContext = \translator { alignmentReference = \down; defaultClef = #"treble" defaultBarType = #"|" - systemStartDelimiterGlyph = #'bar-line + explicitClefVisibility = #all-visible explicitKeySignatureVisibility = #all-visible diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index c674df4239..6136b2f866 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,6 +1,6 @@ Begin3 Title: LilyPond -Version: 1.3.97 +Version: 1.3.98 Entered-date: 22OCT00 Description: Keywords: music notation typesetting midi fonts engraving @@ -8,8 +8,8 @@ Author: hanwen@cs.uu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 1000k lilypond-1.3.97.tar.gz + 1000k lilypond-1.3.98.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.97.tar.gz + 1000k lilypond-1.3.98.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 8d1decf1a5..1351af8fa7 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.3.97 +Version: 1.3.98 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.97.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.98.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly index fee7c2d782..480995effd 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly @@ -60,6 +60,7 @@ allemande_a = \context Staff \notes \relative c { cis(e g!)bes e()a, bes()g f()cis d()gis, a8 cis! | % knee \stemUp d,16 \stemBoth d''(c!)a bes!(g)e cis' d a f d d,8. + \bar "|."; } allemande_b = \notes \relative c { diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly index 8a35f8aafe..ff7f05d526 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly @@ -54,6 +54,7 @@ courante_a = \context Staff \notes \relative c { gis, d'(e f e d cis)d a d a cis | d a f a d, f a, d d,8. + \bar "|."; } courante_b = \notes \relative c { diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly index d31d4893e4..d300e28aeb 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly @@ -66,6 +66,7 @@ gigue_notes = \context Staff \notes \relative c { %72 cis'4 \stemBoth d16()c | bes(a g f e)d | cis(b a g f)e | d f a d f a | d4 + \bar "|."; } gigue_b = \context Staff \notes \relative c { diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly index 0cbaba1420..6b4fcf1a64 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -95,6 +95,9 @@ menuetto_ii_cello_staff = \context Staff < } } \midi{ \tempo 4 = 130; } - \header{ piece = "Menuetto II"; } + \header{ + piece = "Menuetto II"; + opus = ""; + } } diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly index 2c6fe350b4..a00f3c8a86 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly @@ -66,6 +66,7 @@ menuetto_i_b = \context Staff \notes \relative c { g4 \skip 4*1; f4 | cis8 \skip 8*3; d4 | s2.*2 + \bar "|."; } % UGH, fix this like in sarabande @@ -146,6 +147,7 @@ menuetto_ii = \context Staff\notes \relative c { e( fis g )b a4 | g8()fis e()d e()cis | d2. + \bar "|."; } \version "1.3.93"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly index 633af16bb5..c5bb695392 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -58,8 +58,9 @@ menuetto_i_viola_staff = \context Staff < } \midi{ \tempo 4 = 110; } \header{ - opus= "" ; - piece ="Menuetto I"; } + opus= "" ; + piece ="Menuetto I"; + } } menuetto_ii_viola_global = \notes{ diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly index 7344202daa..a2f8b2f4c6 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly @@ -81,6 +81,7 @@ sarabande_b = \context Staff \notes \relative c { f'4 fis4. s8 | gis4. s8 | s2.*2 + \bar "|."; } diff --git a/scm/basic-properties.scm b/scm/basic-properties.scm index ff3204e8e2..7955f6a630 100644 --- a/scm/basic-properties.scm +++ b/scm/basic-properties.scm @@ -156,7 +156,7 @@ (flag-width-function . ,default-beam-flag-width-function) (space-function . ,default-beam-space-function) (damping . 1) - (meta . ,(element-description "Beam" general-element-interface beam-interface)) + (meta . ,(element-description "Beam" beam-interface)) ) ) diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm index 80613065f4..dedecbf7a1 100644 --- a/scm/element-descriptions.scm +++ b/scm/element-descriptions.scm @@ -77,7 +77,7 @@ )) (Clef . ( - (molecule-callback . ,Score_element::brew_molecule) + (molecule-callback . ,Clef::brew_molecule) (before-line-breaking-callback . ,Clef::before_line_breaking) (breakable . #t) (break-align-symbol . Clef_item) @@ -195,7 +195,9 @@ (InstrumentName . ( (breakable . #t) - (Y-offset-callbacks . (,Side_position::centered_on_parent)) + (Y-offset-callbacks . (,Side_position::centered_on_parent + ,Side_position::aligned_on_self)) + (self-alignment-Y . 0) (molecule-callback . ,Text_item::brew_molecule) (break-align-symbol . Instrument_name) (visibility-lambda . ,begin-of-line-visible) @@ -225,7 +227,7 @@ (LineOfScore . ( (axes . (0 1)) - (meta . ,(element-description "LineOfScore" axis-group-interface)) + (meta . ,(element-description "LineOfScore" line-of-score-interface axis-group-interface)) )) (LyricExtender . ( @@ -475,9 +477,11 @@ (arch-height . 1.5) (arch-angle . 50.0) (arch-thick . 0.25) + (glyph . bar-line) (arch-width . 1.5) (bracket-thick . 0.25) (bracket-width . 2.0) + (Y-extent-callback . #f) (meta . ,(element-description "SystemStartDelimiter" system-start-delimiter )) )) @@ -504,7 +508,7 @@ (Tie . ( (molecule-callback . ,Tie::brew_molecule) (spacing-procedure . ,Tie::set_spacing_rods) - (staffline-clearance . 0.24) + (staffline-clearance . 0.35) (details . ((ratio . 0.333) (height-limit . 1.0))) (thickness . 1.2) (x-gap . 0.2) diff --git a/scm/font.scm b/scm/font.scm index 64d3d5c67a..2f9a88fb45 100644 --- a/scm/font.scm +++ b/scm/font.scm @@ -29,8 +29,6 @@ (("medium upright music feta 20" . 0) . "feta20") (("medium upright music feta 16" . -1) . "feta16") (("medium upright music feta 13" . -2) . "feta13") - (("medium upright music feta 13" . -3) . "feta11") - (("medium upright music feta 13" . -4) . "feta11") (("medium upright music feta 23" . 1) . "feta23") (("medium upright music feta 26" . 2) . "feta26") (("medium upright braces feta-braces 20" . 0) . "feta-braces20") @@ -98,9 +96,6 @@ (if entry (cdr entry) "[^ ]+")) " ")) '(font-series font-shape font-family font-name font-point font-size))))) - ;;(display "font-regexp: `") - ;;(display font-regexp) - ;;(display "'\n") (font-regexp-to-font-name paper font-regexp))) (define markup-abbrev-to-properties-alist @@ -121,7 +116,7 @@ style-to-font-alist))) (define (markup-to-properties markup) - ;;(display "markup: `") + ;; (display "markup: `") ;;(display markup) ;;(display "'\n") (if (pair? markup) diff --git a/scm/generate-documentation.scm b/scm/generate-documentation.scm index 9f33bdf1e7..4868dfa3a0 100644 --- a/scm/generate-documentation.scm +++ b/scm/generate-documentation.scm @@ -20,27 +20,9 @@ ) (define (self-evaluating? x) - (or (number? x) (string? x) (procedure? x)) + (or (number? x) (string? x) (procedure? x) (boolean? x)) ) -(define (type-name predicate) - (cond - ((eq? predicate dir?) "direction") - ((eq? predicate ly-element?) "graphic element") - ((eq? predicate pair?) "pair") - ((eq? predicate integer?) "integer") - ((eq? predicate list?) "list") - ((eq? predicate symbol?) "symbol") - ((eq? predicate string?) "string") - ((eq? predicate boolean?) "string") - ((eq? predicate number?) "number") - ((eq? predicate char?) "char") - ((eq? predicate input-port?) "input port") - ((eq? predicate output-port?) "output port") - ((eq? predicate vector?) "vector") - ((eq? predicate procedure?) "procedure") - (else "(unknown)") - )) (define (htmlfy x) (let* @@ -101,7 +83,7 @@ (name (cdr (assoc 'name meta))) (ifaces (cdr (assoc 'interface-descriptions meta))) (ifacedoc (map (lambda (x) (document-interface x description)) - ifaces)) + (reverse ifaces))) (outname (string-append name ".html")) (out (open-output-file outname)) ) diff --git a/scm/interface.scm b/scm/interface.scm index fa95a24068..e8d62d020b 100644 --- a/scm/interface.scm +++ b/scm/interface.scm @@ -43,21 +43,32 @@ ))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;;;;;;;;;;;;;; -;;;;;;;;;;;;;;;;; - (define general-element-interface (lily-interface 'general-element-interface "All elements support this" - (list (property-description 'X-offset-callbacks list? "") - (property-description 'Y-offset-callbacks list? "") - (property-description 'X-extent-callback procedure? "") - (property-description 'Y-extent-callback procedure? "") + (list + (property-description 'X-offset-callbacks list? "list of functions, each taking an element and axis argument. The function determine the position relative to this element's parent. The last one in the list is called first") + (property-description 'Y-offset-callbacks list? "see X-offset-callbacks") + (property-description 'X-extent-callback procedure? "procedure taking an element and axis argument, returning a number-pair. The return value is the extent of the element.") + (property-description 'Y-extent-callback procedure? "see X-extent-callback ") (property-description 'font-size integer? "") + (property-description 'extra-offset number-pair? "pair of reals (a cons) forcing an extra offset before outputting") + (property-description 'interfaces list? "list of symbols indicating the interfaces supported by this object. Is initialized from the meta field.") + (property-description 'dependencies list? "list of score-element pointers that indicate who to compute first for certain global passes") + (property-description 'no-spacing-rods boolean? "read from elements: boolean that makes Separation_item ignore this item (MOVE ME TO ITEM)") + (property-description 'extra-extent-X number-pair? "enlarge in X dimension by this much, measured in staff space") + (property-description 'extra-extent-Y number-pair? "see extra-extent-Y") + (property-description 'minimum-extent-X number-pair? "minimum size in X dimension, measured in staff space") + (property-description 'minimum-extent-Y number-pair? "see minimum-extent-Y") + (property-description 'origin ly-input-location? "location in input file of the definition") + (property-description 'transparent boolean? "This is almost the +same as setting molecule-callback to #f, but this retains the +dimensions of this element, which means that you can erase elements +individually. ") + (property-description 'molecule-callback procedure? "Function taking graphical element as argument, returning a Scheme encoded Molecule") )) -) + ) (define beam-interface (lily-interface @@ -114,7 +125,7 @@ more than this (in staffspace)") (list (property-description 'horizontal-shift integer? "integer that identifies ranking of note-column for horizontal shifting.") (property-description 'force-hshift number? "amount of collision_note_width that overides automatic collision settings.") - (property-description 'merge-differently-dotted boolean? "merge black noteheads with differing dot count.") + (property-description 'merge-differently-dotted boolean? "merge black noteheads with differing dot count in collisions.") )) ) @@ -123,17 +134,25 @@ more than this (in staffspace)") 'stem-interface "A stem" (list - (property-description 'thickness number? "") - (property-description 'beamed-lengths list? "") - (property-description 'beamed-minimum-lengths list? "") - (property-description 'lengths list? "") - (property-description 'stem-shorten list? "") - (property-description 'default-neutral-direction dir? "") - (property-description 'direction dir? "") - (property-description 'stem-length number? "") + (property-description 'thickness number? "thickness, measured in stafflinethickness") + (property-description 'beamed-lengths list? "list of stem lengths given beam multiplicity ") + (property-description 'beamed-minimum-lengths list? "list of minimum stem lengths given beam multiplicity") + (property-description 'stem-centered boolean? "Center stems on note heads. Useful for mensural notation") + (property-description 'lengths list? "Stem length given multiplicity of flag") + (property-description 'beam ly-element? "pointer to the beam, if applicable") + (property-description 'stem-shorten list? "shorten stems in forced directions given flag multiplicity") + (property-description 'duration-log integer? "log of the duration, ie. 0=whole note, 1 = half note, etc.") + (property-description 'beaming number-pair? "number of beams extending to left and right") + (property-description 'default-neutral-direction dir? "Where to go if we're in the middle of the staff") + (property-description 'stem-end-position number? "Where does the stem end (the end is opposite to the support-head") + (property-description 'support-head ly-element? "the note head at +one end of the stem") + (property-description 'heads list? "list of note heads") + (property-description 'direction dir? "up or down") + (property-description 'stem-length number? "length of stem") (property-description 'style string? "") ; symbol!? (property-description 'flag-style string? "") ; symbol!? - (property-description 'X-offset-callbacks list? "") + (property-description 'dir-forced boolean? "set if direction has been forced; read by Beam.") ))) @@ -145,15 +164,16 @@ more than this (in staffspace)") (property-description 'de-uglify-parameters list? "list of 3 real constants. They define the valid areas for the middle control points. Used in de_uglyfy. They are a bit empirical.") (property-description 'details list? "alist containing contaning a few magic constants.") (property-description 'attachment pair? "cons of symbols, '(LEFT-TYPE . RIGHT-TYPE), where both types may be alongside-stem, stem, head or loose-end") - (property-description 'attachment-offset pair? "cons of offsets, '(LEFT-offset . RIGHT-offset). This offset is added to the attachments to prevent ugly slurs.") (property-description 'direction dir? "up or down?") - (property-description 'beautiful number? "number that dictates when a slur should be de-uglyfied. It correlates with the enclosed area between noteheads and slurs. A value of 0.1 yields only undisturbed slurs, a value of 5 will tolerate quite high blown slurs.") - (property-description 'y-free number? "minimal vertical gap between slur and noteheads or stems") - (property-description 'control-points list? "[internal] control points of bezier curve") - (property-description 'extremity-rules list? "an alist (procedure slur dir) -> attachment to determine the attachment (see above). If procedure returns #t, attachment is used. Otherwise, the next procedure is tried.") - (property-description 'extremity-offset-alist list? "an alist (attachment stem-dir*dir slur-dir*dir) -> offset. The offset adds to the centre of the notehead, or stem.") - (property-description 'thickness list? "The thickness[stafflinethickness] of slur in the centre.") - (property-description 'dashed number? "[FIXME: use dash-period/dash length; see text-spanner] number representing the length of the dashes.") + (property-description 'attachment-offset pair? "cons of offsets, '(LEFT-offset . RIGHT-offset). This offset is added to the attachments to prevent ugly slurs.") + (property-description 'beautiful number? "number that dictates when a slur should be de-uglyfied. It correlates with the enclosed area between noteheads and slurs. A value of 0.1 yields only undisturbed slurs, a value of 5 will tolerate quite high blown slurs.") + (property-description 'y-free number? "minimal vertical gap between slur and noteheads or stems") + (property-description 'control-points list? "[internal] control points of bezier curve") + (property-description 'extremity-rules list? "an alist (procedure slur dir) -> attachment to determine the attachment (see above). If procedure returns #t, attachment is used. Otherwise, the next procedure is tried.") + (property-description 'extremity-offset-alist list? "an alist (attachment stem-dir*dir slur-dir*dir) -> offset. The offset adds to the centre of the notehead, or stem.") + (property-description 'thickness list? "The thickness[stafflinethickness] of slur in the centre.") + (property-description 'dashed number? "[FIXME: use dash-period/dash length; see text-spanner] number representing the length of the dashes.") + ) ) ) @@ -161,8 +181,10 @@ more than this (in staffspace)") (define side-position-interface (lily-interface 'side-position-interface - "put an element next to another one." + "Position a victim object (this one) next to other objects (the support)." (list + (property-description 'side-support list? "the support, a list of score elements") + (property-description 'direction-source ly-element? "in case side-relative-direction is set, which element to get the direction from ") (property-description 'direction dir? "where to put the victim object (left or right?)") (property-description 'side-relative-direction dir? "if set: get the direction from a different object, and multiply by this.") (property-description 'minimum-space number? "minimum distance that the victim should move (after padding)") @@ -183,6 +205,31 @@ more than this (in staffspace)") ) )) +(define line-of-score-interface + (lily-interface + 'line-of-score-interface + "Super element, parent of all: +

+ The columns of a score that form one line. The toplevel element. + Any element has a Line_of_score as both X and Y reference + point. The Paper_score contains one element of this type. Control + enters the Score_element dependency calculation from this single + Line_of_score object." + (list + (property-description 'between-system-string string? "string + to dump between two systems. Useful for forcing pagebreaks") + (property-description 'spacing-procedure procedure? "procedure taking +graphical element as argument. This is called after before-line-breaking-callback, but before the actual line breaking itself. Return value is ignored") + (property-description 'before-line-breaking-callback procedure? + "Procedure taking graphical element as argument. +This procedure is called (using dependency resolution) before line breaking, but after generating discretionary items. Return value is ignored") + (property-description 'after-line-breaking-callback procedure? + "Procedure taking graphical element as argument. +This procedure is called (using dependency resolution) after line breaking. Return value is ignored") + (property-description 'all-elements list? "list of all score elements in this line. Needed for protecting elements from GC.") + (property-description 'columns list? "list of all paper columns") + ))) + (define note-head-interface (lily-interface 'note-head-interface @@ -195,7 +242,7 @@ more than this (in staffspace)") (define note-name-interface (lily-interface 'note-name-interface - "Note naem" + "Note name" (list (property-description 'style symbol? "symbol that sets note name style") ) @@ -222,13 +269,13 @@ more than this (in staffspace)") (define tuplet-bracket-interface (lily-interface 'tuplet-bracket-interface - "A bracket with a number in the middle" + "A bracket with a number in the middle, used for tuplets." (list (property-description 'beams list? "list of beam ptrs.") (property-description 'columns list? " list of note-columns.") (property-description 'number-gap number? "") - (property-description 'delta-y number? "") - (property-description 'thick number? "") + (property-description 'delta-y number? "amount of ascension") + (property-description 'thick number? "thickness, in stafflinethickness") ) )) @@ -240,7 +287,7 @@ more than this (in staffspace)") (list (property-description 'stacking-dir dir? "stack contents of elements in which direction ?") (property-description 'align-dir dir? "Which side to align? -1: left side, 0: centered around center-element if not nil, or around center of width), 1: right side") - (property-description 'threshold pair? "(cons MIN MAX), where MIN and MAX are dimensions in staffspace") + (property-description 'threshold number-pair? "(cons MIN MAX), where MIN and MAX are dimensions in staffspace") (property-description 'alignment-done boolean? "boolean to administrate whether we've done the alignment already (to ensure that the process is done only once)") (property-description 'center-element ly-element? "element which will be at the center of the group after aligning (when using @@ -255,8 +302,8 @@ this object as a reference point.") 'aligned-interface "read by align-interface" (list - (property-description 'minimum-space pair? "(cons LEFT RIGHT)") - (property-description 'extra-space pair? "(cons LEFT RIGHT)") + (property-description 'minimum-space number-pair? "(cons LEFT RIGHT)") + (property-description 'extra-space number-pair? "(cons LEFT RIGHT)") ))) (define break-aligned-interface @@ -265,22 +312,26 @@ this object as a reference point.") "Items that are aligned in prefatory matter" (list (property-description 'break-align-symbol symbol? "the index in the spacing table (symbol) of the to be aligned item.") - (property-description 'visibility-lambda procedure? "") - (property-description 'breakable boolean? "") + (property-description 'visibility-lambda procedure? "a function that takes the break direction and returns a cons of booleans containing (TRANSPARENT . EMPTY)") + (property-description 'breakable boolean? "boolean indicating if this is a breakable item (clef, barline, key sig, etc.)") ))) (define chord-name-interface (lily-interface 'chord-name-interface - "" + "generate a chord name" (list - ))) + (property-description 'pitches list? "list of musical-pitch") + (property-description 'inversion list? " musical-pitch, optional") + (property-description 'bass list? " musical-pitch, optional") + ))) + (define time-signature-interface (lily-interface 'time-signature-interface "A time signature, in different styles" (list - (property-description 'fraction pair? "") + (property-description 'fraction number-pair? "") (property-description 'style string? "") ))) @@ -289,35 +340,35 @@ this object as a reference point.") 'bar-line-interface "Bar line" (list - (property-description 'barsize-procedure procedure? "") - (property-description 'kern number? "") - (property-description 'thin-kern number? "") - (property-description 'hair-thickness number? "") - (property-description 'thick-thickness number? "") - (property-description 'glyph string? "") + (property-description 'barsize-procedure procedure? "how to compute the size of a bar line") + (property-description 'kern number? "space after a thick line") + (property-description 'thin-kern number? "space after a hair-line") + (property-description 'hair-thickness number? "thickness, measured in stafflinethickness") + (property-description 'thick-thickness number? "thickness, measured in stafflinethickness") + (property-description 'glyph string? "what kind barline? A concatenation of |, : and .") (property-description 'bar-size number? "") - (property-description 'break-glyph-function procedure? "") + (property-description 'break-glyph-function procedure? "function taking glyph and break-direction, returning the glyph at a line break") ))) + (define hairpin-interface (lily-interface 'hairpin-interface "hairpin crescendo" (list - (property-description 'grow-direction dir? "") - (property-description 'thickness number? "") - (property-description 'height number? "") + (property-description 'grow-direction dir? "crescendo or decrescendo?") + (property-description 'thickness number? "thickness, measured in stafflinethickness") + (property-description 'height number? "height, measured in staffspace in ") ))) - (define arpeggio-interface (lily-interface 'arpeggio-interface - "arpeggio " + "arpeggio" (list - (property-description 'stems list? "list of stem objects, corresponding to the notes that the arp has to be before.") + (property-description 'stems list? "list of stem objects, corresponding to the notes that the arpeggio has to be before.") ) ) ) @@ -362,7 +413,7 @@ this object as a reference point.") (define dot-column-interface (lily-interface 'dot-column-interface - "" + "Interface that groups dots so they form a column" (list ))) @@ -377,14 +428,14 @@ this object as a reference point.") (define finger-interface (lily-interface 'finger-interface - "Any kind of loudness sign" + "A fingering instruction" '() )) (define separation-spanner-interface (lily-interface 'separation-spanner-interface - "" + "Spanner that containing separation-item-interface elements to calculate rods" '() )) (define text-script-interface @@ -406,8 +457,15 @@ this object as a reference point.") (define hara-kiri-group-interface (lily-interface 'hara-kiri-group-interface - "seppuku" - '())) + " As Vertical_group_spanner, but keep track of interesting items. If + we don't contain any interesting items after linebreaking, then + gracefully commit suicide. Objective: don't disgrace Lily by + typesetting empty lines in orchestral scores." + (list + (property-description 'items-worth-living list? "list of interesting items. If empty in a particular system, clear that system.") + + + ))) (define lyric-hyphen-interface (lily-interface @@ -429,7 +487,7 @@ syllables. The length of the hyphen line should stretch based on the 'key-signature-interface "A group of accidentals." (list - (property-description 'c0-position integer? "integer indicating the position of central C?") + (property-description 'c0-position integer? "integer indicating the position of central C") (property-description 'old-accidentals list? "list of (pitch, accidental) pairs") (property-description 'new-accidentals list? "list of (pitch, accidental) pairs") ))) @@ -449,7 +507,7 @@ syllables. The length of the hyphen line should stretch based on the (define lyric-syllable-interface (lily-interface 'lyric-syllable-interface - "" + "a single piece of lyrics" (list (property-description 'word-space number? "") ))) @@ -458,20 +516,20 @@ syllables. The length of the hyphen line should stretch based on the (define mark-interface (lily-interface 'mark-interface - "" + "a rehearsal mark" (list ))) (define multi-measure-rest-interface (lily-interface 'multi-measure-rest-interface - "" + "A rest that spans a whole number of measures." (list (property-description 'columns list? "list of paper-columns") - (property-description 'expand-limit integer? "int : max number of measures expanded in church rests") - (property-description 'minimum-width number? "Real in staffspace") - (property-description 'padding number? "staffspace") + (property-description 'expand-limit integer? "maximum number of measures expanded in church rests") + (property-description 'minimum-width number? "minimum-width of rest symbol, in staffspace") + (property-description 'padding number? "padding between number and rest. Measured in staffspace.") ))) (define paper-column-interface @@ -479,31 +537,40 @@ syllables. The length of the hyphen line should stretch based on the 'paper-column-interface "" (list + (property-description 'when moment? "when does this column happen?") + (property-description 'bounded-by-me list? "list of spanners that have this +column as start/begin point. Only columns that have elements or act as bounds are spaced.") (property-description 'dir-list list? "list of stem directions") (property-description 'shortest-playing-duration moment? "duration of the shortest playing in that column.") (property-description 'shortest-starter-duration moment? "duration of the shortest notes that starts exactly in this column.") (property-description 'contains-grace boolean? "Used to widen entries for grace notes.") - (property-description 'extra-space pair? "pair of distances") - (property-description 'stretch-distance pair? "pair of distances") + (property-description 'extra-space number-pair? "pair of distances") + (property-description 'stretch-distance number-pair? "pair of distances") ))) (define spaceable-element-interface (lily-interface 'spaceable-element-interface - "" + "An element (generally a Paper_column) that takes part in the +spacing problem. " (list (property-description 'minimum-distances list? "list of rods (ie. (OBJ . DIST) pairs)") (property-description 'ideal-distances list? "(OBJ . (DIST . STRENGTH)) pairs") - (property-description 'dir-list list? "list of stem directions.") + (property-description 'dir-list list? "list of stem directions, needed for optical spacing correction.") ))) (define rest-collision-interface (lily-interface 'rest-collision-interface - "" - (list - (property-description 'maximum-rest-count integer? "") - (property-description 'minimum-distance number? "") + "Move around ordinary rests (not multi-measure-rests) to avoid +conflicts." + (list + (property-description 'maximum-rest-count integer? "kill off rests so we don't more than this number left.") + (property-description 'minimum-distance number? "minimum distance between notes and rests.") + (property-description 'elements list? "list of elements (NoteColumn, +generally) participating in the collision. The +rest-collision property in elements is set +to a pointer to the collision") ))) (define script-interface @@ -511,13 +578,13 @@ syllables. The length of the hyphen line should stretch based on the 'script-interface "" (list - (property-description 'script-priority number? "") + (property-description 'script-priority number? "A sorting key that determines in what order a script is within a stack of scripts") ))) (define script-column-interface (lily-interface 'script-column-interface - "" + "An interface that sorts scripts according to their script-priority" (list ))) @@ -535,8 +602,8 @@ syllables. The length of the hyphen line should stretch based on the "This spanner draws the lines of a staff. The middle line is position 0." (list - (property-description 'staff-space number? "") - (property-description 'line-count integer? "") + (property-description 'staff-space number? "Amount of line leading relative to global staffspace") + (property-description 'line-count integer? "Number of staff lines") ))) (define stem-tremolo-interface @@ -545,17 +612,23 @@ position 0." "" (list (property-description 'stem ly-element? "pointer to the stem object.") - (property-description 'beam-width number? "") - (property-description 'beam-thickness number? "") - (property-description 'beam-space-function procedure? "") + (property-description 'beam-width number? "width of the tremolo sign") + (property-description 'beam-thickness number? "thickness, measured in staffspace") + (property-description 'beam-space-function procedure? "function returning space given multiplicity") ))) (define separation-item-interface (lily-interface 'separation-item-interface - "" - (list - ))) + "Item that computes widths to generate spacing rods. +

+Calc dimensions for the Separating_group_spanner; this has to be + an item to get dependencies correct. It can't be an element_group + since these usually are in a different X_group +" + (list + (property-description 'elements list? " -- list of items.") + ))) (define sustain-pedal-interface (lily-interface @@ -569,21 +642,17 @@ position 0." "" (list (property-description 'collapse-height number? "") - (property-description 'thickness number? "") + (property-description 'thickness number? "thickness, measured in stafflinethickness") + + ; Should collapse into (bracket . ((height . ) ... )) + ; (property-description 'arch-height number? "") (property-description 'arch-angle number? "") (property-description 'arch-thick number? "") (property-description 'arch-width number? "") (property-description 'bracket-thick number? "") (property-description 'bracket-width number? "") - ))) - -(define text-script-interface - (lily-interface - 'text-script-interface - "" - (list - + (property-description 'glyph symbol? "bar-line, bracket or brace") ))) (define text-spanner-interface @@ -600,17 +669,28 @@ position 0." ) )) +(define text-script-interface + (lily-interface + 'text-script-interface + "" + (list + + ))) + + (define tie-interface (lily-interface 'tie-interface - "" + "A tie connecting two noteheads." (list - (property-description 'staffline-clearance number? "") + (property-description 'staffline-clearance number? "don't get closer than this to stafflines.") + (property-description 'control-points list? "List of 4 offsets (number-pairs) controlling the tie shape") (property-description 'heads pair? "pair of element pointers, pointing to the two heads of the tie. ") - (property-description 'details list? "") - (property-description 'thickness number? "") - (property-description 'x-gap number? "") - (property-description 'minimum-length number? "") + (property-description 'details list? "alist of parameters for the curve shape") + (property-description 'thickness number? "thickness, measured in stafflinethickness") + (property-description 'x-gap number? "horizontal gap between notehead and tie") + (property-description 'direction dir? "up or down?") + (property-description 'minimum-length number? "minimum length in staffspace") ))) @@ -618,7 +698,7 @@ position 0." (define tie-column-interface (lily-interface 'tie-column-interface - "" + "that sets tie directions in a tied chord" (list ))) @@ -628,7 +708,7 @@ position 0." "Volta bracket with number" (list (property-description 'bars list? "list of barline ptrs.") - (property-description 'thickness number? "in stafflinethickness") + (property-description 'thickness number? "thickness, measured in stafflinethickness") (property-description 'height number? "in staffspace ") ))) diff --git a/scm/lily.scm b/scm/lily.scm index d7f25a10af..fd0b407b71 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -20,6 +20,32 @@ (use-modules (ice-9 regex)) +(define (number-pair? x) + (and (pair? x) (number? (car x)) (number? (cdr x)))) + +(define (type-name predicate) + (cond + ((eq? predicate dir?) "direction") + ((eq? predicate number-pair?) "pair of numbers") + ((eq? predicate ly-input-location?) "input location") + ((eq? predicate ly-element?) "graphic element") + ((eq? predicate pair?) "pair") + ((eq? predicate integer?) "integer") + ((eq? predicate list?) "list") + ((eq? predicate symbol?) "symbol") + ((eq? predicate string?) "string") + ((eq? predicate boolean?) "boolean") + ((eq? predicate moment?) "moment") + ((eq? predicate number?) "number") + ((eq? predicate char?) "char") + ((eq? predicate input-port?) "input port") + ((eq? predicate output-port?) "output port") + ((eq? predicate vector?) "vector") + ((eq? predicate procedure?) "procedure") + (else "unknown type") + )) + + ;; The regex module may not be available, or may be broken. (define use-regex (let ((os (string-downcase (vector-ref (uname) 0)))) diff --git a/scm/slur.scm b/scm/slur.scm index 630dc82cc9..a17cf91fd0 100644 --- a/scm/slur.scm +++ b/scm/slur.scm @@ -115,6 +115,6 @@ (y-free . 0.75) (attachment-offset . ((0 . 0) . (0 . 0))) (slope-limit . 0.8) - (meta . ,(element-description "Slur" general-element-interface slur-interface)) + (meta . ,(element-description "Slur" slur-interface)) ) ) -- 2.39.5