From 74ace225ceec792896b4c778c013830809d45d6d Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 2 Oct 2019 19:03:54 +0200 Subject: Slides should not add themselves to the narrative --- libstorycode/storycode.y | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libstorycode/storycode.y b/libstorycode/storycode.y index f53ee87..a0d4757 100644 --- a/libstorycode/storycode.y +++ b/libstorycode/storycode.y @@ -103,6 +103,7 @@ %token TEXT_START %type narrative +%type slide %type slide_parts %type stylesheet %type slide_part @@ -250,7 +251,7 @@ narrative_el: PRESTITLE TEXT_START text_line { narrative_add_prestitle(ctx->n, $3.runs, $3.n_runs); } | BP TEXT_START text_line { narrative_add_bp(ctx->n, $3.runs, $3.n_runs); } | TEXT_START text_line { narrative_add_text(ctx->n, $2.runs, $2.n_runs); } -| slide { } +| slide { narrative_add_slide(ctx->n, $1); } | EOP { narrative_add_eop(ctx->n); } ; @@ -308,7 +309,7 @@ one_or_more_runs: /* -------- Slide -------- */ slide: - SLIDE '{' slide_parts '}' { narrative_add_slide(ctx->n, $3); } + SLIDE '{' slide_parts '}' { $$ = $3; } ; slide_parts: { $$ = slide_new(); } -- cgit v1.2.3