diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2014-12-10 23:42:16 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2014-12-10 23:42:16 +0100 |
| commit | fb3e555e5f3f42db4719d70bbb41697f05d1903a (patch) | |
| tree | 109394b61d231c4f36cd30bad0808c66fa6920e3 /src/render.c | |
| parent | b9c2d02c6bbf19287a2d68d3ec9887b4bb49fb80 (diff) | |
Multiple stylesheets in rendering pipeline
Diffstat (limited to 'src/render.c')
| -rw-r--r-- | src/render.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/render.c b/src/render.c index 719677a..9220750 100644 --- a/src/render.c +++ b/src/render.c @@ -345,7 +345,7 @@ static int recursive_wrap_and_draw(struct frame *fr, cairo_t *cr, static void render_sc_to_surface(SCBlock *scblocks, cairo_surface_t *surf, cairo_t *cr, double log_w, double log_h, - SCBlock *stylesheet, + SCBlock **stylesheets, ImageStore *is, enum is_size isz, int slide_number) { @@ -391,7 +391,14 @@ static void render_sc_to_surface(SCBlock *scblocks, cairo_surface_t *surf, add_macro(scin, "slidenumber", snum); /* "The rendering pipeline" */ - if ( stylesheet != NULL ) sc_interp_run_stylesheet(scin, stylesheet); + + if ( stylesheets != NULL ) { + int i = 0; + while ( stylesheets[i] != NULL ) { + sc_interp_run_stylesheet(scin, stylesheets[i]); + i++; + } + } renew_frame(top); sc_interp_add_blocks(scin, scblocks); recursive_wrap_and_draw(top, cr, is, isz); @@ -414,7 +421,7 @@ static void render_sc_to_surface(SCBlock *scblocks, cairo_surface_t *surf, */ cairo_surface_t *render_sc(SCBlock *scblocks, int w, int h, double log_w, double log_h, - SCBlock *stylesheet, + SCBlock **stylesheets, ImageStore *is, enum is_size isz, int slide_number) { @@ -425,7 +432,7 @@ cairo_surface_t *render_sc(SCBlock *scblocks, int w, int h, cr = cairo_create(surf); cairo_scale(cr, w/log_w, h/log_h); render_sc_to_surface(scblocks, surf, cr, log_w, log_h, - stylesheet, is, isz,slide_number); + stylesheets, is, isz,slide_number); cairo_destroy(cr); return surf; } @@ -454,8 +461,11 @@ int export_pdf(struct presentation *p, const char *filename) for ( i=0; i<p->num_slides; i++ ) { struct slide *s; + SCBlock *stylesheets[2]; s = p->slides[i]; + stylesheets[0] = p->stylesheet; + stylesheets[1] = NULL; cairo_save(cr); @@ -466,7 +476,7 @@ int export_pdf(struct presentation *p, const char *filename) cairo_fill(cr); render_sc_to_surface(s->scblocks, surf, cr, p->slide_width, - p->slide_height, p->stylesheet, + p->slide_height, stylesheets, p->is, ISZ_SLIDESHOW, i); cairo_restore(cr); |