[EMAIL PROTECTED] said:
> * The new \key stuff is great! It shouldn't be too hard to implement
> \key inside \transpose, now, eh?
Thanks! It wasn't hard to implement transposed keys, the patch follows.
However, I don't really know how to transpose \accidentals, so they
remain unchanged.
In addition, I thought it was silly that internally to Lilypond,
all octaves were one step off, so I tried to change it.
The only user-visible change is that transposing one third up now
is written "\transpose e" instead of "\transpose e'".
(I didn't change this in any of the examples though)
There is a problem with the relative octaves when combined with
transposition. In noticed the problem both before and after my changes,
so it's not (only) a result of my patches.
If you think this change was a silly idea, just use patch for
command-request.cc/hh, the rest is for the octave handling.
/Mats
Generated by (address unknown) using package-diff 0.54,
>From = lilypond-0.1.77, To = lilypond-0.1.77.mb1
usage
cd lilypond-source-dir; patch -E -p1 < lilypond-0.1.77.mb1.diff
Patches do not contain automatically generated files,
i.e. you should rerun autoconf and configure
--state
0.1.77
0.1.77.mb1
++state
diff -urN ../lilypond-0.1.77/NEWS ./NEWS
--- ../lilypond-0.1.77/NEWS Tue Jul 7 16:28:34 1998
+++ ./NEWS Thu Jul 9 00:03:03 1998
@@ -1,3 +1,11 @@
+pl 77.mb1
+ - Implemented transposed keys, no support for transposed
+ \accidentals.
+ - bf(!?) Changed internal note representation so
+ c0 is c0, not c1.
+ - Corollary: "\transpose e" now raises a third (used to lower a sixth).
+
+*******
pl 77
- bf: install info
- bf: key-grav.cc: ambiguous conversion
diff -urN ../lilypond-0.1.77/VERSION ./VERSION
--- ../lilypond-0.1.77/VERSION Tue Jul 7 15:43:06 1998
+++ ./VERSION Thu Jul 9 00:03:23 1998
@@ -2,7 +2,7 @@
MAJOR_VERSION=0
MINOR_VERSION=1
PATCH_LEVEL=77
-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.77/lily/command-request.cc ./lily/command-request.cc
--- ../lilypond-0.1.77/lily/command-request.cc Tue Jul 7 12:47:56 1998
+++ ./lily/command-request.cc Wed Jul 8 22:08:24 1998
@@ -200,9 +200,12 @@
/* *************** */
void
-Key_change_req::transpose (Musical_pitch d) const
+Key_change_req::transpose (Musical_pitch d)
{
- WARN << _ ("don't know how to transpose a key") << '\n'; // TODO!
+ if (ordinary_key_b_ && (pitch_arr_.size () > 0))
+ pitch_arr_[0].transpose(d);
+ else
+ warning(_ ("don't know how to transpose special keys")); // TODO
}
diff -urN ../lilypond-0.1.77/lily/include/command-request.hh
./lily/include/command-request.hh
--- ../lilypond-0.1.77/lily/include/command-request.hh Tue Jul 7 12:47:56 1998
+++ ./lily/include/command-request.hh Wed Jul 8 21:26:27 1998
@@ -158,7 +158,7 @@
/// return number of sharps in key
int sharps_i();
- void transpose (Musical_pitch d) const;
+ void transpose (Musical_pitch d);
/// is minor key?
bool minor_b() const;
};
diff -urN ../lilypond-0.1.77/init/deutsch.ly ./init/deutsch.ly
--- ../lilypond-0.1.77/init/deutsch.ly Thu May 14 01:39:12 1998
+++ ./init/deutsch.ly Thu Jul 9 00:08:04 1998
@@ -11,41 +11,41 @@
% have a rhythmic part too. This is the reason that we don't write 'note { .. }'
%
\notenames {
- ceses = \musical_pitch { -1 0 -2 }
- ces = \musical_pitch { -1 0 -1 }
- c = \musical_pitch { -1 0 0 }
- cis = \musical_pitch { -1 0 1 }
- cisis = \musical_pitch { -1 0 2 }
- deses = \musical_pitch { -1 1 -2 }
- des = \musical_pitch { -1 1 -1 }
- d = \musical_pitch { -1 1 0 }
- dis = \musical_pitch { -1 1 1 }
- disis = \musical_pitch { -1 1 2 }
- eses = \musical_pitch { -1 2 -2 }
- es = \musical_pitch { -1 2 -1 }
- e = \musical_pitch { -1 2 0 }
- eis = \musical_pitch { -1 2 1 }
- eisis = \musical_pitch { -1 2 2 }
- feses = \musical_pitch { -1 3 -2 }
- fes = \musical_pitch { -1 3 -1 }
- f = \musical_pitch { -1 3 0 }
- fis = \musical_pitch { -1 3 1 }
- fisis = \musical_pitch { -1 3 2 }
- geses = \musical_pitch { -1 4 -2 }
- ges = \musical_pitch { -1 4 -1 }
- g = \musical_pitch { -1 4 0 }
- gis = \musical_pitch { -1 4 1 }
- gisis = \musical_pitch { -1 4 2 }
- ases = \musical_pitch { -1 5 -2 }
- as = \musical_pitch { -1 5 -1 }
- a = \musical_pitch { -1 5 0 }
- ais = \musical_pitch { -1 5 1 }
- aisis = \musical_pitch { -1 5 2 }
- heses = \musical_pitch { -1 6 -2 }
- b = \musical_pitch { -1 6 -1 }
- h = \musical_pitch { -1 6 0 }
- his = \musical_pitch { -1 6 1 }
- hisis = \musical_pitch { -1 6 2 }
+ ceses = \musical_pitch { 0 0 -2 }
+ ces = \musical_pitch { 0 0 -1 }
+ c = \musical_pitch { 0 0 0 }
+ cis = \musical_pitch { 0 0 1 }
+ cisis = \musical_pitch { 0 0 2 }
+ deses = \musical_pitch { 0 1 -2 }
+ des = \musical_pitch { 0 1 -1 }
+ d = \musical_pitch { 0 1 0 }
+ dis = \musical_pitch { 0 1 1 }
+ disis = \musical_pitch { 0 1 2 }
+ eses = \musical_pitch { 0 2 -2 }
+ es = \musical_pitch { 0 2 -1 }
+ e = \musical_pitch { 0 2 0 }
+ eis = \musical_pitch { 0 2 1 }
+ eisis = \musical_pitch { 0 2 2 }
+ feses = \musical_pitch { 0 3 -2 }
+ fes = \musical_pitch { 0 3 -1 }
+ f = \musical_pitch { 0 3 0 }
+ fis = \musical_pitch { 0 3 1 }
+ fisis = \musical_pitch { 0 3 2 }
+ geses = \musical_pitch { 0 4 -2 }
+ ges = \musical_pitch { 0 4 -1 }
+ g = \musical_pitch { 0 4 0 }
+ gis = \musical_pitch { 0 4 1 }
+ gisis = \musical_pitch { 0 4 2 }
+ ases = \musical_pitch { 0 5 -2 }
+ as = \musical_pitch { 0 5 -1 }
+ a = \musical_pitch { 0 5 0 }
+ ais = \musical_pitch { 0 5 1 }
+ aisis = \musical_pitch { 0 5 2 }
+ heses = \musical_pitch { 0 6 -2 }
+ b = \musical_pitch { 0 6 -1 }
+ h = \musical_pitch { 0 6 0 }
+ his = \musical_pitch { 0 6 1 }
+ hisis = \musical_pitch { 0 6 2 }
%
@@ -53,41 +53,41 @@
%
- Ceses = \musical_pitch { -2 0 -2 }
- Ces = \musical_pitch { -2 0 -1 }
- C = \musical_pitch { -2 0 0 }
- Cis = \musical_pitch { -2 0 1 }
- Cisis = \musical_pitch { -2 0 2 }
- Deses = \musical_pitch { -2 1 -2 }
- Des = \musical_pitch { -2 1 -1 }
- D = \musical_pitch { -2 1 0 }
- Dis = \musical_pitch { -2 1 1 }
- Disis = \musical_pitch { -2 1 2 }
- Eses = \musical_pitch { -2 2 -2 }
- Es = \musical_pitch { -2 2 -1 }
- E = \musical_pitch { -2 2 0 }
- Eis = \musical_pitch { -2 2 1 }
- Eisis = \musical_pitch { -2 2 2 }
- Feses = \musical_pitch { -2 3 -2 }
- Fes = \musical_pitch { -2 3 -1 }
- F = \musical_pitch { -2 3 0 }
- Fis = \musical_pitch { -2 3 1 }
- Fisis = \musical_pitch { -2 3 2 }
- Geses = \musical_pitch { -2 4 -2 }
- Ges = \musical_pitch { -2 4 -1 }
- G = \musical_pitch { -2 4 0 }
- Gis = \musical_pitch { -2 4 1 }
- Gisis = \musical_pitch { -2 4 2 }
- Ases = \musical_pitch { -2 5 -2 }
- As = \musical_pitch { -2 5 -1 }
- A = \musical_pitch { -2 5 0 }
- Ais = \musical_pitch { -2 5 1 }
- Aisis = \musical_pitch { -2 5 2 }
- Heses = \musical_pitch { -2 6 -2 }
- B = \musical_pitch { -2 6 -1 }
- H = \musical_pitch { -2 6 0 }
- His = \musical_pitch { -2 6 1 }
- Hisis = \musical_pitch { -2 6 2 }
+ Ceses = \musical_pitch { -1 0 -2 }
+ Ces = \musical_pitch { -1 0 -1 }
+ C = \musical_pitch { -1 0 0 }
+ Cis = \musical_pitch { -1 0 1 }
+ Cisis = \musical_pitch { -1 0 2 }
+ Deses = \musical_pitch { -1 1 -2 }
+ Des = \musical_pitch { -1 1 -1 }
+ D = \musical_pitch { -1 1 0 }
+ Dis = \musical_pitch { -1 1 1 }
+ Disis = \musical_pitch { -1 1 2 }
+ Eses = \musical_pitch { -1 2 -2 }
+ Es = \musical_pitch { -1 2 -1 }
+ E = \musical_pitch { -1 2 0 }
+ Eis = \musical_pitch { -1 2 1 }
+ Eisis = \musical_pitch { -1 2 2 }
+ Feses = \musical_pitch { -1 3 -2 }
+ Fes = \musical_pitch { -1 3 -1 }
+ F = \musical_pitch { -1 3 0 }
+ Fis = \musical_pitch { -1 3 1 }
+ Fisis = \musical_pitch { -1 3 2 }
+ Geses = \musical_pitch { -1 4 -2 }
+ Ges = \musical_pitch { -1 4 -1 }
+ G = \musical_pitch { -1 4 0 }
+ Gis = \musical_pitch { -1 4 1 }
+ Gisis = \musical_pitch { -1 4 2 }
+ Ases = \musical_pitch { -1 5 -2 }
+ As = \musical_pitch { -1 5 -1 }
+ A = \musical_pitch { -1 5 0 }
+ Ais = \musical_pitch { -1 5 1 }
+ Aisis = \musical_pitch { -1 5 2 }
+ Heses = \musical_pitch { -1 6 -2 }
+ B = \musical_pitch { -1 6 -1 }
+ H = \musical_pitch { -1 6 0 }
+ His = \musical_pitch { -1 6 1 }
+ Hisis = \musical_pitch { -1 6 2 }
}
diff -urN ../lilypond-0.1.77/init/italiano.ly ./init/italiano.ly
--- ../lilypond-0.1.77/init/italiano.ly Thu May 14 01:39:12 1998
+++ ./init/italiano.ly Thu Jul 9 00:08:48 1998
@@ -11,39 +11,39 @@
% contributed by Paolo Zuliani <[EMAIL PROTECTED]>
\notenames {
- dobb = \musical_pitch { -1 0 -2 }
- dob = \musical_pitch { -1 0 -1 }
- do = \musical_pitch { -1 0 0 }
- dod = \musical_pitch { -1 0 1 }
- dodd = \musical_pitch { -1 0 2 }
- rebb = \musical_pitch { -1 1 -2 }
- reb = \musical_pitch { -1 1 -1 }
- re = \musical_pitch { -1 1 0 }
- red = \musical_pitch { -1 1 1 }
- redd = \musical_pitch { -1 1 2 }
- mibb = \musical_pitch { -1 2 -2 }
- mib = \musical_pitch { -1 2 -1 }
- mi = \musical_pitch { -1 2 0 }
- mid = \musical_pitch { -1 2 1 }
- midd = \musical_pitch { -1 2 2 }
- fabb = \musical_pitch { -1 3 -2 }
- fab = \musical_pitch { -1 3 -1 }
- fa = \musical_pitch { -1 3 0 }
- fad = \musical_pitch { -1 3 1 }
- fadd = \musical_pitch { -1 3 2 }
- solbb = \musical_pitch { -1 4 -2 }
- solb = \musical_pitch { -1 4 -1 }
- sol = \musical_pitch { -1 4 0 }
- sold = \musical_pitch { -1 4 1 }
- soldd = \musical_pitch { -1 4 2 }
- labb = \musical_pitch { -1 5 -2 }
- lab = \musical_pitch { -1 5 -1 }
- la = \musical_pitch { -1 5 0 }
- lad = \musical_pitch { -1 5 1 }
- ladd = \musical_pitch { -1 5 2 }
- sibb = \musical_pitch { -1 6 -2 }
- sib = \musical_pitch { -1 6 -1 }
- si = \musical_pitch { -1 6 0 }
- sid = \musical_pitch { -1 6 1 }
- sidd = \musical_pitch { -1 6 2 }
+ dobb = \musical_pitch { 0 0 -2 }
+ dob = \musical_pitch { 0 0 -1 }
+ do = \musical_pitch { 0 0 0 }
+ dod = \musical_pitch { 0 0 1 }
+ dodd = \musical_pitch { 0 0 2 }
+ rebb = \musical_pitch { 0 1 -2 }
+ reb = \musical_pitch { 0 1 -1 }
+ re = \musical_pitch { 0 1 0 }
+ red = \musical_pitch { 0 1 1 }
+ redd = \musical_pitch { 0 1 2 }
+ mibb = \musical_pitch { 0 2 -2 }
+ mib = \musical_pitch { 0 2 -1 }
+ mi = \musical_pitch { 0 2 0 }
+ mid = \musical_pitch { 0 2 1 }
+ midd = \musical_pitch { 0 2 2 }
+ fabb = \musical_pitch { 0 3 -2 }
+ fab = \musical_pitch { 0 3 -1 }
+ fa = \musical_pitch { 0 3 0 }
+ fad = \musical_pitch { 0 3 1 }
+ fadd = \musical_pitch { 0 3 2 }
+ solbb = \musical_pitch { 0 4 -2 }
+ solb = \musical_pitch { 0 4 -1 }
+ sol = \musical_pitch { 0 4 0 }
+ sold = \musical_pitch { 0 4 1 }
+ soldd = \musical_pitch { 0 4 2 }
+ labb = \musical_pitch { 0 5 -2 }
+ lab = \musical_pitch { 0 5 -1 }
+ la = \musical_pitch { 0 5 0 }
+ lad = \musical_pitch { 0 5 1 }
+ ladd = \musical_pitch { 0 5 2 }
+ sibb = \musical_pitch { 0 6 -2 }
+ sib = \musical_pitch { 0 6 -1 }
+ si = \musical_pitch { 0 6 0 }
+ sid = \musical_pitch { 0 6 1 }
+ sidd = \musical_pitch { 0 6 2 }
}
diff -urN ../lilypond-0.1.77/init/nederlands.ly ./init/nederlands.ly
--- ../lilypond-0.1.77/init/nederlands.ly Thu May 14 01:39:12 1998
+++ ./init/nederlands.ly Wed Jul 8 22:31:46 1998
@@ -11,45 +11,45 @@
%}
\notenames {
- ceses = \musical_pitch { -1 0 -2 }
- ces = \musical_pitch { -1 0 -1 }
- c = \musical_pitch { -1 0 0 }
- cis = \musical_pitch { -1 0 1 }
- cisis = \musical_pitch { -1 0 2 }
- deses = \musical_pitch { -1 1 -2 }
- des = \musical_pitch { -1 1 -1 }
- d = \musical_pitch { -1 1 0 }
- dis = \musical_pitch { -1 1 1 }
- disis = \musical_pitch { -1 1 2 }
- eeses = \musical_pitch { -1 2 -2 }
- eses = \musical_pitch { -1 2 -2 }
- ees = \musical_pitch { -1 2 -1 }
- es = \musical_pitch { -1 2 -1 }
- e = \musical_pitch { -1 2 0 }
- eis = \musical_pitch { -1 2 1 }
- eisis = \musical_pitch { -1 2 2 }
- feses = \musical_pitch { -1 3 -2 }
- fes = \musical_pitch { -1 3 -1 }
- f = \musical_pitch { -1 3 0 }
- fis = \musical_pitch { -1 3 1 }
- fisis = \musical_pitch { -1 3 2 }
- geses = \musical_pitch { -1 4 -2 }
- ges = \musical_pitch { -1 4 -1 }
- g = \musical_pitch { -1 4 0 }
- gis = \musical_pitch { -1 4 1 }
- gisis = \musical_pitch { -1 4 2 }
- aeses = \musical_pitch { -1 5 -2 }
- ases = \musical_pitch { -1 5 -2 }
- aes = \musical_pitch { -1 5 -1 }
- as = \musical_pitch { -1 5 -1 }
- a = \musical_pitch { -1 5 0 }
- ais = \musical_pitch { -1 5 1 }
- aisis = \musical_pitch { -1 5 2 }
- beses = \musical_pitch { -1 6 -2 }
- bes = \musical_pitch { -1 6 -1 }
- b = \musical_pitch { -1 6 0 }
- bis = \musical_pitch { -1 6 1 }
- bisis = \musical_pitch { -1 6 2 }
+ ceses = \musical_pitch { 0 0 -2 }
+ ces = \musical_pitch { 0 0 -1 }
+ c = \musical_pitch { 0 0 0 }
+ cis = \musical_pitch { 0 0 1 }
+ cisis = \musical_pitch { 0 0 2 }
+ deses = \musical_pitch { 0 1 -2 }
+ des = \musical_pitch { 0 1 -1 }
+ d = \musical_pitch { 0 1 0 }
+ dis = \musical_pitch { 0 1 1 }
+ disis = \musical_pitch { 0 1 2 }
+ eeses = \musical_pitch { 0 2 -2 }
+ eses = \musical_pitch { 0 2 -2 }
+ ees = \musical_pitch { 0 2 -1 }
+ es = \musical_pitch { 0 2 -1 }
+ e = \musical_pitch { 0 2 0 }
+ eis = \musical_pitch { 0 2 1 }
+ eisis = \musical_pitch { 0 2 2 }
+ feses = \musical_pitch { 0 3 -2 }
+ fes = \musical_pitch { 0 3 -1 }
+ f = \musical_pitch { 0 3 0 }
+ fis = \musical_pitch { 0 3 1 }
+ fisis = \musical_pitch { 0 3 2 }
+ geses = \musical_pitch { 0 4 -2 }
+ ges = \musical_pitch { 0 4 -1 }
+ g = \musical_pitch { 0 4 0 }
+ gis = \musical_pitch { 0 4 1 }
+ gisis = \musical_pitch { 0 4 2 }
+ aeses = \musical_pitch { 0 5 -2 }
+ ases = \musical_pitch { 0 5 -2 }
+ aes = \musical_pitch { 0 5 -1 }
+ as = \musical_pitch { 0 5 -1 }
+ a = \musical_pitch { 0 5 0 }
+ ais = \musical_pitch { 0 5 1 }
+ aisis = \musical_pitch { 0 5 2 }
+ beses = \musical_pitch { 0 6 -2 }
+ bes = \musical_pitch { 0 6 -1 }
+ b = \musical_pitch { 0 6 0 }
+ bis = \musical_pitch { 0 6 1 }
+ bisis = \musical_pitch { 0 6 2 }
%
@@ -57,43 +57,43 @@
%
- Ceses = \musical_pitch { -2 0 -2 }
- Ces = \musical_pitch { -2 0 -1 }
- C = \musical_pitch { -2 0 0 }
- Cis = \musical_pitch { -2 0 1 }
- Cisis = \musical_pitch { -2 0 2 }
- Deses = \musical_pitch { -2 1 -2 }
- Des = \musical_pitch { -2 1 -1 }
- D = \musical_pitch { -2 1 0 }
- Dis = \musical_pitch { -2 1 1 }
- Disis = \musical_pitch { -2 1 2 }
- Eses = \musical_pitch { -2 2 -2 }
- Es = \musical_pitch { -2 2 -1 }
- E = \musical_pitch { -2 2 0 }
- Eis = \musical_pitch { -2 2 1 }
- Eisis = \musical_pitch { -2 2 2 }
- Feses = \musical_pitch { -2 3 -2 }
- Fes = \musical_pitch { -2 3 -1 }
- F = \musical_pitch { -2 3 0 }
- Fis = \musical_pitch { -2 3 1 }
- Fisis = \musical_pitch { -2 3 2 }
- Geses = \musical_pitch { -2 4 -2 }
- Ges = \musical_pitch { -2 4 -1 }
- G = \musical_pitch { -2 4 0 }
- Gis = \musical_pitch { -2 4 1 }
- Gisis = \musical_pitch { -2 4 2 }
- Aeses = \musical_pitch { -2 5 -2 }
- Ases = \musical_pitch { -2 5 -2 }
- Aes = \musical_pitch { -2 5 -1 }
- As = \musical_pitch { -2 5 -1 }
- A = \musical_pitch { -2 5 0 }
- Ais = \musical_pitch { -2 5 1 }
- Aisis = \musical_pitch { -2 5 2 }
- Beses = \musical_pitch { -2 6 -2 }
- Bes = \musical_pitch { -2 6 -1 }
- B = \musical_pitch { -2 6 0 }
- Bis = \musical_pitch { -2 6 1 }
- Bisis = \musical_pitch { -2 6 2 }
+ Ceses = \musical_pitch { -1 0 -2 }
+ Ces = \musical_pitch { -1 0 -1 }
+ C = \musical_pitch { -1 0 0 }
+ Cis = \musical_pitch { -1 0 1 }
+ Cisis = \musical_pitch { -1 0 2 }
+ Deses = \musical_pitch { -1 1 -2 }
+ Des = \musical_pitch { -1 1 -1 }
+ D = \musical_pitch { -1 1 0 }
+ Dis = \musical_pitch { -1 1 1 }
+ Disis = \musical_pitch { -1 1 2 }
+ Eses = \musical_pitch { -1 2 -2 }
+ Es = \musical_pitch { -1 2 -1 }
+ E = \musical_pitch { -1 2 0 }
+ Eis = \musical_pitch { -1 2 1 }
+ Eisis = \musical_pitch { -1 2 2 }
+ Feses = \musical_pitch { -1 3 -2 }
+ Fes = \musical_pitch { -1 3 -1 }
+ F = \musical_pitch { -1 3 0 }
+ Fis = \musical_pitch { -1 3 1 }
+ Fisis = \musical_pitch { -1 3 2 }
+ Geses = \musical_pitch { -1 4 -2 }
+ Ges = \musical_pitch { -1 4 -1 }
+ G = \musical_pitch { -1 4 0 }
+ Gis = \musical_pitch { -1 4 1 }
+ Gisis = \musical_pitch { -1 4 2 }
+ Aeses = \musical_pitch { -1 5 -2 }
+ Ases = \musical_pitch { -1 5 -2 }
+ Aes = \musical_pitch { -1 5 -1 }
+ As = \musical_pitch { -1 5 -1 }
+ A = \musical_pitch { -1 5 0 }
+ Ais = \musical_pitch { -1 5 1 }
+ Aisis = \musical_pitch { -1 5 2 }
+ Beses = \musical_pitch { -1 6 -2 }
+ Bes = \musical_pitch { -1 6 -1 }
+ B = \musical_pitch { -1 6 0 }
+ Bis = \musical_pitch { -1 6 1 }
+ Bisis = \musical_pitch { -1 6 2 }
}
diff -urN ../lilypond-0.1.77/init/norsk.ly ./init/norsk.ly
--- ../lilypond-0.1.77/init/norsk.ly Thu May 14 01:39:12 1998
+++ ./init/norsk.ly Thu Jul 9 00:07:25 1998
@@ -28,78 +28,78 @@
%}
\notenames {
- ceses = \musical_pitch { -1 0 -2 }
- cessess = \musical_pitch { -1 0 -2 }
- ces = \musical_pitch { -1 0 -1 }
- cess = \musical_pitch { -1 0 -1 }
- c = \musical_pitch { -1 0 0 }
- cis = \musical_pitch { -1 0 1 }
- ciss = \musical_pitch { -1 0 1 }
- cisis = \musical_pitch { -1 0 2 }
- cississ = \musical_pitch { -1 0 2 }
- deses = \musical_pitch { -1 1 -2 }
- dessess = \musical_pitch { -1 1 -2 }
- des = \musical_pitch { -1 1 -1 }
- dess = \musical_pitch { -1 1 -1 }
- d = \musical_pitch { -1 1 0 }
- dis = \musical_pitch { -1 1 1 }
- diss = \musical_pitch { -1 1 1 }
- disis = \musical_pitch { -1 1 2 }
- dississ = \musical_pitch { -1 1 2 }
- eeses = \musical_pitch { -1 2 -2 }
- eessess = \musical_pitch { -1 2 -2 }
- eses = \musical_pitch { -1 2 -2 }
- essess = \musical_pitch { -1 2 -2 }
- ees = \musical_pitch { -1 2 -1 }
- eess = \musical_pitch { -1 2 -1 }
- es = \musical_pitch { -1 2 -1 }
- ess = \musical_pitch { -1 2 -1 }
- e = \musical_pitch { -1 2 0 }
- eis = \musical_pitch { -1 2 1 }
- eiss = \musical_pitch { -1 2 1 }
- eisis = \musical_pitch { -1 2 2 }
- eississ = \musical_pitch { -1 2 2 }
- feses = \musical_pitch { -1 3 -2 }
- fessess = \musical_pitch { -1 3 -2 }
- fes = \musical_pitch { -1 3 -1 }
- fess = \musical_pitch { -1 3 -1 }
- f = \musical_pitch { -1 3 0 }
- fis = \musical_pitch { -1 3 1 }
- fiss = \musical_pitch { -1 3 1 }
- fisis = \musical_pitch { -1 3 2 }
- fississ = \musical_pitch { -1 3 2 }
- geses = \musical_pitch { -1 4 -2 }
- gessess = \musical_pitch { -1 4 -2 }
- ges = \musical_pitch { -1 4 -1 }
- gess = \musical_pitch { -1 4 -1 }
- g = \musical_pitch { -1 4 0 }
- g = \musical_pitch { -1 4 0 }
- gis = \musical_pitch { -1 4 1 }
- giss = \musical_pitch { -1 4 1 }
- gisis = \musical_pitch { -1 4 2 }
- gississ = \musical_pitch { -1 4 2 }
- aeses = \musical_pitch { -1 5 -2 }
- aessess = \musical_pitch { -1 5 -2 }
- ases = \musical_pitch { -1 5 -2 }
- assess = \musical_pitch { -1 5 -2 }
- aes = \musical_pitch { -1 5 -1 }
- aess = \musical_pitch { -1 5 -1 }
- as = \musical_pitch { -1 5 -1 }
- ass = \musical_pitch { -1 5 -1 }
- a = \musical_pitch { -1 5 0 }
- ais = \musical_pitch { -1 5 1 }
- aiss = \musical_pitch { -1 5 1 }
- aisis = \musical_pitch { -1 5 2 }
- aississ = \musical_pitch { -1 5 2 }
- bes = \musical_pitch { -1 6 -2 }
- bess = \musical_pitch { -1 6 -2 }
- b = \musical_pitch { -1 6 -1 }
- b = \musical_pitch { -1 6 -1 }
- h = \musical_pitch { -1 6 0 }
- his = \musical_pitch { -1 6 1 }
- hiss = \musical_pitch { -1 6 1 }
- hisis = \musical_pitch { -1 6 2 }
- hississ = \musical_pitch { -1 6 2 }
+ ceses = \musical_pitch { 0 0 -2 }
+ cessess = \musical_pitch { 0 0 -2 }
+ ces = \musical_pitch { 0 0 -1 }
+ cess = \musical_pitch { 0 0 -1 }
+ c = \musical_pitch { 0 0 0 }
+ cis = \musical_pitch { 0 0 1 }
+ ciss = \musical_pitch { 0 0 1 }
+ cisis = \musical_pitch { 0 0 2 }
+ cississ = \musical_pitch { 0 0 2 }
+ deses = \musical_pitch { 0 1 -2 }
+ dessess = \musical_pitch { 0 1 -2 }
+ des = \musical_pitch { 0 1 -1 }
+ dess = \musical_pitch { 0 1 -1 }
+ d = \musical_pitch { 0 1 0 }
+ dis = \musical_pitch { 0 1 1 }
+ diss = \musical_pitch { 0 1 1 }
+ disis = \musical_pitch { 0 1 2 }
+ dississ = \musical_pitch { 0 1 2 }
+ eeses = \musical_pitch { 0 2 -2 }
+ eessess = \musical_pitch { 0 2 -2 }
+ eses = \musical_pitch { 0 2 -2 }
+ essess = \musical_pitch { 0 2 -2 }
+ ees = \musical_pitch { 0 2 -1 }
+ eess = \musical_pitch { 0 2 -1 }
+ es = \musical_pitch { 0 2 -1 }
+ ess = \musical_pitch { 0 2 -1 }
+ e = \musical_pitch { 0 2 0 }
+ eis = \musical_pitch { 0 2 1 }
+ eiss = \musical_pitch { 0 2 1 }
+ eisis = \musical_pitch { 0 2 2 }
+ eississ = \musical_pitch { 0 2 2 }
+ feses = \musical_pitch { 0 3 -2 }
+ fessess = \musical_pitch { 0 3 -2 }
+ fes = \musical_pitch { 0 3 -1 }
+ fess = \musical_pitch { 0 3 -1 }
+ f = \musical_pitch { 0 3 0 }
+ fis = \musical_pitch { 0 3 1 }
+ fiss = \musical_pitch { 0 3 1 }
+ fisis = \musical_pitch { 0 3 2 }
+ fississ = \musical_pitch { 0 3 2 }
+ geses = \musical_pitch { 0 4 -2 }
+ gessess = \musical_pitch { 0 4 -2 }
+ ges = \musical_pitch { 0 4 -1 }
+ gess = \musical_pitch { 0 4 -1 }
+ g = \musical_pitch { 0 4 0 }
+ g = \musical_pitch { 0 4 0 }
+ gis = \musical_pitch { 0 4 1 }
+ giss = \musical_pitch { 0 4 1 }
+ gisis = \musical_pitch { 0 4 2 }
+ gississ = \musical_pitch { 0 4 2 }
+ aeses = \musical_pitch { 0 5 -2 }
+ aessess = \musical_pitch { 0 5 -2 }
+ ases = \musical_pitch { 0 5 -2 }
+ assess = \musical_pitch { 0 5 -2 }
+ aes = \musical_pitch { 0 5 -1 }
+ aess = \musical_pitch { 0 5 -1 }
+ as = \musical_pitch { 0 5 -1 }
+ ass = \musical_pitch { 0 5 -1 }
+ a = \musical_pitch { 0 5 0 }
+ ais = \musical_pitch { 0 5 1 }
+ aiss = \musical_pitch { 0 5 1 }
+ aisis = \musical_pitch { 0 5 2 }
+ aississ = \musical_pitch { 0 5 2 }
+ bes = \musical_pitch { 0 6 -2 }
+ bess = \musical_pitch { 0 6 -2 }
+ b = \musical_pitch { 0 6 -1 }
+ b = \musical_pitch { 0 6 -1 }
+ h = \musical_pitch { 0 6 0 }
+ his = \musical_pitch { 0 6 1 }
+ hiss = \musical_pitch { 0 6 1 }
+ hisis = \musical_pitch { 0 6 2 }
+ hississ = \musical_pitch { 0 6 2 }
%
@@ -107,75 +107,75 @@
%
- Ceses = \musical_pitch { -2 0 -2 }
- Cessess = \musical_pitch { -2 0 -2 }
- Ces = \musical_pitch { -2 0 -1 }
- Cess = \musical_pitch { -2 0 -1 }
- C = \musical_pitch { -2 0 0 }
- Cis = \musical_pitch { -2 0 1 }
- Ciss = \musical_pitch { -2 0 1 }
- Cisis = \musical_pitch { -2 0 2 }
- Cississ = \musical_pitch { -2 0 2 }
- Deses = \musical_pitch { -2 1 -2 }
- Dessess = \musical_pitch { -2 1 -2 }
- Des = \musical_pitch { -2 1 -1 }
- Dess = \musical_pitch { -2 1 -1 }
- D = \musical_pitch { -2 1 0 }
- D = \musical_pitch { -2 1 0 }
- Dis = \musical_pitch { -2 1 1 }
- Diss = \musical_pitch { -2 1 1 }
- Disis = \musical_pitch { -2 1 2 }
- Dississ = \musical_pitch { -2 1 2 }
- Eses = \musical_pitch { -2 2 -2 }
- Essess = \musical_pitch { -2 2 -2 }
- Es = \musical_pitch { -2 2 -1 }
- Ess = \musical_pitch { -2 2 -1 }
- E = \musical_pitch { -2 2 0 }
- E = \musical_pitch { -2 2 0 }
- Eis = \musical_pitch { -2 2 1 }
- Eiss = \musical_pitch { -2 2 1 }
- Eisis = \musical_pitch { -2 2 2 }
- Eississ = \musical_pitch { -2 2 2 }
- Feses = \musical_pitch { -2 3 -2 }
- Fessess = \musical_pitch { -2 3 -2 }
- Fes = \musical_pitch { -2 3 -1 }
- Fess = \musical_pitch { -2 3 -1 }
- F = \musical_pitch { -2 3 0 }
- Fis = \musical_pitch { -2 3 1 }
- Fiss = \musical_pitch { -2 3 1 }
- Fisis = \musical_pitch { -2 3 2 }
- Fississ = \musical_pitch { -2 3 2 }
- Geses = \musical_pitch { -2 4 -2 }
- Gessess = \musical_pitch { -2 4 -2 }
- Ges = \musical_pitch { -2 4 -1 }
- Gess = \musical_pitch { -2 4 -1 }
- G = \musical_pitch { -2 4 0 }
- Gis = \musical_pitch { -2 4 1 }
- Giss = \musical_pitch { -2 4 1 }
- Gisis = \musical_pitch { -2 4 2 }
- Gississ = \musical_pitch { -2 4 2 }
- Aeses = \musical_pitch { -2 5 -2 }
- Aessess = \musical_pitch { -2 5 -2 }
- Ases = \musical_pitch { -2 5 -2 }
- Assess = \musical_pitch { -2 5 -2 }
- Aes = \musical_pitch { -2 5 -1 }
- Aess = \musical_pitch { -2 5 -1 }
- As = \musical_pitch { -2 5 -1 }
- Ass = \musical_pitch { -2 5 -1 }
- A = \musical_pitch { -2 5 0 }
- A = \musical_pitch { -2 5 0 }
- Ais = \musical_pitch { -2 5 1 }
- Aiss = \musical_pitch { -2 5 1 }
- Aisis = \musical_pitch { -2 5 2 }
- Aississ = \musical_pitch { -2 5 2 }
- Bes = \musical_pitch { -2 6 -2 }
- Bess = \musical_pitch { -2 6 -2 }
- B = \musical_pitch { -2 6 -1 }
- H = \musical_pitch { -2 6 0 }
- His = \musical_pitch { -2 6 1 }
- Hiss = \musical_pitch { -2 6 1 }
- Hisis = \musical_pitch { -2 6 2 }
- Hississ = \musical_pitch { -2 6 2 }
+ Ceses = \musical_pitch { -1 0 -2 }
+ Cessess = \musical_pitch { -1 0 -2 }
+ Ces = \musical_pitch { -1 0 -1 }
+ Cess = \musical_pitch { -1 0 -1 }
+ C = \musical_pitch { -1 0 0 }
+ Cis = \musical_pitch { -1 0 1 }
+ Ciss = \musical_pitch { -1 0 1 }
+ Cisis = \musical_pitch { -1 0 2 }
+ Cississ = \musical_pitch { -1 0 2 }
+ Deses = \musical_pitch { -1 1 -2 }
+ Dessess = \musical_pitch { -1 1 -2 }
+ Des = \musical_pitch { -1 1 -1 }
+ Dess = \musical_pitch { -1 1 -1 }
+ D = \musical_pitch { -1 1 0 }
+ D = \musical_pitch { -1 1 0 }
+ Dis = \musical_pitch { -1 1 1 }
+ Diss = \musical_pitch { -1 1 1 }
+ Disis = \musical_pitch { -1 1 2 }
+ Dississ = \musical_pitch { -1 1 2 }
+ Eses = \musical_pitch { -1 2 -2 }
+ Essess = \musical_pitch { -1 2 -2 }
+ Es = \musical_pitch { -1 2 -1 }
+ Ess = \musical_pitch { -1 2 -1 }
+ E = \musical_pitch { -1 2 0 }
+ E = \musical_pitch { -1 2 0 }
+ Eis = \musical_pitch { -1 2 1 }
+ Eiss = \musical_pitch { -1 2 1 }
+ Eisis = \musical_pitch { -1 2 2 }
+ Eississ = \musical_pitch { -1 2 2 }
+ Feses = \musical_pitch { -1 3 -2 }
+ Fessess = \musical_pitch { -1 3 -2 }
+ Fes = \musical_pitch { -1 3 -1 }
+ Fess = \musical_pitch { -1 3 -1 }
+ F = \musical_pitch { -1 3 0 }
+ Fis = \musical_pitch { -1 3 1 }
+ Fiss = \musical_pitch { -1 3 1 }
+ Fisis = \musical_pitch { -1 3 2 }
+ Fississ = \musical_pitch { -1 3 2 }
+ Geses = \musical_pitch { -1 4 -2 }
+ Gessess = \musical_pitch { -1 4 -2 }
+ Ges = \musical_pitch { -1 4 -1 }
+ Gess = \musical_pitch { -1 4 -1 }
+ G = \musical_pitch { -1 4 0 }
+ Gis = \musical_pitch { -1 4 1 }
+ Giss = \musical_pitch { -1 4 1 }
+ Gisis = \musical_pitch { -1 4 2 }
+ Gississ = \musical_pitch { -1 4 2 }
+ Aeses = \musical_pitch { -1 5 -2 }
+ Aessess = \musical_pitch { -1 5 -2 }
+ Ases = \musical_pitch { -1 5 -2 }
+ Assess = \musical_pitch { -1 5 -2 }
+ Aes = \musical_pitch { -1 5 -1 }
+ Aess = \musical_pitch { -1 5 -1 }
+ As = \musical_pitch { -1 5 -1 }
+ Ass = \musical_pitch { -1 5 -1 }
+ A = \musical_pitch { -1 5 0 }
+ A = \musical_pitch { -1 5 0 }
+ Ais = \musical_pitch { -1 5 1 }
+ Aiss = \musical_pitch { -1 5 1 }
+ Aisis = \musical_pitch { -1 5 2 }
+ Aississ = \musical_pitch { -1 5 2 }
+ Bes = \musical_pitch { -1 6 -2 }
+ Bess = \musical_pitch { -1 6 -2 }
+ B = \musical_pitch { -1 6 -1 }
+ H = \musical_pitch { -1 6 0 }
+ His = \musical_pitch { -1 6 1 }
+ Hiss = \musical_pitch { -1 6 1 }
+ Hisis = \musical_pitch { -1 6 2 }
+ Hississ = \musical_pitch { -1 6 2 }
}
diff -urN ../lilypond-0.1.77/init/svenska.ly ./init/svenska.ly
--- ../lilypond-0.1.77/init/svenska.ly Thu May 14 01:39:12 1998
+++ ./init/svenska.ly Thu Jul 9 00:06:40 1998
@@ -10,41 +10,41 @@
% have a rhythmic part too. This is the reason that we don't write 'note { .. }'
%
\notenames {
- cessess = \musical_pitch { -1 0 -2 }
- cess = \musical_pitch { -1 0 -1 }
- c = \musical_pitch { -1 0 0 }
- ciss = \musical_pitch { -1 0 1 }
- cississ = \musical_pitch { -1 0 2 }
- dessess = \musical_pitch { -1 1 -2 }
- dess = \musical_pitch { -1 1 -1 }
- d = \musical_pitch { -1 1 0 }
- diss = \musical_pitch { -1 1 1 }
- dississ = \musical_pitch { -1 1 2 }
- essess = \musical_pitch { -1 2 -2 }
- ess = \musical_pitch { -1 2 -1 }
- e = \musical_pitch { -1 2 0 }
- eiss = \musical_pitch { -1 2 1 }
- eississ = \musical_pitch { -1 2 2 }
- fessess = \musical_pitch { -1 3 -2 }
- fess = \musical_pitch { -1 3 -1 }
- f = \musical_pitch { -1 3 0 }
- fiss = \musical_pitch { -1 3 1 }
- fississ = \musical_pitch { -1 3 2 }
- gessess = \musical_pitch { -1 4 -2 }
- gess = \musical_pitch { -1 4 -1 }
- g = \musical_pitch { -1 4 0 }
- giss = \musical_pitch { -1 4 1 }
- gississ = \musical_pitch { -1 4 2 }
- assess = \musical_pitch { -1 5 -2 }
- ass = \musical_pitch { -1 5 -1 }
- a = \musical_pitch { -1 5 0 }
- aiss = \musical_pitch { -1 5 1 }
- aississ = \musical_pitch { -1 5 2 }
- hessess = \musical_pitch { -1 6 -2 }
- b = \musical_pitch { -1 6 -1 }
- h = \musical_pitch { -1 6 0 }
- hiss = \musical_pitch { -1 6 1 }
- hississ = \musical_pitch { -1 6 2 }
+ cessess = \musical_pitch { 0 0 -2 }
+ cess = \musical_pitch { 0 0 -1 }
+ c = \musical_pitch { 0 0 0 }
+ ciss = \musical_pitch { 0 0 1 }
+ cississ = \musical_pitch { 0 0 2 }
+ dessess = \musical_pitch { 0 1 -2 }
+ dess = \musical_pitch { 0 1 -1 }
+ d = \musical_pitch { 0 1 0 }
+ diss = \musical_pitch { 0 1 1 }
+ dississ = \musical_pitch { 0 1 2 }
+ essess = \musical_pitch { 0 2 -2 }
+ ess = \musical_pitch { 0 2 -1 }
+ e = \musical_pitch { 0 2 0 }
+ eiss = \musical_pitch { 0 2 1 }
+ eississ = \musical_pitch { 0 2 2 }
+ fessess = \musical_pitch { 0 3 -2 }
+ fess = \musical_pitch { 0 3 -1 }
+ f = \musical_pitch { 0 3 0 }
+ fiss = \musical_pitch { 0 3 1 }
+ fississ = \musical_pitch { 0 3 2 }
+ gessess = \musical_pitch { 0 4 -2 }
+ gess = \musical_pitch { 0 4 -1 }
+ g = \musical_pitch { 0 4 0 }
+ giss = \musical_pitch { 0 4 1 }
+ gississ = \musical_pitch { 0 4 2 }
+ assess = \musical_pitch { 0 5 -2 }
+ ass = \musical_pitch { 0 5 -1 }
+ a = \musical_pitch { 0 5 0 }
+ aiss = \musical_pitch { 0 5 1 }
+ aississ = \musical_pitch { 0 5 2 }
+ hessess = \musical_pitch { 0 6 -2 }
+ b = \musical_pitch { 0 6 -1 }
+ h = \musical_pitch { 0 6 0 }
+ hiss = \musical_pitch { 0 6 1 }
+ hississ = \musical_pitch { 0 6 2 }
%
@@ -52,41 +52,41 @@
%
- Cessess = \musical_pitch { -2 0 -2 }
- Cess = \musical_pitch { -2 0 -1 }
- C = \musical_pitch { -2 0 0 }
- Ciss = \musical_pitch { -2 0 1 }
- Cississ = \musical_pitch { -2 0 2 }
- Dessess = \musical_pitch { -2 1 -2 }
- Dess = \musical_pitch { -2 1 -1 }
- D = \musical_pitch { -2 1 0 }
- Diss = \musical_pitch { -2 1 1 }
- Dississ = \musical_pitch { -2 1 2 }
- Essess = \musical_pitch { -2 2 -2 }
- Ess = \musical_pitch { -2 2 -1 }
- E = \musical_pitch { -2 2 0 }
- Eiss = \musical_pitch { -2 2 1 }
- Eississ = \musical_pitch { -2 2 2 }
- Fessess = \musical_pitch { -2 3 -2 }
- Fess = \musical_pitch { -2 3 -1 }
- F = \musical_pitch { -2 3 0 }
- Fiss = \musical_pitch { -2 3 1 }
- Fississ = \musical_pitch { -2 3 2 }
- Gessess = \musical_pitch { -2 4 -2 }
- Gess = \musical_pitch { -2 4 -1 }
- G = \musical_pitch { -2 4 0 }
- Giss = \musical_pitch { -2 4 1 }
- Gississ = \musical_pitch { -2 4 2 }
- Assess = \musical_pitch { -2 5 -2 }
- Ass = \musical_pitch { -2 5 -1 }
- A = \musical_pitch { -2 5 0 }
- Aiss = \musical_pitch { -2 5 1 }
- Aississ = \musical_pitch { -2 5 2 }
- Hessess = \musical_pitch { -2 6 -2 }
- B = \musical_pitch { -2 6 -1 }
- H = \musical_pitch { -2 6 0 }
- Hiss = \musical_pitch { -2 6 1 }
- Hississ = \musical_pitch { -2 6 2 }
+ Cessess = \musical_pitch { -1 0 -2 }
+ Cess = \musical_pitch { -1 0 -1 }
+ C = \musical_pitch { -1 0 0 }
+ Ciss = \musical_pitch { -1 0 1 }
+ Cississ = \musical_pitch { -1 0 2 }
+ Dessess = \musical_pitch { -1 1 -2 }
+ Dess = \musical_pitch { -1 1 -1 }
+ D = \musical_pitch { -1 1 0 }
+ Diss = \musical_pitch { -1 1 1 }
+ Dississ = \musical_pitch { -1 1 2 }
+ Essess = \musical_pitch { -1 2 -2 }
+ Ess = \musical_pitch { -1 2 -1 }
+ E = \musical_pitch { -1 2 0 }
+ Eiss = \musical_pitch { -1 2 1 }
+ Eississ = \musical_pitch { -1 2 2 }
+ Fessess = \musical_pitch { -1 3 -2 }
+ Fess = \musical_pitch { -1 3 -1 }
+ F = \musical_pitch { -1 3 0 }
+ Fiss = \musical_pitch { -1 3 1 }
+ Fississ = \musical_pitch { -1 3 2 }
+ Gessess = \musical_pitch { -1 4 -2 }
+ Gess = \musical_pitch { -1 4 -1 }
+ G = \musical_pitch { -1 4 0 }
+ Giss = \musical_pitch { -1 4 1 }
+ Gississ = \musical_pitch { -1 4 2 }
+ Assess = \musical_pitch { -1 5 -2 }
+ Ass = \musical_pitch { -1 5 -1 }
+ A = \musical_pitch { -1 5 0 }
+ Aiss = \musical_pitch { -1 5 1 }
+ Aississ = \musical_pitch { -1 5 2 }
+ Hessess = \musical_pitch { -1 6 -2 }
+ B = \musical_pitch { -1 6 -1 }
+ H = \musical_pitch { -1 6 0 }
+ Hiss = \musical_pitch { -1 6 1 }
+ Hississ = \musical_pitch { -1 6 2 }
}
diff -urN ../lilypond-0.1.77/lily/clef-grav.cc ./lily/clef-grav.cc
--- ../lilypond-0.1.77/lily/clef-grav.cc Mon Jul 6 15:58:12 1998
+++ ./lily/clef-grav.cc Wed Jul 8 22:47:01 1998
@@ -119,11 +119,11 @@
clef_position_i_ = 2 * (s[1] - '0') - 6;
}
if (clef_type_str_ == "violin")
- c0_position_i_ = clef_position_i_ - 4;
+ c0_position_i_ = clef_position_i_ - 11;
else if (clef_type_str_ == "alto")
- c0_position_i_ = clef_position_i_;
+ c0_position_i_ = clef_position_i_ - 7;
else if (clef_type_str_ == "bass")
- c0_position_i_ = clef_position_i_ + 4;
+ c0_position_i_ = clef_position_i_ - 3;
c0_position_i_ -= (int) octave_dir_ * 7;
diff -urN ../lilypond-0.1.77/lily/key-item.cc ./lily/key-item.cc
--- ../lilypond-0.1.77/lily/key-item.cc Tue Jul 7 12:47:56 1998
+++ ./lily/key-item.cc Wed Jul 8 23:28:18 1998
@@ -46,10 +46,10 @@
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;
+ // Find the c in the range -4 through 2
+ int from_bottom_pos = c0 + 4;
+ from_bottom_pos = from_bottom_pos%7;
+ from_bottom_pos = (from_bottom_pos + 7)%7; // Precaution to get positive.
c_position = from_bottom_pos - 4;
}
diff -urN ../lilypond-0.1.77/lily/musical-pitch.cc ./lily/musical-pitch.cc
--- ../lilypond-0.1.77/lily/musical-pitch.cc Mon Jun 8 11:03:52 1998
+++ ./lily/musical-pitch.cc Wed Jul 8 22:37:03 1998
@@ -114,7 +114,7 @@
Musical_pitch
Musical_pitch::to_relative_octave (Musical_pitch p)
{
- int oct_mod = octave_i_ + 1; // account for c' = octave 1 iso. 0 4
+ int oct_mod = octave_i_ ;
Musical_pitch up_pitch (p);
Musical_pitch down_pitch (p);
diff -urN ../lilypond-0.1.77/make/STATE-VECTOR ./make/STATE-VECTOR
--- ../lilypond-0.1.77/make/STATE-VECTOR Tue Jul 7 15:52:10 1998
+++ ./make/STATE-VECTOR Thu Jul 9 00:03:53 1998
@@ -1,3 +1,4 @@
0.1.76
0.1.76.jcn1
0.1.77
+0.1.77.mb1
diff -urN ../lilypond-0.1.77/mutopia/gallina.ly ./mutopia/gallina.ly
--- ../lilypond-0.1.77/mutopia/gallina.ly Mon Jul 6 16:08:13 1998
+++ ./mutopia/gallina.ly Tue Jul 7 22:10:49 1998
@@ -183,7 +183,7 @@
}
-bc=\melodic\transpose c''{
+bc=\melodic\transpose c{
\clef "bass";
\meter 4/4;
