Get rid of StyleSheet
authorThomas White <taw@bitwiz.org.uk>
Sun, 5 Jan 2014 22:59:01 +0000 (22:59 +0000)
committerThomas White <taw@bitwiz.org.uk>
Sun, 5 Jan 2014 22:59:01 +0000 (22:59 +0000)
This branch won't compile, for a while...

Makefile.am
src/frame.c
src/loadsave.c
src/presentation.c
src/presentation.h
src/render.c
src/stylesheet.c [deleted file]
src/stylesheet.h [deleted file]
src/wrap.c

index 5ee59fe..11b29c5 100644 (file)
@@ -12,7 +12,7 @@ LDADD = $(top_builddir)/lib/libgnu.la @IGNORE_UNUSED_LIBRARIES_CFLAGS@ \
 
 src_colloquium_SOURCES = src/colloquium.c src/render.c \
                          src/mainwindow.c src/presentation.c \
-                         src/stylesheet.c src/loadsave.c src/frame.c \
+                         src/loadsave.c src/frame.c \
                          src/slideshow.c src/wrap.c src/storycode.c \
                          src/imagestore.c src/notes.c src/pr_clock.c \
                          src/inhibit_screensaver.c src/slide_sorter.c
@@ -20,7 +20,7 @@ src_colloquium_SOURCES = src/colloquium.c src/render.c \
 INCLUDES = -Iharfatum/src
 
 EXTRA_DIST += src/presentation.h src/render.h src/wrap.h \
-              src/stylesheet.h src/loadsave.h src/slideshow.h src/storycode.h \
+              src/loadsave.h src/slideshow.h src/storycode.h \
               src/imagestore.h src/notes.h src/pr_clock.h \
               src/inhibit_screensaver.h src/slide_sorter.h
 
@@ -46,9 +46,9 @@ tests_storycode_test_SOURCES = tests/storycode_test.c src/storycode.c
 
 tests_render_test_SOURCES = tests/render_test.c src/render.c src/frame.c \
                             src/wrap.c src/storycode.c src/imagestore.c \
-                            src/stylesheet.c src/loadsave.c
+                            src/loadsave.c
 
 tests_render_test_sc1_SOURCES = tests/render_test_sc1.c src/storycode.c \
                                 src/render.c src/frame.c src/wrap.c \
-                                src/imagestore.c src/stylesheet.c \
+                                src/imagestore.c \
                                 src/loadsave.c
index 150c397..829a44d 100644 (file)
@@ -31,7 +31,6 @@
 
 #include "storycode.h"
 #include "frame.h"
-#include "stylesheet.h"
 
 
 static int alloc_ro(struct frame *fr)
index 683c94e..4d65106 100644 (file)
@@ -32,7 +32,6 @@
 #include <assert.h>
 
 #include "presentation.h"
-#include "stylesheet.h"
 
 
 static int alloc_children(struct ds_node *node)
index 13894fa..d573257 100644 (file)
@@ -31,7 +31,6 @@
 #include <gtk/gtk.h>
 
 #include "presentation.h"
-#include "stylesheet.h"
 #include "loadsave.h"
 #include "mainwindow.h"
 #include "frame.h"
index 2294c48..3d344eb 100644 (file)
@@ -30,7 +30,6 @@
 #include <cairo.h>
 #include <gtk/gtk.h>
 
-#include "stylesheet.h"
 #include "imagestore.h"
 
 
index d0a3696..813344d 100644 (file)
@@ -36,7 +36,6 @@
 #include <gdk/gdk.h>
 
 #include "storycode.h"
-#include "stylesheet.h"
 #include "presentation.h"
 #include "frame.h"
 #include "render.h"
