+.3.35.hwn1
+===========
+
+* textEmptyDimension changed into textNonEmpty, default: off,
+ie. texts don't occupy space.
+
+* Use STL map for Lookup::lookup_p_tab_p_
+
+* Abstracted Axis_group_element into Axis_group_interface, and removed
+Axis_group_element. This eliminates some multiple inheritance in the
+backend
+
+1.3.35.jcn1
+===========
+
+* Added minimum-space property to Side_position_interface. Used in
+ positioning of Volta_spanner: voltaMinimumSpace.
+
+* Fixed and cleaned-up volta-spanner.
+
+* Moved directional-element.cc -> directional-element-interface.cc
+
+* Renamed all `process_requests' to `process_music', which fixes
+ midi performance.
+
+* Fixed dimensions (more x-y interchanges) of brace, bracket and
+ volta-spanner.
+
+* Bit half-baken fix in to get similar vertical placement of orphaned vs.
+ line-spanned dynamic elements.
+
+* Added property bracketCollapseHeight: the minimal size of a staff bracket
+ that will be typeset. Smaller brackets will not be displayed. This
+ fixes the (in 1.3.x reintroduced) funny duck-beak-bracket-bug (sorry).
+
+* Removed some dissonant chords from Coriolan
+
1.3.35
======
% line breaks and special bars.
c' d e f |
-\repeat semi 2 { g a b c }
+\repeat "volta" 2 { g a b c }
\alternative { { c b a g a g a g} { f e d c } }
-\repeat semi 2 { g a b c }
+\repeat "volta" 2 { g a b c }
\alternative { { c b a g \break a g a g} { f e d c } }
-c, d e f |
-\repeat semi 2 { g a b c }
+c' d e f |
+\repeat "volta" 2 { g a b c }
\alternative { { c b a g \break a g a g \break a b a b } { f e d c } }
-c, d e f |
-\repeat semi 2 { g a b c }
+c' d e f |
+\repeat "volta" 2 { g a b c }
\alternative { { c b a g } { f e d c \break a g a g} }
-c, d e f |
-\repeat semi 2 { g a b c }
+c' d e f |
+\repeat "volta" 2 { g a b c }
\alternative { { c b a g a g a g} { f e d c \bar "|.";} }
#include "interval.hh"
#include "direction.hh"
#include "debug.hh"
-#include "hash-table-iter.hh"
#include "dimension-cache.hh"
+#include "axis-group-interface.hh"
/*
This callback is set in the children of the align element. It does
Align_element::add_element (Score_element* s)
{
s->add_offset_callback (alignment_callback, axis ());
- Axis_group_element::add_element (s);
+ axis_group (this).add_element (s);
}
/*
Array<Interval> dims;
Link_array<Score_element> elems;
- Link_array<Score_element> all_elts (elem_l_arr ());
+ Link_array<Score_element> all_elts
+ = Group_interface__extract_elements (this, (Score_element*) 0, "elements");
for (int i=0; i < all_elts.size(); i++)
{
Interval y = all_elts[i]->extent(a) + all_elts[i]->relative_coordinate (this, a);
void
Align_element::set_axis (Axis a)
{
- set_axes (a, a);
+ axis_group (this).set_axes (a, a);
}
-
-
-
-
-
+Align_element::Align_element ()
+{
+ axis_group (this).set_interface ();
+}
#include "axis-group-engraver.hh"
#include "axis-group-spanner.hh"
#include "paper-column.hh"
+#include "axis-group-interface.hh"
Axis_group_engraver::Axis_group_engraver ()
{
Axis_group_engraver::do_creation_processing ()
{
staffline_p_ = get_spanner_p ();
- staffline_p_->set_axes (Y_AXIS, Y_AXIS);
+ axis_group (staffline_p_).set_axes (Y_AXIS, Y_AXIS);
staffline_p_->set_bound(LEFT,get_staff_info().command_pcol_l ());
announce_element (Score_element_info (staffline_p_, 0));
}
/* UGH UGH UGH */
for (int i=0; i < elts_.size (); i++)
{
- if (!elts_[i]->parent_l (Y_AXIS))
- staffline_p_->add_element (elts_[i]);
- else
- if (
- // elts_[i]->get_elt_property ("Axis_group_element::add_extra_element") == SCM_UNDEFINED &&
- ! dynamic_cast<Axis_group_element*> (elts_[i]->parent_l (Y_AXIS)))
-
- {
- staffline_p_->add_element (elts_[i]);
- }
+ Score_element *par = elts_[i]->parent_l (Y_AXIS);
+ if (!par || !axis_group (par).has_interface_b ())
+ axis_group (staffline_p_).add_element (elts_[i]);
}
elts_.clear ();
}
--- /dev/null
+/*
+ axis-group-interface.cc -- implement Axis_group_interface
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ */
+
+#include "axis-group-interface.hh"
+#include "score-element.hh"
+#include "dimension-cache.hh"
+
+Axis_group_interface::Axis_group_interface (Score_element*s)
+ : Group_interface (s)
+{
+ elt_l_ = s;
+}
+
+Axis_group_interface
+axis_group (Score_element*s)
+{
+ return Axis_group_interface (s);
+}
+
+void
+Axis_group_interface::add_element (Score_element *e)
+{
+ elt_l_->used_b_ = true;
+ e->used_b_ = true;
+
+ for (SCM ax = elt_l_->get_elt_property ("axes"); ax != SCM_EOL ; ax = gh_cdr (ax))
+ {
+ Axis a = (Axis) gh_scm2int (gh_car (ax));
+
+ if (!e->parent_l (a))
+ e->set_parent (elt_l_, a);
+ }
+
+ Group_interface::add_element (e);
+
+ elt_l_->add_dependency (e);
+}
+
+
+bool
+Axis_group_interface::axis_b (Axis a )const
+{
+ return elt_l_->dim_cache_[a]->extent_callback_l_ == group_extent_callback;
+}
+
+Interval
+Axis_group_interface::group_extent_callback (Dimension_cache const *c)
+{
+ Axis a = c->axis ();
+ Score_element * me = c->element_l ();
+
+ Interval r;
+ for (SCM s = me->get_elt_property ("elements"); gh_pair_p (s); s = gh_cdr (s))
+ {
+ SCM e=gh_car (s);
+ Score_element * se = SMOB_TO_TYPE (Score_element, e);
+
+ Interval dims = se->extent (a);
+ if (!dims.empty_b ())
+ r.unite (dims + se->relative_coordinate (me, a));
+ }
+
+ return r;
+}
+
+
+void
+Axis_group_interface::set_interface ()
+{
+ if (!has_interface_b ())
+ {
+ elt_l_->set_elt_property ("elements", SCM_EOL);
+ elt_l_->set_elt_property ("transparent", SCM_BOOL_T);
+ elt_l_->set_elt_property ("axes" , SCM_EOL);
+ group (elt_l_, "interfaces").add_thing (ly_symbol2scm ("Axis_group"));
+ }
+}
+
+void
+Axis_group_interface::set_axes (Axis a1, Axis a2)
+{
+ // set_interface () ?
+
+ SCM ax = gh_cons (gh_int2scm (a1), SCM_EOL);
+ if (a1 != a2)
+ ax= gh_cons (gh_int2scm (a2), ax);
+
+
+ elt_l_->set_elt_property ("axes", ax);
+
+ if (a1 != X_AXIS && a2 != X_AXIS)
+ elt_l_->set_empty (X_AXIS);
+ if (a1 != Y_AXIS && a2 != Y_AXIS)
+ elt_l_->set_empty (Y_AXIS);
+
+ elt_l_->dim_cache_[a1]->set_callback (Axis_group_interface::group_extent_callback);
+ elt_l_->dim_cache_[a2]->set_callback (Axis_group_interface::group_extent_callback);
+}
+
+Link_array<Score_element>
+Axis_group_interface::get_children ()
+{
+ Link_array<Score_element> childs;
+ childs.push (elt_l_) ;
+
+ if (!has_interface_b ())
+ return childs;
+
+ for (SCM ep = elt_l_->get_elt_property ("elements"); gh_pair_p (ep); ep = gh_cdr (ep))
+ {
+ Score_element* e = unsmob_element (gh_car (ep));
+ if (e)
+ childs.concat (axis_group (e).get_children ());
+ }
+
+ return childs;
+}
+
+bool
+Axis_group_interface::has_interface_b ()
+{
+ SCM memq = scm_memq (ly_symbol2scm ("Axis_group"),
+ elt_l_->get_elt_property ("interfaces"));
+
+ return (memq != SCM_BOOL_F);
+}
+
+
--- /dev/null
+/*
+ axis-group-item.cc -- implement Axis_group_interface
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ */
+
+#include "axis-group-item.hh"
+#include "axis-group-interface.hh"
+
+Axis_group_item ::Axis_group_item ()
+{
+ axis_group (this).set_interface ();
+}
--- /dev/null
+/*
+ axis-group-spanner.cc -- implement Axis_group_spanner
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ */
+
+#include "axis-group-spanner.hh"
+#include "axis-group-interface.hh"
+
+Axis_group_spanner::Axis_group_spanner()
+{
+ axis_group (this).set_interface ();
+}
Bar::staff_bracket (Real height) const
{
Paper_def* p= paper_l ();
+ Real arc_height = p->get_var("bracket_arch_height");
SCM at = gh_list (ly_symbol2scm ("bracket"),
gh_double2scm (p->get_var("bracket_arch_angle")),
gh_double2scm (p->get_var("bracket_arch_width")),
- gh_double2scm (p->get_var("bracket_arch_height")),
+ gh_double2scm (arc_height),
gh_double2scm (p->get_var("bracket_width")),
gh_double2scm (height),
gh_double2scm (p->get_var("bracket_arch_thick")),
SCM_UNDEFINED);
Real staff_space = p->get_var ("interline");
- Box b (Interval (0, 1.5 * staff_space), Interval (-height/2,height/2));
+ Real h = height + 2 * arc_height;
+ Box b (Interval (0, 1.5 * staff_space), Interval (-h/2, h/2));
Molecule mol (b, at);
mol.translate_axis (- mol.dim_[X_AXIS].length () / 2, X_AXIS);
at = fontify_atom (all_fonts_global_p->find_font (nm), at);
- Box b ( Interval (-y/2,y/2),
- Interval (0,0));
+ Box b (Interval (0,0), Interval (-y/2, y/2));
+
return Molecule(b, at);
}
#include "protected-scm.hh"
#include "break-align-item.hh"
#include "axis-group-item.hh"
+#include "axis-group-interface.hh"
class Break_align_engraver : public Engraver
{
else
{
group = new Axis_group_item;
- group->set_axes (X_AXIS,X_AXIS);
+ axis_group(group).set_axes (X_AXIS,X_AXIS);
group->set_elt_property ("origin", name);
group->set_parent (align_l_, Y_AXIS);
announce_element (Score_element_info (group, 0));
column_alist_ = scm_assoc_set_x (column_alist_, name, group->self_scm_);
}
- group->add_element (item_l);
+ axis_group (group).add_element (item_l);
}
}
#include "paper-score.hh"
#include "paper-def.hh"
#include "paper-column.hh"
+#include "group-interface.hh"
/*
Handle spacing for prefatory matter.
Link_array<Score_element> elems;
- Link_array<Score_element> all_elems (elem_l_arr ());
+ Link_array<Score_element> all_elems
+ = Group_interface__extract_elements (this, (Score_element*)0,
+ "elements");
for (int i=0; i < all_elems.size(); i++)
{
#include "note-column.hh"
#include "note-head.hh"
#include "paper-def.hh"
+#include "axis-group-interface.hh"
+
Collision::Collision()
{
- set_axes (X_AXIS, Y_AXIS);
+ axis_group (this).set_axes (X_AXIS, Y_AXIS);
}
void
Collision::add_column (Note_column* ncol_l)
{
- add_element (ncol_l);
+ axis_group (this).add_element (ncol_l);
add_dependency (ncol_l);
}
--- /dev/null
+/*
+ directional-element.cc -- implement Directional_element
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ */
+
+#include "directional-element-interface.hh"
+
+
+Directional_element_interface::Directional_element_interface (Score_element const *s)
+{
+ elt_l_ = (Score_element*)s;
+}
+
+bool
+Directional_element_interface::has_interface_b () const
+{
+ return isdir_b (elt_l_->get_elt_property ("direction"));
+}
+
+
+
+
+Direction
+Directional_element_interface::get () const
+{
+ // return dir_;
+ SCM d= elt_l_->get_elt_property ("direction");
+ if (!isdir_b(d))
+ return CENTER;
+
+ return to_dir (d);
+}
+
+void
+Directional_element_interface::set (Direction d)
+{
+ elt_l_->set_elt_property ("direction", gh_int2scm (d));
+}
+
+Directional_element_interface
+directional_element (Score_element const*s)
+{
+ return s;
+}
#include "staff-symbol-referencer.hh"
#include "directional-element-interface.hh"
#include "side-position-interface.hh"
+#include "axis-group-interface.hh"
+
void
Dot_column::add_dots (Dots *d)
gi.add_element (d);
add_dependency (d);
- add_element (d);
+ axis_group (this).add_element (d);
}
void
gi.set_interface ();
directional_element (this).set (RIGHT);
- set_axes(X_AXIS,X_AXIS);
+ axis_group (this).set_axes(X_AXIS,X_AXIS);
}
/*
/*
TODO:
- * padding of orphaned items
- * direction of orphaned items
+ * direction of text-dynamic-request if not equalt to direction
+ of line-spanner
*/
class Dynamic_line_spanner : public Spanner
Dynamic_line_spanner ();
VIRTUAL_COPY_CONS(Score_element);
void add_column (Item*);
- Direction get_default_dir () const;
+
+protected:
+ virtual void after_line_breaking ();
};
Dynamic_line_spanner::Dynamic_line_spanner ()
add_dependency (n);
}
-Direction
-Dynamic_line_spanner::get_default_dir () const
+void
+Dynamic_line_spanner::after_line_breaking ()
{
- return DOWN;
+#if 0
+
+ /*
+ We hebben hier een probleempje: er is een verschil tussen
+ dynamics zonder en met line-spanner.
+ Allen zijn gecentreerd (aligned-on-self), wat okee is,
+ maar de losse hebben zelf een padding tov de staff.
+
+ Deze padding werkt niet op items die in line-spanner zitten:
+ de padding werkt op line-spanner zelf.
+ De line-spanner moet dus eigenlijk zoveel naar beneden of boven
+ als er items uitsteken, maar Hmm.
+ */
+#endif
+ Direction dir = directional_element (this).get ();
+ if (!dir)
+ dir = DOWN;
+ //Hmm. inf
+ //translate_axis (extent (Y_AXIS)[dir], Y_AXIS);
+ translate_axis (staff_symbol_referencer (this).staff_space () * dir, Y_AXIS);
}
/**
SCM s = get_property ("dynamicPadding");
if (gh_number_p (s))
e->set_elt_property ("padding", s);
+ s = get_property ("dynamicMinimumSpace");
+ if (gh_number_p (s))
+ e->set_elt_property ("minimum-space", s);
}
pending_element_arr_.clear ();
}
protected:
void do_print () const;
virtual bool do_try_music (Music* req_l);
- virtual void do_process_requests ();
+ virtual void do_process_music ();
virtual void do_pre_move_processing ();
private:
}
void
-Dynamic_performer::do_process_requests ()
+Dynamic_performer::do_process_music ()
{
if (text_script_req_l_)
{
Grace_engraver_group::process ()
{
calling_self_b_ = true;
- process_requests ();
+ process_music ();
do_announces();
pre_move_processing();
check_removal();
Grace_performer_group::process ()
{
calling_self_b_ = true;
- process_requests ();
+ process_music ();
do_announces();
pre_move_processing();
check_removal();
#include "paper-column.hh"
#include "dimension-cache.hh"
#include "side-position-interface.hh"
+#include "axis-group-interface.hh"
+
class Grace_position_engraver:public Engraver
{
warning (_("Unattached grace notes. Attaching to last musical column."));
align_l_->set_parent (0, X_AXIS);
- last_musical_col_l_->add_element (align_l_);
+ axis_group(last_musical_col_l_).add_element (align_l_);
}
last_musical_col_l_ = get_staff_info ().musical_pcol_l ();
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "axis-group-interface.hh"
#include "hara-kiri-vertical-group-spanner.hh"
#include "debug.hh"
#include "item.hh"
Hara_kiri_group_spanner::Hara_kiri_group_spanner()
{
set_elt_property ("items-worth-living", SCM_EOL);
- set_axes(Y_AXIS,Y_AXIS);
+ axis_group (this).set_axes(Y_AXIS,Y_AXIS);
}
void
if (gh_pair_p (worth))
return;
- Link_array<Score_element> childs = get_children ();
+ Link_array<Score_element> childs = axis_group (this).get_children ();
for (int i = 0; i < childs.size (); i++)
{
Score_element* s = childs[i];
#ifndef VERTICAL_ALIGN_ITEM_HH
#define VERTICAL_ALIGN_ITEM_HH
-#include "axis-group-element.hh"
-#include "interval.hh"
-#include "direction.hh"
-#include "axes.hh"
-#include "hash-table.hh"
+#include "score-element.hh"
/**
Order elements top to bottom/left to right/right to left etc..
*/
-class Align_element : public virtual Axis_group_element {
+class Align_element : public virtual Score_element {
public:
Axis axis () const;
+ Align_element ();
void set_axis (Axis);
int get_count (Score_element*)const;
void add_element (Score_element *);
--- /dev/null
+/*
+ axis-group-interface.hh -- declare Axis_group_interface
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ */
+
+#ifndef AXIS_GROUP_INTERFACE_HH
+#define AXIS_GROUP_INTERFACE_HH
+
+#include "group-interface.hh"
+
+struct Axis_group_interface : Group_interface
+{
+ Axis_group_interface (Score_element*);
+ static Interval group_extent_callback (Dimension_cache const*);
+ void add_element (Score_element*);
+ void set_axes (Axis,Axis);
+ bool axis_b (Axis)const;
+ Link_array<Score_element> get_children ();
+ bool has_interface_b ();
+ void set_interface ();
+};
+
+Axis_group_interface
+axis_group (Score_element*);
+
+#endif /* AXIS_GROUP_INTERFACE_HH */
+
#ifndef AXIS_ITEM_HH
#define AXIS_ITEM_HH
-#include "axis-group-element.hh"
#include "item.hh"
-/**
- A grouping item. Its special support is in do_breakable_col_processing().
- */
-class Axis_group_item : public virtual Axis_group_element, public virtual Item
+class Axis_group_item : public virtual Item
{
public:
+ Axis_group_item ();
VIRTUAL_COPY_CONS(Score_element);
};
#define AXIS_GROUP_SPANNER_HH
#include "spanner.hh"
-#include "axis-group-element.hh"
/**
An element which groups a line in a certain direction. The most
useful example of this is the Vertical_group_spanner
*/
-class Axis_group_spanner : public virtual Axis_group_element,
- public virtual Spanner
+class Axis_group_spanner : public virtual Spanner
{
public:
+ Axis_group_spanner ();
VIRTUAL_COPY_CONS(Score_element);
};
*/
class Music:public Input {
public:
-
-
virtual Musical_pitch to_relative_octave (Musical_pitch);
/// The duration of this piece of music
#ifndef PAPER_DEF_HH
#define PAPER_DEF_HH
+
+#include <map>
+
#include "lily-proto.hh"
#include "lily-guile.hh"
#include "real.hh"
*/
class Paper_def : public Music_output_def
{
- Hash_table<int, Lookup *> *lookup_p_tab_p_;
+ map<int, Lookup *> *lookup_p_tab_p_;
static int default_count_i_;
protected:
static Real quantised_position (Dimension_cache const*);
static Real centered_on_parent (Dimension_cache const*);
void set_axis (Axis);
+ void set_minimum_space (Real);
+ void set_padding (Real);
void set_quantised (Axis);
Axis get_axis () const;
void pre_move_processing();
void add_processing ();
void creation_processing ();
- void process_requests();
+ void process_music();
void post_move_processing();
void removal_processing();
/**
VIRTUAL_COPY_CONS (Score_element);
virtual void do_add_processing ();
- static Interval dim_callback (Dimension_cache const*);
virtual void after_line_breaking ();
};
#include "debug.hh"
#include "line-group-group-engraver.hh"
#include "paper-column.hh"
+#include "axis-group-interface.hh"
+
Line_group_engraver_group::Line_group_engraver_group()
{
Line_group_engraver_group::typeset_element (Score_element *elem)
{
if (!elem->parent_l (Y_AXIS))
- staffline_p_->add_element (elem);
+ axis_group (staffline_p_).add_element (elem);
Engraver_group_engraver::typeset_element (elem);
}
Line_group_engraver_group::create_line_spanner ()
{
staffline_p_ = new Axis_group_spanner ;
- staffline_p_->set_axes (Y_AXIS,Y_AXIS);
+ axis_group (staffline_p_).set_axes (Y_AXIS,Y_AXIS);
}
#include "warn.hh"
#include "main.hh"
#include "debug.hh"
+#include "axis-group-interface.hh"
+
Line_of_score::Line_of_score()
{
set_elt_property ("columns", SCM_EOL);
- set_axes (Y_AXIS,X_AXIS);
+ axis_group (this).set_axes (Y_AXIS,X_AXIS);
}
{
set_elt_property ("columns",
gh_cons (p->self_scm_, get_elt_property ("columns")));
- add_element (p);
+ axis_group (this).add_element (p);
}
void
*/
#include <math.h> // ceil
-
+#include "axis-group-interface.hh"
#include "dot-column.hh"
#include "note-column.hh"
#include "beam.hh"
{
set_elt_property ("rests", SCM_EOL);
set_elt_property ("note-heads", SCM_EOL);
- set_axes (X_AXIS, Y_AXIS);
+ axis_group (this).set_axes (X_AXIS, Y_AXIS);
}
Stem *
set_elt_property ("stem", stem_l->self_scm_);
add_dependency (stem_l);
- add_element (stem_l);
+ axis_group (this).add_element (stem_l);
}
Group_interface gi (this, "note-heads");
gi.add_element (nh);
}
- add_element (h);
+ axis_group (this).add_element (h);
}
/**
void
Note_column::set_dotcol (Dot_column *d)
{
- add_element (d);
+ axis_group (this).add_element (d);
}
/*
#include "paper-column.hh"
#include "paper-score.hh"
#include "debug.hh"
+#include "axis-group-interface.hh"
void
Paper_column::add_rod (Paper_column * p, Real d)
scm_unprotect_object (when);
set_elt_property ("when", when);
- set_axes (X_AXIS, X_AXIS);
+ axis_group (this).set_axes (X_AXIS, X_AXIS);
line_l_=0;
rank_i_ = -1;
*/
#include <math.h>
+
#include "all-font-metrics.hh"
#include "string.hh"
#include "misc.hh"
Paper_def::Paper_def ()
{
- lookup_p_tab_p_ = new Hash_table<int, Lookup*>;
- lookup_p_tab_p_->hash_func_ = int_hash;
+ lookup_p_tab_p_ = new map<int, Lookup*>;
}
Paper_def::~Paper_def ()
{
- for (Hash_table_iter<int, Lookup*> ai(*lookup_p_tab_p_); ai.ok (); ai++)
+ for (map<int,Lookup*>::const_iterator ai = lookup_p_tab_p_->begin();
+ ai != lookup_p_tab_p_->end (); ai++)
{
- delete ai.val ();
+ delete (*ai).second;
}
delete lookup_p_tab_p_;
: Music_output_def (s)
{
shape_int_a_ = s.shape_int_a_;
- lookup_p_tab_p_ = new Hash_table<int, Lookup*>;
- lookup_p_tab_p_->hash_func_ = int_hash;
+ lookup_p_tab_p_ = new map<int, Lookup*>;
- for (Hash_table_iter<int, Lookup*> ai(*s.lookup_p_tab_p_); ai.ok (); ai++)
+ for (map<int,Lookup*>::const_iterator ai = s.lookup_p_tab_p_->begin();
+ ai != s.lookup_p_tab_p_->end (); ai++)
{
- Lookup * l = new Lookup (*ai.val ());
- set_lookup (ai.key(), l);
+ Lookup * l = new Lookup (* (*ai).second);
+ set_lookup ((*ai).first, l);
}
}
void
Paper_def::set_lookup (int i, Lookup*l)
{
- if (lookup_p_tab_p_->elem_b (i))
+ map<int,Lookup*> :: const_iterator it (lookup_p_tab_p_->find (i));
+ if (it != lookup_p_tab_p_->end ())
{
- delete lookup_p_tab_p_->elem (i);
+ delete (*it).second;
}
(*lookup_p_tab_p_)[i] = l;
}
#ifndef NPRINT
Music_output_def::print ();
DEBUG_OUT << "Paper {";
- for (Hash_table_iter<int, Lookup*> ai(*lookup_p_tab_p_); ai.ok (); ai++)
+ for (map<int,Lookup*>::const_iterator ai = lookup_p_tab_p_->begin();
+ ai != lookup_p_tab_p_->end (); ai++)
{
- DEBUG_OUT << "Lookup: " << ai.key () << " = " << ai.val ()->font_name_ << '\n';
+ DEBUG_OUT << "Lookup: " << (*ai).first
+ << " = " << (*ai).second->font_name_ << '\n';
}
DEBUG_OUT << "}\n";
#endif
#include "lookup.hh"
#include "rest.hh"
#include "dots.hh"
-#include "axis-group-element.hh"
#include "paper-score.hh"
#include "staff-symbol-referencer.hh"
#include "lookup.hh"
#include "rest.hh"
#include "dots.hh"
-#include "axis-group-element.hh"
#include "paper-score.hh"
#include "stem.hh"
#include "staff-symbol-referencer.hh"
#include "hash-table-iter.hh"
-#ifdef usestl
-
-
Scheme_hash_table::Scheme_hash_table ()
{
self_scm_ = SCM_EOL;
IMPLEMENT_UNSMOB(Scheme_hash_table,scheme_hash);
IMPLEMENT_SMOBS(Scheme_hash_table);
-#else
-Scheme_hash_table::Scheme_hash_table ()
-{
- hash_func_ = ly_scm_hash;
- self_scm_ = SCM_EOL;
- smobify_self ();
-}
-
-void
-Scheme_hash_table::operator =(Scheme_hash_table const & src)
-{
- Hash_table<SCM,SCM>::operator = (src);
-
- // we do not copy the self_scm_ field!
-}
-
-void
-Scheme_hash_table::do_smobify_self ()
-{
-}
-
-SCM
-Scheme_hash_table::mark_smob (SCM s)
-{
- /*
- can't typecheck naively, since GC bit lives in CAR of S
- */
- //assert (SMOB_IS_TYPE_B (Scheme_hash_table, s));
-
- Scheme_hash_table *me = SMOB_TO_TYPE(Scheme_hash_table,s);
- for (Hash_table_iter<SCM,SCM> i (*me); i.ok(); i++)
- {
- scm_gc_mark (i.key());
- scm_gc_mark (i.val ());
- }
- return SCM_EOL;
-}
-
-
-Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
- : Hash_table<SCM,SCM> (src)
-{
- hash_func_ = src.hash_func_;
- self_scm_ = SCM_EOL;
- smobify_self ();
-}
-
-int
-Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
-{
- assert (SMOB_IS_TYPE_B (Scheme_hash_table, s));
- char str[1000];
- sprintf (str, "#<Scheme_hash_table 0x%0x ", s);
- scm_puts (str, p);
- Scheme_hash_table *me = SMOB_TO_TYPE(Scheme_hash_table,s);
- for (Hash_table_iter<SCM,SCM> i (*me); i.ok(); i++)
- {
- scm_display (i.key(), p);
- scm_puts (" = ",p);
- scm_display (i.val (), p);
- scm_puts ("\n",p);
- }
- scm_puts ("> ",p);
- return 1;
-}
-
-
-void
-Scheme_hash_table::set (SCM k, SCM v)
-{
- elem (k ) = v;
- scm_unprotect_object (v);
-}
-
-SCM
-Scheme_hash_table::get (SCM k)const
-{
- return const_elem (k);
-}
-
-
-Scheme_hash_table::~Scheme_hash_table( )
-{
- unsmobify_self ();
-}
-
-SCM
-Scheme_hash_table::to_alist () const
-{
- SCM l = SCM_EOL;
- for (Hash_table_iter<SCM,SCM> i (*this); i.ok(); i++)
- l = gh_cons (gh_cons (i.key (), i.val()), l);
- return l;
-}
-
-
-#include "ly-smobs.icc"
-IMPLEMENT_UNSMOB(Scheme_hash_table,scheme_hash);
-IMPLEMENT_SMOBS(Scheme_hash_table);
-#endif
(c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+
#include "debug.hh"
#include "dimension-cache.hh"
#include "line-of-score.hh"
#include "paper-column.hh"
#include "command-request.hh"
#include "paper-def.hh"
+#include "axis-group-interface.hh"
Score_engraver::Score_engraver()
{
void
Score_engraver::process()
{
- process_requests();
+ process_music();
do_announces();
pre_move_processing();
check_removal();
if (!elem_p->parent_l (X_AXIS))
{
bool br = to_boolean (elem_p->remove_elt_property ("breakable"));
- if (br)
- command_column_l_->add_element(elem_p);
- else
- musical_column_l_->add_element(elem_p);
+ Axis_group_interface gi ((br) ? command_column_l_ : musical_column_l_) ;
+ gi.add_element(elem_p);
}
}
if (!elem_p->parent_l(Y_AXIS))
- scoreline_l_->add_element (elem_p);
+ axis_group (scoreline_l_).add_element (elem_p);
}
elem_p_arr_.clear();
}
void
Score_performer::process()
{
- process_requests();
+ process_music();
do_announces ();
pre_move_processing();
check_removal();
dim = Interval(0,0);
}
- Real off = me->parent_l (axis)->relative_coordinate (common, axis);
-
-
Direction dir = Side_position_interface (me).get_direction ();
- SCM pad = me->remove_elt_property ("padding");
- if (gh_number_p (pad))
+ Real off = me->parent_l (axis)->relative_coordinate (common, axis);
+ SCM minimum = me->remove_elt_property ("minimum-space");
+
+ Real total_off = dim[dir] + off;
+ SCM padding = me->remove_elt_property ("padding");
+ if (gh_number_p (padding))
{
- off += gh_scm2double (pad) * dir;
+ total_off += gh_scm2double (padding) * dir;
+ }
+ if (gh_number_p (minimum) && total_off * dir < gh_scm2double (minimum))
+ {
+ total_off = gh_scm2double (minimum) * dir;
}
- Real total_off = dim[dir] + off;
-
if (fabs (total_off) > 100 CM)
programming_error ("Huh ? Improbable staff side dim.");
elt_l_->set_elt_property ("direction", gh_int2scm (d));
}
+void
+Side_position_interface::set_minimum_space (Real m)
+{
+ elt_l_->set_elt_property ("minimum-space", gh_double2scm (m));
+}
+
+void
+Side_position_interface::set_padding (Real p)
+{
+ elt_l_->set_elt_property ("padding", gh_double2scm (p));
+}
+
bool
Side_position_interface::has_interface_b () const
{
Span_bar::after_line_breaking ()
{
Bar::after_line_breaking ();
- Interval i(get_spanned_interval ());
+ SCM s = get_elt_property ("collapse-height");
+ if (gh_number_p (s)
+ && get_spanned_interval ().length () < gh_scm2double (s))
+ {
+ set_elt_property ("transparent", SCM_BOOL_T);
+ set_empty (X_AXIS);
+ set_empty (Y_AXIS);
+ }
+ Interval i (get_spanned_interval ());
translate_axis (i.center (), Y_AXIS);
}
void
Span_bar::evaluate_empty ()
{
- if (!gh_pair_p (get_elt_property ("elements")))
- {
- set_elt_property ("transparent", SCM_BOOL_T);
- set_empty (X_AXIS);
- set_empty (Y_AXIS);
- }
-
+ if (!gh_pair_p (get_elt_property ("elements")))
+ {
+ set_elt_property ("transparent", SCM_BOOL_T);
+ set_empty (X_AXIS);
+ set_empty (Y_AXIS);
+ }
+
SCM gl = get_elt_property ("glyph");
if (!gh_string_p (gl))
{
protected:
virtual bool do_try_music (Music* req_l);
virtual void acknowledge_element (Audio_element_info);
- virtual void do_process_requests ();
+ virtual void do_process_music ();
virtual void do_pre_move_processing ();
virtual void do_post_move_processing ();
}
void
-Span_dynamic_performer::do_process_requests ()
+Span_dynamic_performer::do_process_music ()
{
if (finished_dynamic_tuple_arr_.size () > 1
&& finished_dynamic_tuple_arr_.top ().audio_l_->volume_i_)
Span_bar *s= new Span_bar;
s->set_empty (X_AXIS);
s->set_elt_property ("glyph", gh_str02scm ("bracket"));
+
+ SCM collapse = get_property ("bracketCollapseHeight");
+ if (gh_number_p (collapse))
+ s->set_elt_property ("collapse-height", collapse);
+ else
+ s->set_elt_property ("collapse-height", gh_double2scm (1));
+
return s;
}
if (r->style_str_.length_i ())
text->set_elt_property ("style", ly_str02scm (r->style_str_.ch_C()));
- SCM empty = get_property ("textEmptyDimension");
- if (to_boolean (empty))
- {
- text->set_empty (X_AXIS);
- }
+ SCM empty = get_property ("textNonEmpty");
+ if (!to_boolean (empty))
+ text->set_empty (X_AXIS);
announce_element (Score_element_info (text, r));
texts_.push (text);
void
Translator_group::do_process_music ()
{
- each (&Translator::process_requests);
+ each (&Translator::process_music);
}
void
}
void
-Translator::process_requests ()
+Translator::process_music ()
{
if (status < PROCESSED_REQS)
post_move_processing ();
#include "axis-align-spanner.hh"
#include "axis-group-spanner.hh"
#include "span-bar.hh"
+#include "axis-group-interface.hh"
Vertical_align_engraver::Vertical_align_engraver()
{
{
int sz = i.origin_trans_l_arr ((Translator*)this).size() ;
- Axis_group_element * elt = dynamic_cast<Axis_group_element *> (i.elem_l_);
- return sz > 1 && elt && !elt->parent_l (Y_AXIS) && elt->axis_b (Y_AXIS);
+ Axis_group_interface agi(i.elem_l_);
+
+ return sz > 1 && agi.has_interface_b ()
+ && !i.elem_l_->parent_l (Y_AXIS) && agi.axis_b (Y_AXIS);
}
void
#include "stem.hh"
#include "dimension-cache.hh"
#include "group-interface.hh"
-
-
+#include "side-position-interface.hh"
+#include "directional-element-interface.hh"
Volta_spanner::Volta_spanner ()
{
- dim_cache_ [Y_AXIS]->set_callback (dim_callback);
+ //dim_cache_ [Y_AXIS]->set_callback (dim_callback);
set_elt_property ("bars", SCM_EOL);
- set_elt_property ("note-columns", SCM_EOL);
+ side_position (this).set_axis (Y_AXIS);
+ directional_element (this).set (UP);
}
-/*
- FIXME: too complicated.
- */
Molecule
Volta_spanner::do_brew_molecule () const
{
if (!bar_arr.size ())
return mol;
- Link_array<Score_element> note_column_arr
- = Group_interface__extract_elements (this, (Score_element*)0, "note-columns");
-
bool no_vertical_start = false;
bool no_vertical_end = to_boolean (get_elt_property ("last-volta"));
Spanner *orig_span = dynamic_cast<Spanner*> (original_l_);
#endif
Real staff_space = paper_l ()->get_var ("interline");
- Real half_staff_space = staff_space/2;
- Real t = paper_l ()->get_var ("volta_thick");
+ Real half_space = staff_space / 2;
- Real dx = half_staff_space;
- Real w = spanner_length() - dx - get_broken_left_end_align ();
+ Real w = spanner_length () - get_broken_left_end_align () - half_space;
Real h = paper_l()->get_var ("volta_spanner_height");
+ Real t = paper_l ()->get_var ("volta_thick");
SCM at = (gh_list (ly_symbol2scm ("volta"),
gh_double2scm (h),
gh_int2scm (no_vertical_start),
gh_int2scm (no_vertical_end),
SCM_UNDEFINED));
- Box b (Interval (- h/2, h/2), Interval (0, w));
- Molecule volta(b,at);
+ //Box b (Interval (0, w), Interval (- h/2, h/2));
+ Box b (Interval (0, w), Interval (0, h));
+ Molecule volta (b, at);
+ mol.add_molecule (volta);
Molecule num (lookup_l ()->text ("volta",
ly_scm2string (get_elt_property("text")),
paper_l ()));
- Real dy = bar_arr.top ()->extent (Y_AXIS) [UP] >?
- bar_arr[0]->extent (Y_AXIS) [UP];
- dy += 2 * h;
-
-
- /*
- CODE DUPLICATION.
- FIXME (see axis-group-elt, side-pos interface.)
- */
- for (int i = 0; i < note_column_arr.size (); i++)
- dy = dy >? note_column_arr[i]->extent (Y_AXIS)[BIGGER];
- dy -= h;
-
- Molecule two (lookup_l ()->text ("volta", "2", paper_l ()));
- Real gap = two.dim_.x ().length () / 2;
- Offset off (num.dim_.x ().length () + gap,
- h / half_staff_space - gap);
- num.translate (off);
- mol.add_molecule (volta);
- mol.add_molecule (num);
- mol.translate (Offset (0, dy));
+
+ mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
+ - staff_space);
return mol;
}
}
}
-/*
- Originally the following comment existed here
- "in most cases, it's a lot better not no have height...",
- but problems existed with collision between volta spanner
- and above staff or lyrics for multi-staff music, so the proper
- height is now being returned. Additional space should still
- be added elsewhere so lyrics from above staff do not sit on
- volta spanner. (Roy R. Rankin)
-*/
-Interval
-Volta_spanner::dim_callback (Dimension_cache const *c)
-{
- Volta_spanner * v = dynamic_cast<Volta_spanner*> (c->element_l ());
- Real h = v->paper_l()->get_var ("volta_spanner_height") * 2.;
- return Interval (0., h);
-}
-
void
Volta_spanner::after_line_breaking ()
{
- Link_array<Bar> bar_arr
- = Group_interface__extract_elements (this, (Bar*)0, "bars");
-
- if (bar_arr.size())
- translate_axis (bar_arr[0]->extent (Y_AXIS)[UP], Y_AXIS);
- translate_axis (get_broken_left_end_align (), X_AXIS);
+ side_position (this).add_staff_support ();
}
void
-Volta_spanner::add_bar (Bar* c)
+Volta_spanner::add_bar (Bar* b)
{
Group_interface gi(this, "bars");
- gi.add_element (c);
+ gi.add_element (b);
- add_dependency (c);
+ side_position (this).add_support (b);
+ add_dependency (b);
}
void
Volta_spanner::add_column (Note_column* c)
{
- Group_interface gi(this, "note-columns");
- gi.add_element (c);
-
+ side_position (this).add_support (c);
add_dependency (c);
}
-
-
\consists "Bar_engraver";
% Bar_engraver must be first so default bars aren't overwritten
% with empty ones.
+
+ voltaPadding = #5 % urg, in \pt
+ voltaMinimumSpace = #25 % urg, in \pt
\consists "Repeat_engraver";
\consists "Separating_line_group_engraver";
\name RhythmicStaff;
+ voltaPadding = #5 % urg, in \pt
+ voltaMinimumSpace = #15 % urg, in \pt
\consists "Repeat_engraver";
\consists "Bar_engraver";
\consists "Time_signature_engraver";
\name Voice;
dynamicPadding = #5 % urg, in \pt
+ dynamicMinimumSpace = #10 % urg, in \pt
+
Generic_property_list = #generic-voice-properties
\consists "Output_property_engraver";
\consists "Timing_engraver";
\consists "Output_property_engraver";
+ %bracketCollapseHeight = #10 % \pt
\consists "Span_score_bar_engraver";
% \consists "Score_priority_engraver";
\consists "Break_align_engraver";
\consists "Key_performer";
\consists "Time_signature_performer";
\consists "Tempo_performer";
-% \consists "Span_dynamic_performer";
dynamicStyle = #"dynamic"
};
\translator { \StaffContext }
\type "Performer_group_performer";
\name Voice;
% All notes fall to Grace if you leave Thread out (huh?)
- \consists "Dynamic_performer"; % must come before text_engraver.
+ \consists "Dynamic_performer";
\consists "Span_dynamic_performer";
\consists "Grace_position_performer";
\accepts Thread;
f4-. r r2 |
e4-. r r2 |
R1 *4 |
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
bes2\p\< ( a |
)gis2. \!a4-.\f |
R1*13 |
c2. c4\sf|
c4 r r2|
R1*5|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
a'2.\p\< ( bes4|
a g e)c|
c'2.( d4|
d~|
d~|
d|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
bes2.\<( c4|
bes a fis)d|
\!d'2\ff f|
)e2. f4\sf(|
)e4 r r2|
R1*9|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
fis2.\p\<(g4|
fis e cis)a|
\!a2\ff c|
r2 r4 d(|
)cis r r2|
r r4 r8 cis|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
d4\< r r2|
r r4 r8 d|
e4 r r r8 e|
d4 r8 g f4 r8 c|
bes4 r r2|
R1*11|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
f'2.\p\<(g4|
f e cis)a|
a1|
- \!b\f~|
- b|
+ \!bes\f~|
+ bes|
c\f~|
c\p|
d\f~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
d\p\<~|
d~|
d~|
R1|
d4-. d-. r2|
d4-. d-. r2|
- \property Voice.decrescendoText = "dim."
- \property Voice.decrescendoSpanner = "dashed-line"
+ \property VoiceOne.decrescendoText = "dim."
+ \property VoiceOne.decrescendoSpanner = "dashed-line"
d4\> r e r|
R1|
\!a,4\p r r2|
d~|
d|
%a deux|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
bes'2.\<(c4|
bes a fis)d|
\!d'2\ff f,|
r4 r8 f f4\sf()a|
r4 r8 f f4\sf()a|
r4 r8 f f4\sf()a|
- b2 gis|
+ bes2 gis|
a fis|
g f|
b a|
a4 r8 a a4 r8 a|
R1*4|
%a deux|
- b4\ff r8 es d4 r8 a|
+ bes4\ff r8 es d4 r8 a|
g4 r8 c bes4 r8 f|
es4 r8 a g4 r8 g|
g4 r8 g fis4 r8 fis|
)e2. f4\sf(|
)e4 r r2|
R1*9|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
fis2.\p\<( g4|
fis e cis)a|
%a deux; urg|
c1\f~|
c\p|
a1\f|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
d,\p\<~|
d~|
d~|
R1|
a4-. c-. r2|
bes4-. c-. r2|
- \property Voice.decrescendoText = "dim."
- \property Voice.decrescendoSpanner = "dashed-line"
+ \property VoiceTwo.decrescendoText = "dim."
+ \property VoiceTwo.decrescendoSpanner = "dashed-line"
bes4\> r a r|
R1|
\!a4\p r r2|
)g,4 r r r8 g( |
\!)d2\ff e' |
dis b |
- e4\p r r r8 e(|
- )a4 r r r8 a(|
+ es4\p r r r8 es(|
+ )a,4 r r r8 a(|
%200
)g1 |
\skip 1*18; |
%220
- f4 r r2 |
+ f'4 r r2 |
f'4 r r2 |
f4 r r2 |
f4 r r2 |
\midi{
- \tempo 4 = 160;
+ \tempo 4 = 150;
}
% slurs are never beautiful (no steep slurs)
slur_beautiful = 0.0;
+ \translator {
+ \VoiceContext
+ dynamicPadding = #3 % urg, in \pt
+ dynamicMinimumSpace = #6 % urg, in \pt
+ }
\translator {
\VoiceContext
\name "VoiceOne";
\accepts "VoiceOne";
\accepts "VoiceTwo";
}
+ \translator {
+ \ScoreContext
+ textEmptyDimension = ##t
+ textStyle = #"italic"
+ }
\translator { \OrchestralScoreContext }
}
% slurs are never beautiful (no steep slurs)
slur_beautiful = 0.0;
+ \translator {
+ \VoiceContext
+ dynamicPadding = #3 % urg, in \pt
+ dynamicMinimumSpace = #6 % urg, in \pt
+ }
\translator {
\VoiceContext
\name "VoiceOne";
- \consists "Line_number_engraver";
+ %%\consists "Line_number_engraver";
verticalDirection = #1
stemVerticalDirection = #1
dynamicDirection = #-1
\translator {
\VoiceContext
\name "VoiceTwo";
- \consists "Line_number_engraver";
+ %%\consists "Line_number_engraver";
verticalDirection = #-1
stemVerticalDirection = #-1
\remove "Dynamic_engraver";
maximumRestCount = #1
}
\translator { \OrchestralPartStaffContext }
- \translator { \ScoreContext skipBars = ##t }
+ \translator {
+ \ScoreContext skipBars = ##t
+ textEmptyDimension = ##t
+ textStyle = #"italic"
+ }
}
$timpani_g = \context StaffGroup = timpani_group <
\$timpani_staff
% Force a staff bracket (?)
- \context Staff = timpany { \skip 1; }
+ \context Staff = timpany { \skip 1*314; }
>
violini = \context GrandStaff = violini_group <
r4 g-.\f r2 |
R1*2 |
% `a 2
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
r8 f\p\< f2 e4 |
r8 f f2 e4 |
f4. e8 f4. e8 |
e~|
e~|
e~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
e\<~|
e~|
e|
R1*2 |
% `a 2
% urg, yes this is a-deux, but lily doesn't know about I. / a2 yet.
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
r8 f'\p\< f2 e4 |
r8 f f2 e4 |
f4. e8 f4. e8 |
d4\f r r2|
g,4 r r2|
g4 r8 g g4 r8 g|
- g4 r8 g g'4 r8 g|
+ g4 r8 g e'4 r8 e|
d4\p r r2|
R1*3|
d4\ff r c r|
e~|
e~|
e~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
e\<~|
e~|
e~|
%a deux|
r4 r8 e,\p e4. e8|
r4 r8 e e4. e8|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
r4 r8 e\< e4. e8|
r4 r8 e e4. e8|
r4 r8 e e4. e8|
e~|
e~|
e~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
e\<~|
e~|
e|
R1*5 |
r2 r4 g4-.\f |
R1*5 |
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
ges'2\p\< f2 ~ |
f4 \!e-.\f r2 |
R1 |
f2\p()es |
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
d1\< |
d |
d2 d |
)d4 r r2|
R1*9|
\clef "tenor";
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
g'2.(as4 \p\<|
g f d)bes
\clef "bass";
c~|
c~|
c~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
c\<~|
c|
\!c2\ff bes|
bes(a bes)g|
fis r8 a\pp a4. a8|
r4 r8 a a4. a8|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
r4 r8 bes\< bes4. bes8|
r4 r8 bes bes4. bes8|
r4 r8 c8 c4. c8|
e4 r r2|
R1*3|
r4 r8 f' es4 r8 bes|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
c4\< r4 r2|
R1*2|
r4 r8 ges' f4 r8 c|
[g,: bes: c: des:][f,: bes: c: des:]||
[e,: g: bes: des:][c: e: g: c:]||
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
c1\p\< ~|
c1~|
c1~|
es(d es)c|
b r8 d\p d4. d8|
r4 r8 d d4. d8|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
r4 r8 es\< es4. es8|
r4 r8 es es4. es8|
r4 r8 %
es d b)g|
g'2.(as4|
g2)f|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
es2.\<( f4|
es d b)g|
R1|
d\f|
es\p|
e\f|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
as,4.\p\< as8 g4. g8|
f4. f8 es4. es8|
as4. as8 g4. g8|
R1|
g,4-. g-. r2|
as4-. bes-. r2|
- \property Voice.decrescendoText = "dim."
- \property Voice.decrescendoSpanner = "dashed-line"
+ \property VoiceOne.decrescendoText = "dim."
+ \property VoiceOne.decrescendoSpanner = "dashed-line"
c4\> r d r|
R1|
\!c,4\p r r2|
g4 r r2|
R1|
c4\pp r r2|
- \property Voice.decrescendoText = "sempre pi\\`u piano"
- \property Voice.decrescendoSpanner = ""
+ \property VoiceOne.decrescendoText = "sempre pi\\`u piano"
+ \property VoiceOne.decrescendoSpanner = ""
r r4 g\p\>~|
g1~|
g~|
)d4 r r2|
R1*9|
\clef "tenor";
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
g''2.(as4 \p\<||
g f d)bes||
\clef "bass";
c~|
c~|
c~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
c\<~|
c|
\!c2\ff g'|
fis d|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
g,4 \p\< r r r8 g(|
)c4 r r r8 c(|
\!)b1\sf\>|
R1*2|
r4 r8 fis\pp fis4. fis8|
r4 r8 fis fis4. fis8|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
r4 r8 g\< g4. g8|
r4 r8 g g4. g8|
r4 r8 a a4. a8|
e|
f|
g|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
as\<|
g|
as|
g~|
g~|
g~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
g\<~|
g~|
g~|
a~|
a~|
a~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
a\<~|
a|
\!f'2\ff e|
R1*3|
r4 r8 b'' b4. b8|
r4 r8 b b4. b8|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
r4 r8 c\< c4. c8|
r4 r8 c c4. c8|
\clef "tenor";
g\p|
bes\f|
%a deux|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
as4.\p\< as8 g4. g8|
f4. f8 es4. es8|
as4. as8 g4. g8|
R1|
es,4-. e-. r2|
f4-. g-. r2|
- \property Voice.decrescendoText = "dim."
- \property Voice.decrescendoSpanner = "dashed-line"
+ \property VoiceTwo.decrescendoText = "dim."
+ \property VoiceTwo.decrescendoSpanner = "dashed-line"
as4\> r b r|
R1|
%a deux|
g4-. r r2 |
b,4-. r r2 |
R1 *4 |
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
r2 g'\p\< ( |
)fis2. \!g4-.\f |
R1*5 |
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
r2 f\p\< ~ |
f4 \!e-.\f r2 |
R1 |
- f2()es |
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ f2\p()es |
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
d1\< |
d1 |
d2 d2 |
)f2. ges4\sf|
f4 r r2 |
R1*9|
- g2.(f4|
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
+ g2.\p\<(f4|
as g d)bes
- bes2\ff des|
+ \!bes2\ff des|
c1~|
c\p~|
c~|
c~|
c~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
c\<~|
c~|
\!c2\ff es|
d1~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
d\p\<~|
d~|
d2.()f4|
\!fis\pp r r2|
r2 r4 r8 a|
bes4 r r2|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
r r4 r8 bes\<|
c4 r r r8 c |
d4 r r r8 d|
r4 r8 f' es4 r8 bes|
c4 r r2|
R1*2|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = ""
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = ""
r4 r8 ges'\< f4 r8 c|
des4 r r2|
R1*5|
bes4 r8 e f4 r8 f|
g4 r8 g e4 r8 e|
R1*4|
- as,4\ff r8 des8 c4 r8 g|
+ \!as,4\ff r8 des8 c4 r8 g|
f4 r8 bes as4 r8 es|
des4 r8 g f4 r8 f'|
f4 r8 f e4 r8 e|
f4 r r2|
R1|
- \!des4-.\ff r r2|
+ des4-.\ff r r2|
R1*3|
d2\sf r|
d2\sf r|
)d2. es4\sf(|
)d r r2|
R1*9|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
e2.\p\<(f4|
e d b )g|
\!g2\ff bes|
a1~a4\p r r2|
R1*3|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
a1\<~|
a|
\!a2\ff c|
f4 r as r|
f r g r|
c,\p r r2|
- r r4 r8 des\f|
+ r r4 r8 d\f|
es4 r r2|
- r r4 r8 des\f|
+ r r4 r8 d\f|
es4 r r2|
R1*3|
es4\f r d r |
c r8 f8 es4 r8 bes|
as4-. des4-. r2|
R1*11|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
es2.\p\<(f4|
es d b)g|
g1|
R1|
c4-. c4-. r2|
c4-. c4-. r2|
- \property Voice.decrescendoText = "dim."
- \property Voice.decrescendoSpanner = "dashed-line"
+ \property VoiceOne.decrescendoText = "dim."
+ \property VoiceOne.decrescendoSpanner = "dashed-line"
c4\> r d r|
R1|
\!es4\p r r2|
R1*21|
f4\f r r r8 es|
des4 r r r8 c|
- bes4 r8 bes bes4 r8 bes|
+ bes4 r8 bes' bes4 r8 bes|
bes4 r8 bes bes4 r8 bes|
R1*4|
- as4\ff r8 des c4 r8 g|
+ as,4\ff r8 des c4 r8 g|
f4 r8 bes as4 r8 es|
des4 r8 g f4 r8 as'|
g4 r8 g g4 r8 g|
bes\f~|
bes\p|
c1\f~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
c\p\<~|
c~|
c~|
R1|
c4-. g'-. r2|
as4-. e-. r2|
- \property Voice.decrescendoText = "dim."
- \property Voice.decrescendoSpanner = "dashed-line"
+ \property VoiceTwo.decrescendoText = "dim."
+ \property VoiceTwo.decrescendoSpanner = "dashed-line"
f4\> r f r|
R1|
\!es4\p r r2|
g4-. r r2 |
g4-. r r2 |
R1 *4 |
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
as2\p\< ( g |
)fis2. \!g4-.\f |
R1*5 |
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
ges2\p\< f ~ |
f4 \!e\f r2 |
R1 |
f2\p()es |
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
d1\< |
d |
d2 d |
)f2. ges4(|
)f4 r r2|
R1*9|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
g2.\p\<( as4|
g f d)bes|
\!bes'2\ff des|
c bes|
as4\p r r2|
R1*3|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
as2.\p\<( bes4|
as g e)c|
\!c'2\ff es,|
d1~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
d\p\< ~|
d~|
\!d2.\sf\>()f4|
fis\pp r r2|
r r4 r8 fis' |
g4 r r2|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
r r4 r8 g\<|
a4 r r r8 a|
bes4 r r r8 bes|
des4 r r r8 c|
bes4 r8 es f4 r8 f|
g4 r8 g e4 r 8 e|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
c'1\p\< ~|
c~|
c~|
)g2. fis4\sf(|
)g4 r r2|
R1*5|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
e2.\p\< (f4|
e d b)g|
g'2.(a4 g2)f|
a~|
a~|
a|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
f2.\<( g4|
f e cis)a|
\!a'2\ff c|
es(d es)c|
b r r2|
r r4 r8 d|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
es4\< r r2|
r r4 r8 es|
f4 r r r8 f|
es d b)g|
g'2.(as4|
g2)f|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
es2.\<( f4|
es d b)g|
c1|
f\f|
g\p|
g\f|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
c\p\<~|
c~|
c~|
bes4 r8 bes bes4 r8 bes|
bes4\p r r2|
R1*15|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
r4 r8 as'\< ges4 r8 des|
es4 r8 bes' as4 r8 es|
f4 r r2|
des4 r r r8 c|
bes4 r8 bes bes4 r8 bes|
bes4 r8 bes bes4 r8 bes|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
c1\p\< ~||
c~|
c~|
d\f|
es\p|
e\f|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
c\p\< ~|
c~|
c~|
R1|
c4-. c-. r2|
c4-. c-. r2|
- \property Voice.decrescendoText = "dim."
- \property Voice.decrescendoSpanner = "dashed-line"
+ \property VoiceTwo.decrescendoText = "dim."
+ \property VoiceTwo.decrescendoSpanner = "dashed-line"
c4\> r d r|
R1|
\!c4\p r r2|
\notes<
% \global
\time 4/4;
- \context VoiceOne=timpani
+ \context Voice=timpani
\$timpani
>
>
R1*6 |
r4 c-.\f r2 |
R1*2 |
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
r2 c4\p\< r |
r2 c4 r |
r2 c4 r |
c4 r r2|
R1*18|
e1\f(|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceOne.crescendoText = "cresc."
+ \property VoiceOne.crescendoSpanner = "dashed-line"
)c\p\< ~|
c~|
c~|
R1|
c4-. c-. r2|
c4-. c-. r2|
- \property Voice.decrescendoText = "dim."
- \property Voice.decrescendoSpanner = "dashed-line"
+ \property VoiceOne.decrescendoText = "dim."
+ \property VoiceOne.decrescendoSpanner = "dashed-line"
c4\> r g r|
R1|
\!g4\p r r2|
R1*6 |
r4 c-.\f r2 |
R1*2 |
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
r2 c4\p\< r |
r2 c4 r |
r2 c4 r |
c4 r r2|
R1*18|
c1\f~|
- \property Voice.crescendoText = "cresc."
- \property Voice.crescendoSpanner = "dashed-line"
+ \property VoiceTwo.crescendoText = "cresc."
+ \property VoiceTwo.crescendoSpanner = "dashed-line"
c\p\< ~|
c~|
c~|
R1|
c,4-. c-. r2|
c4-. c-. r2|
- \property Voice.decrescendoText = "dim."
- \property Voice.decrescendoSpanner = "dashed-line"
+ \property VoiceTwo.decrescendoText = "dim."
+ \property VoiceTwo.decrescendoSpanner = "dashed-line"
c4\> r g r|
R1|
\!g4\p r r2|
%155
f,1 ~ |
f |
- d'2\sf [g,8-. bes-.][bes()as] |
+ d'2\sf [f,8-. as-.][as()g] |
- es'2\sf [g,8-. bes-.][bes()as] |
+ d'2\sf [f,8-. as-.][as()g] |
% ugh, should be quoted and transposed...
%160
[f8-.\p as-.][as()f][g-. c-.][c()b] |
g2\ff [es8-. g-.][g()f] |
g2\sf [es8-. g-.][g()f] |
%165
- [e-. bes'-.][bes()as][g-. des'-.][des()c] |
+ [e-.\p bes'-.][bes()as][g-. des'-.][des()c] |
R1*2 |
r4 [e,8-.\ff g-.][g()f] r4 |
r4 [e8-. g-.][g()f] r4 |
g'2: g: |
%214
- b,2:16\ff b4: c: |
+ bes,2:16\ff bes4: c: |
g'2: g: |
e2:16\ff e4: f: |
- b,: c: b: c: |
+ bes,: c: bes: c: |
e2:16\ff e4: f: |
b,: c: b: c: |
%220
- r4 r8 es8 es4\sf()fes |
- r4 r8 es8 es4\sf()fes |
- r4 r8 es8 es4\sf()fes |
- r4 r8 es8 es4\sf()fes |
- [des16 des f f]des4: [b16 b d d]b4: |
+ r4 r8 as as2|
+ r4 r8 as as2|
+ r4 r8 as as2|
+ r4 r8 as as2|
+ [des'16 des f f]des4: [b16 b d d]b4: |
%225
% check
[bes16 bes c c]bes4: [a16 a c c]a4: |
f4\f r8 bes as4 r8 es |
des4 r8 ges f4 r8 c |
bes4 r8 e f4 r8 bes, |
- bes4 r8 g'! es4 r8 bes' |
+ bes4 r8 g'! e4 r8 bes' |
\property Voice.crescendoText = "cresc."
\property Voice.crescendoSpanner = "dashed-line"
as4\p r8 des\< c4 r8 g |
f4\f r8 bes as4 r8 es |
des4 r8 ges f4 r8 c |
bes4 r8 e f4 r8 bes, |
- bes4 r8 g'! es4 r8 bes' |
+ bes4 r8 g'! e4 r8 bes' |
\property Voice.crescendoText = "cresc."
\property Voice.crescendoSpanner = "dashed-line"
as4\p r8 des\< c4 r8 g |
g,4. g'8 g2\sf |
g,4. g'8 g2\sf |
as,4. as'8 as2\sf |
- a,4. a'8 a2\sf |
+ b,4. b'8 b2\sf |
%270
[c,8-"sempre"\ff b c d][es\ff d es c]|
(list 'verticalDirection dir? 'direction)
(list 'dynamicDirection dir? 'direction)
(list 'dynamicPadding number? 'padding)
+ (list 'dynamicMinimumSpace number? 'minimum-space)
)))
(define generic-dynamic-line-spanner-properties
(list 'verticalDirection dir? 'direction)
(list 'dynamicDirection dir? 'direction)
(list 'dynamicPadding number? 'padding)
+ (list 'dynamicMinimumSpace number? 'minimum-space)
+ )))
+
+(define generic-volta-spanner-properties
+ (cons "Volta_spanner" (list
+ (list 'voltaVerticalDirection dir? 'direction)
+ (list 'voltaPadding number? 'padding)
+ (list 'voltaMinimumSpace number? 'minimum-space)
)))
(define generic-bar-properties
generic-clef-properties
generic-collision-properties
generic-rest-collision-properties
+ generic-volta-spanner-properties
; generic-staff-symbol-properties
generic-All-properties
)
conversions.append ((1,3,18), conv, 'staffLineLeading -> staffSpace')
+if 1:
+ def conv (str):
+ str = re.sub ('textEmptyDimension *= *##t',
+ 'textNonEmpty = ##f',
+ str)
+ str = re.sub ('textEmptyDimension *= *##f',
+ 'textNonEmpty = ##t',
+ str)
+ return str
+
+ conversions.append ((1,3,35), conv, 'textEmptyDimension -> textNonEmpty')
+
############################
projects / lilypond.git / commitdiff