Merge branch 'master' of carldsorensen@git.sv.gnu.org:/srv/git/lilypond into fret...

[lilypond.git] / lily / file-name-map.cc

diff --git a/lily/file-name-map.cc b/lily/file-name-map.cc
index 8d3eb19c8e3800623105ab5d0cf2288caa17ea47..63ae7eced0e46bcb293c2c4ac07ead7a61b32a13 100644 (file)
--- a/lily/file-name-map.cc
+++ b/lily/file-name-map.cc
@@ -1,9 +1,9 @@
 /*
-  file-name-map.cc --  implement map_file_name()
+  file-name-map.cc --  implement map_file_name ()
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <map>
@@ -12,10 +12,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];
@@ -24,7 +24,7 @@ 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")
+          "Add mappings for error messages from @var{alist}.")
 {
   for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
     {