-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
===========
* 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.
* Self-documenting backend using ly/generate-documentation.ly
-
-1.3.95.jcn5
-===========
+1.3.96
+======
* Added friendly message for the clueless dvips user.
* added input/test/bagpipe.ly
-
-
1.3.87
======
* 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.
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.
}
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);
--- /dev/null
+\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"; }
+}}
--- /dev/null
+\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"; }
+}}
+
}
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
}
\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"; }
}}
c2^^^-^\f
\time 3/4;
- \fugaIIPedal }
+ \fugaIIPedal \bar "|." ; }
>
>
-
/*
auto-beam-engraver.cc -- implement Auto_beam_engraver
(c) 1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
*/
+
#include "beaming.hh"
#include "musical-request.hh"
#include "beam.hh"
#include "item.hh"
#include "spanner.hh"
+/*
+ TODO: figure what to do in grace?
+ */
class Auto_beam_engraver : public Engraver
{
public:
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;
grouping_p_ = 0;
}
-
bool
Auto_beam_engraver::do_try_music (Music*)
{
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);
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 ();
}
}
}
}
-
column->set_elt_property ("stretch-distance",
gh_cons (gh_double2scm (-dists[0]),
gh_double2scm (stretch_distance)));
-
-
}
#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
}
+
+
+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;
+ }
+}
#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
{
#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:
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*);
};
#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:
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<Item*> broken_to_drul_;
#include "lily-guile.hh"
#include "lily-proto.hh"
-/**
-
- Properties:
-
-
- */
struct Key_item
{
static int calculate_position(Score_element*,SCM pair) ;
#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:
-/*
- 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*);
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 {
/**
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 ();
#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
{
#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
{
#include "lily-proto.hh"
#include "rod.hh"
-/**
-*/
class Slur
{
public:
#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<Score_element*> 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 *) ;
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*);
#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:
return 0;
}
+SCM
+ly_input_p (SCM x)
+{
+ return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F ;
+}
+
static
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
Input dummy_input_global;
+
-
/*
new-staff-margin-engraver.cc -- implement Instrument_name_engraver
#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:
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);
}
}
- 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<Spanner*> (i.elem_l_);
+ delim_ = i.elem_l_;
}
}
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);
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);
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);
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);
}
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()));
}
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);
-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
}
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))
curve_.control_[2][X_AXIS] -= da[1] * u * pct;
}
- Real area = enclosed_area_f ();
+ // Real area = enclosed_area_f ();
}
/*
[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
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<Real> a;
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)
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);
}
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_);
}
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"));
}
#include "all-font-metrics.hh"
#include "afm.hh"
+
/*
text: string | (markup sentence)
markup: markup-symbol | (markup-symbol . parameter)
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))
- 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;
}
/*
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<Real> horizontal (b.solve_derivative (Offset (1,0)));
if (horizontal.size ())
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];
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);
}
}
- go to alternative if we're a volta
+ - make a :| if there are no alternatives
+
- do something intelligent when we're fully unfolding (fixcomment)
*/
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;
end_volta_span_p_ =0;
}
}
+
+/*
+ TODO: should attach volta to paper-column if no bar is found.
+ */
\name ChoirStaff;
alignmentReference = \center;
\consists "System_start_delimiter_engraver";
- systemStartDelimiterGlyph = #'bracket
+ SystemStartDelimiter \push #'glyph = #'bracket
\accepts "Staff";
\accepts "RhythmicStaff";
\consists "Stem_engraver";
\consists "Beam_engraver";
\consists "Slur_engraver";
-
+
\consists "Auto_beam_engraver";
\consists "Align_note_column_engraver";
\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
\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";
alignmentReference = \down;
defaultClef = #"treble"
defaultBarType = #"|"
- systemStartDelimiterGlyph = #'bar-line
+
explicitClefVisibility = #all-visible
explicitKeySignatureVisibility = #all-visible
Begin3
Title: LilyPond
-Version: 1.3.97
+Version: 1.3.98
Entered-date: 22OCT00
Description:
Keywords: music notation typesetting midi fonts engraving
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
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
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 {
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 {
%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 {
}
}
\midi{ \tempo 4 = 130; }
- \header{ piece = "Menuetto II"; }
+ \header{
+ piece = "Menuetto II";
+ opus = "";
+ }
}
g4 \skip 4*1; f4 |
cis8 \skip 8*3; d4 |
s2.*2
+ \bar "|.";
}
% UGH, fix this like in sarabande
e( fis g )b a4 |
g8()fis e()d e()cis |
d2.
+ \bar "|.";
}
\version "1.3.93";
}
\midi{ \tempo 4 = 110; }
\header{
- opus= "" ;
- piece ="Menuetto I"; }
+ opus= "" ;
+ piece ="Menuetto I";
+ }
}
menuetto_ii_viola_global = \notes{
f'4 fis4. s8 |
<d4 g,> gis4. s8 |
s2.*2
+ \bar "|.";
}
(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))
)
)
))
(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)
(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)
(LineOfScore . (
(axes . (0 1))
- (meta . ,(element-description "LineOfScore" axis-group-interface))
+ (meta . ,(element-description "LineOfScore" line-of-score-interface axis-group-interface))
))
(LyricExtender . (
(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 ))
))
(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)
(("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")
(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
style-to-font-alist)))
(define (markup-to-properties markup)
- ;;(display "markup: `")
+ ;; (display "markup: `")
;;(display markup)
;;(display "'\n")
(if (pair? markup)
)
(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*
(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))
)
)))
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;
-
(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 <code> X-offset-callbacks</code>")
+ (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 <code> X-extent-callback </code>")
(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 <code>meta</code> 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 <code>extra-extent-Y</code>")
+ (property-description 'minimum-extent-X number-pair? "minimum size in X dimension, measured in staff space")
+ (property-description 'minimum-extent-Y number-pair? "see <code>minimum-extent-Y</code>")
+ (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
(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.")
))
)
'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.")
)))
(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.")
+
)
)
)
(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)")
)
))
+(define line-of-score-interface
+ (lily-interface
+ 'line-of-score-interface
+ "Super element, parent of all:
+<p>
+ 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
(define note-name-interface
(lily-interface
'note-name-interface
- "Note naem"
+ "Note name"
(list
(property-description 'style symbol? "symbol that sets note name style")
)
(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")
)
))
(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
'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
"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? "")
)))
'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.")
)
)
)
(define dot-column-interface
(lily-interface
'dot-column-interface
- ""
+ "Interface that groups dots so they form a column"
(list
)))
(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 <code>separation-item-interface</code> elements to calculate rods"
'()
))
(define text-script-interface
(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
'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")
)))
(define lyric-syllable-interface
(lily-interface
'lyric-syllable-interface
- ""
+ "a single piece of lyrics"
(list
(property-description 'word-space number? "")
)))
(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
'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
+<code>rest-collision</code> property in <code>elements</code> is set
+to a pointer to the collision")
)))
(define script-interface
'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 <code>script-priority</code>"
(list )))
"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
""
(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.
+<p>
+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
""
(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
)
))
+(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")
)))
(define tie-column-interface
(lily-interface
'tie-column-interface
- ""
+ "that sets tie directions in a tied chord"
(list
)))
"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 ")
)))
(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))))
(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))
)
)
projects / lilypond.git / commitdiff