* Large cleanups, enhanced design and GUILE integration for smaller
memory footprint and more flexible code.
-* Direct output to PostScript (optional), PDFTeX or as GUILE script.
+* Direct output to PostScript (optional), PDFTeX or as GUILE script
+ (default output still to plain TeX).
-* convertors for ABC and MUP formats.
+* Convertors for ABC and MUP formats.
-* Font: now available as scaleable PostScript. New glyphs: time
+* Font: now available as scalable PostScript. New glyphs: time
signature, more note heads.
* Enhanced input: semi-automatic beaming, (nested) tuplets, (nested)
repeats, automatic staff switching, chordnames, automatic Lyrics
durations.
-* Grace notes, volta brackets, better spacing, multiple styles for
- note heads and time signatures, breathing signs, lyric extenders,
- cross staff beaming and slurring.
+* Grace notes, volta brackets, multiple styles for note heads and
+ time signatures, breathing signs, lyric extenders, cross staff
+ beaming and slurring.
-* --safe option for the paranoid
+* --safe option for the paranoid.
* More elegant spacing. Text is spaced exactly.
-* lots of bugfixes
+* Lots of bugfixes.
-% -*-LaTeX-*-
+% -*-LaTeX-*- vim:tw=72
\documentclass{article}
\title{LilyPond feature test}
\mudelafile{stem-tremolo.ly}
-Abbreviation beams (official naming?) are a kind of repeat symbol.
-To avoid confusion, abbreviation beams do not touch the stems, but
-leave a gap. Abbreviation beams on half notes are not ambiguous,
-and should touch the stems.
-
-\mudelafile{abbreviation-beam.sly}
+Chord tremolos look like beams, but are a kind of repeat symbol.
+To avoid confusion, chord tremolo beams do not reach the stems, but
+leave a gap. Chord tremolo beams on half notes are not ambiguous,
+as half notes cannot appear in a regular beam, and should reach the
+stems.
+
+\mudelafile{chord-tremolo.sly}
Beams, stems and noteheads often have communication troubles, since
the two systems for y dimensions (1 unit = staffspace, 1 unit = 1
Lyrics can be set to a melody automatically. Excess lyrics will be
dumped. Lyrics will not be set over rests. You can have melismata
either by setting a property melismaBusy, or by setting
-automaticMelismas (which will set melismas during slurs). If you want a
-different order than first Music, then Lyrics, you must precook a
-chord of staffs/lyrics and label those. Of course \verb+\rhythm+
-ignores any other rhythms in the piece. Hyphens and extenders do not
-assume anything about lyric lengths, so they continue to work.
+automaticMelismas (which will set melismas during slurs and ties). If
+you want a different order than first Music, then Lyrics, you must
+precook a chord of staffs/lyrics and label those. Of course
+\verb+\rhythm+ ignores any other rhythms in the piece. Hyphens and
+extenders do not assume anything about lyric lengths, so they continue
+to work.
\mudelafile{lyric-combine.ly}
and whole rests just outside the staff get ledger lines in different
cases.
-\mudelafile{rest-collision.ly}
+% \m udelafile{rest-collision.ly}
Normal collisions. We have support for four voice polyphony, where the
middle voices are horizontally shifted in a limited number of cases.
\mudelafile{collisions.ly}
+In some cases, collisions may be hairy to resolve, or the typesetter
+may have special whishes. For those special cases, note shifts can be
+set by hand.
+
+\mudelafile{note-shift.sly}
+
The number of stafflines of a staff can be set with the property
numberOfStaffLines. Ledger lines both on note heads and rests are
adjusted. Barlines also are adjusted.
)
-This document describes the the GNU LilyPond input format, which is a
+
+sect(Overview)
+
+
+This bind(document)footnote(This document was revised for LilyPond
+1.2.) describes the the GNU LilyPond input format, which is a
language for defining music. We call this language (rather
arrogantly) The Musical Definition Language or Mudela, for
short.footnote(If anybody comes up with a better name, we'd gladly
Score Definition Language. ISO standard 10743 defines a Standard
Music Description Language. We're not being original here.)
-This document was revised for LilyPond 1.2.
+Mudela is a language that allows you to
+itemize(
+it() create musical expressions by combining pitches, durations to
+it() output those musical expressions to various formats
+it() give those musical expressions and output definitions names, so
+you can enter them in manageable chunks.
+)
-The first aim of Mudela is to define a piece of music, being complete
-from both from a musical typesetting, as from a musical performing
-point of view.
+Mudela aims to be a language that defines a piece of music completely
+both for typesetting and for a performance point of view.
-The Musical Definition Language (Mudela), has a logical structure,
-making use of identifiers, that allows for flexible input, and
-definition reuse. See the documentation file file(MANIFESTO), included
-with the LilyPond sources for reasons and design considerations.
+sect(General syntax)
+The percent sign introduces line comments.
-sect(Running LilyPond)
+The syntax for most constructions follows this pattern: A keyword that
+is the name of the construction, followed by a list of items, which is
+enclosed in braces, e.g. a paper block looks like this
+verb(\paper {
+ linewidth = 14.0 \cm; % one item
+ indent = \linewidth / 12.0 ; % another one.
+})
+Keywords are prefixed by a backslash. Words without backslashes are
+strings, like ``linewidth'' in the above example. When you do an
+assigment, the left hand side is a string, the name name of the
+identifier you wish to assign to. When you refer to an identifier,
+you must put a backslash before the name, like in second item of the
+example.
-When invoked with a filename that has no extension, LilyPond will try
-adding a file(.ly) extension first, then a file(.sly) and then a
-file(.ly) extension second. If the filename ends with file(.fly),
-LilyPond processes the file as music using file(init.fly). In this
-case, LilyPond does something like: COMMENT(
+sect(Music expressions)
-)verb(\score {
- \notes\relative c {
- \input "yourfile.fly"
- }
- \paper{}
- \midi{}
-})
-If you invoke LilyPond with a file file(foo.)var(ext) that doesn't
-have the file(.ly) extension then LilyPond will look for a file called
-file(init.)var(ext) and process this file. The file
-file(init.)var(ext) must contain the code(\maininput) keyword or LilyPond
-will not read the user specified file.
+Music in mudela is entered as a music expression. Notes, rests, lyric
+syllables are music expressions (the atomic expressions), and you can
+combine music expressions to form new music expressions. This example
+forms a compound expressions out of the quarter code(c) note and a
+code(d) note:COMMENT(
-When LilyPond processes file(filename.ly) it will produce
-file(filename.tex) as output. If file(filename.ly) contains a second
-code(\paper) keyword, then LilyPond will produce file(filename-1.tex)
-as well. Subsequent code(\paper) keywords will produces sequentially
-numbered file names. Several files can be specified; they will each
-be processed independently.footnote(Not entirely true: the status of
-GUILE is kept).
+)verb(\sequential { c4 d4 })COMMENT(
+)The meaning of this compound expression is to play the code(c) first,
+and then the code(d) (as opposed to playing them simultaneously, for
+instance).
+We shall first review how to make atomic music expressions, and then
+how to make compound expressions.
-sect(Syntax)
+subsect(Atomic music expressions)
+subsect(Composition music expressions)
subsect(Basic Mudela)
-Mudela is a declarative input format: in a file you can declare items
-with identifiers, and instruct LilyPond to typeset music
-
A Mudela file consists of keywords with arguments and identifier
assignments separated by spaces, tabs or newlines. Semicolons are
keywords: code(\mm), code(\pt), code(\in), or code(\cm). Dimensions
are converted immediately to a real which gives the dimension in
points, so they can be mixed with reals, but the result is no longer
-of type dimension. The keywords that require a dimension
-(code(\shape)).
+of type dimension.
dit(pitch)
A pitch is a string which is the name of a pitch. Example: code(a).
\paper{ \foo }
})
If code(\foo) is used here without the surrounding code(\paper) then
-an error will result. Note however that the following is acceptible
+an error will result. Note however that the following is acceptable
verb(foo = \notes { ... }
\score{ \foo })
It is not necessary to specify code(\notes).
Identifiers can be set equal to integers, reals, strings, music,
durations (specified with code(\duration)), note ornaments (specified
with code(\script), dynamics commands, or code(:)), note name tables
-(specified with code(\notenames), translator definitions, the
+(specified with code(\notenames)), translator definitions, the
code(\paper) block, the code(\midi) block or the code(\score) block.
When identifiers are used for translators, the code(\paper),
code(\midi), and code(\score) blocks, they may only be referred to as
after the note. The length must be at least 8. A var(length) value
of 8 gives one line across the note stem.
If the length is omitted,
-then the last value is used, or the value of the code(Abbrev)
-property if there was no last value.
-
+then the last value is used, or the value of the code(abbrev)
+property if there was no last value. To place tremolo marks in
+between two notes, begin with code([:)var(length) and end with code(]).
+The tremolo marks will appear instead of beams. Putting more than two
+notes in such a construction will produce odd effects.
+
mudela(fragment,verbatim,center)(
-c'2:8 c':32 c'
-))
-
+ c'2:8 c':32 [:16 e'1 g'] [:8 e'4 f']
+)
+
+mudela(fragment,verbatim,center)(
+ c'4:32 [:16 c'8 d'8]
+)
sect(Other Ways to Enter Pitches)
subsect(Relative Pitch Specification)
label(relative)
-One very common error when entering music is to place notes in the wrong
-octave. One way to avoid being confused by large numbers of octave changing
-marks is to use
-the code(\relative) keyword.
-Music which appears within code(\relative) is
-interpreted differently. The octave of a note is determined by making it as
-close to the previous note as possible. The octave changing marks code(') and
-code(,) can then be added to raise or lower this note by octaves. You have to
-specify a starting pitch because the first note of a list has no predecessor.
+A very common mistake when entering music is to place a note in the wrong
+octave. One can easily get confused by the large numbers of octave changing
+marks in the music. For most music, a much friendlier way of specifying
+a note's octave is by using the Relative Pitch Specification mode, that is
+introduced by the code(\relative) keyword. For real world music entry,
+Relative mode is being used almost exclusively.
+
+The octave of notes that appear in code(\relative) mode is calculated
+differently: The octave of a note depends on the previous note.
+When no octave changing marks are used, the basic interval (without
+accidentals) between two notes is always taken to be equal to or smaller
+than a quart. The octave changing marks code(') and code(,) can then be
+added to raise or lower that interval by octaves. Upon entering
+code(\relative) mode, an absolute starting pitch must be specified
+that will act as the predecessor of the first note of the following music.
+
+Thus, entering scales is straightforward
+
+mudela(fragment,verbatim,center)(
+\relative c' { c d e f g a b c c, }
+)
+
+and octave changing marks are used for intervals greater than a quart.
mudela(fragment,verbatim,center)(
-\relative c'' { c d b c, d b c' d
- b c,, d b }
+\relative c'' { c g c f, c' a,, e''' }
)
When the preceding item is a chord, the first note of the chord is used to
\addlyrics
\transpose c'' { c4 d8. e16 f2 }
\context Lyrics \lyrics { do4 re mi fa }
-)
+)COMMENT(
-You should use a single rhythm melody, and single rhythm lyrics (a
+)You should use a single rhythm melody, and single rhythm lyrics (a
constant duration is the obvious choice). If you do not, you will get
undesired effects when using multiple stanzas: COMMENT(
Since this assignment is possible at top-level and within paper, these
are two conflicts.
-it() A chord followed by
-code(-3)
-can be interpreted as a chord substraction, or as the fingering `2' (with
-neutral direction)
-it() Similarly code(^2) is a conflict.
- chord_addition '^' ->?
it()
If you do a nested repeat,
verb (
code(another) is removed.
Almost all music expressions inherit their interpretation context from
-their parent. In other words, suppose that the syntax for a music expression is
-code(code(\keyword) var(musicexpr1) var(musicexpr2) dots()).
+their parent. In other words, suppose that the syntax for a music expression is code(\keyword) var(musicexpr1) var(musicexpr2) dots().
When the interpretation of this music expression starts,
the context for var(musicexpr1), var(musicexpr2), etc. that of
the total expression.
description(
+dit(code(stemLength)) Set length of stems. Unit is
+code(interline)/2, so stemLength defaults to 7.
+
dit(code(stemLeftBeamCount)) Specify the number of beams to draw on
the left side of the next note. Overrides automatic beaming. The
value is only used once, and then it is erased.
a larger value for dashed slurs. Identifiers code(\slurnormal) and
code(\slurdotted) are predefined to set the first two settings.
-dit(code(horizontalNoteShift)) Set to 1 to enable LilyPond to shift notes
+dit(code(horizontalNoteShift)) Enable LilyPond to shift notes
horizontally if they collide with other notes. This is useful when
typesetting many voices on one staff. The identifier code(\shift) is
-defined to enable this. If there are several voices, every voice must
-have a distinct value of this property or no shifting will occur.
+defined to enable this. Traditionally, the outer chords (the upmost
+and downmost voices), should have no horizontalNoteShift. Voice s
+
dit(code(forceHorizontalShift)) Force horizontal shift for collision
resolution. It overrides automatic collision resolution.
The engravers for paper output are:
description(
-dit(code(Abbreviation_beam_engraver)) [FIXME. Broken as of 1.0.?]
dit(code(Bar_engraver)) Engraves bar lines. Normally in code(Staff) and
code(RhythmicStaff).
dit(code(Bar_number_engraver)) Engrave bar numbers. These numbers
code(LyricVoice).
dit(code(Chord_name_engraver)) Engraves chord names. Normally in
code(ChordNameVoice)
+dit(code(Chord_tremolo_engraver))
dit(code(Clef_engraver)) Engraves the clef symbol. Normally in code(Staff).
dit(code(Collision_engraver))
dit(code(Dot_column_engraver)) Engraves dots on dotted notes shifted to the
)
)
+
+sect(Running LilyPond)
+
+
+When invoked with a filename that has no extension, LilyPond will try
+adding a file(.ly) extension first, then a file(.sly) and then a
+file(.ly) extension second. If the filename ends with file(.fly),
+LilyPond processes the file as music using file(init.fly). In this
+case, LilyPond does something like: COMMENT(
+
+)verb(\score {
+ \notes\relative c {
+ \input "yourfile.fly"
+ }
+ \paper{}
+ \midi{}
+})
+If you invoke LilyPond with a file file(foo.)var(ext) that doesn't
+have the file(.ly) extension then LilyPond will look for a file called
+file(init.)var(ext) and process this file. The file
+file(init.)var(ext) must contain the code(\maininput) keyword or LilyPond
+will not read the user specified file.
+
+When LilyPond processes file(filename.ly) it will produce
+file(filename.tex) as output. If file(filename.ly) contains a second
+code(\paper) keyword, then LilyPond will produce file(filename-1.tex)
+as well. Subsequent code(\paper) keywords will produces sequentially
+numbered file names. Several files can be specified; they will each
+be processed independently.footnote(Not entirely true: the status of
+GUILE is kept).
+pl 65.hwn1
+ - refman updates
+ - added \simultaneous { } , \sequential { } syntax, for
+consistency.
+
+pl 65.jcn2
+ - bf: if tie then melisma
+
+pl 65.uu1
+ - bf: squashed 2 sr conflicts in parser.
+
+pl 64.jcn2
+ - stanchen almost without " " hacks
+ - if tie then melisma..?
+ - refman updates
+ - Abbreviation.beam -> Chord_tremolo
+ - bf: chord tremolo vs beam over rests
+ - bf: note width for noteless stem
+
+
+
+********
pl 64.jcn1
- resurrected abbreviation beam
- coriolan fixes
-*-outline-layout:(2 (-1 -1 0 :) 0);outline-stylish-prefixes:nil -*-
* GNU LilyPond TODO
-Features you cannot find in the doco as working, should be
+Features you cannot find in the documentation as working, should be
mentioned here. This is an assorted collection of stuff that will be
-done, might be done, or is an idea that I want to think about
+done, might be done, or is an idea that we want to think about.
Most of the items are marked in the code as well
-Grep for TODO and ugh/ugr/urg.
+Grep -i for TODO, FIXME and ugh/ugr/urg.
.* TODO before 1.2
. * align left edge of broken (de)cresc/slur/tie/tuplet/volta
. * auto-staff-switching.
+. * staccato-dot placement/quantisation is broken again
. * warning if feta-nummer.tfm not found
. * broken examples:
input/star-spangled-banner.ly: hw?
-mutopia/Coriolan/*
. * spacing of accidentals
. * key restorations & repeats
. * rename \paper?
. * rhythmic staff & accidentals.
. * use melismaBusy in Lyric context to typeset melismata correctly.
. * ly2dvi/lilypond logfile.
+. * def stem dir.
. * hang Item on Spanner
. * do --safe for PS output?
. * msgfmt -o check?
\cadenza , \meter, should all be \properties
. * fix singleStaffBracket
. * rename
-. * abbreviation-beam -> (measured/unmeasured) tremolo
. * partial -> anacrouse
. * move paper vars into engraver properties
. * add new glyphs to font.ly
PACKAGE_NAME=LilyPond
MAJOR_VERSION=1
MINOR_VERSION=1
-PATCH_LEVEL=65
+PATCH_LEVEL=66
MY_PATCH_LEVEL=
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
--- /dev/null
+\score{
+ \addlyrics
+ \context Staff {
+ \notes\relative c''{ c () d r e f }
+ \notes\relative c''{ c ~ c r c c }
+ }
+ {
+ \context Lyrics \lyrics { foo __ bar baz }
+ \context Lyrics \lyrics { foo __ bar baz }
+ }
+ \paper{
+ \translator{
+ \VoiceContext
+ automaticMelismas=1;
+ }
+ }
+}
-% when tightly spaced, hinterfleisch -> 0 (and not: -> note-width)
-% we need a mininum of about a note-width/interline space before
-% bar line
+% When tightly spaced, hinterfleisch -> 0.
+% Stems may touch the bar lines, opposite stems may touch eachother.
+% We need a mininum of about a note-width/interline space in these
+% situations, so that in tightly spaced music all vertical lines
+% are about equally spaced.
-% set rediculously tight
\score {
- \notes { \time 2/2; c'2 c'2 \time 2/2; }
- \paper { linewidth = 2.0 \cm;
- indent = 0.0;
+ \notes \relative c''{
+ r1 e4 f, e' f,
+ }
+ \paper {
+ linewidth = 25.0 \mm;
+ indent = 0.0\mm;
}
}
--- /dev/null
+\stemup
+f'-. g-. a-. b-. c-. d-. e-.
\context Voice = VA { \stemup [b8 fis8] b4 }
\context Voice = VB { \stemdown fis2 }
>
- %{ this chord is usually set like this:
- |
- x||
- x||
- x|
- |x
- |
- %}
- \context Staff <
- { \stemup \shiftoff e4 }
- { \stemup \shifton cis }
- { \stemup \shifton ais }
- { \stemdown fis }
- > |
- %16
- \context Staff <
- \context VoiceOne { dis2 dis4 |
+
+ % Wadieuw
+ \context Staff \notes\relative c''<
+ \context Voice=one {
+ \property Voice.horizontalNoteShift=0
+ \property Voice.verticalDirection=1
+ e4
+ }
+ \context Voice=two {
+ \property Voice.verticalDirection=1
+ \property Voice.horizontalNoteShift=1
+ cis
+ }
+ \context Voice=three {
+ \property Voice.horizontalNoteShift=2
+ \property Voice.verticalDirection=1
+ ais
+ }
+ \context Voice=four {
+ \property Voice.verticalDirection=-1
+ \property Voice.horizontalNoteShift=-1
+ fis
+ }
+ >
+
+ %16
+ \context Staff <
+ \context VoiceOne { dis2 dis4 |
cis2 cis4 |
b4. [cis8 dis e] }
\context VoiceThree { \stemup \shifton [b8 fis] b2 ~ |
+++ /dev/null
-[:16 c'1 d]
-[:8 c2 d]
-[:16 c4 d]
-[:32 c16 d]
-[:32 c16 d]
-[:16 c8 d]
--- /dev/null
+[:16 c'1 d]
+[:8 c2 d]
+[:16 c4 d]
+[:32 c16 d]
+[:32 c16 d]
+[:16 c8 d]
\context Staff <
\context Voice = VA {
\property Voice.forceHorizontalShift = "0.1"
- \stemup \shifton
+ % \stemup \shifton
+ \property Voice.verticalDirection=1
+ \property Voice.horizontalNoteShift=1
<g' d'>
}
\context Voice = VB {
- \stemdown
- \shifton
+ %\stemdown \shifton
+ \property Voice.verticalDirection=-1
+ \property Voice.horizontalNoteShift=1
\property Voice.forceHorizontalShift = "-0.1"
<bes f'>
}
--- /dev/null
+
+\context Staff <
+ \context Voice =VA {\stemup \property Voice.horizontalNoteShift = 0 g'' }
+ \context Voice =VB {\stemup \property Voice.horizontalNoteShift = 1 e }
+ \context Voice =VC {\stemup \property Voice.horizontalNoteShift = 2 c }
+ \context Voice =VD {\stemup \property Voice.horizontalNoteShift = 3 a }
+ \context Voice =VE {\stemup \property Voice.horizontalNoteShift = 4 f }
+>
--- /dev/null
+\context Staff \notes\relative c''<
+ \context Voice=one {
+ \property Voice.horizontalNoteShift=0
+ \property Voice.verticalDirection=1
+ e4
+ }
+ \context Voice=two {
+ \property Voice.verticalDirection=1
+ \property Voice.horizontalNoteShift=1
+ cis
+ }
+ \context Voice=three {
+ \property Voice.horizontalNoteShift=2
+ \property Voice.verticalDirection=1
+ ais
+ }
+ \context Voice=four {
+ \property Voice.verticalDirection=-1
+ \property Voice.horizontalNoteShift=-1
+ fis
+ }
+>
+
+++ /dev/null
-/*
- abbreviation-beam-engraver.cc -- implement Abbreviation_beam_engraver
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
-*/
-
-#include "duration-convert.hh"
-#include "time-description.hh"
-#include "abbreviation-beam-engraver.hh"
-#include "stem.hh"
-#include "abbreviation-beam.hh"
-#include "musical-request.hh"
-#include "misc.hh"
-#include "warn.hh"
-#include "score-engraver.hh"
-
-ADD_THIS_TRANSLATOR (Abbreviation_beam_engraver);
-
-Abbreviation_beam_engraver::Abbreviation_beam_engraver ()
-{
- reqs_drul_[LEFT] = reqs_drul_[RIGHT] = 0;
- abeam_p_ = 0;
- finished_abeam_p_ = 0;
- prev_start_req_ = 0;
-}
-
-bool
-Abbreviation_beam_engraver::do_try_music (Music* m)
-{
- if (Abbreviation_beam_req* b = dynamic_cast <Abbreviation_beam_req *> (m))
- {
- Direction d = b->span_dir_;
- if (reqs_drul_[d] && !reqs_drul_[d]->equal_b (b))
- return false;
-
- if ((d == STOP) && !abeam_p_)
- {
- m->warning (_ ("No abbreviation beam to end"));
- return false;
- }
-
- reqs_drul_[d] = b;
- return true;
- }
-
- return false;
-}
-
-void
-Abbreviation_beam_engraver::do_process_requests ()
-{
- if (reqs_drul_[STOP])
- {
- if (!abeam_p_)
- reqs_drul_[STOP]->warning (_("No abbreviation beam to end"));
- prev_start_req_ = 0;
- finished_abeam_p_ = abeam_p_;
- abeam_p_ = 0;
- }
-
- if (abeam_p_)
- {
- Score_engraver * e = 0;
- Translator * t = daddy_grav_l ();
- for (; !e && t; t = t->daddy_trans_l_)
- {
- e = dynamic_cast<Score_engraver*> (t);
- }
-
- if (!e)
- programming_error ("No score engraver!");
- else
- e->forbid_breaks ();
- }
-
- if (reqs_drul_[START])
- {
- if (abeam_p_)
- {
- reqs_drul_[START]->warning (_ ("Already have an abbreviation beam"));
- return;
- }
-
- prev_start_req_ = reqs_drul_[START];
-
- abeam_p_ = new Abbreviation_beam;
- announce_element (Score_element_info (abeam_p_, reqs_drul_[LEFT]));
- }
-}
-
-void
-Abbreviation_beam_engraver::do_post_move_processing ()
-{
- reqs_drul_ [START] = 0;
-}
-
-void
-Abbreviation_beam_engraver::do_pre_move_processing ()
-{
- typeset_beam ();
-}
-
-void
-Abbreviation_beam_engraver::typeset_beam ()
-{
- if (finished_abeam_p_)
- {
- typeset_element (finished_abeam_p_);
- finished_abeam_p_ = 0;
-
- reqs_drul_[STOP] = 0;
- }
-}
-
-void
-Abbreviation_beam_engraver::do_removal_processing ()
-{
- typeset_beam ();
- if (abeam_p_)
- {
- prev_start_req_->warning (_ ("Unfinished abbreviation beam"));
- finished_abeam_p_ = abeam_p_;
- typeset_beam ();
- }
-}
-
-void
-Abbreviation_beam_engraver::acknowledge_element (Score_element_info i)
-{
- if (abeam_p_)
- {
- if (Stem* s = dynamic_cast<Stem *> (i.elem_l_))
- {
- int type_i = prev_start_req_->type_i_;
- s->flag_i_ = intlog2 (type_i) - 2;
-
- s->beams_i_drul_[LEFT] = s->flag_i_;
- s->beams_i_drul_[RIGHT] = s->flag_i_;
-
- abeam_p_->multiple_i_ = s->flag_i_;
- /*
- abbrev gaps on all but half note
- */
-#if 0
- if (s->type_i () != 1)
- {
- int gap_i =s->flag_i_ - ((s->type_i () >? 2) - 2);
- s->set_elt_property (beam_gap_scm_sym, gh_int2scm(gap_i));
- }
-#else
- if (s->type_i () != 1)
- {
- int gap_i =s->flag_i_ - ((s->type_i () >? 2) - 2);
- abeam_p_->set_elt_property (beam_gap_scm_sym, gh_int2scm(gap_i));
- }
-#endif
-
- abeam_p_->add_stem (s);
- }
- }
-}
+++ /dev/null
-/*
- abbreviation-beam.cc -- implement Abbreviation_beam
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
-*/
-
-#include "paper-column.hh"
-#include "array.hh"
-#include "proto.hh"
-#include "abbreviation-beam.hh"
-#include "misc.hh"
-#include "debug.hh"
-
-#include "molecule.hh"
-#include "leastsquares.hh"
-#include "stem.hh"
-#include "paper-def.hh"
-#include "lookup.hh"
-#include "stem-info.hh"
-
-
-
-
-Abbreviation_beam::Abbreviation_beam ()
- : Beam ()
-{
-}
-
-Molecule*
-Abbreviation_beam::do_brew_molecule_p () const
-{
- return Beam::do_brew_molecule_p ();
-}
-
-void
-Abbreviation_beam::do_print () const
-{
-#ifndef NPRINT
- Beam::do_print ();
- Spanner::do_print ();
-#endif
-}
-
-/*
- beams to go with one stem.
- */
-Molecule
-Abbreviation_beam::stem_beams (Stem *here, Stem *next, Stem *prev) const
-{
- /*
- todo
- - shorter beams (not reaching outer "stems")
- for [:16 c4 c4] and [:16 c1 c1]
- - centered beam on [:16 c1 c1] heads, rather than "stems"
- */
- return Beam::stem_beams (here, next, prev);
-}
#include "musical-request.hh"
#include "bar.hh"
#include "beam.hh"
-#include "abbreviation-beam.hh"
+#include "chord-tremolo.hh"
#include "rest.hh"
#include "stem.hh"
#include "debug.hh"
{
junk_beam ();
}
- else if (Abbreviation_beam *b = dynamic_cast<Abbreviation_beam*> (info.elem_l_))
+ else if (Chord_tremolo *b = dynamic_cast<Chord_tremolo*> (info.elem_l_))
{
junk_beam ();
}
#include <math.h>
+#include "chord-tremolo.hh"
#include "new-beaming.hh"
#include "proto.hh"
#include "dimensions.hh"
for (int i=0; i < stems_.size (); i++)
{
Stem *s = stems_[i];
-#if 0
- // abbreviation beam needs to beam over invisible stems of wholes
- if (s->invisible_b ())
- continue;
-#endif
+ /*
+ Chord tremolo needs to beam over invisible stems of wholes
+ */
+ if (!dynamic_cast<Chord_tremolo*> (this))
+ {
+ if (s->invisible_b ())
+ continue;
+ }
Stem_info info (s, multiple_i_);
if (leftx == 0)
// UGH
Real nw_f;
- if (here->type_i ()== 1)
+ if (!here->head_l_arr_.size ())
+ nw_f = 0;
+ else if (here->type_i ()== 1)
nw_f = paper_l ()->get_var ("wholewidth");
else if (here->type_i () == 2)
nw_f = paper_l ()->note_width () * 0.8;
--- /dev/null
+/*
+ abbreviation-beam-engraver.cc -- implement Chord_tremolo_engraver
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#include "duration-convert.hh"
+#include "time-description.hh"
+#include "chord-tremolo-engraver.hh"
+#include "stem.hh"
+#include "chord-tremolo.hh"
+#include "musical-request.hh"
+#include "misc.hh"
+#include "warn.hh"
+#include "score-engraver.hh"
+
+ADD_THIS_TRANSLATOR (Chord_tremolo_engraver);
+
+Chord_tremolo_engraver::Chord_tremolo_engraver ()
+{
+ reqs_drul_[LEFT] = reqs_drul_[RIGHT] = 0;
+ abeam_p_ = 0;
+ finished_abeam_p_ = 0;
+ prev_start_req_ = 0;
+}
+
+bool
+Chord_tremolo_engraver::do_try_music (Music* m)
+{
+ if (Chord_tremolo_req* b = dynamic_cast <Chord_tremolo_req *> (m))
+ {
+ Direction d = b->span_dir_;
+ if (reqs_drul_[d] && !reqs_drul_[d]->equal_b (b))
+ return false;
+
+ if ((d == STOP) && !abeam_p_)
+ {
+ m->warning (_ ("No abbreviation beam to end"));
+ return false;
+ }
+
+ reqs_drul_[d] = b;
+ return true;
+ }
+
+ return false;
+}
+
+void
+Chord_tremolo_engraver::do_process_requests ()
+{
+ if (reqs_drul_[STOP])
+ {
+ if (!abeam_p_)
+ reqs_drul_[STOP]->warning (_("No abbreviation beam to end"));
+ prev_start_req_ = 0;
+ finished_abeam_p_ = abeam_p_;
+ abeam_p_ = 0;
+ }
+
+ if (abeam_p_)
+ {
+ Score_engraver * e = 0;
+ Translator * t = daddy_grav_l ();
+ for (; !e && t; t = t->daddy_trans_l_)
+ {
+ e = dynamic_cast<Score_engraver*> (t);
+ }
+
+ if (!e)
+ programming_error ("No score engraver!");
+ else
+ e->forbid_breaks ();
+ }
+
+ if (reqs_drul_[START])
+ {
+ if (abeam_p_)
+ {
+ reqs_drul_[START]->warning (_ ("Already have an abbreviation beam"));
+ return;
+ }
+
+ prev_start_req_ = reqs_drul_[START];
+
+ abeam_p_ = new Chord_tremolo;
+ announce_element (Score_element_info (abeam_p_, reqs_drul_[LEFT]));
+ }
+}
+
+void
+Chord_tremolo_engraver::do_post_move_processing ()
+{
+ reqs_drul_ [START] = 0;
+}
+
+void
+Chord_tremolo_engraver::do_pre_move_processing ()
+{
+ typeset_beam ();
+}
+
+void
+Chord_tremolo_engraver::typeset_beam ()
+{
+ if (finished_abeam_p_)
+ {
+ typeset_element (finished_abeam_p_);
+ finished_abeam_p_ = 0;
+
+ reqs_drul_[STOP] = 0;
+ }
+}
+
+void
+Chord_tremolo_engraver::do_removal_processing ()
+{
+ typeset_beam ();
+ if (abeam_p_)
+ {
+ prev_start_req_->warning (_ ("Unfinished abbreviation beam"));
+ finished_abeam_p_ = abeam_p_;
+ typeset_beam ();
+ }
+}
+
+void
+Chord_tremolo_engraver::acknowledge_element (Score_element_info i)
+{
+ if (abeam_p_)
+ {
+ if (Stem* s = dynamic_cast<Stem *> (i.elem_l_))
+ {
+ int type_i = prev_start_req_->type_i_;
+ s->flag_i_ = intlog2 (type_i) - 2;
+
+ s->beams_i_drul_[LEFT] = s->flag_i_;
+ s->beams_i_drul_[RIGHT] = s->flag_i_;
+
+ abeam_p_->multiple_i_ = s->flag_i_;
+ /*
+ abbrev gaps on all but half note
+ */
+#if 0
+ if (s->type_i () != 1)
+ {
+ int gap_i =s->flag_i_ - ((s->type_i () >? 2) - 2);
+ s->set_elt_property (beam_gap_scm_sym, gh_int2scm(gap_i));
+ }
+#else
+ if (s->type_i () != 1)
+ {
+ int gap_i =s->flag_i_ - ((s->type_i () >? 2) - 2);
+ abeam_p_->set_elt_property (beam_gap_scm_sym, gh_int2scm(gap_i));
+ }
+#endif
+
+ abeam_p_->add_stem (s);
+ }
+ }
+}
--- /dev/null
+/*
+ abbreviation-beam.cc -- implement Chord_tremolo
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#include "paper-column.hh"
+#include "array.hh"
+#include "proto.hh"
+#include "chord-tremolo.hh"
+#include "misc.hh"
+#include "debug.hh"
+
+#include "molecule.hh"
+#include "leastsquares.hh"
+#include "stem.hh"
+#include "paper-def.hh"
+#include "lookup.hh"
+#include "stem-info.hh"
+
+
+
+
+Chord_tremolo::Chord_tremolo ()
+ : Beam ()
+{
+}
+
+Molecule*
+Chord_tremolo::do_brew_molecule_p () const
+{
+ return Beam::do_brew_molecule_p ();
+}
+
+void
+Chord_tremolo::do_print () const
+{
+#ifndef NPRINT
+ Beam::do_print ();
+ Spanner::do_print ();
+#endif
+}
+
+/*
+ beams to go with one stem.
+ */
+Molecule
+Chord_tremolo::stem_beams (Stem *here, Stem *next, Stem *prev) const
+{
+ /*
+ todo
+ - shorter beams (not reaching outer "stems")
+ for [:16 c4 c4] and [:16 c1 c1]
+ - centered beam on [:16 c1 c1] heads, rather than "stems"
+ */
+ return Beam::stem_beams (here, next, prev);
+}
+++ /dev/null
-/*
- colhpos.cc -- implement Column_x_positions
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#include "colhpos.hh"
-#include "real.hh"
-#include "debug.hh"
-#include "vector.hh"
-#include "line-spacer.hh"
-
-Column_x_positions::Column_x_positions()
-{
- energy_f_ = infinity_f;
- satisfies_constraints_b_ = false;
- spacer_l_ =0;
-}
-
-Column_x_positions::~Column_x_positions()
-{
-
-}
-
-void
-Column_x_positions::add_paper_column (Paper_column*c)
-{
- cols_.push (c);
-}
-
-void
-Column_x_positions::print() const
-{
-#ifndef NPRINT
- DOUT << "energy : " << energy_f_ << '\n';
- DOUT << "line of " << config_.size() << " cols\n";
- Vector v (config_);
- DOUT << v;
-#endif
-}
-
-void
-Column_x_positions::OK() const
-{
-#ifndef NDEBUG
- assert (config_.size() == cols_.size ());
-#endif
-}
-
-void
-Column_x_positions::set_stupid_solution(Vector v)
-{
- energy_f_ = infinity_f;
- config_ = v;
-}
-
-void
-Column_x_positions::stupid_solution()
-{
- set_stupid_solution (spacer_l_->default_solution());
-}
-
-void
-Column_x_positions::solve_line()
-{
- spacer_l_->solve (this);
-}
-
-
-void
-Column_x_positions::approximate_solve_line()
-{
- spacer_l_->lower_bound_solution (this);
-}
-
-
--- /dev/null
+/*
+ colhpos.cc -- implement Column_x_positions
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#include "column-x-positions.hh"
+#include "real.hh"
+#include "debug.hh"
+#include "vector.hh"
+#include "line-spacer.hh"
+
+Column_x_positions::Column_x_positions()
+{
+ energy_f_ = infinity_f;
+ satisfies_constraints_b_ = false;
+ spacer_l_ =0;
+}
+
+Column_x_positions::~Column_x_positions()
+{
+
+}
+
+void
+Column_x_positions::add_paper_column (Paper_column*c)
+{
+ cols_.push (c);
+}
+
+void
+Column_x_positions::print() const
+{
+#ifndef NPRINT
+ DOUT << "energy : " << energy_f_ << '\n';
+ DOUT << "line of " << config_.size() << " cols\n";
+ Vector v (config_);
+ DOUT << v;
+#endif
+}
+
+void
+Column_x_positions::OK() const
+{
+#ifndef NDEBUG
+ assert (config_.size() == cols_.size ());
+#endif
+}
+
+void
+Column_x_positions::set_stupid_solution(Vector v)
+{
+ energy_f_ = infinity_f;
+ config_ = v;
+}
+
+void
+Column_x_positions::stupid_solution()
+{
+ set_stupid_solution (spacer_l_->default_solution());
+}
+
+void
+Column_x_positions::solve_line()
+{
+ spacer_l_->solve (this);
+}
+
+
+void
+Column_x_positions::approximate_solve_line()
+{
+ spacer_l_->lower_bound_solution (this);
+}
+
+
*/
#include "gourlay-breaking.hh"
-#include "colhpos.hh"
+#include "column-x-positions.hh"
#include "spring-spacer.hh"
#include "debug.hh"
#include "paper-column.hh"
+++ /dev/null
-/*
- abbreviation-beam-engraver.hh -- declare Abbreviation_beam_engraver
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
-*/
-
-
-#ifndef ABBREVIATION_BEAM_ENGRAVER_HH
-#define ABBREVIATION_BEAM_ENGRAVER_HH
-
-#include "engraver.hh"
-#include "drul-array.hh"
-
-/**
- Generate an abbreviation beam. Eat stems.
- */
-class Abbreviation_beam_engraver : public Engraver
-{
-public:
- VIRTUAL_COPY_CONS(Translator);
-
-
- Abbreviation_beam_engraver();
-
-protected:
- virtual void do_removal_processing();
- virtual void do_process_requests();
- virtual bool do_try_music (Music*);
- virtual void acknowledge_element (Score_element_info);
- virtual void do_pre_move_processing();
- virtual void do_post_move_processing();
-
-private:
- void typeset_beam ();
- Drul_array<Abbreviation_beam_req*> reqs_drul_;
- Abbreviation_beam_req* prev_start_req_;
- Abbreviation_beam* abeam_p_;
- Abbreviation_beam* finished_abeam_p_;
-};
-
-#endif // ABBREVIATION_BEAM_ENGRAVER_HH
+++ /dev/null
-/*
- abbreviation-beam-engraver.hh -- declare Abbreviation_beam_engraver
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
-*/
-
-#ifndef ABBREVIATION_BEAM_HH
-#define ABBREVIATION_BEAM_HH
-
-#include "beam.hh"
-
-/** a beam connects multiple stems Beam adjusts the stems its owns to
- make sure that they reach the beam and that point in the correct
- direction */
-class Abbreviation_beam : public Beam {
-public:
-
-
- Abbreviation_beam();
-
- VIRTUAL_COPY_CONS(Score_element);
-
-protected:
- virtual void do_print() const;
- virtual Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
- virtual Molecule* do_brew_molecule_p() const;
-};
-
-#endif // ABBREVIATION_BEAM_HH
-
#include "array.hh"
#include "interval.hh"
#include "lily-proto.hh"
-#include "colhpos.hh"
+#include "column-x-positions.hh"
/**
Statistics for the number of columns calced.
--- /dev/null
+/*
+ chord-tremolo-engraver.hh -- declare Chord_tremolo_engraver
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+
+#ifndef Chord_tremolo_ENGRAVER_HH
+#define Chord_tremolo_ENGRAVER_HH
+
+#include "engraver.hh"
+#include "drul-array.hh"
+
+/**
+ Generate an abbreviation beam. Eat stems.
+ */
+class Chord_tremolo_engraver : public Engraver
+{
+public:
+ VIRTUAL_COPY_CONS(Translator);
+
+
+ Chord_tremolo_engraver();
+
+protected:
+ virtual void do_removal_processing();
+ virtual void do_process_requests();
+ virtual bool do_try_music (Music*);
+ virtual void acknowledge_element (Score_element_info);
+ virtual void do_pre_move_processing();
+ virtual void do_post_move_processing();
+
+private:
+ void typeset_beam ();
+ Drul_array<Chord_tremolo_req*> reqs_drul_;
+ Chord_tremolo_req* prev_start_req_;
+ Chord_tremolo* abeam_p_;
+ Chord_tremolo* finished_abeam_p_;
+};
+
+#endif // Chord_tremolo_ENGRAVER_HH
--- /dev/null
+/*
+ chord-tremolo-engraver.hh -- declare Chord_tremolo_engraver
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#ifndef Chord_tremolo_HH
+#define Chord_tremolo_HH
+
+#include "beam.hh"
+
+/** a beam connects multiple stems Beam adjusts the stems its owns to
+ make sure that they reach the beam and that point in the correct
+ direction */
+class Chord_tremolo : public Beam {
+public:
+
+
+ Chord_tremolo();
+
+ VIRTUAL_COPY_CONS(Score_element);
+
+protected:
+ virtual void do_print() const;
+ virtual Molecule stem_beams (Stem *here, Stem *next, Stem *prev) const;
+ virtual Molecule* do_brew_molecule_p() const;
+};
+
+#endif // Chord_tremolo_HH
+
+++ /dev/null
-/*
- colhpos.hh -- part of GNU LilyPond
-
- (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#ifndef COLHPOS_HH
-#define COLHPOS_HH
-
-#include "parray.hh"
-#include "lily-proto.hh"
-
-typedef Link_array<Paper_column> Line_of_cols;
-
-struct Column_x_positions {
- Line_spacer * spacer_l_;
- Line_of_cols cols_;
- Array<Real> config_;
-
- Real energy_f_;
- bool satisfies_constraints_b_;
-
- void OK() const;
- ~Column_x_positions();
- void solve_line();
- void approximate_solve_line();
- /** generate a solution with no regard to idealspacings or
- constraints. should always work */
- void stupid_solution();
- void set_stupid_solution (Vector);
- Column_x_positions();
- void add_paper_column (Paper_column*c);
- void print() const;
-};
-
-
-#endif // COLHPOS_HH
-
--- /dev/null
+/*
+ column-x-positions.hh -- part of GNU LilyPond
+
+ (c) 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#ifndef COLUMN_X_POSITIONS_HH
+#define COLUMN_X_POSITIONS_HH
+
+#include "parray.hh"
+#include "lily-proto.hh"
+
+typedef Link_array<Paper_column> Line_of_cols;
+
+struct Column_x_positions {
+ Line_spacer * spacer_l_;
+ Line_of_cols cols_;
+ Array<Real> config_;
+
+ Real energy_f_;
+ bool satisfies_constraints_b_;
+
+ void OK() const;
+ ~Column_x_positions();
+ void solve_line();
+ void approximate_solve_line();
+ /** generate a solution with no regard to idealspacings or
+ constraints. should always work */
+ void stupid_solution();
+ void set_stupid_solution (Vector);
+ Column_x_positions();
+ void add_paper_column (Paper_column*c);
+ void print() const;
+};
+
+
+#endif // COLUMN_X_POSITIONS_HH
+
-struct Abbreviation_beam;
-struct Abbreviation_beam_engraver;
-struct Abbreviation_beam_req;
struct Absolute_dynamic_req;
struct Adobe_font_char_metric;
struct Adobe_font_metric;
struct Break_align_item;
struct Break_req;
struct CHyphen_req;
+struct Chord_tremolo;
+struct Chord_tremolo_engraver;
+struct Chord_tremolo_req;
struct Cadenza_req;
struct Change_iterator;
struct Change_translator;
#ifndef SCORELINE_HH
#define SCORELINE_HH
-#include "colhpos.hh"
+#include "column-x-positions.hh"
#include "axis-group-spanner.hh"
#include "super-element.hh"
};
/**
Start / stop an abbreviation beam. */
-class Abbreviation_beam_req : public Span_req
+class Chord_tremolo_req : public Span_req
{
public:
VIRTUAL_COPY_CONS (Music);
- Abbreviation_beam_req ();
+ Chord_tremolo_req ();
virtual void do_print () const;
#ifndef P_SCORE_HH
#define P_SCORE_HH
-#include "colhpos.hh"
+#include "column-x-positions.hh"
#include "parray.hh"
#include "lily-proto.hh"
#include "music-output.hh"
#include "line-spacer.hh"
#include "cons.hh"
#include "col-info.hh"
-#include "colhpos.hh"
+#include "column-x-positions.hh"
#include "moment.hh"
Array<CHead_melodic_tuple> stopped_heads_;
Link_array<Tie> tie_p_arr_;
+ void set_melisma (bool);
protected:
virtual void do_post_move_processing ();
virtual void do_pre_move_processing ();
\" {
start_quote ();
}
+ - {
+ return CHORD_MINUS;
+ }
+ \^ {
+ return CHORD_CARET;
+ }
. {
return yylval.c = YYText ()[0];
}
{
if (dynamic_cast<Melisma_playing_req*>(m))
{
- Scalar s (get_property ("melismaBusy", 0));
- return s.to_bool ();
+ Scalar plain (get_property ("melismaBusy", 0));
+ Scalar slur (get_property ("slurMelismaBusy", 0));
+ Scalar tie (get_property ("tieMelismaBusy", 0));
+ return plain.to_bool () || slur.to_bool () || tie.to_bool ();
}
return false;
}
span_dir_ = CENTER;
}
-Abbreviation_beam_req::Abbreviation_beam_req ()
+Chord_tremolo_req::Chord_tremolo_req ()
{
type_i_ = 0;
}
void
-Abbreviation_beam_req::do_print () const
+Chord_tremolo_req::do_print () const
{
#ifndef NPRINT
DOUT << type_i_;
static Keyword_ent the_key_tab[]={
{"spanrequest", SPANREQUEST},
+ {"simultaneous", SIMULTANEOUS},
+ {"sequential", SEQUENTIAL},
{"accepts", ACCEPTS},
{"alternative", ALTERNATIVE},
{"bar", BAR},
%token CLEF
%token CM_T
%token CONSISTS
+%token SEQUENTIAL
+%token SIMULTANEOUS
%token CONSISTSEND
%token DURATION
%token EXTENDER
%token VERSION
/* escaped */
-%token E_EXCLAMATION E_SMALLER E_BIGGER E_CHAR
+%token E_EXCLAMATION E_SMALLER E_BIGGER E_CHAR CHORD_MINUS CHORD_CARET
%type <i> exclamations questions
%token <i> DIGIT
}
;
-Sequential_music: '{' Music_list '}' {
+Sequential_music:
+ SEQUENTIAL '{' Music_list '}' {
+ $$ = new Sequential_music ($3);
+ $$->set_spot ($3->spot ());
+ }
+ | '{' Music_list '}' {
$$ = new Sequential_music ($2);
$$->set_spot ($2->spot ());
}
;
-Simultaneous_music: '<' Music_list '>' {
+Simultaneous_music:
+ SIMULTANEOUS '{' Music_list '}'{
+ $$ = new Simultaneous_music ($3);
+ $$->set_spot ($3->spot ());
+ }
+ | '<' Music_list '>' {
$$ = new Simultaneous_music ($2);
$$->set_spot ($2->spot ());
}
else
THIS->set_abbrev_beam ($3);
- Abbreviation_beam_req* a = new Abbreviation_beam_req;
+ Chord_tremolo_req* a = new Chord_tremolo_req;
a->span_dir_ = START;
a->type_i_ = THIS->abbrev_beam_type_i_;
$$=a;
}
else
{
- Abbreviation_beam_req* a = new Abbreviation_beam_req;
+ Chord_tremolo_req* a = new Chord_tremolo_req;
a->span_dir_ = STOP;
a->type_i_ = THIS->abbrev_beam_type_i_;
THIS->set_abbrev_beam (0);
{
$$ = new Array<Musical_pitch>;
}
- | '-' chord_notes {
+ | CHORD_MINUS chord_notes {
$$ = $2;
}
;
{
$$ = new Array<Musical_pitch>;
}
- | '^' chord_notes {
+ | CHORD_CARET chord_notes {
$$ = $2;
}
;
void
Slur_engraver::set_melisma (bool m)
{
- Translator_group *where = daddy_trans_l_;
- get_property ("melismaBusy", &where);
- if (!where)
- where = daddy_trans_l_;
+ Translator_group *where = daddy_trans_l_;
+ get_property ("slurMelismaBusy", &where);
+ if (!where)
+ where = daddy_trans_l_;
- daddy_trans_l_->set_property ("melismaBusy", m ? "1" :"0");
+ daddy_trans_l_->set_property ("slurMelismaBusy", m ? "1" :"0");
}
void
#include "pointer.tcc"
#include "score-column.hh"
#include "paper-def.hh"
-#include "colhpos.hh"
+#include "column-x-positions.hh"
#include "main.hh"
Vector
#include "note-head.hh"
#include "musical-request.hh"
#include "tie.hh"
+#include "translator-group.hh"
Tie_engraver::Tie_engraver()
{
if (Tie_req * c = dynamic_cast<Tie_req*> (m))
{
req_l_ = c;
+ if (get_property ("automaticMelismas",0).to_bool ())
+ {
+ set_melisma (true);
+ }
return true;
}
return false;
}
+void
+Tie_engraver::set_melisma (bool m)
+{
+ Translator_group *where = daddy_trans_l_;
+ get_property ("tieMelismaBusy", &where);
+ if (!where)
+ where = daddy_trans_l_;
+
+ daddy_trans_l_->set_property ("tieMelismaBusy", m ? "1" :"0");
+}
+
void
Tie_engraver::acknowledge_element (Score_element_info i)
{
void
Tie_engraver::do_post_move_processing ()
{
- req_l_ =0;
+ if (get_property ("automaticMelismas",0).to_bool ())
+ {
+ set_melisma (false);
+ }
+ req_l_ = 0;
Moment now = now_mom ();
while (past_notes_pq_.size () && past_notes_pq_.front ().end_ < now)
past_notes_pq_.delmin ();
\consists "Dynamic_engraver"; % must come before text_engraver.
\name Voice ;
- \consists "Tie_engraver";
+% \consists "Tie_engraver";
\consists "Breathing_sign_engraver";
\consists "Rest_engraver";
\consists "Dot_column_engraver";
beamAuto = "1";
\consists "Auto_beam_engraver";
\include "auto-beam-settings.ly";
- \consists "Abbreviation_beam_engraver";
+ \consists "Chord_tremolo_engraver";
% \consists "Multi_measure_rest_engraver";
% ugh. Order matters here.
\consists "Rhythmic_column_engraver";
\consists "Font_size_engraver";
\consists "Slur_engraver";
+ \consists "Tie_engraver";
\consists "Tuplet_engraver";
\consists "Grace_position_engraver";
\consists "Skip_req_swallow_translator";
Begin3
Title: LilyPond
-Version: 1.1.65
-Entered-date: 22JUL99
+Version: 1.1.66
+Entered-date: 23JUL99
Description:
LilyPond is a music typesetter. It produces beautiful sheet music
using a high level description file as input. LilyPond is part of
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.1.65.tar.gz
+ 1000k lilypond-1.1.66.tar.gz
Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
- 1000k lilypond-1.1.65.tar.gz
+ 1000k lilypond-1.1.66.tar.gz
Copying-policy: GPL
End
Name: lilypond
-Version: 1.1.65
+Version: 1.1.66
Release: 1
Copyright: GPL
Group: Applications/Publishing
-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.65.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.66.tar.gz
Summary: A program for printing sheet music.
URL: http://www.cs.uu.nl/~hanwen/lilypond
Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>
EXTRA_DIST_FILES += README
FET_FILES = $(wildcard feta[0-9]*.mf)
+FONT_FILES = $(wildcard feta*[0-9].mf)
LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log))
TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex))
-XPM_FONTS = feta20
AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm))
-TFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tfm))
+TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
ALL_GEN_FILES= $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) $(TFM_FILES)
R2. |
g8. b16 es4. d8 |
c8. g16 es4. c8 |
- % \times 2/3 { [ as\grace( bes ] )
\grace { as'16 bes } \times 2/3 { [ )as8( )g] as } c4. as8 |
g2. |
\grace { f16( g } \times 2/3 { [ )f8( )e] f } as4. f8 |
c8. g16 e4. c8 |
\grace { a'16( b } \times 2/3 { [ )a!8( ) gis] a } c4. a8 |
g!2. |
- % \times 2/3 { [ a\grace( b] )
- \times 2/3 { [ d'8\f cis] d } f4. b,8 |
+ \times 2/3 { [ d'8\f( )cis] d } f4. b,8 |
c!2. |
}
R2. |
\grace { a16( b } \times 2/3 { [ )a!8( ) gis] a } c4. a8 |
g!2. |
- \times 2/3 { [ d'8\f cis] d } f4. b,8 |
+ \times 2/3 { [ d'8\f( )cis] d } f4. b,8 |
c!2. ~ |
c4 r c |
as2. |
}
lyricVerseOne = \lyrics{
- Lei- " " se fleh- en mei- " " ne Lie- der
- Durch die Nacht " " zu dir;
- In " " den stil- len Hain " " her- nie- der
- Lieb- chen, komm " " zu mir!
+ Lei- se fleh- en mei- ne Lie- der
+ Durch die Nacht zu dir;
+ In den stil- len Hain her- nie- der
+ Lieb- chen, komm zu mir!
Fl\"us- ternd schlan- ke Wip- fel rau- schen
- In " " des Mon- des Licht,
- In " " des Mon- des Licht;
+ In des Mon- des Licht,
+ In des Mon- des Licht;
Des Ver- r\"a- ters feind- lich Lau- schen
- F\"urch- " " te, Hol- de, nicht,
- F\"urch- " " te, Hol- de, nicht.
+ F\"urch- te, Hol- de, nicht,
+ F\"urch- te, Hol- de, nicht.
}
lyricVerseTwo = \lyrics{
- H\"orst " " die Nach- ti- gal- " " len schla- gen?
- Ach! sie fleh- " " en dich,
- Mit " " der T\"o- ne s\"u- " " "\ss en" Kla- gen
- Fleh- en sie " " f\"ur mich.
+ H\"orst die Nach- ti- gal- len schla- gen?
+ Ach! sie fleh- en dich,
+ Mit der T\"o- ne s\"u- "\ss en" Kla- gen
+ Fleh- en sie f\"ur mich.
Sie- ver- "steh'n" des Bus- ens Seh- nen
- Ken- " " nen Lieb- es- schmerz,
- Ken- " " nen Lieb- es- schmerz.
+ Ken- nen Lieb- es- schmerz,
+ Ken- nen Lieb- es- schmerz.
R\"uh- ren mit den Sil- ber- t\"o- nen
- Jed- " " es wei- che Herz,
- Jed- " " es wei- che Herz.
+ Jed- es wei- che Herz,
+ Jed- es wei- che Herz.
}
lyricThrough = \lyrics{
La\ss auch dir die Brust be- we- gen
Lieb- chen, h\"o- re mich!
- Be- bend harr' " " ich dir ent- ge- gen!
+ Be- bend harr' ich dir ent- ge- gen!
- Komm, " " be- gl\"uk- ke mich!
- Komm, " " be- gl\"uk- ke mich, __ " "
+ Komm, be- gl\"uk- ke mich!
+ Komm, be- gl\"uk- ke mich, __
Be- gl\"uk- ke mich!
}
\clef treble;
% certainly no auto-beaming for vocals
\property Voice.beamAuto=0
+ \property Staff.automaticMelismas=1
\property Voice.dynamicDir = \up
\skip 4 * 12;
projects / lilypond.git / commitdiff