source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "config.hh"
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-
+#include <cctype>
+#include <cstdlib>
+#include <cstdio>
+using namespace std;
#include "book.hh"
#include "context-def.hh"
SCM
make_simple_markup (SCM a)
{
- SCM simple = ly_lily_module_constant ("simple-markup");
- return scm_list_2 (simple, a);
+ return a;
}
bool
{
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);
+
+ unsmob_music (ch)->protect();
return ch;
}
deleting them. Let's hope that a stack overflow doesnt trigger a move
of the parse stack onto the heap. */
+%left PREC_TOP
%left ADDLYRICS
+%left PREC_BOT
%union {
Book *book;
%token E_OPEN "\\("
%token E_BRACKET_CLOSE "\\]"
%token E_ANGLE_OPEN "\\<"
+%token E_PLUS "\\+"
%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
+/*
+If we give names, Bison complains.
*/
%token FIGURE_CLOSE /* "\\>" */
%token FIGURE_OPEN /* "\\<" */
%token HYPHEN "--"
%token CHORDMODIFIERS
-%token COMMANDSPANREQUEST
%token LYRIC_MARKUP
%token MULTI_MEASURE_REST
%token SCM_T
%token <i> E_UNSIGNED
%token <i> UNSIGNED
-%token <id> IDENTIFIER
-
+%token <scm> BOOK_IDENTIFIER
%token <scm> CHORDMODIFIER_PITCH
%token <scm> CHORD_MODIFIER
%token <scm> CONTEXT_DEF_IDENTIFIER
%token <scm> MUSIC_FUNCTION_SCM_MUSIC_MUSIC
%token <scm> MUSIC_FUNCTION_SCM_SCM
%token <scm> MUSIC_FUNCTION_SCM_SCM_MUSIC
+%token <scm> MUSIC_FUNCTION_SCM_SCM_SCM
%token <scm> MUSIC_IDENTIFIER
%token <scm> NOTENAME_PITCH
%token <scm> NUMBER_IDENTIFIER
%type <book> book_body
%type <i> bare_unsigned
-%type <i> bass_mod
+%type <i> figured_bass_alteration
%type <i> dots
%type <i> exclamations
%type <i> optional_rest
%type <music> chord_body
%type <music> chord_body_element
%type <music> command_element
-%type <music> command_req
+%type <music> command_event
%type <music> context_change
%type <music> direction_less_event
%type <music> direction_reqd_event
%type <scm> assignment_id
%type <scm> bare_number
%type <scm> bass_figure
-%type <scm> bass_number
+%type <scm> figured_bass_modification
%type <scm> br_bass_figure
+%type <scm> bass_number
%type <scm> chord_body_elements
%type <scm> chord_item
%type <scm> chord_items
toplevel_expression:
lilypond_header {
- THIS->lexer_->set_identifier (ly_symbol2scm ("$globalheader"), $1);
+ THIS->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
}
| add_quote {
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 ());
+ book->unprotect ();
}
| 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 ());
+ score->unprotect ();
}
| 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 ());
+ music->unprotect ();
}
| full_markup {
SCM proc = THIS->lexer_->lookup_identifier ("toplevel-text-handler");
id = ly_symbol2scm ("$defaultlayout");
THIS->lexer_->set_identifier (id, od->self_scm ());
- scm_gc_unprotect_object (od->self_scm ());
+ od->unprotect();
}
;
lilypond_header_body:
{
- SCM id = THIS->lexer_->lookup_identifier("$globalheader");
- if ( ly_is_module(id) ){
- // if the header exists, then comes here.
- THIS->lexer_->add_scope(id);
- $$ = id;
- }else{
- /* org code */
- $$ = ly_make_anonymous_module (be_safe_global);
- THIS->lexer_->add_scope ($$);
- }
+ $$ = get_header(THIS);
+ THIS->lexer_->add_scope ($$);
}
| lilypond_header_body assignment {
identifier_init:
score_block {
$$ = $1->self_scm ();
- scm_gc_unprotect_object ($$);
+ $1->unprotect ();
+ }
+ | book_block {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
}
| output_def {
$$ = $1->self_scm ();
- scm_gc_unprotect_object ($$);
+ $1->unprotect ();
}
| context_def_spec_block {
$$ = $1;
}
| Music {
$$ = $1->self_scm ();
- scm_gc_unprotect_object ($$);
+ $1->unprotect();
}
| post_event {
$$ = $1->self_scm ();
- scm_gc_unprotect_object ($$);
+ $1->unprotect();
}
| number_expression {
$$ = $1;
$$ = $1;
}
| DIGIT {
- $$ = scm_int2num ($1);
+ $$ = scm_from_int ($1);
}
;
$$ = 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");
+ $$->paper_->unprotect ();
+ $$->header_ = THIS->lexer_->lookup_identifier ("$defaultheader");
+ }
+ | BOOK_IDENTIFIER {
+ $$ = unsmob_book ($1);
+ $$->set_spot (@$);
}
| book_body paper_block {
$$->paper_ = $2;
- scm_gc_unprotect_object ($2->self_scm ());
+ $2->unprotect ();
}
| book_body score_block {
SCM s = $2->self_scm ();
$$->add_score (s);
- scm_gc_unprotect_object (s);
+ $2->unprotect();
}
| book_body full_markup {
$$->add_score ($2);
score_body:
Music {
SCM m = $1->self_scm ();
- scm_gc_unprotect_object (m);
+ $1->unprotect();
SCM scorify = ly_lily_module_constant ("scorify-music");
SCM score = scm_call_2 (scorify, m, THIS->self_scm ());
- // pass ownernship to C++ again.
- scm_gc_protect_object (score);
+ // pass ownernship to C++ again.
$$ = unsmob_score (score);
+ $$->protect ();
$$->set_spot (@$);
}
| SCORE_IDENTIFIER {
{
$$->defs_.push ($2);
}
- scm_gc_unprotect_object ($2->self_scm ());
+ $2->unprotect ();
}
| score_body error {
$$->error_found_ = true;
THIS->lexer_->push_initial_state ();
}
| output_def_head '{' OUTPUT_DEF_IDENTIFIER {
- scm_gc_unprotect_object ($1->self_scm ());
+ $1->unprotect ();
Output_def *o = unsmob_output_def ($3);
o->input_origin_.set_spot (@$);
$$ = o;
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 ());
+ $2->unprotect ();
}
| output_def_body error {
TEMPO steno_duration '=' bare_unsigned {
$$ = MY_MAKE_MUSIC ("MetronomeChangeEvent");
$$->set_property ("tempo-unit", $2);
- $$->set_property ("metronome-count", scm_int2num ( $4));
+ $$->set_property ("metronome-count", scm_from_int ( $4));
}
;
| Music_list Music {
SCM s = $$;
SCM c = scm_cons ($2->self_scm (), SCM_EOL);
- scm_gc_unprotect_object ($2->self_scm ()); /* UGH */
+ $2->unprotect (); /* UGH */
if (scm_is_pair (scm_cdr (s)))
scm_set_cdr_x (scm_cdr (s), c); /* append */
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 */
+ m->unprotect (); /* UGH */
if (scm_is_pair (scm_cdr (s)))
scm_set_cdr_x (scm_cdr (s), c); /* append */
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);
+ r->protect ();
if (beg)
{
r-> set_property ("element", beg->self_scm ());
- scm_gc_unprotect_object (beg->self_scm ());
+ beg->unprotect ();
}
- r->set_property ("repeat-count", scm_int2num (max (times, 1)));
+ r->set_property ("repeat-count", scm_from_int (max (times, 1)));
r-> set_property ("elements",alts);
if (ly_is_equal ($2, scm_makfrom0str ("tremolo"))) {
shift -= 1;
r->compress (Moment (Rational (1, list_len)));
}
- scm_call_3 (func, r->self_scm (), scm_int2num (shift), scm_int2num (dots));
+ scm_call_3 (func, r->self_scm (), scm_from_int (shift), scm_from_int (dots));
}
r->set_spot (*$4->origin ());
}
| MUSIC_FUNCTION_MUSIC Music {
$$ = scm_list_3 ($1, make_input (@$), $2->self_scm ());
- scm_gc_unprotect_object ($2->self_scm ());
+ $2->unprotect ();
}
| MUSIC_FUNCTION_SCM_MUSIC embedded_scm Music {
$$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
+ $3->unprotect ();
}
| MUSIC_FUNCTION_SCM_SCM embedded_scm embedded_scm {
$$ = scm_list_4 ($1, make_input (@$), $2, $3);
}
+ | MUSIC_FUNCTION_SCM_SCM_SCM embedded_scm embedded_scm embedded_scm {
+ $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
+ }
| 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 ());
+ $3->unprotect ();
}
| 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 ());
- scm_gc_unprotect_object ($3->self_scm ());
+ $2->unprotect ();
+ $3->unprotect ();
}
| 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 ());
+ $4->unprotect ();
+ $3->unprotect ();
}
| 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 ());
+ $3->unprotect ();
+ $4->unprotect ();
}
;
if (unsmob_music (m))
{
$$ = unsmob_music (m);
- scm_gc_protect_object (m);
+ $$->protect ();
}
else
{
$$->set_spot (@$);
$$->set_property ("element", mp->self_scm ());
- scm_gc_unprotect_object (mp->self_scm ());
- $$->set_property ("numerator", scm_int2num (n));
- $$->set_property ("denominator", scm_int2num (d));
+ mp->unprotect();
+ $$->set_property ("numerator", scm_from_int (n));
+ $$->set_property ("denominator", scm_from_int (d));
$$->compress (Moment (Rational (n,d)));
}
p->transpose (pitch_interval (from, to));
$$->set_property ("element", p->self_scm ());
- scm_gc_unprotect_object (p->self_scm ());
+ p->unprotect();
}
| 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 ());
+ $2->unprotect();
}
else
{
{
Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
chm->set_property ("element", $$->self_scm ());
- scm_gc_unprotect_object ($$->self_scm ());
+ $$->unprotect();
$$ = chm;
}
THIS->lexer_->pop_state ();
Music *m = $3;
Pitch start = *unsmob_pitch ($2);
$$ = make_music_relative (start, m);
- scm_gc_unprotect_object (m->self_scm ());
+ m->unprotect();
}
| RELATIVE Composite_music {
Music *m = $2;
Pitch middle_c (0, 0, 0);
$$ = make_music_relative (middle_c, m);
- scm_gc_unprotect_object (m->self_scm ());
+ m->unprotect();
}
;
all->set_property ("elements", scm_cons (voice->self_scm (),
lst));
$$ = all;
- scm_gc_unprotect_object (voice->self_scm ());
+ voice->unprotect ();
}
| LYRICSTO simple_string {
THIS->lexer_->push_lyric_state ();
Music *music = $4;
SCM name = $2;
$$ = make_lyric_combine_music (name, music);
- scm_gc_unprotect_object (music->self_scm ());
+ music->unprotect();
}
;
}
| OVERRIDE simple_string embedded_scm '=' embedded_scm {
$$ = scm_list_4 (ly_symbol2scm ("push"),
- scm_string_to_symbol ($2), $3, $5);
+ scm_string_to_symbol ($2), $5, $3);
+ }
+ | OVERRIDE simple_string embedded_scm embedded_scm '=' embedded_scm {
+ $$ = scm_list_5 (ly_symbol2scm ("push"),
+ scm_string_to_symbol ($2), $6, $4, $3);
}
| REVERT simple_string embedded_scm {
$$ = scm_list_3 (ly_symbol2scm ("pop"),
music_property_def:
OVERRIDE context_prop_spec embedded_scm '=' scalar {
$$ = property_op_to_music (scm_list_4 (
- ly_symbol2scm ("poppush"),
+ ly_symbol2scm ("push"),
scm_cadr ($2),
- $3, $5));
- $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $5, $3));
+ $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ }
+ | OVERRIDE context_prop_spec embedded_scm embedded_scm '=' scalar {
+ $$ = property_op_to_music (scm_list_5 (
+ ly_symbol2scm ("push"),
+ scm_cadr ($2),
+ $6, $4, $3));
+ $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
}
| REVERT context_prop_spec embedded_scm {
$$ = property_op_to_music (scm_list_3 (
| LYRICS_STRING {
$$ = $1;
}
+ | STRING_IDENTIFIER {
+ $$ = $1;
+ }
;
scalar: string {
}
| 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;
- }*/
}
| embedded_scm {
$$ = $1;
$$ = $1;
}
| DIGIT {
- $$ = scm_int2num ($1);
+ $$ = scm_from_int ($1);
}
;
/* empty */ { $$ = SCM_EOL; }
| chord_body_elements chord_body_element {
$$ = scm_cons ($2->self_scm (), $1);
- scm_gc_unprotect_object ($2->self_scm ());
+ $2->unprotect ();
}
;
if (scm_is_number (check))
{
int q = scm_to_int (check);
- n->set_property ("absolute-octave", scm_int2num (q-1));
+ n->set_property ("absolute-octave", scm_from_int (q-1));
}
SCM adder = ly_lily_module_constant ("add-quotable");
scm_call_2 (adder, $2, $3->self_scm ());
- scm_gc_unprotect_object ($3->self_scm ());
+ $3->unprotect();
}
;
command_element:
- command_req {
+ command_event {
$$ = MY_MAKE_MUSIC ("EventChord");
$$->set_property ("elements", scm_cons ($1->self_scm (), SCM_EOL));
- scm_gc_unprotect_object ($1->self_scm ());
+ $1->unprotect();
$$-> set_spot (@$);
$1-> set_spot (@$);
}
| E_BRACKET_OPEN {
Music *m = MY_MAKE_MUSIC ("LigatureEvent");
- m->set_property ("span-direction", scm_int2num (START));
+ m->set_property ("span-direction", scm_from_int (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 ());
+ m->unprotect();
$$->set_spot (@$);
}
| E_BRACKET_CLOSE {
Music *m = MY_MAKE_MUSIC ("LigatureEvent");
- m->set_property ("span-direction", scm_int2num (STOP));
+ m->set_property ("span-direction", scm_from_int (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 ());
+ m->unprotect ();
}
| E_BACKSLASH {
$$ = MY_MAKE_MUSIC ("VoiceSeparator");
SCM proc = ly_lily_module_constant ("make-clef-set");
SCM result = scm_call_1 (proc, $2);
- scm_gc_protect_object (result);
$$ = unsmob_music (result);
+ $$->protect ();
}
| TIME_T fraction {
SCM proc = ly_lily_module_constant ("make-time-signature-set");
SCM result = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
- scm_gc_protect_object (result);
$$ = unsmob_music (result);
+ $$->protect ();
}
| MARK scalar {
SCM proc = ly_lily_module_constant ("make-mark-set");
SCM result = scm_call_1 (proc, $2);
- scm_gc_protect_object (result);
$$ = unsmob_music (result);
+ $$->protect ();
}
;
-command_req:
+command_event:
E_TILDE {
$$ = MY_MAKE_MUSIC ("PesOrFlexaEvent");
}
| post_events post_event {
$2->set_spot (@2);
$$ = scm_cons ($2->self_scm (), $$);
- scm_gc_unprotect_object ($2->self_scm ());
+ $2->unprotect ();
}
| post_events tagged_post_event {
$2 -> set_spot (@2);
$$ = scm_cons ($2->self_scm (), $$);
- scm_gc_unprotect_object ($2->self_scm ());
+ $2->unprotect ();
}
;
}
| script_dir direction_reqd_event {
if ($1)
- $2->set_property ("direction", scm_int2num ($1));
+ $2->set_property ("direction", scm_from_int ($1));
$$ = $2;
}
| script_dir direction_less_event {
if ($1)
- $2->set_property ("direction", scm_int2num ($1));
+ $2->set_property ("direction", scm_from_int ($1));
$$ = $2;
}
| string_number_event
string_number_event:
E_UNSIGNED {
Music *s = MY_MAKE_MUSIC ("StringNumberEvent");
- s->set_property ("string-number", scm_int2num ($1));
+ s->set_property ("string-number", scm_from_int ($1));
s->set_spot (@$);
$$ = s;
}
| tremolo_type {
Music *a = MY_MAKE_MUSIC ("TremoloEvent");
a->set_spot (@$);
- a->set_property ("tremolo-type", scm_int2num ($1));
+ a->set_property ("tremolo-type", scm_from_int ($1));
$$ = a;
}
;
octave_check:
/**/ { $$ = SCM_EOL; }
- | '=' { $$ = scm_int2num (0); }
- | '=' sub_quotes { $$ = scm_int2num ($2); }
- | '=' sup_quotes { $$ = scm_int2num ($2); }
+ | '=' { $$ = scm_from_int (0); }
+ | '=' sub_quotes { $$ = scm_from_int ($2); }
+ | '=' sup_quotes { $$ = scm_from_int ($2); }
;
sup_quotes:
}
| DIGIT {
Music *t = MY_MAKE_MUSIC ("FingerEvent");
- t->set_property ("digit", scm_int2num ($1));
+ t->set_property ("digit", scm_from_int ($1));
t->set_spot (@$);
$$ = t;
}
fraction:
FRACTION { $$ = $1; }
| UNSIGNED '/' UNSIGNED {
- $$ = scm_cons (scm_int2num ($1), scm_int2num ($3));
+ $$ = scm_cons (scm_from_int ($1), scm_from_int ($3));
}
;
bass_number:
DIGIT {
- $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
- $$ = scm_list_2 (ly_lily_module_constant ("number-markup"),
- $$);
+ $$ = scm_from_int ($1);
}
| UNSIGNED {
- $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
- $$ = scm_list_2 (ly_lily_module_constant ("number-markup"),
- $$);
+ $$ = scm_from_int ($1);
}
| STRING { $$ = $1; }
| full_markup { $$ = $1; }
;
-bass_mod:
+figured_bass_alteration:
'-' { $$ = -2; }
| '+' { $$ = 2; }
| '!' { $$ = 0; }
FIGURE_SPACE {
Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
$$ = bfr->self_scm ();
- scm_gc_unprotect_object ($$);
+ bfr->unprotect ();
}
| bass_number {
Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
$$ = bfr->self_scm ();
- bfr->set_property ("figure", $1);
+ if (scm_is_number ($1))
+ bfr->set_property ("figure", $1);
+ else if (Text_interface::is_markup ($1))
+ bfr->set_property ("text", $1);
- scm_gc_unprotect_object ($$);
+ bfr->unprotect ();
+ }
+ | bass_figure ']' {
+ $$ = $1;
+ unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T);
}
- | bass_figure bass_mod {
+ | bass_figure figured_bass_alteration {
Music *m = unsmob_music ($1);
if ($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));
+ scm_from_int (alter + $2));
} else {
- m->set_property ("alteration", scm_int2num (0));
+ m->set_property ("alteration", scm_from_int (0));
}
}
+ | bass_figure figured_bass_modification {
+ Music *m = unsmob_music ($1);
+ if ($2 == ly_symbol2scm ("plus"))
+ {
+ m->set_property ("augmented", SCM_BOOL_T);
+ }
+ else if ($2 == ly_symbol2scm ("slash"))
+ {
+ m->set_property ("diminished", SCM_BOOL_T);
+ }
+ else if ($2 == ly_symbol2scm ("exclamation"))
+ {
+ m->set_property ("no-continuation", SCM_BOOL_T);
+ }
+ }
;
-br_bass_figure:
- '[' bass_figure {
- $$ = $2;
- unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T);
+
+figured_bass_modification:
+ E_PLUS {
+ $$ = ly_symbol2scm ("plus");
}
- | bass_figure {
- $$ = $1;
+ | E_EXCLAMATION {
+ $$ = ly_symbol2scm ("exclamation");
+ }
+ | '/' {
+ $$ = ly_symbol2scm ("slash");
}
- | br_bass_figure ']' {
+ ;
+
+br_bass_figure:
+ bass_figure {
$$ = $1;
- unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T);
+ }
+ | '[' bass_figure {
+ $$ = $2;
+ unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T);
}
;
if (scm_is_number ($4))
{
int q = scm_to_int ($4);
- n->set_property ("absolute-octave", scm_int2num (q-1));
+ n->set_property ("absolute-octave", scm_from_int (q-1));
}
if ($3 % 2)
Music *v = MY_MAKE_MUSIC ("EventChord");
v->set_property ("elements", scm_list_1 (n->self_scm ()));
- scm_gc_unprotect_object (n->self_scm ());
+ n->unprotect ();
v->set_spot (@$);
n->set_spot (@$);
Music *v = MY_MAKE_MUSIC ("EventChord");
v->set_property ("elements", scm_list_1 (n->self_scm ()));
- scm_gc_unprotect_object (n->self_scm ());
+ n->unprotect ();
v->set_spot (@$);
n->set_spot (@$);
$$ = v;
velt->set_property ("elements", scm_list_1 (ev->self_scm ()));
velt->set_spot (@$);
- scm_gc_unprotect_object (ev->self_scm ());
+ ev->unprotect();
$$ = velt;
}
| MULTI_MEASURE_REST optional_notemode_duration {
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);
+ $$->protect ();
}
| lyric_element optional_notemode_duration {
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_property ("text", $1);
- lreq->set_property ("duration",$2);
- lreq->set_spot (@$);
+ Music *levent = MY_MAKE_MUSIC ("LyricEvent");
+ levent->set_property ("text", $1);
+ levent->set_property ("duration",$2);
+ levent->set_spot (@$);
Music *velt = MY_MAKE_MUSIC ("EventChord");
- velt->set_property ("elements", scm_list_1 (lreq->self_scm ()));
+ velt->set_property ("elements", scm_list_1 (levent->self_scm ()));
$$= velt;
}
$$ = $1;
}
| LYRICS_STRING {
- $$ = make_simple_markup ($1);
+ $$ = $1;
}
;
bare_number:
UNSIGNED {
- $$ = scm_int2num ($1);
+ $$ = scm_from_int ($1);
}
| REAL {
$$ = $1;
$$ = $1;
}
| REAL NUMBER_IDENTIFIER {
- $$ = scm_make_real (scm_to_double ($1) *scm_to_double ($2));
+ $$ = scm_from_double (scm_to_double ($1) *scm_to_double ($2));
}
| UNSIGNED NUMBER_IDENTIFIER {
- $$ = scm_make_real ($1 *scm_to_double ($2));
+ $$ = scm_from_double ($1 *scm_to_double ($2));
}
;
} '{' score_body '}' {
Score * sc = $4;
$$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ());
- scm_gc_unprotect_object (sc->self_scm ());
+ sc->unprotect ();
THIS->lexer_->pop_state ();
}
| MARKUP_HEAD_SCM0 embedded_scm {
if (scm_is_string (sid)) {
*destination = sid;
return STRING_IDENTIFIER;
+ } else if (unsmob_book (sid)) {
+ *destination = unsmob_book (sid)->clone ()->self_scm ();
+ return BOOK_IDENTIFIER;
} else if (scm_is_number (sid)) {
*destination = sid;
return NUMBER_IDENTIFIER;
*destination = p->self_scm ();
return OUTPUT_DEF_IDENTIFIER;
- } else if (Text_interface::markup_p (sid)) {
+ } else if (Text_interface::is_markup (sid)) {
*destination = sid;
if (is_lyric_state ())
return LYRIC_MARKUP_IDENTIFIER;
SCM symbol = scm_cadr (op);
SCM args = scm_cddr (op);
SCM grob_val = SCM_UNDEFINED;
- SCM grob_sym = SCM_UNDEFINED;
+ SCM grob_path = SCM_UNDEFINED;
SCM val = SCM_UNDEFINED;
if (tag == ly_symbol2scm ("assign"))
}
else if (tag == ly_symbol2scm ("unset"))
m = MY_MAKE_MUSIC ("PropertyUnset");
- else if (tag == ly_symbol2scm ("poppush")
- || tag == ly_symbol2scm ("push"))
+ else if (tag == ly_symbol2scm ("push"))
{
m = MY_MAKE_MUSIC ("OverrideProperty");
- grob_sym = scm_car (args);
- grob_val = scm_cadr (args);
+ grob_val = scm_car (args);
+ grob_path = scm_cdr (args);
+ m->set_property ("pop-first", SCM_BOOL_T);
}
else if (tag == ly_symbol2scm ("pop")) {
m = MY_MAKE_MUSIC ("RevertProperty");
- grob_sym = scm_car (args);
+ grob_path = args;
}
m->set_property ("symbol", symbol);
m->set_property ("value", val);
if (grob_val != SCM_UNDEFINED)
m->set_property ("grob-value", grob_val);
-
- if (grob_sym != SCM_UNDEFINED)
- {
- bool itc = do_internal_type_checking_global;
- /* UGH.
- */
- bool autobeam = ly_is_equal (symbol, ly_symbol2scm ("autoBeamSettings"));
- if (autobeam)
- do_internal_type_checking_global = false;
- m->set_property ("grob-property", grob_sym);
- if (autobeam)
- do_internal_type_checking_global = itc;
- }
-
- if (tag == ly_symbol2scm ("poppush"))
- m->set_property ("pop-first", SCM_BOOL_T);
-
+ if (grob_path != SCM_UNDEFINED)
+ m->set_property ("grob-property-path", grob_path);
return m;
}
Music *csm = MY_MAKE_MUSIC ("ContextSpeccedMusic");
csm->set_property ("element", m->self_scm ());
- scm_gc_unprotect_object (m->self_scm ());
+ m->unprotect ();
csm->set_property ("context-type",
scm_is_symbol (type) ? type : scm_string_to_symbol (type));
projects / lilypond.git / blobdiff