release: 1.0.1

[lilypond.git] / lib / source.cc

diff --git a/lib/source.cc b/lib/source.cc
index 3f2daf6a2356d8c27423b925a6cc1e917f8357c9..81423bb1cb95b01a5a4b063628dbcd4f128f1bc1 100644 (file)
--- a/lib/source.cc
+++ b/lib/source.cc
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -15,22 +15,22 @@
 #include "plist.hh"
 #include "source-file.hh"
 #include "source.hh"
-#include "path.hh"
+#include "file-path.hh"
 
-Sources::Sources()
+Sources::Sources ()
 {
   path_C_= 0;
   binary_b_ = false;
 }
 
 void
-Sources::set_binary(bool bo)
+Sources::set_binary (bool bo)
 {
   binary_b_ = bo;
 }
 
 void
-Sources::set_path(File_path *f_C)
+Sources::set_path (File_path *f_C)
 {
   path_C_ = f_C;
 }
@@ -44,25 +44,25 @@ Sources::set_path(File_path *f_C)
   @return 0 if no file found
   */
 Source_file*
-Sources::get_file_l(String &file_str) //UGH
+Sources::get_file_l (String &file_str) //UGH
 {
-  if (path_C_)
+  if ((file_str != "-") && path_C_)
     {
-      String file_str_o = path_C_->find(file_str); 
+      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);
+  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_list_.bottom().add(sourcefile_p);
+  sourcefile_p_list_.bottom ().add (sourcefile_p);
 }
 
 /**
@@ -71,11 +71,11 @@ 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_list_.top());
-  for (; sourcefile_l_pcur.ok(); sourcefile_l_pcur++)
-    if (sourcefile_l_pcur->in_b(ch_C)) 
+  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;
 }