* Fixed bracket, and made some other PostScript code fixes.
-1.3.101.jcn1
-============
-
* Silly font initialisation fix for paper19 non-feature.
+1.3.101.uu1
+===========
+
+* Automatic engraver/property documentation infrastructure.
+
+* Fixed system-start braces
+
+* Fix for forgetAccidentals: do print accidentals, just don't remember
+them.
+
+* Bugfix: forced script directions for scripts that have relative stem-direction.
+
+* Bugfix: Tie_column doesn't force Tie directions ties that already
+have a direction.
+
+* Bugfix: multimeasure rest
+
1.3.101
=======
@itemize @bullet
@item @uref{../user/out-www/lilypond.html,LilyPond reference manual}
also available in @uref{../user/out-www/lilypond.ps.gz,Postscript}
-@item @uref{../user/out-www/backend.html,LilyPond backend reference}
+@item LilyPond @uref{../user/out-www/backend.html,backend reference} and
+ @uref{../user/out-www/translation.html, context reference}
@item @uref{../user/out-www/glossary.html,A glossary of musical
terms}, includes translations. Also available in @uref{../user/out-www/glossary.ps.gz,Postscript})
@item @uref{../user/out-www/mudela-book.html,mudela-book}, a tool for
typeset with a full size clef. By default, clef changes are
typeset in smaller size.
-
-
- @item @code{supportedClefTypes}@indexcode{supportedClefTypes} @propertytype{alist}
-
- Clef settings supported. The value is an association list clef
-descriptions indexed by clef name (alto, baritone, etc.). A clef
-description is a list with the glyph name, and the staff position
-where it should go. For internal use.
-
- @item @code{clefPitches}@indexcode{clefPitches} @propertytype{alist}
- Settings for the position of the central C, relative to this clef
- symbol. For internal use.
-
- @item @code{defaultClef}@indexcode{defaultClef} @propertytype{string}
- Clef setting to use when this context is created. If unset,
-no clef is printed upon creation.
-
- @item @code{marginDirection}@indexcode{marginDirection} @propertytype{direction}
- Set to @code{\left} or @code{\right} to specify location of
- marginal scripts.
-
- @item @code{marginScriptPadding}@indexcode{marginScriptPadding}
- Specify extra space for marginal scripts.
-
- @item @code{forgetAccidentals}@indexcode{forgetAccidentals} @propertytype{boolean}
- Causes accidentals to be printed at every note instead of
- remembered for the duration of a measure.
-
- @item @code{noResetKey}@indexcode{noResetKey} @propertytype{boolean}
- Do not reset the key at the start of a measure. Accidentals will
- be printed only once and are in effect until overridden, possibly
- many measures later.
@item @code{staffSpace}@indexcode{staffLineLeading} @propertytype{number}
Specifies the distance (in points) between lines of the staff.
@item @code{noVoltaBraces}@indexcode{noVoltaBraces} @propertytype{boolean}
Set to true to suppress the printing of brackets over alternate
- endings specified by the command @code{\alternative}.
+ endings specified by the command @code{\alternative}. [BROKEN]
@item @code{barAlways}@indexcode{barAlways} @propertytype{boolean}
@end mudela
@item @code{voltaSpannerDuration}@indexcode{voltaSpannerDuration} @propertytype{moment}
- Set to an integer to control the size of the brackets printed by
- @code{\alternative}. The integer specifies the number of whole
- notes duration to use for the brackets. It is rounded to the
- nearest measure. This can be used to shrink the length of
- brackets in the situation where one alternative is very large.
- It may have odd effects if the specified duration is longer than
- the music given in an @code{\alternative}.
+
@end table
@subsubheading GrandStaff properties
PACKAGE_NAME=LilyPond
MAJOR_VERSION=1
MINOR_VERSION=3
-PATCH_LEVEL=101
-MY_PATCH_LEVEL=jcn2
+PATCH_LEVEL=102
+MY_PATCH_LEVEL=
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
return *this;
}
Interval_t<T> &operator *=(T r) {
- elem (LEFT) *= r;
- elem (RIGHT) *= r;
- if (r < T(0)) {
- T t = elem (LEFT);
- elem (LEFT) = elem (RIGHT);
- elem (RIGHT) = t;
- }
+ if (!empty_b ())
+ {
+ elem (LEFT) *= r;
+ elem (RIGHT) *= r;
+ if (r < T(0)) {
+ T t = elem (LEFT);
+ elem (LEFT) = elem (RIGHT);
+ elem (RIGHT) = t;
+ }
+ }
return *this;
}
enteredby = "JCN";
%piece = "Allegretto scherzando";
copyright = "public domain";
- description = "Natiest piece of competition at http://www.orphee.com/comparison/study.html, see http://www.orphee.com/comparison/gray.pdf";
+ description = "Nastiest piece of competition at http://www.orphee.com/comparison/study.html, see http://www.orphee.com/comparison/gray.pdf";
comment = "LilyPond (1.3.93) can't really do this yet, I guess";
}
\property Voice.TextSpanner \push #'edge-height = #'(0 . 1.5)
\property Voice.TextSpanner \push #'edge-text = #'("8 " . "")
% Huh, urg? Implicit \context Staff lifts us up to Staff context???
+
+ % no, see seq-mus-iter --hwn
\property Staff."c0-position" = #-13
+
+
% Get back
- \context Voice
+ %\context Voice
\outputproperty #(make-text-checker "m.g.")
#'extra-offset = #'(-3 . -2)
% currently, this can't be (small) italic, because in the paperblock
\property Voice.TextSpanner \push #'type = #"dotted-line"
\property Voice.TextSpanner \push #'edge-height = #'(0 . 1.5)
\property Voice.TextSpanner \push #'edge-text = #'("8va " . "")
- \property Staff."c0-position" = #-13
+ \property Staff.centralCPosition = #-13
a\spanrequest \start "text" b c a \spanrequest \stop "text"
- \property Staff."c0-position" = #-6
+ \property Staff.centralCPosition = #-6
a b c a
- \property Staff."c0-position" = #1
+ \property Staff.centralCPosition = #1
\property Voice.TextSpanner \push #'edge-text = #'("8bass " . "")
\property Voice.TextSpanner \push #'direction = #-1
a\spanrequest \start "text" b c a \spanrequest \stop "text"
--- /dev/null
+
+\score {
+ \notes \context PianoStaff < \context Staff = SA { s1 }
+ \context Staff = SB { s1 }>
+}
--- /dev/null
+
+\score {
+ \notes \context StaffGroup < \context Staff = SA { s1 }
+ \context Staff = SB { s1 }>
+}
\notes \context Voice {
\t
\transpose g' \t
- \property Voice.tieVerticalDirection = #-1
+
+ \property Voice.TieColumn \push #'direction = #-1
\t
}
return false;
int c0_position = gh_scm2int (pos) + gh_scm2int (gh_cdr (found));
- daddy_trans_l_->set_property ("clefCentralCPosition", gh_int2scm (c0_position));
+ daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position));
}
- int c0_position = gh_scm2int (get_property ("clefCentralCPosition"));
+ int c0_position = gh_scm2int (get_property ("centralCPosition"));
c0_position -= (int)octave_dir_ * 7;
- daddy_trans_l_->set_property ("clefCentralCPosition", gh_int2scm (c0_position));
+ daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position));
SCM basic = ly_symbol2scm ("Clef");
)
{
int p = int (Staff_symbol_referencer::position_f (item))
- + gh_scm2int (get_property ("clefCentralCPosition"));
+ + gh_scm2int (get_property ("centralCPosition"));
Staff_symbol_referencer::set_position (item, p);
}
else if (Key_item::has_interface (item))
to know c0-pos for this. (?)
*/
- item->set_elt_property ("c0-position", get_property ("clefCentralCPosition"));
+ item->set_elt_property ("c0-position", get_property ("centralCPosition"));
}
}
}
{
daddy_trans_l_->set_property ("clefPosition", gh_int2scm (0));
daddy_trans_l_->set_property ("clefGlyph", SCM_EOL);
- daddy_trans_l_->set_property ("clefCentralCPosition", gh_int2scm (0));
+ daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (0));
SCM def = get_property ("defaultClef");
if (gh_string_p (def))
if (fm)
return fm;
+ fm = get_font (me, font_alist_chain (me));
+ me->set_elt_property ("font", fm->self_scm ());
+ return fm;
+}
+
+Font_metric *
+Font_interface::get_font (Score_element *me, SCM chain)
+{
+
SCM ss = me->paper_l ()->style_sheet_;
SCM proc = gh_cdr (scm_assoc (ly_symbol2scm ("properties-to-font"),
ss));
SCM fonts = gh_cdr (scm_assoc (ly_symbol2scm ("fonts"), ss));
- SCM defaults = gh_cdr (scm_assoc (ly_symbol2scm ("font-defaults"),
- ss));
assert (gh_procedure_p (proc));
- SCM font_name = gh_call2 (proc, fonts, font_alist_chain (me));
+ SCM font_name = gh_call2 (proc, fonts, chain);
+
+ Font_metric *fm = me->paper_l ()->find_font (font_name, 1.0);
- fm = me->paper_l ()->find_font (font_name, 1.0);
- me->set_elt_property ("font", fm->self_scm ());
return fm;
}
+
+SCM
+Font_interface::add_style (Score_element* me, SCM style, SCM chain)
+{
+ assert (gh_symbol_p (style));
+
+ SCM sheet = me->paper_l ()->style_sheet_;
+
+ SCM style_alist = gh_cdr (scm_assoc (ly_symbol2scm ("style-alist"), sheet));
+ SCM entry = scm_assoc (style, style_alist);
+ if (gh_pair_p (entry))
+ {
+ chain = gh_cons (gh_cdr (entry), chain);
+ }
+ return chain;
+}
}
-Box
-Scaled_font_metric::text_dimension (String t) const
-{
- Box b (orig_l_->text_dimension (t));
-
- b.scale (magnification_f_);
- return b;
-}
Font_metric::~Font_metric ()
{
protected:
/// utility
Paper_def * paper_l() const;
- /**
- Invoke walker method to typeset element. Default: pass on to daddy.
- */
+
+ /*
+ Call this last thing.
+ */
virtual void typeset_element (Score_element*elem_p);
- /**
+ /*
take note of item/spanner
put item in spanner. Adjust local key; etc.
struct Font_interface
{
static SCM font_alist_chain (Score_element*);
- static Font_metric * get_default_font (Score_element*);
+ static Font_metric * get_font (Score_element*, SCM alist_chain);
+ static Font_metric * get_default_font (Score_element*);
+ static SCM add_style (Score_element*, SCM style, SCM alist_chain);
};
#endif /* FONT_INTERFACE_HH */
Font_metric ();
};
-
-/*
- Perhaps junk this, and move iface to paper_def?
- */
-struct Scaled_font_metric : public Font_metric
-{
- virtual Box text_dimension (String) const;
- virtual Molecule find_by_name (String) const;
- static SCM make_scaled_font_metric (Font_metric*, Real);
-protected:
- Font_metric *orig_l_;
- Real magnification_f_;
-
- Scaled_font_metric (Font_metric*,Real);
-};
-
Font_metric * unsmob_metrics (SCM s);
#endif /* FONT_METRIC_HH */
typedef SCM(*Scheme_function_unknown)();
#if __GNUC_MINOR__ >= 96
+typedef SCM(*Scheme_function_0)();
typedef SCM(*Scheme_function_1)(SCM);
typedef SCM(*Scheme_function_2)(SCM,SCM);
#else
+typedef SCM(*Scheme_function_0)(...);
typedef SCM(*Scheme_function_1)(...);
typedef SCM(*Scheme_function_2)(...);
#endif
*/
class Music_output_def
{
- Scope *translator_p_dict_p_;
public:
+ Scope *translator_p_dict_p_;
Scope *scope_p_;
VIRTUAL_COPY_CONS(Music_output_def);
#ifndef MY_LILY_PARSER_HH
#define MY_LILY_PARSER_HH
+
#include "lily-proto.hh"
#include "string.hh"
#include "parray.hh"
musical content here. We still have to remove default_duration_.
TODO: interface is too complicated
-
*/
class My_lily_parser
{
void parser_error (String);
void set_yydebug (bool);
+
+
+ DECLARE_SCHEME_CALLBACK(paper_description, ());
private:
-
+
Array<Input> define_spot_array_;
char const* here_ch_C() const;
- Simultaneous_music * get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p, Array<Musical_pitch>* sub_arr_p, Musical_pitch* inversion_p, Musical_pitch* bass_p, Duration d);
-
+ Simultaneous_music * get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p,
+ Array<Musical_pitch>* sub_arr_p, Musical_pitch* inversion_p,
+ Musical_pitch* bass_p, Duration d);
+
void set_chord_tremolo (int type_i);
void set_last_duration (Duration const *);
void set_last_pitch (Musical_pitch const *);
--- /dev/null
+/*
+ scaled-font-metric.hh -- declare Font_metric
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ */
+
+#ifndef SCALED_FONT_METRIC_HH
+#define SCALED_FONT_METRIC_HH
+
+#include "font-metric.hh"
+
+/*
+ Perhaps junk this, and move this to paper_def as interface?
+ */
+struct Scaled_font_metric : public Font_metric
+{
+ virtual Box text_dimension (String) const;
+ virtual Molecule find_by_name (String) const;
+ static SCM make_scaled_font_metric (Font_metric*, Real);
+
+protected:
+ virtual Box get_char (int)const;
+ Font_metric *orig_l_;
+ Real magnification_f_;
+
+ Scaled_font_metric (Font_metric*,Real);
+};
+#endif
#ifndef TEXT_ITEM
#define TEXT_ITEM
+
+#include "lily-proto.hh"
#include "lily-guile.hh"
#include "molecule.hh"
static Molecule text2molecule (Score_element *me, SCM text, SCM properties);
static Molecule string2molecule (Score_element *me, SCM text, SCM properties);
static Molecule markup_sentence2molecule (Score_element *me, SCM markup_sentence, SCM properties);
- static Molecule lookup_character (Score_element *me, SCM font_name, SCM text);
- static Molecule lookup_text (Score_element *me, SCM font_name, SCM char_name);
+
+private:
+ static Molecule lookup_character (Score_element *me, Font_metric*, SCM char_name);
+ static Molecule lookup_text (Score_element *me, Font_metric*, SCM text);
};
#endif /* TEXT_ITEM */
Link_array<Translator_def> path_to_acceptable_translator (SCM type_str, Music_output_def* odef) const;
Translator_group * instantiate (Music_output_def*);
+ SCM to_alist () const;
+
static SCM make_scm () ;
static void apply_pushpop_property (Translator_group*, SCM syms, SCM eprop, SCM val);
#include "arpeggio.hh"
/**
- Make accidentals. Catches note heads, ties and notices key-change
- events. Due to interaction with ties (which don't come together
- with note heads), this needs to be in a context higher than Tie_engraver.
- (FIXME).
+
FIXME: should not compute vertical positioning of accidentals, but
get them from the noteheads
{
SCM localsig = get_property ("localKeySignature");
- SCM f = get_property ("forgetAccidentals");
- bool forget = to_boolean (f);
for (int i=0; i < mel_l_arr_.size(); i++)
{
Score_element * support_l = support_l_arr_[i];
bool different = prev_acc != a;
bool tie_changes = tied_l_arr_.find_l (support_l) && different;
- if (!forget
- && (note_l->forceacc_b_ || different)
- && !tie_changes)
+ if ((note_l->forceacc_b_ || different) && !tie_changes)
{
if (!key_item_p_)
{
always do the correct thing?
*/
+ bool forget = to_boolean (get_property ("forgetAccidentals"));
if (!forget && !tie_changes)
{
/*
{
Score_element *me = unsmob_element (smob);
Spanner * sp = dynamic_cast<Spanner*> (me);
+
+ SCM alist_chain = Font_interface::font_alist_chain (me);
+
+
+ SCM style_chain =
+ Font_interface::add_style (me, ly_symbol2scm ("mmrest-symbol"),
+ alist_chain);
+
+ Font_metric *musfont
+ = Font_interface::get_font (me,style_chain);
+
Real staff_space = Staff_symbol_referencer::staff_space (me);
Interval sp_iv;
Real pad = s.empty_b ()
? 0.0 : gh_scm2double (me->get_elt_property ("padding")) * staff_space;
- Molecule r (Font_interface::get_default_font (me)->find_by_name ("rests-" + to_str (k)));
+ Molecule r (musfont->find_by_name ("rests-" + to_str (k)));
if (k == 0)
r.translate_axis (staff_space, Y_AXIS);
else
{
String idx = ("rests-") + to_str (-4);
- s = Font_interface::get_default_font (me)->find_by_name (idx);
+ s = musfont->find_by_name (idx);
}
mol.add_molecule (s);
if (measures > 1)
{
- SCM properties = Font_interface::font_alist_chain (me);
Molecule s = Text_item::text2molecule (me,
ly_str02scm (to_str (measures).ch_C ()),
- properties);
+ alist_chain);
s.align_to (X_AXIS, CENTER);
s.translate_axis (3.0 * staff_space, Y_AXIS);
mol.add_molecule (s);
}
-Script_req::Script_req ()
-{
- set_direction (CENTER);
-}
return lexer_p_->here_input ();
}
+// move me?
+#include "paper-def.hh"
+#include "identifier.hh"
+#include "translator-def.hh"
+My_lily_parser * current_parser;
+
+MAKE_SCHEME_CALLBACK(My_lily_parser,paper_description, 0);
+
+SCM
+My_lily_parser::paper_description ()
+{
+ My_lily_parser * me = current_parser;
+
+ Identifier *id = unsmob_identifier (me->lexer_p_->lookup_identifier ("$defaultpaper"));
+ Paper_def *p = dynamic_cast<Paper_def*> (id->access_content_Music_output_def (false));
+
+ SCM al = p->translator_p_dict_p_->to_alist ();
+ SCM l = SCM_EOL;
+ for (SCM s = al ; gh_pair_p (s); s = gh_cdr (s))
+ {
+ Translator_def * td = unsmob_translator_def (gh_cdar (s));
+ l = gh_cons (td->to_alist (), l);
+ }
+ return l;
+}
+
#include "misc.hh"
#include "paper-def.hh"
#include "debug.hh"
-#include "font-metric.hh"
+#include "scaled-font-metric.hh"
#include "main.hh"
#include "scope.hh"
#include "file-results.hh" // urg? header_global_p
yydebug = b;
#endif
}
+
+extern My_lily_parser * current_parser;
+
void
My_lily_parser::do_yyparse ()
{
+
+ current_parser = this;;
yyparse ((void*)this);
}
set_mus_property ("type", ly_symbol2scm ("request"));
}
+
+
+Script_req::Script_req ()
+{
+ set_direction (CENTER);
+}
+
void
Script_req::set_direction (Direction d)
{
-#include "font-metric.hh"
+/*
+ scaled-font-metric.cc -- declare Scaled_font_metric
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ */
+
+#include "scaled-font-metric.hh"
#include "string.hh"
#include "molecule.hh"
return q ;
}
+
+Box
+Scaled_font_metric::get_char (int i) const
+{
+ Box b = orig_l_->get_char (i);
+ b.scale (magnification_f_);
+ return b;
+}
+
+Box
+Scaled_font_metric::text_dimension (String t) const
+{
+ Box b (orig_l_->text_dimension (t));
+
+ b.scale (magnification_f_);
+ return b;
+}
{
return id_dict_->try_retrieve (k, v);
}
+
SCM priority = gh_car (list);
- if (to_dir (relative_stem_dir))
+ if (!isdir_b (force_dir)
+ && to_dir (relative_stem_dir))
p->set_elt_property ("side-relative-direction", relative_stem_dir);
else
p->set_elt_property ("direction", force_dir);
Molecule
System_start_delimiter::staff_bracket (Score_element*me,Real height)
{
- Paper_def* p= me->paper_l ();
Real arc_height = gh_scm2double (me->get_elt_property("arch-height")) ;
SCM at = gh_list (ly_symbol2scm ("bracket"),
- me->get_elt_property ("arch-angle"),
- me->get_elt_property ("arch-width"),
+ me->get_elt_property ("arch-angle"),
+ me->get_elt_property ("arch-width"),
gh_double2scm (arc_height),
me->get_elt_property ("bracket-width"),
gh_double2scm (height),
return m.create_scheme ();
}
-/*
- Ugh. Suck me plenty.
- */
Molecule
System_start_delimiter::staff_brace (Score_element*me,Real y)
{
- int staff_size = 20; // URG.
-
- // URG
- Real step = 1.0;
- int minht = 2 * staff_size;
- int maxht = 7 * minht;
- int idx = int (((maxht - step) <? y - minht) / step);
- idx = idx >? 0;
-
+ int lo = 0;
+ int hi = 255;
Font_metric *fm = Font_interface::get_default_font (me);
-
- SCM at =gh_list (ly_symbol2scm ("char"), gh_int2scm (idx), SCM_UNDEFINED);
+ Box b;
+
+ /* do a binary search for each Y, not very efficient, but passable? */
+ do
+ {
+ int cmp = (lo + hi) / 2;
+
+ b = fm->get_char (cmp);
+ if (b[Y_AXIS].empty_b () || b[Y_AXIS].length () > y )
+ hi = cmp;
+ else
+ lo = cmp;
+ }
+ while (hi - lo > 1);
+
+ SCM at = gh_list (ly_symbol2scm ("char"), gh_int2scm (lo), SCM_UNDEFINED);
at = fontify_atom (fm, at);
- Box b (Interval (0,0), Interval (-y/2, y/2));
+ b = fm->get_char (lo);
+ b[X_AXIS] = Interval (0,0);
return Molecule(b, at);
}
{
SCM style = ly_assoc_chain (ly_symbol2scm ("font-style"),
alist_chain);
- if (gh_pair_p (style))
- style = gh_cdr (style);
-
- SCM sheet = me->paper_l ()->style_sheet_;
-
- if (gh_symbol_p (style))
- {
- SCM style_alist = gh_cdr (scm_assoc (ly_symbol2scm ("style-alist"), sheet));
- SCM entry = scm_assoc (style, style_alist);
- entry = gh_pair_p (entry) ? gh_cdr (entry) : SCM_EOL;
- alist_chain = gh_cons (entry, alist_chain);
- }
-
- SCM fonts = gh_cdr (scm_assoc (ly_symbol2scm ("fonts"), sheet));
- SCM proc = gh_cdr (scm_assoc (ly_symbol2scm ("properties-to-font"), sheet));
- SCM font_name = gh_call2 (proc, fonts, alist_chain);
+ if (gh_pair_p (style) && gh_symbol_p (gh_cdr (style)))
+ alist_chain = Font_interface::add_style (me, gh_cdr(style), alist_chain);
+ Font_metric *fm = Font_interface::get_font (me, alist_chain);
+
SCM lookup = ly_assoc_chain (ly_symbol2scm ("lookup"), alist_chain);
-
+
Molecule mol;
- if (gh_pair_p (lookup) && ly_symbol2string (gh_cdr (lookup)) == "name")
- mol = lookup_character (me, font_name, text);
+ if (gh_pair_p (lookup) && gh_cdr (lookup) ==ly_symbol2scm ("name"))
+ mol = lookup_character (me, fm, text);
else
- mol = lookup_text (me, font_name, text);
+ mol = lookup_text (me, fm, text);
return mol;
}
Molecule
-Text_item::lookup_character (Score_element *, SCM font_name, SCM char_name)
+Text_item::lookup_character (Score_element *, Font_metric*fm, SCM char_name)
{
- Adobe_font_metric *afm = all_fonts_global_p->find_afm (ly_scm2string (font_name));
-
- if (!afm)
- {
- warning (_f ("can't find font: `%s'", ly_scm2string (font_name)));
- warning (_f ("(search path: `%s')", global_path.str ().ch_C()));
- error (_ ("Aborting"));
- }
- Font_metric * fm = afm;
-
return fm->find_by_name (ly_scm2string (char_name));
}
Molecule
-Text_item::lookup_text (Score_element *me, SCM font_name, SCM text)
+Text_item::lookup_text (Score_element *me, Font_metric*fm, SCM text)
{
+#if 0
+ /*
+ Fixme; should be done differently, move to font-interface?
+ */
+
SCM magnification = me->get_elt_property ("font-magnification");
+
Font_metric* metric = 0;
if (gh_number_p (magnification))
{
-#if 0
+
Real realmag = pow (1.2, gh_scm2int (magnification));
metric = all_fonts_global_p->find_scaled (ly_scm2string (font_name), realmag);
-#endif
+
assert (false);
}
- else
- metric = me->paper_l ()->find_font (font_name, 1.0);
-
+
+#endif
+
SCM list = gh_list (ly_symbol2scm ("text"), text, SCM_UNDEFINED);
- list = fontify_atom (metric, list);
+ list = fontify_atom (fm, list);
- return Molecule (metric->text_dimension (ly_scm2string (text)), list);
+ return Molecule (fm->text_dimension (ly_scm2string (text)), list);
}
Molecule
/*
- tfm.cc -- implement Tex_font_metric
+ tfm.cc -- implement Tex_font_metric
source file of the GNU LilyPond music typesetter
Box
Tex_font_char_metric::dimensions () const
{
+ if (!exists_b_)
+ {
+ Box b;
+ b.set_empty ();
+ return b;
+ }
+
Real d = -depth_;
return Box (Interval (0, width_),Interval ( d <? height_, d >? height_));
}
if (ascii < ascii_to_metric_idx_.size() && ascii_to_metric_idx_[ascii] >= 0)
return & char_metrics_[ascii_to_metric_idx_ [ascii]];
else if (warn)
-
{
warning (_f ("can't find ascii character %d", ascii));
}
return me->has_interface (ly_symbol2scm ("tie-column-interface"));
}
+
+/*
+ tie dir depends on what Tie_column does.
+*/
+
void
Tie_column::add_tie (Score_element*me,Score_element *s)
{
-
if (! Pointer_group_interface ::count (me, "ties"))
{
dynamic_cast<Spanner*> (me)->set_bound (LEFT, Tie::head (s,LEFT));
Link_array<Score_element> ties =
Pointer_group_interface__extract_elements (me, (Score_element*)0, "ties");
+ for (int i = ties.size (); i--; )
+ if (Directional_element_interface::get (ties[i]))
+ ties.del (i);
+
Direction d = Directional_element_interface::get (me);
-
if (d)
{
for (int i = ties.size (); i--;)
SCM d = accepts_name_list_;
return gh_pair_p (d) ? gh_car (scm_last_pair (d)) : SCM_EOL;
}
+
+SCM
+Translator_def::to_alist ()const
+{
+ SCM l = SCM_EOL;
+
+ l = gh_cons (gh_cons (ly_symbol2scm ("consists"), consists_name_list_), l);
+ l = gh_cons (gh_cons (ly_symbol2scm ("end-consists"), end_consists_name_list_), l);
+ l = gh_cons (gh_cons (ly_symbol2scm ("accepts"), accepts_name_list_), l);
+ l = gh_cons (gh_cons (ly_symbol2scm ("property-ops"), property_ops_), l);
+ l = gh_cons (gh_cons (ly_symbol2scm ("type-name"), type_name_), l);
+ l = gh_cons (gh_cons (ly_symbol2scm ("group-type"), translator_group_type_), l);
+
+ return l;
+}
}
-
end_volta_span_p_ = volta_span_p_;
volta_span_p_ = 0;
}
void
-Volta_spanner::set_interface (Score_element*me)
+Volta_spanner::set_interface (Score_element*)
{
}
-#(eval-string (ly-gulp-file "generate-documentation.scm"))
+#(eval-string (ly-gulp-file "generate-engraver-documentation.scm"))
+#(eval-string (ly-gulp-file "generate-backend-documentation.scm"))
Begin3
Title: LilyPond
-Version: 1.3.101
-Entered-date: 30OCT00
+Version: 1.3.102
+Entered-date: 01NOV00
Description:
Keywords: music notation typesetting midi fonts engraving
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.101.tar.gz
+ 1000k lilypond-1.3.102.tar.gz
Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
- 1000k lilypond-1.3.101.tar.gz
+ 1000k lilypond-1.3.102.tar.gz
Copying-policy: GPL
End
Name: lilypond
-Version: 1.3.101
+Version: 1.3.102
Release: 1
License: GPL
Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.101.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.102.tar.gz
Summary: A program for printing sheet music.
URL: http://www.cs.uu.nl/~hanwen/lilypond
# Icon: lilypond-icon.gif
height# := height_sharp;
width# := width_sharp;
- beginchar(incr code, width#, height#/2, height#/2);
-
+ beginchar(code, width#, height#/2, height#/2);
+ code := incr code;
+
define_pixels (height, width);
thin = 2 stafflinethickness;
thick = .5 staff_space;
/draw_bracket % arch_angle arch_width arch_height bracket_width bracket_height arch_thick bracket_thick
{
% urg
+
/bracket_thick exch def
/arch_thick exch def
/bracket_height exch def
(collapse-height . 1.0)
(thickness . 1.6)
(arch-height . 1.5)
- (arch-angle . 50.0)
+ (arch-angle . 25.0)
(arch-thick . 0.25)
(glyph . bar-line)
(arch-width . 1.5)
(bracket-thick . 0.25)
- (bracket-width . 2.0)
+ (bracket-width . 0.4)
(font-family . braces)
(font-point-size . 20)
(Y-extent-callback . #f)
(volta . ((font-family . number) (font-relative-size . -2)))
(tuplet . ((font-family . roman) (font-shape . italic) (font-relative-size . -1)))
(timesig . ((font-family . number) (font-relative-size . 0)))
+
(mmrest . ((font-family . number) (font-relative-size . 1)))
+ (mmrest-symbol . ((font-family . music) (font-relative-size . 0)))
+
(mark . ((font-family . number) (font-relative-size . 1)))
(script . ((font-family . roman) (font-relative-size . -1)))
(large . ((font-family . roman) (font-relative-size . 1)))
--- /dev/null
+
+;;;;
+;
+; This file generates documentation for the backend of lilypond.
+;
+;;;;
+
+
+(define (uniqued-alist alist acc)
+ (if (null? alist) acc
+ (if (assoc (caar alist) acc)
+ (uniqued-alist (cdr alist) acc)
+ (uniqued-alist (cdr alist) (cons (car alist) acc)
+ ))))
+
+;;; TODO
+
+(define (wordwrap string)
+ ""
+ )
+
+(define (self-evaluating? x)
+ (or (number? x) (string? x) (procedure? x) (boolean? x))
+ )
+
+
+(define (htmlfy x)
+ (let*
+ ((x1 (regexp-substitute/global #f ">" x 'pre ">" 'post))
+ (x2 (regexp-substitute/global #f "<" x1 'pre "<" 'post))
+ )
+ x2))
+
+(define (scm->string val)
+ (string-append
+ (if (self-evaluating? val) "" "'")
+ (htmlfy
+ (call-with-output-string (lambda (port) (display val port))))
+ ))
+
+(define (document-property prop desc)
+ (let ((handle (assoc (car prop) desc)))
+ (string-append
+ "\n<li><code>" (symbol->string (car prop)) "</code> (" (type-name (cadr prop)) ") -- "
+ (caddr prop)
+ "<br>default value: <code>"
+ (if (pair? handle)
+ (scm->string (cdr handle))
+ "not set"
+ )
+ "</code>\n"
+ )
+ ))
+
+(define (document-interface interface elt-description)
+ (let* ((name (car interface))
+ (desc (cadr interface))
+ (props (caddr interface))
+ (docs (map (lambda (x) (document-property x elt-description))
+ props))
+ )
+
+ (string-append
+ "<hr>"
+ "<h2>Interface: " (symbol->string name) "</h2>\n"
+ desc
+ "<hr>\n<ul>"
+ (apply string-append docs)
+ "</ul>"
+ )
+ ))
+
+;
+; generate HTML, return filename.
+;
+(define (document-element iname description)
+ (display (string-append "Processing " iname " ... ") (current-error-port))
+ (let* ((metah (assoc 'meta description))
+
+ (meta (if (pair? metah)
+ (cdr metah)
+ '((properties . ()) (name . "huh?"))
+ ))
+
+ (name (cdr (assoc 'name meta)))
+ (ifaces (cdr (assoc 'interface-descriptions meta)))
+ (ifacedoc (map (lambda (x) (document-interface x description))
+ (reverse ifaces)))
+ (outname (string-append name ".html"))
+ (out (open-output-file outname))
+ )
+ (display (string-append "Writing " outname " ... \n") (current-error-port))
+ (display
+ (string-append "<title>LilyPond Element " name " </title>"
+ "<h1>" name "</h1>"
+ (apply string-append ifacedoc))
+ out)
+ outname
+ )
+ )
+
+(define (document-elements elts)
+ (let* ((files (map (lambda (x) (document-element (car x) (cdr x)))
+ elts))
+ (outname (string-append "backend.html"))
+ (out (open-output-file outname))
+ (l (map (lambda (x) (string-append
+ "<li><a href=" x ">" x "</a>\n"))
+ files))
+ )
+
+ (display
+ (string-append
+ "<title>LilyPond backend documentation</title>"
+ "<h1>LilyPond backend documentation</h1>"
+ "<ul>"
+ (apply string-append l)
+ "</ul>"
+ )
+ out
+ )
+ ))
+
+; (display (document-interface stem-interface '()))
+; (define b (cdr (assoc 'Dyna all-element-descriptions)))
+;(display b)
+
+;(document-element b)
+
+(document-elements all-element-descriptions)
+
+++ /dev/null
-
-;;;;
-;
-; This file generates documentation for the backend of lilypond.
-;
-;;;;
-
-
-(define (uniqued-alist alist acc)
- (if (null? alist) acc
- (if (assoc (caar alist) acc)
- (uniqued-alist (cdr alist) acc)
- (uniqued-alist (cdr alist) (cons (car alist) acc)
- ))))
-
-;;; TODO
-
-(define (wordwrap string)
- ""
- )
-
-(define (self-evaluating? x)
- (or (number? x) (string? x) (procedure? x) (boolean? x))
- )
-
-
-(define (htmlfy x)
- (let*
- ((x1 (regexp-substitute/global #f ">" x 'pre ">" 'post))
- (x2 (regexp-substitute/global #f "<" x1 'pre "<" 'post))
- )
- x2))
-
-(define (scm->string val)
- (string-append
- (if (self-evaluating? val) "" "'")
- (htmlfy
- (call-with-output-string (lambda (port) (display val port))))
- ))
-
-(define (document-property prop desc)
- (let ((handle (assoc (car prop) desc)))
- (string-append
- "\n<li><code>" (symbol->string (car prop)) "</code> (" (type-name (cadr prop)) ") -- "
- (caddr prop)
- "<br>default value: <code>"
- (if (pair? handle)
- (scm->string (cdr handle))
- "not set"
- )
- "</code>\n"
- )
- ))
-
-(define (document-interface interface elt-description)
- (let* ((name (car interface))
- (desc (cadr interface))
- (props (caddr interface))
- (docs (map (lambda (x) (document-property x elt-description))
- props))
- )
-
- (string-append
- "<hr>"
- "<h2>Interface: " (symbol->string name) "</h2>\n"
- desc
- "<hr>\n<ul>"
- (apply string-append docs)
- "</ul>"
- )
- ))
-
-;
-; generate HTML, return filename.
-;
-(define (document-element iname description)
- (display (string-append "Processing " iname " ... ") (current-error-port))
- (let* ((metah (assoc 'meta description))
-
- (meta (if (pair? metah)
- (cdr metah)
- '((properties . ()) (name . "huh?"))
- ))
-
- (name (cdr (assoc 'name meta)))
- (ifaces (cdr (assoc 'interface-descriptions meta)))
- (ifacedoc (map (lambda (x) (document-interface x description))
- (reverse ifaces)))
- (outname (string-append name ".html"))
- (out (open-output-file outname))
- )
- (display (string-append "Writing " outname " ... \n") (current-error-port))
- (display
- (string-append "<title>LilyPond Element " name " </title>"
- "<h1>" name "</h1>"
- (apply string-append ifacedoc))
- out)
- outname
- )
- )
-
-(define (document-elements elts)
- (let* ((files (map (lambda (x) (document-element (car x) (cdr x)))
- elts))
- (outname (string-append "backend.html"))
- (out (open-output-file outname))
- (l (map (lambda (x) (string-append
- "<li><a href=" x ">" x "</a>\n"))
- files))
- )
-
- (display
- (string-append
- "<title>LilyPond backend documentation</title>"
- "<h1>LilyPond backend documentation</h1>"
- "<ul>"
- (apply string-append l)
- "</ul>"
- )
- out
- )
- ))
-
-; (display (document-interface stem-interface '()))
-; (define b (cdr (assoc 'Dyna all-element-descriptions)))
-;(display b)
-
-;(document-element b)
-
-(document-elements all-element-descriptions)
-
--- /dev/null
+(eval-string (ly-gulp-file "translator-description.scm"))
+
+(define (document-trans-property prop-desc)
+ (string-append "<li><code>" (car prop-desc) "</code>"
+ " (" (type-name (cadr prop-desc)) "):"
+ (caddr prop-desc)
+ )
+ )
+
+(define (document-engraver engraver-name)
+
+ (let*
+ (
+ (eg (assoc (string->symbol engraver-name) engraver-description-alist))
+ (engraver-descr (if (eq? eg #f) '() (cdr eg)))
+ )
+
+
+ (if (eq? eg #f)
+ (string-append "<hr>Engraver " engraver-name ", not documented.\n")
+ (string-append
+ "<hr><h2><code>" (car engraver-descr) "</code></h2>\n"
+ "<h3>Description</h3>"
+ (cadr engraver-descr)
+ "<p>This engraver creates the following elements:\n "
+ (human-listify (map urlfy (caddr engraver-descr)))
+ "<ul>\n"
+ (apply string-append
+ (map (lambda (x) (document-trans-property x))
+ (car (cdddr engraver-descr)))
+ )
+ "</ul>\n"
+ )
+
+ )
+ )
+ )
+
+(define (urlfy x)
+ (string-append "<a href=" x ".html>" x "</a>"))
+
+(define (human-listify l)
+ (cond
+ ((null? l) "none")
+ ((null? (cdr l)) (car l))
+ ((null? (cddr l)) (string-append (car l) " and " (cadr l)))
+ (else (string-append (car l) ", " (human-listify (cdr l))))
+ ))
+
+
+
+
+(define (context-doc-string context-desc)
+ (let*
+ (
+ (nm (cdr (assoc 'type-name context-desc)))
+ (accepts (cdr (assoc 'accepts context-desc)))
+ (consists (append
+ (cdr (assoc 'consists context-desc))
+ (cdr (assoc 'end-consists context-desc))
+ ))
+ )
+
+ (string-append
+ "<h1>" nm "</h1>\n"
+ "accepts:\n"
+ (human-listify (map urlfy accepts))
+ "<hr>\n"
+ (apply string-append
+ (map document-engraver consists)
+ )
+ )
+ )
+ )
+
+;; FIXME element ChordNames overwrites context ChordNames.
+(define (document-context context-desc)
+ (let*
+ (
+ (name (cdr (assoc 'type-name context-desc)))
+ (docstr (context-doc-string context-desc))
+ (outname (string-append name ".html"))
+ (out (open-output-file outname))
+ )
+
+ (display (string-append "Writing " outname " ... \n") (current-error-port))
+ (display
+ (string-append "<title>LilyPond Context " name " </title>"
+ docstr)
+ out
+ )
+ outname)
+ )
+
+
+
+(define (document-paper paper-alist)
+ (let*
+ (
+ (ufiles (map (lambda (x) (document-context x )) paper-alist))
+ (files (sort ufiles string<?))
+ (outname (string-append "translation.html"))
+ (out (open-output-file outname))
+ (l (map (lambda (x) (string-append
+ "<li><a href=" x ">" x "</a>\n"))
+ files))
+ )
+ (write files)
+ (display
+ (string-append
+ "<title>LilyPond music translation documentation</title>"
+ "<h1>LilyPond music translation documentation</h1>"
+ "<ul>"
+ (apply string-append l)
+ "</ul>"
+ )
+ out
+ )
+ )
+ )
+
+; (display (document-engraver 'Stem_engraver))
+
+(document-paper (My_lily_parser::paper_description))
+
+;(display (human-listify '("a" "b" "c")))
;;; ::::::: should generate documentation for score elements from here.
-(define (property-description symbol type? description)
+(define (elt-property-description symbol type? description)
(list symbol type? description))
(define (lily-interface symbol description props)
'general-element-interface
"All elements support this"
(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-relative-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
+ (elt-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")
+ (elt-property-description 'Y-offset-callbacks list? "see <code> X-offset-callbacks</code>")
+ (elt-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.")
+ (elt-property-description 'Y-extent-callback procedure? "see <code> X-extent-callback </code>")
+ (elt-property-description 'font-relative-size integer? "")
+ (elt-property-description 'extra-offset number-pair? "pair of reals (a cons) forcing an extra offset before outputting")
+ (elt-property-description 'interfaces list? "list of symbols indicating the interfaces supported by this object. Is initialized from the <code>meta</code> field.")
+ (elt-property-description 'dependencies list? "list of score-element pointers that indicate who to compute first for certain global passes")
+ (elt-property-description 'no-spacing-rods boolean? "read from elements: boolean that makes Separation_item ignore this item (MOVE ME TO ITEM)")
+ (elt-property-description 'extra-extent-X number-pair? "enlarge in X dimension by this much, measured in staff space")
+ (elt-property-description 'extra-extent-Y number-pair? "see <code>extra-extent-Y</code>")
+ (elt-property-description 'minimum-extent-X number-pair? "minimum size in X dimension, measured in staff space")
+ (elt-property-description 'minimum-extent-Y number-pair? "see <code>minimum-extent-Y</code>")
+ (elt-property-description 'origin ly-input-location? "location in input file of the definition")
+ (elt-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
+ (elt-property-description 'molecule-callback procedure? "Function taking graphical element as argument, returning a Scheme encoded Molecule
This function can be called more than once (for instance once for
computing dimensions, and once for computing the output). Therefore,
'beam-interface
"A beam. "
(list
- (property-description 'y-position number? "position of left edge")
- (property-description 'height number? "dy")
- (property-description 'flag-width-function procedure? "")
- (property-description 'damping integer? "amount of beam slope damping should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams ")
- (property-description 'default-neutral-direction dir? "which
+ (elt-property-description 'y-position number? "position of left edge")
+ (elt-property-description 'height number? "dy")
+ (elt-property-description 'flag-width-function procedure? "")
+ (elt-property-description 'damping integer? "amount of beam slope damping should beam slope be damped? 0: no, 1: yes, 100000: horizontal beams ")
+ (elt-property-description 'default-neutral-direction dir? "which
direction to choose if we're in the middle of the staff ")
- (property-description 'thickness number? "weight of beams, in staffspace")
- (property-description 'space-function procedure? "function of type multiplicity -> real (in staffspace)")
- (property-description 'beamed-stem-shorten number? "")
- (property-description 'height-quants number? "")
- (property-description 'vertical-position-quant-function procedure? "")
- (property-description 'dir-function procedure? "")
- (property-description 'damping number? "damping factor.")
- (property-description 'outer-stem-length-limit number? "catch
+ (elt-property-description 'thickness number? "weight of beams, in staffspace")
+ (elt-property-description 'space-function procedure? "function of type multiplicity -> real (in staffspace)")
+ (elt-property-description 'beamed-stem-shorten number? "")
+ (elt-property-description 'height-quants number? "")
+ (elt-property-description 'vertical-position-quant-function procedure? "")
+ (elt-property-description 'dir-function procedure? "")
+ (elt-property-description 'damping number? "damping factor.")
+ (elt-property-description 'outer-stem-length-limit number? "catch
suspect beam slopes, set slope to zero if outer stem is lengthened
more than this (in staffspace)")
- (property-description 'slope-limit number? "set slope to zero if slope is running away steeper than this.")
+ (elt-property-description 'slope-limit number? "set slope to zero if slope is running away steeper than this.")
)
))
'clef-interface
"A clef sign"
(list
- (property-description 'non-default boolean? "not set because of existence of a bar?")
- (property-description 'change boolean? "is this a change clef (smaller size)?")
- (property-description 'glyph string? "a string determining what glyph is typeset")
+ (elt-property-description 'non-default boolean? "not set because of existence of a bar?")
+ (elt-property-description 'change boolean? "is this a change clef (smaller size)?")
+ (elt-property-description 'glyph string? "a string determining what glyph is typeset")
))
)
'axis-group-interface
"a group of coupled elements"
(list
- (property-description 'axes list? "list of axis (number) in which this group works")
+ (elt-property-description 'axes list? "list of axis (number) in which this group works")
)))
(define note-column-interface
'note-column-interface
"Stem and noteheads combined"
(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 in collisions.")
+ (elt-property-description 'horizontal-shift integer? "integer that identifies ranking of note-column for horizontal shifting.")
+ (elt-property-description 'force-hshift number? "amount of collision_note_width that overides automatic collision settings.")
+ (elt-property-description 'merge-differently-dotted boolean? "merge black noteheads with differing dot count in collisions.")
))
)
'stem-interface
"A stem"
(list
- (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
+ (elt-property-description 'thickness number? "thickness, measured in stafflinethickness")
+ (elt-property-description 'beamed-lengths list? "list of stem lengths given beam multiplicity ")
+ (elt-property-description 'beamed-minimum-lengths list? "list of minimum stem lengths given beam multiplicity")
+ (elt-property-description 'stem-centered boolean? "Center stems on note heads. Useful for mensural notation")
+ (elt-property-description 'lengths list? "Stem length given multiplicity of flag")
+ (elt-property-description 'beam ly-element? "pointer to the beam, if applicable")
+ (elt-property-description 'stem-shorten list? "shorten stems in forced directions given flag multiplicity")
+ (elt-property-description 'duration-log integer? "log of the duration, ie. 0=whole note, 1 = half note, etc.")
+ (elt-property-description 'beaming number-pair? "number of beams extending to left and right")
+ (elt-property-description 'default-neutral-direction dir? "Where to go if we're in the middle of the staff")
+ (elt-property-description 'stem-end-position number? "Where does the stem end (the end is opposite to the support-head")
+ (elt-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 'dir-forced boolean? "set if direction has been forced; read by Beam.")
+ (elt-property-description 'heads list? "list of note heads")
+ (elt-property-description 'direction dir? "up or down")
+ (elt-property-description 'stem-length number? "length of stem")
+ (elt-property-description 'style string? "") ; symbol!?
+ (elt-property-description 'flag-style string? "") ; symbol!?
+ (elt-property-description 'dir-forced boolean? "set if direction has been forced; read by Beam.")
)))
'slur-interface
"A slur"
(list
- (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 'direction dir? "up or down?")
- (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.")
+ (elt-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.")
+ (elt-property-description 'details list? "alist containing contaning a few magic constants.")
+ (elt-property-description 'attachment pair? "cons of symbols, '(LEFT-TYPE . RIGHT-TYPE), where both types may be alongside-stem, stem, head or loose-end")
+ (elt-property-description 'direction dir? "up or down?")
+ (elt-property-description 'attachment-offset pair? "cons of offsets, '(LEFT-offset . RIGHT-offset). This offset is added to the attachments to prevent ugly slurs.")
+ (elt-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.")
+ (elt-property-description 'y-free number? "minimal vertical gap between slur and noteheads or stems")
+ (elt-property-description 'control-points list? "[internal] control points of bezier curve")
+ (elt-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.")
+ (elt-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.")
+ (elt-property-description 'thickness list? "The thickness[stafflinethickness] of slur in the centre.")
+ (elt-property-description 'dashed number? "[FIXME: use dash-period/dash length; see text-spanner] number representing the length of the dashes.")
)
)
'side-position-interface
"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)")
- (property-description 'padding number? "add this much extra space between victim and support")
- (property-description 'self-alignment-X number? "real number: -1 =
+ (elt-property-description 'side-support list? "the support, a list of score elements")
+ (elt-property-description 'direction-source ly-element? "in case side-relative-direction is set, which element to get the direction from ")
+ (elt-property-description 'direction dir? "where to put the victim object (left or right?)")
+ (elt-property-description 'side-relative-direction dir? "if set: get the direction from a different object, and multiply by this.")
+ (elt-property-description 'minimum-space number? "minimum distance that the victim should move (after padding)")
+ (elt-property-description 'padding number? "add this much extra space between victim and support")
+ (elt-property-description 'self-alignment-X number? "real number: -1 =
left aligned, 0 = center, 1 right-aligned in X direction. <p> Set to
an element pointer, if you want that element to be the center. In
this case, the center element should have this object as a reference
point.
")
- (property-description 'self-alignment-Y number? "like self-alignment-X but for Y axis")
+ (elt-property-description 'self-alignment-Y number? "like self-alignment-X but for Y axis")
)
))
'accidentals-interface
"Accidentals"
(list
- (property-description 'left-padding number? "space left of accs")
- (property-description 'right-padding number? "space right of accs")
+ (elt-property-description 'left-padding number? "space left of accs")
+ (elt-property-description 'right-padding number? "space right of accs")
)
))
enters the Score_element dependency calculation from this single
Line_of_score object."
(list
- (property-description 'between-system-string string? "string
+ (elt-property-description 'between-system-string string? "string
to dump between two systems. Useful for forcing pagebreaks")
- (property-description 'spacing-procedure procedure? "procedure taking
+ (elt-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?
+ (elt-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?
+ (elt-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")
+ (elt-property-description 'all-elements list? "list of all score elements in this line. Needed for protecting elements from GC.")
+ (elt-property-description 'columns list? "list of all paper columns")
)))
(define note-head-interface
'note-head-interface
"Note head"
(list
- (property-description 'style symbol? "symbol that sets note head style")
+ (elt-property-description 'style symbol? "symbol that sets note head style")
)
))
'note-name-interface
"Note name"
(list
- (property-description 'style symbol? "symbol that sets note name style")
+ (elt-property-description 'style symbol? "symbol that sets note name style")
)
))
'rhythmic-head-interface
"Note head or rest"
(list
- (property-description 'dot ly-element? "reference to Dots object.")
- (property-description 'stem ly-element? "pointer to Stem object")
- (property-description 'duration-log integer? "2-log of the notehead duration")
+ (elt-property-description 'dot ly-element? "reference to Dots object.")
+ (elt-property-description 'stem ly-element? "pointer to Stem object")
+ (elt-property-description 'duration-log integer? "2-log of the notehead duration")
)))
(define rest-interface
'rest-interface
"a rest"
(list
- (property-description 'style string? "string specifying glyph style"))))
+ (elt-property-description 'style string? "string specifying glyph style"))))
(define tuplet-bracket-interface
(lily-interface
'tuplet-bracket-interface
"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? "amount of ascension")
- (property-description 'thick number? "thickness, in stafflinethickness")
+ (elt-property-description 'beams list? "list of beam ptrs.")
+ (elt-property-description 'columns list? " list of note-columns.")
+ (elt-property-description 'number-gap number? "")
+ (elt-property-description 'delta-y number? "amount of ascension")
+ (elt-property-description 'thick number? "thickness, in stafflinethickness")
)
))
'align-interface
" Order elements top to bottom/left to right/right to left etc."
(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: around center of width, 1: right side")
- (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
+ (elt-property-description 'stacking-dir dir? "stack contents of elements in which direction ?")
+ (elt-property-description 'align-dir dir? "Which side to align? -1: left side, 0: around center of width, 1: right side")
+ (elt-property-description 'threshold number-pair? "(cons MIN MAX), where MIN and MAX are dimensions in staffspace")
+ (elt-property-description 'alignment-done boolean? "boolean to administrate whether we've done the alignment already (to ensure that the process is done only once)")
+ (elt-property-description 'center-element ly-element? "element which will be at the
center of the group after aligning (when using
Align_interface::center_on_element). ")
- (property-description 'elements list? "to be aligned elements ")
- (property-description 'axes list? "list of axis numbers. Should contain only one number.")
+ (elt-property-description 'elements list? "to be aligned elements ")
+ (elt-property-description 'axes list? "list of axis numbers. Should contain only one number.")
)))
(define aligned-interface
'aligned-interface
"read by align-interface"
(list
- (property-description 'minimum-space number-pair? "(cons LEFT RIGHT)")
- (property-description 'extra-space number-pair? "(cons LEFT RIGHT)")
+ (elt-property-description 'minimum-space number-pair? "(cons LEFT RIGHT)")
+ (elt-property-description 'extra-space number-pair? "(cons LEFT RIGHT)")
)))
(define break-aligned-interface
'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? "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.)")
+ (elt-property-description 'break-align-symbol symbol? "the index in the spacing table (symbol) of the to be aligned item.")
+ (elt-property-description 'visibility-lambda procedure? "a function that takes the break direction and returns a cons of booleans containing (TRANSPARENT . EMPTY)")
+ (elt-property-description 'breakable boolean? "boolean indicating if this is a breakable item (clef, barline, key sig, etc.)")
)))
(define chord-name-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")
+ (elt-property-description 'pitches list? "list of musical-pitch")
+ (elt-property-description 'inversion list? " musical-pitch, optional")
+ (elt-property-description 'bass list? " musical-pitch, optional")
)))
(define time-signature-interface
'time-signature-interface
"A time signature, in different styles"
(list
- (property-description 'fraction number-pair? "")
- (property-description 'style string? "")
+ (elt-property-description 'fraction number-pair? "")
+ (elt-property-description 'style string? "")
)))
(define bar-line-interface
'bar-line-interface
"Bar line"
(list
- (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? "function taking glyph and break-direction, returning the glyph at a line break")
+ (elt-property-description 'barsize-procedure procedure? "how to compute the size of a bar line")
+ (elt-property-description 'kern number? "space after a thick line")
+ (elt-property-description 'thin-kern number? "space after a hair-line")
+ (elt-property-description 'hair-thickness number? "thickness, measured in stafflinethickness")
+ (elt-property-description 'thick-thickness number? "thickness, measured in stafflinethickness")
+ (elt-property-description 'glyph string? "what kind barline? A concatenation of |, : and .")
+ (elt-property-description 'bar-size number? "")
+ (elt-property-description 'break-glyph-function procedure? "function taking glyph and break-direction, returning the glyph at a line break")
)))
'hairpin-interface
"hairpin crescendo"
(list
- (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 ")
+ (elt-property-description 'grow-direction dir? "crescendo or decrescendo?")
+ (elt-property-description 'thickness number? "thickness, measured in stafflinethickness")
+ (elt-property-description 'height number? "height, measured in staffspace in ")
)))
(define arpeggio-interface
'arpeggio-interface
"arpeggio"
(list
- (property-description 'stems list? "list of stem objects, corresponding to the notes that the arpeggio has to be before.")
+ (elt-property-description 'stems list? "list of stem objects, corresponding to the notes that the arpeggio has to be before.")
)
)
)
'note-collision-interface
"note collision"
(list
- (property-description 'note-width 'number? "unit for horizontal translation, measured in staff-space.")
+ (elt-property-description 'note-width 'number? "unit for horizontal translation, measured in staff-space.")
) ) )
[TODO: add to glossary]"
(list
- (property-description 'style string? "a string determining what glyph is
+ (elt-property-description 'style string? "a string determining what glyph is
typeset. Current choices are mensural,
hufnagel, vaticana and medicaea [TODO: should use symbol] ")
))
"The dots to go with a notehead/rest. A separate interface, since they
are a party in collision resolution."
(list
- (property-description 'direction dir? "Direction to handle staff-line collisions in.")
- (property-description 'dot-count integer? "number of dots")
+ (elt-property-description 'direction dir? "Direction to handle staff-line collisions in.")
+ (elt-property-description 'dot-count integer? "number of dots")
)))
(define font-interface
'font-interface
"Any symbol that is typeset through fixed sets of glyphs (ie. fonts)"
(list
- (property-description 'font-style symbol? "a precooked set of font definitions, eg. finger volta timesig mark script large Large dynamic")
- (property-description 'font-series symbol? "partial font definition: medium, bold")
- (property-description 'font-shape symbol? "partial font definition: upright or italic")
- (property-description 'font-family symbol? "partial font definition: music roman braces dynamic math ...")
- (property-description 'font-name symbol? "partial font definition: base name of font file FIXME: should override other partials")
- (property-description 'font-point-size number? "partial font definition: exact font size in points FIXME: should override font-relative-size")
- (property-description 'font-relative-size number? "partial font definition: the relative size, 0 is style-sheet's normal size, -1 is smaller, +1 is bigger")
+ (elt-property-description 'font-style symbol? "a precooked set of font definitions, eg. finger volta timesig mark script large Large dynamic")
+ (elt-property-description 'font-series symbol? "partial font definition: medium, bold")
+ (elt-property-description 'font-shape symbol? "partial font definition: upright or italic")
+ (elt-property-description 'font-family symbol? "partial font definition: music roman braces dynamic math ...")
+ (elt-property-description 'font-name symbol? "partial font definition: base name of font file FIXME: should override other partials")
+ (elt-property-description 'font-point-size number? "partial font definition: exact font size in points FIXME: should override font-relative-size")
+ (elt-property-description 'font-relative-size number? "partial font definition: the relative size, 0 is style-sheet's normal size, -1 is smaller, +1 is bigger")
)))
'text-interface
"A scheme markup text"
(list
- (property-description 'text (lambda (x) (or (string? x) (list? x))) "
+ (elt-property-description 'text (lambda (x) (or (string? x) (list? x))) "
Scheme markup text. It is defined as follows:
<p>
</dl>
" )
;; Should move this somewhere else?
- (property-description 'align number? "the alignment of the text, 0 is horizontal, 1 is vertical")
- (property-description 'lookup symbol? "lookup method: 'value for plain text, 'name for character-name")
- (property-description 'raise number? "height for text to be raised (a negative value lowers the text")
- (property-description 'kern number? "amount of extra white space to add before text. This is `relative'(?) to the current alignment.")
- (property-description 'magnify number? "the magnification factor. FIXME: doesn't work for feta fonts")
+ (elt-property-description 'align number? "the alignment of the text, 0 is horizontal, 1 is vertical")
+ (elt-property-description 'lookup symbol? "lookup method: 'value for plain text, 'name for character-name")
+ (elt-property-description 'raise number? "height for text to be raised (a negative value lowers the text")
+ (elt-property-description 'kern number? "amount of extra white space to add before text. This is `relative'(?) to the current alignment.")
+ (elt-property-description 'magnify number? "the magnification factor. FIXME: doesn't work for feta fonts")
)))
(define dot-column-interface
'grace-alignment-interface
"put grace notes in line"
(list
- (property-description 'horizontal-space number? "amount of space to add after a note (in staff-space)")
+ (elt-property-description 'horizontal-space number? "amount of space to add after a note (in staff-space)")
)
))
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.")
+ (elt-property-description 'items-worth-living list? "list of interesting items. If empty in a particular system, clear that system.")
)))
size of the gap between syllables."
(list
- (property-description 'thickness number? "thickness of line (in stafflinethickness)")
- (property-description 'height number? "vertical offset (in staffspace)")
+ (elt-property-description 'thickness number? "thickness of line (in stafflinethickness)")
+ (elt-property-description 'height number? "vertical offset (in staffspace)")
- (property-description 'minimum-length number? "try to make the hyphens at least this long. Also works as a scaling parameter for the length")
- (property-description 'word-space number? "elongate left by this much (FIXME: cumbersome semantics)")
+ (elt-property-description 'minimum-length number? "try to make the hyphens at least this long. Also works as a scaling parameter for the length")
+ (elt-property-description 'word-space number? "elongate left by this much (FIXME: cumbersome semantics)")
)))
(define key-signature-interface
'key-signature-interface
"A group of accidentals."
(list
- (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")
+ (elt-property-description 'c0-position integer? "integer indicating the position of central C")
+ (elt-property-description 'old-accidentals list? "list of (pitch, accidental) pairs")
+ (elt-property-description 'new-accidentals list? "list of (pitch, accidental) pairs")
)))
(define lyric-extender-interface
"The extender is a simple line at the baseline of the lyric
that helps show the length of a melissima (tied/slurred note)."
(list
- (property-description 'word-space number? "")
- (property-description 'height number? "in stafflinethickness")
- (property-description 'right-trim-amount number? "")
+ (elt-property-description 'word-space number? "")
+ (elt-property-description 'height number? "in stafflinethickness")
+ (elt-property-description 'right-trim-amount number? "")
)))
'lyric-syllable-interface
"a single piece of lyrics"
(list
- (property-description 'word-space number? "")
+ (elt-property-description 'word-space number? "")
)))
(define multi-measure-rest-interface
(lily-interface
'multi-measure-rest-interface
- "A rest that spans a whole number of measures."
+ "A rest that spans a whole number of measures. For typesetting the
+numbers, fields from font-interface may be used.
+"
(list
- (property-description 'columns list? "list of paper-columns")
- (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.")
+ (elt-property-description 'columns list? "list of paper-columns")
+ (elt-property-description 'expand-limit integer? "maximum number of measures expanded in church rests")
+ (elt-property-description 'minimum-width number? "minimum-width of rest symbol, in staffspace")
+ (elt-property-description 'padding number? "padding between number and rest. Measured in staffspace.")
)))
(define paper-column-interface
'paper-column-interface
""
(list
- (property-description 'column-space-strength number? "relative strength of space following breakable columns (eg. prefatory matter)")
- (property-description 'before-musical-spacing-factor number?
+ (elt-property-description 'column-space-strength number? "relative strength of space following breakable columns (eg. prefatory matter)")
+ (elt-property-description 'before-musical-spacing-factor number?
"space before musical columns (eg. taken by accidentals) get this much
stretched when they follow a musical column, in absence of grace
notes. 0.0 means no extra space (accidentals are ignored)")
- (property-description 'stem-spacing-correction number? "optical correction amount.")
- (property-description 'before-grace-spacing-factor number? " stretch space this much if there are grace notes before the column")
- (property-description 'when moment? "when does this column happen?")
- (property-description 'bounded-by-me list? "list of spanners that have this
+ (elt-property-description 'stem-spacing-correction number? "optical correction amount.")
+ (elt-property-description 'before-grace-spacing-factor number? " stretch space this much if there are grace notes before the column")
+ (elt-property-description 'when moment? "when does this column happen?")
+ (elt-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 number-pair? "pair of distances")
- (property-description 'stretch-distance number-pair? "pair of distances")
+ (elt-property-description 'dir-list list? "list of stem directions")
+ (elt-property-description 'shortest-playing-duration moment? "duration of the shortest playing in that column.")
+ (elt-property-description 'shortest-starter-duration moment? "duration of the shortest notes that starts exactly in this column.")
+ (elt-property-description 'contains-grace boolean? "Used to widen entries for grace notes.")
+ (elt-property-description 'extra-space number-pair? "pair of distances")
+ (elt-property-description 'stretch-distance number-pair? "pair of distances")
)))
(define 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, needed for optical spacing correction.")
+ (elt-property-description 'minimum-distances list? "list of rods (ie. (OBJ . DIST) pairs)")
+ (elt-property-description 'ideal-distances list? "(OBJ . (DIST . STRENGTH)) pairs")
+ (elt-property-description 'dir-list list? "list of stem directions, needed for optical spacing correction.")
)))
(define rest-collision-interface
"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,
+ (elt-property-description 'maximum-rest-count integer? "kill off rests so we don't more than this number left.")
+ (elt-property-description 'minimum-distance number? "minimum distance between notes and rests.")
+ (elt-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")
'script-interface
""
(list
- (property-description 'script-priority number? "A sorting key that determines in what order a script is within a stack of scripts")
+ (elt-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
'spacing-spanner-interface
""
(list
- (property-description 'maximum-duration-for-spacing moment? "space as if a duration of this type is available in this measure.")
- (property-description 'arithmetic-basicspace number? "The space taken by a note is determined by the formula
+ (elt-property-description 'maximum-duration-for-spacing moment? "space as if a duration of this type is available in this measure.")
+ (elt-property-description 'arithmetic-basicspace number? "The space taken by a note is determined by the formula
SPACE = arithmetic_multiplier * ( C + log2 (TIME) ))
arithmetic_basicspace = 4.;
")
- (property-description 'arithmetic-multiplier number? "see arithmetic-basicspace")
+ (elt-property-description 'arithmetic-multiplier number? "see arithmetic-basicspace")
)))
"This spanner draws the lines of a staff. The middle line is
position 0."
(list
- (property-description 'staff-space number? "Amount of line leading relative to global staffspace")
- (property-description 'line-count integer? "Number of staff lines")
+ (elt-property-description 'staff-space number? "Amount of line leading relative to global staffspace")
+ (elt-property-description 'line-count integer? "Number of staff lines")
)))
(define stem-tremolo-interface
'stem-tremolo-interface
""
(list
- (property-description 'stem ly-element? "pointer to the stem object.")
- (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")
+ (elt-property-description 'stem ly-element? "pointer to the stem object.")
+ (elt-property-description 'beam-width number? "width of the tremolo sign")
+ (elt-property-description 'beam-thickness number? "thickness, measured in staffspace")
+ (elt-property-description 'beam-space-function procedure? "function returning space given multiplicity")
)))
(define separation-item-interface
since these usually are in a different X_group
"
(list
- (property-description 'elements list? " -- list of items.")
+ (elt-property-description 'elements list? " -- list of items.")
)))
(define sustain-pedal-interface
'system-start-delimiter
""
(list
- (property-description 'collapse-height number? "")
- (property-description 'thickness number? "thickness, measured in stafflinethickness")
+ (elt-property-description 'collapse-height number? "")
+ (elt-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? "")
- (property-description 'glyph symbol? "bar-line, bracket or brace")
+ (elt-property-description 'arch-height number? "")
+ (elt-property-description 'arch-angle number? "")
+ (elt-property-description 'arch-thick number? "")
+ (elt-property-description 'arch-width number? "")
+ (elt-property-description 'bracket-thick number? "")
+ (elt-property-description 'bracket-width number? "")
+ (elt-property-description 'glyph symbol? "bar-line, bracket or brace")
)))
(define text-spanner-interface
'text-spanner-interface
"generic text spanner"
(list
- (property-description 'dash-period number? "the length of one dash + white space")
- (property-description 'dash-length number? "the length of a dash")
- (property-description 'line-thickness number? "the thickness[stafflinethickness] of the line")
- (property-description 'edge-height pair? "a cons that specifies the heights of the vertical egdes '(LEFT-height . RIGHT-height)")
- (property-description 'edge-text pair? "a cons that specifies the texts to be set at the edges '(LEFT-text . RIGHT-text)")
- (property-description 'type string? "one of: line, dashed-line or dotted-line") ; SYMBOL!!?
+ (elt-property-description 'dash-period number? "the length of one dash + white space")
+ (elt-property-description 'dash-length number? "the length of a dash")
+ (elt-property-description 'line-thickness number? "the thickness[stafflinethickness] of the line")
+ (elt-property-description 'edge-height pair? "a cons that specifies the heights of the vertical egdes '(LEFT-height . RIGHT-height)")
+ (elt-property-description 'edge-text pair? "a cons that specifies the texts to be set at the edges '(LEFT-text . RIGHT-text)")
+ (elt-property-description 'type string? "one of: line, dashed-line or dotted-line") ; SYMBOL!!?
)
))
'tie-interface
"A tie connecting two noteheads."
(list
- (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? "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")
+ (elt-property-description 'staffline-clearance number? "don't get closer than this to stafflines.")
+ (elt-property-description 'control-points list? "List of 4 offsets (number-pairs) controlling the tie shape")
+ (elt-property-description 'heads pair? "pair of element pointers, pointing to the two heads of the tie. ")
+ (elt-property-description 'details list? "alist of parameters for the curve shape")
+ (elt-property-description 'thickness number? "thickness, measured in stafflinethickness")
+ (elt-property-description 'x-gap number? "horizontal gap between notehead and tie")
+ (elt-property-description 'direction dir? "up or down?")
+ (elt-property-description 'minimum-length number? "minimum length in staffspace")
)))
'tie-column-interface
"that sets tie directions in a tied chord"
(list
+ (elt-property-description 'direction dir? "Forced direction for all ties")
)))
(define volta-bracket-interface
'volta-bracket-interface
"Volta bracket with number"
(list
- (property-description 'bars list? "list of barline ptrs.")
- (property-description 'thickness number? "thickness, measured in stafflinethickness")
- (property-description 'height number? "in staffspace ")
+ (elt-property-description 'bars list? "list of barline ptrs.")
+ (elt-property-description 'thickness number? "thickness, measured in stafflinethickness")
+ (elt-property-description 'height number? "in staffspace ")
)))
(define span-bar-interface
(eval-string (ly-gulp-file "generic-property.scm"))
(eval-string (ly-gulp-file "basic-properties.scm"))
(eval-string (ly-gulp-file "chord-names.scm"))
- (eval-string (ly-gulp-file "element-descriptions.scm"))
+ (eval-string (ly-gulp-file "element-descriptions.scm"))
)
--- /dev/null
+
+(define (engraver-description name description created-elts properties)
+ (list name description created-elts properties)
+ )
+
+(define (translator-property-description symbol type? description)
+ (list symbol type? description)
+ )
+
+(define engraver-description-alist
+ (list
+ (cons
+ 'Stem_engraver
+ (engraver-description
+ "Stem_engraver"
+ "Create stems and single-stem tremolos"
+ '(Stem StemTremolo)
+ (list
+ (translator-property-description 'tremoloFlags integer? "")
+ (translator-property-description 'stemLeftBeamCount integer? "")
+ (translator-property-description 'stemRightBeamCount integer? "")
+ )))
+
+ (cons
+ 'Hyphen_engraver
+ (engraver-description
+ "Hyphen_engraver"
+ "Create lyric hyphens"
+ '(LyricHyphen)
+ (list
+ )))
+
+ (cons
+ 'Extender_engraver
+ (engraver-description
+ "Extender_engraver"
+ "Create lyric extenders"
+ '(LyricExtender)
+ (list
+ )))
+
+
+ (cons
+ 'Separating_line_group_engraver
+ (engraver-description
+ "Separating_line_group_engraver"
+ "Objects that generate rods and springs for the spacing problem."
+ '(SeparationItem SeparatingGroupSpanner)
+ (list
+ )))
+
+ (cons
+ 'Axis_group_engraver
+ (engraver-description
+ "Axis_group_engraver"
+ "Group all objects created in this context in a VerticalAxisGroup spanner."
+ '(VerticalAxisGroup)
+ (list
+ (translator-property-description 'CONTEXTNAMEVerticalExtent number-pair? "hard coded vertical extent [fixme, naming]")
+ (translator-property-description 'CONTEXTNAMEMinimumVerticalExtent number-pair? "minimum vertical extent [fixme, naming]")
+ (translator-property-description 'CONTEXTNAExtraVerticalExtent number-pair? "extra vertical extent [fixme, naming]")
+ )))
+
+ (cons
+ 'Hara_kiri_engraver
+ (engraver-description
+ "Hara_kiri_engraver"
+ "Like Axis_group_engraver, but make a hara kiri spanner, and add
+interesting items (ie. note heads, lyric syllables and normal rests)"
+ '(HaraKiriVerticalGroup)
+ '()
+ ))
+
+
+ (cons
+ 'Local_key_engraver
+ (engraver-description
+ "Local_key_engraver"
+ "Make accidentals. Catches note heads, ties and notices key-change
+ events. Due to interaction with ties (which don't come together
+ with note heads), this needs to be in a context higher than Tie_engraver.
+ (FIXME)."
+ '(Accidentals)
+ (list
+ (translator-property-description 'localKeySignature list? "the key signature at this point in the measure")
+ (translator-property-description 'forgetAccidentals boolean? "do
+not set localKeySignature when a note alterated differently from
+localKeySignature is found.
+<p>
+Causes accidentals to be printed at every note instead of
+remembered for the duration of a measure.
+")
+ (translator-property-description 'noResetKey boolean? "Do not
+reset local key to the value of keySignature at the start of a measure,
+as determined by measurePosition.<p>
+ Do not reset the key at the start of a measure. Accidentals will
+ be printed only once and are in effect until overridden, possibly
+ many measures later.
+")
+
+ )))
+
+
+ (cons
+ 'Volta_engraver
+ (engraver-description
+ "Volta_engraver"
+ "Make volta brackets"
+ '(VoltaBracket)
+ (list
+ (translator-property-description 'repeatCommands list?
+"This property is read to find any command of the form (volta . X), where X is a string or #f")
+ (translator-property-description 'voltaSpannerDuration moment?
+"maximum duration of the volta bracket.<p>
+
+ Set to a duration to control the size of the brackets printed by
+@code{\alternative}. It specifies the number of whole notes duration
+to use for the brackets. This can be used to shrink the length of
+brackets in the situation where one alternative is very large. It may
+have odd effects if the specified duration is longer than the music
+given in an @code{\alternative}.
+")
+ )
+ ))
+
+ (cons
+ 'Clef_engraver
+ (engraver-description
+ "Clef_engraver"
+ "Determine and set reference point for pitches"
+ '(Clef OctavateEight)
+ (list
+ (translator-property-description 'supportedClefTypes
+ list? "Clef settings supported. The value is an association list contain entries (NAME . (GLYPH . POSITION)), where NAME is the clef name (alto, baritone, etc.), GLYPH the glyph name, POSITION an integer where the center symbol should go.")
+ (translator-property-description 'clefPosition number? " where the center of the symbol should go")
+ (translator-property-description 'clefGlyph string? "name of the symbol within the music font")
+ (translator-property-description 'centralCPosition number? "place of the central C. ")
+ (translator-property-description 'defaultClef string? "generate this clef at the very start of this staff. If not set, don't generate a clef")
+ (translator-property-description 'explicitClefVisibility procedure? "visibility-lambda function for clefs entered as \clef.")
+ (translator-property-description 'clefPitches list? "alist mapping GLYPHNAME to the position of the central C for that symbol")
+
+ )))
+
+
+ ))
#TODO:
-# UNDEF -> None
-
-
+# - UNDEF -> None
+# - rewrite this to be like etf2ly.py
program_name = 'abc2ly'
version = '@TOPLEVEL_VERSION@'
def print_version ():
print r"""abc2ly (GNU lilypond) %s""" % version
-
-
(options, files) = getopt.getopt (sys.argv[1:], 'vo:h', ['help','version', 'output='])
out_filename = ''
projects / lilypond.git / commitdiff