* lily/align-interface.cc (find_fixed_alignment_parent): new function.

[lilypond.git] / lily / input-file-results.cc

diff --git a/lily/input-file-results.cc b/lily/input-file-results.cc
index 1f9362bf480440359df470c5d588dba004146c6f..37e0a3a63935b3c6ef3a3bf7eabf6dfc9540db18 100644 (file)
--- a/lily/input-file-results.cc
+++ b/lily/input-file-results.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "config.h"
 
@@ -33,11 +33,14 @@
 #include "ly-modules.hh"
 
 
-LY_DEFINE(ly_set_point_and_click_x, "set-point-and-click!", 1, 0, 0,
+/*
+  no ! suffix since it doesn't modify 1st argument.
+ */
+LY_DEFINE(ly_set_point_and_click, "ly:set-point-and-click", 1, 0, 0,
          (SCM what),
-         "Set the options for Point-and-click source specials output. The
-argument is a symbol.  Possible options are @code{none} (no source specials),
-@code{line} and @code{line-column}")
+         "Set the options for Point-and-click source specials output. The\n"
+"argument is a symbol.  Possible options are @code{none} (no source specials),\n"
+"@code{line} and @code{line-column}")
 {
   /*
     UGH.
@@ -50,6 +53,8 @@ argument is a symbol.  Possible options are @code{none} (no source specials),
 
   extern SCM lily_module; 
   scm_module_define (lily_module, ly_symbol2scm ("point-and-click"), val);
+
+  store_locations_global_b =gh_procedure_p (val);
   return SCM_UNSPECIFIED;
 }
 
@@ -104,7 +109,7 @@ Input_file_results::do_deps ()
     {
       Path p = split_path (output_name_global);
       p.ext = "dep";
-      write_dependency_file (p.string (),
+      write_dependency_file (p.to_string (),
                             target_strings_,
                             inclusion_names_);
     }
@@ -158,7 +163,7 @@ Input_file_results::Input_file_results (String init_string, String file_string)
 {
   header_ = SCM_EOL;
   global_input_file = this;
-  ly_set_point_and_click_x (SCM_BOOL_F);
+  ly_set_point_and_click (SCM_BOOL_F);
   
   sources_.set_path (&global_path);
   
@@ -184,7 +189,7 @@ do_one_file (String init_string, String file_string)
    if (init_string.length () && global_path.find (init_string).empty_b ())
     {
       warning (_f ("can't find file: `%s'", init_string));
-      warning (_f ("(search path: `%s')", global_path.string ().to_str0 ()));
+      warning (_f ("(search path: `%s')", global_path.to_string ().to_str0 ()));
       return;
     }
   if ((file_string != "-") && global_path.find (file_string).empty_b ())