string() -> to_string()

diff --git a/ChangeLog b/ChangeLog
index fdacb804fedd3503172e6f51f8bc1e1ed9143ff0..023168325ae704420cbbaa86e297e5aab0054cb3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-02-15  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * lily/include/*.hh: string() -> to_string()
+
        * scm/chords-ignatzek.scm: new file.
 
        * ly/chord-modifiers-init.ly (ignatzekExceptionMusic): define

diff --git a/flower/file-path.cc b/flower/file-path.cc
index cf9ad32f965a51a47d08d9c89e47ff007ed8e2ac..14babc23ec95945e8cb8b9f86704e0e1768ab21c 100644 (file)
--- a/flower/file-path.cc
+++ b/flower/file-path.cc
@@ -72,16 +72,16 @@ dos_to_posix_list (String path)
 
 /* Join components to full path. */
 String
-Path::string () const
+Path::to_string () const
 {
   String s;
   if (!root.empty_b ())
-    s = root + to_string (ROOTSEP);
+    s = root + ::to_string (ROOTSEP);
   if (!dir.empty_b ())
-    s += dir + to_string (DIRSEP);
+    s += dir + ::to_string (DIRSEP);
   s += base;
   if (!ext.empty_b ())
-    s += to_string (EXTSEP) + ext;
+    s += ::to_string (EXTSEP) + ext;
   return s;
 }
 
@@ -164,10 +164,10 @@ File_path::find (String nm) const
   for (int i=0; i < size (); i++)
     {
       String path  = elem (i);
-      String sep = to_string (DIRSEP);
+      String sep = ::to_string (DIRSEP);
       String right (path.right_string (1));
       if (path.length () && right != sep)
-       path += to_string (DIRSEP);
+       path += ::to_string (DIRSEP);
 
       path += nm;
 
@@ -232,7 +232,7 @@ File_path::add (String s)
 }
 
 String
-File_path::string () const
+File_path::to_string () const
 {
   String s;
   for (int i=0; i< size (); i++)

diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index 59cb97161a533311f44dc5152880da3a7f7f423b..e3da98695f26d3d744e260df916591af2996e629 100644 (file)
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -92,7 +92,7 @@ Getopt_long::parselong ()
 }
 
 String
-Long_option_init::string () const
+Long_option_init::to_string () const
 {
   String str;
   if (shortname_char_)
@@ -109,7 +109,7 @@ Long_option_init::str_for_help () const
 {
   String s;
   if (shortname_char_)
-    s = "-" + to_string (shortname_char_);
+    s = "-" + ::to_string (shortname_char_);
   else
     s = "  ";
 
@@ -144,11 +144,11 @@ Getopt_long::report (Errorcod c)
     {
     case E_ARGEXPECT:
       str += _f ("option `%s' requires an argument",
-       found_option_->string ());
+       found_option_->to_string ());
       break;
     case  E_NOARGEXPECT:
       str += _f ("option `%s' doesn't allow an argument",
-       found_option_->string ());
+       found_option_->to_string ());
       break;
     case E_UNKNOWNOPTION:
       str += _f ("unrecognized option: `%s'",
@@ -159,7 +159,7 @@ Getopt_long::report (Errorcod c)
       break;
     case E_ILLEGALARG:
       str += _f ("invalid argument `%s' to option `%s'",
-        optional_argument_str0_, found_option_->string ());
+        optional_argument_str0_, found_option_->to_string ());
       break;
     default:
       assert (false);

diff --git a/flower/include/file-path.hh b/flower/include/file-path.hh
index 2055d08f011c35415ce7f757fbfcda7d31587cd8..b5c93d6fffd78ce319b40e31384a8a4510621f39 100644 (file)
--- a/flower/include/file-path.hh
+++ b/flower/include/file-path.hh
@@ -30,7 +30,7 @@ public:
   String base;
   String ext;
 
-  String string () const;
+  String to_string () const;
 };
 
 class File_path : private Array<String>
@@ -40,7 +40,7 @@ public:
 
   Array<String>::push;
   void prepend (String str) { Array<String>::insert (str, 0); }
-  String string ()const;
+  String to_string ()const;
   bool try_add (String str);
   void add (String);
   void parse_path (String);

