release: 1.3.39

[lilypond.git] / lily / musical-pitch.cc

diff --git a/lily/musical-pitch.cc b/lily/musical-pitch.cc
index dfc0614e4a93d3a4c6d8049b3e2856298f142ef6..0ebd91dfe4139d94bcc2c02dbb60c610ed0878fb 100644 (file)
--- a/lily/musical-pitch.cc
+++ b/lily/musical-pitch.cc
@@ -13,18 +13,18 @@
 SCM
 Musical_pitch::to_scm ()const
 {
-  return gh_list (gh_int2scm (notename_i_),
+  return gh_list (gh_int2scm (octave_i_),
+                 gh_int2scm (notename_i_),
                  gh_int2scm (accidental_i_),
-                 gh_int2scm (octave_i_),
                  SCM_UNDEFINED);
 }
 
 
 Musical_pitch::Musical_pitch (SCM s)
 {
-  notename_i_ = gh_scm2int (gh_car (s));
-  accidental_i_ = gh_scm2int (gh_cadr (s));
-  octave_i_ = gh_scm2int (gh_caddr (s));
+  octave_i_ = gh_scm2int (gh_car (s));
+  notename_i_ = gh_scm2int (gh_cadr (s));
+  accidental_i_ = gh_scm2int (gh_caddr (s));
 }
 
 Musical_pitch::Musical_pitch (int n, int a, int o)