release: 1.3.45

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

diff --git a/lily/musical-pitch.cc b/lily/musical-pitch.cc
index 409c71d92b496b6fb63563cdb317d87498f86d3a..0ebd91dfe4139d94bcc2c02dbb60c610ed0878fb 100644 (file)
--- a/lily/musical-pitch.cc
+++ b/lily/musical-pitch.cc
@@ -3,13 +3,30 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "musical-pitch.hh"
 #include "debug.hh"
 #include "main.hh"
 
+SCM
+Musical_pitch::to_scm ()const
+{
+  return gh_list (gh_int2scm (octave_i_),
+                 gh_int2scm (notename_i_),
+                 gh_int2scm (accidental_i_),
+                 SCM_UNDEFINED);
+}
+
+
+Musical_pitch::Musical_pitch (SCM 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)
 {
   notename_i_ = n;