aboutsummaryrefslogtreecommitdiff
path: root/libstorycode/storycode.y
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.me.uk>2019-02-25 22:53:33 +0100
committerThomas White <taw@bitwiz.me.uk>2019-02-25 22:53:33 +0100
commit2cd7252202c10ef8918ce8885cdf26dd5fcf00f5 (patch)
treed81a0fae4c7f4c6d5869da480293a6b897714f46 /libstorycode/storycode.y
parent916b00a9ec80e5647ddd13bc32c7cbe64d8b42ee (diff)
Render slide titles and presentation titles
Diffstat (limited to 'libstorycode/storycode.y')
-rw-r--r--libstorycode/storycode.y18
1 files changed, 11 insertions, 7 deletions
diff --git a/libstorycode/storycode.y b/libstorycode/storycode.y
index d476acc..5b7279f 100644
--- a/libstorycode/storycode.y
+++ b/libstorycode/storycode.y
@@ -223,18 +223,26 @@ slide_parts:
;
slide_part:
- slide_prestitle { slide_add_prestitle(ctx->s, $1); str_reset(ctx); }
+ slide_prestitle { slide_add_prestitle(ctx->s, ctx->str, ctx->n_str);
+ str_reset(ctx); }
| imageframe { slide_add_image(ctx->s, $1, ctx->geom);
str_reset(ctx); }
| textframe { slide_add_text(ctx->s, ctx->str, ctx->n_str,
ctx->geom, ctx->alignment);
str_reset(ctx); }
| FOOTER { slide_add_footer(ctx->s); }
-| slidetitle { slide_add_slidetitle(ctx->s, $1); str_reset(ctx); }
+| slidetitle { slide_add_slidetitle(ctx->s, ctx->str, ctx->n_str);
+ str_reset(ctx); }
;
slide_prestitle:
- PRESTITLE STRING { $$ = $2; }
+ PRESTITLE frame_options multi_line_string { }
+| PRESTITLE frame_options '{' multi_line_string '}' { }
+;
+
+slidetitle:
+ SLIDETITLE frame_options multi_line_string { }
+| SLIDETITLE frame_options '{' multi_line_string '}' { }
;
imageframe:
@@ -257,10 +265,6 @@ slide_bulletpoint:
BP STRING { $$ = $2; }
;
-slidetitle:
- SLIDETITLE STRING { $$ = $2; }
-;
-
/* There can be any number of options */
frame_options:
%empty