Add new signature to parser and change argument order.
@itemx @var{scm markup}
@itemx @var{scm scm}
@itemx @var{scm scm markup}
@itemx @var{scm markup}
@itemx @var{scm scm}
@itemx @var{scm scm markup}
+@itemx @var{scm scm markup markup}
@itemx @var{scm markup markup}
@itemx @var{scm scm scm}
@end table
@itemx @var{scm markup markup}
@itemx @var{scm scm scm}
@end table
return MARKUP_HEAD_SCM0_MARKUP1;
else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2"))
return MARKUP_HEAD_SCM0_SCM1_MARKUP2;
return MARKUP_HEAD_SCM0_MARKUP1;
else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2"))
return MARKUP_HEAD_SCM0_SCM1_MARKUP2;
+ else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2-markup3"))
+ return MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3;
else if (tag == ly_symbol2scm ("scheme0-markup1-markup2"))
return MARKUP_HEAD_SCM0_MARKUP1_MARKUP2;
else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
else if (tag == ly_symbol2scm ("scheme0-markup1-markup2"))
return MARKUP_HEAD_SCM0_MARKUP1_MARKUP2;
else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
%token <scm> MARKUP_HEAD_SCM0_MARKUP1
%token <scm> MARKUP_HEAD_SCM0_SCM1
%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
%token <scm> MARKUP_HEAD_SCM0_MARKUP1
%token <scm> MARKUP_HEAD_SCM0_SCM1
%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
+%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3
%token <scm> MARKUP_HEAD_SCM0_MARKUP1_MARKUP2
%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
%token <scm> MARKUP_LIST_HEAD_EMPTY
%token <scm> MARKUP_HEAD_SCM0_MARKUP1_MARKUP2
%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
%token <scm> MARKUP_LIST_HEAD_EMPTY
| MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 embedded_scm markup markup {
$$ = scm_list_4 ($1, $2, $3, $4);
}
| MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 embedded_scm markup markup {
$$ = scm_list_4 ($1, $2, $3, $4);
}
+ | MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3 embedded_scm embedded_scm markup markup {
+ $$ = scm_list_5 ($1, $2, $3, $4, $5);
+ }
| MARKUP_HEAD_EMPTY {
$$ = scm_list_1 ($1);
}
| MARKUP_HEAD_EMPTY {
$$ = scm_list_1 ($1);
}
(interval-widen x amount)
y)))
(interval-widen x amount)
y)))
-(define-builtin-markup-command (put-adjacent layout props arg1 axis dir arg2)
- (markup? integer? ly:dir? markup?)
+(define-builtin-markup-command (put-adjacent layout props axis dir arg1 arg2)
+ (integer? ly:dir? markup? markup?)
- "
-@ignore
-This is broken, since there's no parser tag for the signature
-markup_scm_scm_markup. Only works using Scheme markup. -np
-@end ignore
-
-Put @var{arg2} next to @var{arg1}, without moving @var{arg1}."
+ "Put @var{arg2} next to @var{arg1}, without moving @var{arg1}."
(let ((m1 (interpret-markup layout props arg1))
(m2 (interpret-markup layout props arg2)))
(ly:stencil-combine-at-edge m1 axis dir m2 0.0)))
(let ((m1 (interpret-markup layout props arg1))
(m2 (interpret-markup layout props arg2)))
(ly:stencil-combine-at-edge m1 axis dir m2 0.0)))
(if alt-markup
(set! fig-markup
(markup #:put-adjacent
(if alt-markup
(set! fig-markup
(markup #:put-adjacent
- fig-markup X
- (if (number? alt-dir)
- alt-dir
- LEFT)
+ X (if (number? alt-dir)
+ alt-dir
+ LEFT)
+ fig-markup
#:pad-x 0.2 alt-markup
)))
#:pad-x 0.2 alt-markup
)))
(set! fig-markup
(if fig-markup
(markup #:put-adjacent
(set! fig-markup
(if fig-markup
(markup #:put-adjacent
X (if (number? plus-dir)
plus-dir
LEFT)
X (if (number? plus-dir)
plus-dir
LEFT)
#:pad-x 0.2 plus-markup)
plus-markup)))
#:pad-x 0.2 plus-markup)
plus-markup)))