diff --git a/flower/include/getopt-long.hh b/flower/include/getopt-long.hh
index 35720d8a68c43b76f59ee15bb63f8100a5058bbc..a909326d4cc455c06d1c8cf1661bcb1e4a4dafb2 100644 (file)
--- a/flower/include/getopt-long.hh
+++ b/flower/include/getopt-long.hh
@@ -14,7 +14,7 @@ struct Long_option_init {
 
   char const * help_str0_;
   
-  String string () const;
+  String to_string () const;
   String str_for_help () const;
   //   NO constructor!
 

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index d5158f415e53be70b9be8947c22b1c0b3722d428..cbee57fbc9e2131fd1378580c7c08a78aa4a45b4 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -86,7 +86,7 @@ struct Interval_t : public Drul_array<T> {
   Real linear_combination (Real x) const {
     return ((1.0 - x) * Real (elem (LEFT))  + (x + 1.0) * Real (elem (RIGHT))) * 0.5;
   }
-  String string () const;    
+  String to_string () const;    
 
   bool elem_b (T r);
   void negate () {

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index ad531418d385db3d90159284dc4ebfb84dade2bb..9a94f154b85b86c1f3488290ac160344a3f29716 100644 (file)
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -127,7 +127,7 @@ intersect (Interval_t<T> x, Interval_t<T> const &y)
 
 template<class T>
 String
-Interval_t<T>::string () const
+Interval_t<T>::to_string () const
 {
   if (empty_b ())
     return "[empty]";

diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index cc22f84da6b43431123c6a93b0c9388bb29fd16b..a69acb02ceda2a782efd8747da7e29d865e410ce 100644 (file)
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -74,7 +74,7 @@ public:
       0.0;
   }
 
-  String string () const;
+  String to_string () const;
 
   void mirror (Axis);
   Real  arg () const;

diff --git a/flower/include/rational.hh b/flower/include/rational.hh
index 427eab9bf60debe3d9000db98bdb1dfbc0bc22f1..8ac788f886c4af518fabd4f558511a1d647a138d 100644 (file)
--- a/flower/include/rational.hh
+++ b/flower/include/rational.hh
@@ -70,7 +70,7 @@ public:
   Rational &operator %= (Rational);
   static int compare (Rational const&, Rational const&);
   int sign () const;
-  String string () const;
+  String to_string () const;
 };
 
 IMPLEMENT_ARITHMETIC_OPERATOR (Rational, / );

diff --git a/flower/interval.cc b/flower/interval.cc
index e3873147fc3b2451dc61fcc7056682e50322a097..97dd9c323d0c921f7ebc019bb32226502c834b2b 100644 (file)
--- a/flower/interval.cc
+++ b/flower/interval.cc
@@ -20,7 +20,7 @@ Interval_t<Real>::infinity ()
 String
 Interval_t<Real>::T_to_string (Real r)
 {
-  return to_string (r);
+  return ::to_string (r);
 }
 
 
@@ -33,7 +33,7 @@ Interval_t<int>::infinity ()
 String
 Interval_t<int>::T_to_string (int i)
 {
-  return to_string (i);
+  return ::to_string (i);
 }
 
 template INTERVAL__INSTANTIATE (int);

diff --git a/flower/offset.cc b/flower/offset.cc
index 92d2937b0a834642dccf34d3f935a90fd2214773..e9a6d7394a6993d053739f07546caf23b8911d3a 100644 (file)
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -15,11 +15,11 @@
 
 #ifndef STANDALONE
 String
-Offset::string () const
+Offset::to_string () const
 {
   String s;
-  s = String (" (") + to_string (coordinate_a_[X_AXIS]) + ", " 
-    + to_string (coordinate_a_[Y_AXIS]) + ")";
+  s = String (" (") + ::to_string (coordinate_a_[X_AXIS]) + ", " 
+    + ::to_string (coordinate_a_[Y_AXIS]) + ")";
   return s;
 }
 #endif

diff --git a/flower/rational.cc b/flower/rational.cc
index 4719582cb75534661019b841e9a6b3c3ec335310..0b0e3d524fadbf003cf9538ed49b5acce9a07dc5 100644 (file)
--- a/flower/rational.cc
+++ b/flower/rational.cc
@@ -277,16 +277,17 @@ Rational::operator -= (Rational r)
 }
 
 String
-Rational::string () const
+Rational::to_string () const
 {
   if (infty_b ())
     {
       String s (sign_ > 0 ? "" : "-" );
       return String (s + "infinity");
     }
-  String s = to_string (num ());
+
+  String s = ::to_string (num ());
   if (den () != 1 && num ())
-    s += "/" + to_string (den ());
+    s += "/" + ::to_string (den ());
   return s;
 }
 

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index 6981551d30677077c409656e2a5a3c22149a99d2..74b6c23277a6aed9ff0a69c449974ded9678b237 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -268,7 +268,7 @@ String_convert::char_string (char c, int n)
 String
 String_convert::rational_string (Rational r)
 {
-       return r.string ();
+ return r.to_string ();
 }
 
 String

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 28b687c9ea216a1af96e1e54edd26718b8951812..f0c377c03422e39f0fe5c86d15803f282ff29df2 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -182,7 +182,7 @@ All_font_metrics::find_font (String name)
     return f;
 
   error (_f ("can't find default font: `%s'", def_name.to_str0 ()));
-  error (_f ("(search path: `%s')", search_path_.string ()));
+  error (_f ("(search path: `%s')", search_path_.to_string ()));
   error (_ ("Giving up"));
 
   return 0;

diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc
index f7513b9f6de3c1eeb924f155ffcf0e5fc5fdeca3..c95c064a45bb7b6387b7cd265aec90f8765e4229 100644 (file)
--- a/lily/bar-check-iterator.cc
+++ b/lily/bar-check-iterator.cc
@@ -49,7 +49,7 @@ Bar_check_iterator::process (Moment m)
       if (where->main_part_)
        {
          get_music ()->origin ()->warning (_f ("barcheck failed at: %s", 
-                                             where->string ()));
+                                             where->to_string ()));
          if (to_boolean (sync))
            {
              tr = tr->where_defined (ly_symbol2scm("measurePosition"));

diff --git a/lily/chord.cc b/lily/chord.cc
index 9248bad895fce049ddab0d9919ab4ffc792692e4..169b15571321032ddd2edfc0439248ad74cecdca 100644 (file)
--- a/lily/chord.cc
+++ b/lily/chord.cc
@@ -314,7 +314,7 @@ Chord::tonic_add_sub_to_pitches (SCM tonic, SCM add, SCM sub)
   
   for (SCM i = sub; gh_pair_p (i); i = ly_cdr (i))
     warning (_f ("invalid subtraction: not part of chord: %s",
-                unsmob_pitch (ly_car (i))->string ()));
+                unsmob_pitch (ly_car (i))->to_string ()));
 
   return pitches;
 }
@@ -343,7 +343,7 @@ Chord::get_chord (SCM tonic, SCM add, SCM sub, SCM inversion, SCM bass, SCM dur)
        }
       else
        warning (_f ("invalid inversion pitch: not part of chord: %s",
-                    unsmob_pitch (inversion)->string ()));
+                    unsmob_pitch (inversion)->to_string ()));
     }
 
   /* Bass is easy, just add if requested */

diff --git a/lily/duration.cc b/lily/duration.cc
index 87c6dcfd0c64782621582118c78db542aaff7ed6..3847353d2678cf09ad68b8a9b4acea301ec02a7a 100644 (file)
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -69,19 +69,19 @@ Duration::get_length () const
 
 
 String
-Duration::string () const
+Duration::to_string () const
 {
   String s;
 
   if (durlog_ < 0  )
-    s = "log = "  + to_string (durlog_);
+    s = "log = "  + ::to_string (durlog_);
   else
-    s = to_string (1 << durlog_);
+    s = ::to_string (1 << durlog_);
   
-  s += to_string ('.', dots_);
+  s += ::to_string ('.', dots_);
   if (factor_ != Moment (Rational (1,1)))
     {
-      s += "*" + factor_.string ();
+      s += "*" + factor_.to_string ();
     }
   return s;
 }
@@ -102,7 +102,7 @@ Duration::print_smob (SCM s, SCM port, scm_print_state *)
   Duration  *r = (Duration *) ly_cdr (s);
      
   scm_puts ("#<Duration ", port);
-  scm_display (scm_makfrom0str (r->string ().to_str0 ()), port);
+  scm_display (scm_makfrom0str (r->to_string ().to_str0 ()), port);
   scm_puts (" >", port);
   
   return 1;

diff --git a/lily/event.cc b/lily/event.cc
index 199c85eb454d5f442eba8969817fde63f1586e1e..944aa5417f9e756ea3ce9c8bdc0fe1167ddc8deb 100644 (file)
--- a/lily/event.cc
+++ b/lily/event.cc
@@ -42,7 +42,7 @@ Event::transpose (Pitch delta)
   if (abs (np.get_alteration ()) > 2)
     {
        warning (_f ("Transposition by %s makes alteration larger than two",
-         delta.string ()));
+         delta.to_string ()));
     }
 
   set_mus_property ("pitch", np.smobbed_copy ());

diff --git a/lily/global-translator.cc b/lily/global-translator.cc
index f43c5486c0e7cdf2c972ec072dfa0e48790c7c29..ce30c74db6feebf5d78560a85006867e915ed78c 100644 (file)
--- a/lily/global-translator.cc
+++ b/lily/global-translator.cc
@@ -100,7 +100,7 @@ Global_translator::run_iterator_on_me (Music_iterator * iter)
 
       w = sneaky_insert_extra_moment (w);
       
