Here is the patch to get real key names.
Features:
\key E; % E major
\accidentals fis cis gis dis; % E major
\accidentals bes fis; % neither major nor minor
\specialkey \accidentals Bes fis'; % F major one octave, G major another
\specialkey \key E; % E major only in the mid-octave
I hope a remembered to update all examples and documentation as well.
Enjoy
/Mats
-----------------------------
Generated by package-diff 0.52 old = lilypond-0.1.75, new = lilypond-0.1.75.mb1
usage
cd lilypond-source-dir; patch -E -p1 < lilypond-0.1.75.mb1.diff
Patches do not contain automatically generated files,
i.e. you should rerun autoconf and configure
diff -urN ../lilypond-0.1.75/Documentation/language.yo ./Documentation/language.yo
--- ../lilypond-0.1.75/Documentation/language.yo Tue Jun 23 13:27:23 1998
+++ ./Documentation/language.yo Mon Jul 6 19:02:50 1998
@@ -55,18 +55,6 @@
This will only be readable if the Mudela-user rigidly uses hungarian,
which he/she won't.
-Of course \key should take a \notename. In fact, I think we should
-program the note intervals (which are now hardcoded for midi purposes)
-To allow adaptation to other scales.
-
-As simple fix, we might do key declarations:
-
-verb(
- \keybes= \key { bes es }
-
- \key{\keybes}
-)
-
nsubsect(Requests)
I want to give the user some access to the internals. Technically,
diff -urN ../lilypond-0.1.75/Documentation/tex/mudela.yo ./Documentation/tex/mudela.yo
--- ../lilypond-0.1.75/Documentation/tex/mudela.yo Wed Jun 24 16:49:06 1998
+++ ./Documentation/tex/mudela.yo Mon Jul 6 20:06:24 1998
@@ -608,11 +608,24 @@
)
dit(code(\key)) This command sets the current key signature. The
key signature is printed at the start of every line. The argument
- is a list pitches. The key of C-minor can be specified as
- code(\key bes es as;).footnote(Unfortunately, there is a bug.
- When you change back to C-major, no restoration sign is printed.
- )
+ is the name of the corresponding major key. The key of C-minor can
+ thus be specified as code(\key es;).footnote(Unfortunately, there is
+ a bug. When you change back to C-major, no restoration sign is
+ printed.
+ )
+dit(code(\accidentals)) This command sets the current key signature
+ in the form of a list of accidentals, which can be useful for
+ non-conventional keys. The argument is a list pitches. The key of
+ C-minor can be specified as code(\accidentals bes es as;), whereas
+ code(\accidentals fis es bis;) provides a more exotic example.
+ By default the same accidentals are valid for all octaves, but
+ this can be changed with the identifier code(\specialkey), defined
+ in file(property.ly). A key with two flats in one octave and three
+ sharps in the next can be declared with verb(
+ \specialkey \accidentals bes es fis' cis' gis';
+ )
+
dit(code(\meter))
This command sets the current meter. LilyPond uses the meter to
calculate where to place the bars that start a measure. These bars
@@ -819,7 +832,7 @@
row(cell()cell(code(|) em(Command)))
row(cell()cell(code(|) code(\type) em(string) code(=) em(string) em(Music)))
row(cell()cell(;))
- row(cell(em(MusicList))cell(: em(empty)))
+ row(cell(em(MusicList))cell(: em(empty)))
row(cell()cell(code(|) em(MusicList) em(Music)))
)
@@ -867,7 +880,7 @@
\melodic \relative c'' { \clef bass;\meter 2/4; g'4 c,4 a'4 f4 e c d2 }
)
mudela(fragment)(
- \melodic \relative c'' { \key fis cis gis dis ais eis bis;\meter 2/4; g'4 c,4 a'4
f4 e c d2 }
+ \melodic \relative c'' { \key cis;\meter 2/4; g'4 c,4 a'4 f4 e c d2 }
)
mudela(fragment)(
\melodic \relative c'' { \meter 2/4;\cadenza 1; g'4 c,4 a'4 f4 e c d2 }
@@ -1913,7 +1926,7 @@
)
mudela(fragment,verbatim,center)(
-\key fis cis;
+\key d;
g a b cis' d' e' fis' g'
)
Note how Mudela allows you to
@@ -2043,12 +2056,12 @@
The duration of a Chord is the union of the durations
of its elements Example:
verb(
- <a4 {cis8 cis8} e'4> % a-major chord
+ <a4 {cis8 cis8} e'4> % a-major chord
)
it()You can form music by transposing music:
verb(
\transpose
- d % from c to the d that's one octave down
+ d % from c to the d that's one octave down
{ e4 f4 } % the horizontal music
)
it()verb(\type)
@@ -2117,10 +2130,10 @@
\def\inlanguage#1#2{{\length{#2}%
- \ifnum\count0=0
- \else
- em(#1): #2.
- \fi}}
+ \ifnum\count0=0
+ \else
+ em(#1): #2.
+ \fi}}
\small
diff -urN ../lilypond-0.1.75/NEWS ./NEWS
--- ../lilypond-0.1.75/NEWS Wed Jul 1 17:20:58 1998
+++ ./NEWS Sun Jul 5 23:29:52 1998
@@ -1,3 +1,11 @@
+pl 75.mb1
+ - Introduced real key names, \key e; gives E major!
+ - Previous use of the \key command now called \accidentals,
+ \accidentals fis cis gis dis; gives E major.
+ - Support for special keys with different accidentals on
+ different octaves, \specialkey \accidentals Fis Bes gis aiss';
+
+**********
pl 75
pl 74.jcn5
diff -urN ../lilypond-0.1.75/TODO ./TODO
--- ../lilypond-0.1.75/TODO Wed Jul 1 14:30:02 1998
+++ ./TODO Mon Jul 6 19:01:11 1998
@@ -367,11 +367,9 @@
* Keys:
- merge key{item} & localkey{item}?
- - do conventional keys (C G A, F B E, a e fis, d as des, etc ),
- besides lists of flats/sharps, possibly via declaration
+ - Major/Minor
- key transposition.
- key undo: \key bes; .. . \key; should print natural
- - special key: \key bes 'b bis';
- spacing, national styles?
* Support for TAB
diff -urN ../lilypond-0.1.75/VERSION ./VERSION
--- ../lilypond-0.1.75/VERSION Wed Jul 1 15:07:27 1998
+++ ./VERSION Mon Jul 6 21:32:45 1998
@@ -2,7 +2,7 @@
MAJOR_VERSION=0
MINOR_VERSION=1
PATCH_LEVEL=75
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
# use the above to send patches, always empty for released version:
# please don't move these comments up; the patch should fail if
diff -urN ../lilypond-0.1.75/bin/convert-mudela.pl ./bin/convert-mudela.pl
--- ../lilypond-0.1.75/bin/convert-mudela.pl Mon Jun 15 08:28:12 1998
+++ ./bin/convert-mudela.pl Sun Jul 5 22:50:46 1998
@@ -198,6 +198,12 @@
print STDERR "Not really smart enough to convert \\multi\n" if (/\\multi/);
}
+sub convert_0_1_18_to_0_1_19
+{
+ s/\\key/\\accidentals/g;
+# Should really convert to real key names instead.
+}
+
###############################################################
sub last_conversion
@@ -252,6 +258,7 @@
, "0.1.15" => \&convert_0_1_14_to_0_1_15
, "0.1.17" => \&convert_0_1_16_to_0_1_17
, "0.1.18" => \&convert_0_1_17_to_0_1_18
+ , "0.1.19" => \&convert_0_1_18_to_0_1_19
);
diff -urN ../lilypond-0.1.75/init/book-fragment.ly ./init/book-fragment.ly
--- ../lilypond-0.1.75/init/book-fragment.ly Mon Jun 15 08:28:12 1998
+++ ./init/book-fragment.ly Sun Jul 5 22:53:51 1998
@@ -1,6 +1,6 @@
% Toplevel initialisation file.
-\version "0.1.18";
+\version "0.1.19";
\include "declarations.ly"
diff -urN ../lilypond-0.1.75/init/center-fragment.ly ./init/center-fragment.ly
--- ../lilypond-0.1.75/init/center-fragment.ly Mon Jun 22 10:51:19 1998
+++ ./init/center-fragment.ly Sun Jul 5 22:53:58 1998
@@ -1,6 +1,6 @@
% Toplevel initialisation file.
-\version "0.1.18";
+\version "0.1.19";
\include "declarations.ly"
diff -urN ../lilypond-0.1.75/init/center.ly ./init/center.ly
--- ../lilypond-0.1.75/init/center.ly Tue Jun 23 17:07:20 1998
+++ ./init/center.ly Sun Jul 5 22:54:07 1998
@@ -1,6 +1,6 @@
% Toplevel initialisation file.
-\version "0.1.18";
+\version "0.1.19";
\include "declarations.ly"
diff -urN ../lilypond-0.1.75/init/fragment.ly ./init/fragment.ly
--- ../lilypond-0.1.75/init/fragment.ly Mon Jun 22 10:51:10 1998
+++ ./init/fragment.ly Sun Jul 5 22:54:20 1998
@@ -1,6 +1,6 @@
% Toplevel initialisation file.
-\version "0.1.18";
+\version "0.1.19";
\include "declarations.ly"
diff -urN ../lilypond-0.1.75/init/init.fly ./init/init.fly
--- ../lilypond-0.1.75/init/init.fly Mon Jun 15 08:28:12 1998
+++ ./init/init.fly Sun Jul 5 22:54:26 1998
@@ -1,6 +1,6 @@
% Toplevel initialisation file.
-\version "0.1.18";
+\version "0.1.19";
\include "declarations.ly"
diff -urN ../lilypond-0.1.75/init/init.ly ./init/init.ly
--- ../lilypond-0.1.75/init/init.ly Mon Jun 15 08:28:12 1998
+++ ./init/init.ly Sun Jul 5 22:54:31 1998
@@ -1,6 +1,6 @@
% Toplevel initialisation file.
-\version "0.1.18";
+\version "0.1.19";
\include "declarations.ly";
diff -urN ../lilypond-0.1.75/init/property.ly ./init/property.ly
--- ../lilypond-0.1.75/init/property.ly Mon Jun 15 08:28:12 1998
+++ ./init/property.ly Mon Jul 6 18:27:52 1998
@@ -31,6 +31,10 @@
beamquantisation 1 quantise pos and slope \beamposnormal
beamquantisation 2 quantise avoide wedge2) \beampostraditional
+[Staff]
+specialaccidentals 0 Accidental for all octaves \normalkey
+specialaccidentals 1 Accidental only for specified octave \specialkey
+
[Staff?]
instrument ascii midi instrument table lookup
@@ -225,4 +229,12 @@
\property Voice.pletvisibility = 2
}
%}
+
+normalkey = {
+ \property Staff.specialaccidentals = 0
+}
+
+specialkey = {
+ \property Staff.specialaccidentals = 1
+}
diff -urN ../lilypond-0.1.75/input/bugs/multi.ly ./input/bugs/multi.ly
--- ../lilypond-0.1.75/input/bugs/multi.ly Mon Jun 15 08:28:12 1998
+++ ./input/bugs/multi.ly Mon Jul 6 21:26:41 1998
@@ -21,7 +21,7 @@
%}
-\version "0.1.18";
+\version "0.1.19";
\score{
\melodic
@@ -30,7 +30,7 @@
\type Staff < { \stemdown c2 c2 } { \stemup c'2 c'2 } >
\multi 3 < { \clef "bass"; c2 c2 }
{ \meter 2/4;\bar "||";
- \key fis cis gis; c'2 c'2 }
+ \key A; c'2 c'2 }
>
c2 c1
c1 c1
diff -urN ../lilypond-0.1.75/input/coriolan-alto.ly ./input/coriolan-alto.ly
--- ../lilypond-0.1.75/input/coriolan-alto.ly Mon Jun 15 08:28:12 1998
+++ ./input/coriolan-alto.ly Mon Jul 6 20:10:51 1998
@@ -16,11 +16,11 @@
% (maybe even sooner :-)
%
-\version "0.1.18";
+\version "0.1.19";
alto1 = \melodic{
\meter 4/4;
- \key bes es as;
+ \key es;
\clef "alto";
% these are chords (i.e. non-divisi)
diff -urN ../lilypond-0.1.75/input/keys.ly ./input/keys.ly
--- ../lilypond-0.1.75/input/keys.ly Mon Jun 15 08:28:12 1998
+++ ./input/keys.ly Mon Jul 6 20:11:52 1998
@@ -1,16 +1,16 @@
-\version "0.1.18";
+\version "0.1.19";
blah = \melodic{
\meter 4/4;
\octave c';
- \key bes es as;
+ \key es;
[cis8 d e f] [e! a b cis'] |
es e f e a a' a a' |
\clef "bass"; \octave c; [es16 c' b a] [g f es d] [c d es d] [c Bes As G] |
\clef "violin";
- \key ;
+ \key c;
cis4 c cis cis |
<cis dis eis fes ges> cis dis2 ~ |
\meter 2/4 ;
diff -urN ../lilypond-0.1.75/input/kortjakje.ly ./input/kortjakje.ly
--- ../lilypond-0.1.75/input/kortjakje.ly Mon Jun 15 08:28:12 1998
+++ ./input/kortjakje.ly Mon Jul 6 20:09:10 1998
@@ -10,7 +10,7 @@
Tested Features: example file with comments
%}
-\version "0.1.18";
+\version "0.1.19";
% the % is a comment.
diff -urN ../lilypond-0.1.75/input/pedal.ly ./input/pedal.ly
--- ../lilypond-0.1.75/input/pedal.ly Mon Jun 15 08:28:12 1998
+++ ./input/pedal.ly Mon Jul 6 20:12:23 1998
@@ -24,12 +24,12 @@
% \lbheel \lbheel \lfheel \lftoe
% \rbheel \rbtoe \rfheel \rftoe
-\version "0.1.18";
+\version "0.1.19";
\score{
\melodic {
\meter 4/4;
- \key fis cis;
+ \key D;
\clef bass;
\octave c;
% silly chord testing...
diff -urN ../lilypond-0.1.75/input/praeludium-fuga-E.ly ./input/praeludium-fuga-E.ly
--- ../lilypond-0.1.75/input/praeludium-fuga-E.ly Mon Jun 15 08:28:12 1998
+++ ./input/praeludium-fuga-E.ly Mon Jul 6 21:43:27 1998
@@ -19,13 +19,13 @@
* organ staff...
%}
-\version "0.1.18";
+\version "0.1.19";
praeludium_commands = \melodic {
\meter 4/4;
- \key fis cis gis dis; % E-major
+ \key E; % E-major
}
praeludium_right = \melodic {
@@ -84,7 +84,7 @@
fuga2_commands = \melodic{
\meter 3/4;
- \key fis cis gis dis; % E-major
+ \key E; % E-major
}
fuga2_right = \melodic {
diff -urN ../lilypond-0.1.75/input/rhythm.ly ./input/rhythm.ly
--- ../lilypond-0.1.75/input/rhythm.ly Mon Jun 15 08:28:12 1998
+++ ./input/rhythm.ly Mon Jul 6 20:09:10 1998
@@ -7,7 +7,7 @@
-\version "0.1.18";
+\version "0.1.19";
ritme = \melodic{ %\octave ;
\partial 8;
diff -urN ../lilypond-0.1.75/input/scales.ly ./input/scales.ly
--- ../lilypond-0.1.75/input/scales.ly Mon Jun 15 08:28:12 1998
+++ ./input/scales.ly Mon Jul 6 20:09:10 1998
@@ -12,7 +12,7 @@
% scales with accents.
%
-\version "0.1.18";
+\version "0.1.19";
blah = \melodic {
\meter 6/8;
\octave c, ;
diff -urN ../lilypond-0.1.75/input/scripts.ly ./input/scripts.ly
--- ../lilypond-0.1.75/input/scripts.ly Mon Jun 15 08:28:12 1998
+++ ./input/scripts.ly Mon Jul 6 20:09:10 1998
@@ -1,5 +1,5 @@
-\version "0.1.18";
+\version "0.1.19";
blah = \melodic {
diff -urN ../lilypond-0.1.75/input/tril.ly ./input/tril.ly
--- ../lilypond-0.1.75/input/tril.ly Mon Jun 15 08:28:12 1998
+++ ./input/tril.ly Mon Jul 6 20:09:10 1998
@@ -5,7 +5,7 @@
"(Feta definitively is not an abbreviation of Font-En-TjA)";
}
-\version "0.1.18";
+\version "0.1.19";
\score{
\melodic{
diff -urN ../lilypond-0.1.75/input/twinkle-pop.ly ./input/twinkle-pop.ly
--- ../lilypond-0.1.75/input/twinkle-pop.ly Mon Jun 15 08:28:12 1998
+++ ./input/twinkle-pop.ly Mon Jul 6 20:09:10 1998
@@ -12,7 +12,7 @@
Tested Features lyrics and chords
%}
-\version "0.1.18";
+\version "0.1.19";
melodie = \melodic {
\clef"violin";
diff -urN ../lilypond-0.1.75/input/twinkle.ly ./input/twinkle.ly
--- ../lilypond-0.1.75/input/twinkle.ly Mon Jun 15 08:28:12 1998
+++ ./input/twinkle.ly Mon Jul 6 20:09:11 1998
@@ -15,7 +15,7 @@
Tested Features: lyrics, interleaving lyrics and staffs
%}
-\version "0.1.18";
+\version "0.1.19";
melody = \melodic \relative c'' {
\clef violin;
diff -urN ../lilypond-0.1.75/lily/command-request.cc ./lily/command-request.cc
--- ../lilypond-0.1.75/lily/command-request.cc Thu Jun 4 08:19:20 1998
+++ ./lily/command-request.cc Sun Jul 5 21:12:41 1998
@@ -230,7 +230,7 @@
Key_change_req::Key_change_req()
{
minor_b_ = false;
- multi_octave_b_= false;
+ ordinary_key_b_= false;
}
IMPLEMENT_IS_TYPE_B1(Break_req, Command_req);
@@ -270,8 +270,8 @@
return flats_i;
}
-int
-Key_change_req::minor_b()
+bool
+Key_change_req::minor_b() const
{
return minor_b_;
}
diff -urN ../lilypond-0.1.75/lily/include/command-request.hh
./lily/include/command-request.hh
--- ../lilypond-0.1.75/lily/include/command-request.hh Thu Jun 4 08:18:51 1998
+++ ./lily/include/command-request.hh Sun Jul 5 21:12:47 1998
@@ -145,9 +145,8 @@
public:
Array<Musical_pitch> pitch_arr_;
bool minor_b_;
+ bool ordinary_key_b_;
- /// don't ignore the octaves in #melodic_p_arr_#?
- bool multi_octave_b_;
Key_change_req();
REQUESTMETHODS(Key_change_req);
@@ -161,7 +160,7 @@
void transpose (Musical_pitch d) const;
/// is minor key?
- int minor_b();
+ bool minor_b() const;
};
class Clef_change_req : public Command_req {
diff -urN ../lilypond-0.1.75/lily/include/key-grav.hh ./lily/include/key-grav.hh
--- ../lilypond-0.1.75/lily/include/key-grav.hh Wed May 13 22:15:13 1998
+++ ./lily/include/key-grav.hh Sun Jul 5 13:53:18 1998
@@ -12,6 +12,7 @@
#include "engraver.hh"
#include "key.hh"
+#include "musical-pitch.hh"
/**
Make the key signature.
@@ -27,7 +28,7 @@
Key key_;
Key_change_req * keyreq_l_;
Key_item * kit_p_;
- Array<int> accidental_idx_arr_;
+ Array<Musical_pitch> accidental_idx_arr_;
bool default_key_b_;
bool change_key_b_;
diff -urN ../lilypond-0.1.75/lily/include/key-item.hh ./lily/include/key-item.hh
--- ../lilypond-0.1.75/lily/include/key-item.hh Fri May 29 13:12:10 1998
+++ ./lily/include/key-item.hh Sun Jul 5 19:40:06 1998
@@ -13,22 +13,26 @@
/// An item which places accidentals at the start of the line
struct Key_item : Item {
- Array<int> pitch;
- Array<int> acc;
- int c_position;
- bool default_b_;
-
+ Array<int> pitch;
+ Array<int> acc;
+ int c_position;
+ int c0_position;
+ bool default_b_;
+ bool multi_octave_b_;
- DECLARE_MY_RUNTIME_TYPEINFO;
- SCORE_ELEM_CLONE(Key_item);
+ DECLARE_MY_RUNTIME_TYPEINFO;
+ SCORE_ELEM_CLONE(Key_item);
+
+ Key_item ();
+ void add (int pitch, int acc);
+ void add (const Musical_pitch&);
+ void read (const Key_engraver&);
+ void set_c_position (int);
+ int Key_item::calculate_position(int p, int a) const;
- Key_item ();
- void add (int pitch, int acc);
- void read (const Key_engraver&);
- void set_c_position (int);
protected:
- virtual void do_pre_processing();
- Molecule* brew_molecule_p() const;
+ virtual void do_pre_processing();
+ Molecule* brew_molecule_p() const;
};
#endif // KEYITEM_HH
diff -urN ../lilypond-0.1.75/lily/key-grav.cc ./lily/key-grav.cc
--- ../lilypond-0.1.75/lily/key-grav.cc Wed Jun 3 13:54:01 1998
+++ ./lily/key-grav.cc Mon Jul 6 21:44:38 1998
@@ -70,11 +70,7 @@
void
Key_engraver::do_process_requests()
{
- if (key_.multi_octave_b_)
- {
- assert (false); // TODO .
- }
- else if (keyreq_l_)
+ if (keyreq_l_)
{
create_key();
}
@@ -97,18 +93,82 @@
Key_engraver::read_req (Key_change_req const * r)
{
key_.clear ();
- key_.multi_octave_b_ = r->multi_octave_b_;
+ Scalar prop = get_property ("specialaccidentals");
+ if (prop.length_i () > 0)
+ {
+ key_.multi_octave_b_ = (bool) prop;
+ }
+
accidental_idx_arr_.clear();
- for (int i = 0; i < r->pitch_arr_.size(); i ++)
+ if (r->ordinary_key_b_)
{
- Musical_pitch m_l =r->pitch_arr_[i];
- if (r->multi_octave_b_)
- key_.set (m_l);
+ int p;
+ if (r->pitch_arr_.size() < 1) {
+ r->warning(_ ("No clef name, defaults to C"));
+ p = 0;
+ }
else
- key_.set (m_l.notename_i_, m_l.accidental_i_);
+ {
+ p = r->pitch_arr_[0].semitone_pitch();
+ if (r->minor_b())
+ p += 3;
+ }
+ /* Solve the equation 7*no_of_acc mod 12 = p, -6 <= no_of_acc <= 5 */
+ int no_of_acc = (7*p) % 12;
+ no_of_acc = (no_of_acc + 18) % 12 -6;
+
+ /* Correct from flats to sharps or vice versa */
+ if (no_of_acc * r->pitch_arr_[0].accidental_i_ < 0)
+ no_of_acc += 12 * sign(r->pitch_arr_[0].accidental_i_);
- accidental_idx_arr_.push (m_l.notename_i_);
+ if (no_of_acc < 0)
+ {
+ int accidental = 6 ; // First accidental: bes
+ for ( ; no_of_acc < 0 ; no_of_acc++ )
+ {
+ Musical_pitch m;
+ m.accidental_i_ = -1;
+ m.notename_i_ = accidental;
+ if (key_.multi_octave_b_)
+ key_.set (m);
+ else
+ key_.set (m.notename_i_, m.accidental_i_);
+ accidental_idx_arr_.push (m);
+
+ accidental = (accidental + 3) % 7 ;
+ }
+ }
+ else
+ {
+ int accidental = 3 ; // First accidental: fis
+ for ( ; no_of_acc > 0 ; no_of_acc-- )
+ {
+ Musical_pitch m;
+ m.accidental_i_ = 1;
+ m.notename_i_ = accidental;
+ if (key_.multi_octave_b_)
+ key_.set (m);
+ else
+ key_.set (m.notename_i_, m.accidental_i_);
+ accidental_idx_arr_.push (m);
+
+ accidental = (accidental + 4) % 7 ;
+ }
+ }
+ }
+ else // Special key
+ {
+ for (int i = 0; i < r->pitch_arr_.size(); i ++)
+ {
+ Musical_pitch m_l =r->pitch_arr_[i];
+ if (key_.multi_octave_b_)
+ key_.set (m_l);
+ else
+ key_.set (m_l.notename_i_, m_l.accidental_i_);
+
+ accidental_idx_arr_.push (m_l);
+ }
}
}
diff -urN ../lilypond-0.1.75/lily/key-item.cc ./lily/key-item.cc
--- ../lilypond-0.1.75/lily/key-item.cc Fri May 29 13:12:11 1998
+++ ./lily/key-item.cc Sun Jul 5 20:25:11 1998
@@ -30,20 +30,23 @@
void
Key_item::read (Key_engraver const & key_grav_r)
{
- assert (!key_grav_r.key_.multi_octave_b_);
- const Array<int> &idx_arr =key_grav_r.accidental_idx_arr_;
+ multi_octave_b_ = key_grav_r.key_.multi_octave_b_;
+ const Array<Musical_pitch> &idx_arr =key_grav_r.accidental_idx_arr_;
for (int i = 0 ; i< idx_arr.size(); i++)
{
- int note = idx_arr[i];
- int acc = ((Key &) key_grav_r.key_).oct (0).acc (note);
-
- add (note, acc);
+ Musical_pitch m_l =idx_arr[i];
+ if (multi_octave_b_)
+ add (m_l);
+ else
+ add (m_l.notename_i_, m_l.accidental_i_);
}
}
void
Key_item::set_c_position (int c0)
{
+ c0_position = c0;
+ // Find the c within the range of the staff:
int from_bottom_pos = c0 + 4; // ugh
int octaves =(from_bottom_pos / 7) +1 ;
from_bottom_pos =(from_bottom_pos + 7*octaves)%7;
@@ -54,16 +57,34 @@
void
Key_item::add (int p, int a)
{
- if ((a<0 && ((p>FLAT_TOP_PITCH) || (p+c_position>4)) && (p+c_position>1))
- ||
- (a>0 && ((p>SHARP_TOP_PITCH) || (p+c_position>5)) && (p+c_position>2)))
- {
- p -= 7; /* Typeset below c_position */
- }
pitch.push (p);
acc.push (a);
}
+void
+Key_item::add (const Musical_pitch& pitch_r)
+{
+ pitch.push (pitch_r.steps());
+ acc.push (pitch_r.accidental_i_);
+}
+
+int
+Key_item::calculate_position(int p, int a) const
+{
+ if (multi_octave_b_)
+ {
+ return p + c0_position;
+ }
+ else {
+ if ((a<0 && ((p>FLAT_TOP_PITCH) || (p+c_position>4)) && (p+c_position>1))
+ ||
+ (a>0 && ((p>SHARP_TOP_PITCH) || (p+c_position>5)) && (p+c_position>2)))
+ {
+ p -= 7; /* Typeset below c_position */
+ }
+ return p + c_position;
+ }
+}
Molecule*
Key_item::brew_molecule_p() const
@@ -74,16 +95,16 @@
for (int i =0; i < pitch.size(); i++)
{
Atom a =lookup_l ()->accidental (acc[i]);
- a.translate_axis ((c_position + pitch[i]) * inter, Y_AXIS);
+ a.translate_axis (calculate_position(pitch[i], acc[i]) * inter, Y_AXIS);
Molecule m (a);
output->add_at_edge (X_AXIS, RIGHT, m);
}
if (pitch.size())
{
Molecule m (lookup_l ()->fill (Box (
- Interval (0, paper()->note_width
()),
- Interval (0,0))));
-
+ Interval (0, paper()->note_width ()),
+ Interval (0,0))));
+
output->add_at_edge (X_AXIS, RIGHT, m);
}
return output;
diff -urN ../lilypond-0.1.75/lily/my-lily-lexer.cc ./lily/my-lily-lexer.cc
--- ../lilypond-0.1.75/lily/my-lily-lexer.cc Wed Jun 3 21:22:30 1998
+++ ./lily/my-lily-lexer.cc Sun Jul 5 13:47:05 1998
@@ -25,6 +25,7 @@
static Keyword_ent the_key_tab[]={
{"absdynamic", ABSDYNAMIC},
{"accepts", ACCEPTS},
+ {"accidentals", ACCIDENTALS},
{"bar", BAR},
{"cadenza", CADENZA},
{"clear", CLEAR},
diff -urN ../lilypond-0.1.75/lily/parser.yy ./lily/parser.yy
--- ../lilypond-0.1.75/lily/parser.yy Mon Jun 15 08:28:12 1998
+++ ./lily/parser.yy Sun Jul 5 22:33:00 1998
@@ -44,8 +44,8 @@
// mmm
-Mudela_version oldest_version ("0.1.18");
-Mudela_version version ("0.1.18");
+Mudela_version oldest_version ("0.1.19");
+Mudela_version version ("0.1.19");
// needed for bison.simple's malloc() and free()
@@ -137,6 +137,7 @@
/* tokens which are not keywords */
+%token ACCIDENTALS
%token ALIAS
%token BAR
%token BEAMPLET
@@ -846,9 +847,17 @@
$$ = new Clef_change_req (*$2);
delete $2;
}
- | KEY pitch_list {
+ | KEY NOTENAME_PITCH {
+ Key_change_req *key_p= new Key_change_req;
+ key_p->pitch_arr_.push(*$2);
+ key_p->ordinary_key_b_ = true;
+ $$ = key_p;
+ delete $2;
+ }
+ | ACCIDENTALS pitch_list {
Key_change_req *key_p= new Key_change_req;
key_p->pitch_arr_ = *$2;
+ key_p->ordinary_key_b_ = false;
$$ = key_p;
delete $2;
}
@@ -1308,7 +1317,7 @@
pitch_list: {
$$ = new Array<Musical_pitch>;
}
- | pitch_list NOTENAME_PITCH {
+ | pitch_list musical_pitch {
$$->push (*$2);
delete $2;
}
diff -urN ../lilypond-0.1.75/mudela-mode.el ./mudela-mode.el
--- ../lilypond-0.1.75/mudela-mode.el Mon May 18 01:53:35 1998
+++ ./mudela-mode.el Mon Jul 6 21:31:33 1998
@@ -32,15 +32,15 @@
(defconst mudela-font-lock-keywords
(let* ((keywords '(
- "accepts" "break" "bar" "cadenza" "clear" "clef" "cm" "consists"
"contains"
- "duration" "absdynamic" "in" "translator" "type" "lyric" "key"
- "maininput" "melodic" "musical_pitch" "meter" "midi" "mm" "multi"
"header"
- "notenames" "octave" "output" "partial" "paper" "plet" "property"
"pt" "shape"
- "relative"
- "include"
- "score" "script" "skip" "staff" "table" "spandynamic" "symboltables"
- "tempo" "texid" "textstyle" "transpose" "version" "grouping"
- ))
+ "accepts" "accidentals" "break" "bar" "cadenza" "clear"
+ "clef" "cm" "consists" "contains" "duration" "absdynamic"
+ "in" "translator" "type" "lyric" "key" "maininput" "melodic"
+ "musical_pitch" "meter" "midi" "mm" "multi" "header"
+ "notenames" "octave" "output" "partial" "paper" "plet"
+ "property" "pt" "shape" "relative" "include" "score"
+ "script" "skip" "staff" "table" "spandynamic" "symboltables"
+ "tempo" "texid" "textstyle" "transpose" "version" "grouping"
+ ))
(kwregex (mapconcat (lambda (x) (concat "\\\\" x)) keywords "\\|")))
(list
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/clarinetti-part.ly
./mutopia/Coriolan/clarinetti-part.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/clarinetti-part.ly Mon Jun 15 08:28:12
1998
+++ ./mutopia/Coriolan/clarinetti-part.ly Mon Jul 6 20:16:45 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
\include "global.ly"
\include "clarinetti.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/clarinetti.ly
./mutopia/Coriolan/clarinetti.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/clarinetti.ly Mon Jun 15 08:28:12 1998
+++ ./mutopia/Coriolan/clarinetti.ly Mon Jul 6 20:20:05 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
\include "clarinetto-1.ly"
\include "clarinetto-2.ly"
@@ -23,7 +23,7 @@
\property Staff.transposing = -3
\melodic \type Voice=one <
\meter 4/4;
- \key bes;
+ \key F;
\$clarinetto1
\$clarinetto2
>
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/clarinetto-1.ly
./mutopia/Coriolan/clarinetto-1.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/clarinetto-1.ly Mon Jun 15 08:28:12 1998
+++ ./mutopia/Coriolan/clarinetto-1.ly Mon Jul 6 20:16:45 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
clarinetto1 = \melodic \relative c {
R1 *2 | d''4-.\ff r r2 | R1 *3 | e4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/clarinetto-2.ly
./mutopia/Coriolan/clarinetto-2.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/clarinetto-2.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/clarinetto-2.ly Mon Jul 6 20:16:45 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
clarinetto2 = \melodic \relative c {
R1*2 bes''4-.\ff r r2 | R1*3 | cis4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/contrabasso.ly
./mutopia/Coriolan/contrabasso.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/contrabasso.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/contrabasso.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
contrabasso = \melodic \relative c {
\skip 1*21;
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/coriolan.ly
./mutopia/Coriolan/coriolan.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/coriolan.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/coriolan.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
\include "global.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/corni-part.ly
./mutopia/Coriolan/corni-part.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/corni-part.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/corni-part.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
\include "global.ly"
\include "corni.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/corni.ly ./mutopia/Coriolan/corni.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/corni.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/corni.ly Mon Jul 6 20:16:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
\include "corno-1.ly"
\include "corno-2.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/corno-1.ly ./mutopia/Coriolan/corno-1.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/corno-1.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/corno-1.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
corno1 = \melodic \relative c {
R1 *2 | f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/corno-2.ly ./mutopia/Coriolan/corno-2.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/corno-2.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/corno-2.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
corno2 = \melodic \relative c {
R1 *2 | d''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/fagotti-part.ly
./mutopia/Coriolan/fagotti-part.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/fagotti-part.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/fagotti-part.ly Mon Jul 6 20:16:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
\include "global.ly"
\include "fagotti.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/fagotti.ly ./mutopia/Coriolan/fagotti.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/fagotti.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/fagotti.ly Mon Jul 6 20:16:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
\include "fagotto-1.ly"
\include "fagotto-2.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/fagotto-1.ly
./mutopia/Coriolan/fagotto-1.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/fagotto-1.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/fagotto-1.ly Mon Jul 6 20:16:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
fagotto1 = \melodic \relative c {
R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/fagotto-2.ly
./mutopia/Coriolan/fagotto-2.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/fagotto-2.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/fagotto-2.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
fagotto2 = \melodic \relative c {
R1 *2 | f4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/flauti-part.ly
./mutopia/Coriolan/flauti-part.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/flauti-part.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/flauti-part.ly Mon Jul 6 20:16:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
\include "global.ly"
\include "flauti.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/flauti.ly ./mutopia/Coriolan/flauti.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/flauti.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/flauti.ly Mon Jul 6 20:16:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
\include "flauto-1.ly"
\include "flauto-2.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/flauto-1.ly
./mutopia/Coriolan/flauto-1.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/flauto-1.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/flauto-1.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
flauto1 = \melodic \relative c {
R1 *2 | c'''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/flauto-2.ly
./mutopia/Coriolan/flauto-2.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/flauto-2.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/flauto-2.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
flauto2 = \melodic \relative c {
R1 *2 | as'''4-.\ff r r2 | R1 *3 | b4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/global.ly ./mutopia/Coriolan/global.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/global.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/global.ly Mon Jul 6 20:20:37 1998
@@ -9,11 +9,11 @@
}
-\version "0.1.18";
+\version "0.1.19";
global = \melodic {
\meter 4/4;
- \key bes es as;
+ \key es;
\skip 1*315;
}
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/oboe-1.ly ./mutopia/Coriolan/oboe-1.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/oboe-1.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/oboe-1.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
oboe1 = \melodic \relative c'' {
R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/oboe-2.ly ./mutopia/Coriolan/oboe-2.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/oboe-2.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/oboe-2.ly Mon Jul 6 20:16:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
oboe2 = \melodic \relative c{
R1 *2| f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/oboi-part.ly
./mutopia/Coriolan/oboi-part.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/oboi-part.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/oboi-part.ly Mon Jul 6 20:16:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
\include "global.ly"
\include "oboi.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/oboi.ly ./mutopia/Coriolan/oboi.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/oboi.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/oboi.ly Mon Jul 6 20:16:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
\include "oboe-1.ly"
\include "oboe-2.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/timpani.ly ./mutopia/Coriolan/timpani.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/timpani.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/timpani.ly Mon Jul 6 20:16:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
timpani = \melodic \relative c {
R1 *2 | c4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/trombe-part.ly
./mutopia/Coriolan/trombe-part.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/trombe-part.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/trombe-part.ly Mon Jul 6 20:16:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
\include "global.ly"
\include "trombe.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/trombe.ly ./mutopia/Coriolan/trombe.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/trombe.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/trombe.ly Mon Jul 6 20:16:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
\include "trombo-1.ly"
\include "trombo-2.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/trombo-1.ly
./mutopia/Coriolan/trombo-1.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/trombo-1.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/trombo-1.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
trombo1 = \melodic \relative c {
R1 *2 | c''4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/trombo-2.ly
./mutopia/Coriolan/trombo-2.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/trombo-2.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/trombo-2.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
trombo2 = \melodic \relative c {
R1 *2 | c'4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/viola-1.ly ./mutopia/Coriolan/viola-1.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/viola-1.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/viola-1.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
viola1 = \melodic \relative c {
\type Voice=one
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/viola-2.ly ./mutopia/Coriolan/viola-2.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/viola-2.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/viola-2.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
viola2 = \melodic \relative c {
% starts on (actualy, most part is on) same staff as viola1
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/viola-part.ly
./mutopia/Coriolan/viola-part.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/viola-part.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/viola-part.ly Mon Jul 6 20:16:46 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
\include "global.ly"
\include "viola-1.ly"
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/violino-1.ly
./mutopia/Coriolan/violino-1.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/violino-1.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/violino-1.ly Mon Jul 6 20:16:47 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
violino1 = \melodic \relative c {
c'1\ff ~ | c | <f4-. c'-. as'-.> r r2 | r1 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/violino-2.ly
./mutopia/Coriolan/violino-2.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/violino-2.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/violino-2.ly Mon Jul 6 20:16:47 1998
@@ -7,7 +7,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
violino2 = \melodic \relative c {
c'1\ff ~ | c | <f4-. c'-. as'-.> r r2 | r1 |
diff -urN ../lilypond-0.1.75/mutopia/Coriolan/violoncello.ly
./mutopia/Coriolan/violoncello.ly
--- ../lilypond-0.1.75/mutopia/Coriolan/violoncello.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/Coriolan/violoncello.ly Mon Jul 6 20:16:47 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.18";
+\version "0.1.19";
violoncello = \melodic \relative c {
c1\ff ~ | c | f,4-. r r2 | r1 | c'1\ff ~ | c | f,4-. r r2 |
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/allemande-alto.ly
./mutopia/J.S.Bach/allemande-alto.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/allemande-alto.ly Mon Jun 15 08:28:13
1998
+++ ./mutopia/J.S.Bach/allemande-alto.ly Mon Jul 6 20:27:11 1998
@@ -15,13 +15,13 @@
dotted slurs
%}
-\version "0.1.18";
+\version "0.1.19";
\include "allemande-urtext.ly";
allemande_alto_global = \melodic{
\meter 4/4;
- \key bes;
+ \key F;
\partial 16;
\clef alto;
\skip 1*11;
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/allemande-cello.ly
./mutopia/J.S.Bach/allemande-cello.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/allemande-cello.ly Mon Jun 15 08:28:13
1998
+++ ./mutopia/J.S.Bach/allemande-cello.ly Mon Jul 6 20:21:20 1998
@@ -15,13 +15,13 @@
dotted slurs
%}
-\version "0.1.18";
+\version "0.1.19";
\include "allemande-urtext.ly";
allemande_cello_global = \melodic{
\meter 4/4;
- \key bes;
+ \key F;
\partial 16;
\clef bass;
\skip 1*11;
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/courante-alto.ly
./mutopia/J.S.Bach/courante-alto.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/courante-alto.ly Mon Jun 15 08:28:13
1998
+++ ./mutopia/J.S.Bach/courante-alto.ly Mon Jul 6 20:21:53 1998
@@ -15,13 +15,13 @@
dotted slurs
%}
-\version "0.1.18";
+\version "0.1.19";
\include "courante-urtext.ly";
courante_alto_global = \melodic{
\meter 3/4;
- \key bes;
+ \key F;
\partial 16;
\clef alto;
\skip 2.*15;
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/courante-cello.ly
./mutopia/J.S.Bach/courante-cello.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/courante-cello.ly Mon Jun 15 08:28:13
1998
+++ ./mutopia/J.S.Bach/courante-cello.ly Mon Jul 6 20:22:07 1998
@@ -15,13 +15,13 @@
dotted slurs
%}
-\version "0.1.18";
+\version "0.1.19";
\include "courante-urtext.ly";
courante_cello_global = \melodic{
\meter 3/4;
- \key bes;
+ \key F;
\partial 16;
\clef bass;
\skip 2.*15;
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/gigue-alto.ly
./mutopia/J.S.Bach/gigue-alto.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/gigue-alto.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/J.S.Bach/gigue-alto.ly Mon Jul 6 20:22:48 1998
@@ -15,13 +15,13 @@
dotted slurs
%}
-\version "0.1.18";
+\version "0.1.19";
\include "gigue-urtext.ly";
gigue_cello_global = \melodic{
\meter 3/8;
- \key bes;
+ \key F;
\clef bass;
\partial 8
\skip 4.*31;
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/gigue-cello.ly
./mutopia/J.S.Bach/gigue-cello.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/gigue-cello.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/J.S.Bach/gigue-cello.ly Mon Jul 6 20:23:01 1998
@@ -15,13 +15,13 @@
dotted slurs
%}
-\version "0.1.18";
+\version "0.1.19";
\include "gigue-urtext.ly";
gigue_cello_global = \melodic{
\meter 3/8;
- \key bes;
+ \key F;
\clef bass;
\partial 8;
\skip 4.*31;
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/menuetto-alto.ly
./mutopia/J.S.Bach/menuetto-alto.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/menuetto-alto.ly Mon Jun 15 08:28:13
1998
+++ ./mutopia/J.S.Bach/menuetto-alto.ly Mon Jul 6 20:23:34 1998
@@ -17,13 +17,13 @@
dotted slurs
%}
-\version "0.1.18";
+\version "0.1.19";
\include "menuetto-urtext.ly";
menuetto_i_alto_global = \melodic{
\meter 3/4;
- \key bes;
+ \key F;
\clef alto;
\skip 2.*8;
\bar ":|:";
@@ -66,7 +66,7 @@
menuetto_ii_alto_global = \melodic{
\meter 3/4;
- \key fis cis;
+ \key D;
\clef alto;
\skip 2.*8;
\bar ":|:";
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/menuetto-cello.ly
./mutopia/J.S.Bach/menuetto-cello.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/menuetto-cello.ly Mon Jun 15 08:28:13
1998
+++ ./mutopia/J.S.Bach/menuetto-cello.ly Mon Jul 6 20:23:57 1998
@@ -16,13 +16,13 @@
dotted slurs
%}
-\version "0.1.18";
+\version "0.1.19";
\include "menuetto-urtext.ly";
menuetto_i_cello_global = \melodic{
\meter 3/4;
- \key bes;
+ \key F;
\clef bass;
\skip 2.*8;
\bar ":|:";
@@ -67,7 +67,7 @@
menuetto_ii_cello_global = \melodic{
\meter 3/4;
- \key fis cis;
+ \key D;
\clef bass;
\skip 2.*8;
\bar ":|:";
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/prelude-alto.ly
./mutopia/J.S.Bach/prelude-alto.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/prelude-alto.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/J.S.Bach/prelude-alto.ly Mon Jul 6 20:24:17 1998
@@ -15,13 +15,13 @@
dotted slurs
%}
-\version "0.1.18";
+\version "0.1.19";
\include "prelude-urtext.ly";
prelude_alto_global = \melodic{
\meter 3/4;
- \key bes;
+ \key F;
\clef alto;
\skip 2.*63;
\bar "|.";
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/prelude-cello.ly
./mutopia/J.S.Bach/prelude-cello.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/prelude-cello.ly Mon Jun 15 08:28:13
1998
+++ ./mutopia/J.S.Bach/prelude-cello.ly Mon Jul 6 20:24:32 1998
@@ -15,13 +15,13 @@
dotted slurs
%}
-\version "0.1.18";
+\version "0.1.19";
\include "prelude-urtext.ly";
prelude_cello_global = \melodic{
\meter 3/4;
- \key bes;
+ \key F;
\clef bass;
\skip 2.*63;
\bar "|.";
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/preludes-1.ly
./mutopia/J.S.Bach/preludes-1.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/preludes-1.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/J.S.Bach/preludes-1.ly Mon Jul 6 20:17:17 1998
@@ -14,7 +14,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
one = \melodic\relative c {
\textstyle "italic";
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/preludes-2.ly
./mutopia/J.S.Bach/preludes-2.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/preludes-2.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/J.S.Bach/preludes-2.ly Mon Jul 6 20:17:17 1998
@@ -14,7 +14,7 @@
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
one = \melodic\relative c{
\textstyle "italic";
r8\mf [c'-1( e-2 g-4] [e-2 c-1 bes'-5 g-3] |
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/preludes-3.lym4
./mutopia/J.S.Bach/preludes-3.lym4
--- ../lilypond-0.1.75/mutopia/J.S.Bach/preludes-3.lym4 Mon Jun 8 11:03:52 1998
+++ ./mutopia/J.S.Bach/preludes-3.lym4 Mon Jul 6 21:20:09 1998
@@ -21,7 +21,7 @@
copyright = "public domain";
}
-\version "0.1.17";
+\version "0.1.19";
one = \melodic{
@@ -152,7 +152,7 @@
global = \melodic{
\meter 3/4;
- \key bes es as;
+ \key es;
}
treble_staff = \type Staff = treble <
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/preludes-4.ly
./mutopia/J.S.Bach/preludes-4.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/preludes-4.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/J.S.Bach/preludes-4.ly Mon Jul 6 20:25:00 1998
@@ -12,7 +12,7 @@
enteredby = "jcn";
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
one = \melodic\relative c{
\textstyle "italic";
@@ -179,7 +179,7 @@
global = \melodic{
\meter 4/4;
- \key fis cis;
+ \key D;
}
treble_staff = \type Staff = treble <
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/preludes-5.ly
./mutopia/J.S.Bach/preludes-5.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/preludes-5.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/J.S.Bach/preludes-5.ly Mon Jul 6 20:25:14 1998
@@ -12,7 +12,7 @@
enteredby = "jcn";
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
one = \melodic\relative c{
@@ -187,7 +187,7 @@
global = \melodic{
\meter 3/4;
- \key bes;
+ \key F;
}
treble_staff = \type Staff = treble <
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/preludes-6.ly
./mutopia/J.S.Bach/preludes-6.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/preludes-6.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/J.S.Bach/preludes-6.ly Mon Jul 6 20:25:27 1998
@@ -12,7 +12,7 @@
enteredby = "jcn";
copyright = "public domain";
}
-\version "0.1.18";
+\version "0.1.19";
one = \melodic\relative c{
@@ -97,7 +97,7 @@
global = \melodic{
\meter 4/4;
- \key bes;
+ \key F;
}
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/sarabande-alto.ly
./mutopia/J.S.Bach/sarabande-alto.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/sarabande-alto.ly Mon Jun 15 08:28:13
1998
+++ ./mutopia/J.S.Bach/sarabande-alto.ly Mon Jul 6 20:25:44 1998
@@ -15,13 +15,13 @@
dotted slurs
%}
-\version "0.1.18";
+\version "0.1.19";
\include "sarabande-urtext.ly";
sarabande_alto_global = \melodic{
\meter 3/4;
- \key bes;
+ \key F;
\clef alto;
\skip 2.*12;
\bar ":|:";
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/sarabande-cello.ly
./mutopia/J.S.Bach/sarabande-cello.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/sarabande-cello.ly Mon Jun 15 08:28:13
1998
+++ ./mutopia/J.S.Bach/sarabande-cello.ly Mon Jul 6 20:25:57 1998
@@ -15,13 +15,13 @@
dotted slurs
%}
-\version "0.1.18";
+\version "0.1.19";
\include "sarabande-urtext.ly";
sarabande_cello_global = \melodic{
\meter 3/4;
- \key bes;
+ \key F;
\clef bass;
\skip 2.*12;
\bar ":|:";
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/wtk1-fugue1.ly
./mutopia/J.S.Bach/wtk1-fugue1.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/wtk1-fugue1.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/J.S.Bach/wtk1-fugue1.ly Mon Jul 6 20:17:17 1998
@@ -11,7 +11,7 @@
%{
%}
-\version "0.1.18";
+\version "0.1.19";
global =
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/wtk1-fugue2.ly
./mutopia/J.S.Bach/wtk1-fugue2.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/wtk1-fugue2.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/J.S.Bach/wtk1-fugue2.ly Mon Jul 6 20:26:23 1998
@@ -13,13 +13,13 @@
Tested Features: stem direction, multivoice, forced accidentals.
%}
-\version "0.1.18";
+\version "0.1.19";
\include "nederlands.ly" % for correct parsing of note names
global = \melodic {
\meter 4/4;
- \key bes es as;
+ \key es;
\skip 1*31;
\bar "|."; |
}
diff -urN ../lilypond-0.1.75/mutopia/J.S.Bach/wtk1-prelude1.ly
./mutopia/J.S.Bach/wtk1-prelude1.ly
--- ../lilypond-0.1.75/mutopia/J.S.Bach/wtk1-prelude1.ly Mon Jun 15 08:28:13
1998
+++ ./mutopia/J.S.Bach/wtk1-prelude1.ly Mon Jul 6 20:17:17 1998
@@ -8,7 +8,7 @@
copyright = "Public Domain";
}
-\version "0.1.18";
+\version "0.1.19";
global =
\melodic {
diff -urN ../lilypond-0.1.75/mutopia/W.A.Mozart/cadenza.ly
./mutopia/W.A.Mozart/cadenza.ly
--- ../lilypond-0.1.75/mutopia/W.A.Mozart/cadenza.ly Tue Jun 16 14:05:23 1998
+++ ./mutopia/W.A.Mozart/cadenza.ly Mon Jul 6 20:18:03 1998
@@ -13,7 +13,7 @@
Ugh.. Wish we had grace notes.... It adds another dimension to this
piece of music. %}
-\version "0.1.18";
+\version "0.1.19";
cad = \melodic \relative c' {
diff -urN ../lilypond-0.1.75/mutopia/W.A.Mozart/horn-concerto-3.ly
./mutopia/W.A.Mozart/horn-concerto-3.ly
--- ../lilypond-0.1.75/mutopia/W.A.Mozart/horn-concerto-3.ly Mon Jun 8 11:03:52
1998
+++ ./mutopia/W.A.Mozart/horn-concerto-3.ly Mon Jul 6 20:26:46 1998
@@ -9,7 +9,7 @@
}
-\version "0.1.17";
+\version "0.1.19";
allegro =
\melodic
@@ -149,7 +149,7 @@
romanze = \melodic \relative c' {
- \key bes;
+ \key F;
\meter 2/2;
c'4.() f8 a,4 a
[bes8( c d bes] )g4 r8 g
diff -urN ../lilypond-0.1.75/mutopia/los-toros-oboe.ly ./mutopia/los-toros-oboe.ly
--- ../lilypond-0.1.75/mutopia/los-toros-oboe.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/los-toros-oboe.ly Mon Jul 6 20:15:01 1998
@@ -8,7 +8,7 @@
copyright = "public domain";
latexheaders= "headers";
}
-\version "0.1.18";
+\version "0.1.19";
%{
Silly latex file dropped; use ly2dvi
@@ -282,13 +282,13 @@
}
global = \melodic{
- \key bes es as;
+ \key es;
\meter 2/4;
\skip 4*110;
- \key fis; |
+ \key g; |
\bar "||";
\skip 4*58;
- \key bes es as; |
+ \key es; |
\bar "||";
\skip 4*220;
\bar "|.";
diff -urN ../lilypond-0.1.75/mutopia/standchen.ly ./mutopia/standchen.ly
--- ../lilypond-0.1.75/mutopia/standchen.ly Mon Jun 15 08:28:13 1998
+++ ./mutopia/standchen.ly Mon Jul 6 20:15:35 1998
@@ -14,7 +14,7 @@
multiple \paper{}s in one \score
%}
-\version "0.1.18";
+\version "0.1.19";
$vocal_verse1 = \melodic\relative c{
% ugh: treble/bass
@@ -345,7 +345,7 @@
global = \melodic{
\meter 3/4;
- \key bes es as;
+ \key es;
\skip 4 * 12;
\break
\skip 4 * 234;