diff --git a/src/stylesheet.c b/src/stylesheet.c
deleted file mode 100644 (file)
index 857f0f2..0000000
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
- * stylesheet.c
- *
- * Copyright © 2013 Thomas White <taw@bitwiz.org.uk>
- *
- * This file is part of Colloquium.
- *
- * Colloquium is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-#include <assert.h>
-
-#include "presentation.h"
-#include "stylesheet.h"
-#include "loadsave.h"
-
-
-struct _stylesheet
-{
-       struct style          **styles;
-       int                     n_styles;
-
-       struct slide_template **templates;
-       int                     n_templates;
-
-       struct style           *default_style;
-};
-
-
-struct style *new_style(StyleSheet *ss, const char *name, const char *pname)
-{
-       struct style *sty;
-       int n;
-       struct style **styles_new;
-
-       sty = calloc(1, sizeof(*sty));
-       if ( sty == NULL ) return NULL;
-
-       sty->name = strdup(name);
-       sty->pname = strdup(pname);
-
-       /* DS9K compatibility */
-       sty->lop.x = 0.0;
-       sty->lop.y = 0.0;
-       sty->lop.w = 100.0;
-       sty->lop.h = 100.0;
-
-       n = ss->n_styles;
-       styles_new = realloc(ss->styles, (n+1)*sizeof(sty));
-       if ( styles_new == NULL ) {
-               free(sty->name);
-               free(sty);
-               return NULL;
-       }
-       ss->styles = styles_new;
-       ss->styles[n] = sty;
-       ss->n_styles = n+1;
-
-       return sty;
-}
-
-
-struct style *lookup_style(StyleSheet *ss, const char *pname)
-{
-       int i;
-
-       for ( i=0; i<ss->n_styles; i++ ) {
-               if ( strcmp(ss->styles[i]->pname, pname) == 0 ) {
-                       return ss->styles[i];
-               }
-       }
-       return NULL;
-}
-
-
-void free_stylesheet(StyleSheet *ss)
-{
-       int i;
-
-       for ( i=0; i<ss->n_styles; i++ ) {
-               free(ss->styles[i]->name);
-               free(ss->styles[i]->sc_prologue);
-               free(ss->styles[i]);
-       }
-
-       free(ss->styles);
-       free(ss);
-}
-
-
-extern void *_binary_src_default_stylesheet_sty_start;
-extern void *_binary_src_default_stylesheet_sty_size;
-
-StyleSheet *default_stylesheet()
-{
-       char *v;
-       struct ds_node *root;
-       struct ds_node *ss_root;
-       StyleSheet *ss;
-       size_t len;
-
-       len = (size_t)&_binary_src_default_stylesheet_sty_size;
-       v = malloc(len+1);
-       if ( v == NULL ) return NULL;
-
-       memcpy(v, &_binary_src_default_stylesheet_sty_start, len);
-       v[len] = '\0';
-
-       root = new_ds_node("root");
-       deserialize_memory(v, root);
-
-       ss_root = find_node(root, "stylesheet", 0);
-       if ( ss_root == NULL ) {
-               fprintf(stderr, "Doesn't look like a stylesheet.\n");
-               return NULL;
-       }
-       ss = tree_to_stylesheet(ss_root);
-       free_ds_tree(root);
-       free(v);
-       return ss;
-}
-
-
-static void get_field_f_units(struct ds_node *root, const char *key,
-                              double *val, LengthUnits *units)
-{
-       char *s;
-       char *u;
-       double v;
-       char *check;
-
-       get_field_s(root, key, &s);
-       u = index(s, ' ');
-       if ( u == NULL ) {
-               fprintf(stderr, "Invalid value '%s'\n", s);
-               return;
-       }
-
-       u[0] = '\0';
-       u++;
-       v = strtod(s, &check);
-       if ( check == s ) {
-               fprintf(stderr, "Invalid value '%s'\n", s);
-               return;
-       }
-
-       if ( strcmp(u, "f") == 0 ) *units = UNITS_FRAC;
-       else if ( strcmp(u, "u") == 0 ) *units = UNITS_SLIDE;
-       else {
-               fprintf(stderr, "Invalid unit '%s'\n", u);
-               return;
-       }
-
-       *val = v;
-}
-
-
-static int read_template(struct slide_template *t, StyleSheet *ss,
-                         struct ds_node *node)
-{
-       int i;
-       char *top_style;
-
-       if ( !get_field_s(node, "top_style", &top_style) ) {
-               t->top_style = lookup_style(ss, top_style);
-               free(top_style);
-       } else {
-               t->top_style = NULL;
-       }
-
-       for ( i=0; i<node->n_children; i++ ) {
-
-               char *sn;
-
-               if ( strncmp(node->children[i]->key, "sty", 3) != 0 ) {
-                       continue;
-               }
-
-               /* This looks a bit weird, but it's done so that the contents
-                * can go through the same validation as other fields */
-               if ( !get_field_s(node, node->children[i]->key, &sn) ) {
-
-                       struct style *sty;
-
-                       sty = lookup_style(ss, sn);
-                       if ( sty == NULL ) {
-                               fprintf(stderr, "Couldn't find style '%s'\n",
-                                       sn);
-                       } else {
-                               add_to_template(t, sty);
-                       }
-
-                       free(sn);
-               }
-
-       }
-
-       return 0;
-}
-
-
-static int read_style(struct style *sty, struct ds_node *root)
-{
-       get_field_f(root, "margin_l", &sty->lop.margin_l);
-       get_field_f(root, "margin_r", &sty->lop.margin_r);
-       get_field_f(root, "margin_t", &sty->lop.margin_t);
-       get_field_f(root, "margin_b", &sty->lop.margin_b);
-       get_field_f(root, "pad_l", &sty->lop.pad_l);
-       get_field_f(root, "pad_r", &sty->lop.pad_r);
-       get_field_f(root, "pad_t", &sty->lop.pad_t);
-       get_field_f(root, "pad_b", &sty->lop.pad_b);
-       get_field_f(root, "x", &sty->lop.x);
-       get_field_f(root, "y", &sty->lop.y);
-       get_field_f_units(root, "w", &sty->lop.w, &sty->lop.w_units);
-       get_field_f_units(root, "h", &sty->lop.h, &sty->lop.h_units);
-       get_field_s(root, "prologue", &sty->sc_prologue);
-
-       return 0;
-}
-
-
-StyleSheet *tree_to_stylesheet(struct ds_node *root)
-{
-       StyleSheet *ss;
-       struct ds_node *node;
-       int i;
-       char *ds;
-
-       ss = new_stylesheet();
-       if ( ss == NULL ) return NULL;
-
-       node = find_node(root, "styles", 0);
-       if ( node == NULL ) {
-               fprintf(stderr, "Couldn't find styles\n");
-               free_stylesheet(ss);
-               return NULL;
-       }
-
-       for ( i=0; i<node->n_children; i++ ) {
-
-               struct style *ns;
-               char *v;
-
-               get_field_s(node->children[i], "name", &v);
-               if ( v == NULL ) {
-                       fprintf(stderr, "No name for style '%s'\n",
-                               node->children[i]->key);
-                       continue;
-               }
-
-               ns = new_style(ss, v, node->children[i]->key);
-               if ( ns == NULL ) {
-                       fprintf(stderr, "Couldn't create style for '%s'\n",
-                               node->children[i]->key);
-                       continue;
-               }
-
-               if ( read_style(ns, node->children[i]) ) {
-                       fprintf(stderr, "Couldn't read style '%s'\n", v);
-                       continue;
-               }
-
-       }
-
-       if ( get_field_s(root, "default_style", &ds) == 0 ) {
-               ss->default_style = lookup_style(ss, ds);
-               if ( ss->default_style == NULL ) {
-                       fprintf(stderr, "Failed to find default style '%s'\n",
-                               ds);
-               }
-       } else {
-               ss->default_style = NULL;
-       }
-
-       node = find_node(root, "templates", 0);
-       if ( node == NULL ) {
-               fprintf(stderr, "Couldn't find templates\n");
-               free_stylesheet(ss);
-               return NULL;
-       }
-
-       for ( i=0; i<node->n_children; i++ ) {
-
-               struct slide_template *nt;
-               char *v;
-
-               get_field_s(node->children[i], "name", &v);
-               if ( v == NULL ) {
-                       fprintf(stderr, "No name for template '%s'\n",
-                               node->children[i]->key);
-                       continue;
-               }
-
-               nt = new_template(ss, v);
-               if ( nt == NULL ) {
-                       fprintf(stderr, "Couldn't create template for '%s'\n",
-                               node->children[i]->key);
-                       continue;
-               }
-
-               if ( read_template(nt, ss, node->children[i]) ) {
-                       fprintf(stderr, "Couldn't read template '%s'\n", v);
-                       continue;
-               }
-
-       }
-
-       return ss;
-}
-
-
-static int fixup_styles(struct frame *fr, StyleSheet *ss)
-{
-       int i;
-       char *t;
-       int n = 0;
-
-       if ( fr->style != NULL ) {
-
-               /* FIXME: Horrible to do this using names and string comparisons
-                *  - what if the stylesheets are in different languages?
-                * Better would be to have "roles" for common types of style
-                * and match using those. */
-
-               t = fr->style->name;
-
-               for ( i=0; i<ss->n_styles; i++ ) {
-                       if ( strcmp(t, ss->styles[i]->name) == 0 ) {
-                               fr->style = ss->styles[i];
-                               n = 1;
-                               break;
-                       }
-               }
-       }
-
-       for ( i=0; i<fr->num_children; i++ ) {
-               n += fixup_styles(fr->children[i], ss);
-       }
-
-       return n;
-}
-
-
-static void fixup_templates(struct slide *s, StyleSheet *ss)
-{
-       int i;
-       char *t;
-
-       if ( s->st != NULL ) {
-
-               /* FIXME: Horrible to do this using names and string comparisons
-                *  - what if the stylesheets are in different languages?
-                * Better would be to have "roles" for common types of template
-                * and match using those. */
-
-               t = s->st->name;
-
-               for ( i=0; i<ss->n_templates; i++ ) {
-                       if ( strcmp(t, ss->templates[i]->name) == 0 ) {
-                               s->st = ss->templates[i];
-                               break;
-                       }
-               }
-
-               s->top->style = s->st->top_style;
-
-       }
-}
-
-
-int replace_stylesheet(struct presentation *p, const char *filename)
-{
-       FILE *fh;
-       struct ds_node *root;
-       struct ds_node *node;
-       StyleSheet *ss;
-       int i;
-
-       fh = fopen(filename, "r");
-       if ( fh == NULL ) return 1;
-
-       root = new_ds_node("root");
-       if ( root == NULL ) return 1;
-
-       if ( deserialize_file(fh, root) ) {
-               fclose(fh);
-               return 1;
-       }
-
-       fclose(fh);
-
-       node = find_node(root, "stylesheet", 0);
-       if ( node == NULL ) {
-               free_ds_tree(root);
-               return 1;
-       }
-       ss = tree_to_stylesheet(node);
-       if ( ss == NULL ) {
-               fprintf(stderr, "Invalid style sheet\n");
-               return 1;
-       }
-       free_ds_tree(root);
-
-       for ( i=0; i<p->num_slides; i++ ) {
-               fixup_styles(p->slides[i]->top, ss);
-               fixup_templates(p->slides[i], ss);
-       }
-
-       free_stylesheet(p->ss);
-       p->ss = ss;
-
-       return 0;
-}
-
-
-StyleSheet *new_stylesheet()
-{
-       StyleSheet *ss;
-
-       ss = calloc(1, sizeof(struct _stylesheet));
-       if ( ss == NULL ) return NULL;
-
-       ss->n_styles = 0;
-       ss->styles = NULL;
-       ss->default_style = NULL;
-
-       return ss;
-}
-
-
-int save_stylesheet(StyleSheet *ss, const char *filename)
-{
-       FILE *fh;
-       struct serializer ser;
-
-       fh = fopen(filename, "w");
-       if ( fh == NULL ) return 1;
-
-       /* Set up the serializer */
-       ser.fh = fh;
-       ser.stack_depth = 0;
-       ser.prefix = NULL;
-
-       fprintf(fh, "# Colloquium style sheet file\n");
-       serialize_f(&ser, "version", 0.1);
-
-       serialize_start(&ser, "stylesheet");
-       write_stylesheet(ss, &ser);
-       serialize_end(&ser);
-
-       fclose(fh);
-
-       return 0;
-}
-
-
-StyleSheet *load_stylesheet(const char *filename)
-{
-       StyleSheet *ss;
-
-       ss = new_stylesheet();
-       if ( ss == NULL ) return NULL;
-
-       /* FIXME: Implement this */
-
-       return ss;
-}
-
-
-const char *units(LengthUnits un)
-{
-       switch ( un ) {
-               case UNITS_SLIDE : return "u";
-               case UNITS_FRAC : return "f";
-       }
-       return "annoyingly unspecified units";
-}
-
-
-static void serialize_f_units(struct serializer *s, const char *key, double val,
-                              LengthUnits un)
-{
-       char tmp[64];
-
-       snprintf(tmp, 63, "%.2f %s", val, units(un));
-       serialize_s(s, key, tmp);
-}
-
-
-void write_stylesheet(StyleSheet *ss, struct serializer *ser)
-{
-       int i;
-
-       if ( ss->default_style != NULL ) {
-               serialize_s(ser, "default_style", ss->default_style->pname);
-       }
-
-       serialize_start(ser, "styles");
-       for ( i=0; i<ss->n_styles; i++ ) {
-
-               struct style *s = ss->styles[i];
-
-               serialize_start(ser, s->pname);
-               serialize_s(ser, "name", s->name);
-               serialize_f(ser, "margin_l", s->lop.margin_l);
-               serialize_f(ser, "margin_r", s->lop.margin_r);
-               serialize_f(ser, "margin_t", s->lop.margin_t);
-               serialize_f(ser, "margin_b", s->lop.margin_b);
-               serialize_f(ser, "pad_l", s->lop.pad_l);
-               serialize_f(ser, "pad_r", s->lop.pad_r);
-               serialize_f(ser, "pad_t", s->lop.pad_t);
-               serialize_f(ser, "pad_b", s->lop.pad_b);
-               serialize_f_units(ser, "w", s->lop.w, s->lop.w_units);
-               serialize_f_units(ser, "h", s->lop.h, s->lop.h_units);
-               serialize_f(ser, "x", s->lop.x);
-               serialize_f(ser, "y", s->lop.y);
-               serialize_s(ser, "prologue", s->sc_prologue);
-               serialize_end(ser);
-
-       }
-       serialize_end(ser);
-
-       serialize_start(ser, "templates");
-       for ( i=0; i<ss->n_templates; i++ ) {
-
-               struct slide_template *t = ss->templates[i];
-               char id[32];
-               int j;
-
-               snprintf(id, 31, "%i", i);
-
-               serialize_start(ser, id);
-               serialize_s(ser, "name", t->name);
-               if (t->top_style != NULL ) {
-                       serialize_s(ser, "top_style", t->top_style->pname);
-               }
-               for ( j=0; j<t->n_styles; j++ ) {
-
-                       struct style *s = t->styles[j];
-                       char id[32];
-
-                       snprintf(id, 31, "sty%i", j);
-
-                       serialize_s(ser, id, s->pname);
-
-               }
-               serialize_end(ser);
-
-       }
-       serialize_end(ser);
-}
-
-
-struct style *default_style(StyleSheet *ss)
-{
-       return ss->default_style;
-}
-
-
-struct slide_template *new_template(StyleSheet *ss, const char *name)
-{
-       struct slide_template *t;
-       int n;
-       struct slide_template **templates_new;
-
-       t = calloc(1, sizeof(*t));
-       if ( t == NULL ) return NULL;
-
-       t->name = strdup(name);
-
-       n = ss->n_templates;
-       templates_new = realloc(ss->templates, (n+1)*sizeof(t));
-       if ( templates_new == NULL ) {
-               free(t->name);
-               free(t);
-               return NULL;
-       }
-       ss->templates = templates_new;
-       ss->templates[n] = t;
-       ss->n_templates = n+1;
-
-       return t;
-}
-
-
-void add_to_template(struct slide_template *t, struct style *sty)
-{
-       int n;
-       struct style **styles_new;
-
-       n = t->n_styles;
-       styles_new = realloc(t->styles, (n+1)*sizeof(sty));
-       if ( styles_new == NULL ) {
-               fprintf(stderr, "Failed to add style '%s' to template '%s'.\n",
-                       sty->name, t->name);
-               return;
-       }
-       t->styles = styles_new;
-       t->styles[n] = sty;
-       t->n_styles = n+1;
-}
-
-
-struct _styleiterator
-{
-       int n;
-};
-
-struct style *style_first(StyleSheet *ss, StyleIterator **piter)
-{
-       StyleIterator *iter;
-
-       if ( ss->n_styles == 0 ) return NULL;
-
-       iter = calloc(1, sizeof(StyleIterator));
-       if ( iter == NULL ) return NULL;
-
-       iter->n = 0;
-       *piter = iter;
-
-       return ss->styles[0];
-}
-
-
-struct style *style_next(StyleSheet *ss, StyleIterator *iter)
-{
-       iter->n++;
-       if ( iter->n == ss->n_styles ) {
-               free(iter);
-               return NULL;
-       }
-
-       return ss->styles[iter->n];
-}
-
-
-struct _templateiterator
-{
-       int n;
-};
-
-struct slide_template *template_first(StyleSheet *ss, TemplateIterator **piter)
-{
-       TemplateIterator *iter;
-
-       if ( ss->n_templates == 0 ) return NULL;
-
-       iter = calloc(1, sizeof(TemplateIterator));
-       if ( iter == NULL ) return NULL;
-
-       iter->n = 0;
-       *piter = iter;
-
-       return ss->templates[0];
-}
-
-
-struct slide_template *template_next(StyleSheet *ss, TemplateIterator *iter)
-{
-       iter->n++;
-       if ( iter->n == ss->n_templates ) {
-               free(iter);
-               return NULL;
-       }
-
-       return ss->templates[iter->n];
-}
diff --git a/src/stylesheet.h b/src/stylesheet.h
deleted file mode 100644 (file)
index a3a6c3c..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * stylesheet.h
- *
- * Copyright © 2013 Thomas White <taw@bitwiz.org.uk>
- *
- * This file is part of Colloquium.
- *
- * Colloquium is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef STYLESHEET_H
-#define STYLESHEET_H
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-#include "loadsave.h"
-#include "frame.h"
-
-
-struct style
-{
-       char *name;
-       char *pname;
-
-       struct layout_parameters lop;
-
-       /* Storycode prologue (run through the interpreter before the
-        * main storycode for the frame */
-       char    *sc_prologue;
-};
-
-
-struct slide_template
-{
-       char                 *name;
-
-       /* References to the styles in the main list */
-       struct style        **styles;
-       int                   n_styles;
-
-       struct style         *top_style;
-};
-
-
-typedef struct _stylesheet StyleSheet;
-struct presentation;
-
-extern StyleSheet *new_stylesheet();
-extern StyleSheet *load_stylesheet(const char *filename);
-extern void free_stylesheet(StyleSheet *ss);
-extern StyleSheet *default_stylesheet(void);
-extern int replace_stylesheet(struct presentation *p, const char *filename);
-
-extern struct style *new_style(StyleSheet *ss, const char *name,
-                               const char *pname);
-extern struct style *default_style(StyleSheet *ss);
-extern struct style *lookup_style(StyleSheet *ss, const char *pname);
-
-extern struct slide_template *new_template(StyleSheet *ss, const char *name);
-extern void add_to_template(struct slide_template *t, struct style *sty);
-
-extern int save_stylesheet(StyleSheet *ss, const char *filename);
-extern StyleSheet *tree_to_stylesheet(struct ds_node *root);
-extern void write_stylesheet(StyleSheet *ss, struct serializer *ser);
-extern const char *units(LengthUnits un);
-
-typedef struct _styleiterator StyleIterator;
-extern struct style *style_first(StyleSheet *ss, StyleIterator **piter);
-extern struct style *style_next(StyleSheet *ss, StyleIterator *iter);
-
-typedef struct _templateiterator TemplateIterator;
-extern struct slide_template *template_first(StyleSheet *ss,
-                                             TemplateIterator **piter);
-extern struct slide_template *template_next(StyleSheet *ss,
-                                            TemplateIterator *iter);
-
-#endif /* STYLESHEET_H */
index 8c7b7cc..5dde838 100644 (file)
@@ -37,7 +37,6 @@
 #include "storycode.h"
 #include "wrap.h"
 #include "frame.h"
-#include "stylesheet.h"
 #include "presentation.h"