-      //      printf ("proccing %s\n ",       w.string ().to_str0 ());
+      //      printf ("proccing %s\n ",       w.to_string ().to_str0 ());
       if (first)
        {
          first = false;

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index e2bd367808db455e0f3885353f1232ce3e9fcb6d..6d5207a084b33289766b7d557e537c91ac368f6d 100644 (file)
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -48,7 +48,7 @@ Includable_lexer::new_input (String s, Sources  * global_sources)
     {
       String msg = _f ("can't find file: `%s'", s);
       msg += "\n";
-      msg += _f ("(search path: `%s')", global_sources->path_C_->string ().to_str0 ());
+      msg += _f ("(search path: `%s')", global_sources->path_C_->to_string ().to_str0 ());
       msg += "\n";
       LexerError (msg.to_str0 ());
 

diff --git a/lily/include/afm.hh b/lily/include/afm.hh
index e60686d8377ac4fa2941ba139df8c77502eb3406..a82eaeffcf2b16e6285a81b3325d484b02503caa 100644 (file)
--- a/lily/include/afm.hh
+++ b/lily/include/afm.hh
@@ -27,7 +27,7 @@ struct Adobe_font_metric : Font_metric
   AFM_CharMetricInfo const *find_char_metric (String name, bool warn=true) const;
   AFM_CharMetricInfo const *find_ascii_metric (int, bool warn=true) const;  
 
-  String string () const;
+  String to_string () const;
   ~Adobe_font_metric ();
   static SCM make_afm (AFM_Font_info*, unsigned);
 

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index c6c194d2269be5f02bc3026a80c134234cd433cb..771f5a99eb97a839df1dc5a6e6d7decd1782fc8a 100644 (file)
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -22,7 +22,7 @@ public:
   
   Duration ();
   Duration (int, int);
-  String string () const;
+  String to_string () const;
 
   Duration compressed (Rational) const;
   Rational get_length () const ;

diff --git a/lily/include/lilypond-input-version.hh b/lily/include/lilypond-input-version.hh
index aaa23d687137016fc81380661ea40bc25b854d99..000e74d541a8727a9de94d51cfa7e4a426284d91 100644 (file)
--- a/lily/include/lilypond-input-version.hh
+++ b/lily/include/lilypond-input-version.hh
@@ -17,7 +17,7 @@ struct Lilypond_version
   Lilypond_version (int major, int minor, int patch);
   Lilypond_version (String str);
 
-  String string () const;
+  String to_string () const;
   operator int () const;
 
   int major_;

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index 0e52ccf004f7aec4e247c7c86f517f3ad7384607..0fbe2eb217cf67a39a2f3edf9f380c7b27f40512 100644 (file)
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -29,7 +29,7 @@ public:
 
   static String i2varint_string (int i);
 
-  virtual String string () const = 0;
+  virtual String to_string () const = 0;
 
   int channel_;
 };
@@ -44,7 +44,7 @@ public:
 
   Moment delta_mom_;
   Midi_item* midi_;
-  String string () const;
+  String to_string () const;
 };
 
 /**
@@ -54,7 +54,7 @@ class Midi_chunk : public Midi_item
 {
 public:
   void set (String header_string, String data_string, String footer_string);
-  virtual String string () const;
+  virtual String to_string () const;
   virtual String data_string () const;
 
 private:
@@ -68,7 +68,7 @@ class Midi_duration : public Midi_item
 public:
   Midi_duration (Real seconds_f);
 
-  virtual String string () const;
+  virtual String to_string () const;
   Real seconds_;
 };
 
@@ -86,7 +86,7 @@ class Midi_instrument : public Midi_item
 public:
   Midi_instrument (Audio_instrument*);
 
-  virtual String string () const;
+  virtual String to_string () const;
 
   Audio_instrument* audio_;
 };
@@ -97,7 +97,7 @@ class Midi_key : public Midi_item
 public:
   Midi_key (Audio_key*);
        
-  virtual String string () const;
+  virtual String to_string () const;
 
   Audio_key* audio_;
 };
@@ -107,7 +107,7 @@ class Midi_time_signature : public Midi_item
 public:
   Midi_time_signature (Audio_time_signature*);
   
-  virtual String string () const;
+  virtual String to_string () const;
 
   Audio_time_signature* audio_;
   int clocks_per_1_;
@@ -123,7 +123,7 @@ public:
 
   Moment get_length () const;
   int get_pitch () const;
-  virtual String string () const;
+  virtual String to_string () const;
 
   Audio_note* audio_;
 
@@ -139,7 +139,7 @@ class Midi_note_off : public Midi_note
 public:
   Midi_note_off (Midi_note*); 
 
-  virtual String string () const;
+  virtual String to_string () const;
 
   Midi_note* on_;
   Byte aftertouch_byte_;
@@ -155,7 +155,7 @@ public:
 
   Midi_text (Audio_text*);
     
-  virtual String string () const;
+  virtual String to_string () const;
 
   Audio_text* audio_;
 };
@@ -165,7 +165,7 @@ class Midi_dynamic : public Midi_item
 public:
   Midi_dynamic (Audio_dynamic*);
   
-  virtual String string () const;
+  virtual String to_string () const;
 
   Audio_dynamic* audio_;
 };
@@ -175,7 +175,7 @@ class Midi_piano_pedal : public Midi_item
 public:
   Midi_piano_pedal (Audio_piano_pedal*);
   
-  virtual String string () const;
+  virtual String to_string () const;
 
   Audio_piano_pedal* audio_;
 };
@@ -185,7 +185,7 @@ class Midi_tempo : public Midi_item
 public:
   Midi_tempo (Audio_tempo*);
   
-  virtual String string () const;
+  virtual String to_string () const;
 
   Audio_tempo* audio_;
 };

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index 65f42149d316073332a74733276904dd39161678..5d876f7b11a4088a1caf17d32a41b5bbd0d98ead 100644 (file)
--- a/lily/include/moment.hh
+++ b/lily/include/moment.hh
@@ -47,7 +47,7 @@ public:
     Deliver a copy of THIS as a smobified SCM
    */
   SCM smobbed_copy () const;
-  String string () const;
+  String to_string () const;
   static int compare (Moment const&, Moment const&);
   
 };

diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh
index a3c63fb25b64b6ceeb5414e262510799c9451736..ff03ec2826a7dd8fe0f985251f57fea7c6073078 100644 (file)
--- a/lily/include/pitch.hh
+++ b/lily/include/pitch.hh
@@ -66,7 +66,7 @@ public:
   int steps () const;
   /// return pitch from central c (in halfnotes)
   int semitone_pitch () const; 
-  String string () const;
+  String to_string () const;
 
   SCM smobbed_copy () const;
   DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));

diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh
index 53cfa1c140823712aa14e300800212000359971a..24e2d85b2c7331d5d49b1c38e3e872b048cb3e63 100644 (file)
--- a/lily/include/tfm.hh
+++ b/lily/include/tfm.hh
@@ -138,7 +138,7 @@ struct Tex_font_char_metric
   Array<Tfm_kern> kerns_;
   Array<Tfm_ligature> ligatures_;
 
-  String string () const;
+  String to_string () const;
   Tex_font_char_metric ();
 
   Box dimensions () const; 
@@ -154,9 +154,7 @@ public:
   virtual Box get_char (int) const;
   Tex_font_char_metric const *find_ascii (int ascii, bool warn=true) const;
 
-  String string () const;
-
-
+  String to_string () const;
   
   Tfm_info info_;
   Tfm_header header_;

diff --git a/lily/input-file-results.cc b/lily/input-file-results.cc
index 281c345ee79b7b38eb2f377e257a1847597b9972..37e0a3a63935b3c6ef3a3bf7eabf6dfc9540db18 100644 (file)
--- a/lily/input-file-results.cc
+++ b/lily/input-file-results.cc
@@ -109,7 +109,7 @@ Input_file_results::do_deps ()
     {
       Path p = split_path (output_name_global);
       p.ext = "dep";
-      write_dependency_file (p.string (),
+      write_dependency_file (p.to_string (),
                             target_strings_,
                             inclusion_names_);
     }
@@ -189,7 +189,7 @@ do_one_file (String init_string, String file_string)
    if (init_string.length () && global_path.find (init_string).empty_b ())
     {
       warning (_f ("can't find file: `%s'", init_string));
-      warning (_f ("(search path: `%s')", global_path.string ().to_str0 ()));
+      warning (_f ("(search path: `%s')", global_path.to_string ().to_str0 ()));
       return;
     }
   if ((file_string != "-") && global_path.find (file_string).empty_b ())

diff --git a/lily/lexer.ll b/lily/lexer.ll
index c3f469a6b8c8ef7f8458076d5abd74862c4e2398..01e4eeb6650e87d640f6996b234039270d8ef2c2 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -731,7 +731,7 @@ valid_version_b (String s)
   Lilypond_version ver (s);
   if (! ((ver >= oldest_version) && (ver <= current)))
        {       
-               non_fatal_error (_f ("Incorrect lilypond version: %s (%s, %s)", ver.string (), oldest_version.string (), current.string ()));
+               non_fatal_error (_f ("Incorrect lilypond version: %s (%s, %s)", ver.to_string (), oldest_version.to_string (), current.to_string ()));
                non_fatal_error (_ ("Consider updating the input with the convert-ly script")); 
                return false;
     }

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index c49923bbf9373ad9f919baafe7d2bccca0c73897..cab31a2124a2bbb444eb6e84e79a4db03b158ae6 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -85,7 +85,7 @@ gulp_file_to_string (String fn)
     {
       String e = _f ("can't find file: `%s'", fn);
       e += " ";
-      e += _f ("(load path: `%s')", global_path.string ());
+      e += _f ("(load path: `%s')", global_path.to_string ());
       error (e);
     }
   else if (verbose_global_b)

diff --git a/lily/lilypond-version.cc b/lily/lilypond-version.cc
index 309420e660cd010311b49a8509ae5bba59402386..ca293c9a784276c6cafb0ae08aa93ac5876ceaa7 100644 (file)
--- a/lily/lilypond-version.cc
+++ b/lily/lilypond-version.cc
@@ -34,9 +34,9 @@ Lilypond_version::Lilypond_version (String str)
 }
 
 String
-Lilypond_version::string () const
+Lilypond_version::to_string () const
 {
-  return to_string (major_) + "." + to_string (minor_) + "." + to_string (patch_);
+  return ::to_string (major_) + "." + ::to_string (minor_) + "." + ::to_string (patch_);
 }
 
 Lilypond_version::operator int () const

diff --git a/lily/main.cc b/lily/main.cc
index b104b899915b1da3ea58be58b08fcb4d3dd30741..e8952d29080cb33a3c695aaf47de838c1a12ab8b 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -286,11 +286,11 @@ distill_inname (String str)
          if (*extensions[i] && !p.ext.empty_b ())
            p.ext += ".";
          p.ext += extensions[i];
-         if (!global_path.find (p.string ()).empty_b ())
+         if (!global_path.find (p.to_string ()).empty_b ())
              break;
        }
       /* Reshuffle extension */
-      p = split_path (p.string ());
+      p = split_path (p.to_string ());
     }
   return p;
 }
@@ -335,7 +335,7 @@ main_prog (void *, int, char **)
 
   progress_indication ("\n");
 
-  all_fonts_global = new All_font_metrics (global_path.string ());
+  all_fonts_global = new All_font_metrics (global_path.to_string ());
 
   init_scheme_code_string += ")";
   gh_eval_str ((char *)init_scheme_code_string.to_str0 ());
@@ -363,7 +363,7 @@ main_prog (void *, int, char **)
 
       /* By default, use base name of input file for output file name */
       Path outpath = inpath;
-      if (inpath.string () != "-")
+      if (inpath.to_string () != "-")
        outpath.ext = format_to_ext (output_format_global);
 
       /* By default, write output to cwd; do not copy directory part
@@ -382,8 +382,8 @@ main_prog (void *, int, char **)
        
       /* Burp: output name communication goes through _global */
       String save_output_name_global = output_name_global;
-      output_name_global = outpath.string ();
-      do_one_file (init, inpath.string ());
+      output_name_global = outpath.to_string ();
+      do_one_file (init, inpath.to_string ());
       output_name_global = save_output_name_global;
       
       p++;
@@ -441,7 +441,7 @@ main (int argc, char **argv)
            Path p = split_path (s);
            if (s != "-" && p.ext.empty_b ())
              p.ext = format_to_ext (output_format_global);
-           output_name_global = p.string ();
+           output_name_global = p.to_string ();
          }
          break;
        case 'e':

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 1dbb35768ed3f8057ae8adfaef8aa9b2dc714eab..1f7cbea2d6b88ae394f9dd2bf7a3334f0d847ce4 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -61,7 +61,7 @@ Midi_chunk::data_string () const
 }
 
 String
-Midi_chunk::string () const
+Midi_chunk::to_string () const
 {
   String str = header_string_;
   String dat = data_string ();
@@ -80,9 +80,9 @@ Midi_duration::Midi_duration (Real seconds_f)
 }
 
 String
-Midi_duration::string () const
+Midi_duration::to_string () const
 {
-  return String ("<duration: ") + to_string (seconds_) + ">";
+  return String ("<duration: ") + ::to_string (seconds_) + ">";
 }
 
 Midi_event::Midi_event (Moment delta_mom, Midi_item* midi)
@@ -95,14 +95,14 @@ Midi_event::Midi_event (Moment delta_mom, Midi_item* midi)
   ugh. midi output badly broken since grace note hackage.
  */
 String
