X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffile-name-map.cc;h=96be62c9a2985bc8822420f9338cb7b2af1cf914;hb=fe37d3cbc1f095a36e65d8ae6f400465e5aab62d;hp=8d3eb19c8e3800623105ab5d0cf2288caa17ea47;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/file-name-map.cc b/lily/file-name-map.cc
index 8d3eb19c8e..96be62c9a2 100644
--- a/lily/file-name-map.cc
+++ b/lily/file-name-map.cc
@@ -1,9 +1,20 @@
 /*
-  file-name-map.cc --  implement map_file_name()
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <map>
@@ -12,10 +23,10 @@ using namespace std;
 #include "file-name-map.hh"
 #include "lily-guile.hh"
 
-map<std::string, std::string> file_name_map_global;
+map<string, string> file_name_map_global;
 
-std::string
-map_file_name (std::string s)
+string
+map_file_name (string s)
 {
   if (file_name_map_global.find (s) != file_name_map_global.end ())
     s = file_name_map_global[s];
@@ -23,8 +34,8 @@ map_file_name (std::string s)
 }
 
 LY_DEFINE (ly_add_file_name_alist, "ly:add-file-name-alist",
-	   1, 0, 0, (SCM alist),
-	   "Add mappings for error messages from specified alist")
+           1, 0, 0, (SCM alist),
+           "Add mappings for error messages from @var{alist}.")
 {
   for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
     {