Run grand-replace (issue 3765)

[lilypond.git] / lily / sources.cc

diff --git a/lily/sources.cc b/lily/sources.cc
index 0b33c92f9ed89da3952bfdf78fe9d34c50e41007..dc784d2bdb5f20c17058f2219309d2e6e44c08b2 100644 (file)
--- a/lily/sources.cc
+++ b/lily/sources.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,13 +29,11 @@ Sources::Sources ()
   path_ = 0;
 }
 
-
 Sources::Sources (Sources const &)
 {
   assert (false);
 }
 
-
 void
 Sources::set_path (File_path *f)
 {
@@ -51,27 +49,27 @@ Sources::set_path (File_path *f)
      working directory.
 */
 Source_file *
-Sources::get_file (string file_string, string const& current_dir)
-{  
+Sources::get_file (string file_string, string const &current_dir)
+{
   if (file_string != "-")
     {
       // First, check for a path relative to the directory of the
       // file currently being parsed.
       if (current_dir.length ()
-         && file_string.length ()
-         && !File_name (file_string).is_absolute ()
-         && is_file (current_dir + DIRSEP + file_string))
-       file_string = current_dir + DIRSEP + file_string;
+          && file_string.length ()
+          && !File_name (file_string).is_absolute ()
+          && is_file (current_dir + DIRSEP + file_string))
+        file_string = current_dir + DIRSEP + file_string;
 
       // Otherwise, check the rest of the path.
       else if (path_)
-       {
-         string file_string_o = path_->find (file_string);
-         if ((file_string_o == "") && (file_string != ""))
-           return 0;
+        {
+          string file_string_o = path_->find (file_string);
+          if ((file_string_o == "") && (file_string != ""))
+            return 0;
 
-         file_string = file_string_o;
-       }
+          file_string = file_string_o;
+        }
     }
 
   Source_file *f = new Source_file (file_string);