-Midi_event::string () const
+Midi_event::to_string () const
 {
   Rational rat_dt = (delta_mom_.main_part_ * Rational (384) +
     delta_mom_.grace_part_ * Rational (100))*Rational (4);
   int delta_i = int (rat_dt);
 
   String delta_string = Midi_item::i2varint_string (delta_i);
-  String midi_string = midi_->string ();
+  String midi_string = midi_->to_string ();
   assert (midi_string.length ());
   return delta_string + midi_string;
 }
@@ -131,7 +131,7 @@ Midi_instrument::Midi_instrument (Audio_instrument* a)
 }
 
 String
-Midi_instrument::string () const
+Midi_instrument::to_string () const
 {
   Byte program_byte = 0;
   bool found = false;
@@ -147,8 +147,8 @@ Midi_instrument::string () const
   else
       warning (_f ("no such instrument: `%s'", audio_->str_.to_str0 ()));
 
-  String str = to_string ((char) (0xc0 + channel_)); //YIKES! FIXME: Should be track. -rz
-  str += to_string ((char)program_byte);
+  String str = ::to_string ((char) (0xc0 + channel_)); //YIKES! FIXME: Should be track. -rz
+  str += ::to_string ((char)program_byte);
   return str;
 }
 
@@ -175,7 +175,7 @@ Midi_item::i2varint_string (int i)
   String str;
   while (1) 
     {
-      str += to_string ((char)buffer_i);
+      str += ::to_string ((char)buffer_i);
       if (buffer_i & 0x80)
        buffer_i >>= 8;
       else
@@ -190,7 +190,7 @@ Midi_key::Midi_key (Audio_key*a)
 }
 
 String
-Midi_key::string () const
+Midi_key::to_string () const
 {
   String str = "ff5902";
   str += String_convert::int2hex (audio_->accidentals_, 2, '0');
@@ -208,7 +208,7 @@ Midi_time_signature::Midi_time_signature (Audio_time_signature* a)
 }
 
 String
-Midi_time_signature::string () const
+Midi_time_signature::to_string () const
 {
   int num = audio_->beats_;
   int den = audio_->one_beat_;
@@ -255,14 +255,14 @@ Midi_note::get_pitch () const
 }
 
 String
-Midi_note::string () const
+Midi_note::to_string () const
 {
   Byte status_byte = (char) (0x90 + channel_);
 
-  String str = to_string ((char)status_byte);
-  str += to_string ((char) (get_pitch () + c0_pitch_i_));
+  String str = ::to_string ((char)status_byte);
+  str += ::to_string ((char) (get_pitch () + c0_pitch_i_));
 
-  str += to_string ((char)dynamic_byte_);
+  str += ::to_string ((char)dynamic_byte_);
   return str;
 }
 
@@ -280,13 +280,13 @@ Midi_note_off::Midi_note_off (Midi_note* n)
 }
 
 String
-Midi_note_off::string () const
+Midi_note_off::to_string () const
 {
   Byte status_byte = (char) (0x80 + channel_);
 
-  String str = to_string ((char)status_byte);
-  str += to_string ((char) (get_pitch () + Midi_note::c0_pitch_i_));
-  str += to_string ((char)aftertouch_byte_);
+  String str = ::to_string ((char)status_byte);
+  str += ::to_string ((char) (get_pitch () + Midi_note::c0_pitch_i_));
+  str += ::to_string ((char)aftertouch_byte_);
   return str;
 }
 
@@ -296,10 +296,10 @@ Midi_dynamic::Midi_dynamic (Audio_dynamic* a)
 }
 
 String
