* parser.yy: Guile > 1.4 compilation fix; scm_unprotect_object is deprecated.
+1.5.10.hwn1
+===========
+
+* Rational bugfix.
+
+* Cleaned up definitions of SystemStartDelimiter
+
+* WTK fix.
+
+* Porrectus patch (Juergen Reuter):
+
+- Syntax change: \porrectus -> \~
+- New porrectus properties: porrectus-width, line-thickness.
+- Bugfix: left<->right confusion in porrectus-engraver.cc.
+- Bugfix: Box dimensions for horizontal slope molecule in porrectus.cc.
+- Enhanced mensural style porrectus shape, considering optical
+ illusion in vertical endings due to slope. Simplified drawing.
+- Code clean-up.
+
1.5.10
======
* Bugfix: stepmake: don't go building executables all over the place,
if NAME is set in environment. Some cleanups.
-
* add-html-footer.py: remove href to self. Substitute @at-variables@
defined in html comments. Any occurrence of
--- /dev/null
+
+New features in 1.4
+
+
+DESIGN
+
+
+* More pervasive GUILE integration resulting in improved design and
+implementation. LilyPond is smaller, cleaner, more flexible, etc.
+
+ - Improved speed with comparable memory footprint
+
+ - More tweakability using less memory with the new `property push'
+ mechanism.
+
+ - Improved robustness: Lily almost never crashes.
+
+ - Access to internal music representation
+
+* New font selection scheme similar to Latex-NFSS.
+
+* Flexible formatting mechanism for musical texts.
+
+* Chordnames are now configurable in every respect
+
+* Part combining for orchestral scores and hymns: two voices are
+ combined into a staff automatically, including Solo/a2
+ indications as appropriate.
+
+
+ERGONOMICS
+
+* Point and click functionality using emacs and Xdvi.
+
+* Rewritten Emacs mode
+
+* Cleaned up syntax details
+
+* Comprehensive documentation, including a rewritten tutorial.
+
+* All properties have doc strings, and internal documentation is
+generated automatically.
+
+* Windows point-and-click installer
+
+
+NOTATION FEATURES
+
+* Piano pedals, Arpeggios, Glissandi, many more note head
+shapes, Medieval clefs, custodes.
+
+* Better lyrics placement: Automatical phrasing, melisma alignment,
+ and stanza numbering.
+
+* Typography: More elegant slurs, aligned dynamics, text crescendos,
+
+* Easy-play note heads
+
+* ASCIIScript: ASCII-art output
+
+* Improved standalone postscript layout.
+
+
+IMPORT/EXPORT
+
+* dynamics, tempo changes in the MIDI output
+
+* Finale (.etf), PMX, Musedata and Mup import tools.
+
+
+MISCELLANEOUS
+
+* Mutopia ports collection: easily accessible music archive.
+
+* Translations into Japanese, French and Russian
+
+* Many many many bugfixes.
+
-New features in 1.4
+New features in 1.5
+* Figured bass support
-DESIGN
+* Improved grace notes
+* Better spacing.
-* More pervasive GUILE integration resulting in improved design and
-implementation. LilyPond is smaller, cleaner, more flexible, etc.
-
- - Improved speed with comparable memory footprint
-
- - More tweakability using less memory with the new `property push'
- mechanism.
-
- - Improved robustness: Lily almost never crashes.
-
- - Access to internal music representation
-
-* New font selection scheme similar to Latex-NFSS.
-
-* Flexible formatting mechanism for musical texts.
-
-* Chordnames are now configurable in every respect
-
-* Part combining for orchestral scores and hymns: two voices are
- combined into a staff automatically, including Solo/a2
- indications as appropriate.
-
-
-ERGONOMICS
-
-* Point and click functionality using emacs and Xdvi.
-
-* Rewritten Emacs mode
-
-* Cleaned up syntax details
-
-* Comprehensive documentation, including a rewritten tutorial.
-
-* All properties have doc strings, and internal documentation is
-generated automatically.
-
-* Windows point-and-click installer
-
-
-NOTATION FEATURES
-
-* Piano pedals, Arpeggios, Glissandi, many more note head
-shapes, Medieval clefs, custodes.
-
-* Better lyrics placement: Automatical phrasing, melisma alignment,
- and stanza numbering.
-
-* Typography: More elegant slurs, aligned dynamics, text crescendos,
-
-* Easy-play note heads
-
-* ASCIIScript: ASCII-art output
-
-* Improved standalone postscript layout.
-
-
-IMPORT/EXPORT
-
-* dynamics, tempo changes in the MIDI output
-
-* Finale (.etf), PMX, Musedata and Mup import tools.
-
-
-MISCELLANEOUS
-
-* Mutopia ports collection: easily accessible music archive.
-
-* Translations into Japanese, French and Russian
-
-* Many many many bugfixes.
-
+* More ancient notation support.
PACKAGE_NAME=LilyPond
MAJOR_VERSION=1
MINOR_VERSION=5
-PATCH_LEVEL=10
-MY_PATCH_LEVEL=jcn3
+PATCH_LEVEL=11
+MY_PATCH_LEVEL=
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
return 0;
else
{
- /*
- TODO: fix this code; (r-s).sign() is too expensive.
-
- return r.sign_ * ::sign (r.num_ * s.den_ - s.num_ * r.den_);
- */
- return (r - s).sign ();
+ return r.sign_ * ::sign (int (r.num_ * s.den_) - int (s.num_ * r.den_));
}
}
a! b!
\property Staff.BarLine \override #'bar-size = #3.0 \bar "|"
\property Voice.NoteHead \override #'style = #'vaticana_virga
- ces' b! ces'! \porrectus ges! \porrectus fes!
+ ces' b! ces'! \~ ges! \~ fes!
\breathe
\clef "vaticana_fa1"
\property Voice.NoteHead \override #'style = #'vaticana_quilisma
\property Voice.Porrectus \override #'solid = ##f
\property Voice.Porrectus \override #'add-stem = ##t
\property Voice.Porrectus \override #'stem-direction = #1
+ \property Voice.Porrectus \override #'line-thickness = #0.7
+ % \property Voice.Porrectus \override #'porrectus-width = #3.0
\key a \major
% IMPORTANT NOTE:
%
- % The porrectus syntax is subject to change. For proper
- % use, it may eventually change into something like this:
+ % The porrectus syntax is definitely subject to change. For
+ % proper use, it may eventually change into something like this:
%
- % \ligature { e \porrectus c }
+ % \startLigature e \~ c \endLigature
%
% The reason is that there needs to be some enclosing instance
% for correct handling of line breaking, alignment with
% adjacent note heads, and placement of accidentals.
\clef "neo_mensural_c2"
- cis' e' \porrectus d' gis' \porrectus e'
+ cis' e' \~ d' gis' \~ e'
\property Staff.forceClef = ##t
\clef "neo_mensural_c2"
- fis' \porrectus b cis''
- b \porrectus a a \porrectus fis
+ fis' \~ b cis''
+ b \~ a a \~ fis
\clef "petrucci_c2"
- cis \porrectus fis ces1 % \bar "|"
+ cis \~ fis ces1 % \bar "|"
\clef "petrucci_c2"
r\longa
% porrectus grobs. Is this an initialization bug in the line
% breaking algorithm?
- bes'! \porrectus as'! \porrectus cis''!
- bes'! \porrectus fis'! as'! \porrectus ges'!
+ bes'! \~ as'! \~ cis''!
+ bes'! \~ fis'! as'! \~ ges'!
\property Staff.forceClef = ##t
\clef "mensural_g"
e' d' c'1 \bar "|"
class Porrectus
{
public:
- static void set_left_head (Grob *, SCM);
- static SCM get_left_head (Grob *);
- static void set_right_head (Grob *, SCM);
- static SCM get_right_head (Grob *);
+ static void set_left_head (Grob *, Item *);
+ static Item *get_left_head (Grob *);
+ static void set_right_head (Grob *, Item *);
+ static Item *get_right_head (Grob *);
DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
private:
- static Molecule brew_vaticana_molecule (Item *, bool, bool, Direction, Real);
- static Molecule brew_mensural_molecule (Item *, bool, bool, Direction, Real);
+ static Molecule brew_vaticana_molecule (Item *, Real,
+ bool, Real, Real,
+ bool, Direction);
+ static Molecule brew_mensural_molecule (Item *, Real,
+ bool, Real, Real,
+ bool, Direction);
static Molecule brew_horizontal_slope (Real, Real, Real);
static Molecule create_ledger_line (Interval, Grob *);
static Molecule create_streepjes (Grob *, int, int, Interval);
return E_OPEN;
case ')':
return E_CLOSE;
+ case '~':
+ return E_TILDE;
default:
return E_CHAR;
}
{"repeat", REPEAT},
{"addlyrics", ADDLYRICS},
{"partcombine", PARTCOMBINE},
- {"porrectus", PORRECTUS},
{"score", SCORE},
{"script", SCRIPT},
{"stylesheet", STYLESHEET},
%token PAPER
%token PARTIAL
%token PENALTY
-%token PORRECTUS
%token PROPERTY
%token OVERRIDE SET REVERT
%token PT_T
%token CONTEXT
/* escaped */
-%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE
+%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE E_TILDE
%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET
%type <i> exclamations questions dots
| BREATHE {
$$ = new Breathing_sign_req;
}
- | PORRECTUS {
+ | E_TILDE {
$$ = new Porrectus_req;
}
;
-
verbose_command_req:
COMMANDSPANREQUEST bare_int STRING { /*TODO: junkme */
Span_req * sp_p = new Span_req;
* moment of the second note. Actually, it should take the moment of
* the first note.
*
- * TODO: Introduce "\~" as alternative syntax for "\porrectus"?
+ * FIXME: Turn off typesetting of stems, flags, dots, etc.
*
* TODO: Hufnagel support.
*
- * TODO: Fine-tuning of porrectus shape. In particular, the mensural
- * non-solid shape could either be slightly bigger in height, or the
- * extrem points could be slightly vertically shifted apart.
+ * TODO: Fine-tuning of vaticana-style porrectus shape; in particular,
+ * ensure solidity if solid is set to #t and thickness is very small.
*
* TODO: For white mensural (i.e. #'style=#'mensural, #'solid=##f)
* porrectus grobs, it is possible to automatically determine all
* porrectus specific properties (add-stem, stem-direction) solely
* from the duration of the contributing notes and time-signature.
* Introduce a boolean grob property called auto-config, so that, if
- * turned on, lily automatically sets the remaining properties
- * properly.
+ * turned on, lily automatically sets the properties add-stem and
+ * stem-direction properly.
*
- * TODO: The following issues are not (and should not be) handled by
- * this engraver: (1) accidentals placement, (2) avoiding line
- * breaking inbetween porrectus, (3) spacing. For example, currently
- * only the accidental for the second note (cp. the above FIXME) is
- * printed. These issues should be resolved by some sort of ligature
- * context that encloses use of this engraver, using syntax like:
- * \ligature { e \porrectus c }.
+ * TODO: The following issues are currently not handled by this
+ * engraver: (1) accidentals placement, (2) avoiding line breaking
+ * inbetween porrectus, (3) spacing. (Han-Wen says: for (2), look at
+ * beam engraver.) For example, currently only the accidental for the
+ * second note (cp. the above FIXME) is printed. These issues should
+ * be resolved by some sort of ligature context that encloses use of
+ * this engraver, using syntax like: \ligature { e \~ c }.
*
* TODO: Do not allow a series of adjacent porrectus requests, as in:
- * e \porrectus d \porrectus c.
- */
+ * e \~ d \~ c.
+ *
+ * TODO: Junk duplicate (or rather triple) implementation of
+ * create_ledger_line in porrectus.cc, custos.cc and note-head.cc. */
#include "staff-symbol-referencer.hh"
#include "porrectus.hh"
Note_req *note_req_l_ = dynamic_cast <Note_req *> (info_l_.req_l_);
if (!note_req_l_)
return;
- left_heads_.push (PHead_melodic_tuple (info_l_.elem_l_, note_req_l_,
- now_mom () +
- note_req_l_->length_mom ()));
+ right_heads_.push (PHead_melodic_tuple (info_l_.elem_l_, note_req_l_,
+ now_mom () +
+ note_req_l_->length_mom ()));
}
}
{
left_heads_.sort (PHead_melodic_tuple::pitch_compare);
right_heads_.sort (PHead_melodic_tuple::pitch_compare);
-
- SCM head_list = SCM_EOL;
-
int i = left_heads_.size () - 1;
int j = right_heads_.size () - 1;
while ((i >= 0) && (j >= 0))
{
- head_list =
- gh_cons (gh_cons (right_heads_[j].head_l_->self_scm (),
- left_heads_[i].head_l_->self_scm ()),
- head_list);
-
- past_notes_pq_. insert (left_heads_[i]);
- left_heads_.del (i);
- right_heads_.del (j);
- i--;
- j--;
- }
-
- for (SCM s = head_list; gh_pair_p (s); s = gh_cdr (s))
- {
- SCM caar = gh_caar (s);
- SCM cdar = gh_cdar (s);
-
- Item *left_head = dynamic_cast<Item*> (unsmob_grob (caar));
- Item *right_head = dynamic_cast<Item*> (unsmob_grob (cdar));
+ Item *left_head = dynamic_cast<Item*> (left_heads_[i].head_l_);
+ Item *right_head = dynamic_cast<Item*> (right_heads_[j].head_l_);
left_head->set_grob_property("transparent", gh_bool2scm(true));
right_head->set_grob_property("transparent", gh_bool2scm(true));
Grob *porrectus_p_ = new Item (get_property ("Porrectus"));
- Porrectus::set_left_head(porrectus_p_, caar);
- Porrectus::set_right_head(porrectus_p_, cdar);
+ Porrectus::set_left_head(porrectus_p_, left_head);
+ Porrectus::set_right_head(porrectus_p_, right_head);
porrectus_p_arr_.push (porrectus_p_);
- announce_grob (porrectus_p_, 0);
+ announce_grob (porrectus_p_, porrectus_req_l_);
+
+ past_notes_pq_. insert (right_heads_[i]);
+ left_heads_.del (i);
+ right_heads_.del (j);
+ i--;
+ j--;
}
}
}
void
Porrectus_engraver::stop_translation_timestep ()
{
- for (int i = 0; i < left_heads_.size (); i++)
+ for (int i = 0; i < right_heads_.size (); i++)
{
- past_notes_pq_.insert (left_heads_[i]);
+ past_notes_pq_.insert (right_heads_[i]);
}
- left_heads_.clear ();
+ right_heads_.clear ();
for (int i = 0; i < porrectus_p_arr_.size (); i++)
{
while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now)
past_notes_pq_.delmin ();
- right_heads_.clear ();
+ left_heads_.clear ();
while (past_notes_pq_.size () &&
(past_notes_pq_.front ().end_ == now))
- right_heads_.push (past_notes_pq_.get ());
+ left_heads_.push (past_notes_pq_.get ());
}
ADD_THIS_TRANSLATOR (Porrectus_engraver);
#include "direction.hh"
#include "bezier.hh"
#include "font-interface.hh"
+#include "paper-def.hh"
#include "math.h" // rint
void
-Porrectus::set_left_head (Grob *me, SCM left_head)
+Porrectus::set_left_head (Grob *me, Item *left_head)
{
- if (left_head == SCM_EOL)
+ if (left_head != 0)
{
- warning (_ ("(left_head == SCM_EOL) (ignored)"));
+ me->set_grob_property ("left-head", left_head->self_scm());
+ }
+ else
+ {
+ programming_error (_ ("(left_head == 0)"));
+ me->set_grob_property ("left-head", SCM_EOL);
}
- me->set_grob_property ("left-head", left_head);
}
-SCM
+Item *
Porrectus::get_left_head (Grob *me)
{
- SCM left_head = me->get_grob_property ("left-head");
- return left_head;
+ SCM left_head_scm = me->get_grob_property ("left-head");
+ if (left_head_scm == SCM_EOL)
+ {
+ programming_error (_ ("undefined left_head"));
+ return 0;
+ }
+ else
+ {
+ Item *left_head = dynamic_cast<Item*> (unsmob_grob (left_head_scm));
+ return left_head;
+ }
}
void
-Porrectus::set_right_head (Grob *me, SCM right_head)
+Porrectus::set_right_head (Grob *me, Item *right_head)
{
- if (right_head == SCM_EOL)
+ if (right_head != 0)
+ {
+ me->set_grob_property ("right-head", right_head->self_scm());
+ }
+ else
{
- warning (_ ("(right_head == SCM_EOL) (ignored)"));
+ programming_error (_ ("(right_head == 0)"));
+ me->set_grob_property ("right-head", SCM_EOL);
}
- me->set_grob_property ("right-head", right_head);
}
-SCM
+Item *
Porrectus::get_right_head (Grob *me)
{
- SCM right_head = me->get_grob_property ("right-head");
- return right_head;
+ SCM right_head_scm = me->get_grob_property ("right-head");
+ if (right_head_scm == SCM_EOL)
+ {
+ programming_error (_ ("undefined right_head"));
+ return 0;
+ }
+ else
+ {
+ Item *right_head = dynamic_cast<Item*> (unsmob_grob (right_head_scm));
+ return right_head;
+ }
}
// Uugh. The following two functions are almost duplicated code from
if (!stem_direction)
stem_direction = DOWN;
- SCM left_head_scm = get_left_head (me);
- SCM right_head_scm = get_right_head (me);
- if ((left_head_scm == SCM_EOL) || (right_head_scm == SCM_EOL))
- {
- warning (_ ("junking lonely porrectus"));
- return SCM_EOL;
- }
-
- Item *left_head = dynamic_cast<Item*> (unsmob_grob (left_head_scm));
- Item *right_head = dynamic_cast<Item*> (unsmob_grob (right_head_scm));
+ Item *left_head = get_left_head (me);
+ Item *right_head = get_right_head (me);
if (!left_head || !right_head)
{
warning (_ ("junking lonely porrectus"));
+ me->suicide ();
return SCM_EOL;
}
Real interval = right_position_f - left_position_f;
Molecule molecule;
+
+ SCM line_thickness_scm = me->get_grob_property ("line-thickness");
+ Real line_thickness;
+ if (gh_number_p (line_thickness_scm))
+ {
+ line_thickness = gh_scm2double (line_thickness_scm);
+ }
+ else
+ {
+ line_thickness = 1.0;
+ }
+ Real thickness =
+ line_thickness * me->paper_l ()->get_var ("stafflinethickness");
+
+ SCM porrectus_width_scm = me->get_grob_property ("porrectus-width");
+ Real porrectus_width;
+ if (gh_number_p (porrectus_width_scm))
+ {
+ porrectus_width = gh_scm2double (porrectus_width_scm);
+ }
+ else
+ {
+ porrectus_width = 2.4;
+ }
+ Real width = porrectus_width * Staff_symbol_referencer::staff_space (me);
+
if (String::compare_i (style, "vaticana") == 0)
- molecule = brew_vaticana_molecule (me, solid, add_stem, stem_direction,
- interval);
+ molecule = brew_vaticana_molecule (me, interval,
+ solid, width, thickness,
+ add_stem, stem_direction);
else if (String::compare_i (style, "mensural") == 0)
- molecule = brew_mensural_molecule (me, solid, add_stem, stem_direction,
- interval);
+ molecule = brew_mensural_molecule (me, interval,
+ solid, width, thickness,
+ add_stem, stem_direction);
else
return SCM_EOL;
Molecule
Porrectus::brew_vaticana_molecule (Item *me,
+ Real interval,
bool solid,
+ Real width,
+ Real thickness,
bool add_stem,
- Direction stem_direction,
- Real interval)
+ Direction stem_direction)
{
Real space = Staff_symbol_referencer::staff_space (me);
- Real line_thickness = space/6;
- Real width = 2.4 * space;
Molecule molecule = Molecule ();
if (interval >= 0.0)
{
- warning (_ ("ascending vaticana style porrectus (ignored)"));
+ warning (_ ("ascending vaticana style porrectus"));
}
if (add_stem)
{
bool consider_interval =
- ((stem_direction == DOWN) && (interval < 0.0)) ||
- ((stem_direction == UP) && (interval > 0.0));
+ stem_direction * interval > 0.0;
- Interval stem_box_x (-line_thickness/2, +line_thickness/2);
+ Interval stem_box_x (-thickness/2, +thickness/2);
Interval stem_box_y;
if (consider_interval)
molecule.add_molecule(stem);
}
- Box vertical_edge (Interval (-line_thickness/2, +line_thickness/2),
- Interval (-4*line_thickness/2, +4*line_thickness/2));
+ Box vertical_edge (Interval (-thickness/2, +thickness/2),
+ Interval (-4*thickness/2, +4*thickness/2));
Molecule left_edge = Lookup::filledbox (vertical_edge);
Molecule right_edge = Lookup::filledbox (vertical_edge);
right_edge.translate_axis (width, X_AXIS);
bezier.control_[3] = Offset (1.00 * width, interval / 2.0);
Molecule slice;
- slice = Lookup::slur (bezier, 0.0, line_thickness);
- slice.translate_axis (-3 * line_thickness/2, Y_AXIS);
+ slice = Lookup::slur (bezier, 0.0, thickness);
+ slice.translate_axis (-3 * thickness/2, Y_AXIS);
molecule.add_molecule (slice);
if (solid)
for (int i = -2; i < +2; i++)
{
- slice = Lookup::slur (bezier, 0.0, line_thickness);
- slice.translate_axis (i * line_thickness/2, Y_AXIS);
+ slice = Lookup::slur (bezier, 0.0, thickness);
+ slice.translate_axis (i * thickness/2, Y_AXIS);
molecule.add_molecule (slice);
}
- slice = Lookup::slur (bezier, 0.0, line_thickness);
- slice.translate_axis (+3 * line_thickness/2, Y_AXIS);
+ slice = Lookup::slur (bezier, 0.0, thickness);
+ slice.translate_axis (+3 * thickness/2, Y_AXIS);
molecule.add_molecule (slice);
return molecule;
Molecule
Porrectus::brew_mensural_molecule (Item *me,
+ Real interval,
bool solid,
+ Real width,
+ Real thickness,
bool add_stem,
- Direction stem_direction,
- Real interval)
+ Direction stem_direction)
{
Real space = Staff_symbol_referencer::staff_space (me);
- Real line_thickness = space/6;
- Real width = 2.4 * space;
Molecule molecule = Molecule ();
if (add_stem)
// brew_vaticana_molecule, but may eventually be changed.
bool consider_interval =
- ((stem_direction == DOWN) && (interval < 0.0)) ||
- ((stem_direction == UP) && (interval > 0.0));
+ stem_direction * interval > 0.0;
- Interval stem_box_x (0, line_thickness);
+ Interval stem_box_x (0, thickness);
Interval stem_box_y;
if (consider_interval)
Real slope = (interval / 2.0) / width;
- Molecule left_edge =
- brew_horizontal_slope (line_thickness, slope, 3.5 * line_thickness);
- left_edge.translate_axis (0.25 * line_thickness, Y_AXIS);
- molecule.add_molecule(left_edge);
-
- Molecule right_edge =
- brew_horizontal_slope (line_thickness, slope, 3.5 * line_thickness);
- right_edge.translate_axis (width - line_thickness, X_AXIS);
- right_edge.translate_axis (interval / 2.0 * (1.0 - (line_thickness/width)) +
- 0.25 * line_thickness, Y_AXIS);
- molecule.add_molecule(right_edge);
-
- Molecule bottom_edge =
- Porrectus::brew_horizontal_slope (width, slope, line_thickness);
- bottom_edge.translate_axis (-3 * line_thickness/2, Y_AXIS);
- molecule.add_molecule (bottom_edge);
-
- Molecule top_edge =
- Porrectus::brew_horizontal_slope (width, slope, line_thickness);
- top_edge.translate_axis (+3 * line_thickness/2, Y_AXIS);
- molecule.add_molecule (top_edge);
+ // Compensate optical illusion regarding vertical position of left
+ // and right endings due to slope.
+ Real ypos_correction = -0.1*space * sign(slope);
+ Real slope_correction = 0.2*space * sign(slope);
+ Real corrected_slope = slope + slope_correction/width;
if (solid)
{
- Molecule core =
- Porrectus::brew_horizontal_slope (width, slope, 6 * line_thickness/2);
- core.translate_axis (-line_thickness/2, Y_AXIS);
- molecule.add_molecule (core);
+ Molecule solid_head =
+ brew_horizontal_slope (width, corrected_slope, 0.6*space);
+ molecule.add_molecule (solid_head);
}
-
+ else
+ {
+ Molecule left_edge =
+ brew_horizontal_slope (thickness, corrected_slope, 0.6*space);
+ molecule.add_molecule(left_edge);
+
+ Molecule right_edge =
+ brew_horizontal_slope (thickness, corrected_slope, 0.6*space);
+ right_edge.translate_axis (width-thickness, X_AXIS);
+ right_edge.translate_axis (corrected_slope * (width-thickness), Y_AXIS);
+ molecule.add_molecule(right_edge);
+
+ Molecule bottom_edge =
+ brew_horizontal_slope (width, corrected_slope, thickness);
+ bottom_edge.translate_axis (-0.3*space, Y_AXIS);
+ molecule.add_molecule (bottom_edge);
+
+ Molecule top_edge =
+ brew_horizontal_slope (width, corrected_slope, thickness);
+ top_edge.translate_axis (+0.3*space, Y_AXIS);
+ molecule.add_molecule (top_edge);
+ }
+ molecule.translate_axis (ypos_correction, Y_AXIS);
return molecule;
}
+/*
+ * Horizontal Slope:
+ *
+ * /| ^
+ * / | |
+ * / | | thickness
+ * / | |
+ * / | v
+ * | /
+ * | /
+ * (0,0) x /slope=dy/dx
+ * | /
+ * |/
+ *
+ * <----->
+ * width
+ */
Molecule
-Porrectus::brew_horizontal_slope(Real width, Real slope, Real line_thickness)
+Porrectus::brew_horizontal_slope(Real width, Real slope, Real thickness)
{
SCM width_scm = gh_double2scm (width);
SCM slope_scm = gh_double2scm (slope);
- SCM line_thickness_scm = gh_double2scm (line_thickness);
+ SCM thickness_scm = gh_double2scm (thickness);
SCM horizontal_slope = gh_list (ly_symbol2scm ("beam"),
width_scm, slope_scm,
- line_thickness_scm, SCM_UNDEFINED);
+ thickness_scm, SCM_UNDEFINED);
Box b (Interval (0, width),
- Interval (0, width * slope +
- sqrt (sqr(line_thickness/slope) + sqr (line_thickness))));
+ Interval (-thickness/2, thickness/2 + width*slope));
return Molecule (b, horizontal_slope);
}
void
System_start_delimiter_engraver::initialize ()
{
- delim_ = new Spanner (get_property ("SystemStartDelimiter"));
+ SCM delim_name =get_property ("SystemStartDelimiter");
+ delim_ = new Spanner (get_property (delim_name));
delim_->set_bound (LEFT, unsmob_grob (get_property ("currentCommandColumn")));
gh_double2scm (arc_height),
gh_double2scm (height),
me->get_grob_property ("arch-thick"),
- me->get_grob_property ("bracket-thick"),
+ me->get_grob_property ("thickness"),
SCM_UNDEFINED);
/*
SCM
System_start_delimiter::after_line_breaking (SCM smob)
{
- try_collapse (unsmob_grob (smob));
- return SCM_UNSPECIFIED;
-}
-
-void
-System_start_delimiter::try_collapse (Grob*me)
-{
+ Grob * me = unsmob_grob (smob);
SCM gl = me->get_grob_property ("glyph");
if (scm_ilength (me->get_grob_property ("elements")) <= 1 && gl == ly_symbol2scm ("bar-line"))
{
me->suicide ();
}
-
+
+ return SCM_UNSPECIFIED;
}
MAKE_SCHEME_CALLBACK (System_start_delimiter,brew_molecule,1);
-
SCM
System_start_delimiter::brew_molecule (SCM smob)
{
if (!gh_symbol_p (s))
return SCM_EOL;
- SCM c = me->get_grob_property ((ly_symbol2string (s) + "-collapse-height")
- .ch_C ());
+ SCM c = me->get_grob_property ("collapse-height");
Real staff_space = Staff_symbol_referencer::staff_space (me);
Interval ext = ly_scm2interval (Axis_group_interface::group_extent_callback
\name InnerChoirStaff
alignmentReference = #0
\consists "System_start_delimiter_engraver"
- SystemStartDelimiter \override #'glyph = #'bracket
+ SystemStartDelimiter = #'SystemStartBracket
\accepts "Staff"
\accepts "RhythmicStaff"
\consists "Span_bar_engraver"
\consists "Span_arpeggio_engraver"
\consists "System_start_delimiter_engraver"
- SystemStartDelimiter \override #'glyph = #'brace
-
+ SystemStartDelimiter = #'SystemStartBrace
Generic_property_list = #generic-grand-staff-properties
\accepts "Staff"
}
\consists "Span_bar_engraver"
\consists "Span_arpeggio_engraver"
\consists "Output_property_engraver"
- SystemStartDelimiter \override #'glyph = #'bracket
+ SystemStartDelimiter = #'SystemStartBracket
\consists "System_start_delimiter_engraver"
\accepts "Staff"
soloADue = ##t
splitInterval = #'(0 . 1)
changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512))
-
+ SystemStartDelimiter =#'SystemStartBar
barAuto = ##t
voltaVisibility = ##t
% name, glyph id, clef position
Begin3
Title: LilyPond
-Version: 1.5.10
-Entered-date: 17SEP01
+Version: 1.5.11
+Entered-date: 21SEP01
Description: @BLURB@
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.5.10.tar.gz
+ 1000k lilypond-1.5.11.tar.gz
Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
- 1000k lilypond-1.5.10.tar.gz
+ 1000k lilypond-1.5.11.tar.gz
Copying-policy: GPL
End
%define name lilypond
-%define version 1.5.10
+%define version 1.5.11
%define release 1mdk
Name: %{name}
%define info yes
Name: lilypond
-Version: 1.5.10
+Version: 1.5.11
Release: 1
License: GPL
Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.10.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.11.tar.gz
Summary: Create and print music notation
URL: http://www.lilypond.org/
BuildRoot: /tmp/lilypond-install
Distribution: SuSE Linux 7.0 (i386)
Name: lilypond
-Version: 1.5.10
+Version: 1.5.11
Release: 2
Copyright: GPL
Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.10.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.11.tar.gz
# music notation software for.. ?
Summary: A program for printing sheet music.
URL: http://www.lilypond.org/
#include "rational.hh"
#include "duration.hh"
#include "duration-convert.hh"
-#include "duration-iter.hh"
// statics Duration
int Duration::division_1_i_s = 384 * 4;
/*
- midi-score-parser.hh -- declare
+ midi-score-parser.hh -- declare Midi_score_parser
source file of the GNU LilyPond music typesetter
# Hmm, name dir midi too, then?
NAME=midi
-STEPMAKE_TEMPLATES=c install python-module
+
+# compile fucks up on without autoconf -I flag.
+STEPMAKE_TEMPLATES=c install # python-module
INSTALLATION_FILES=$(outdir)/midi.so
INSTALLATION_DIR=$(datadir)/python
+# do nothing; module ins't used yet.
+
include $(depth)/make/stepmake.make
+
d c g' g,
%%30
\context Staff=bass <
- {\stemUp c2 ~ | c1 ~ | c1 }
- \context Voice=four {\stemDown c,2 ~ | c1 ~ | c1 }
+ { \voiceOne c2 ~ | c1 ~ | c1 }
+ \context Voice=four { \voiceTwo c,2 ~ | c1 ~ | c1 }
>
}
(Porrectus . (
(style . mensural)
+ (auto-properties . #t)
(solid . #f)
+ (porrectus-width . 2.4)
+ (line-thickness . 1.0)
(add-stem . #t)
(stem-direction . 1)
(molecule-callback . ,Porrectus::brew_molecule)
))
;; TODO: should split in 3
- (SystemStartDelimiter . (
+ (SystemStartBrace . (
+ (glyph . brace)
(molecule-callback . ,System_start_delimiter::brew_molecule)
- (after-line-breaking-callback . ,System_start_delimiter::after_line_breaking)
- ;; really 4.0, but 5 to be on safe side.
- (brace-collapse-height . 5.0)
- (bracket-collapse-height . 1)
- (thickness . 1.6)
+ (collapse-height . 5.0)
+ (font-family . braces)
+ (Y-extent-callback . #f)
+ (meta . ,(grob-description "SystemStartBrace" system-start-delimiter-interface font-interface))
+ ))
+ (SystemStartBracket . (
+ (Y-extent-callback . #f)
+ (molecule-callback . ,System_start_delimiter::brew_molecule)
+ (glyph . bracket)
(arch-height . 1.5)
(arch-angle . 50.0)
(arch-thick . 0.25)
- (glyph . bar-line)
(arch-width . 1.5)
- (bracket-thick . 0.25)
+ (thickness . 0.25)
+ (meta . ,(grob-description "SystemStartBracket" system-start-delimiter-interface ))
+ (bracket-collapse-height . 1)
+ ))
+ (SystemStartBar . (
(Y-extent-callback . #f)
- (font-family . braces)
- ;; if you want to set point-size, you cannot set
- ;; relative-size, as no font will be found for other
- ;; sheets than 20
- ;;(font-design-size . 20)
- ;;(font-relative-size . #f)
- (meta . ,(grob-description "SystemStartDelimiter" system-start-delimiter-interface font-interface))
- ))
+ (molecule-callback . ,System_start_delimiter::brew_molecule)
+ (glyph . bar-line)
+ (thickness . 1.6)
+ (after-line-breaking-callback . ,System_start_delimiter::after_line_breaking)
+ (meta . ,(grob-description "SystemStartBar" system-start-delimiter-interface ))
+ ))
(TextScript . (
(molecule-callback . ,Text_item::brew_molecule)
(grob-property-description 'padding number? "add this much extra space between objects that are next to each other.")
(grob-property-description 'parallel-beam boolean? "internal: true if there is a beam just as wide as the bracket .")
(grob-property-description 'pitches list? "list of musical-pitch.")
+(grob-property-description 'porrectus-width number? "width of the porrectus ligature measured in staff space.")
(grob-property-description 'raise number? "height for text to be raised (a negative value lowers the text.")
(grob-property-description 'right-padding number? "space right of accs.")
(grob-property-description 'right-trim-amount number? "shortening of the lyric extender on the right.")
'System_start_delimiter_engraver
(engraver-description
"System_start_delimiter_engraver"
- "creates a SystemStartDelimiter spanner"
- '(SystemStartDelimiter)
+ "creates a system start delimiter (ie. SystemStart@{Bar,Brace,Bracket@} spanner"
+ '(SystemStartBar SystemStartBrace SystemStartBracket)
'(
)))
projects / lilypond.git / commitdiff