Get rid of Presentation structure

It doesn't have any reason to exist.  A Narrative defines the top-level
object already.  This is, after all, a narrative-based presentation
system.

This removes a lot of faff surrounding retrieving the Narrative from the
Presentation.  It also removes a gigantic place for bugs to hide in
keeping the Presentation's view of the slides in sync with the
Narrative's opinion.

What was that quote?  "Code is terrible, and we want as little of it as
possible in our program."

1 files changed, 7 insertions, 0 deletions

diff --git a/libstorycode/narrative_priv.h b/libstorycode/narrative_priv.h
index 1a461c4..065b416 100644
--- a/libstorycode/narrative_priv.h
+++ b/libstorycode/narrative_priv.h
@@ -27,6 +27,7 @@
 #include <pango/pangocairo.h>
 #endif
 
+#include "imagestore.h"
 #include "storycode.h"
 #include "slide.h"
 
@@ -72,8 +73,14 @@ struct narrative_item
 
 struct _narrative
 {
+	Stylesheet *stylesheet;
+	ImageStore *imagestore;
+	int saved;
+	const char *language;
+
 	int n_items;
 	struct narrative_item *items;
+
 	double w;
 	double space_l;
 	double space_r;