X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser-scheme.cc;h=7dfeab6057b7dd4e12799e90b401a3c62b3de0c6;hb=f073e985d3aeafd05d1eef91dcd485fa589f1d8f;hp=4e22461638f6354289208371c8f009f673f8be1d;hpb=e9a308e9c6002900fc336733950a0175bcbcc333;p=lilypond.git diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc index 4e22461638..7dfeab6057 100644 --- a/lily/lily-parser-scheme.cc +++ b/lily/lily-parser-scheme.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2005--2007 Han-Wen Nienhuys + (c) 2005--2009 Han-Wen Nienhuys */ #include @@ -33,8 +33,8 @@ LY_DEFINE (ly_set_point_and_click, "ly:set-point-and-click", LY_DEFINE (ly_parse_file, "ly:parse-file", 1, 0, 0, (SCM name), - "Parse a single @code{.ly} file. " - "Upon failure, throw @code{ly-file-failed} key.") + "Parse a single @code{.ly} file." + " Upon failure, throw @code{ly-file-failed} key.") { LY_ASSERT_TYPE (scm_is_string, name, 1); string file = ly_scm2string (name); @@ -47,35 +47,27 @@ LY_DEFINE (ly_parse_file, "ly:parse-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 (); @@ -91,7 +83,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", chdir (dir.c_str ()); } else - out_file_name = File_name (output_name_global); + out_file_name = File_name (output_name); } string init; @@ -101,7 +93,6 @@ LY_DEFINE (ly_parse_file, "ly:parse-file", 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)); @@ -175,7 +166,7 @@ LY_DEFINE (ly_parser_define_x, "ly:parser-define!", LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); Lily_parser *parser = unsmob_lily_parser (parser_smob); - LY_ASSERT_TYPE (ly_is_symbol,symbol, 2); + LY_ASSERT_TYPE (ly_is_symbol, symbol, 2); parser->lexer_->set_identifier (scm_symbol_to_string (symbol), val); return SCM_UNSPECIFIED; @@ -183,14 +174,14 @@ LY_DEFINE (ly_parser_define_x, "ly:parser-define!", LY_DEFINE (ly_parser_lookup, "ly:parser-lookup", 2, 0, 0, (SCM parser_smob, SCM symbol), - "Lookup @var{symbol} in @var{parser-smob}'s module. " - "Undefined is '().") + "Look up @var{symbol} in @var{parser-smob}'s module." + " Return @code{'()} if not defined.") { LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); Lily_parser *parser = unsmob_lily_parser (parser_smob); - LY_ASSERT_TYPE (ly_is_symbol,symbol, 2); + LY_ASSERT_TYPE (ly_is_symbol, symbol, 2); SCM val = parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol))); if (val != SCM_UNDEFINED) @@ -201,12 +192,12 @@ LY_DEFINE (ly_parser_lookup, "ly:parser-lookup", LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string", 2, 0, 0, (SCM parser_smob, SCM ly_code), - "Parse the string @code{ly-code} with @code{parser-smob}." - "Upon failure, throw @code{ly-file-failed} key.") + "Parse the string @var{ly-code} with @var{parser-smob}." + " Upon failure, throw @code{ly-file-failed} key.") { LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); Lily_parser *parser = unsmob_lily_parser (parser_smob); - LY_ASSERT_TYPE(scm_is_string,ly_code, 2); + LY_ASSERT_TYPE (scm_is_string, ly_code, 2); parser->parse_string (ly_scm2string (ly_code)); @@ -215,9 +206,9 @@ LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string", LY_DEFINE (ly_parser_set_note_names, "ly:parser-set-note-names", 2, 0, 0, (SCM parser, SCM names), - "Replace current note names in @var{parser}. " - "@var{names} is an alist of symbols. " - "This only has effect if the current mode is notes.") + "Replace current note names in @var{parser}." + " @var{names} is an alist of symbols. This only has effect" + " if the current mode is notes.") { LY_ASSERT_SMOB (Lily_parser, parser, 1); Lily_parser *p = unsmob_lily_parser (parser); @@ -243,12 +234,12 @@ LY_DEFINE (ly_parser_output_name, "ly:parser-output-name", LY_DEFINE (ly_parser_error, "ly:parser-error", 2, 1, 0, (SCM parser, SCM msg, SCM input), - "Display an error message, and make the parser fail") + "Display an error message and make the parser fail.") { LY_ASSERT_SMOB (Lily_parser, parser, 1); Lily_parser *p = unsmob_lily_parser (parser); - LY_ASSERT_TYPE(scm_is_string,msg, 2); + LY_ASSERT_TYPE (scm_is_string, msg, 2); string s = ly_scm2string (msg); Input *i = unsmob_input (input);