-Midi_dynamic::string () const
+Midi_dynamic::to_string () const
 {
   Byte status_byte = (char) (0xB0 + channel_);
-  String str = to_string ((char)status_byte);
+  String str = ::to_string ((char)status_byte);
 
   /*
     Main volume controller (per channel):
@@ -314,8 +314,8 @@ Midi_dynamic::string () const
   if (volume > full_scale)
     volume = (int)full_scale;
 
-  str += to_string ((char)0x07);
-  str += to_string ((char)volume);
+  str += ::to_string ((char)0x07);
+  str += ::to_string ((char)volume);
   return str;
 }
 
@@ -325,20 +325,20 @@ Midi_piano_pedal::Midi_piano_pedal (Audio_piano_pedal* a)
 }
 
 String
-Midi_piano_pedal::string () const
+Midi_piano_pedal::to_string () const
 {
   Byte status_byte = (char) (0xB0 + channel_);
-  String str = to_string ((char)status_byte);
+  String str = ::to_string ((char)status_byte);
 
   if (audio_->type_string_ == "Sostenuto")
-    str += to_string ((char)0x42);
+    str += ::to_string ((char)0x42);
   else if (audio_->type_string_ == "Sustain")
-    str += to_string ((char)0x40);
+    str += ::to_string ((char)0x40);
   else if (audio_->type_string_ == "UnaCorda")
-    str += to_string ((char)0x43);
+    str += ::to_string ((char)0x43);
 
   int pedal = ((1 - audio_->dir_) / 2) * 0x7f;
-  str += to_string ((char)pedal);
+  str += ::to_string ((char)pedal);
   return str;
 }
 
@@ -348,7 +348,7 @@ Midi_tempo::Midi_tempo (Audio_tempo* a)
 }
 
 String
-Midi_tempo::string () const
+Midi_tempo::to_string () const
 {
   int useconds_per_4_i = 60 * (int)1e6 / audio_->per_minute_4_;
   String str = "ff5103";
@@ -362,7 +362,7 @@ Midi_text::Midi_text (Audio_text* a)
 }
 
 String
-Midi_text::string () const
+Midi_text::to_string () const
 {
   String str = "ff" + String_convert::int2hex (audio_->type_, 2, '0');
   str = String_convert::hex2bin (str);
@@ -427,7 +427,7 @@ Midi_track::data_string () const
     str += "\n";
   for (Cons<Midi_event> *i=event_p_list_.head_; i; i = i->next_) 
     {
-      str += i->car_->string ();
+      str += i->car_->to_string ();
       if (midi_debug_global_b)
         str += "\n";
     }

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 1bd6b7ddb3acffda2212ebadf0ad1a51af8daebb..1013a5068ac8a081121fea03969d2b4ed87f7066 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -43,7 +43,7 @@ Midi_stream::operator << (String str)
 Midi_stream&
 Midi_stream::operator << (Midi_item const& midi_c_r)
 {
-  String str = midi_c_r.string ();
+  String str = midi_c_r.to_string ();
 
 
   if (midi_debug_global_b)

diff --git a/lily/molecule.cc b/lily/molecule.cc
index 29af894151e16a676a53dfd8ffa8161dbb95f8ff..af60d58ab4ccf50948e39be0bd9ba0dfee17fbdc 100644 (file)
--- a/lily/molecule.cc
+++ b/lily/molecule.cc
@@ -176,7 +176,7 @@ Molecule::print_smob (SCM , SCM port, scm_print_state *)
   scm_puts ("#<Molecule ", port);
 #if 0
   Molecule  *r = (Molecule *) ly_cdr (s);
-  String string (r->string ());
+  String string (r->to_string ());
   scm_puts ((char *)str.to_str0 (), port);
 #endif
   scm_puts (" >", port);

diff --git a/lily/moment.cc b/lily/moment.cc
index f8e32be86fc1b0c67274f5594dd754e59da134b3..43c3e0bf1893dba18473af75a923061c8ac8c6e5 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -37,7 +37,7 @@ Moment::print_smob (SCM s, SCM port, scm_print_state *)
   Moment  *r = (Moment *) ly_cdr (s);
      
   scm_puts ("#<Mom ", port);
-  String str = r->string ();
+  String str = r->to_string ();
   scm_puts ((char *)str.to_str0 (), port);
   scm_puts (" >", port);
   
@@ -215,12 +215,12 @@ Moment::set_infinite (int k)
 
 
 String
-Moment::string () const
+Moment::to_string () const
 {
-  String s =  main_part_.string ();
+  String s =  main_part_.to_string ();
   if (grace_part_)
     {
-      s += "G" + grace_part_.string ();
+      s += "G" + grace_part_.to_string ();
     }
   return s;
 }
@@ -239,7 +239,7 @@ Moment::operator - () const
 std::ostream &
 operator << (std::ostream &os, Moment const &m)
 {
-  os << m.string ();
+  os << m.to_string ();
   return os;
 }
 #endif

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index 6dd6c095812a0c8adbe993b74c9eaf0ec7db76c7..082270c0b66a2ee8df732b65dda1e6b7d69a6ca7 100644 (file)
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -143,7 +143,7 @@ Music_output_def::outname_string ()
     {
       Path p = split_path (out);
       p.base += "-" + to_string (def);
-      out = p.string ();
+      out = p.to_string ();
     }
   return out;
 }

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index f252d029aab33d5787a9bb96480124d2d9830011..989a9265a97da2dff4b110393773c60bcbd8f35f 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -431,9 +431,8 @@ Note_collision_interface::add_column (Grob*me,Grob* ncol)
 
 
 ADD_INTERFACE (Note_collision_interface, "note-collision-interface",
-  "An object that handles collisions between notes with different stem
-directions and horizontal shifts. Most of the interesting properties
-are to be set in @ref{note-column-interface}: these are
-@code{force-hshift} and @code{horizontal-shift}.
-",
+  "An object that handles collisions between notes with different stem " 
+"directions and horizontal shifts. Most of the interesting properties "
+"are to be set in @ref{note-column-interface}: these are "
+"@code{force-hshift} and @code{horizontal-shift}. ",
   "merge-differently-dotted merge-differently-headed collision-done");

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index 9644f9373424fa6aaaf0c77b9c103fdd6713102a..25031239a8b3859cc1be4e0e8f55cbcdd4cdec30 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -44,7 +44,7 @@ Note_name_engraver::process_acknowledged_grobs ()
     {
       if (i)
        s += " ";
-      s += unsmob_pitch (reqs_[i]->get_mus_property ("pitch"))->string ();
+      s += unsmob_pitch (reqs_[i]->get_mus_property ("pitch"))->to_string ();
     }
   if (s.length ())
     {

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
index 9eeab12ffc65e1d898146fc1c34be3aa9455139e..e96afc33d10266921c946245b2c3aa9eb3751aea 100644 (file)
--- a/lily/paper-def.cc
+++ b/lily/paper-def.cc
@@ -100,7 +100,7 @@ Paper_def::get_paper_outputter ()
   Paper_outputter * po = new Paper_outputter (outname);
   Path p = split_path (outname);
   p.ext = "";
-  po->basename_ = p.string ();
+  po->basename_ = p.to_string ();
   return po;
 }
 

diff --git a/lily/performance.cc b/lily/performance.cc
index 257e9016475e60b209fc60725b53f54aac25d339..23be820ad001b5ee3d5a5726894d552619bfde70 100644 (file)
--- a/lily/performance.cc
+++ b/lily/performance.cc
@@ -157,13 +157,13 @@ Performance::process ()
     {
       Path p = split_path (out);
       p.base += "-" + to_string (def);
-      out = p.string ();
+      out = p.to_string ();
     }
 
   /* Maybe a bit crude, but we had this before */
   Path p = split_path (out);
   p.ext = "midi";
-  out = p.string ();
+  out = p.to_string ();
   
   Midi_stream midi_stream (out);
   progress_indication (_f ("MIDI output to `%s'...", out));

diff --git a/lily/pitch.cc b/lily/pitch.cc
index c3e2471c6ca245bdec7ee237c3475d8a15649dd4..895f18ef6265fe5c80308d044134e12d533fe86e 100644 (file)
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -145,10 +145,10 @@ interval (Pitch const & from , Pitch const & to )
 char const *accname[] = {"eses", "es", "", "is" , "isis"};
 
 String
-Pitch::string () const
+Pitch::to_string () const
 {
   int n = (notename_ + 2) % 7;
-  String s = to_string (char (n + 'a'));
+  String s = ::to_string (char (n + 'a'));
   if (alteration_)
     s += String (accname[alteration_ + 2]);
 
@@ -162,7 +162,7 @@ Pitch::string () const
     {
       int o = (-octave_) - 1;
       while (o--)
-       s += to_string (',');
+       s += ::to_string (',');
     }
 
   return s;
@@ -248,7 +248,7 @@ Pitch::print_smob (SCM s, SCM port, scm_print_state *)
   Pitch  *r = (Pitch *) ly_cdr (s);
      
   scm_puts ("#<Pitch ", port);
-  scm_display (scm_makfrom0str (r->string ().to_str0 ()), port);
+  scm_display (scm_makfrom0str (r->to_string ().to_str0 ()), port);
   scm_puts (" >", port);
   
   return 1;

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index 435f91ebd8279c0a33a58b799a793fc0d152e832..96aa5f52bd7a2173e4e132e79c8072a536735032 100644 (file)
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -102,8 +102,8 @@ Spaceable_grob::remove_interface (Grob*me)
 
 
 ADD_INTERFACE (Spaceable_grob,"spaceable-grob-interface",
-  "A grob (a Paper_column) that takes part in the
-spacing problem. ",
-  "measure-length spacing-wishes penalty minimum-distances ideal-distances
-left-neighbors right-neighbors");
+              "A grob (a Paper_column) that takes part in the \n"
+              "spacing problem. ",
+  "measure-length spacing-wishes penalty minimum-distances ideal-distances "
+"left-neighbors right-neighbors");
 

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 091dd1ce68e827da521debeb03f993a6e25bc50b..89cf829cfcaf8717ce4f87196b45870f9219fec4 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -376,7 +376,7 @@ Spacing_spanner::set_springs (SCM smob)
       global_shortest = find_shortest (me, all);
       if (verbose_global_b)
        {
-         progress_indication (_f("Global shortest duration is %s\n", global_shortest.string ())); 
+         progress_indication (_f("Global shortest duration is %s\n", global_shortest.to_string ())); 
        }
     }
   prune_loose_colunms (me, &all, global_shortest);
@@ -845,7 +845,7 @@ Spacing_spanner::note_spacing (Grob*me, Grob *lc, Grob *rc,
   
   if (! shortest_playing_len.to_bool ())
     {
-      programming_error ("can't find a ruling note at " + Paper_column::when_mom (lc).string ());
+      programming_error ("can't find a ruling note at " + Paper_column::when_mom (lc).to_string ());
       shortest_playing_len = 1;
     }
 

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index beaf99f6d4b11dc20bd351e54f49397a1ad5b75d..342e8801cbfa640c929d60dddf176a0ac59ca760 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -90,8 +90,8 @@ Span_bar_engraver::stop_translation_timestep ()
 
 
 ENTER_DESCRIPTION(Span_bar_engraver,
-/* descr */       "This engraver makes cross-staff barlines: It catches all normal
-bar lines, and draws a single span-bar across them.",
+/* descr */       "This engraver makes cross-staff barlines: It catches all normal "
+"bar lines, and draws a single span-bar across them.",
 /* creats*/       "SpanBar",
 /* accepts */     "",
 /* acks  */      "bar-line-interface",

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 503bd49a59e7813a42349846cd7012c14744c6f6..4d1f6e88ead7581d62c3e97debd535bc146bcd32 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -115,10 +115,9 @@ Staff_symbol::staff_space (Grob*me)
 
 
 ADD_INTERFACE (Staff_symbol,"staff-symbol-interface",
-  "This spanner draws the lines of a staff.  The center (i.e. middle line
-or space) is position 0. The length of the symbol may be set by hand
-through the @code{width} property.
-",
+  "This spanner draws the lines of a staff.  The center (i.e. middle line "
+"or space) is position 0. The length of the symbol may be set by hand "
+"through the @code{width} property. ",
               
   "width staff-space thickness line-count");
 

diff --git a/lily/system.cc b/lily/system.cc
index 1527ac9978b976a51bcf05b613783fda8910387a..2d62e26df9816d8dbbf9aa230913eef60fede865 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -557,11 +557,11 @@ System::columns ()const
 
 
 ADD_INTERFACE (System,"system-interface",
-  "Super grob, parent of all:
-
-The columns of a score that form one line.  The toplevel grob.  Any
-grob has a Line_of_score as both X and Y reference point. The
-Paper_score contains one grob of this type. Control enters the
-Grob dependency calculation from this single Line_of_score
-object.",
+  "Super grob, parent of all: "
+"\n\n"
+"The columns of a score that form one line.  The toplevel grob.  Any "
+"grob has a Line_of_score as both X and Y reference point. The "
+"Paper_score contains one grob of this type. Control enters the "
+"Grob dependency calculation from this single Line_of_score "
+"object.",
   "between-system-string all-elements columns");

diff --git a/lily/template5.cc b/lily/template5.cc
index 19e75a3874916ff1874ebbd24f4cb620f1b8d181..33d9b32f18be2aa2269f45af664408becb917929 100644 (file)
--- a/lily/template5.cc
+++ b/lily/template5.cc
@@ -24,7 +24,7 @@ Interval_t<Rational>::infinity ()
 String
 Interval_t<Rational>::T_to_string (Rational a)
 {
-  return a.string ();
+  return a.to_string ();
 }
 
 

diff --git a/lily/tfm.cc b/lily/tfm.cc
index 2219b191ffe9ad99dffb84e9c5eeec18e4d772e4..df8d2d0dbcb623d90ad3704c723ffcdb58be2d25 100644 (file)
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -49,10 +49,10 @@ Tex_font_char_metric::Tex_font_char_metric ()
   italic_correction_fix_ = 0;
 }
 
-#define APPEND_CHAR_METRIC_ELT(k)  outstr += to_string (#k) + " "  + to_string (k ## _)  + "; "
+#define APPEND_CHAR_METRIC_ELT(k)  outstr += ::to_string (#k) + " "  + ::to_string (k ## _)  + "; "
 
 String
-Tex_font_char_metric::string () const
+Tex_font_char_metric::to_string () const
 {
   String outstr ;
 
@@ -109,11 +109,11 @@ Tex_font_metric::get_char (int a) const
 
 
 String
-Tex_font_metric::string () const
+Tex_font_metric::to_string () const
 {
   String outstr;
   for (int i=0; i < char_metrics_.size (); i++)
-    outstr += char_metrics_[i].string ();
+    outstr += char_metrics_[i].to_string ();
   
   return outstr;
 }

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index dc07f195ff81fac01475805279b24b8a83294ebc..b576c9e8d211e3805ccd8047a0cd0945e588146b 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -113,7 +113,7 @@ dump reinterpret the markup as a molecule.
 (define (pitch->note-name pitch)
   (cons (cadr pitch) (caddr pitch)))
 
-(define (accidental->markup acc)
+(define (old-accidental->markup acc)
   "ACC is an int, return a markup making an accidental."
   (if (= acc 0)
       (make-line-markup (list empty-markup))
@@ -121,28 +121,12 @@ dump reinterpret the markup as a molecule.
                            (string-append "accidentals-"
                                           (number->string acc))))))
 
-; unused.
-(define (accidental->markupp acc pos)
-
-  (if (= acc 0)
-      empty-markup
-      (let ((acc-markup (make-musicglyph-markup
-                        (string-append "accidentals-"
-                                       (number->string acc)))))
-       
-       (if (equal? pos 'columns)
-           (make-line-markup (list (make-smaller-markup acc-markup)))
-         (if (equal? pos 'super)
-             (make-line-markup (list (make-super-markup acc-markup)))
-             ;; not 'super or 'columns must be 'sub...
-             (make-line-markup (list (make-sub-markup acc-markup))))))))
-
 
 ; unused.
 
 ;; FIXME: possibly to be used for american/jazz style
 ;; However, only pos == columns is used, which seems to do
-;; exactly what accidental->markup does...
+;; exactly what old-accidental->markup does...
 (define (amy-accidental->text acc) (accidental->textp acc 'columns))
 
 
@@ -161,7 +145,7 @@ dump reinterpret the markup as a molecule.
     (make-simple-markup
      (vector-ref #("C" "D" "E" "F" "G" "A" "B")  (cadr pitch)))
     (make-normal-size-super-markup
-     (accidental->markup (caddr pitch))))))
+     (old-accidental->markup (caddr pitch))))))
   
 ;;; Hooks to override chord names and note names, 
 ;;; see input/tricks/german-chords.ly
