%{ // -*-Fundamental-*-
/*
- parser.yy -- Bison/C++ parser for lilypond
+ parser.yy -- Bison/C++ parser for LilyPond
source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Jan Nieuwenhuizen <janneke@gnu.org>
*/
/*
- Four shift/reduce problems:
+FIXME:
-1. foo = bar.
-
- "bar" -> String -> Lyric -> Music -> music-assignment
-
- "bar" -> String -> string-assignment
-
-
-Similar problem for
-
- * \markup identifier.
- * \markup { }
-
-
-2. \repeat
- \repeat .. \alternative
-
-
- \repeat { \repeat .. \alternative }
-
-or
-
- \repeat { \repeat } \alternative
-
-)
-
---hwn
-
- */
-
-/*
-
-TODO:
-
-* The rules for who is protecting what are very shady. Uniformise
- this.
-
-* There are too many lexical modes?
+ * The rules for who is protecting what are very shady. Uniformise
+ this.
+ * There are too many lexical modes?
*/
+#include "config.hh"
+
#include <ctype.h>
#include <stdlib.h>
#include <stdio.h>
-#include "scm-option.hh"
+#include "book.hh"
#include "context-def.hh"
-#include "lily-guile.hh"
-#include "misc.hh"
-#include "my-lily-lexer.hh"
-#include "paper-def.hh"
-#include "midi-def.hh"
-#include "main.hh"
-#include "file-path.hh"
-#include "warn.hh"
#include "dimensions.hh"
-#include "my-lily-parser.hh"
-#include "score.hh"
-#include "input-file-results.hh"
+#include "event.hh"
+#include "file-path.hh"
+#include "input-smob.hh"
#include "input.hh"
+#include "lily-guile.hh"
#include "lilypond-input-version.hh"
+#include "main.hh"
+#include "misc.hh"
+#include "lily-lexer.hh"
+#include "lily-parser.hh"
+#include "paper-book.hh"
+#include "output-def.hh"
#include "scm-hash.hh"
-#include "ly-modules.hh"
-#include "music-sequence.hh"
-#include "input-smob.hh"
-#include "event.hh"
-#include "text-item.hh"
-#include "music-list.hh"
+#include "program-option.hh"
+#include "score.hh"
+#include "text-interface.hh"
+#include "warn.hh"
#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
Music *property_op_to_music (SCM op);
-Music *context_spec_music (SCM type, SCM id, Music * m, SCM ops_);
-SCM get_next_unique_context ();
+Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops);
+SCM get_next_unique_context_id ();
+SCM get_next_unique_lyrics_context_id ();
+
+#undef _
+#if !HAVE_GETTEXT
+#define _(x) x
+#else
+#include <libintl.h>
+#define _(x) gettext (x)
+#endif
#define YYERROR_VERBOSE 1
-My_lily_parser* my_lily_parser;
#define YYPARSE_PARAM my_lily_parser
#define YYLEX_PARAM my_lily_parser
#define THIS\
- ((My_lily_parser *) my_lily_parser)
+ ((Lily_parser *) my_lily_parser)
#define yyerror THIS->parser_error
-/*
- Add symbols to the TAGS field of a music object.
-*/
+/* We use custom location type: Input objects */
+#define YYLTYPE Input
+#define YYLLOC_DEFAULT(Current,Rhs,N) \
+ ((Current).set_location ((Rhs)[1], (Rhs)[N]))
+
+
+/* Add symbols to the TAGS field of a music object. */
void
-tag_music (Music*m, SCM tag, Input ip)
+tag_music (Music *m, SCM tag, Input ip)
{
- SCM tags = m->get_mus_property ("tags");
- if (gh_symbol_p (tag))
+ SCM tags = m->get_property ("tags");
+ if (scm_is_symbol (tag))
tags = scm_cons (tag, tags);
- else if (gh_list_p (tag))
- tags = gh_append2 (tag, tags);
+ else if (ly_c_list_p (tag))
+ tags = ly_append2 (tag, tags);
else
- ip.warning (_("Tag must be symbol or list of symbols."));
+ ip.warning (_ ("tag must be symbol or list of symbols"));
- m->set_mus_property ("tags", tags);
+ m->set_property ("tags", tags);
}
-
-
bool
-regular_identifier_b (SCM id)
+is_regular_identifier (SCM id)
{
String str = ly_scm2string (id);
- char const *s = str.to_str0 () ;
+ char const *s = str.to_str0 ();
bool v = true;
+#if 0
+ isalpha (*s);
+ s++;
+#endif
while (*s && v)
{
- v = v && isalpha (*s);
+ v = v && isalnum (*s);
s++;
}
return v;
}
+
SCM
-make_simple_markup (SCM a)
+get_first_context_id (SCM type, Music *m)
{
- static SCM simple;
- if (!simple)
- simple = scm_c_eval_string ("simple-markup");
-
- return scm_list_n (simple, a, SCM_UNDEFINED);
+ SCM id = m->get_property ("context-id");
+ if (SCM_BOOL_T == scm_equal_p (m->get_property ("context-type"), type)
+ && scm_is_string (m->get_property ("context-id"))
+ && scm_c_string_length (id) > 0)
+ {
+ return id;
+ }
+ return SCM_EOL;
}
+SCM
+make_simple_markup (SCM a)
+{
+ SCM simple = ly_lily_module_constant ("simple-markup");
+ return scm_list_2 (simple, a);
+}
bool
-is_duration_b (int t)
+is_duration (int t)
{
return t && t == 1 << intlog2 (t);
}
void
set_music_properties (Music *p, SCM a)
{
- for (SCM k = a; gh_pair_p (k); k = ly_cdr (k))
- {
- p->internal_set_mus_property (ly_caar (k), ly_cdar (k));
- }
+ for (SCM k = a; scm_is_pair (k); k = scm_cdr (k))
+ p->internal_set_property (scm_caar (k), scm_cdar (k));
}
SCM
if (step == 7)
alter += FLAT;
- while(step < 0)
+ while (step < 0)
step += 7;
- Pitch m((step -1) / 7 , (step - 1) % 7, alter);
+ Pitch m ((step -1) / 7, (step - 1) % 7, alter);
return m.smobbed_copy ();
}
SCM
make_chord (SCM pitch, SCM dur, SCM modification_list)
{
- static SCM chord_ctor;
- if (!chord_ctor)
- chord_ctor= scm_c_eval_string ("construct-chord");
- SCM ch= scm_call_3 (chord_ctor, pitch, dur, modification_list);
+ SCM chord_ctor = ly_lily_module_constant ("construct-chord");
+ SCM ch = scm_call_3 (chord_ctor, pitch, dur, modification_list);
scm_gc_protect_object (ch);
return ch;
}
-/*
- Todo: actually also use apply iso. call too ...
-*/
+/* Todo: actually also use apply iso. call too ... */
bool
ly_input_procedure_p (SCM x)
{
- return gh_procedure_p (x)
- || (gh_pair_p (x) && gh_procedure_p (gh_car (x)));
+ return ly_c_procedure_p (x)
+ || (scm_is_pair (x) && ly_c_procedure_p (scm_car (x)));
}
-Music*
+Music*
set_property_music (SCM sym, SCM value)
{
- Music * p = MY_MAKE_MUSIC("PropertySet");
- p->set_mus_property ("symbol", sym);
- p->set_mus_property ("value", value);
+ Music *p = MY_MAKE_MUSIC ("PropertySet");
+ p->set_property ("symbol", sym);
+ p->set_property ("value", value);
return p;
}
+Music*
+make_music_relative (Pitch start, Music *music)
+{
+ Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic");
+ relative->set_property ("element", music->self_scm ());
+
+ Pitch last = music->to_relative_octave (start);
+ if (lily_1_8_relative)
+ music->set_property ("last-pitch", last.smobbed_copy ());
+ return relative;
+}
+
+Music*
+make_lyric_combine_music (SCM name, Music *music)
+{
+ Music *combine = MY_MAKE_MUSIC ("LyricCombineMusic");
+ combine->set_property ("element", music->self_scm ());
+ combine->set_property ("associated-context", name);
+ return combine;
+}
+
%}
/* We use SCMs to do strings, because it saves us the trouble of
deleting them. Let's hope that a stack overflow doesnt trigger a move
of the parse stack onto the heap. */
+%left ADDLYRICS
%union {
- String * string;
- Music *music;
- Score *score;
- Music_output_def * outputdef;
- SCM scm;
- int i;
+ Book *book;
+ Output_def *outputdef;
+ SCM scm;
+ String *string;
+ Music *music;
+ Score *score;
+ int i;
}
%{
int
-yylex (YYSTYPE *s, void * v)
+yylex (YYSTYPE *s, YYLTYPE *loc, void *v)
{
- My_lily_parser *pars = (My_lily_parser*) v;
- My_lily_lexer * lex = pars->lexer_;
+ Lily_parser *pars = (Lily_parser*) v;
+ Lily_lexer *lex = pars->lexer_;
lex->lexval = (void*) s;
- lex->prepare_for_next_token();
+ lex->lexloc = loc;
+ lex->prepare_for_next_token ();
return lex->yylex ();
}
%}
+%expect 1
+
+/* One shift/reduce problem
+
+1. \repeat
+ \repeat .. \alternative
+
+ \repeat { \repeat .. \alternative }
+
+or
+
+ \repeat { \repeat } \alternative
+*/
+
+
%pure_parser
+%locations
+
+/* The third option is an alias that will be used to display the
+ syntax error. Bison CVS now correctly handles backslash escapes.
+
+ FIXME: Bison needs to translate some of these, eg, STRING.
+
+*/
+
+/* Keyword tokens with plain escaped name. */
+%token ACCEPTS "\\accepts"
+%token ADDLYRICS "\\addlyrics"
+%token ADDQUOTE "\\addquote"
+%token ALIAS "\\alias"
+%token ALTERNATIVE "\\alternative"
+%token BAR "\\bar"
+%token BOOK "\book"
+%token CHANGE "\\change"
+%token CHORDMODE "\\chordmode"
+%token CHORDS "\\chords"
+%token CLEF "\\clef"
+%token CONSISTS "\\consists"
+%token CONTEXT "\\context"
+%token DEFAULT "\\default"
+%token DEFAULTCHILD "\\defaultchild"
+%token DENIES "\\denies"
+%token DESCRIPTION "\\description"
+%token DRUMMODE "\\drummode"
+%token DRUMS "\\drums"
+%token FIGUREMODE "\\figuremode"
+%token FIGURES "\\figures"
+%token GROBDESCRIPTIONS "\\grobdescriptions"
+%token HEADER "\\header"
+%token INVALID "\\invalid"
+%token KEY "\\key"
+%token LAYOUT "\\layout"
+%token LYRICMODE "\\lyricmode"
+%token LYRICS "\\lyrics"
+%token LYRICSTO "\\lyricsto"
+%token MARK "\\mark"
+%token MARKUP "\\markup"
+%token MIDI "\\midi"
+%token NAME "\\name"
+%token NOTEMODE "\\notemode"
+%token OBJECTID "\\objectid"
+%token OCTAVE "\\octave"
+%token ONCE "\\once"
+%token OVERRIDE "\\override"
+%token PAPER "\\paper"
+%token PARTIAL "\\partial"
+%token RELATIVE "\\relative"
+%token REMOVE "\\remove"
+%token REPEAT "\\repeat"
+%token REST "\\rest"
+%token REVERT "\\revert"
+%token SCORE "\\score"
+%token SEQUENTIAL "\\sequential"
+%token SET "\\set"
+%token SIMULTANEOUS "\\simultaneous"
+%token SKIP "\\skip"
+%token TAG "\\tag"
+%token TEMPO "\\tempo"
+%token TIMES "\\times"
+%token TRANSPOSE "\\transpose"
+%token TRANSPOSITION "\\transposition"
+%token TYPE "\\type"
+%token UNSET "\\unset"
+%token WITH "\\with"
+
+/* Keyword token exceptions. */
+%token TIME_T "\\time"
+%token NEWCONTEXT "\\new"
+
+
+/* Other string tokens. */
+
+%token CHORD_BASS "/+"
+%token CHORD_CARET "^"
+%token CHORD_COLON ":"
+%token CHORD_MINUS "-"
+%token CHORD_SLASH "/"
+%token DOUBLE_ANGLE_CLOSE ">>"
+%token DOUBLE_ANGLE_OPEN "<<"
+%token E_BACKSLASH "\\"
+%token E_ANGLE_CLOSE "\\>"
+%token E_CHAR "\\C[haracter]"
+%token E_CLOSE "\\)"
+%token E_EXCLAMATION "\\!"
+%token E_BRACKET_OPEN "\\["
+%token E_OPEN "\\("
+%token E_BRACKET_CLOSE "\\]"
+%token E_ANGLE_OPEN "\\<"
+%token E_TILDE "\\~"
+%token EXTENDER "__"
+/* These used at all?
+ %token FIGURE_BRACKET_CLOSE
+ %token FIGURE_BRACKET_OPEN
+
+parser.yy:348.8-25: warning: symbol `"\\>"' used more than once as a literal string
+parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal string
+*/
+%token FIGURE_CLOSE /* "\\>" */
+%token FIGURE_OPEN /* "\\<" */
+%token FIGURE_SPACE "_"
+%token HYPHEN "--"
-%token ACCEPTS
-%token ADDLYRICS
-%token NEWADDLYRICS
-%token ALIAS
-%token ALTERNATIVE
-%token APPLY
-%token APPLYCONTEXT
-%token APPLYOUTPUT
-%token AUTOCHANGE
-%token BAR
-%token BREATHE
-%token CHANGE
-%token CHORDMODIFIERS
-%token CHORDS
-%token LESSLESS
-%token MOREMORE
-%token CLEF
+%token CHORDMODIFIERS
%token COMMANDSPANREQUEST
-%token CONSISTS
-%token CONSISTSEND
-%token CONTEXT
-%token DEFAULT
-%token DENIES
-%token DESCRIPTION
-%token EXTENDER
-%token FIGURES FIGURE_OPEN FIGURE_CLOSE
-%token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN
-%token GRACE
-%token ACCIACCATURA
-%token APPOGGIATURA
-%token GROBDESCRIPTIONS
-%token HEADER
-%token HYPHEN
-%token INVALID
-%token KEY
-%token LYRICS
-%token MARK
-%token MIDI
+%token LYRIC_MARKUP
%token MULTI_MEASURE_REST
-%token NAME
-%token NEWCONTEXT
-%token NOTES
-%token OCTAVE
-%token ONCE
-%token OVERRIDE SET REVERT
-%token PAPER
-%token PARTCOMBINE
-%token PARTIAL
-%token PROPERTY
-%token RELATIVE
-%token REMOVE
-%token REPEAT
-%token REST
%token SCM_T
-%token SCORE
-%token SEQUENTIAL
-%token SIMULTANEOUS
-%token SKIP
-%token SPANREQUEST
-%token TAG
-%token TEMPO
-%token TIMES
-%token TIME_T
-%token TRANSLATOR
-%token TRANSPOSE
-%token TYPE
-%token UNSET
-%token WITH
-
-/* escaped */
-%token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE
-%token E_LEFTSQUARE E_RIGHTSQUARE E_TILDE
-%token E_BACKSLASH
+
+
+%token <i> DIGIT
%token <i> E_UNSIGNED
-%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET CHORD_SLASH
-%token FIGURE_SPACE
-
-%type <i> exclamations questions dots optional_rest
-%type <i> bass_mod
-%type <scm> grace_head
-%type <scm> oct_check
-%type <scm> context_mod_list
-%type <scm> lyric_element
-%type <scm> bass_number br_bass_figure bass_figure figure_list figure_spec
-%token <i> DIGIT
-%token <scm> NOTENAME_PITCH
-%token <scm> TONICNAME_PITCH
-%token <scm> CHORDMODIFIER_PITCH
-%token <scm> DURATION_IDENTIFIER
-%token <scm> FRACTION
-%token <id> IDENTIFIER
-%token DRUMS
-%token <scm> DRUM_PITCH
-%token <scm> CHORD_MODIFIER
-%token <scm> SCORE_IDENTIFIER
-%token <scm> MUSIC_OUTPUT_DEF_IDENTIFIER
-%token <scm> NUMBER_IDENTIFIER
-%token <scm> EVENT_IDENTIFIER
-%token <scm> MUSIC_IDENTIFIER TRANSLATOR_IDENTIFIER
-%token <scm> STRING_IDENTIFIER SCM_IDENTIFIER
-%token <scm> RESTNAME
-%token <scm> STRING
-%token <scm> SCM_T
-%token <i> UNSIGNED
-%token <scm> REAL
-
-%token MARKUP
-%token <scm> MARKUP_HEAD_MARKUP0
+%token <i> UNSIGNED
+
+%token <id> IDENTIFIER
+
+%token <scm> CHORDMODIFIER_PITCH
+%token <scm> CHORD_MODIFIER
+%token <scm> CONTEXT_DEF_IDENTIFIER
+%token <scm> DRUM_PITCH
+%token <scm> DURATION_IDENTIFIER
+%token <scm> EVENT_IDENTIFIER
+%token <scm> FRACTION
+%token <scm> LYRICS_STRING
+%token <scm> LYRIC_MARKUP_IDENTIFIER
%token <scm> MARKUP_HEAD_EMPTY
+%token <scm> MARKUP_HEAD_LIST0
+%token <scm> MARKUP_HEAD_MARKUP0
%token <scm> MARKUP_HEAD_MARKUP0_MARKUP1
%token <scm> MARKUP_HEAD_SCM0
%token <scm> MARKUP_HEAD_SCM0_MARKUP1
-%token <scm> MARKUP_HEAD_SCM0_SCM1
-%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
+%token <scm> MARKUP_HEAD_SCM0_SCM1
%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
-
-%token <scm> MARKUP_IDENTIFIER MARKUP_HEAD_LIST0
-%type <scm> markup markup_line markup_list markup_list_body full_markup
-
-%type <outputdef> output_def
-%type <scm> lilypond_header lilypond_header_body
-%type <music> open_event close_event
-%type <i> sub_quotes sup_quotes
-%type <music> simple_element event_chord command_element Simple_music Composite_music
-%type <music> Repeated_music
-%type <scm> Alternative_music
-%type <i> tremolo_type
-%type <i> bare_int bare_unsigned
-%type <i> script_dir
-%type <scm> identifier_init
-
-%type <music> note_chord_element chord_body chord_body_element
-%type <scm> chord_body_elements
-%type <scm> steno_duration optional_notemode_duration multiplied_duration
-
-%type <scm> post_events
-%type <music> gen_text_def direction_less_event direction_reqd_event
-%type <scm> steno_pitch pitch absolute_pitch pitch_also_in_chords
-%type <scm> steno_tonic_pitch
-%type <scm> duration_length fraction
-
-%type <scm> new_chord step_number chord_items chord_item chord_separator step_numbers
-
-%type <scm> embedded_scm scalar
-%type <music> Music Sequential_music Simultaneous_music
-%type <music> relative_music re_rhythmed_music
-%type <music> music_property_def context_change
-%type <scm> Music_list
-%type <scm> property_operation context_mod translator_mod optional_context_mod
-%type <outputdef> music_output_def_body music_output_def_head
-%type <music> shorthand_command_req
-%type <music> post_event tagged_post_event
-%type <music> command_req verbose_command_req
+%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
+%token <scm> MARKUP_IDENTIFIER
+%token <scm> MUSIC_FUNCTION
+%token <scm> MUSIC_FUNCTION_MARKUP
+%token <scm> MUSIC_FUNCTION_MARKUP_MARKUP
+%token <scm> MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC
+%token <scm> MUSIC_FUNCTION_MARKUP_MUSIC
+%token <scm> MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC
+%token <scm> MUSIC_FUNCTION_MUSIC
+%token <scm> MUSIC_FUNCTION_MUSIC_MUSIC
+%token <scm> MUSIC_FUNCTION_SCM
+%token <scm> MUSIC_FUNCTION_SCM_MUSIC
+%token <scm> MUSIC_FUNCTION_SCM_MUSIC_MUSIC
+%token <scm> MUSIC_FUNCTION_SCM_SCM
+%token <scm> MUSIC_FUNCTION_SCM_SCM_MUSIC
+%token <scm> MUSIC_IDENTIFIER
+%token <scm> NOTENAME_PITCH
+%token <scm> NUMBER_IDENTIFIER
+%token <scm> OUTPUT_DEF_IDENTIFIER
+%token <scm> REAL
+%token <scm> RESTNAME
+%token <scm> SCM_IDENTIFIER
+%token <scm> SCM_T
+%token <scm> SCORE_IDENTIFIER
+%token <scm> STRING
+%token <scm> STRING_IDENTIFIER
+%token <scm> TONICNAME_PITCH
+
+
+%type <book> book_block
+%type <book> book_body
+
+%type <i> bare_unsigned
+%type <i> bass_mod
+%type <i> dots
+%type <i> exclamations
+%type <i> optional_rest
+%type <i> questions
+%type <i> script_dir
+%type <i> sub_quotes
+%type <i> sup_quotes
+%type <i> tremolo_type
+
+%type <music> Composite_music
+%type <music> Generic_prefix_music
+%type <music> Grouped_music_list
+%type <music> Music
+%type <music> Prefix_composite_music
+%type <music> Repeated_music
+%type <music> Sequential_music
+%type <music> Simple_music
+%type <music> Simultaneous_music
+%type <music> chord_body
+%type <music> chord_body_element
+%type <music> command_element
+%type <music> command_req
+%type <music> context_change
+%type <music> direction_less_event
+%type <music> direction_reqd_event
+%type <music> event_chord
+%type <music> gen_text_def
+%type <music> music_property_def
+%type <music> note_chord_element
+%type <music> post_event
+%type <music> re_rhythmed_music
+%type <music> relative_music
+%type <music> simple_element
%type <music> string_number_event
-%type <scm> string bare_number number_expression number_term number_factor
-%type <score> score_block score_body
+%type <music> tagged_post_event
+%type <music> tempo_event
+%type <music> toplevel_music
-%type <scm> translator_spec_block translator_spec_body
-%type <music> tempo_event
-%type <scm> script_abbreviation
+%type <outputdef> output_def_body
+%type <outputdef> output_def_head
+%type <outputdef> output_def
+%type <outputdef> paper_block
+%type <scm> Alternative_music
+%type <scm> Generic_prefix_music_scm
+%type <scm> Music_list
+%type <scm> absolute_pitch
+%type <scm> assignment_id
+%type <scm> bare_number
+%type <scm> bass_figure
+%type <scm> bass_number
+%type <scm> br_bass_figure
+%type <scm> chord_body_elements
+%type <scm> chord_item
+%type <scm> chord_items
+%type <scm> chord_separator
+%type <scm> context_def_mod
+%type <scm> context_def_spec_block
+%type <scm> context_def_spec_body
+%type <scm> context_mod
+%type <scm> context_mod_list
+%type <scm> context_prop_spec
+%type <scm> direction_less_char
+%type <scm> duration_length
+%type <scm> embedded_scm
+%type <scm> figure_list
+%type <scm> figure_spec
+%type <scm> fraction
+%type <scm> full_markup
+%type <scm> identifier_init
+%type <scm> lilypond_header
+%type <scm> lilypond_header_body
+%type <scm> lyric_element
+%type <scm> lyric_markup
+%type <scm> markup
+%type <scm> markup_braced_list
+%type <scm> markup_braced_list_body
+%type <scm> markup_composed_list
+%type <scm> markup_head_1_item
+%type <scm> markup_head_1_list
+%type <scm> markup_list
+%type <scm> markup_top
+%type <scm> mode_changing_head
+%type <scm> mode_changing_head_with_context
+%type <scm> multiplied_duration
+%type <scm> new_chord
+%type <scm> new_lyrics
+%type <scm> number_expression
+%type <scm> number_factor
+%type <scm> number_term
+%type <scm> object_id_setting
+%type <scm> octave_check
+%type <scm> optional_context_mod
+%type <scm> optional_notemode_duration
+%type <scm> pitch
+%type <scm> pitch_also_in_chords
+%type <scm> post_events
+%type <scm> property_operation
+%type <scm> scalar
+%type <scm> script_abbreviation
+%type <scm> simple_markup
+%type <scm> simple_string
+%type <scm> steno_duration
+%type <scm> steno_pitch
+%type <scm> steno_tonic_pitch
+%type <scm> step_number
+%type <scm> step_numbers
+%type <scm> string
+
+%type <score> score_block
+%type <score> score_body
%left '-' '+'
%%
lilypond: /* empty */
- | lilypond toplevel_expression {}
- | lilypond assignment { }
+ | lilypond toplevel_expression {
+ }
+ | lilypond assignment {
+ }
| lilypond error {
- THIS->error_level_ = 1;
+ THIS->error_level_ = 1;
}
| lilypond INVALID {
- THIS->error_level_ = 1;
+ THIS->error_level_ = 1;
}
;
+
+object_id_setting:
+ OBJECTID STRING { $$ = $2; }
+ ;
+
toplevel_expression:
lilypond_header {
- THIS->input_file_->header_ = $1;
+ THIS->lexer_->set_identifier (ly_symbol2scm ("$globalheader"), $1);
}
- | score_block {
- Score * sc = $1;
-
- SCM head = ly_module_p (sc->header_) ? sc->header_ : THIS->input_file_->header_.to_SCM ();
-
- Path p = split_path (THIS->output_basename_);
- int *c = &THIS->input_file_->score_count_;
- if (*c)
- {
- p.base += "-" + to_string (*c);
- }
-
- (*c)++;
- SCM outname = scm_makfrom0str (p.to_string ().to_str0());
-
- for (int i=0; i < sc->defs_.size (); i++)
- default_rendering (sc->music_, sc->defs_[i]->self_scm(),head, outname);
-
- if (sc->defs_.empty ())
- {
- Music_output_def *id =
- unsmob_music_output_def (THIS->lexer_->lookup_identifier
- ("$defaultpaper"));
-
- id = id ? id->clone () : new Paper_def;
+ | add_quote {
- default_rendering (sc->music_, id->self_scm(), head, outname);
-
- scm_gc_unprotect_object (id->self_scm ());
- }
- scm_gc_unprotect_object (sc->self_scm());
+ }
+ | book_block {
+ Book *book = $1;
+ SCM proc = THIS->lexer_->lookup_identifier ("toplevel-book-handler");
+ scm_call_2 (proc, THIS->self_scm (), book->self_scm ());
+ scm_gc_unprotect_object (book->self_scm ());
+ }
+ | score_block {
+ Score *score = $1;
+
+ SCM proc = THIS->lexer_->lookup_identifier ("toplevel-score-handler");
+ scm_call_2 (proc, THIS->self_scm (), score->self_scm ());
+ scm_gc_unprotect_object (score->self_scm ());
+ }
+ | toplevel_music {
+ Music *music = $1;
+ SCM proc = THIS->lexer_->lookup_identifier ("toplevel-music-handler");
+ scm_call_2 (proc, THIS->self_scm (), music->self_scm ());
+ scm_gc_unprotect_object (music->self_scm ());
+ }
+ | full_markup {
+ SCM proc = THIS->lexer_->lookup_identifier ("toplevel-text-handler");
+ scm_call_2 (proc, THIS->self_scm (), $1);
}
| output_def {
SCM id = SCM_EOL;
- if (dynamic_cast<Paper_def*> ($1))
- id = scm_makfrom0str ("$defaultpaper");
- else if (dynamic_cast<Midi_def*> ($1))
- id = scm_makfrom0str ("$defaultmidi");
- THIS->lexer_->set_identifier (id, $1->self_scm ());
- scm_gc_unprotect_object ($1->self_scm ());
+ Output_def * od = $1;
+
+ if ($1->c_variable ("is-paper") == SCM_BOOL_T)
+ id = ly_symbol2scm ("$defaultpaper");
+ else if ($1->c_variable ("is-midi") == SCM_BOOL_T)
+ id = ly_symbol2scm ("$defaultmidi");
+ else if ($1->c_variable ("is-layout") == SCM_BOOL_T)
+ id = ly_symbol2scm ("$defaultlayout");
+
+ THIS->lexer_->set_identifier (id, od->self_scm ());
+ scm_gc_unprotect_object (od->self_scm ());
+ }
+ ;
+
+toplevel_music:
+ Composite_music {
}
;
embedded_scm:
SCM_T
- | SCM_IDENTIFIER
+ | SCM_IDENTIFIER
;
-
-
lilypond_header_body:
{
- $$ = ly_make_anonymous_module ();
+ $$ = ly_make_anonymous_module (be_safe_global);
THIS->lexer_->add_scope ($$);
}
- | lilypond_header_body assignment {
+ | lilypond_header_body assignment {
}
;
lilypond_header:
HEADER '{' lilypond_header_body '}' {
- $$ = THIS->lexer_-> remove_scope();
+ $$ = THIS->lexer_->remove_scope ();
}
;
-
/*
DECLARATIONS
*/
-assignment:
- STRING {
- THIS->push_spot ();
- }
- /* cont */ '=' identifier_init {
-
- /*
- Should find generic way of associating input with objects.
- */
- Input ip = THIS->pop_spot ();
+assignment_id:
+ STRING { $$ = $1; }
+ | LYRICS_STRING { $$ = $1; }
+ ;
- if (! regular_identifier_b ($1))
+assignment:
+ assignment_id '=' identifier_init {
+ if (! is_regular_identifier ($1))
{
- ip.warning (_ ("Identifier should have alphabetic characters only"));
+ @1.warning (_ ("identifier should have alphabetic characters only"));
}
- THIS->lexer_->set_identifier ($1, $4);
+ THIS->lexer_->set_identifier ($1, $3);
/*
TODO: devise standard for protection in parser.
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
- | full_markup {
- $$ = $1;
- }
| output_def {
$$ = $1->self_scm ();
scm_gc_unprotect_object ($$);
}
- | translator_spec_block {
+ | context_def_spec_block {
$$ = $1;
}
| Music {
scm_gc_unprotect_object ($$);
}
| number_expression {
- $$ = $1;
+ $$ = $1;
}
| string {
$$ = $1;
}
- | embedded_scm {
+ | embedded_scm {
$$ = $1;
}
+ | full_markup {
+ $$ = $1;
+ }
+ | DIGIT {
+ $$ = scm_int2num ($1);
+ }
;
-translator_spec_block:
- TRANSLATOR '{' translator_spec_body '}'
+context_def_spec_block:
+ CONTEXT '{' context_def_spec_body '}'
{
$$ = $3;
}
;
-translator_spec_body:
+context_def_spec_body:
/**/ {
$$ = Context_def::make_scm ();
- unsmob_context_def ($$)->set_spot (THIS->here_input ());
+ unsmob_context_def ($$)->set_spot (@$);
}
- | TRANSLATOR_IDENTIFIER {
+ | CONTEXT_DEF_IDENTIFIER {
$$ = $1;
- unsmob_context_def ($$)->set_spot (THIS->here_input ());
+ unsmob_context_def ($$)->set_spot (@$);
}
- | translator_spec_body GROBDESCRIPTIONS embedded_scm {
- Context_def*td = unsmob_context_def($$);
+ | context_def_spec_body GROBDESCRIPTIONS embedded_scm {
+ Context_def*td = unsmob_context_def ($$);
+
+ for (SCM p = $3; scm_is_pair (p); p = scm_cdr (p)) {
+ SCM tag = scm_caar (p);
- for (SCM p = $3; gh_pair_p (p); p = ly_cdr (p)) {
- SCM tag = gh_caar (p);
- td->add_context_mod (scm_list_n (ly_symbol2scm ("assign"),
- tag, ly_cdar (p), SCM_UNDEFINED));
+ /* TODO: should make new tag "grob-definition" ? */
+ td->add_context_mod (scm_list_3 (ly_symbol2scm ("assign"),
+ tag, scm_cons (scm_cdar (p), SCM_EOL)));
}
}
- | translator_spec_body context_mod {
+ | context_def_spec_body context_mod {
unsmob_context_def ($$)->add_context_mod ($2);
}
;
-/*
- SCORE
-*/
-score_block:
- SCORE {
- THIS->push_spot ();
+
+
+book_block:
+ BOOK '{' book_body '}' {
+ $$ = $3;
}
- /*cont*/ '{' score_body '}' {
- THIS->pop_spot ();
- $$ = $4;
+ ;
+/* FIXME:
+ * Use 'handlers' like for toplevel-* stuff?
+ * grok \layout and \midi? */
+book_body:
+ {
+ $$ = new Book;
+ $$->set_spot (@$);
+ $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
+ scm_gc_unprotect_object ($$->paper_->self_scm ());
+ $$->header_ = THIS->lexer_->lookup_identifier ("$globalheader");
+ }
+ | book_body paper_block {
+ $$->paper_ = $2;
+ scm_gc_unprotect_object ($2->self_scm ());
+ }
+ | book_body score_block {
+ SCM s = $2->self_scm ();
+ $$->add_score (s);
+ scm_gc_unprotect_object (s);
+ }
+ | book_body full_markup {
+ $$->add_score ($2);
+ }
+ | book_body lilypond_header {
+ $$->header_ = $2;
+ }
+ | book_body error {
+ $$->paper_ = 0;
+ $$->scores_ = SCM_EOL;
+ }
+ | book_body object_id_setting {
+ $$->user_key_ = ly_scm2string ($2);
+ }
+ ;
+
+score_block:
+ SCORE '{' score_body '}' {
+ $$ = $3;
}
;
score_body:
- Music {
- $$ = new Score;
-
- $$->set_spot (THIS->here_input ());
+ Music {
SCM m = $1->self_scm ();
scm_gc_unprotect_object (m);
+ SCM scorify = ly_lily_module_constant ("scorify-music");
+ SCM score = scm_call_2 (scorify, m, THIS->self_scm ());
- /*
- guh.
- */
- SCM check_funcs = scm_c_eval_string ("toplevel-music-functions");
- for (; gh_pair_p (check_funcs); check_funcs = gh_cdr (check_funcs))
- m = gh_call1 (gh_car (check_funcs), m);
- $$->music_ = m;
-
+ // pass ownernship to C++ again.
+ scm_gc_protect_object (score);
+ $$ = unsmob_score (score);
+ $$->set_spot (@$);
}
| SCORE_IDENTIFIER {
- $$ = new Score ( *unsmob_score ($1));
- $$->set_spot (THIS->here_input ());
+ $$ = unsmob_score ($1);
+ $$->set_spot (@$);
+ }
+ | score_body object_id_setting {
+ $$->user_key_ = ly_scm2string ($2);
}
| score_body lilypond_header {
$$->header_ = $2;
}
| score_body output_def {
- $$->defs_.push ($2);
+ if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
+ {
+ THIS->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead"));
+
+ }
+ else
+ {
+ $$->defs_.push ($2);
+ }
scm_gc_unprotect_object ($2->self_scm ());
}
| score_body error {
-
+ $$->error_found_ = true;
}
;
/*
- MIDI
+ OUTPUT DEF
*/
-output_def:
- music_output_def_body '}' {
+
+paper_block:
+ output_def {
$$ = $1;
- THIS-> lexer_-> remove_scope ();
+ if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T)
+ {
+ THIS->parser_error (@1, _ ("need \\paper for paper block"));
+ $$ = get_paper (THIS);
+ }
}
;
-music_output_def_head:
- MIDI {
- Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultmidi"));
+output_def:
+ output_def_body '}' {
+ $$ = $1;
- Midi_def* p =0;
- if (id)
- p = dynamic_cast<Midi_def*> (id->clone ());
- else
- p = new Midi_def;
+ THIS->lexer_->remove_scope ();
+ THIS->lexer_->pop_state ();
+ }
+ ;
+output_def_head:
+ PAPER {
+ $$ = get_paper (THIS);
+ $$->input_origin_ = @$;
+ THIS->lexer_->add_scope ($$->scope_);
+ }
+ | MIDI {
+ Output_def *p = get_midi (THIS);
$$ = p;
THIS->lexer_->add_scope (p->scope_);
}
- | PAPER {
- Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"));
- Paper_def *p = 0;
- if (id)
- p = dynamic_cast<Paper_def*> (id->clone ());
- else
- p = new Paper_def;
+ | LAYOUT {
+ Output_def *p = get_layout (THIS);
THIS->lexer_->add_scope (p->scope_);
$$ = p;
;
-music_output_def_body:
- music_output_def_head '{' {
-
+output_def_body:
+ output_def_head '{' {
+ $$ = $1;
+ $$->input_origin_.set_spot (@$);
+ THIS->lexer_->push_initial_state ();
}
- | music_output_def_head '{' MUSIC_OUTPUT_DEF_IDENTIFIER {
- Music_output_def * o = unsmob_music_output_def ($3);
+ | output_def_head '{' OUTPUT_DEF_IDENTIFIER {
+ scm_gc_unprotect_object ($1->self_scm ());
+ Output_def *o = unsmob_output_def ($3);
+ o->input_origin_.set_spot (@$);
$$ = o;
THIS->lexer_->remove_scope ();
THIS->lexer_->add_scope (o->scope_);
+ THIS->lexer_->push_initial_state ();
}
- | music_output_def_body assignment {
+ | output_def_body assignment {
}
- | music_output_def_body translator_spec_block {
- $$->assign_translator ($2);
+ | output_def_body context_def_spec_block {
+ assign_context_def ($$, $2);
}
- | music_output_def_body tempo_event {
+ | output_def_body tempo_event {
/*
junk this ? there already is tempo stuff in
music.
*/
- int m = gh_scm2int ( $2->get_mus_property ("metronome-count"));
- Duration *d = unsmob_duration ($2->get_mus_property ("tempo-unit"));
- Midi_def * md = dynamic_cast<Midi_def*> ($$);
- if (md)
- md->set_tempo (d->get_length (), m);
+ int m = scm_to_int ($2->get_property ("metronome-count"));
+ Duration *d = unsmob_duration ($2->get_property ("tempo-unit"));
+ set_tempo ($$, d->get_length (), m);
scm_gc_unprotect_object ($2->self_scm ());
}
- | music_output_def_body error {
+ | output_def_body error {
}
;
tempo_event:
TEMPO steno_duration '=' bare_unsigned {
- $$ = MY_MAKE_MUSIC("MetronomeChangeEvent");
- $$->set_mus_property ("tempo-unit", $2);
- $$->set_mus_property ("metronome-count", gh_int2scm ( $4));
+ $$ = MY_MAKE_MUSIC ("MetronomeChangeEvent");
+ $$->set_property ("tempo-unit", $2);
+ $$->set_property ("metronome-count", scm_int2num ( $4));
}
;
(LIST . LAST-CONS)
- to have efficient append.
-*/
+ to have efficient append. */
+
Music_list:
/* empty */ {
$$ = scm_cons (SCM_EOL, SCM_EOL);
SCM s = $$;
SCM c = scm_cons ($2->self_scm (), SCM_EOL);
scm_gc_unprotect_object ($2->self_scm ()); /* UGH */
- if (gh_pair_p (ly_cdr (s)))
- gh_set_cdr_x (ly_cdr (s), c); /* append */
+
+ if (scm_is_pair (scm_cdr (s)))
+ scm_set_cdr_x (scm_cdr (s), c); /* append */
else
- gh_set_car_x (s, c); /* set first cons */
- gh_set_cdr_x (s, c) ; /* remember last cell */
+ scm_set_car_x (s, c); /* set first cons */
+ scm_set_cdr_x (s, c); /* remember last cell */
+ }
+ | Music_list embedded_scm {
+
}
| Music_list error {
+ Music * m = MY_MAKE_MUSIC("Music");
+ // ugh. code dup
+ m->set_property ("error-found", SCM_BOOL_T);
+ SCM s = $$;
+ SCM c = scm_cons (m->self_scm (), SCM_EOL);
+ scm_gc_unprotect_object (m->self_scm ()); /* UGH */
+
+ if (scm_is_pair (scm_cdr (s)))
+ scm_set_cdr_x (scm_cdr (s), c); /* append */
+ else
+ scm_set_car_x (s, c); /* set first cons */
+ scm_set_cdr_x (s, c); /* remember last cell */
}
;
-
Music:
Simple_music
| Composite_music
}
;
+
Repeated_music:
- REPEAT string bare_unsigned Music Alternative_music
+ REPEAT simple_string bare_unsigned Music Alternative_music
{
Music *beg = $4;
int times = $3;
- SCM alts = gh_pair_p ($5) ? gh_car ($5) : SCM_EOL;
+ SCM alts = scm_is_pair ($5) ? scm_car ($5) : SCM_EOL;
if (times < scm_ilength (alts)) {
- unsmob_music (gh_car (alts))
+ unsmob_music (scm_car (alts))
->origin ()->warning (
- _("More alternatives than repeats. Junking excess alternatives."));
+ _ ("more alternatives than repeats"));
+ warning ("junking excess alternatives");
alts = ly_truncate_list (times, alts);
}
- static SCM proc;
- if (!proc)
- proc = scm_c_eval_string ("make-repeated-music");
+ SCM proc = ly_lily_module_constant ("make-repeated-music");
SCM mus = scm_call_1 (proc, $2);
- scm_gc_protect_object (mus); // UGH.
- Music *r =unsmob_music (mus);
+ scm_gc_protect_object (mus); // UGH.
+ Music *r = unsmob_music (mus);
if (beg)
{
- r-> set_mus_property ("element", beg->self_scm ());
+ r-> set_property ("element", beg->self_scm ());
scm_gc_unprotect_object (beg->self_scm ());
}
- r->set_mus_property ("repeat-count", gh_int2scm (times >? 1));
+ r->set_property ("repeat-count", scm_int2num (max (times, 1)));
- r-> set_mus_property ("elements",alts);
- if (gh_equal_p ($2, scm_makfrom0str ("tremolo"))) {
+ r-> set_property ("elements",alts);
+ if (ly_c_equal_p ($2, scm_makfrom0str ("tremolo"))) {
/*
- we can not get durations and other stuff correct down the line, so we have to
- add to the duration log here.
+ TODO: move this code to Scheme.
*/
- static SCM func;
- if (!func)
- func = scm_primitive_eval (ly_symbol2scm ("shift-duration-log"));
+ /* we cannot get durations and other stuff
+ correct down the line,
+ so we have to add to the duration log here. */
+ SCM func = ly_lily_module_constant ("shift-duration-log");
int dots = ($3 % 3) ? 0 : 1;
int shift = -intlog2 ((dots) ? ($3*2/3) : $3);
- Sequential_music * seq = dynamic_cast<Sequential_music*> ($4);
- if (seq) {
- int list_len =scm_ilength (seq->music_list ());
+ if ($4->is_mus_type ("sequential-music"))
+ {
+ int list_len = scm_ilength ($4->get_property ("elements"));
if (list_len != 2)
- seq->origin ()->warning ("Chord tremolo must have 2 elements.");
+ $4->origin ()->warning (_f ("expect 2 elements for Chord tremolo, found %d", list_len));
shift -= 1;
- r->compress (Moment (Rational (1,list_len)));
- }
- gh_call3 (func, r->self_scm (), gh_int2scm(shift),gh_int2scm(dots));
+ r->compress (Moment (Rational (1, list_len)));
+ }
+ scm_call_3 (func, r->self_scm (), scm_int2num (shift), scm_int2num (dots));
}
r->set_spot (*$4->origin ());
Sequential_music:
SEQUENTIAL '{' Music_list '}' {
- $$ = MY_MAKE_MUSIC("SequentialMusic");
- $$->set_mus_property ("elements", ly_car ($3));
- $$->set_spot(THIS->here_input());
+ $$ = MY_MAKE_MUSIC ("SequentialMusic");
+ $$->set_property ("elements", scm_car ($3));
+ $$->set_spot (@$);
}
| '{' Music_list '}' {
- $$ = MY_MAKE_MUSIC("SequentialMusic");
- $$->set_mus_property ("elements", ly_car ($2));
- $$->set_spot(THIS->here_input());
+ $$ = MY_MAKE_MUSIC ("SequentialMusic");
+ $$->set_property ("elements", scm_car ($2));
+ $$->set_spot (@$);
}
;
Simultaneous_music:
SIMULTANEOUS '{' Music_list '}'{
- $$ = MY_MAKE_MUSIC("SimultaneousMusic");
- $$->set_mus_property ("elements", ly_car ($3));
- $$->set_spot(THIS->here_input());
+ $$ = MY_MAKE_MUSIC ("SimultaneousMusic");
+ $$->set_property ("elements", scm_car ($3));
+ $$->set_spot (@$);
}
| simul_open Music_list simul_close {
- $$ = MY_MAKE_MUSIC("SimultaneousMusic");
- $$->set_mus_property ("elements", ly_car ($2));
- $$->set_spot(THIS->here_input());
+ $$ = MY_MAKE_MUSIC ("SimultaneousMusic");
+ $$->set_property ("elements", scm_car ($2));
+ $$->set_spot (@$);
}
;
Simple_music:
event_chord { $$ = $1; }
- | APPLYOUTPUT embedded_scm {
- if (!ly_input_procedure_p ($2))
- THIS->parser_error (_ ("\\applycontext takes function argument"));
- $$ = MY_MAKE_MUSIC ("ApplyOutputEvent");
- $$->set_mus_property ("procedure", $2);
- $$->set_spot (THIS->here_input());
- }
- | APPLYCONTEXT embedded_scm {
- if (!ly_input_procedure_p ($2))
- THIS->parser_error (_ ("\\applycontext takes function argument"));
- $$ = MY_MAKE_MUSIC ("ApplyContext");
- $$->set_mus_property ("procedure", $2);
- $$->set_spot (THIS->here_input());
- }
| MUSIC_IDENTIFIER {
$$ = unsmob_music ($1);
}
optional_context_mod:
/**/ { $$ = SCM_EOL; }
- | WITH '{' context_mod_list '}' { $$ = $3; }
- ;
-
-grace_head:
- GRACE { $$ = scm_makfrom0str ("Grace"); }
- | ACCIACCATURA { $$ = scm_makfrom0str ("Acciaccatura"); }
- | APPOGGIATURA { $$ = scm_makfrom0str ("Appoggiatura"); }
+ | WITH { THIS->lexer_->push_initial_state (); }
+ '{' context_mod_list '}'
+ {
+ THIS->lexer_->pop_state ();
+ $$ = $4;
+ }
;
context_mod_list:
/* */ { $$ = SCM_EOL; }
| context_mod_list context_mod {
- $$ = gh_cons ($2, $1);
+ $$ = scm_cons ($2, $1);
}
;
+
Composite_music:
- AUTOCHANGE Music {
- static SCM proc ;
- if (!proc)
- proc = scm_c_eval_string ("make-autochange-music");
-
- SCM res = scm_call_1 (proc, $2->self_scm ());
+ Prefix_composite_music { $$ = $1; }
+ | Grouped_music_list { $$ = $1; }
+ ;
+
+Grouped_music_list:
+ Simultaneous_music { $$ = $1; }
+ | Sequential_music { $$ = $1; }
+ ;
+
+Generic_prefix_music_scm:
+ MUSIC_FUNCTION {
+ $$ = scm_list_2 ($1, make_input (@$));
+ }
+ | MUSIC_FUNCTION_SCM embedded_scm {
+ $$ = scm_list_3 ($1, make_input (@$), $2);
+ }
+ | MUSIC_FUNCTION_MARKUP full_markup {
+ $$ = scm_list_3 ($1, make_input (@$), $2);
+ }
+ | MUSIC_FUNCTION_MUSIC Music {
+ $$ = scm_list_3 ($1, make_input (@$), $2->self_scm ());
scm_gc_unprotect_object ($2->self_scm ());
- $$ = unsmob_music (res);
- scm_gc_protect_object (res);
- $$->set_spot (THIS->here_input())
}
- | PARTCOMBINE Music Music {
- static SCM proc;
- if (!proc)
- proc = scm_c_eval_string ("make-part-combine-music");
-
- SCM res = scm_call_1 (proc, gh_list ($2->self_scm (),
- $3->self_scm (), SCM_UNDEFINED));
+ | MUSIC_FUNCTION_SCM_MUSIC embedded_scm Music {
+ $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
+ scm_gc_unprotect_object ($3->self_scm ());
+ }
+ | MUSIC_FUNCTION_SCM_SCM embedded_scm embedded_scm {
+ $$ = scm_list_4 ($1, make_input (@$), $2, $3);
+ }
+ | MUSIC_FUNCTION_SCM_SCM_MUSIC embedded_scm embedded_scm Music {
+ $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4->self_scm ());
+ }
+ | MUSIC_FUNCTION_MARKUP_MUSIC full_markup Music {
+ $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
scm_gc_unprotect_object ($3->self_scm ());
+ }
+ | MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup {
+ $$ = scm_list_4 ($1, make_input (@$), $2, $3);
+ }
+ | MUSIC_FUNCTION_MUSIC_MUSIC Music Music {
+ $$ = scm_list_4 ($1, make_input (@$), $2->self_scm (), $3->self_scm ());
scm_gc_unprotect_object ($2->self_scm ());
- $$ = unsmob_music (res);
- scm_gc_protect_object (res);
- $$->set_spot (THIS->here_input());
+ scm_gc_unprotect_object ($3->self_scm ());
}
- | grace_head Music {
-#if 1
- /*
- The other version is for easier debugging of
- Sequential_music_iterator in combination with grace notes.
- */
-
-/*
+ | MUSIC_FUNCTION_SCM_MUSIC_MUSIC embedded_scm Music Music {
+ $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ());
+ scm_gc_unprotect_object ($4->self_scm ());
+ scm_gc_unprotect_object ($3->self_scm ());
+ }
+ | MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup Music Music {
+ $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ());
+ scm_gc_unprotect_object ($3->self_scm ());
+ scm_gc_unprotect_object ($4->self_scm ());
+ }
+ ;
-TODO: should distinguish between both grace types in the
-basic music objects too, since the meaning is different.
+Generic_prefix_music:
+ Generic_prefix_music_scm {
+ SCM func = scm_car ($1);
+ Input *loc = unsmob_input (scm_cadr ($1));
+ SCM args = scm_cddr ($1);
+ SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature"));
-*/
+ SCM type_check_proc = ly_lily_module_constant ("type-check-list");
+ bool ok = true;
- String start_str = "start" + ly_scm2string ($1) + "Music";
- String stop_str = "stop" + ly_scm2string ($1) + "Music";
-
- SCM start = THIS->lexer_->lookup_identifier (start_str);
- SCM stop = THIS->lexer_->lookup_identifier (stop_str);
+ if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr ($1), sig, args)))
+ {
+ THIS->error_level_ = 1;
+ ok = false;
+ }
- Music *startm = unsmob_music (start);
- Music *stopm = unsmob_music (stop);
+ SCM m = SCM_EOL;
+ if (ok)
+ m = scm_apply_0 (func, scm_cons (THIS->self_scm(),
+ scm_cdr ($1)));
- SCM ms = SCM_EOL;
- if (stopm) {
- stopm = stopm->clone ();
- ms = scm_cons (stopm->self_scm (), ms);
- scm_gc_unprotect_object (stopm->self_scm ());
- }
- ms = scm_cons ($2->self_scm (), ms);
- scm_gc_unprotect_object ($2->self_scm());
- if (startm) {
- startm = startm->clone ();
- ms = scm_cons (startm->self_scm () , ms);
- scm_gc_unprotect_object (startm->self_scm ());
- }
+ if (unsmob_music (m))
+ {
+ $$ = unsmob_music (m);
+ scm_gc_protect_object (m);
+ }
+ else
+ {
+ if (ok)
+ loc->error (_ ("music head function must return Music object"));
+ $$ = MY_MAKE_MUSIC ("Music");
+ }
+ $$->set_spot (*loc);
+ }
+ ;
-
- Music* seq = MY_MAKE_MUSIC("SequentialMusic");
- seq->set_mus_property ("elements", ms);
-
- $$ = MY_MAKE_MUSIC("GraceMusic");
- $$->set_mus_property ("element", seq->self_scm ());
- scm_gc_unprotect_object (seq->self_scm ());
-#else
- $$ = MY_MAKE_MUSIC("GraceMusic");
- $$->set_mus_property ("element", $2->self_scm ());
- scm_gc_unprotect_object ($2->self_scm ());
-#endif
+Prefix_composite_music:
+ Generic_prefix_music {
+ $$ = $1;
}
- | CONTEXT string '=' string optional_context_mod Music {
+ | CONTEXT simple_string '=' simple_string optional_context_mod Music {
$$ = context_spec_music ($2, $4, $6, $5);
}
- | CONTEXT STRING optional_context_mod Music {
+ | CONTEXT simple_string optional_context_mod Music {
$$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3);
}
- | NEWCONTEXT string optional_context_mod Music {
- $$ = context_spec_music ($2, get_next_unique_context (),
- $4, $3);
+ | NEWCONTEXT simple_string optional_context_mod Music {
+ $$ = context_spec_music ($2, get_next_unique_context_id (), $4,
+ $3);
}
- | TIMES {
- THIS->push_spot ();
- }
- /* CONTINUED */
- fraction Music
+ | TIMES fraction Music
{
- int n = gh_scm2int (ly_car ($3)); int d = gh_scm2int (ly_cdr ($3));
- Music *mp = $4;
+ int n = scm_to_int (scm_car ($2)); int d = scm_to_int (scm_cdr ($2));
+ Music *mp = $3;
- $$= MY_MAKE_MUSIC("TimeScaledMusic");
- $$->set_spot (THIS->pop_spot ());
+ $$= MY_MAKE_MUSIC ("TimeScaledMusic");
+ $$->set_spot (@$);
- $$->set_mus_property ("element", mp->self_scm ());
+ $$->set_property ("element", mp->self_scm ());
scm_gc_unprotect_object (mp->self_scm ());
- $$->set_mus_property ("numerator", gh_int2scm (n));
- $$->set_mus_property ("denominator", gh_int2scm (d));
+ $$->set_property ("numerator", scm_int2num (n));
+ $$->set_property ("denominator", scm_int2num (d));
$$->compress (Moment (Rational (n,d)));
}
| Repeated_music { $$ = $1; }
- | Simultaneous_music { $$ = $1; }
- | Sequential_music { $$ = $1; }
| TRANSPOSE pitch_also_in_chords pitch_also_in_chords Music {
- $$ = MY_MAKE_MUSIC("TransposedMusic");
+ $$ = MY_MAKE_MUSIC ("TransposedMusic");
Music *p = $4;
Pitch from = *unsmob_pitch ($2);
Pitch to = *unsmob_pitch ($3);
- p->transpose (interval (from, to));
- $$->set_mus_property ("element", p->self_scm ());
+ p->transpose (pitch_interval (from, to));
+ $$->set_property ("element", p->self_scm ());
scm_gc_unprotect_object (p->self_scm ());
}
- | APPLY embedded_scm Music {
- if (!ly_input_procedure_p ($2))
- {
- THIS->parser_error (_ ("\\apply takes function argument"));
- $$ = $3;
- }
+ | mode_changing_head Grouped_music_list {
+ if ($1 == ly_symbol2scm ("chords"))
+ {
+ Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
+ chm->set_property ("element", $2->self_scm ());
+ $$ = chm;
+ scm_gc_unprotect_object ($2->self_scm ());
+ }
else
- {
- SCM ret = gh_call1 ($2, $3->self_scm ());
- Music *m = unsmob_music (ret);
- if (!m) {
- THIS->parser_error ("\\apply must return a Music");
- m = MY_MAKE_MUSIC("Music");
- }
- $$ = m;
- }
+ {
+ $$ = $2;
+ }
+ THIS->lexer_->pop_state ();
}
- | NOTES
+ | mode_changing_head_with_context optional_context_mod Grouped_music_list {
+ $$ = context_spec_music ($1, get_next_unique_context_id (),
+ $3, $2);
+ if ($1 == ly_symbol2scm ("ChordNames"))
{
+ Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
+ chm->set_property ("element", $$->self_scm ());
+ scm_gc_unprotect_object ($$->self_scm ());
+ $$ = chm;
+ }
+ THIS->lexer_->pop_state ();
+ }
+ | relative_music { $$ = $1; }
+ | re_rhythmed_music { $$ = $1; }
+ | TAG embedded_scm Music {
+ tag_music ($3, $2, @$);
+ $$ = $3;
+ }
+ ;
+
+mode_changing_head:
+ NOTEMODE {
SCM nn = THIS->lexer_->lookup_identifier ("pitchnames");
THIS->lexer_->push_note_state (alist_to_hashq (nn));
+
+ $$ = ly_symbol2scm ("notes");
}
- Music
- { $$ = $3;
- THIS->lexer_->pop_state ();
- }
- | DRUMS
+ | DRUMMODE
{
SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames");
THIS->lexer_->push_note_state (alist_to_hashq (nn));
+
+ $$ = ly_symbol2scm ("drums");
}
- Music
- { $$ = $3;
- THIS->lexer_->pop_state ();
- }
- | FIGURES
- { THIS->lexer_->push_figuredbass_state (); }
- Music
- {
- Music * chm = MY_MAKE_MUSIC("UntransposableMusic");
- chm->set_mus_property ("element", $3->self_scm ());
- $$ = chm;
- scm_gc_unprotect_object ($3->self_scm());
+ | FIGUREMODE {
+ THIS->lexer_->push_figuredbass_state ();
- THIS->lexer_->pop_state ();
+ $$ = ly_symbol2scm ("figures");
}
- | CHORDS
- {
+ | CHORDMODE {
SCM nn = THIS->lexer_->lookup_identifier ("chordmodifiers");
THIS->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
- THIS->lexer_->push_chord_state (); }
- Music
- {
- Music * chm = MY_MAKE_MUSIC("UnrelativableMusic");
- chm->set_mus_property ("element", $3->self_scm ());
- scm_gc_unprotect_object ($3->self_scm());
- $$ = chm;
+ nn = THIS->lexer_->lookup_identifier ("pitchnames");
+ THIS->lexer_->push_chord_state (alist_to_hashq (nn));
+ $$ = ly_symbol2scm ("chords");
- THIS->lexer_->pop_state ();
}
- | LYRICS
- { THIS->lexer_->push_lyric_state (); }
- Music
- {
- $$ = $3;
- THIS->lexer_->pop_state ();
+ | LYRICMODE
+ { THIS->lexer_->push_lyric_state ();
+ $$ = ly_symbol2scm ("lyrics");
}
- | relative_music { $$ = $1; }
- | re_rhythmed_music { $$ = $1; }
- | TAG embedded_scm Music {
- tag_music ($3, $2, THIS->here_input ());
- $$ = $3;
+ ;
+
+mode_changing_head_with_context:
+ DRUMS {
+ SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames");
+ THIS->lexer_->push_note_state (alist_to_hashq (nn));
+
+ $$ = ly_symbol2scm ("DrumStaff");
+ }
+ | FIGURES {
+ THIS->lexer_->push_figuredbass_state ();
+
+ $$ = ly_symbol2scm ("FiguredBass");
+ }
+ | CHORDS {
+ SCM nn = THIS->lexer_->lookup_identifier ("chordmodifiers");
+ THIS->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
+ nn = THIS->lexer_->lookup_identifier ("pitchnames");
+ THIS->lexer_->push_chord_state (alist_to_hashq (nn));
+ $$ = ly_symbol2scm ("ChordNames");
+ }
+ | LYRICS
+ { THIS->lexer_->push_lyric_state ();
+ $$ = ly_symbol2scm ("Lyrics");
}
;
+
relative_music:
RELATIVE absolute_pitch Music {
- Music * p = $3;
- Pitch pit = *unsmob_pitch ($2);
- $$ = MY_MAKE_MUSIC("RelativeOctaveMusic");
+ Music *m = $3;
+ Pitch start = *unsmob_pitch ($2);
+ $$ = make_music_relative (start, m);
+ scm_gc_unprotect_object (m->self_scm ());
+ }
+ | RELATIVE Composite_music {
+ Music *m = $2;
- $$->set_mus_property ("element", p->self_scm ());
- scm_gc_unprotect_object (p->self_scm ());
+ Pitch middle_c (0, 0, 0);
+ $$ = make_music_relative (middle_c, m);
+ scm_gc_unprotect_object (m->self_scm ());
+ }
+ ;
+new_lyrics:
+ ADDLYRICS { THIS->lexer_->push_lyric_state (); }
+ /*cont */
+ Grouped_music_list {
+ /* Can also use Music at the expensive of two S/Rs similar to
+ \repeat \alternative */
+ THIS->lexer_->pop_state ();
- Pitch retpitch = p->to_relative_octave (pit);
- if (lily_1_8_relative)
- $$->set_mus_property ("last-pitch", retpitch.smobbed_copy ());
+ $$ = scm_cons ($3->self_scm (), SCM_EOL);
+ }
+ | new_lyrics ADDLYRICS {
+ THIS->lexer_->push_lyric_state ();
+ } Grouped_music_list {
+ THIS->lexer_->pop_state ();
+ $$ = scm_cons ($4->self_scm (), $1);
}
;
re_rhythmed_music:
- ADDLYRICS Music Music {
- Music*l =MY_MAKE_MUSIC("LyricCombineMusic");
- l->set_mus_property ("elements", gh_list ($2->self_scm (), $3->self_scm (), SCM_UNDEFINED));
- scm_gc_unprotect_object ($3->self_scm ());
- scm_gc_unprotect_object ($2->self_scm ());
- $$ = l;
+ Grouped_music_list new_lyrics {
+ Music * voice = $1;
+ SCM name = get_first_context_id (scm_makfrom0str ("Voice"), voice);
+ if (!scm_is_string (name))
+ {
+ name = get_next_unique_lyrics_context_id ();
+ voice = context_spec_music (scm_makfrom0str ("Voice"),
+ name,
+ voice, SCM_EOL);
+ }
+
+ SCM context = scm_makfrom0str ("Lyrics");
+ Music *all = MY_MAKE_MUSIC ("SimultaneousMusic");
+
+ SCM lst = SCM_EOL;
+ for (SCM s = $2; scm_is_pair (s); s = scm_cdr (s))
+ {
+ Music *music = unsmob_music (scm_car (s));
+ Music *com = make_lyric_combine_music (name, music);
+ Music *csm = context_spec_music (context,
+ get_next_unique_context_id (), com, SCM_EOL);
+ lst = scm_cons (csm->self_scm (), lst);
+ }
+ all->set_property ("elements", scm_cons (voice->self_scm (),
+ lst));
+ $$ = all;
+ scm_gc_unprotect_object (voice->self_scm ());
}
- | NEWADDLYRICS string Music {
- Music*l =MY_MAKE_MUSIC("NewLyricCombineMusic");
- l->set_mus_property ("element", $3->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
- $$ = l;
- l->set_mus_property ("associated-context", $2);
+ | LYRICSTO simple_string {
+ THIS->lexer_->push_lyric_state ();
+ } Music {
+ THIS->lexer_->pop_state ();
+ Music *music = $4;
+ SCM name = $2;
+ $$ = make_lyric_combine_music (name, music);
+ scm_gc_unprotect_object (music->self_scm ());
}
;
context_change:
CHANGE STRING '=' STRING {
- Music*t= MY_MAKE_MUSIC("TranslatorChange");
- t-> set_mus_property ("change-to-type", scm_string_to_symbol ($2));
- t-> set_mus_property ("change-to-id", $4);
+ Music*t = MY_MAKE_MUSIC ("ContextChange");
+ t-> set_property ("change-to-type", scm_string_to_symbol ($2));
+ t-> set_property ("change-to-id", $4);
$$ = t;
- $$->set_spot (THIS->here_input ());
+ $$->set_spot (@$);
}
;
property_operation:
- STRING '=' scalar {
- $$ = scm_list_n (ly_symbol2scm ("assign"),
- scm_string_to_symbol ($1), $3, SCM_UNDEFINED);
+ STRING '=' scalar {
+ $$ = scm_list_3 (ly_symbol2scm ("assign"),
+ scm_string_to_symbol ($1), $3);
}
- | STRING UNSET {
- $$ = scm_list_n (ly_symbol2scm ("unset"),
- scm_string_to_symbol ($1), SCM_UNDEFINED);
+ | UNSET simple_string {
+ $$ = scm_list_2 (ly_symbol2scm ("unset"),
+ scm_string_to_symbol ($2));
}
- | STRING SET embedded_scm '=' embedded_scm {
- $$ = scm_list_n (ly_symbol2scm ("poppush"),
- scm_string_to_symbol ($1), $3, $5, SCM_UNDEFINED);
+ | OVERRIDE simple_string embedded_scm '=' embedded_scm {
+ $$ = scm_list_4 (ly_symbol2scm ("push"),
+ scm_string_to_symbol ($2), $3, $5);
}
- | STRING OVERRIDE embedded_scm '=' embedded_scm {
- $$ = scm_list_n (ly_symbol2scm ("push"),
- scm_string_to_symbol ($1), $3, $5, SCM_UNDEFINED);
- }
- | STRING REVERT embedded_scm {
- $$ = scm_list_n (ly_symbol2scm ("pop"),
- scm_string_to_symbol ($1), $3, SCM_UNDEFINED);
+ | REVERT simple_string embedded_scm {
+ $$ = scm_list_3 (ly_symbol2scm ("pop"),
+ scm_string_to_symbol ($2), $3);
}
;
-translator_mod:
- CONSISTSEND { $$ = ly_symbol2scm ("consists-end"); }
- | CONSISTS { $$ = ly_symbol2scm ("consists"); }
+context_def_mod:
+ CONSISTS { $$ = ly_symbol2scm ("consists"); }
| REMOVE { $$ = ly_symbol2scm ("remove"); }
| ACCEPTS { $$ = ly_symbol2scm ("accepts"); }
+ | DEFAULTCHILD { $$ = ly_symbol2scm ("default-child"); }
| DENIES { $$ = ly_symbol2scm ("denies"); }
| ALIAS { $$ = ly_symbol2scm ("alias"); }
context_mod:
property_operation { $$ = $1; }
- | translator_mod STRING {
- $$ = scm_list_n ($1, $2, SCM_UNDEFINED);
+ | context_def_mod STRING {
+ $$ = scm_list_2 ($1, $2);
+ }
+ ;
+
+context_prop_spec:
+ simple_string {
+ if (!is_regular_identifier ($1))
+ {
+ @$.error (_("Grob name should be alphanumeric"));
+ }
+
+ $$ = scm_list_2 (ly_symbol2scm ("Bottom"),
+ scm_string_to_symbol ($1));
+ }
+ | simple_string '.' simple_string {
+ $$ = scm_list_2 (scm_string_to_symbol ($1),
+ scm_string_to_symbol ($3));
+ }
+ ;
+
+music_property_def:
+ OVERRIDE context_prop_spec embedded_scm '=' scalar {
+ $$ = property_op_to_music (scm_list_4 (
+ ly_symbol2scm ("poppush"),
+ scm_cadr ($2),
+ $3, $5));
+ $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ }
+ | REVERT context_prop_spec embedded_scm {
+ $$ = property_op_to_music (scm_list_3 (
+ ly_symbol2scm ("pop"),
+ scm_cadr ($2),
+ $3));
+
+ $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ }
+ | SET context_prop_spec '=' scalar {
+ $$ = property_op_to_music (scm_list_3 (
+ ly_symbol2scm ("assign"),
+ scm_cadr ($2),
+ $4));
+ $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ }
+ | UNSET context_prop_spec {
+ $$ = property_op_to_music (scm_list_2 (
+ ly_symbol2scm ("unset"),
+ scm_cadr ($2)));
+ $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ }
+ | ONCE music_property_def {
+ SCM e = $2->get_property ("element");
+ unsmob_music (e)->set_property ("once", SCM_BOOL_T);
+ $$ = $2;
+
+ }
+ ;
+
+
+string:
+ STRING {
+ $$ = $1;
+ }
+ | STRING_IDENTIFIER {
+ $$ = $1;
+ }
+ | string '+' string {
+ $$ = scm_string_append (scm_list_2 ($1, $3));
+ }
+ ;
+
+simple_string: STRING {
+ $$ = $1;
+ }
+ | LYRICS_STRING {
+ $$ = $1;
+ }
+ ;
+
+scalar: string {
+ $$ = $1;
+ }
+ | LYRICS_STRING {
+ $$ = $1;
+ }
+ | bare_number {
+ $$ = $1;
+/* if (scm_integer_p ($1) == SCM_BOOL_T)
+ {
+ int k = scm_to_int (scm_inexact_to_exact ($1));
+ $$ = k;
+ } else
+ {
+ THIS->parser_error (@1, _ ("need integer number arg"));
+ $$ = 0;
+ }*/
}
- ;
-
-music_property_def:
- PROPERTY STRING '.' property_operation {
- Music * t = property_op_to_music ($4);
- Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
-
- csm->set_mus_property ("element", t->self_scm ());
- scm_gc_unprotect_object (t->self_scm ());
-
- $$ = csm;
- $$->set_spot (THIS->here_input ());
-
- csm-> set_mus_property ("context-type", scm_string_to_symbol ($2));
+ | embedded_scm {
+ $$ = $1;
}
- | ONCE music_property_def {
- $$ = $2;
- SCM e = $2->get_mus_property ("element");
- unsmob_music (e)->set_mus_property ("once", SCM_BOOL_T);
+ | full_markup {
+ $$ = $1;
+ }
+ | DIGIT {
+ $$ = scm_int2num ($1);
}
;
-
-scalar:
- string { $$ = $1; }
- | bare_int { $$ = gh_int2scm ($1); }
- | embedded_scm { $$ = $1; }
- | full_markup { $$ = $1; }
- | DIGIT { $$ = gh_int2scm ($1); }
- ;
-
/*
-This is a trick:
+
+pre_events doesn't contain anything. It is a trick:
Adding pre_events to the simple_element
makes the choice between
a single shift/reduction conflict.
nevertheless, this is not very clean, and we should find a different
-solution.
+solution.
*/
-pre_events: {
- THIS->push_spot ();
- }
+pre_events: /* empty */
;
event_chord:
pre_events simple_element post_events {
- SCM elts = $2-> get_mus_property ("elements");
+ SCM elts = $2-> get_property ("elements");
- elts = gh_append2 (elts, scm_reverse_x ($3, SCM_EOL));
+ elts = ly_append2 (elts, scm_reverse_x ($3, SCM_EOL));
- $2->set_mus_property ("elements", elts);
+ $2->set_property ("elements", elts);
+ /* why is this giving wrong start location? -ns
+ * $2->set_spot (@$); */
+ Input i;
+ i.set_location (@2, @3);
+ $2->set_spot (i);
$$ = $2;
}
| command_element
note_chord_element:
chord_body optional_notemode_duration post_events
{
- SCM dur = unsmob_duration ($2)->smobbed_copy();
- SCM es = $1->get_mus_property ("elements");
+ SCM dur = unsmob_duration ($2)->smobbed_copy ();
+ SCM es = $1->get_property ("elements");
SCM postevs = scm_reverse_x ($3, SCM_EOL);
- for (SCM s = es; gh_pair_p (s); s = gh_cdr (s))
- unsmob_music (gh_car(s))->set_mus_property ("duration", dur);
- es = gh_append2 (es, postevs);
+ for (SCM s = es; scm_is_pair (s); s = scm_cdr (s))
+ unsmob_music (scm_car (s))->set_property ("duration", dur);
+ es = ly_append2 (es, postevs);
- $1-> set_mus_property ("elements", es);
+ $1-> set_property ("elements", es);
+ $1->set_spot (@$);
$$ = $1;
}
;
chord_close: '>'
;
-simul_open: LESSLESS
+simul_open: DOUBLE_ANGLE_OPEN
;
-simul_close: MOREMORE
+simul_close: DOUBLE_ANGLE_CLOSE
;
chord_body:
chord_open chord_body_elements chord_close
{
- $$ = MY_MAKE_MUSIC("EventChord");
- $$->set_mus_property ("elements",
+ $$ = MY_MAKE_MUSIC ("EventChord");
+ $$->set_spot (@$);
+ $$->set_property ("elements",
scm_reverse_x ($2, SCM_EOL));
}
;
chord_body_elements:
/* empty */ { $$ = SCM_EOL; }
| chord_body_elements chord_body_element {
- $$ = gh_cons ($2->self_scm(), $1);
- scm_gc_unprotect_object ($2->self_scm());
+ $$ = scm_cons ($2->self_scm (), $1);
+ scm_gc_unprotect_object ($2->self_scm ());
}
;
chord_body_element:
- pitch exclamations questions post_events
+ pitch exclamations questions octave_check post_events
{
- Music * n = MY_MAKE_MUSIC("NoteEvent");
- n->set_mus_property ("pitch", $1);
- if ($3 % 2)
- n->set_mus_property ("cautionary", SCM_BOOL_T);
- if ($2 % 2 || $3 % 2)
- n->set_mus_property ("force-accidental", SCM_BOOL_T);
+ int q = $3;
+ int ex = $2;
+ SCM check = $4;
+ SCM post = $5;
+
+ Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ n->set_property ("pitch", $1);
+ n->set_spot (@$);
+ if (q % 2)
+ n->set_property ("cautionary", SCM_BOOL_T);
+ if (ex % 2 || q % 2)
+ n->set_property ("force-accidental", SCM_BOOL_T);
+
+ if (scm_is_pair (post)) {
+ SCM arts = scm_reverse_x (post, SCM_EOL);
+ n->set_property ("articulations", arts);
+ }
+ if (scm_is_number (check))
+ {
+ int q = scm_to_int (check);
+ n->set_property ("absolute-octave", scm_int2num (q-1));
+ }
- SCM arts = scm_reverse_x ($4, SCM_EOL);
- n->set_mus_property ("articulations", arts);
+
+ $$ = n;
+ }
+ | DRUM_PITCH post_events {
+ Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ n->set_property ("duration", $2);
+ n->set_property ("drum-type", $1);
+ n->set_spot (@$);
+ if (scm_is_pair ($2)) {
+ SCM arts = scm_reverse_x ($2, SCM_EOL);
+ n->set_property ("articulations", arts);
+ }
$$ = n;
}
;
+add_quote:
+ ADDQUOTE string Music {
+ SCM adder = ly_lily_module_constant ("add-quotable");
+
+ scm_call_2 (adder, $2, $3->self_scm ());
+ scm_gc_unprotect_object ($3->self_scm ());
+ }
+ ;
+
command_element:
command_req {
- $$ = MY_MAKE_MUSIC("EventChord");
- $$->set_mus_property ("elements", scm_cons ($1->self_scm (), SCM_EOL));
- scm_gc_unprotect_object ($1->self_scm());
-
- $$-> set_spot (THIS->here_input ());
- $1-> set_spot (THIS->here_input ());
- }
- | OCTAVE { THIS->push_spot (); }
- pitch {
- Music *l = MY_MAKE_MUSIC("RelativeOctaveCheck");
- $$ = l;
- $$->set_spot (THIS->pop_spot ());
- $$->set_mus_property ("pitch", $3);
- }
- | E_LEFTSQUARE {
- Music *l = MY_MAKE_MUSIC("LigatureEvent");
- l->set_mus_property ("span-direction", gh_int2scm (START));
- l->set_spot (THIS->here_input ());
-
- $$ = MY_MAKE_MUSIC("EventChord");
- $$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL));
- scm_gc_unprotect_object (l->self_scm());
- $$->set_spot (THIS->here_input ());
- }
- | E_RIGHTSQUARE {
- Music *l = MY_MAKE_MUSIC("LigatureEvent");
- l->set_mus_property ("span-direction", gh_int2scm (STOP));
- l->set_spot (THIS->here_input ());
-
- $$ = MY_MAKE_MUSIC("EventChord");
- $$->set_mus_property ("elements", scm_cons (l->self_scm (), SCM_EOL));
- $$->set_spot (THIS->here_input ());
- scm_gc_unprotect_object (l->self_scm());
+ $$ = MY_MAKE_MUSIC ("EventChord");
+ $$->set_property ("elements", scm_cons ($1->self_scm (), SCM_EOL));
+ scm_gc_unprotect_object ($1->self_scm ());
+
+ $$-> set_spot (@$);
+ $1-> set_spot (@$);
+ }
+ | SKIP duration_length {
+ Music *skip = MY_MAKE_MUSIC ("SkipMusic");
+ skip->set_property ("duration", $2);
+ skip->set_spot (@$);
+ $$ = skip;
+ }
+ | OCTAVE pitch {
+ Music *m = MY_MAKE_MUSIC ("RelativeOctaveCheck");
+ $$ = m;
+ $$->set_spot (@$);
+ $$->set_property ("pitch", $2);
+ }
+ | E_BRACKET_OPEN {
+ Music *m = MY_MAKE_MUSIC ("LigatureEvent");
+ m->set_property ("span-direction", scm_int2num (START));
+ m->set_spot (@$);
+
+ $$ = MY_MAKE_MUSIC ("EventChord");
+ $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
+ scm_gc_unprotect_object (m->self_scm ());
+ $$->set_spot (@$);
+ }
+ | E_BRACKET_CLOSE {
+ Music *m = MY_MAKE_MUSIC ("LigatureEvent");
+ m->set_property ("span-direction", scm_int2num (STOP));
+ m->set_spot (@$);
+
+ $$ = MY_MAKE_MUSIC ("EventChord");
+ $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
+ $$->set_spot (@$);
+ scm_gc_unprotect_object (m->self_scm ());
}
| E_BACKSLASH {
- $$ = MY_MAKE_MUSIC("VoiceSeparator");
- $$->set_spot (THIS->here_input ());
+ $$ = MY_MAKE_MUSIC ("VoiceSeparator");
+ $$->set_spot (@$);
}
| '|' {
+ SCM pipe = THIS->lexer_->lookup_identifier ("pipeSymbol");
+
+ if (Music * m = unsmob_music (pipe))
+ $$ = m->clone ();
+ else
+ $$ = MY_MAKE_MUSIC ("BarCheck");
- $$ = MY_MAKE_MUSIC("BarCheck");
- $$->set_spot (THIS->here_input ());
+ $$->set_spot (@$);
+ }
+ | TRANSPOSITION pitch {
+ Pitch middle_c;
+ Pitch sounds_as_c = pitch_interval (*unsmob_pitch ($2), middle_c);
+ $$ = set_property_music (ly_symbol2scm ("instrumentTransposition"),
+ sounds_as_c.smobbed_copy());
+ $$->set_spot (@$);
+ $$ = context_spec_music (ly_symbol2scm ("Staff"), SCM_UNDEFINED,
+ $$, SCM_EOL);
}
| BAR STRING {
Music *t = set_property_music (ly_symbol2scm ("whichBar"), $2);
- Music *csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
- csm->set_mus_property ("element", t->self_scm ());
- scm_gc_unprotect_object (t->self_scm ());
-
- $$ = csm;
- $$->set_spot (THIS->here_input ());
-
- csm->set_mus_property ("context-type", ly_symbol2scm ("Timing"));
+ Music *csm = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED,
+ t, SCM_EOL);
+ $$ = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED, csm, SCM_EOL);
+ $$->set_spot (@$);
+ t->set_spot (@$);
}
| PARTIAL duration_length {
Moment m = - unsmob_duration ($2)->get_length ();
- Music * p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ());
-
- Music * sp = MY_MAKE_MUSIC("ContextSpeccedMusic");
- sp->set_mus_property ("element", p->self_scm ());
- scm_gc_unprotect_object (p->self_scm ());
-
- $$ =sp ;
- sp-> set_mus_property ("context-type", ly_symbol2scm ("Timing"));
+ Music *p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ());
+ p->set_spot (@$);
+ p = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED,
+ p, SCM_EOL);
+ p = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED,
+ p, SCM_EOL);
+ $$ = p;
}
| CLEF STRING {
- static SCM proc ;
- if (!proc)
- proc = scm_c_eval_string ("make-clef-set");
+ SCM proc = ly_lily_module_constant ("make-clef-set");
SCM result = scm_call_1 (proc, $2);
scm_gc_protect_object (result);
$$ = unsmob_music (result);
}
| TIME_T fraction {
- static SCM proc;
- if (!proc)
- proc = scm_c_eval_string ("make-time-signature-set");
+ SCM proc = ly_lily_module_constant ("make-time-signature-set");
- SCM result = scm_apply_2 (proc, gh_car ($2), gh_cdr ($2), SCM_EOL);
+ SCM result = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
scm_gc_protect_object (result);
$$ = unsmob_music (result);
}
| MARK scalar {
- static SCM proc;
- if (!proc)
- proc = scm_c_eval_string ("make-mark-set");
+ SCM proc = ly_lily_module_constant ("make-mark-set");
SCM result = scm_call_1 (proc, $2);
scm_gc_protect_object (result);
;
command_req:
- shorthand_command_req { $$ = $1; }
- | verbose_command_req { $$ = $1; }
- ;
-
-shorthand_command_req:
- BREATHE {
- $$ = MY_MAKE_MUSIC("BreathingSignEvent");
+ E_TILDE {
+ $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent");
}
- | E_TILDE {
- $$ = MY_MAKE_MUSIC("PesOrFlexaEvent");
- }
- ;
-
-verbose_command_req:
- MARK DEFAULT {
- Music * m = MY_MAKE_MUSIC("MarkEvent");
+ | MARK DEFAULT {
+ Music *m = MY_MAKE_MUSIC ("MarkEvent");
$$ = m;
}
-
- | SKIP duration_length {
- Music * skip = MY_MAKE_MUSIC("SkipEvent");
- skip->set_mus_property ("duration", $2);
-
- $$ = skip;
- }
| tempo_event {
$$ = $1;
}
| KEY DEFAULT {
- Music *key= MY_MAKE_MUSIC("KeyChangeEvent");
+ Music *key = MY_MAKE_MUSIC ("KeyChangeEvent");
$$ = key;
}
| KEY NOTENAME_PITCH SCM_IDENTIFIER {
- Music *key= MY_MAKE_MUSIC("KeyChangeEvent");
+ Music *key = MY_MAKE_MUSIC ("KeyChangeEvent");
if (scm_ilength ($3) > 0)
{
- key->set_mus_property ("pitch-alist", $3);
- key->set_mus_property ("tonic", Pitch (0,0,0).smobbed_copy());
- ((Music*)key)->transpose (* unsmob_pitch ($2));
+ key->set_property ("pitch-alist", $3);
+ key->set_property ("tonic", Pitch (0, 0, 0).smobbed_copy ());
+ key->transpose (* unsmob_pitch ($2));
} else {
- THIS->parser_error (_("Second argument must be pitch list."));
+ THIS->parser_error (@3, _ ("second argument must be pitch list"));
}
$$ = key;
}
;
+
post_events:
/* empty */ {
$$ = SCM_EOL;
}
| post_events post_event {
- $2->set_spot (THIS->here_input ());
- $$ = gh_cons ($2->self_scm(), $$);
- scm_gc_unprotect_object ($2->self_scm());
+ $2->set_spot (@2);
+ $$ = scm_cons ($2->self_scm (), $$);
+ scm_gc_unprotect_object ($2->self_scm ());
}
| post_events tagged_post_event {
- $2 -> set_spot (THIS->here_input ());
- $$ = scm_cons ($2->self_scm(), $$);
- scm_gc_unprotect_object ($2->self_scm());
+ $2 -> set_spot (@2);
+ $$ = scm_cons ($2->self_scm (), $$);
+ scm_gc_unprotect_object ($2->self_scm ());
}
;
tagged_post_event:
'-' TAG embedded_scm post_event {
- tag_music ($4, $3, THIS->here_input ());
+ tag_music ($4, $3, @$);
$$ = $4;
}
;
+
post_event:
direction_less_event {
$$ = $1;
}
| HYPHEN {
- if (!THIS->lexer_->lyric_state_b ())
- THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC("HyphenEvent");
+ if (!THIS->lexer_->is_lyric_state ())
+ THIS->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
+ $$ = MY_MAKE_MUSIC ("HyphenEvent");
}
| EXTENDER {
- if (!THIS->lexer_->lyric_state_b ())
- THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC("ExtenderEvent");
+ if (!THIS->lexer_->is_lyric_state ())
+ THIS->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
+ $$ = MY_MAKE_MUSIC ("ExtenderEvent");
}
| script_dir direction_reqd_event {
if ($1)
- $2->set_mus_property ("direction", gh_int2scm ($1));
+ $2->set_property ("direction", scm_int2num ($1));
$$ = $2;
}
| script_dir direction_less_event {
if ($1)
- $2->set_mus_property ("direction", gh_int2scm ($1));
+ $2->set_property ("direction", scm_int2num ($1));
$$ = $2;
}
| string_number_event
string_number_event:
E_UNSIGNED {
- Music * s = MY_MAKE_MUSIC("StringNumberEvent");
- s->set_mus_property ("string-number", gh_int2scm($1));
- s->set_spot (THIS->here_input ());
+ Music *s = MY_MAKE_MUSIC ("StringNumberEvent");
+ s->set_property ("string-number", scm_int2num ($1));
+ s->set_spot (@$);
$$ = s;
}
;
-
-direction_less_event:
+direction_less_char:
'[' {
-
-
-/*
-
-TODO: should take all these defs out of the parser, adn make use
-configurable, i.e.
-
-
-(set-articulation '~ "trill")
-
-*/
- Music * m = MY_MAKE_MUSIC ("BeamEvent");
- m->set_spot (THIS->here_input());
- m->set_mus_property ("span-direction" , gh_int2scm (START));
- $$ = m;
+ $$ = ly_symbol2scm ("bracketOpenSymbol");
}
| ']' {
- Music * m = MY_MAKE_MUSIC ("BeamEvent");
- m->set_spot (THIS->here_input());
- m->set_mus_property ("span-direction" , gh_int2scm (STOP));
- $$ = m;
+ $$ = ly_symbol2scm ("bracketCloseSymbol");
}
- | '~' {
- Music * m = MY_MAKE_MUSIC ("TieEvent");
- m->set_spot (THIS->here_input());
- $$ = m;
+ | '~' {
+ $$ = ly_symbol2scm ("tildeSymbol");
}
- | close_event {
- $$ = $1;
- dynamic_cast<Music *> ($$)->set_mus_property ("span-direction",
- gh_int2scm (START));
+ | '(' {
+ $$ = ly_symbol2scm ("parenthesisOpenSymbol");
}
- | open_event {
- $$ = $1;
- dynamic_cast<Music *> ($$)->set_mus_property ("span-direction",
- gh_int2scm (STOP));
+ | ')' {
+ $$ = ly_symbol2scm ("parenthesisCloseSymbol");
+ }
+ | E_EXCLAMATION {
+ $$ = ly_symbol2scm ("escapedExclamationSymbol");
+ }
+ | E_OPEN {
+ $$ = ly_symbol2scm ("escapedParenthesisOpenSymbol");
+ }
+ | E_CLOSE {
+ $$ = ly_symbol2scm ("escapedParenthesisCloseSymbol");
+ }
+ | E_ANGLE_CLOSE {
+ $$ = ly_symbol2scm ("escapedBiggerSymbol");
+ }
+ | E_ANGLE_OPEN {
+ $$ = ly_symbol2scm ("escapedSmallerSymbol");
+ }
+ ;
+
+direction_less_event:
+ direction_less_char {
+ SCM predefd = THIS->lexer_->lookup_identifier_symbol ($1);
+ Music * m = 0;
+ if (unsmob_music (predefd))
+ {
+ m = unsmob_music (predefd)->clone ();
+ }
+ else
+ {
+ m = MY_MAKE_MUSIC ("Music");
+ }
+ m->set_spot (@$);
+ $$ = m;
}
| EVENT_IDENTIFIER {
$$ = unsmob_music ($1);
}
| tremolo_type {
- Music * a = MY_MAKE_MUSIC("TremoloEvent");
- a->set_spot (THIS->here_input ());
- a->set_mus_property ("tremolo-type", gh_int2scm ($1));
+ Music *a = MY_MAKE_MUSIC ("TremoloEvent");
+ a->set_spot (@$);
+ a->set_property ("tremolo-type", scm_int2num ($1));
$$ = a;
}
;
direction_reqd_event:
gen_text_def {
- $$ = $1;
+ $$ = $1;
}
| script_abbreviation {
SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
- Music *a = MY_MAKE_MUSIC("ArticulationEvent");
- if (gh_string_p (s))
- a->set_mus_property ("articulation-type", s);
- else THIS->parser_error (_ ("Expecting string as script definition"));
+ Music *a = MY_MAKE_MUSIC ("ArticulationEvent");
+ if (scm_is_string (s))
+ a->set_property ("articulation-type", s);
+ else THIS->parser_error (@1, _ ("expecting string as script definition"));
$$ = a;
}
;
-oct_check:
+octave_check:
/**/ { $$ = SCM_EOL; }
- | '=' { $$ = gh_int2scm (0); }
- | '=' sub_quotes { $$ = gh_int2scm ($2); }
- | '=' sup_quotes { $$ = gh_int2scm ($2); }
+ | '=' { $$ = scm_int2num (0); }
+ | '=' sub_quotes { $$ = scm_int2num ($2); }
+ | '=' sup_quotes { $$ = scm_int2num ($2); }
;
sup_quotes:
$$ = 1;
}
| sub_quotes ',' {
- $$ ++ ;
+ $$++;
}
;
| steno_tonic_pitch
;
-close_event:
- '(' {
- Music * s= MY_MAKE_MUSIC("SlurEvent");
- $$ = s;
- s->set_spot (THIS->here_input());
- }
- | E_OPEN {
- Music * s= MY_MAKE_MUSIC("PhrasingSlurEvent");
- $$ = s;
- s->set_spot (THIS->here_input());
- }
- | E_SMALLER {
- Music *s =MY_MAKE_MUSIC("CrescendoEvent");
- $$ = s;
- s->set_spot (THIS->here_input());
- }
- | E_BIGGER {
- Music *s =MY_MAKE_MUSIC("DecrescendoEvent");
- $$ = s;
- s->set_spot (THIS->here_input());
- }
- ;
-
-
-open_event:
- E_EXCLAMATION {
- Music *s = MY_MAKE_MUSIC("CrescendoEvent");
- s->set_spot (THIS->here_input());
-
- $$ = s;
- }
- | ')' {
- Music * s= MY_MAKE_MUSIC("SlurEvent");
- $$ = s;
- s->set_spot (THIS->here_input());
-
- }
- | E_CLOSE {
- Music * s= MY_MAKE_MUSIC("PhrasingSlurEvent");
- $$ = s;
- s->set_mus_property ("span-type", scm_makfrom0str ( "phrasing-slur"));
- s->set_spot (THIS->here_input());
- }
- ;
-
gen_text_def:
full_markup {
- Music *t = MY_MAKE_MUSIC("TextScriptEvent");
- t->set_mus_property ("text", $1);
- t->set_spot (THIS->here_input ());
+ Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
+ t->set_property ("text", $1);
+ t->set_spot (@$);
$$ = t;
}
| string {
- Music *t = MY_MAKE_MUSIC("TextScriptEvent");
- t->set_mus_property ("text", make_simple_markup ($1));
- t->set_spot (THIS->here_input ());
+ Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
+ t->set_property ("text",
+ make_simple_markup ($1));
+ t->set_spot (@$);
$$ = t;
}
| DIGIT {
- Music * t = MY_MAKE_MUSIC("FingerEvent");
- t->set_mus_property ("digit", gh_int2scm ($1));
- t->set_spot (THIS->here_input ());
+ Music *t = MY_MAKE_MUSIC ("FingerEvent");
+ t->set_property ("digit", scm_int2num ($1));
+ t->set_spot (@$);
$$ = t;
}
;
{
Duration dd = THIS->default_duration_;
$$ = dd.smobbed_copy ();
-
- THIS->beam_check ($$);
}
| multiplied_duration {
$$ = $1;
THIS->default_duration_ = *unsmob_duration ($$);
-
- THIS->beam_check ($$);
}
;
steno_duration:
bare_unsigned dots {
- int l = 0;
- if (!is_duration_b ($1))
- THIS->parser_error (_f ("not a duration: %d", $1));
+ int len = 0;
+ if (!is_duration ($1))
+ THIS->parser_error (@1, _f ("not a duration: %d", $1));
else
- l = intlog2 ($1);
+ len = intlog2 ($1);
- $$ = Duration (l, $2).smobbed_copy ();
+ $$ = Duration (len, $2).smobbed_copy ();
}
| DURATION_IDENTIFIER dots {
- Duration *d =unsmob_duration ($1);
- Duration k (d->duration_log (),d->dot_count () + $2);
-
+ Duration *d = unsmob_duration ($1);
+ Duration k (d->duration_log (), d->dot_count () + $2);
*d = k;
$$ = $1;
}
;
-
-
-
multiplied_duration:
steno_duration {
$$ = $1;
$$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy ();
}
| multiplied_duration '*' FRACTION {
- Rational m (gh_scm2int (ly_car ($3)), gh_scm2int (ly_cdr ($3)));
+ Rational m (scm_to_int (scm_car ($3)), scm_to_int (scm_cdr ($3)));
$$ = unsmob_duration ($$)->compressed (m).smobbed_copy ();
}
fraction:
FRACTION { $$ = $1; }
| UNSIGNED '/' UNSIGNED {
- $$ = scm_cons (gh_int2scm ($1), gh_int2scm ($3));
+ $$ = scm_cons (scm_int2num ($1), scm_int2num ($3));
}
;
}
;
-
-tremolo_type:
+tremolo_type:
':' {
- $$ =0;
+ $$ = 0;
}
| ':' bare_unsigned {
- if (!is_duration_b ($2))
- THIS->parser_error (_f ("not a duration: %d", $2));
+ if (!is_duration ($2))
+ THIS->parser_error (@2, _f ("not a duration: %d", $2));
$$ = $2;
}
;
-
-
-/*****************************************************************
- BASS FIGURES
-*****************************************************************/
bass_number:
DIGIT {
- $$ = scm_number_to_string (gh_int2scm ($1), gh_int2scm (10));
+ $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
+ $$ = scm_list_2 (ly_lily_module_constant ("number-markup"),
+ $$);
}
| UNSIGNED {
- $$ = scm_number_to_string (gh_int2scm ($1), gh_int2scm (10));
+ $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
+ $$ = scm_list_2 (ly_lily_module_constant ("number-markup"),
+ $$);
}
- | STRING { $$ = $1; }
+ | STRING { $$ = $1; }
+ | full_markup { $$ = $1; }
;
bass_mod:
'-' { $$ = -2; }
- | '+' { $$ = 2; }
+ | '+' { $$ = 2; }
| '!' { $$ = 0; }
;
bass_figure:
FIGURE_SPACE {
- Music *bfr = MY_MAKE_MUSIC("BassFigureEvent");
- $$ = bfr->self_scm();
+ Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
+ $$ = bfr->self_scm ();
scm_gc_unprotect_object ($$);
}
| bass_number {
- Music *bfr = MY_MAKE_MUSIC("BassFigureEvent");
- $$ = bfr->self_scm();
+ Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
+ $$ = bfr->self_scm ();
- bfr->set_mus_property ("figure", $1);
+ bfr->set_property ("figure", $1);
scm_gc_unprotect_object ($$);
}
| bass_figure bass_mod {
Music *m = unsmob_music ($1);
if ($2) {
- SCM salter =m->get_mus_property ("alteration");
- int alter = gh_number_p ( salter) ? gh_scm2int (salter) : 0;
- m->set_mus_property ("alteration",
- gh_int2scm (alter + $2));
+ SCM salter = m->get_property ("alteration");
+ int alter = scm_is_number (salter) ? scm_to_int (salter) : 0;
+ m->set_property ("alteration",
+ scm_int2num (alter + $2));
} else {
- m->set_mus_property ("alteration", gh_int2scm (0));
+ m->set_property ("alteration", scm_int2num (0));
}
}
;
br_bass_figure:
'[' bass_figure {
$$ = $2;
- unsmob_music ($$)->set_mus_property ("bracket-start", SCM_BOOL_T);
+ unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T);
}
| bass_figure {
$$ = $1;
}
| br_bass_figure ']' {
$$ = $1;
- unsmob_music ($1)->set_mus_property ("bracket-stop", SCM_BOOL_T);
+ unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T);
}
;
$$ = SCM_EOL;
}
| figure_list br_bass_figure {
- $$ = scm_cons ($2, $1);
+ $$ = scm_cons ($2, $1);
}
;
figure_spec:
FIGURE_OPEN figure_list FIGURE_CLOSE {
- Music * m = MY_MAKE_MUSIC("EventChord");
+ Music *m = MY_MAKE_MUSIC ("EventChord");
$2 = scm_reverse_x ($2, SCM_EOL);
- m->set_mus_property ("elements", $2);
+ m->set_property ("elements", $2);
$$ = m->self_scm ();
}
;
;
simple_element:
- pitch exclamations questions oct_check optional_notemode_duration optional_rest {
-
- Input i = THIS->pop_spot ();
- if (!THIS->lexer_->note_state_b ())
- THIS->parser_error (_ ("Have to be in Note mode for notes"));
+ pitch exclamations questions octave_check optional_notemode_duration optional_rest {
+ if (!THIS->lexer_->is_note_state ())
+ THIS->parser_error (@1, _ ("have to be in Note mode for notes"));
Music *n = 0;
if ($6)
- n = MY_MAKE_MUSIC("RestEvent");
+ n = MY_MAKE_MUSIC ("RestEvent");
else
- n = MY_MAKE_MUSIC("NoteEvent");
+ n = MY_MAKE_MUSIC ("NoteEvent");
- n->set_mus_property ("pitch", $1);
- n->set_mus_property ("duration", $5);
+ n->set_property ("pitch", $1);
+ n->set_property ("duration", $5);
- if (gh_number_p ($4))
+ if (scm_is_number ($4))
{
- int q = gh_scm2int ($4);
- n->set_mus_property ("absolute-octave", gh_int2scm (q-1));
+ int q = scm_to_int ($4);
+ n->set_property ("absolute-octave", scm_int2num (q-1));
}
if ($3 % 2)
- n->set_mus_property ("cautionary", SCM_BOOL_T);
+ n->set_property ("cautionary", SCM_BOOL_T);
if ($2 % 2 || $3 % 2)
- n->set_mus_property ("force-accidental", SCM_BOOL_T);
+ n->set_property ("force-accidental", SCM_BOOL_T);
- Music *v = MY_MAKE_MUSIC("EventChord");
- v->set_mus_property ("elements", scm_list_n (n->self_scm (), SCM_UNDEFINED));
- scm_gc_unprotect_object (n->self_scm());
+ Music *v = MY_MAKE_MUSIC ("EventChord");
+ v->set_property ("elements", scm_list_1 (n->self_scm ()));
+ scm_gc_unprotect_object (n->self_scm ());
- v->set_spot (i);
- n->set_spot (i);
+ v->set_spot (@$);
+ n->set_spot (@$);
$$ = v;
}
| DRUM_PITCH optional_notemode_duration {
- Input i = THIS->pop_spot ();
-
- Music *n = MY_MAKE_MUSIC("NoteEvent");
- n->set_mus_property ("duration" ,$2);
- n->set_mus_property ("drum-type" , $1);
-
- Music *v = MY_MAKE_MUSIC("EventChord");
- v->set_mus_property ("elements", scm_list_n (n->self_scm (), SCM_UNDEFINED));
- scm_gc_unprotect_object (n->self_scm());
- v->set_spot (i);
- n->set_spot (i);
+ Music *n = MY_MAKE_MUSIC ("NoteEvent");
+ n->set_property ("duration", $2);
+ n->set_property ("drum-type", $1);
+
+ Music *v = MY_MAKE_MUSIC ("EventChord");
+ v->set_property ("elements", scm_list_1 (n->self_scm ()));
+ scm_gc_unprotect_object (n->self_scm ());
+ v->set_spot (@$);
+ n->set_spot (@$);
$$ = v;
}
| figure_spec optional_notemode_duration {
- Music * m = unsmob_music ($1);
- Input i = THIS->pop_spot ();
- m->set_spot (i);
- for (SCM s = m->get_mus_property ("elements"); gh_pair_p (s); s = ly_cdr (s))
+ Music *m = unsmob_music ($1);
+ m->set_spot (@$);
+ for (SCM s = m->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s))
{
- unsmob_music (ly_car (s))->set_mus_property ("duration", $2);
+ unsmob_music (scm_car (s))->set_property ("duration", $2);
}
$$ = m;
}
| RESTNAME optional_notemode_duration {
-
- Input i = THIS->pop_spot ();
- Music * ev = 0;
- if (ly_scm2string ($1) =="s") {
+ Music *ev = 0;
+ if (ly_scm2string ($1) == "s") {
/* Space */
- ev = MY_MAKE_MUSIC("SkipEvent");
+ ev = MY_MAKE_MUSIC ("SkipEvent");
}
else {
- ev = MY_MAKE_MUSIC("RestEvent");
+ ev = MY_MAKE_MUSIC ("RestEvent");
}
- ev->set_mus_property ("duration" ,$2);
- ev->set_spot (i);
- Music * velt = MY_MAKE_MUSIC("EventChord");
- velt->set_mus_property ("elements", scm_list_n (ev->self_scm (),SCM_UNDEFINED));
- velt->set_spot (i);
+ ev->set_property ("duration", $2);
+ ev->set_spot (@$);
+ Music *velt = MY_MAKE_MUSIC ("EventChord");
+ velt->set_property ("elements", scm_list_1 (ev->self_scm ()));
+ velt->set_spot (@$);
- scm_gc_unprotect_object (ev->self_scm());
+ scm_gc_unprotect_object (ev->self_scm ());
$$ = velt;
}
| MULTI_MEASURE_REST optional_notemode_duration {
- THIS->pop_spot ();
-
- static SCM proc ;
- if (!proc)
- proc = scm_c_eval_string ("make-multi-measure-rest");
-
- SCM mus = scm_call_2 (proc, $2,
- make_input (THIS->here_input()));
+ SCM proc = ly_lily_module_constant ("make-multi-measure-rest");
+ SCM mus = scm_call_2 (proc, $2, make_input (@$));
scm_gc_protect_object (mus);
$$ = unsmob_music (mus);
}
| lyric_element optional_notemode_duration {
- Input i = THIS->pop_spot ();
- if (!THIS->lexer_->lyric_state_b ())
- THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
+ if (!THIS->lexer_->is_lyric_state ())
+ THIS->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
- Music * lreq = MY_MAKE_MUSIC("LyricEvent");
- lreq->set_mus_property ("text", $1);
- lreq->set_mus_property ("duration",$2);
- lreq->set_spot (i);
- Music * velt = MY_MAKE_MUSIC("EventChord");
- velt->set_mus_property ("elements", scm_list_n (lreq->self_scm (), SCM_UNDEFINED));
+ Music *lreq = MY_MAKE_MUSIC ("LyricEvent");
+ lreq->set_property ("text", $1);
+ lreq->set_property ("duration",$2);
+ lreq->set_spot (@$);
+ Music *velt = MY_MAKE_MUSIC ("EventChord");
+ velt->set_property ("elements", scm_list_1 (lreq->self_scm ()));
$$= velt;
}
| new_chord {
- THIS->pop_spot ();
-
- if (!THIS->lexer_->chord_state_b ())
- THIS->parser_error (_ ("Have to be in Chord mode for chords"));
+ if (!THIS->lexer_->is_chord_state ())
+ THIS->parser_error (@1, _ ("have to be in Chord mode for chords"));
$$ = unsmob_music ($1);
}
;
lyric_element:
- full_markup { $$ = $1; }
- | STRING { $$ = $1 ; }
+ lyric_markup {
+ $$ = $1;
+ }
+ | LYRICS_STRING {
+ $$ = make_simple_markup ($1);
+ }
;
new_chord:
}
| steno_tonic_pitch optional_notemode_duration chord_separator chord_items {
SCM its = scm_reverse_x ($4, SCM_EOL);
- $$ = make_chord ($1, $2, gh_cons ($3, its));
+ $$ = make_chord ($1, $2, scm_cons ($3, its));
}
;
$$ = SCM_EOL;
}
| chord_items chord_item {
- $$ = gh_cons ($2, $$);
+ $$ = scm_cons ($2, $$);
}
;
$$ = ly_symbol2scm ("chord-colon");
}
| CHORD_CARET {
- $$ = ly_symbol2scm ("chord-caret");
+ $$ = ly_symbol2scm ("chord-caret");
}
| CHORD_SLASH steno_tonic_pitch {
- $$ = scm_list_n (ly_symbol2scm ("chord-slash"), $2, SCM_UNDEFINED);
+ $$ = scm_list_2 (ly_symbol2scm ("chord-slash"), $2);
}
| CHORD_BASS steno_tonic_pitch {
- $$ = scm_list_n (ly_symbol2scm ("chord-bass"), $2, SCM_UNDEFINED);
+ $$ = scm_list_2 (ly_symbol2scm ("chord-bass"), $2);
}
;
;
step_numbers:
- step_number { $$ = gh_cons ($1, SCM_EOL); }
+ step_number { $$ = scm_cons ($1, SCM_EOL); }
| step_numbers '.' step_number {
- $$ = gh_cons ($3, $$);
+ $$ = scm_cons ($3, $$);
}
;
step_number:
bare_unsigned {
$$ = make_chord_step ($1, 0);
- }
+ }
| bare_unsigned '+' {
$$ = make_chord_step ($1, SHARP);
}
| bare_unsigned CHORD_MINUS {
$$ = make_chord_step ($1, FLAT);
}
- ;
+ ;
/*
UTILITIES
| number_expression '-' number_term {
$$ = scm_difference ($1, $3);
}
- | number_term
+ | number_term
;
number_term:
bare_number:
UNSIGNED {
- $$ = gh_int2scm ($1);
+ $$ = scm_int2num ($1);
}
| REAL {
$$ = $1;
$$ = $1;
}
| REAL NUMBER_IDENTIFIER {
- $$ = gh_double2scm (gh_scm2double ($1) * gh_scm2double ($2));
+ $$ = scm_make_real (scm_to_double ($1) *scm_to_double ($2));
}
| UNSIGNED NUMBER_IDENTIFIER {
- $$ = gh_double2scm ($1 * gh_scm2double ($2));
+ $$ = scm_make_real ($1 *scm_to_double ($2));
}
;
}
;
-bare_int:
- bare_number {
- if (scm_integer_p ($1) == SCM_BOOL_T)
- {
- int k = gh_scm2int ($1);
- $$ = k;
- } else
- {
- THIS->parser_error (_ ("need integer number arg"));
- $$ = 0;
- }
- }
- | '-' bare_int {
- $$ = -$2;
- }
+exclamations:
+ { $$ = 0; }
+ | exclamations '!' { $$ ++; }
;
+questions:
+ { $$ = 0; }
+ | questions '?' { $$ ++; }
+ ;
-string:
- STRING {
+/*
+This should be done more dynamically if possible.
+*/
+
+lyric_markup:
+ LYRIC_MARKUP_IDENTIFIER {
$$ = $1;
}
- | STRING_IDENTIFIER {
+ | LYRIC_MARKUP
+ { THIS->lexer_->push_markup_state (); }
+ markup_top {
+ $$ = $3;
+ THIS->lexer_->pop_state ();
+ }
+ ;
+
+full_markup:
+ MARKUP_IDENTIFIER {
$$ = $1;
}
- | string '+' string {
- $$ = scm_string_append (scm_list_n ($1, $3, SCM_UNDEFINED));
+ | MARKUP
+ { THIS->lexer_->push_markup_state (); }
+ markup_top {
+ $$ = $3;
+ THIS->lexer_->pop_state ();
}
;
+markup_top:
+ markup_list {
+ $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1);
+ }
+ | markup_head_1_list simple_markup {
+ $$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2)));
+ }
+ | simple_markup {
+ $$ = $1;
+ }
+ ;
-exclamations:
- { $$ = 0; }
- | exclamations '!' { $$ ++; }
+markup_list:
+ markup_composed_list {
+ $$ = $1;
+ }
+ | markup_braced_list {
+ $$ = $1;
+ }
;
-questions:
- { $$ = 0; }
- | questions '?' { $$ ++; }
+markup_composed_list:
+ markup_head_1_list markup_braced_list {
+ $$ = scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, $2);
+
+ }
;
+markup_braced_list:
+ '{' markup_braced_list_body '}' {
+ $$ = scm_reverse_x ($2, SCM_EOL);
+ }
+ ;
+markup_braced_list_body:
+ /* empty */ { $$ = SCM_EOL; }
+ | markup_braced_list_body markup {
+ $$ = scm_cons ($2, $1);
+ }
+ | markup_braced_list_body markup_list {
+ $$ = scm_append_x (scm_list_2 (scm_reverse_x ($2, SCM_EOL), $1));
+ }
+ ;
-full_markup:
- MARKUP_IDENTIFIER {
- $$ = $1;
- }
- | MARKUP
- { THIS->lexer_->push_markup_state (); }
- markup
- { $$ = $3;
- THIS->lexer_->pop_state ();
- }
+markup_head_1_item:
+ MARKUP_HEAD_MARKUP0 {
+ $$ = scm_list_1 ($1);
+ }
+ | MARKUP_HEAD_SCM0_MARKUP1 embedded_scm {
+ $$ = scm_list_2 ($1, $2);
+ }
+ | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm {
+ $$ = scm_list_3 ($1, $2, $3);
+ }
;
+markup_head_1_list:
+ markup_head_1_item {
+ $$ = scm_list_1 ($1);
+ }
+ | markup_head_1_list markup_head_1_item {
+ $$ = scm_cons ($2, $1);
+ }
+ ;
-/*
-This should be done more dynamically if possible.
-*/
-markup:
+simple_markup:
STRING {
$$ = make_simple_markup ($1);
}
- | MARKUP_HEAD_EMPTY {
- $$ = scm_list_n ($1, SCM_UNDEFINED);
- }
- | MARKUP_HEAD_MARKUP0 markup {
- $$ = scm_list_n ($1, $2, SCM_UNDEFINED);
- }
- | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup {
- $$ = scm_list_n ($1, $2, $3, SCM_UNDEFINED);
+ | MARKUP_IDENTIFIER {
+ $$ = $1;
}
- | MARKUP_HEAD_SCM0_MARKUP1 SCM_T markup {
- $$ = scm_list_n ($1, $2, $3, SCM_UNDEFINED);
+ | LYRIC_MARKUP_IDENTIFIER {
+ $$ = $1;
}
- | markup_line {
+ | STRING_IDENTIFIER {
$$ = $1;
}
- | MARKUP_HEAD_LIST0 markup_list {
- $$ = scm_list_n ($1,$2, SCM_UNDEFINED);
+ | SCORE {
+ SCM nn = THIS->lexer_->lookup_identifier ("pitchnames");
+ THIS->lexer_->push_note_state (alist_to_hashq (nn));
+ } '{' score_body '}' {
+ Score * sc = $4;
+ $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ());
+ scm_gc_unprotect_object (sc->self_scm ());
+ THIS->lexer_->pop_state ();
}
| MARKUP_HEAD_SCM0 embedded_scm {
- $$ = scm_list_n ($1, $2, SCM_UNDEFINED);
- }
- | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm markup {
- $$ = scm_list_n ($1, $2, $3, $4, SCM_UNDEFINED);
+ $$ = scm_list_2 ($1, $2);
}
| MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm {
- $$ = scm_list_n ($1, $2, $3, $4, SCM_UNDEFINED);
+ $$ = scm_list_4 ($1, $2, $3, $4);
}
| MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm {
- $$ = scm_list_n ($1, $2, $3, SCM_UNDEFINED);
+ $$ = scm_list_3 ($1, $2, $3);
}
- | MARKUP_IDENTIFIER {
- $$ = $1;
+ | MARKUP_HEAD_EMPTY {
+ $$ = scm_list_1 ($1);
+ }
+ | MARKUP_HEAD_LIST0 markup_list {
+ $$ = scm_list_2 ($1,$2);
+ }
+ | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup {
+ $$ = scm_list_3 ($1, $2, $3);
}
-
- ;
-
-markup_list:
- chord_open markup_list_body chord_close { $$ = scm_reverse_x ($2, SCM_EOL); }
;
-
-markup_line:
- '{' markup_list_body '}' {
- static SCM line ;
- if (!line)
- line = scm_c_eval_string ("line-markup");
- $$ = scm_list_n (line, scm_reverse_x ($2, SCM_EOL), SCM_UNDEFINED);
+markup:
+ markup_head_1_list simple_markup {
+ SCM mapper = ly_lily_module_constant ("map-markup-command-list");
+ $$ = scm_car (scm_call_2 (mapper, $1, scm_list_1 ($2)));
}
- ;
-
-markup_list_body:
- /**/ { $$ = SCM_EOL; }
- | markup_list_body markup {
- $$ = gh_cons ($2, $1) ;
+ | simple_markup {
+ $$ = $1;
}
;
-
%%
void
-My_lily_parser::set_yydebug (bool )
+Lily_parser::set_yydebug (bool )
{
#if 0
yydebug = 1;
#endif
}
-extern My_lily_parser * current_parser;
-
void
-My_lily_parser::do_yyparse ()
+Lily_parser::do_yyparse ()
{
- current_parser = this;;
yyparse ((void*)this);
}
-/*
-Should make this optional? It will also complain when you do
-
- [s4]
-
-which is entirely legitimate.
-
-Or we can scrap it. Barchecks should detect wrong durations, and
-skipTypesetting speeds it up a lot.
-*/
-
-void
-My_lily_parser::beam_check (SCM dur)
-{
- Duration *d = unsmob_duration (dur);
- if (unsmob_music (last_beam_start_) && d->duration_log () <= 2)
- {
- Music * m = unsmob_music (last_beam_start_);
- m->origin ()->warning (_("Suspect duration found following this beam"));
- }
- last_beam_start_ = SCM_EOL;
-}
-
*/
int
-My_lily_lexer::try_special_identifiers (SCM * destination, SCM sid)
+Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
{
- if (gh_string_p (sid)) {
+ if (scm_is_string (sid)) {
*destination = sid;
return STRING_IDENTIFIER;
- } else if (gh_number_p (sid)) {
+ } else if (scm_is_number (sid)) {
*destination = sid;
return NUMBER_IDENTIFIER;
} else if (unsmob_context_def (sid)) {
- *destination = unsmob_context_def (sid)->clone_scm();
- return TRANSLATOR_IDENTIFIER;
+ *destination = unsmob_context_def (sid)->clone_scm ();
+ return CONTEXT_DEF_IDENTIFIER;
} else if (unsmob_score (sid)) {
- Score *sc = new Score (*unsmob_score (sid));
- *destination =sc->self_scm ();
+ Score *score = new Score (*unsmob_score (sid));
+ *destination = score->self_scm ();
return SCORE_IDENTIFIER;
- } else if (Music * mus =unsmob_music (sid)) {
- *destination = unsmob_music (sid)->clone ()->self_scm();
+ } else if (Music *mus = unsmob_music (sid)) {
+ mus = mus->clone ();
+ *destination = mus->self_scm ();
unsmob_music (*destination)->
- set_mus_property ("origin", make_input (last_input_));
+ set_property ("origin", make_input (last_input_));
return dynamic_cast<Event*> (mus)
? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
} else if (unsmob_duration (sid)) {
- *destination = unsmob_duration (sid)->smobbed_copy();
+ *destination = unsmob_duration (sid)->smobbed_copy ();
return DURATION_IDENTIFIER;
- } else if (unsmob_music_output_def (sid)) {
- Music_output_def *p = unsmob_music_output_def (sid);
+ } else if (unsmob_output_def (sid)) {
+ Output_def *p = unsmob_output_def (sid);
p = p->clone ();
- *destination = p->self_scm();
- return MUSIC_OUTPUT_DEF_IDENTIFIER;
- } else if (Text_item::markup_p (sid)) {
+ *destination = p->self_scm ();
+ return OUTPUT_DEF_IDENTIFIER;
+ } else if (Text_interface::markup_p (sid)) {
*destination = sid;
+ if (is_lyric_state ())
+ return LYRIC_MARKUP_IDENTIFIER;
return MARKUP_IDENTIFIER;
}
Music *
property_op_to_music (SCM op)
{
- Music * m = 0;
- SCM tag = gh_car (op);
- SCM symbol = gh_cadr (op);
- SCM args = gh_cddr (op);
+ Music *m = 0;
+ SCM tag = scm_car (op);
+ SCM symbol = scm_cadr (op);
+ SCM args = scm_cddr (op);
SCM grob_val = SCM_UNDEFINED;
SCM grob_sym = SCM_UNDEFINED;
SCM val = SCM_UNDEFINED;
if (tag == ly_symbol2scm ("assign"))
{
- m = MY_MAKE_MUSIC("PropertySet");
- val = gh_car (args);
+ m = MY_MAKE_MUSIC ("PropertySet");
+ val = scm_car (args);
}
else if (tag == ly_symbol2scm ("unset"))
- m = MY_MAKE_MUSIC("PropertyUnset");
+ m = MY_MAKE_MUSIC ("PropertyUnset");
else if (tag == ly_symbol2scm ("poppush")
|| tag == ly_symbol2scm ("push"))
{
- m = MY_MAKE_MUSIC("OverrideProperty");
- grob_sym = gh_car (args);
- grob_val = gh_cadr (args);
+ m = MY_MAKE_MUSIC ("OverrideProperty");
+ grob_sym = scm_car (args);
+ grob_val = scm_cadr (args);
}
else if (tag == ly_symbol2scm ("pop")) {
- m = MY_MAKE_MUSIC("RevertProperty");
- grob_sym = gh_car (args);
+ m = MY_MAKE_MUSIC ("RevertProperty");
+ grob_sym = scm_car (args);
}
- m->set_mus_property ("symbol", symbol);
+ m->set_property ("symbol", symbol);
if (val != SCM_UNDEFINED)
- m->set_mus_property ("value", val);
+ m->set_property ("value", val);
if (grob_val != SCM_UNDEFINED)
- m->set_mus_property ("grob-value", grob_val);
+ m->set_property ("grob-value", grob_val);
if (grob_sym != SCM_UNDEFINED)
{
- bool itc = internal_type_checking_global_b;
+ bool itc = do_internal_type_checking_global;
/* UGH.
*/
- bool autobeam = gh_equal_p (symbol, ly_symbol2scm ("autoBeamSettings"));
+ bool autobeam = ly_c_equal_p (symbol, ly_symbol2scm ("autoBeamSettings"));
if (autobeam)
- internal_type_checking_global_b = false;
- m->set_mus_property ("grob-property", grob_sym);
+ do_internal_type_checking_global = false;
+ m->set_property ("grob-property", grob_sym);
if (autobeam)
- internal_type_checking_global_b = itc;
+ do_internal_type_checking_global = itc;
}
- if (op == ly_symbol2scm ("poppush"))
- m->set_mus_property ("pop-first", SCM_BOOL_T);
+ if (tag == ly_symbol2scm ("poppush"))
+ m->set_property ("pop-first", SCM_BOOL_T);
return m;
}
Music*
-context_spec_music (SCM type, SCM id, Music * m, SCM ops)
+context_spec_music (SCM type, SCM id, Music *m, SCM ops)
{
- Music * csm = MY_MAKE_MUSIC("ContextSpeccedMusic");
+ Music *csm = MY_MAKE_MUSIC ("ContextSpeccedMusic");
- csm->set_mus_property ("element", m->self_scm ());
+ csm->set_property ("element", m->self_scm ());
scm_gc_unprotect_object (m->self_scm ());
- csm->set_mus_property ("context-type", scm_string_to_symbol (type));
- csm->set_mus_property ("property-operations", ops);
+ csm->set_property ("context-type",
+ scm_is_symbol (type) ? type : scm_string_to_symbol (type));
+ csm->set_property ("property-operations", ops);
- if (gh_string_p (id))
- csm->set_mus_property ("context-id", id);
+ if (scm_is_string (id))
+ csm->set_property ("context-id", id);
return csm;
}
+SCM
+get_next_unique_context_id ()
+{
+ return scm_makfrom0str ("$uniqueContextId");
+}
+
SCM
-get_next_unique_context ()
+get_next_unique_lyrics_context_id ()
{
static int new_context_count;
-
- char s[1024];
- snprintf (s, 1024, "uniqueContext%d", new_context_count ++);
-
+ char s[128];
+ snprintf (s, 1024, "uniqueContext%d", new_context_count++);
return scm_makfrom0str (s);
}
-