X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser-scheme.cc;h=5281f7e2a741c3b8867816ea0ec995afcbb0606a;hb=63218958ad166437d2b2ddb33857ab23336b43ba;hp=5f5b5a26fa161f2863b4fad108c57ea9a3e96052;hpb=710206d06b88e43c1776aab303bb46d5889c8dcb;p=lilypond.git diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc index 5f5b5a26fa..5281f7e2a7 100644 --- a/lily/lily-parser-scheme.cc +++ b/lily/lily-parser-scheme.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2011 Han-Wen Nienhuys + Copyright (C) 2005--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -148,9 +148,9 @@ LY_DEFINE (ly_parser_lexer, "ly:parser-lexer", LY_DEFINE (ly_parser_clone, "ly:parser-clone", 1, 1, 0, (SCM parser_smob, SCM closures), "Return a clone of @var{parser-smob}. An association list" -" of port positions to closures can be specified in @var{closures}" -" in order to have @code{$} and @code{#} interpreted in their original" -" lexical environment.") + " of port positions to closures can be specified in @var{closures}" + " in order to have @code{$} and @code{#} interpreted in their original" + " lexical environment.") { LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); Lily_parser *parser = unsmob_lily_parser (parser_smob); @@ -215,10 +215,10 @@ LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string", LY_DEFINE (ly_parse_string_expression, "ly:parse-string-expression", 2, 2, 0, (SCM parser_smob, SCM ly_code, SCM filename, - SCM line), + SCM line), "Parse the string @var{ly-code} with @var{parser-smob}." -" Return the contained music expression." -" @var{filename} and @var{line} are optional source indicators.") + " Return the contained music expression." + " @var{filename} and @var{line} are optional source indicators.") { LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); Lily_parser *parser = unsmob_lily_parser (parser_smob); @@ -237,19 +237,19 @@ LY_DEFINE (ly_parse_string_expression, "ly:parse-string-expression", if (!parser->lexer_->is_clean ()) { parser->parser_error (_ ("ly:parse-string-expression is only valid with a new parser." - " Use ly:parser-include-string instead.")); + " Use ly:parser-include-string instead.")); return SCM_UNSPECIFIED; } return parser->parse_string_expression (ly_scm2string (ly_code), - fn, ln); + fn, ln); } LY_DEFINE (ly_parser_include_string, "ly:parser-include-string", 2, 0, 0, (SCM parser_smob, SCM ly_code), "Include the string @var{ly-code} into the input stream" " for @var{parser-smob}. Can only be used in immediate" - " Scheme expressions (@code{$} instead of @code{#}).") + " Scheme expressions (@code{$} instead of @code{#}).") { LY_ASSERT_SMOB (Lily_parser, parser_smob, 1); Lily_parser *parser = unsmob_lily_parser (parser_smob); @@ -278,32 +278,6 @@ LY_DEFINE (ly_parser_set_note_names, "ly:parser-set-note-names", return SCM_UNSPECIFIED; } -LY_DEFINE (ly_parser_set_repetition_symbol, "ly:parser-set-repetition-symbol", - 2, 0, 0, (SCM parser, SCM sym), - "Replace the current repetition symbol in @var{parser}." - " @var{sym} is the new repetition symbol.") -{ - LY_ASSERT_SMOB (Lily_parser, parser, 1); - Lily_parser *p = unsmob_lily_parser (parser); - - p->lexer_->chord_repetition_.repetition_symbol_ = sym; - - return SCM_UNSPECIFIED; -} - -LY_DEFINE (ly_parser_set_repetition_function, "ly:parser-set-repetition-function", - 2, 0, 0, (SCM parser, SCM fun), - "Replace the current repetition function in @var{parser}." - " @var{fun} is the new repetition function.") -{ - LY_ASSERT_SMOB (Lily_parser, parser, 1); - Lily_parser *p = unsmob_lily_parser (parser); - - p->lexer_->chord_repetition_.repetition_function_ = fun; - - return SCM_UNSPECIFIED; -} - LY_DEFINE (ly_parser_output_name, "ly:parser-output-name", 1, 0, 0, (SCM parser), "Return the base name of the output file.")