@@ -199,7 +183,7 @@ dump reinterpret the markup as a molecule.
 (define (step->markup-previously-alternate-jazz pitch)
   (make-line-markup
    (list
-    (accidental->markup (caddr pitch))
+    (old-accidental->markup (caddr pitch))
     (make-simple-markup
      (number->string (+ (cadr pitch) (if (= (car pitch) 0) 1 8)))))))
 
@@ -209,7 +193,7 @@ dump reinterpret the markup as a molecule.
        ;; sharp 7 only included for completeness?
        ((-2) (make-line-markup
               (list
-               (accidental->markup  -1)
+               (old-accidental->markup  -1)
                (make-simple-markup "7"))))
        ((-1) (make-simple-markup "7"))
        ((0) (make-simple-markup "maj7"))
@@ -217,9 +201,9 @@ dump reinterpret the markup as a molecule.
        ;;      (list (make-simple-markup "maj7"))))
        ((1) (make-line-markup
              (list
-              (accidental->markup 1) (make-simple-markup "7"))))
+              (old-accidental->markup 1) (make-simple-markup "7"))))
        ((2) (make-line-markup
-             (list (accidental->markup 1)
+             (list (old-accidental->markup 1)
                    (make-simple-markup "7")))))
       (step->markup-previously-alternate-jazz pitch)))
 
