From 91eeae07bd6a4d4db2ec81c4237819c73d79b0de Mon Sep 17 00:00:00 2001
From: Thomas White <taw@bitwiz.me.uk>
Date: Sat, 23 Mar 2019 11:34:48 +0100
Subject: Combine slide text strings and layouts in one structure

---
 libstorycode/slide_priv.h | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'libstorycode/slide_priv.h')

diff --git a/libstorycode/slide_priv.h b/libstorycode/slide_priv.h
index 0d80663..75a2ac5 100644
--- a/libstorycode/slide_priv.h
+++ b/libstorycode/slide_priv.h
@@ -39,17 +39,25 @@ enum slide_item_type
 };
 
 
+struct slide_text_paragraph
+{
+	char *text;
+#ifdef HAVE_PANGO
+	PangoLayout *layout;
+#else
+	void *layout;
+#endif
+};
+
+
 struct _slideitem
 {
 	enum slide_item_type type;
 
 	/* For TEXT, SLIDETITLE, PRESTITLE */
-	char **paragraphs;
 	int n_paras;
+	struct slide_text_paragraph *paras;
 	enum alignment align;
-#ifdef HAVE_PANGO
-	PangoLayout **layouts;
-#endif
 
 	/* For IMAGE */
 	char *filename;
-- 
cgit v1.2.3