release: 0.1.11

[lilypond.git] / lib / source.cc

diff --git a/lib/source.cc b/lib/source.cc
index 3247c8d82c11d262af148cd8a612fc6dcdb23855..3f2daf6a2356d8c27423b925a6cc1e917f8357c9 100644 (file)
--- a/lib/source.cc
+++ b/lib/source.cc
@@ -1,5 +1,5 @@
 /*
-  source.cc -- implement Source
+  source.cc -- implement Sources
 
   source file of the LilyPond music typesetter
 
@@ -15,45 +15,54 @@
 #include "plist.hh"
 #include "source-file.hh"
 #include "source.hh"
+#include "path.hh"
+
+Sources::Sources()
+{
+  path_C_= 0;
+  binary_b_ = false;
+}
+
+void
+Sources::set_binary(bool bo)
+{
+  binary_b_ = bo;
+}
 
 void
 Sources::set_path(File_path *f_C)
 {
-    path_C_ = f_C;
+  path_C_ = f_C;
 }
 
 /**
   open a file
 
   @param file_str the file to be opened, name might be changed if it
-  is found in a search path.
+  is found in a search path. UGH!
 
   @return 0 if no file found
   */
 Source_file*
-Sources::get_file_l(String &file_str )
+Sources::get_file_l(String &file_str) //UGH
 {
-    if (path_C_){
-       file_str = path_C_->find(file_str); 
-       if (file_str== "")
-           return 0;
+  if (path_C_)
+    {
+      String file_str_o = path_C_->find(file_str); 
+      if ((file_str_o == "") && (file_str != ""))
+       return 0;
+      file_str = file_str_o;
     }
-    Source_file * f_p= (!binary_b_) ?
-       new Source_file(file_str) : new Binary_source_file(file_str);
-    add(f_p);
-    return f_p;
-}
-
-Sources::Sources()
-{
-    path_C_= 0;
-    binary_b_ = false;
+  Source_file * f_p= (!binary_b_) ?
+    new Source_file(file_str) : new Binary_source_file(file_str);
+  add(f_p);
+  return f_p;
 }
 
 void
-Sources::add( Source_file* sourcefile_p )
+Sources::add(Source_file* sourcefile_p)
 {
-    sourcefile_p_iplist_.bottom().add( sourcefile_p );
+  sourcefile_p_list_.bottom().add(sourcefile_p);
 }
 
 /**
@@ -62,11 +71,12 @@ Sources::add( Source_file* sourcefile_p )
   @return 0 if not found.
   */
 Source_file*
-Sources::sourcefile_l( char const* ch_C )
+Sources::sourcefile_l(char const* ch_C)
 {
-    PCursor<Source_file*> sourcefile_l_pcur( sourcefile_p_iplist_.top() );
-    for ( ; sourcefile_l_pcur.ok(); sourcefile_l_pcur++ )
-       if ( sourcefile_l_pcur->in_b( ch_C ) )  
-           return *sourcefile_l_pcur;
-    return 0;
+  PCursor<Source_file*> sourcefile_l_pcur(sourcefile_p_list_.top());
+  for (; sourcefile_l_pcur.ok(); sourcefile_l_pcur++)
+    if (sourcefile_l_pcur->in_b(ch_C)) 
+      return *sourcefile_l_pcur;
+  return 0;
 }
+