@@ -512,11 +496,11 @@ dump reinterpret the markup as a molecule.
   (make-line-markup
    (list
     (case (caddr pitch)
-      ((-2) (accidental->markup -2))
-      ((-1) (accidental->markup -1))
+      ((-2) (old-accidental->markup -2))
+      ((-1) (old-accidental->markup -1))
       ((0) empty-markup)
-      ((1) (accidental->markup 1))
-      ((2) (accidental->markup 2)))
+      ((1) (old-accidental->markup 1))
+      ((2) (old-accidental->markup 2)))
     (make-simple-markup (number->string (+ (cadr pitch) (if (= (car pitch) 0) 1 8)))))))
 
 (define-public chord::exception-alist-american 
@@ -539,22 +523,22 @@ dump reinterpret the markup as a molecule.
 (define (step->markup-american pitch)
   (case (cadr pitch)
     ((6) (case (caddr pitch)
-          ((-2) (make-line-markup (list (accidental->markup -1) (make-simple-markup "7"))))
+          ((-2) (make-line-markup (list (old-accidental->markup -1) (make-simple-markup "7"))))
           ((-1) (make-simple-markup "7"))
           ((0) (make-simple-markup "maj7"))
-          ((1) (make-line-markup (list (accidental->markup 1) (make-simple-markup "7"))))
-          ((2) (make-line-markup (list (accidental->markup 2) (make-simple-markup "7"))))))
+          ((1) (make-line-markup (list (old-accidental->markup 1) (make-simple-markup "7"))))
+          ((2) (make-line-markup (list (old-accidental->markup 2) (make-simple-markup "7"))))))
     ((4) (case (caddr pitch)
-          ((-2) (make-line-markup (list (accidental->markup -2) (make-simple-markup "5"))))
+          ((-2) (make-line-markup (list (old-accidental->markup -2) (make-simple-markup "5"))))
           ;;choose your symbol for the diminished fifth
           ((-1) (make-simple-markup "-5"))
-          ;;((-1) (make-line-markup (list (accidental->markup -1) (make-simple-markup "5")))))
+          ;;((-1) (make-line-markup (list (old-accidental->markup -1) (make-simple-markup "5")))))
           ((0) empty-markup)
           ;;choose your symbol for the augmented fifth
           ;;((1) (make-simple-markup "aug"))
-          ;;((1) (make-line-markup (list (accidental->markup 1) (make-simple-markup "5")))))
+          ;;((1) (make-line-markup (list (old-accidental->markup 1) (make-simple-markup "5")))))
           ((1) (make-simple-markup "+5"))
-          ((2) (make-line-markup (list (accidental->markup 2) (make-simple-markup "5"))))))
+          ((2) (make-line-markup (list (old-accidental->markup 2) (make-simple-markup "5"))))))
     (else (if (and (= (car pitch) 0)
                   (= (cadr pitch) 3)
                   (= (caddr pitch) 0))
@@ -715,25 +699,25 @@ dump reinterpret the markup as a molecule.
 (define (step->markup-jazz pitch)
   (case (cadr pitch)
     ((6) (case (caddr pitch)
-          ((-2) (make-line-markup (list (accidental->markup -1) (make-simple-markup "7"))))
+          ((-2) (make-line-markup (list (old-accidental->markup -1) (make-simple-markup "7"))))
           ((-1) (make-simple-markup "7"))
           ;;Pick your favorite maj7
           ((0) mathm-markup-object)  ;;a white triangle
           ;;((0) mathn-markup-object) ;;a black triangle
           ;;((0) (make-simple-markup "maj7")) ;;good old maj7
-          ((1) (make-line-markup (list (accidental->markup 1) (make-simple-markup "7"))))
-          ((2) (make-line-markup (list (accidental->markup 2) (make-simple-markup "7"))))))
+          ((1) (make-line-markup (list (old-accidental->markup 1) (make-simple-markup "7"))))
+          ((2) (make-line-markup (list (old-accidental->markup 2) (make-simple-markup "7"))))))
     ((4) (case (caddr pitch)
-          ((-2) (make-line-markup (list (accidental->markup -2) (make-simple-markup "5"))))
+          ((-2) (make-line-markup (list (old-accidental->markup -2) (make-simple-markup "5"))))
           ;;choose your symbol for the diminished fifth
           ;;((-1) (make-simple-markup "-5"))
-          ((-1) (make-line-markup (list (accidental->markup -1) (make-simple-markup "5"))))
+          ((-1) (make-line-markup (list (old-accidental->markup -1) (make-simple-markup "5"))))
           ((0) empty-markup)
           ;;choose your symbol for the augmented fifth
           ;;((1) (make-simple-markup "aug"))
-          ((1) (make-line-markup (list (accidental->markup 1) (make-simple-markup "5"))))
+          ((1) (make-line-markup (list (old-accidental->markup 1) (make-simple-markup "5"))))
           ;;((1) (make-simple-markup "+5"))
-          ((2) (make-line-markup (list (accidental->markup 2) (make-simple-markup "5"))))))
+          ((2) (make-line-markup (list (old-accidental->markup 2) (make-simple-markup "5"))))))
     (else (if (and (= (car pitch) 0)
                   (= (cadr pitch) 3)
                   (= (caddr pitch) 0))

diff --git a/scm/midi.scm b/scm/midi.scm
index 79ffe5846af555bbbb998ab1879d64c5a74e80d5..7167df899c8f2dcd9291a55d85af8854c3a4612d 100644 (file)
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -291,4 +291,5 @@ Note: MIDI cannot handle other tonalities than major/minor.
       (begin
        (ly:warn "Attempt to determine tonality of transposed scale")
        #t)
-  (eq? (cdr (list-ref pitch-list 4)) (cdr (list-ref pitch-list 6)))))
+      (eq? (cdr (list-ref pitch-list 4)) (cdr (list-ref pitch-list 6))))
+  )