source file of the GNU LilyPond music typesetter
- (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include <unistd.h>
#include "sources.hh"
#include "warn.hh"
-/* Do not append `!' suffix, since 1st argument is not modified. */
-LY_DEFINE (ly_set_point_and_click, "ly:set-point-and-click",
- 1, 0, 0, (SCM what),
- "Deprecated.")
-{
- (void) what;
- warning (_f ("deprecated function called: %s", "ly:set-point-and-click"));
- return SCM_UNSPECIFIED;
-}
-
LY_DEFINE (ly_parse_file, "ly:parse-file",
1, 0, 0, (SCM name),
"Parse a single @code{.ly} file."
file name. */
File_name out_file_name (file_name);
- global_path.append (out_file_name.dir_);
-
out_file_name.ext_ = "";
out_file_name.root_ = "";
- out_file_name.dir_ = "";
+ if (ly_get_option (ly_symbol2scm ("gui")) != SCM_BOOL_T
+ && ly_get_option (ly_symbol2scm ("strip-output-dir")) == SCM_BOOL_T) {
+ out_file_name.dir_ = "";
+ }
/* When running from gui, generate output in .ly source directory. */
- if (output_name_global.empty ()
- && ly_get_option (ly_symbol2scm ("gui")) == SCM_BOOL_T)
+ string output_name = output_name_global;
+ if (!output_name.empty ())
{
- File_name f (file);
- f.base_ = "";
- f.ext_ = "";
- output_name_global = f.to_string ();
- }
-
- if (!output_name_global.empty ())
- {
-
/* Interpret --output=DIR to mean --output=DIR/BASE. */
string dir;
- if (is_dir (output_name_global))
+ if (is_dir (output_name))
{
- dir = output_name_global;
- output_name_global = "";
+ dir = output_name;
+ output_name = "";
}
else
{
- File_name out (output_name_global);
+ File_name out (output_name);
if (is_dir (out.dir_part ()))
{
dir = out.dir_part ();
out_file_name = out.file_part ();
}
- }
+ }
if (dir != "" && dir != "." && dir != get_working_directory ())
{
chdir (dir.c_str ());
}
else
- out_file_name = File_name (output_name_global);
+ out_file_name = File_name (output_name);
}
string init;
init = "init.ly";
string out_file = out_file_name.to_string ();
-
if (init.length () && global_path.find (init).empty ())
{
warning (_f ("cannot find init file: `%s'", init));
}
/*
- outside the if-else to ensure cleanup fo Sources object,
+ outside the if-else to ensure cleanup fo Sources object,
*/
if (error)
/* TODO: pass renamed input file too. */
scm_throw (ly_symbol2scm ("ly-file-failed"),
scm_list_1 (ly_string2scm (file_name)));
-
+
return SCM_UNSPECIFIED;
}
3, 0, 0, (SCM parser_smob, SCM symbol, SCM val),
"Bind @var{symbol} to @var{val} in @var{parser-smob}'s module.")
{
-
+
LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
Lily_parser *parser = unsmob_lily_parser (parser_smob);
LY_ASSERT_TYPE (ly_is_symbol, symbol, 2);
-
+
parser->lexer_->set_identifier (scm_symbol_to_string (symbol), val);
return SCM_UNSPECIFIED;
}
LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
Lily_parser *parser = unsmob_lily_parser (parser_smob);
-
+
LY_ASSERT_TYPE (ly_is_symbol, symbol, 2);
SCM val = parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol)));
" Upon failure, throw @code{ly-file-failed} key.")
{
LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
- Lily_parser *parser = unsmob_lily_parser (parser_smob);
+ Lily_parser *parser = unsmob_lily_parser (parser_smob);
LY_ASSERT_TYPE (scm_is_string, ly_code, 2);
parser->parse_string (ly_scm2string (ly_code));
{
LY_ASSERT_SMOB (Lily_parser, parser, 1);
Lily_parser *p = unsmob_lily_parser (parser);
-
+
LY_ASSERT_TYPE (scm_is_string, msg, 2);
string s = ly_scm2string (msg);
-
+
Input *i = unsmob_input (input);
if (i)
p->parser_error (*i, s);
{
LY_ASSERT_SMOB (Lily_parser, parser, 1);
Lily_parser *p = unsmob_lily_parser (parser);
-
+
p->error_level_ = 0;
p->lexer_->error_level_ = 0;
-
+
return SCM_UNSPECIFIED;
}