* Documentation/user/refman.itely (Pitches): doc quarter tones.
* lily/pitch.cc (LY_DEFINE): ly:pitch-quartertones: new function
(quartertone_pitch): new function
* mf/feta-toevallig.mf: add 3/4 sharp, 1/4 sharp, 1/4 flat.
* ly/nederlands.ly: add -eh and -ih for quarter tones.
* mf/feta-toevallig.mf: change accidental codes.
* scm/lily.scm (ly:get-option): switch on debugging only for
--verbose.
* lily/lily-guile.cc: remove ly:verbose?
* lily/scm-option.cc (LY_DEFINE): add verbose to get-option.
* lily/parser.yy (TODO): only do gh_call() for apply with
procedure argument.
2003-09-18 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ * Documentation/topdocs/NEWS.texi (Top): add quarter tones.
+
+ * Documentation/user/refman.itely (Pitches): doc quarter tones.
+
+ * lily/pitch.cc (LY_DEFINE): ly:pitch-quartertones: new function
+ (quartertone_pitch): new function
+
+ * mf/feta-toevallig.mf: add 3/4 sharp, 1/4 sharp, 1/4 flat.
+
+ * ly/nederlands.ly: add -eh and -ih for quarter tones.
+
+ * lily/accidental-placement.cc (add_accidental): support for
+ quarter tones.
+
+ * ly/LANGUAGEs.ly: use symbols for alterations.
+
+ * mf/feta-toevallig.mf: change accidental codes.
+
+ * scm/lily.scm (ly:get-option): switch on debugging only for
+ --verbose.
+
+ * lily/lily-guile.cc: remove ly:verbose?
+
+ * lily/scm-option.cc (LY_DEFINE): add verbose to get-option.
+
+ * lily/parser.yy (TODO): only do gh_call() for apply with
+ procedure argument.
+
* lily/tie-engraver.cc (start_translation_timestep): move melisma
stuff in accordance with new timing of tie-events.
@chapter New features in 1.9 since 1.8
@itemize
+@item
+Quarter tones are now supported. They are entered by suffixing
+@code{ih} for a half-sharp and @code{eh} for a half-flat. Hence, the
+following is an ascending list of pitches:
+
+@example
+ ceses ceseh ces ceh c cih cis cisih cisis
+@end example
+
+
@item
Clefs may now be transposed arbitrarily, for example
(ly:set-mus-property! m 'elements (reverse
(ly:get-mus-property m 'elements)))
m)
- \score { \notes \apply #rev-music-1 { c4 d4 } }
+ \score { \notes \apply #rev-music-1 { c4 d4 } }
@end lilypond
The use of such a function is very limited. The effect of this
Some of the input syntax is also implemented as recursive music
functions. For example, the syntax for polyphony
@example
- << a \\ b>>
+ <<a \\ b>>
@end example
@noindent
@cindex Scheme error
@item Scheme error
Errors that occur while executing Scheme code are caught by the Scheme
-interpreter. When they occur, a call trace of the offending function
-is printed.
+interpreter. If running with the verbose option (@code{-V} or
+@code{--verbose}) then a call trace is printed of the offending
+function call.
@cindex Programming error
@item Programming error
If you have input that results in a crash or an erroneous output, then
that is a bug. We try respond to bug-reports promptly, and fix them as
-soon as possible. For this, we need to replicate and isolate the
-problem. Please help us by sending a good bug-report: an input file
-that will reproduce the problem. Please make it small, so we can
-easily isolate the problem. Don't forget to tell which version you
-use, and on which platform you run it. Send the report to
+soon as possible. For this, we need to reproduce and isolate the
+problem. Help us by sending a defective input file, so we can
+reproduce the problem. Make it small, so we can easily debug the
+problem. Don't forget to tell which version you use, and on which
+platform you run it. Send the report to
@email{bug-lilypond@@gnu.org}.
@node Point and click
Harald Banter, Akkord Lexikon. Schott's S@"{o}hne
1987. Mainz, Germany ISBN 3-7957-2095-8.
-Comprehensive overview of commonly used chords. Suggests (and uses) a
-unification for all different kinds of chord names.
+This book is a comprehensive overview of commonly used chords and
+suggests a unification for all different kinds of chord names.
@item Ignatzek 1995
Klaus Ignatzek, Die Jazzmethode f@"{u}r Klavier. Schott's S@"{o}hne
Karl Hader, Aus der Werkstatt eines Notenstechers. Waldheim--Eberle
Verlag, Vienna 1948.
-Hader was the chief-engraver of the Waldheim-Eberle music publishers.
-This beautiful booklet was intended as an introduction for laymen on the
+Hader was the chief-engraver of an Austrian engraving firm. This
+beautiful booklet was intended as an introduction for laymen on the
art of engraving. It contains a step by step, in-depth explanation of
how to cut and stamp music into zinc plates. It also contains a few
compactly formulated rules on musical orthography. This book is out of
@code{as}, but both forms are accepted. Similarly, both
@code{es} and @code{ees} are accepted.
+Half-flats and half-sharps are formed by adding @code{-eh} and
+@code{-ih}; the following is a series of Cs with increasing pitches:
+
+@lilypond[verbatim,relative 2]
+ ceses4
+ ceseh
+ ces
+ ceh
+ c
+ cih
+ cis
+ cisih
+ cisis
+@end lilypond
+
There are predefined sets of note names for various other languages.
To use them, include the language specific init file. For
example: @code{\include "english.ly"}. The available language files
* Tuning objects ::
* Constructing a tweak::
* Applyoutput::
-* Outputproperty::
* Font selection::
* Text markup::
@end menu
@item the context where @code{\applyoutput} is processed.
@end itemize
+
In addition, the cause of the layout object, i.e. the music
expression or object that was responsible for creating it, is in the
object property @code{cause}. For example, for a note head, this is a
@internalsref{NoteHead} event, and for a @internalsref{Stem} object,
this is a @internalsref{NoteHead} object.
+Here is a simple example of @code{\applyoutput}; it blanks note-heads on the
+center-line:
+@example
+(define (blanker grob grob-origin context)
+ (if (and (memq (ly:get-grob-property grob 'interfaces)
+ note-head-interface)
+ (eq? (ly:get-grob-property grob 'staff-position) 0))
+
+ (ly:set-grob-property! grob 'transparent #t)))
+@end example
+
@node Font selection
line breaks and the spacing. These all influence each other. The
choice of spacing determines how densely each system of music is set,
which influences where line breaks breaks are chosen, and thus
-ultimately how many pages a piece of music takes. In this section, the
-algorithm for spacing music is explained, and how spacing can be
-tuned.
+ultimately how many pages a piece of music takes. This section
+explains how to tune the algorithm for spacing.
Globally spoken, this procedure happens in three steps: first,
flexible distances (``springs'') are chosen, based on durations. All
@example
\property Staff.minimumVerticalExtent = #'(-4 . 4)
@end example
-This sets the vertical size of the current staff to 4 staff-space on
+This sets the vertical size of the current staff to 4 staff spaces on
either side of the center staff line. The argument of
@code{minimumVerticalExtent} is interpreted as an interval, where the
center line is the 0, so the first number is generally negative. The
If one would follow the above procedure exactly, then adding a single
32th note to a score that uses 8th and 16th notes, would widen up the
entire score a lot. The shortest note is no longer a 16th, but a 32nd,
-thus adding 2 noteheads of space to every note. To prevent this, the
+thus adding 1 NHW to every note. To prevent this, the
shortest duration for spacing is not the shortest note in the score,
but the most commonly found shortest note. Notes that are even
-shorter this are followed by a space that is proportonial to their
+shorter this are followed by a space that is proportional to their
duration relative to the common shortest note. So if we were to add
only a few 16th notes to the example above, they would be followed by
half a NHW:
--- /dev/null
+\header {
+
+ texidoc = "Quarter tone notation is supported, including
+ threequarters flat."
+ }
+
+
+\score {
+ \notes \relative c'' {
+ \time 12/4
+ ceses4
+ ceseh
+ ces
+ ceh
+ c
+ c
+ cih
+ cis
+ cisih
+ cisis
+ }
+ \paper { raggedright = ##t }
+}
(n (ly:pitch-notename p)))
(cond
- ((and (> a 0) (or (eq? n 6) (eq? n 2)))
- (set! a (- a 1)) (set! n (+ n 1)))
- ((and (< a 0) (or (eq? n 0) (eq? n 3)))
- (set! a (+ a 1)) (set! n (- n 1))))
+ ((and (> a 1) (or (eq? n 6) (eq? n 2)))
+ (set! a (- a 2)) (set! n (+ n 1)))
+ ((and (< a -1) (or (eq? n 0) (eq? n 3)))
+ (set! a (+ a 2)) (set! n (- n 1))))
(cond
- ((eq? a 2) (set! a 0) (set! n (+ n 1)))
- ((eq? a -2) (set! a 0) (set! n (- n 1))))
+ ((eq? a 4) (set! a 0) (set! n (+ n 1)))
+ ((eq? a -4) (set! a 0) (set! n (- n 1))))
(if (< n 0) (begin (set! o (- o 1)) (set! n (+ n 7))))
(if (> n 6) (begin (set! o (+ o 1)) (set! n (- n 7))))
#include "molecule.hh"
#include "accidental-interface.hh"
#include "paper-def.hh"
+#include "pitch.hh"
/*
TODO: insert support for smaller cautionaries, tie-break-reminders.
&& !parens
&& scm_ilength (accs) == 1)
{
- if (gh_scm2int (gh_car (accs)) == -1)
+ if (gh_scm2int (gh_car (accs)) == FLAT)
{
Box stem = b;
Box bulb = b;
* is currently no sharp accidental in vaticana style. In these cases
* this function falls back to one of the other styles.
*/
+
+/*
+ todo: this sort of stuff in Scheme. --hwn.
+ */
String
-Accidental_interface::get_fontcharname(String style, int alteration)
+Accidental_interface::get_fontcharname (String style, int alteration)
{
+ if (alteration == DOUBLE_FLAT
+ || alteration == DOUBLE_SHARP)
+ {
+ return to_string (alteration);
+ }
+
if (style == "hufnagel")
switch (alteration)
{
- case -2: return "-2";
- case -1: return "hufnagel-1";
+ case FLAT: return "hufnagel-1";
case 0: return "vaticana0";
- case 1: return "mensural1";
- case 2: return "2";
+ case SHARP: return "mensural1";
}
if (style == "medicaea")
switch (alteration)
{
- case -2: return "-2";
- case -1: return "medicaea-1";
+ case FLAT: return "medicaea-1";
case 0: return "vaticana0";
- case 1: return "mensural1";
- case 2: return "2";
+ case SHARP: return "mensural1";
}
if (style == "vaticana")
switch (alteration)
{
- case -2: return "-2";
- case -1: return "vaticana-1";
+ case FLAT: return "vaticana-1";
case 0: return "vaticana0";
- case 1: return "mensural1";
- case 2: return "2";
+ case SHARP: return "mensural1";
}
if (style == "mensural")
switch (alteration)
{
- case -2: return "-2";
- case -1: return "mensural-1";
+ case FLAT: return "mensural-1";
case 0: return "vaticana0";
- case 1: return "mensural1";
- case 2: return "2";
+ case SHARP: return "mensural1";
}
+
if (style == "neo_mensural")
style = ""; // currently same as default
if (style == "default")
* (pitch_min > pitch_max) means that pitches are not yet
* initialized
*/
- pitch_min = Pitch (0, 0, +1);
- pitch_max = Pitch (0, 0, -1);
+ pitch_min = Pitch (0, 0, SHARP);
+ pitch_max = Pitch (0, 0, FLAT);
}
void
Molecule accidental (Font_interface::get_default_font (me)->
find_by_name (String ("accidentals-") +
accidentals_style +
- to_string (pitch->get_alteration())));
+ to_string (pitch->get_alteration ())));
accidental.translate_axis (yoffs, Y_AXIS);
head->add_at_edge (X_AXIS, LEFT, accidental, 0.1, 0);
}
Pitch np = p->transposed (delta);
- if (abs (np.get_alteration ()) > 2)
+ if (abs (np.get_alteration ()) > DOUBLE_SHARP)
{
warning (_f ("Transposition by %s makes alteration larger than two",
delta.to_string ()));
#include "lily-proto.hh"
#include "smobs.hh"
-/** A "tonal" pitch. This is a pitch used in diatonal western
- music (12 semitones in an octave), as opposed to a frequency in Hz
- or a integer number of semitones.
+/** A "tonal" pitch. This is a pitch used in diatonal western music
+ (24 quartertones in an octave), as opposed to a frequency in Hz or a
+ integer number of semitones.
Pitch is lexicographically ordered by (octave, notename,
alteration).
- add indeterminate octaves, so it can be used as a key in keySigature
- - abstract out the representation of alteration_, so we can
- put micropitches (quartertones, etc.) in the Pitch object
*/
class Pitch
{
TODO: use SCM
*/
- /// 0 is c, 6 is b
int notename_;
-
- /// 0 natural, 1 sharp, etc
int alteration_;
-
- /// 0 is central c
int octave_;
void transpose (Pitch);
Pitch to_relative_octave (Pitch) const;
static int compare (Pitch const&,Pitch const&);
- /// return large part of interval from central c
+
int steps () const;
- /// return pitch from central c (in halfnotes)
int semitone_pitch () const;
+ int quartertone_pitch () const;
String to_string () const;
SCM smobbed_copy () const;
DECLARE_SIMPLE_SMOBS (Pitch,);
};
+enum {
+ DOUBLE_FLAT = -4,
+ THREE_Q_FLAT,
+ FLAT ,
+ SEMI_FLAT,
+ NATURAL,
+ SEMI_SHARP,
+ SHARP ,
+ THREE_Q_SHARP,
+ DOUBLE_SHARP ,
+};
+
SCM ly_pitch_transpose (SCM p, SCM delta);
DECLARE_UNSMOB(Pitch,pitch);
return scm_makfrom0str (INTERNAL_UNIT);
}
-LY_DEFINE(ly_verbose, "ly:verbose", 0, 0, 0, (),
- "Return whether lilypond is being run in verbose mode.")
-{
- return gh_bool2scm (verbose_global_b);
-}
+
LY_DEFINE(ly_dimension_p, "ly:dimension?", 1, 0, 0, (SCM d),
"Return @var{d} is a number. Used to distinguish length "
}
| APPLY embedded_scm Music {
if (!ly_input_procedure_p ($2))
+ {
THIS->parser_error (_ ("\\apply takes function argument"));
-
- SCM ret = gh_call1 ($2, $3->self_scm ());
- Music *m = unsmob_music (ret);
- if (!m) {
- THIS->parser_error ("\\apply must return a Music");
- m = MY_MAKE_MUSIC("Music");
+ $$ = $3;
+ }
+ else
+ {
+ SCM ret = gh_call1 ($2, $3->self_scm ());
+ Music *m = unsmob_music (ret);
+ if (!m) {
+ THIS->parser_error ("\\apply must return a Music");
+ m = MY_MAKE_MUSIC("Music");
+ }
+ $$ = m;
}
- $$ = m;
}
| NOTES
{ THIS->lexer_->push_note_state (); }
/*
should be settable from input?
*/
-static Byte pitch_byte_a[ ] = { 0, 2, 4, 5, 7, 9, 11 };
+static Byte diatonic_scale_semitones[ ] = { 0, 2, 4, 5, 7, 9, 11 };
/* Calculate pitch height in 12th octave steps. Don't assume
n += 7;
o --;
}
- return (o + n / 7) * 12 + pitch_byte_a[n % 7] + alteration_;
+
+ if (alteration_ % 2)
+ {
+ programming_error ("Calling semitone_pitch() for quarter tone alterations.");
+
+ }
+
+ return (o + n / 7) * 12 + diatonic_scale_semitones[n % 7] + (alteration_/2);
+}
+
+int
+Pitch::quartertone_pitch () const
+{
+ int o = octave_;
+ int n = notename_;
+ while (n < 0)
+ {
+ n += 7;
+ o --;
+ }
+
+ return (o + n / 7) * 24 + 2* diatonic_scale_semitones[n % 7] + (alteration_);
}
void
Pitch::normalise ()
{
- int pitch = semitone_pitch ();
+ int pitch = quartertone_pitch ();
while (notename_ >= 7)
{
notename_ -= 7;
octave_++;
- alteration_ -= semitone_pitch () - pitch;
+ alteration_ -= quartertone_pitch () - pitch;
}
while (notename_ < 0)
{
notename_ += 7;
octave_--;
- alteration_ -= semitone_pitch () - pitch;
+ alteration_ -= quartertone_pitch () - pitch;
}
- while (alteration_ >= 3)
+ while (alteration_ > DOUBLE_SHARP)
{
if (notename_ == 6)
{
notename_++;
alteration_ = 0;
- alteration_ -= semitone_pitch () - pitch;
+ alteration_ -= quartertone_pitch () - pitch;
}
- while (alteration_ <= -3)
+
+ while (alteration_ < DOUBLE_FLAT)
{
if (notename_ == 0)
{
notename_--;
alteration_ = 0;
- alteration_ -= semitone_pitch () - pitch;
+ alteration_ -= quartertone_pitch () - pitch;
}
}
void
Pitch::transpose (Pitch delta)
{
- int new_semi = semitone_pitch () +delta.semitone_pitch();
+ int new_semi = quartertone_pitch () +delta.quartertone_pitch();
octave_ += delta.octave_;
notename_ += delta.notename_;
- alteration_ += new_semi - semitone_pitch();
+ alteration_ += new_semi - quartertone_pitch();
normalise ();
}
Pitch
interval (Pitch const & from , Pitch const & to )
{
- int sound = to.semitone_pitch() - from.semitone_pitch ();
+ int sound = to.quartertone_pitch() - from.quartertone_pitch ();
Pitch pt (to.get_octave () - from.get_octave (),
to.get_notename() - from.get_notename(),
+
to.get_alteration() - from.get_alteration());
- return pt.transposed (Pitch(0,0,sound - pt.semitone_pitch()));
+ return pt.transposed (Pitch(0,0,sound - pt.quartertone_pitch()));
}
/* FIXME
Merge with *pitch->text* funcs in chord-name.scm
*/
-char const *accname[] = {"eses", "es", "", "is" , "isis"};
+char const *accname[] = {"eses", "eseh", "es", "eh" "",
+ "ih", "is" , "isih", "isis"};
String
Pitch::to_string () const
int n = (notename_ + 2) % 7;
String s = ::to_string (char (n + 'a'));
if (alteration_)
- s += String (accname[alteration_ + 2]);
+ s += String (accname[alteration_ - DOUBLE_FLAT]);
if (octave_ >= 0)
{
return gh_int2scm (q);
}
-LY_DEFINE(pitch_semitones, "ly:pitch-semitones", 1, 0, 0,
+LY_DEFINE(ly_pitch_quartertones, "ly:pitch-quartertones", 1, 0, 0,
+ (SCM pp),
+ "calculate the number of semitones of @var{p} from central C.")
+{
+ Pitch *p = unsmob_pitch (pp);
+ SCM_ASSERT_TYPE(p, pp, SCM_ARG1, __FUNCTION__, "Pitch");
+
+ int q = p->quartertone_pitch ();
+
+ return gh_int2scm (q);
+}
+
+LY_DEFINE(ly_pitch_semitones, "ly:pitch-semitones", 1, 0, 0,
(SCM pp),
"calculate the number of semitones of @var{p} from central C.")
{
LY_DEFINE(ly_pitch_diff, "ly:pitch-diff", 2 ,0 ,0,
(SCM pitch, SCM root),
"Return pitch with value DELTA = PITCH - ROOT, ie, "
-"ROOT == (ly:pitch-transpose root delta).")
+ "ROOT == (ly:pitch-transpose root delta).")
{
Pitch *p = unsmob_pitch (pitch);
Pitch *r = unsmob_pitch (root);
return interval (*r, *p).smobbed_copy();
}
-
-
-
-
SCM
Pitch::smobbed_copy ()const
{
}
}
- return Pitch (p.get_octave () + delta_oct,
- p.get_notename (), p.get_alteration ());
+ return Pitch (p.get_octave () + delta_oct,
+ p.get_notename (), p.get_alteration ());
}
ADD_MUSIC(Relative_octave_check);
#include "lily-guile.hh"
#include "scm-option.hh"
#include "warn.hh"
+#include "main.hh"
/*
This interface to option setting is meant for setting options are
"Report whether old-relative compatibility mode is necessary\n"
"@item old-relative\n"
"Report whether old-relative compatibility mode is used\n"
+ "@item verbose\n"
+ "Report whether we are running in verbose mode\n"
"@end table\n"
"\n")
{
{
return gh_bool2scm (lily_1_8_relative);
}
+ if (var == ly_symbol2scm ("verbose"))
+ {
+ return gh_bool2scm (verbose_global_b);
+ }
else
{
warning (_("Unknown internal option!"));
-\version "1.9.1"
+\version "1.9.7"
% a3-init.ly
hsize = 296.9 \mm
-\version "1.9.1"
+\version "1.9.7"
% a4.ly
hsize = 210.0 \mm
-\version "1.9.1"
+\version "1.9.7"
% Symbols needed to print accordion music
%
% 2' = T
% Toplevel initialisation file.
-\version "1.9.1"
+\version "1.9.7"
\include "declarations-init.ly"
(sostenido) .
%}
-% contributed by Jaume Obrador <jobrador@ipc4.uib.es>
+% contributed by Jaume Obrador <<jobrador@ipc4.uib.es>>
% For using "sostingut" notation, which is also correct
\pitchnames #`(
- (dobb . ,(ly:make-pitch -1 0 -2 ))
- (dob . ,(ly:make-pitch -1 0 -1 ))
- (do . ,(ly:make-pitch -1 0 0 ))
- (dod . ,(ly:make-pitch -1 0 1 ))
- (dodd . ,(ly:make-pitch -1 0 2 ))
- (rebb . ,(ly:make-pitch -1 1 -2 ))
- (reb . ,(ly:make-pitch -1 1 -1 ))
- (re . ,(ly:make-pitch -1 1 0 ))
- (red . ,(ly:make-pitch -1 1 1 ))
- (redd . ,(ly:make-pitch -1 1 2 ))
- (mibb . ,(ly:make-pitch -1 2 -2 ))
- (mib . ,(ly:make-pitch -1 2 -1 ))
- (mi . ,(ly:make-pitch -1 2 0 ))
- (mid . ,(ly:make-pitch -1 2 1 ))
- (midd . ,(ly:make-pitch -1 2 2 ))
- (fabb . ,(ly:make-pitch -1 3 -2 ))
- (fab . ,(ly:make-pitch -1 3 -1 ))
- (fa . ,(ly:make-pitch -1 3 0 ))
- (fad . ,(ly:make-pitch -1 3 1 ))
- (fadd . ,(ly:make-pitch -1 3 2 ))
- (solbb . ,(ly:make-pitch -1 4 -2 ))
- (solb . ,(ly:make-pitch -1 4 -1 ))
- (sol . ,(ly:make-pitch -1 4 0 ))
- (sold . ,(ly:make-pitch -1 4 1 ))
- (soldd . ,(ly:make-pitch -1 4 2 ))
- (labb . ,(ly:make-pitch -1 5 -2 ))
- (lab . ,(ly:make-pitch -1 5 -1 ))
- (la . ,(ly:make-pitch -1 5 0 ))
- (lad . ,(ly:make-pitch -1 5 1 ))
- (ladd . ,(ly:make-pitch -1 5 2 ))
- (sibb . ,(ly:make-pitch -1 6 -2 ))
- (sib . ,(ly:make-pitch -1 6 -1 ))
- (si . ,(ly:make-pitch -1 6 0 ))
- (sid . ,(ly:make-pitch -1 6 1 ))
- (sidd . ,(ly:make-pitch -1 6 2 ))
+ (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (dob . ,(ly:make-pitch -1 0 FLAT))
+ (do . ,(ly:make-pitch -1 0 NATURAL))
+ (dod . ,(ly:make-pitch -1 0 SHARP))
+ (dodd . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (reb . ,(ly:make-pitch -1 1 FLAT))
+ (re . ,(ly:make-pitch -1 1 NATURAL))
+ (red . ,(ly:make-pitch -1 1 SHARP))
+ (redd . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (mib . ,(ly:make-pitch -1 2 FLAT))
+ (mi . ,(ly:make-pitch -1 2 NATURAL))
+ (mid . ,(ly:make-pitch -1 2 SHARP))
+ (midd . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fab . ,(ly:make-pitch -1 3 FLAT))
+ (fa . ,(ly:make-pitch -1 3 NATURAL))
+ (fad . ,(ly:make-pitch -1 3 SHARP))
+ (fadd . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (solb . ,(ly:make-pitch -1 4 FLAT))
+ (sol . ,(ly:make-pitch -1 4 NATURAL))
+ (sold . ,(ly:make-pitch -1 4 SHARP))
+ (soldd . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (lab . ,(ly:make-pitch -1 5 FLAT))
+ (la . ,(ly:make-pitch -1 5 NATURAL))
+ (lad . ,(ly:make-pitch -1 5 SHARP))
+ (ladd . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (sib . ,(ly:make-pitch -1 6 FLAT))
+ (si . ,(ly:make-pitch -1 6 NATURAL))
+ (sid . ,(ly:make-pitch -1 6 SHARP))
+ (sidd . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
;; Now that we have espanol.ly, should these be junked? --jcn
- (dos . ,(ly:make-pitch -1 0 1 ))
- (doss . ,(ly:make-pitch -1 0 2 ))
- (res . ,(ly:make-pitch -1 1 1 ))
- (ress . ,(ly:make-pitch -1 1 2 ))
- (mis . ,(ly:make-pitch -1 2 1 ))
- (miss . ,(ly:make-pitch -1 2 2 ))
- (fas . ,(ly:make-pitch -1 3 1 ))
- (fass . ,(ly:make-pitch -1 3 2 ))
- (sols . ,(ly:make-pitch -1 4 1 ))
- (solss . ,(ly:make-pitch -1 4 2 ))
- (las . ,(ly:make-pitch -1 5 1 ))
- (lass . ,(ly:make-pitch -1 5 2 ))
- (sis . ,(ly:make-pitch -1 6 1 ))
- (siss . ,(ly:make-pitch -1 6 2 ))
+ (dos . ,(ly:make-pitch -1 0 SHARP))
+ (doss . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (res . ,(ly:make-pitch -1 1 SHARP))
+ (ress . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (mis . ,(ly:make-pitch -1 2 SHARP))
+ (miss . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (fas . ,(ly:make-pitch -1 3 SHARP))
+ (fass . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (sols . ,(ly:make-pitch -1 4 SHARP))
+ (solss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (las . ,(ly:make-pitch -1 5 SHARP))
+ (lass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (sis . ,(ly:make-pitch -1 6 SHARP))
+ (siss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
)
-\version "1.9.1"
+\version "1.9.7"
% Toplevel initialisation file.
-\version "1.9.1"
+\version "1.9.7"
\include "declarations-init.ly"
-\version "1.9.4"
+\version "1.9.7"
\chordmodifiers #default-chord-modifier-list
#(ly:set-option 'old-relative)
-\version "1.9.1"
+\version "1.9.7"
breve = #(ly:make-duration -1 0)
longa = #(ly:make-duration -2 0 )
maxima = #(ly:make-duration -3 0)
% common german names for notes. "es" means flat, "is" means sharp
%
-% by Roland Meier <meier@informatik.th-darmstadt.de>
+% by Roland Meier <<meier@informatik.th-darmstadt.de>>
% based on swedish.ly by Mats Bengtsson.
-% 1999/06/09 Bjoern Jacke <bjoern.jacke@gmx.de>
+% 1999/06/09 Bjoern Jacke <<bjoern.jacke@gmx.de>>
% added asas and marked ases as `unusual'
\pitchnames #`(
- (ceses . ,(ly:make-pitch -1 0 -2 ))
- (ces . ,(ly:make-pitch -1 0 -1 ))
- (c . ,(ly:make-pitch -1 0 0 ))
- (cis . ,(ly:make-pitch -1 0 1 ))
- (cisis . ,(ly:make-pitch -1 0 2 ))
- (deses . ,(ly:make-pitch -1 1 -2 ))
- (des . ,(ly:make-pitch -1 1 -1 ))
- (d . ,(ly:make-pitch -1 1 0 ))
- (dis . ,(ly:make-pitch -1 1 1 ))
- (disis . ,(ly:make-pitch -1 1 2 ))
- (eses . ,(ly:make-pitch -1 2 -2 ))
- (es . ,(ly:make-pitch -1 2 -1 ))
- (e . ,(ly:make-pitch -1 2 0 ))
- (eis . ,(ly:make-pitch -1 2 1 ))
- (eisis . ,(ly:make-pitch -1 2 2 ))
- (feses . ,(ly:make-pitch -1 3 -2 ))
- (fes . ,(ly:make-pitch -1 3 -1 ))
- (f . ,(ly:make-pitch -1 3 0 ))
- (fis . ,(ly:make-pitch -1 3 1 ))
- (fisis . ,(ly:make-pitch -1 3 2 ))
- (geses . ,(ly:make-pitch -1 4 -2 ))
- (ges . ,(ly:make-pitch -1 4 -1 ))
- (g . ,(ly:make-pitch -1 4 0 ))
- (gis . ,(ly:make-pitch -1 4 1 ))
- (gisis . ,(ly:make-pitch -1 4 2 ))
- (asas . ,(ly:make-pitch -1 5 -2 ))
- (ases . ,(ly:make-pitch -1 5 -2 )) ;;non-standard name for asas
- (as . ,(ly:make-pitch -1 5 -1 ))
- (a . ,(ly:make-pitch -1 5 0 ))
- (ais . ,(ly:make-pitch -1 5 1 ))
- (aisis . ,(ly:make-pitch -1 5 2 ))
- (heses . ,(ly:make-pitch -1 6 -2 ))
- (b . ,(ly:make-pitch -1 6 -1 ))
- (h . ,(ly:make-pitch -1 6 0 ))
- (his . ,(ly:make-pitch -1 6 1 ))
- (hisis . ,(ly:make-pitch -1 6 2 ))
+ (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (ces . ,(ly:make-pitch -1 0 FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (cis . ,(ly:make-pitch -1 0 SHARP))
+ (cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (des . ,(ly:make-pitch -1 1 FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (dis . ,(ly:make-pitch -1 1 SHARP))
+ (disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (es . ,(ly:make-pitch -1 2 FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
+ (eis . ,(ly:make-pitch -1 2 SHARP))
+ (eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fes . ,(ly:make-pitch -1 3 FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fis . ,(ly:make-pitch -1 3 SHARP))
+ (fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (ges . ,(ly:make-pitch -1 4 FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (gis . ,(ly:make-pitch -1 4 SHARP))
+ (gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (asas . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT)) ;;non-standard name for asas
+ (as . ,(ly:make-pitch -1 5 FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (ais . ,(ly:make-pitch -1 5 SHARP))
+ (aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (heses . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (b . ,(ly:make-pitch -1 6 FLAT))
+ (h . ,(ly:make-pitch -1 6 NATURAL))
+ (his . ,(ly:make-pitch -1 6 SHARP))
+ (hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
)
-\version "1.9.1"
+\version "1.9.7"
)
-\version "1.9.1"
+\version "1.9.7"
-\version "1.9.1"
+\version "1.9.7"
%
% declare the standard dynamic identifiers.
%}
\pitchnames #`(
- (cflatflat . ,(ly:make-pitch -1 0 -2 ))
- (cflat . ,(ly:make-pitch -1 0 -1 ))
- (c . ,(ly:make-pitch -1 0 0 ))
- (csharp . ,(ly:make-pitch -1 0 1 ))
- (csharpsharp . ,(ly:make-pitch -1 0 2 ))
- (dflatflat . ,(ly:make-pitch -1 1 -2 ))
- (dflat . ,(ly:make-pitch -1 1 -1 ))
- (d . ,(ly:make-pitch -1 1 0 ))
- (dsharp . ,(ly:make-pitch -1 1 1 ))
- (dsharpsharp . ,(ly:make-pitch -1 1 2 ))
- (eflatflat . ,(ly:make-pitch -1 2 -2 ))
- (eflat . ,(ly:make-pitch -1 2 -1 ))
- (e . ,(ly:make-pitch -1 2 0 ))
- (esharp . ,(ly:make-pitch -1 2 1 ))
- (esharpsharp . ,(ly:make-pitch -1 2 2 ))
- (fflatflat . ,(ly:make-pitch -1 3 -2 ))
- (fflat . ,(ly:make-pitch -1 3 -1 ))
- (f . ,(ly:make-pitch -1 3 0 ))
- (fsharp . ,(ly:make-pitch -1 3 1 ))
- (fsharpsharp . ,(ly:make-pitch -1 3 2 ))
- (gflatflat . ,(ly:make-pitch -1 4 -2 ))
- (gflat . ,(ly:make-pitch -1 4 -1 ))
- (g . ,(ly:make-pitch -1 4 0 ))
- (gsharp . ,(ly:make-pitch -1 4 1 ))
- (gsharpsharp . ,(ly:make-pitch -1 4 2 ))
- (aflatflat . ,(ly:make-pitch -1 5 -2 ))
- (aflat . ,(ly:make-pitch -1 5 -1 ))
- (a . ,(ly:make-pitch -1 5 0 ))
- (asharp . ,(ly:make-pitch -1 5 1 ))
- (asharpsharp . ,(ly:make-pitch -1 5 2 ))
- (bflatflat . ,(ly:make-pitch -1 6 -2 ))
- (bflat . ,(ly:make-pitch -1 6 -1 ))
- (b . ,(ly:make-pitch -1 6 0 ))
- (bsharp . ,(ly:make-pitch -1 6 1 ))
- (bsharpsharp . ,(ly:make-pitch -1 6 2 ))
+ (cflatflat . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (cflat . ,(ly:make-pitch -1 0 FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (csharp . ,(ly:make-pitch -1 0 SHARP))
+ (csharpsharp . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (dflatflat . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (dflat . ,(ly:make-pitch -1 1 FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (dsharp . ,(ly:make-pitch -1 1 SHARP))
+ (dsharpsharp . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (eflatflat . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (eflat . ,(ly:make-pitch -1 2 FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
+ (esharp . ,(ly:make-pitch -1 2 SHARP))
+ (esharpsharp . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (fflatflat . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fflat . ,(ly:make-pitch -1 3 FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fsharp . ,(ly:make-pitch -1 3 SHARP))
+ (fsharpsharp . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (gflatflat . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (gflat . ,(ly:make-pitch -1 4 FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (gsharp . ,(ly:make-pitch -1 4 SHARP))
+ (gsharpsharp . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (aflatflat . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (aflat . ,(ly:make-pitch -1 5 FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (asharp . ,(ly:make-pitch -1 5 SHARP))
+ (asharpsharp . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (bflatflat . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (bflat . ,(ly:make-pitch -1 6 FLAT))
+ (b . ,(ly:make-pitch -1 6 NATURAL))
+ (bsharp . ,(ly:make-pitch -1 6 SHARP))
+ (bsharpsharp . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
- (cff . ,(ly:make-pitch -1 0 -2 ))
- (cf . ,(ly:make-pitch -1 0 -1 ))
- (c . ,(ly:make-pitch -1 0 0 ))
- (cs . ,(ly:make-pitch -1 0 1 ))
- (css . ,(ly:make-pitch -1 0 2 ))
- (cx . ,(ly:make-pitch -1 0 2 ))
- (dff . ,(ly:make-pitch -1 1 -2 ))
- (df . ,(ly:make-pitch -1 1 -1 ))
- (d . ,(ly:make-pitch -1 1 0 ))
- (ds . ,(ly:make-pitch -1 1 1 ))
- (dss . ,(ly:make-pitch -1 1 2 ))
- (dx . ,(ly:make-pitch -1 1 2 ))
- (eff . ,(ly:make-pitch -1 2 -2 ))
- (ef . ,(ly:make-pitch -1 2 -1 ))
- (e . ,(ly:make-pitch -1 2 0 ))
+ (cff . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (cf . ,(ly:make-pitch -1 0 FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (cs . ,(ly:make-pitch -1 0 SHARP))
+ (css . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (cx . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (dff . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (df . ,(ly:make-pitch -1 1 FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (ds . ,(ly:make-pitch -1 1 SHARP))
+ (dss . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (dx . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (eff . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (ef . ,(ly:make-pitch -1 2 FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
- (es . ,(ly:make-pitch -1 2 1 ))
- (ess . ,(ly:make-pitch -1 2 2 ))
- (ex . ,(ly:make-pitch -1 2 2 ))
- (fff . ,(ly:make-pitch -1 3 -2 ))
- (ff . ,(ly:make-pitch -1 3 -1 ))
- (f . ,(ly:make-pitch -1 3 0 ))
- (fs . ,(ly:make-pitch -1 3 1 ))
- (fss . ,(ly:make-pitch -1 3 2 ))
- (fx . ,(ly:make-pitch -1 3 2 ))
- (gff . ,(ly:make-pitch -1 4 -2 ))
- (gf . ,(ly:make-pitch -1 4 -1 ))
- (g . ,(ly:make-pitch -1 4 0 ))
- (gs . ,(ly:make-pitch -1 4 1 ))
- (gss . ,(ly:make-pitch -1 4 2 ))
- (gx . ,(ly:make-pitch -1 4 2 ))
- (aff . ,(ly:make-pitch -1 5 -2 ))
- (af . ,(ly:make-pitch -1 5 -1 ))
- (a . ,(ly:make-pitch -1 5 0 ))
- (as . ,(ly:make-pitch -1 5 1 ))
- (ass . ,(ly:make-pitch -1 5 2 ))
- (ax . ,(ly:make-pitch -1 5 2 ))
- (bff . ,(ly:make-pitch -1 6 -2 ))
- (bf . ,(ly:make-pitch -1 6 -1 ))
- (b . ,(ly:make-pitch -1 6 0 ))
- (bs . ,(ly:make-pitch -1 6 1 ))
- (bss . ,(ly:make-pitch -1 6 2 ))
- (bx . ,(ly:make-pitch -1 6 2 ))
+ (es . ,(ly:make-pitch -1 2 SHARP))
+ (ess . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (ex . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (fff . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (ff . ,(ly:make-pitch -1 3 FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fs . ,(ly:make-pitch -1 3 SHARP))
+ (fss . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (fx . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (gff . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (gf . ,(ly:make-pitch -1 4 FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (gs . ,(ly:make-pitch -1 4 SHARP))
+ (gss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (gx . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (aff . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (af . ,(ly:make-pitch -1 5 FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (as . ,(ly:make-pitch -1 5 SHARP))
+ (ass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (ax . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (bff . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (bf . ,(ly:make-pitch -1 6 FLAT))
+ (b . ,(ly:make-pitch -1 6 NATURAL))
+ (bs . ,(ly:make-pitch -1 6 SHARP))
+ (bss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ (bx . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
)
-\version "1.9.1"
+\version "1.9.7"
-\version "1.9.1"
+\version "1.9.7"
%
%}
-% contributed by Carlos GarcÃa Suárez <cgscqmp@terra.es>
+% contributed by Carlos GarcÃa Suárez <<cgscqmp@terra.es>>
% For using "sostingut" notation, which is also correct
\pitchnames #`(
- (dobb . ,(ly:make-pitch -1 0 -2 ))
- (dob . ,(ly:make-pitch -1 0 -1 ))
- (do . ,(ly:make-pitch -1 0 0 ))
- (dos . ,(ly:make-pitch -1 0 1 ))
- (doss . ,(ly:make-pitch -1 0 2 ))
-
- (rebb . ,(ly:make-pitch -1 1 -2 ))
- (reb . ,(ly:make-pitch -1 1 -1 ))
- (re . ,(ly:make-pitch -1 1 0 ))
- (res . ,(ly:make-pitch -1 1 1 ))
- (ress . ,(ly:make-pitch -1 1 2 ))
-
- (mibb . ,(ly:make-pitch -1 2 -2 ))
- (mib . ,(ly:make-pitch -1 2 -1 ))
- (mi . ,(ly:make-pitch -1 2 0 ))
- (mis . ,(ly:make-pitch -1 2 1 ))
- (miss . ,(ly:make-pitch -1 2 2 ))
-
- (fabb . ,(ly:make-pitch -1 3 -2 ))
- (fab . ,(ly:make-pitch -1 3 -1 ))
- (fa . ,(ly:make-pitch -1 3 0 ))
- (fas . ,(ly:make-pitch -1 3 1 ))
- (fass . ,(ly:make-pitch -1 3 2 ))
-
- (solbb . ,(ly:make-pitch -1 4 -2 ))
- (solb . ,(ly:make-pitch -1 4 -1 ))
- (sol . ,(ly:make-pitch -1 4 0 ))
- (sols . ,(ly:make-pitch -1 4 1 ))
- (solss . ,(ly:make-pitch -1 4 2 ))
-
- (labb . ,(ly:make-pitch -1 5 -2 ))
- (lab . ,(ly:make-pitch -1 5 -1 ))
- (la . ,(ly:make-pitch -1 5 0 ))
- (las . ,(ly:make-pitch -1 5 1 ))
- (lass . ,(ly:make-pitch -1 5 2 ))
-
- (sibb . ,(ly:make-pitch -1 6 -2 ))
- (sib . ,(ly:make-pitch -1 6 -1 ))
- (si . ,(ly:make-pitch -1 6 0 ))
- (sis . ,(ly:make-pitch -1 6 1 ))
- (siss . ,(ly:make-pitch -1 6 2 ))
+ (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (dob . ,(ly:make-pitch -1 0 FLAT))
+ (do . ,(ly:make-pitch -1 0 NATURAL))
+ (dos . ,(ly:make-pitch -1 0 SHARP))
+ (doss . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+
+ (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (reb . ,(ly:make-pitch -1 1 FLAT))
+ (re . ,(ly:make-pitch -1 1 NATURAL))
+ (res . ,(ly:make-pitch -1 1 SHARP))
+ (ress . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+
+ (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (mib . ,(ly:make-pitch -1 2 FLAT))
+ (mi . ,(ly:make-pitch -1 2 NATURAL))
+ (mis . ,(ly:make-pitch -1 2 SHARP))
+ (miss . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+
+ (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fab . ,(ly:make-pitch -1 3 FLAT))
+ (fa . ,(ly:make-pitch -1 3 NATURAL))
+ (fas . ,(ly:make-pitch -1 3 SHARP))
+ (fass . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+
+ (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (solb . ,(ly:make-pitch -1 4 FLAT))
+ (sol . ,(ly:make-pitch -1 4 NATURAL))
+ (sols . ,(ly:make-pitch -1 4 SHARP))
+ (solss . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+
+ (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (lab . ,(ly:make-pitch -1 5 FLAT))
+ (la . ,(ly:make-pitch -1 5 NATURAL))
+ (las . ,(ly:make-pitch -1 5 SHARP))
+ (lass . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+
+ (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (sib . ,(ly:make-pitch -1 6 FLAT))
+ (si . ,(ly:make-pitch -1 6 NATURAL))
+ (sis . ,(ly:make-pitch -1 6 SHARP))
+ (siss . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
)
-\version "1.9.1"
+\version "1.9.7"
-\version "1.9.1"
+\version "1.9.7"
%
% Running LilyPond on this file generates the documentation
-\version "1.9.1"
+\version "1.9.7"
%
% Running LilyPond on this file generates the short interface doc
-\version "1.9.1"
+\version "1.9.7"
\paper {
texsetting = ""
-\version "1.9.1"
+\version "1.9.7"
startGraceMusic = \notes {
-\version "1.9.1"
+\version "1.9.7"
%%%%%%%%
%%%%%%%% shortcuts common for all styles of gregorian chant notation
#(reset-drum-kit)
-\version "1.9.1"
+\version "1.9.7"
\include "declarations-init.ly"
For french naming just change 'do' in 'ut'.
%}
-% contributed by Paolo Zuliani <zuliap@easynet.it>
+% contributed by Paolo Zuliani <<zuliap@easynet.it>>
\pitchnames #`(
- (dobb . ,(ly:make-pitch -1 0 -2 ))
- (dob . ,(ly:make-pitch -1 0 -1 ))
- (do . ,(ly:make-pitch -1 0 0 ))
- (dod . ,(ly:make-pitch -1 0 1 ))
- (dodd . ,(ly:make-pitch -1 0 2 ))
- (rebb . ,(ly:make-pitch -1 1 -2 ))
- (reb . ,(ly:make-pitch -1 1 -1 ))
- (re . ,(ly:make-pitch -1 1 0 ))
- (red . ,(ly:make-pitch -1 1 1 ))
- (redd . ,(ly:make-pitch -1 1 2 ))
- (mibb . ,(ly:make-pitch -1 2 -2 ))
- (mib . ,(ly:make-pitch -1 2 -1 ))
- (mi . ,(ly:make-pitch -1 2 0 ))
- (mid . ,(ly:make-pitch -1 2 1 ))
- (midd . ,(ly:make-pitch -1 2 2 ))
- (fabb . ,(ly:make-pitch -1 3 -2 ))
- (fab . ,(ly:make-pitch -1 3 -1 ))
- (fa . ,(ly:make-pitch -1 3 0 ))
- (fad . ,(ly:make-pitch -1 3 1 ))
- (fadd . ,(ly:make-pitch -1 3 2 ))
- (solbb . ,(ly:make-pitch -1 4 -2 ))
- (solb . ,(ly:make-pitch -1 4 -1 ))
- (sol . ,(ly:make-pitch -1 4 0 ))
- (sold . ,(ly:make-pitch -1 4 1 ))
- (soldd . ,(ly:make-pitch -1 4 2 ))
- (labb . ,(ly:make-pitch -1 5 -2 ))
- (lab . ,(ly:make-pitch -1 5 -1 ))
- (la . ,(ly:make-pitch -1 5 0 ))
- (lad . ,(ly:make-pitch -1 5 1 ))
- (ladd . ,(ly:make-pitch -1 5 2 ))
- (sibb . ,(ly:make-pitch -1 6 -2 ))
- (sib . ,(ly:make-pitch -1 6 -1 ))
- (si . ,(ly:make-pitch -1 6 0 ))
- (sid . ,(ly:make-pitch -1 6 1 ))
- (sidd . ,(ly:make-pitch -1 6 2 ))
+ (dobb . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (dob . ,(ly:make-pitch -1 0 FLAT))
+ (do . ,(ly:make-pitch -1 0 NATURAL))
+ (dod . ,(ly:make-pitch -1 0 SHARP))
+ (dodd . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (rebb . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (reb . ,(ly:make-pitch -1 1 FLAT))
+ (re . ,(ly:make-pitch -1 1 NATURAL))
+ (red . ,(ly:make-pitch -1 1 SHARP))
+ (redd . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (mibb . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (mib . ,(ly:make-pitch -1 2 FLAT))
+ (mi . ,(ly:make-pitch -1 2 NATURAL))
+ (mid . ,(ly:make-pitch -1 2 SHARP))
+ (midd . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (fabb . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fab . ,(ly:make-pitch -1 3 FLAT))
+ (fa . ,(ly:make-pitch -1 3 NATURAL))
+ (fad . ,(ly:make-pitch -1 3 SHARP))
+ (fadd . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (solbb . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (solb . ,(ly:make-pitch -1 4 FLAT))
+ (sol . ,(ly:make-pitch -1 4 NATURAL))
+ (sold . ,(ly:make-pitch -1 4 SHARP))
+ (soldd . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (labb . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (lab . ,(ly:make-pitch -1 5 FLAT))
+ (la . ,(ly:make-pitch -1 5 NATURAL))
+ (lad . ,(ly:make-pitch -1 5 SHARP))
+ (ladd . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (sibb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (sib . ,(ly:make-pitch -1 6 FLAT))
+ (si . ,(ly:make-pitch -1 6 NATURAL))
+ (sid . ,(ly:make-pitch -1 6 SHARP))
+ (sidd . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
)
-\version "1.9.1"
+\version "1.9.7"
-\version "1.9.1"
+\version "1.9.7"
% ledger.ly
-\version "1.9.1"
+\version "1.9.7"
% legal-init.ly
hsize = 8.5 \in
-\version "1.9.1"
+\version "1.9.7"
% letter-init.ly
hsize = 8.5 \in
-\version "1.9.1"
+\version "1.9.7"
\midi {
\tempo 4=60
\include "performer-init.ly"
\pitchnames #`(
(ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+
+ (ceh . ,(ly:make-pitch -1 0 SEMI-FLAT))
(ces . ,(ly:make-pitch -1 0 FLAT))
+ (ceseh . ,(ly:make-pitch -1 0 THREE-Q-FLAT))
(c . ,(ly:make-pitch -1 0 NATURAL))
(cis . ,(ly:make-pitch -1 0 SHARP))
+ (cih . ,(ly:make-pitch -1 0 SEMI-SHARP))
+ (cisih . ,(ly:make-pitch -1 0 THREE-Q-SHARP))
(cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
(deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+
+ (deh . ,(ly:make-pitch -1 1 SEMI-FLAT))
(des . ,(ly:make-pitch -1 1 FLAT))
+ (deseh . ,(ly:make-pitch -1 1 THREE-Q-FLAT))
(d . ,(ly:make-pitch -1 1 NATURAL))
(dis . ,(ly:make-pitch -1 1 SHARP))
+ (dih . ,(ly:make-pitch -1 1 SEMI-SHARP))
+ (disih . ,(ly:make-pitch -1 1 THREE-Q-SHARP))
(disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
(eeses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
(eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+
+ (eeh . ,(ly:make-pitch -1 2 SEMI-FLAT))
(ees . ,(ly:make-pitch -1 2 FLAT))
+ (eeseh . ,(ly:make-pitch -1 2 THREE-Q-FLAT))
(es . ,(ly:make-pitch -1 2 FLAT))
(e . ,(ly:make-pitch -1 2 NATURAL))
(eis . ,(ly:make-pitch -1 2 SHARP))
+ (eih . ,(ly:make-pitch -1 2 SEMI-SHARP))
+ (eisih . ,(ly:make-pitch -1 2 THREE-Q-SHARP))
(eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
(feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+
+ (feh . ,(ly:make-pitch -1 3 SEMI-FLAT))
(fes . ,(ly:make-pitch -1 3 FLAT))
+ (feseh . ,(ly:make-pitch -1 3 THREE-Q-FLAT))
(f . ,(ly:make-pitch -1 3 NATURAL))
(fis . ,(ly:make-pitch -1 3 SHARP))
+ (fih . ,(ly:make-pitch -1 3 SEMI-SHARP))
+ (fisih . ,(ly:make-pitch -1 3 THREE-Q-SHARP))
(fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
(geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+
+ (geh . ,(ly:make-pitch -1 4 SEMI-FLAT))
(ges . ,(ly:make-pitch -1 4 FLAT))
+ (geseh . ,(ly:make-pitch -1 4 THREE-Q-FLAT))
(g . ,(ly:make-pitch -1 4 NATURAL))
(gis . ,(ly:make-pitch -1 4 SHARP))
+ (gih . ,(ly:make-pitch -1 4 SEMI-SHARP))
+ (gisih . ,(ly:make-pitch -1 4 THREE-Q-SHARP))
(gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
(aeses . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
(ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+
+ (aeh . ,(ly:make-pitch -1 5 SEMI-FLAT))
(aes . ,(ly:make-pitch -1 5 FLAT))
+ (aeseh . ,(ly:make-pitch -1 5 THREE-Q-FLAT))
(as . ,(ly:make-pitch -1 5 FLAT))
(a . ,(ly:make-pitch -1 5 NATURAL))
(ais . ,(ly:make-pitch -1 5 SHARP))
+ (aih . ,(ly:make-pitch -1 5 SEMI-SHARP))
+ (aisih . ,(ly:make-pitch -1 5 THREE-Q-SHARP))
(aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
(beses . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+
+ (beh . ,(ly:make-pitch -1 6 SEMI-FLAT))
(bes . ,(ly:make-pitch -1 6 FLAT))
+ (beseh . ,(ly:make-pitch -1 6 THREE-Q-FLAT))
(b . ,(ly:make-pitch -1 6 NATURAL))
(bis . ,(ly:make-pitch -1 6 SHARP))
+ (bih . ,(ly:make-pitch -1 6 SEMI-SHARP))
+ (bisih . ,(ly:make-pitch -1 6 THREE-Q-SHARP))
(bisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
-)
+ )
added "ass" et al, and made some b->h-related changes. There may be
bugs in here please tell me (or send patches) if you find any.
- Arvid Gr=F8tting <arvidg@ifi.uio.no>
+ Arvid Gr=F8tting <<arvidg@ifi.uio.no>>
%}
\pitchnames #`(
- (ceses . ,(ly:make-pitch -1 0 -2 ))
- (cessess . ,(ly:make-pitch -1 0 -2 ))
- (ces . ,(ly:make-pitch -1 0 -1 ))
- (cess . ,(ly:make-pitch -1 0 -1 ))
- (c . ,(ly:make-pitch -1 0 0 ))
- (cis . ,(ly:make-pitch -1 0 1 ))
- (ciss . ,(ly:make-pitch -1 0 1 ))
- (cisis . ,(ly:make-pitch -1 0 2 ))
- (cississ . ,(ly:make-pitch -1 0 2 ))
- (deses . ,(ly:make-pitch -1 1 -2 ))
- (dessess . ,(ly:make-pitch -1 1 -2 ))
- (des . ,(ly:make-pitch -1 1 -1 ))
- (dess . ,(ly:make-pitch -1 1 -1 ))
- (d . ,(ly:make-pitch -1 1 0 ))
- (dis . ,(ly:make-pitch -1 1 1 ))
- (diss . ,(ly:make-pitch -1 1 1 ))
- (disis . ,(ly:make-pitch -1 1 2 ))
- (dississ . ,(ly:make-pitch -1 1 2 ))
- (eeses . ,(ly:make-pitch -1 2 -2 ))
- (eessess . ,(ly:make-pitch -1 2 -2 ))
- (eses . ,(ly:make-pitch -1 2 -2 ))
- (essess . ,(ly:make-pitch -1 2 -2 ))
- (ees . ,(ly:make-pitch -1 2 -1 ))
- (eess . ,(ly:make-pitch -1 2 -1 ))
- (es . ,(ly:make-pitch -1 2 -1 ))
- (ess . ,(ly:make-pitch -1 2 -1 ))
- (e . ,(ly:make-pitch -1 2 0 ))
- (eis . ,(ly:make-pitch -1 2 1 ))
- (eiss . ,(ly:make-pitch -1 2 1 ))
- (eisis . ,(ly:make-pitch -1 2 2 ))
- (eississ . ,(ly:make-pitch -1 2 2 ))
- (feses . ,(ly:make-pitch -1 3 -2 ))
- (fessess . ,(ly:make-pitch -1 3 -2 ))
- (fes . ,(ly:make-pitch -1 3 -1 ))
- (fess . ,(ly:make-pitch -1 3 -1 ))
- (f . ,(ly:make-pitch -1 3 0 ))
- (fis . ,(ly:make-pitch -1 3 1 ))
- (fiss . ,(ly:make-pitch -1 3 1 ))
- (fisis . ,(ly:make-pitch -1 3 2 ))
- (fississ . ,(ly:make-pitch -1 3 2 ))
- (geses . ,(ly:make-pitch -1 4 -2 ))
- (gessess . ,(ly:make-pitch -1 4 -2 ))
- (ges . ,(ly:make-pitch -1 4 -1 ))
- (gess . ,(ly:make-pitch -1 4 -1 ))
- (g . ,(ly:make-pitch -1 4 0 ))
- (g . ,(ly:make-pitch -1 4 0 ))
- (gis . ,(ly:make-pitch -1 4 1 ))
- (giss . ,(ly:make-pitch -1 4 1 ))
- (gisis . ,(ly:make-pitch -1 4 2 ))
- (gississ . ,(ly:make-pitch -1 4 2 ))
- (aeses . ,(ly:make-pitch -1 5 -2 ))
- (aessess . ,(ly:make-pitch -1 5 -2 ))
- (ases . ,(ly:make-pitch -1 5 -2 ))
- (assess . ,(ly:make-pitch -1 5 -2 ))
- (aes . ,(ly:make-pitch -1 5 -1 ))
- (aess . ,(ly:make-pitch -1 5 -1 ))
- (as . ,(ly:make-pitch -1 5 -1 ))
- (ass . ,(ly:make-pitch -1 5 -1 ))
- (a . ,(ly:make-pitch -1 5 0 ))
- (ais . ,(ly:make-pitch -1 5 1 ))
- (aiss . ,(ly:make-pitch -1 5 1 ))
- (aisis . ,(ly:make-pitch -1 5 2 ))
- (aississ . ,(ly:make-pitch -1 5 2 ))
- (bes . ,(ly:make-pitch -1 6 -2 ))
- (bess . ,(ly:make-pitch -1 6 -2 ))
- (b . ,(ly:make-pitch -1 6 -1 ))
- (b . ,(ly:make-pitch -1 6 -1 ))
- (h . ,(ly:make-pitch -1 6 0 ))
- (his . ,(ly:make-pitch -1 6 1 ))
- (hiss . ,(ly:make-pitch -1 6 1 ))
- (hisis . ,(ly:make-pitch -1 6 2 ))
- (hississ . ,(ly:make-pitch -1 6 2 ))
+ (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (cessess . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (ces . ,(ly:make-pitch -1 0 FLAT))
+ (cess . ,(ly:make-pitch -1 0 FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (cis . ,(ly:make-pitch -1 0 SHARP))
+ (ciss . ,(ly:make-pitch -1 0 SHARP))
+ (cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (cississ . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (dessess . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (des . ,(ly:make-pitch -1 1 FLAT))
+ (dess . ,(ly:make-pitch -1 1 FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (dis . ,(ly:make-pitch -1 1 SHARP))
+ (diss . ,(ly:make-pitch -1 1 SHARP))
+ (disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (dississ . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (eeses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (eessess . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (essess . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (ees . ,(ly:make-pitch -1 2 FLAT))
+ (eess . ,(ly:make-pitch -1 2 FLAT))
+ (es . ,(ly:make-pitch -1 2 FLAT))
+ (ess . ,(ly:make-pitch -1 2 FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
+ (eis . ,(ly:make-pitch -1 2 SHARP))
+ (eiss . ,(ly:make-pitch -1 2 SHARP))
+ (eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (eississ . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fessess . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fes . ,(ly:make-pitch -1 3 FLAT))
+ (fess . ,(ly:make-pitch -1 3 FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fis . ,(ly:make-pitch -1 3 SHARP))
+ (fiss . ,(ly:make-pitch -1 3 SHARP))
+ (fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (fississ . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (gessess . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (ges . ,(ly:make-pitch -1 4 FLAT))
+ (gess . ,(ly:make-pitch -1 4 FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (gis . ,(ly:make-pitch -1 4 SHARP))
+ (giss . ,(ly:make-pitch -1 4 SHARP))
+ (gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (gississ . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (aeses . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (aessess . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (assess . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (aes . ,(ly:make-pitch -1 5 FLAT))
+ (aess . ,(ly:make-pitch -1 5 FLAT))
+ (as . ,(ly:make-pitch -1 5 FLAT))
+ (ass . ,(ly:make-pitch -1 5 FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (ais . ,(ly:make-pitch -1 5 SHARP))
+ (aiss . ,(ly:make-pitch -1 5 SHARP))
+ (aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (aississ . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (bes . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (bess . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (b . ,(ly:make-pitch -1 6 FLAT))
+ (b . ,(ly:make-pitch -1 6 FLAT))
+ (h . ,(ly:make-pitch -1 6 NATURAL))
+ (his . ,(ly:make-pitch -1 6 SHARP))
+ (hiss . ,(ly:make-pitch -1 6 SHARP))
+ (hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ (hississ . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
)
-\version "1.9.1"
+\version "1.9.7"
% paper-as5-init.ly
-\version "1.9.1"
+\version "1.9.7"
paperAsFive = \paper {
staffheight = 5.\char
-\version "1.9.1"
+\version "1.9.7"
\include "paper-as5-init.ly"
% paper-as9-init.ly
-\version "1.9.1"
+\version "1.9.7"
paperAsNine = \paper {
staffheight = 9.\char
-\version "1.9.1"
+\version "1.9.7"
\include "paper-as9-init.ly"
-\version "1.9.1"
+\version "1.9.7"
% paper-init.ly
%% Why som complicated? /MB
% paper11-init.ly
-\version "1.9.1"
+\version "1.9.7"
paperEleven = \paper {
staffheight = 11.0\pt
-\version "1.9.1"
+\version "1.9.7"
\include "paper11-init.ly"
% paper13-init.ly
-\version "1.9.1"
+\version "1.9.7"
paperThirteen = \paper {
staffheight = 13.0\pt
-\version "1.9.1"
+\version "1.9.7"
\include "paper13-init.ly"
% paper16-init.ly
-\version "1.9.1"
+\version "1.9.7"
paperSixteen = \paper {
staffheight = 16.0\pt
-\version "1.9.1"
+\version "1.9.7"
\include "paper16-init.ly"
% paper19-init.ly
-\version "1.9.1"
+\version "1.9.7"
paperNineteen = \paper {
staffheight = 19.0\pt
-\version "1.9.1"
+\version "1.9.7"
\include "paper19-init.ly"
% paper20-init.ly
-\version "1.9.1"
+\version "1.9.7"
paperTwenty = \paper {
staffheight = 20.0\pt
-\version "1.9.1"
+\version "1.9.7"
\include "paper20-init.ly"
% paper23-init.ly
-\version "1.9.1"
+\version "1.9.7"
paperTwentythree = \paper {
staffheight = 23.0\pt
-\version "1.9.1"
+\version "1.9.7"
\include "paper23-init.ly"
% paper26-init.ly
-\version "1.9.1"
+\version "1.9.7"
paperTwentysix = \paper {
staffheight = 26.0\pt
-\version "1.9.1"
+\version "1.9.7"
\include "paper26-init.ly"
-\version "1.9.1"
+\version "1.9.7"
% params-as-init.ly
% generic paper parameters
-\version "1.9.1"
+\version "1.9.7"
% JUNKME.
%% deprecated
-\version "1.9.1"
+\version "1.9.7"
% JUNKME
%part-paper-init.ly
-\version "1.9.1"
+\version "1.9.7"
%
% setup for Request->Element conversion. Guru-only
% property-init.ly
-\version "1.9.1"
+\version "1.9.7"
stemUp = \property Voice.Stem \set #'direction = #1
stemDown = \property Voice.Stem \set #'direction = #-1
-\version "1.9.1"
+\version "1.9.7"
-major = #'(
+major = #`(
(0 . 0)
(1 . 0)
(2 . 0)
(6 . 0)
)
-minor = #'(
+minor = #`(
(0 . 0)
(1 . 0)
- (2 . -1)
+ (2 . ,FLAT)
(3 . 0)
(4 . 0)
- (5 . -1)
- (6 . -1)
+ (5 . ,FLAT)
+ (6 . ,FLAT)
)
-ionian = #'(
+ionian = #`(
(0 . 0)
(1 . 0)
(2 . 0)
)
-locrian = #'(
+locrian = #`(
(0 . 0)
- (1 . -1)
- (2 . -1)
+ (1 . ,FLAT)
+ (2 . ,FLAT)
(3 . 0)
- (4 . -1)
- (5 . -1)
- (6 . -1)
+ (4 . ,FLAT)
+ (5 . ,FLAT)
+ (6 . ,FLAT)
)
-aeolian = #'(
+aeolian = #`(
(0 . 0)
(1 . 0)
- (2 . -1)
+ (2 . ,FLAT)
(3 . 0)
(4 . 0)
- (5 . -1)
- (6 . -1)
+ (5 . ,FLAT)
+ (6 . ,FLAT)
)
-mixolydian = #'(
+mixolydian = #`(
(0 . 0)
(1 . 0)
(2 . 0)
(3 . 0)
(4 . 0)
(5 . 0)
- (6 . -1)
+ (6 . ,FLAT)
)
-lydian = #'(
+lydian = #`(
(0 . 0)
(1 . 0)
(2 . 0)
)
-phrygian = #'(
+phrygian = #`(
(0 . 0)
- (1 . -1)
- (2 . -1)
+ (1 . ,FLAT)
+ (2 . ,FLAT)
(3 . 0)
(4 . 0)
- (5 . -1)
- (6 . -1)
+ (5 . ,FLAT)
+ (6 . ,FLAT)
)
-dorian = #'(
+dorian = #`(
(0 . 0)
(1 . 0)
- (2 . -1)
+ (2 . ,FLAT)
(3 . 0)
(4 . 0)
(5 . 0)
- (6 . -1)
+ (6 . ,FLAT)
)
-\version "1.9.1"
+\version "1.9.7"
dashHat= "marcato"
-\version "1.9.1"
+\version "1.9.7"
startGroup = #(make-span-event 'NoteGroupingEvent START)
stopGroup = #(make-span-event 'NoteGroupingEvent STOP)
% common finnish names for notes. "es" means flat, "is" means sharp
%
-% by Heikki Junes <heikki.junes@hut.fi>
+% by Heikki Junes <<heikki.junes@hut.fi>>
% based on svenska.ly by Mats Bengtsson.
-% 2001/08/28 Heikki Junes <heikki.junes@hut.fi>
+% 2001/08/28 Heikki Junes <<heikki.junes@hut.fi>>
% added bb and marked heses as `unusual'
\pitchnames #`(
- (ceses . ,(ly:make-pitch -1 0 -2 ))
- (ces . ,(ly:make-pitch -1 0 -1 ))
- (c . ,(ly:make-pitch -1 0 0 ))
- (cis . ,(ly:make-pitch -1 0 1 ))
- (cisis . ,(ly:make-pitch -1 0 2 ))
- (deses . ,(ly:make-pitch -1 1 -2 ))
- (des . ,(ly:make-pitch -1 1 -1 ))
- (d . ,(ly:make-pitch -1 1 0 ))
- (dis . ,(ly:make-pitch -1 1 1 ))
- (disis . ,(ly:make-pitch -1 1 2 ))
- (eses . ,(ly:make-pitch -1 2 -2 ))
- (es . ,(ly:make-pitch -1 2 -1 ))
- (e . ,(ly:make-pitch -1 2 0 ))
- (eis . ,(ly:make-pitch -1 2 1 ))
- (eisis . ,(ly:make-pitch -1 2 2 ))
- (feses . ,(ly:make-pitch -1 3 -2 ))
- (fes . ,(ly:make-pitch -1 3 -1 ))
- (f . ,(ly:make-pitch -1 3 0 ))
- (fis . ,(ly:make-pitch -1 3 1 ))
- (fisis . ,(ly:make-pitch -1 3 2 ))
- (geses . ,(ly:make-pitch -1 4 -2 ))
- (ges . ,(ly:make-pitch -1 4 -1 ))
- (g . ,(ly:make-pitch -1 4 0 ))
- (gis . ,(ly:make-pitch -1 4 1 ))
- (gisis . ,(ly:make-pitch -1 4 2 ))
- (asas . ,(ly:make-pitch -1 5 -2 ))
- (ases . ,(ly:make-pitch -1 5 -2 )) ;;non-standard name for asas
- (as . ,(ly:make-pitch -1 5 -1 ))
- (a . ,(ly:make-pitch -1 5 0 ))
- (ais . ,(ly:make-pitch -1 5 1 ))
- (aisis . ,(ly:make-pitch -1 5 2 ))
- (bb . ,(ly:make-pitch -1 6 -2 ))
- (heses . ,(ly:make-pitch -1 6 -2 )) ;;non-standard name for bb
- (b . ,(ly:make-pitch -1 6 -1 ))
- (h . ,(ly:make-pitch -1 6 0 ))
- (his . ,(ly:make-pitch -1 6 1 ))
- (hisis . ,(ly:make-pitch -1 6 2 ))
+ (ceses . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (ces . ,(ly:make-pitch -1 0 FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (cis . ,(ly:make-pitch -1 0 SHARP))
+ (cisis . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (deses . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (des . ,(ly:make-pitch -1 1 FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (dis . ,(ly:make-pitch -1 1 SHARP))
+ (disis . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (eses . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (es . ,(ly:make-pitch -1 2 FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
+ (eis . ,(ly:make-pitch -1 2 SHARP))
+ (eisis . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (feses . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fes . ,(ly:make-pitch -1 3 FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fis . ,(ly:make-pitch -1 3 SHARP))
+ (fisis . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (geses . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (ges . ,(ly:make-pitch -1 4 FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (gis . ,(ly:make-pitch -1 4 SHARP))
+ (gisis . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (asas . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (ases . ,(ly:make-pitch -1 5 DOUBLE-FLAT)) ;;non-standard name for asas
+ (as . ,(ly:make-pitch -1 5 FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (ais . ,(ly:make-pitch -1 5 SHARP))
+ (aisis . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (bb . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (heses . ,(ly:make-pitch -1 6 DOUBLE-FLAT)) ;;non-standard name for bb
+ (b . ,(ly:make-pitch -1 6 FLAT))
+ (h . ,(ly:make-pitch -1 6 NATURAL))
+ (his . ,(ly:make-pitch -1 6 SHARP))
+ (hisis . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
)
-\version "1.9.1"
+\version "1.9.7"
% by Mats Bengtsson.
\pitchnames #`(
- (cessess . ,(ly:make-pitch -1 0 -2 ))
- (cess . ,(ly:make-pitch -1 0 -1 ))
- (c . ,(ly:make-pitch -1 0 0 ))
- (ciss . ,(ly:make-pitch -1 0 1 ))
- (cississ . ,(ly:make-pitch -1 0 2 ))
- (dessess . ,(ly:make-pitch -1 1 -2 ))
- (dess . ,(ly:make-pitch -1 1 -1 ))
- (d . ,(ly:make-pitch -1 1 0 ))
- (diss . ,(ly:make-pitch -1 1 1 ))
- (dississ . ,(ly:make-pitch -1 1 2 ))
- (essess . ,(ly:make-pitch -1 2 -2 ))
- (ess . ,(ly:make-pitch -1 2 -1 ))
- (e . ,(ly:make-pitch -1 2 0 ))
- (eiss . ,(ly:make-pitch -1 2 1 ))
- (eississ . ,(ly:make-pitch -1 2 2 ))
- (fessess . ,(ly:make-pitch -1 3 -2 ))
- (fess . ,(ly:make-pitch -1 3 -1 ))
- (f . ,(ly:make-pitch -1 3 0 ))
- (fiss . ,(ly:make-pitch -1 3 1 ))
- (fississ . ,(ly:make-pitch -1 3 2 ))
- (gessess . ,(ly:make-pitch -1 4 -2 ))
- (gess . ,(ly:make-pitch -1 4 -1 ))
- (g . ,(ly:make-pitch -1 4 0 ))
- (giss . ,(ly:make-pitch -1 4 1 ))
- (gississ . ,(ly:make-pitch -1 4 2 ))
- (assess . ,(ly:make-pitch -1 5 -2 ))
- (ass . ,(ly:make-pitch -1 5 -1 ))
- (a . ,(ly:make-pitch -1 5 0 ))
- (aiss . ,(ly:make-pitch -1 5 1 ))
- (aississ . ,(ly:make-pitch -1 5 2 ))
- (hessess . ,(ly:make-pitch -1 6 -2 ))
- (b . ,(ly:make-pitch -1 6 -1 ))
- (h . ,(ly:make-pitch -1 6 0 ))
- (hiss . ,(ly:make-pitch -1 6 1 ))
- (hississ . ,(ly:make-pitch -1 6 2 ))
+ (cessess . ,(ly:make-pitch -1 0 DOUBLE-FLAT))
+ (cess . ,(ly:make-pitch -1 0 FLAT))
+ (c . ,(ly:make-pitch -1 0 NATURAL))
+ (ciss . ,(ly:make-pitch -1 0 SHARP))
+ (cississ . ,(ly:make-pitch -1 0 DOUBLE-SHARP))
+ (dessess . ,(ly:make-pitch -1 1 DOUBLE-FLAT))
+ (dess . ,(ly:make-pitch -1 1 FLAT))
+ (d . ,(ly:make-pitch -1 1 NATURAL))
+ (diss . ,(ly:make-pitch -1 1 SHARP))
+ (dississ . ,(ly:make-pitch -1 1 DOUBLE-SHARP))
+ (essess . ,(ly:make-pitch -1 2 DOUBLE-FLAT))
+ (ess . ,(ly:make-pitch -1 2 FLAT))
+ (e . ,(ly:make-pitch -1 2 NATURAL))
+ (eiss . ,(ly:make-pitch -1 2 SHARP))
+ (eississ . ,(ly:make-pitch -1 2 DOUBLE-SHARP))
+ (fessess . ,(ly:make-pitch -1 3 DOUBLE-FLAT))
+ (fess . ,(ly:make-pitch -1 3 FLAT))
+ (f . ,(ly:make-pitch -1 3 NATURAL))
+ (fiss . ,(ly:make-pitch -1 3 SHARP))
+ (fississ . ,(ly:make-pitch -1 3 DOUBLE-SHARP))
+ (gessess . ,(ly:make-pitch -1 4 DOUBLE-FLAT))
+ (gess . ,(ly:make-pitch -1 4 FLAT))
+ (g . ,(ly:make-pitch -1 4 NATURAL))
+ (giss . ,(ly:make-pitch -1 4 SHARP))
+ (gississ . ,(ly:make-pitch -1 4 DOUBLE-SHARP))
+ (assess . ,(ly:make-pitch -1 5 DOUBLE-FLAT))
+ (ass . ,(ly:make-pitch -1 5 FLAT))
+ (a . ,(ly:make-pitch -1 5 NATURAL))
+ (aiss . ,(ly:make-pitch -1 5 SHARP))
+ (aississ . ,(ly:make-pitch -1 5 DOUBLE-SHARP))
+ (hessess . ,(ly:make-pitch -1 6 DOUBLE-FLAT))
+ (b . ,(ly:make-pitch -1 6 FLAT))
+ (h . ,(ly:make-pitch -1 6 NATURAL))
+ (hiss . ,(ly:make-pitch -1 6 SHARP))
+ (hississ . ,(ly:make-pitch -1 6 DOUBLE-SHARP))
)
-\version "1.9.1"
+\version "1.9.7"
% input feta-banier;
% input feta-eindelijk;
% input feta-klef;
-% input feta-toevallig;
- input feta-schrift;
+ input feta-toevallig;
+% input feta-schrift;
% input feta-haak;
% input feta-timesig;
- input feta-pendaal;
+% input feta-pendaal;
% input feta-accordion;
% input feta-solfa;
fi
% a square pen). [Wanske] does not mention this, so we'll just ignore
% this fact
%
-fet_beginchar("Sharp" , "1", "sharp");
- set_char_box(0, 1.1 staff_space#, 1.5 staff_space#,
- 1.5 staff_space#);
+def draw_meta_sharp (expr width) =
save interbeam, interstem, beamheight, beamwidth,
stemwidth, beamslope;
+ save spanwidth, spanheight;
+
+ save center;
+ pair center;
interbeam := 1.05 staff_space;
- interstem := 7/16 ;
beamheight := 4 stafflinethickness;
- beamwidth := w;
+ beamwidth := width;
stemwidth := 1.5 stafflinethickness;
roundness := 2 blot_diameter;
- pair center;
center := (.5 w, 0);
roundness + 2 spanwidth = beamwidth;
roundness + 2 spanheight = beamheight;
- 2 horizontal_protrusion + interstem * beamwidth + stemwidth
- = beamwidth;
-
-% wanske: whole beamheight; or ca 18 degrees
-% z2 - z1 = (beamwidth - roundness, beamheight/2);
z2 - z1 = (beamwidth - roundness, beamheight);
z1 + z2 = 2*center;
beamslope = (y2-y1)/(x2-x1);
pair hspan, vspan;
hspan = (spanwidth, beamslope * spanwidth);
vspan = (0, spanheight);
-
path beam;
beam := (hspan + vspan -- -hspan
pickup pencircle scaled stemwidth;
x3 = x4 = xpart center;
- numeric xs;
- xs := interstem* beamwidth / 2;
- (bot y3) + -xs * beamslope = -1.5 staff_space + ypart center;
- top y4 + xs * beamslope = 1.5 staff_space + ypart center;
+ enddef;
+
+fet_beginchar("Sharp" , "2", "sharp");
+ set_char_box(0, 1.1 staff_space#, 1.5 staff_space#,
+ 1.5 staff_space#);
+ draw_meta_sharp (w);
+
+ save stemx;
+ stemx := 7 / 32 * w;
+
+ (bot y3) + - stemx * beamslope = -1.5 staff_space + ypart center;
+ top y4 + stemx * beamslope = 1.5 staff_space + ypart center;
- draw_gridline (z3-(xs,xs* beamslope),z4-(xs,xs*beamslope),stemwidth);
- addto currentpicture also currentpicture rotated 180 shifted (w,0);
labels(1,2,3,4);
+ draw_gridline (z3-(stemx,stemx* beamslope),z4-(stemx, stemx*beamslope), stemwidth);
+ addto currentpicture also currentpicture rotated 180 shifted (w,0);
-% to check that it doesn't overshoot staffline.
-%
-% pickup pencircle scaled stafflinethickness;
-% draw (0, 1.5 staff_space ) .. (1 staff_space, 1.5 staff_space);
+ fet_endchar;
+
+fet_beginchar("1/2 Sharp" , "1", "semisharp");
+ set_char_box(0, 0.6 staff_space#, 1.5 staff_space#,
+ 1.5 staff_space#);
+
+ draw_meta_sharp (w);
+ stemx := 7 / 32 * w;
+
+ (bot y3) + - stemx * beamslope = -1.5 staff_space + ypart center;
+ top y4 + stemx * beamslope = 1.5 staff_space + ypart center;
+
+ labels(1,2,3,4);
+
+ draw_gridline (z3, z4, stemwidth);
+ addto currentpicture also currentpicture rotated 180 shifted (w,0);
fet_endchar;
+fet_beginchar("3/4 Sharp" , "3", "threequartersharp");
+ set_char_box(0, 1.6 staff_space#, 1.5 staff_space#,
+ 1.5 staff_space#);
+
+ draw_meta_sharp (w);
+ stemx := 9 / 32 * w;
+
+ (bot y3) + - stemx * beamslope = -1.5 staff_space + ypart center;
+ top y4 + stemx * beamslope = 1.5 staff_space + ypart center;
+
+ labels(1,2,3,4);
+
+ draw_gridline (z3-(stemx,stemx* beamslope),z4-(stemx, stemx*beamslope), stemwidth);
+ draw_gridline (z3, z4, stemwidth);
+ addto currentpicture also currentpicture rotated 180 shifted (w,0);
+
+ fet_endchar;
+
%
% The stems of the natural are brushed (at least, in Barenreiter SCS )
%
%
% unfortunately, 600dpi is not enough to show the brush of the stem.
%
-fet_beginchar("Flat", "-1", "flat")
+fet_beginchar("Flat", "-2", "flat")
+ set_char_box(1.2 stafflinethickness#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#);
+ draw_meta_flat(0, w, 0.31 staff_space);
+ fet_endchar;
+
+fet_beginchar("Semi flat", "-1", "semiflat")
set_char_box(1.2 stafflinethickness#, .8 staff_space#, 0.6 staff_space#, 1.9 staff_space#);
draw_meta_flat(0, w, 0.31 staff_space);
+ currentpicture := currentpicture xscaled -1 shifted (w - b, 0);
fet_endchar;
-fet_beginchar("Double Flat", "-2", "flatflat")
+fet_beginchar("Double Flat", "-4", "flatflat")
save left_wid, overlap, right_wid;
left_wid = .7;
right_wid = .8;
right_wid *staff_space, 0.33 staff_space);
fet_endchar;
-fet_beginchar("Double Sharp", "2", "sharpsharp")
+fet_beginchar("3/4 Flat", "-3", "threeqflat")
+ save left_wid, overlap, right_wid;
+ left_wid = .7;
+ right_wid = .8;
+ overlap = .05;
+ set_char_box(1.2 stafflinethickness#, (left_wid + right_wid -overlap) *staff_space#, .6 staff_space#, 1.9 staff_space#);
+ draw_meta_flat(0, left_wid* staff_space, 1/3 staff_space);
+ draw_meta_flat(round ((left_wid - overlap) *staff_space),
+ right_wid *staff_space, 0.33 staff_space);
+
+ %% maybe we should clip part of the stems?
+ %% or make the 1st flat smaller?
+ %% or reverse it?
+ pickup pencircle scaled 2 stafflinethickness;
+ z12 = ( - .25 w - b, .55 staff_space);
+ z13 = ( .75 w , 1.45 staff_space);
+ draw z12 -- z13;
+ fet_endchar;
+
+
+fet_beginchar("Double Sharp", "4", "sharpsharp")
set_char_box(0, staff_space#, .5 staff_space#, .5 staff_space#);
save klaverblad, klaversteel;
; chord modifiers change the pitch list.
(define (aug-modifier pitches)
- (set! pitches (replace-step (ly:make-pitch 0 4 1) pitches))
+ (set! pitches (replace-step (ly:make-pitch 0 4 SHARP) pitches))
(replace-step (ly:make-pitch 0 2 0) pitches)
)
(define (minor-modifier pitches)
- (replace-step (ly:make-pitch 0 2 -1) pitches)
+ (replace-step (ly:make-pitch 0 2 FLAT) pitches)
)
(define (maj7-modifier pitches)
)
(define (dim-modifier pitches)
- (set! pitches (replace-step (ly:make-pitch 0 2 -1) pitches))
- (set! pitches (replace-step (ly:make-pitch 0 4 -1) pitches))
- (set! pitches (replace-step (ly:make-pitch 0 6 -2) pitches))
+ (set! pitches (replace-step (ly:make-pitch 0 2 FLAT) pitches))
+ (set! pitches (replace-step (ly:make-pitch 0 4 FLAT) pitches))
+ (set! pitches (replace-step (ly:make-pitch 0 6 DOUBLE-FLAT) pitches))
pitches
)
(map
(lambda (n)
(define (nca x)
- (if (= x 7) -1 0))
+ (if (= x 7) FLAT 0))
(if (>= n 8)
(ly:make-pitch 1 (- n 8) (nca n))
(ly:make-pitch 0 (- n 1) (nca n))))
(ly:pitch-transpose pitch
(ly:make-pitch 0 2 (if (or (= (step-nr pitch) 3)
(= (step-nr pitch) 5))
- -1 0))))
+ FLAT 0))))
(define (step-alteration pitch)
(let* ((diff (ly:pitch-diff (ly:make-pitch 0 0 0) (car pitches)))
(normalized-pitch (ly:pitch-transpose pitch diff))
(alteration (ly:pitch-alteration normalized-pitch)))
- (if (= (step-nr pitch) 7) (+ alteration 1) alteration)))
+ (if (= (step-nr pitch) 7) (+ alteration SEMI-TONE) alteration)))
(define (pitch-unalter pitch)
(let ((alteration (step-alteration pitch)))
(make-simple-markup (number->string (step-nr pitch)))
(make-simple-markup
(case (step-alteration pitch)
- ((-2) "--")
- ((-1) "-")
- ((0) "")
- ((1) "+")
- ((2) "++"))))))
+ ((DOUBLE-FLAT) "--")
+ ((FLAT) "-")
+ ((NATURAL) "")
+ ((SHARP) "+")
+ ((DOUBLE-SHARP) "++"))))))
(define (step->markup-accidental pitch)
(make-line-markup
(define (prefix-modifier->markup mod)
(if (and (= 3 (pitch-step mod))
- (= -1 (ly:pitch-alteration mod)))
+ (= FLAT (ly:pitch-alteration mod)))
(make-simple-markup "m")
(make-simple-markup "huh")
))
;; do minor-3rd modifier.
(if (and (get-step 3 pitches)
- (= (ly:pitch-alteration (get-step 3 pitches)) -1))
- (set! prefixes (cons (get-step 3 pitches) prefixes))
- )
+ (= (ly:pitch-alteration (get-step 3 pitches)) FLAT))
+ (set! prefixes (cons (get-step 3 pitches) prefixes)))
;; lazy bum. Should write loop.
(cond
(make-line-markup (list empty-markup))
(conditional-kern-before
(alteration->text-accidental-markup alteration)
- (= alteration -1) 0.2
+ (= alteration FLAT) 0.2
)))
"
(let* ((name (ly:pitch-notename pitch))
(alt (ly:pitch-alteration pitch))
- (n-a (if (member (cons name alt) '((6 . -1) (6 . -2)))
+ (n-a (if (member (cons name alt) `((6 . ,FLAT) (6 . ,DOUBLE-FLAT)))
(cons 7 (+ (if B-instead-of-Bb 1 0) alt))
(cons name alt))))
(make-line-markup
(define-public (note-name->german-markup pitch)
(let* ((name (ly:pitch-notename pitch))
(alt (ly:pitch-alteration pitch))
- (n-a (if (member (cons name alt) '((6 . -1) (6 . -2)))
- (cons 7 (+ 1 alt))
+ (n-a (if (member (cons name alt) `((6 . ,FLAT) (6 . ,DOUBLE-FLAT)))
+ (cons 7 (+ 2 alt))
(cons name alt))))
(make-line-markup
(list
(string-append
- (list-ref '("c" "d" "e" "f" "g" "a" "h" "b") (car n-a))
+ (list-ref '("c" "d" "e" "f" "g" "a" "h" "b") (/ (car n-a) 2))
(if (or (equal? (car n-a) 2) (equal? (car n-a) 5))
- (list-ref '( "ses" "s" "" "is" "isis") (+ 2 (cdr n-a)))
- (list-ref '("eses" "es" "" "is" "isis") (+ 2 (cdr n-a)))))))))
+ (list-ref '( "ses" "s" "" "is" "isis") (+ 2 (/ (cdr n-a) 2) ))
+ (list-ref '("eses" "es" "" "is" "isis") (+ 2 (/ (cdr n-a) 2) ))
+ ))))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;; ugh. Should make separate module?
(define-public drum-pitch-names `(
- (acousticbassdrum bda ,(ly:make-pitch -3 6 0 ))
- (bassdrum bd ,(ly:make-pitch -2 0 0 ))
- (hisidestick ssh ,(ly:make-pitch -3 6 2))
- (sidestick ss ,(ly:make-pitch -2 0 1))
- (losidestick ssl ,(ly:make-pitch -2 1 -1))
- (acousticsnare sna ,(ly:make-pitch -2 1 0))
- (snare sn ,(ly:make-pitch -2 2 -2))
- (handclap hc ,(ly:make-pitch -2 1 1))
- (electricsnare sne ,(ly:make-pitch -2 2 0))
- (lowfloortom tomfl ,(ly:make-pitch -2 3 0))
- (closedhihat hhc ,(ly:make-pitch -2 3 1))
- (hihat hh ,(ly:make-pitch -2 4 -1))
- (highfloortom tomfh ,(ly:make-pitch -2 4 0))
- (pedalhihat hhp ,(ly:make-pitch -2 4 1))
- (lowtom toml ,(ly:make-pitch -2 5 0))
- (openhihat hho ,(ly:make-pitch -2 5 1))
- (halfopenhihat hhho ,(ly:make-pitch -2 5 1))
- (lowmidtom tomml ,(ly:make-pitch -2 6 0))
- (himidtom tommh ,(ly:make-pitch -1 0 0))
- (crashcymbala cymca ,(ly:make-pitch -1 0 1))
- (crashcymbal cymc ,(ly:make-pitch -1 1 -1))
- (hightom tomh ,(ly:make-pitch -1 1 0))
- (ridecymbala cymra ,(ly:make-pitch -1 1 1))
- (ridecymbal cymr ,(ly:make-pitch -1 2 -1))
- (chinesecymbal cymch ,(ly:make-pitch -1 2 0))
- (ridebell rb ,(ly:make-pitch -1 3 0))
- (tambourine tamb ,(ly:make-pitch -1 3 1))
- (splashcymbal cyms ,(ly:make-pitch -1 4 0))
- (cowbell cb ,(ly:make-pitch -1 4 1))
- (crashcymbalb cymcb ,(ly:make-pitch -1 5 0))
- (vibraslap vibs ,(ly:make-pitch -1 5 1))
- (ridecymbalb cymrb ,(ly:make-pitch -1 6 0))
- (mutehibongo bohm ,(ly:make-pitch -1 6 1))
- (hibongo boh ,(ly:make-pitch 0 0 0))
- (openhibongo boho ,(ly:make-pitch 0 1 -2))
- (mutelobongo bolm ,(ly:make-pitch -1 6 2))
- (lobongo bol ,(ly:make-pitch 0 0 1))
- (openlobongo bolo ,(ly:make-pitch 0 1 -1))
- (mutehiconga cghm ,(ly:make-pitch 0 1 0))
- (muteloconga cglm ,(ly:make-pitch 0 2 -2))
- (openhiconga cgho ,(ly:make-pitch 0 1 1))
- (hiconga cgh ,(ly:make-pitch 0 2 -1))
- (openloconga cglo ,(ly:make-pitch 0 1 2))
- (loconga cgl ,(ly:make-pitch 0 2 0))
- (hitimbale timh ,(ly:make-pitch 0 3 0))
- (lotimbale timl ,(ly:make-pitch 0 3 1))
- (hiagogo agh ,(ly:make-pitch 0 4 0))
- (loagogo agl ,(ly:make-pitch 0 4 1))
- (cabasa cab ,(ly:make-pitch 0 5 0))
- (maracas mar ,(ly:make-pitch 0 5 1))
- (shortwhistle whs ,(ly:make-pitch 0 6 0))
- (longwhistle whl ,(ly:make-pitch 1 0 0))
- (shortguiro guis ,(ly:make-pitch 1 0 1))
- (longguiro guil ,(ly:make-pitch 1 1 0))
- (guiro gui ,(ly:make-pitch 1 0 2))
- (claves cl ,(ly:make-pitch 1 1 1))
- (hiwoodblock wbh ,(ly:make-pitch 1 2 0))
- (lowoodblock wbl ,(ly:make-pitch 1 3 0))
- (mutecuica cuim ,(ly:make-pitch 1 3 1))
- (opencuica cuio ,(ly:make-pitch 1 4 0))
- (mutetriangle trim ,(ly:make-pitch 1 4 1))
- (triangle tri ,(ly:make-pitch 1 4 2))
- (opentriangle trio ,(ly:make-pitch 1 5 0))
+ (acousticbassdrum bda ,(ly:make-pitch -3 6 NATURAL))
+ (bassdrum bd ,(ly:make-pitch -2 0 NATURAL))
+ (hisidestick ssh ,(ly:make-pitch -3 6 DOUBLE-SHARP))
+ (sidestick ss ,(ly:make-pitch -2 0 SHARP))
+ (losidestick ssl ,(ly:make-pitch -2 1 FLAT))
+ (acousticsnare sna ,(ly:make-pitch -2 1 NATURAL))
+ (snare sn ,(ly:make-pitch -2 2 DOUBLE-FLAT))
+ (handclap hc ,(ly:make-pitch -2 1 SHARP))
+ (electricsnare sne ,(ly:make-pitch -2 2 NATURAL))
+ (lowfloortom tomfl ,(ly:make-pitch -2 3 NATURAL))
+ (closedhihat hhc ,(ly:make-pitch -2 3 SHARP))
+ (hihat hh ,(ly:make-pitch -2 4 FLAT))
+ (highfloortom tomfh ,(ly:make-pitch -2 4 NATURAL))
+ (pedalhihat hhp ,(ly:make-pitch -2 4 SHARP))
+ (lowtom toml ,(ly:make-pitch -2 5 NATURAL))
+ (openhihat hho ,(ly:make-pitch -2 5 SHARP))
+ (halfopenhihat hhho ,(ly:make-pitch -2 5 SHARP))
+ (lowmidtom tomml ,(ly:make-pitch -2 6 NATURAL))
+ (himidtom tommh ,(ly:make-pitch -1 0 NATURAL))
+ (crashcymbala cymca ,(ly:make-pitch -1 0 SHARP))
+ (crashcymbal cymc ,(ly:make-pitch -1 1 FLAT))
+ (hightom tomh ,(ly:make-pitch -1 1 NATURAL))
+ (ridecymbala cymra ,(ly:make-pitch -1 1 SHARP))
+ (ridecymbal cymr ,(ly:make-pitch -1 2 FLAT))
+ (chinesecymbal cymch ,(ly:make-pitch -1 2 NATURAL))
+ (ridebell rb ,(ly:make-pitch -1 3 NATURAL))
+ (tambourine tamb ,(ly:make-pitch -1 3 SHARP))
+ (splashcymbal cyms ,(ly:make-pitch -1 4 NATURAL))
+ (cowbell cb ,(ly:make-pitch -1 4 SHARP))
+ (crashcymbalb cymcb ,(ly:make-pitch -1 5 NATURAL))
+ (vibraslap vibs ,(ly:make-pitch -1 5 SHARP))
+ (ridecymbalb cymrb ,(ly:make-pitch -1 6 NATURAL))
+ (mutehibongo bohm ,(ly:make-pitch -1 6 SHARP))
+ (hibongo boh ,(ly:make-pitch 0 0 NATURAL))
+ (openhibongo boho ,(ly:make-pitch 0 1 DOUBLE-FLAT))
+ (mutelobongo bolm ,(ly:make-pitch -1 6 DOUBLE-SHARP))
+ (lobongo bol ,(ly:make-pitch 0 0 SHARP))
+ (openlobongo bolo ,(ly:make-pitch 0 1 FLAT))
+ (mutehiconga cghm ,(ly:make-pitch 0 1 NATURAL))
+ (muteloconga cglm ,(ly:make-pitch 0 2 DOUBLE-FLAT))
+ (openhiconga cgho ,(ly:make-pitch 0 1 SHARP))
+ (hiconga cgh ,(ly:make-pitch 0 2 FLAT))
+ (openloconga cglo ,(ly:make-pitch 0 1 DOUBLE-SHARP))
+ (loconga cgl ,(ly:make-pitch 0 2 NATURAL))
+ (hitimbale timh ,(ly:make-pitch 0 3 NATURAL))
+ (lotimbale timl ,(ly:make-pitch 0 3 SHARP))
+ (hiagogo agh ,(ly:make-pitch 0 4 NATURAL))
+ (loagogo agl ,(ly:make-pitch 0 4 SHARP))
+ (cabasa cab ,(ly:make-pitch 0 5 NATURAL))
+ (maracas mar ,(ly:make-pitch 0 5 SHARP))
+ (shortwhistle whs ,(ly:make-pitch 0 6 NATURAL))
+ (longwhistle whl ,(ly:make-pitch 1 0 NATURAL))
+ (shortguiro guis ,(ly:make-pitch 1 0 SHARP))
+ (longguiro guil ,(ly:make-pitch 1 1 NATURAL))
+ (guiro gui ,(ly:make-pitch 1 0 DOUBLE-SHARP))
+ (claves cl ,(ly:make-pitch 1 1 SHARP))
+ (hiwoodblock wbh ,(ly:make-pitch 1 2 NATURAL))
+ (lowoodblock wbl ,(ly:make-pitch 1 3 NATURAL))
+ (mutecuica cuim ,(ly:make-pitch 1 3 SHARP))
+ (opencuica cuio ,(ly:make-pitch 1 4 NATURAL))
+ (mutetriangle trim ,(ly:make-pitch 1 4 SHARP))
+ (triangle tri ,(ly:make-pitch 1 4 DOUBLE-SHARP))
+ (opentriangle trio ,(ly:make-pitch 1 5 NATURAL))
;; "transposing" pitches:
- (oneup ua ,(ly:make-pitch 0 1 0))
- (twoup ub ,(ly:make-pitch 0 2 0))
- (threeup uc ,(ly:make-pitch 0 3 0))
- (fourup ud ,(ly:make-pitch 0 4 0))
- (fiveup ue ,(ly:make-pitch 0 5 0))
- (onedown da ,(ly:make-pitch -1 6 0))
- (twodown db ,(ly:make-pitch -1 5 0))
- (threedown dc ,(ly:make-pitch -1 4 0))
- (fourdown dd ,(ly:make-pitch -1 3 0))
- (fivedown de ,(ly:make-pitch -1 2 0))
+ (oneup ua ,(ly:make-pitch 0 1 NATURAL))
+ (twoup ub ,(ly:make-pitch 0 2 NATURAL))
+ (threeup uc ,(ly:make-pitch 0 3 NATURAL))
+ (fourup ud ,(ly:make-pitch 0 4 NATURAL))
+ (fiveup ue ,(ly:make-pitch 0 5 NATURAL))
+ (onedown da ,(ly:make-pitch -1 6 NATURAL))
+ (twodown db ,(ly:make-pitch -1 5 NATURAL))
+ (threedown dc ,(ly:make-pitch -1 4 NATURAL))
+ (fourdown dd ,(ly:make-pitch -1 3 NATURAL))
+ (fivedown de ,(ly:make-pitch -1 2 NATURAL))
))
;;
percussive-instrument-init-settings
`((drums
. (
- (acousticbassdrum default #f ,(ly:make-pitch -1 4 0))
- (bassdrum default #f ,(ly:make-pitch -1 4 0))
- (sidestick cross #f ,(ly:make-pitch 0 1 0))
- (acousticsnare default #f ,(ly:make-pitch 0 1 0))
- (snare default #f ,(ly:make-pitch 0 1 0))
- (handclap triangle #f ,(ly:make-pitch 0 1 0))
- (electricsnare default #f ,(ly:make-pitch 0 1 0))
- (lowfloortom default #f ,(ly:make-pitch -1 3 0))
- (closedhihat cross "stopped" ,(ly:make-pitch 0 3 0))
- (hihat cross #f ,(ly:make-pitch 0 3 0))
- (highfloortom default #f ,(ly:make-pitch -1 5 0))
- (pedalhihat cross #f ,(ly:make-pitch -1 2 0))
- (lowtom default #f ,(ly:make-pitch -1 6 0))
- (openhihat cross "open" ,(ly:make-pitch 0 3 0))
- (halfopenhihat xcircle #f ,(ly:make-pitch 0 3 0))
- (lowmidtom default #f ,(ly:make-pitch 0 0 0))
- (himidtom default #f ,(ly:make-pitch 0 2 0))
- (crashcymbala xcircle #f ,(ly:make-pitch 0 5 0))
- (crashcymbal xcircle #f ,(ly:make-pitch 0 5 0))
- (hightom default #f ,(ly:make-pitch 0 4 0))
- (ridecymbala cross #f ,(ly:make-pitch 0 5 0))
- (ridecymbal cross #f ,(ly:make-pitch 0 5 0))
- (chinesecymbal mensural #f ,(ly:make-pitch 0 5 0))
- (ridebell default #f ,(ly:make-pitch 0 5 0))
- (splashcymbal diamond #f ,(ly:make-pitch 0 5 0))
- (cowbell triangle #f ,(ly:make-pitch 0 5 0))
- (crashcymbalb cross #f ,(ly:make-pitch 0 5 0))
- (vibraslap diamond #f ,(ly:make-pitch 0 4 0))
- (ridecymbalb cross #f ,(ly:make-pitch 0 5 0))
+ (acousticbassdrum default #f ,(ly:make-pitch -1 4 NATURAL))
+ (bassdrum default #f ,(ly:make-pitch -1 4 NATURAL))
+ (sidestick cross #f ,(ly:make-pitch 0 1 NATURAL))
+ (acousticsnare default #f ,(ly:make-pitch 0 1 NATURAL))
+ (snare default #f ,(ly:make-pitch 0 1 NATURAL))
+ (handclap triangle #f ,(ly:make-pitch 0 1 NATURAL))
+ (electricsnare default #f ,(ly:make-pitch 0 1 NATURAL))
+ (lowfloortom default #f ,(ly:make-pitch -1 3 NATURAL))
+ (closedhihat cross "stopped" ,(ly:make-pitch 0 3 NATURAL))
+ (hihat cross #f ,(ly:make-pitch 0 3 NATURAL))
+ (highfloortom default #f ,(ly:make-pitch -1 5 NATURAL))
+ (pedalhihat cross #f ,(ly:make-pitch -1 2 NATURAL))
+ (lowtom default #f ,(ly:make-pitch -1 6 NATURAL))
+ (openhihat cross "open" ,(ly:make-pitch 0 3 NATURAL))
+ (halfopenhihat xcircle #f ,(ly:make-pitch 0 3 NATURAL))
+ (lowmidtom default #f ,(ly:make-pitch 0 0 NATURAL))
+ (himidtom default #f ,(ly:make-pitch 0 2 NATURAL))
+ (crashcymbala xcircle #f ,(ly:make-pitch 0 5 NATURAL))
+ (crashcymbal xcircle #f ,(ly:make-pitch 0 5 NATURAL))
+ (hightom default #f ,(ly:make-pitch 0 4 NATURAL))
+ (ridecymbala cross #f ,(ly:make-pitch 0 5 NATURAL))
+ (ridecymbal cross #f ,(ly:make-pitch 0 5 NATURAL))
+ (chinesecymbal mensural #f ,(ly:make-pitch 0 5 NATURAL))
+ (ridebell default #f ,(ly:make-pitch 0 5 NATURAL))
+ (splashcymbal diamond #f ,(ly:make-pitch 0 5 NATURAL))
+ (cowbell triangle #f ,(ly:make-pitch 0 5 NATURAL))
+ (crashcymbalb cross #f ,(ly:make-pitch 0 5 NATURAL))
+ (vibraslap diamond #f ,(ly:make-pitch 0 4 NATURAL))
+ (ridecymbalb cross #f ,(ly:make-pitch 0 5 NATURAL))
))
(timbales
. (
- (losidestick cross #f ,(ly:make-pitch -1 6 0))
- (lotimbale default #f ,(ly:make-pitch -1 6 0))
- (cowbell triangle #f ,(ly:make-pitch 0 2 0))
- (hisidestick cross #f ,(ly:make-pitch 0 1 0))
- (hitimbale default #f ,(ly:make-pitch 0 1 0))
+ (losidestick cross #f ,(ly:make-pitch -1 6 NATURAL))
+ (lotimbale default #f ,(ly:make-pitch -1 6 NATURAL))
+ (cowbell triangle #f ,(ly:make-pitch 0 2 NATURAL))
+ (hisidestick cross #f ,(ly:make-pitch 0 1 NATURAL))
+ (hitimbale default #f ,(ly:make-pitch 0 1 NATURAL))
))
(congas
. (
- (losidestick cross #f ,(ly:make-pitch -1 6 0))
- (loconga default #f ,(ly:make-pitch -1 6 0))
- (openloconga default "open" ,(ly:make-pitch -1 6 0))
- (muteloconga default "stopped" ,(ly:make-pitch -1 6 0))
- (hisidestick cross #f ,(ly:make-pitch 0 1 0))
- (hiconga default #f ,(ly:make-pitch 0 1 0))
- (openhiconga default "open" ,(ly:make-pitch 0 1 0))
- (mutehiconga default "stopped" ,(ly:make-pitch 0 1 0))
+ (losidestick cross #f ,(ly:make-pitch -1 6 NATURAL))
+ (loconga default #f ,(ly:make-pitch -1 6 NATURAL))
+ (openloconga default "open" ,(ly:make-pitch -1 6 NATURAL))
+ (muteloconga default "stopped" ,(ly:make-pitch -1 6 NATURAL))
+ (hisidestick cross #f ,(ly:make-pitch 0 1 NATURAL))
+ (hiconga default #f ,(ly:make-pitch 0 1 NATURAL))
+ (openhiconga default "open" ,(ly:make-pitch 0 1 NATURAL))
+ (mutehiconga default "stopped" ,(ly:make-pitch 0 1 NATURAL))
))
(bongos
. (
- (losidestick cross #f ,(ly:make-pitch -1 6 0))
- (lobongo default #f ,(ly:make-pitch -1 6 0))
- (openlobongo default "open" ,(ly:make-pitch -1 6 0))
- (mutelobongo default "stopped" ,(ly:make-pitch -1 6 0))
- (hisidestick cross #f ,(ly:make-pitch 0 1 0))
- (hibongo default #f ,(ly:make-pitch 0 1 0))
- (openhibongo default "open" ,(ly:make-pitch 0 1 0))
- (mutehibongo default "stopped" ,(ly:make-pitch 0 1 0))
+ (losidestick cross #f ,(ly:make-pitch -1 6 NATURAL))
+ (lobongo default #f ,(ly:make-pitch -1 6 NATURAL))
+ (openlobongo default "open" ,(ly:make-pitch -1 6 NATURAL))
+ (mutelobongo default "stopped" ,(ly:make-pitch -1 6 NATURAL))
+ (hisidestick cross #f ,(ly:make-pitch 0 1 NATURAL))
+ (hibongo default #f ,(ly:make-pitch 0 1 NATURAL))
+ (openhibongo default "open" ,(ly:make-pitch 0 1 NATURAL))
+ (mutehibongo default "stopped" ,(ly:make-pitch 0 1 NATURAL))
))
(percussion
. (
- (opentriangle cross "open" ,(ly:make-pitch 0 0 0))
- (mutetriangle cross "stopped" ,(ly:make-pitch 0 0 0))
- (triangle cross #f ,(ly:make-pitch 0 0 0))
- (shortguiro default "staccato",(ly:make-pitch 0 0 0))
- (longguiro default "tenuto" ,(ly:make-pitch 0 0 0))
- (guiro default #f ,(ly:make-pitch 0 0 0))
- (cowbell triangle #f ,(ly:make-pitch 0 0 0))
- (claves default #f ,(ly:make-pitch 0 0 0))
- (tambourine default #f ,(ly:make-pitch 0 0 0))
- (cabasa cross #f ,(ly:make-pitch 0 0 0))
- (maracas default #f ,(ly:make-pitch 0 0 0))
- (handclap default #f ,(ly:make-pitch 0 0 0))
+ (opentriangle cross "open" ,(ly:make-pitch 0 0 NATURAL))
+ (mutetriangle cross "stopped" ,(ly:make-pitch 0 0 NATURAL))
+ (triangle cross #f ,(ly:make-pitch 0 0 NATURAL))
+ (shortguiro default "staccato",(ly:make-pitch 0 0 NATURAL))
+ (longguiro default "tenuto" ,(ly:make-pitch 0 0 NATURAL))
+ (guiro default #f ,(ly:make-pitch 0 0 NATURAL))
+ (cowbell triangle #f ,(ly:make-pitch 0 0 NATURAL))
+ (claves default #f ,(ly:make-pitch 0 0 NATURAL))
+ (tambourine default #f ,(ly:make-pitch 0 0 NATURAL))
+ (cabasa cross #f ,(ly:make-pitch 0 0 NATURAL))
+ (maracas default #f ,(ly:make-pitch 0 0 NATURAL))
+ (handclap default #f ,(ly:make-pitch 0 0 NATURAL))
))
))
;;; have a more sensible default.
-
-(debug-enable 'debug)
-;(debug-enable 'backtrace)
-(read-enable 'positions)
+(if (ly:get-option 'verbose)
+ (begin
+ (debug-enable 'debug)
+ (debug-enable 'backtrace)
+ (read-enable 'positions)))
(define-public (line-column-location line col file)
(define-public DOWN -1)
(define-public CENTER 0)
-(define-public DOUBLE-FLAT -2)
-(define-public FLAT -1)
-(define-public SHARP 1)
-(define-public DOUBLE-SHARP 2)
+(define-public DOUBLE-FLAT -4)
+(define-public THREE-Q-FLAT -3)
+(define-public FLAT -2)
+(define-public SEMI-FLAT -1)
(define-public NATURAL 0)
-
+(define-public SEMI-SHARP 1)
+(define-public SHARP 2)
+(define-public THREE-Q-SHARP 3)
+(define-public DOUBLE-SHARP 4)
+(define-public SEMI-TONE 2)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; lily specific variables.
(fn (%search-load-path x))
)
- (if (ly:verbose)
+ (if (ly:get-option 'verbose)
(format (current-error-port) "[~A]" fn))
(primitive-load fn)))
(define (voicify-chord ch)
"Split the parts of a chord into different Voices using separator"
(let* ((es (ly:get-mus-property ch 'elements)))
-
-
+
(ly:set-mus-property! ch 'elements
(voicify-list (split-list es music-separator?) 0))
ch
(define-module (scm output-tex) )
-(debug-enable 'backtrace)
+; (debug-enable 'backtrace)
(use-modules (scm output-ps)
(ice-9 regex)
(ice-9 string-fun)
str =re.sub ("\\(ly:make-pitch *([0-9-]+) *([0-9-]+) *([0-9-]+) *\\)", sub_alteration, str)
+
+ str = re.sub ("ly:verbose", "ly:get-option 'verbose", str)
+
m= re.search ("\\\\outputproperty #([^#]+)[\t\n ]*#'([^ ]+)", str)
if m:
sys.stderr.write (\
\applyoutput #(outputproperty-compatibility %s '%s <GROB PROPERTY VALUE>)
as a substitution text.""" % (m.group (1), m.group (2)) )
- raise FatalConversionError
+ raise FatalConversionError ()
+
+ if re.search ("ly:(make-pitch|ly:pitch-alteration)", str):
+ sys.stderr.write (
+"""The alteration field of Scheme pitches was multiplied by 2
+to support quarter tone accidentals. Please edit ly:make-pitch and
+ly:pitch-alteration calls by hand""")
+ raise FatalConversionError ()
return str
-conversions.append (((1,9,7), conv, 'use symbolic constants for alterations, remove \\outputproperty'))
+conversions.append (((1,9,7), conv,
+ '''use symbolic constants for alterations,
+remove \\outputproperty, move ly:verbose into ly:get-option'''))
projects / lilypond.git / commitdiff