Most of the new interpreter structure

2 files changed, 10 insertions, 55 deletions

diff --git a/tests/render_test.c b/tests/render_test.c
index 6d5bcec..e2bf0d7 100644
--- a/tests/render_test.c
+++ b/tests/render_test.c
@@ -34,11 +34,12 @@
 
 #include "../src/sc_parse.h"
 #include "../src/render.h"
-#include "../src/stylesheet.h"
 #include "../src/frame.h"
 #include "../src/presentation.h"
 
 
+const char *sc = "\\font[Sorts Mill Goudy 32]Lorem ipsum dolor sit amet, consect-etur adipiscing elit.\n\\font[Serif 17]Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. \\font[Edrip 32]{Nam tincidunt congue enim, ut porta lorem \\font[Edrip Bold 32]{lacinia} consectetur.} Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. \\font[Serif Bold 17]{Cum sociis natoque penatibus et magnis dis parturient} montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est.";
+
 static gint mw_destroy(GtkWidget *w, void *p)
 {
 	gtk_main_quit();
@@ -73,66 +74,20 @@ int main(int argc, char *argv[])
 	GtkWidget *window;
 	GtkWidget *drawingarea;
 	struct frame *fr;
-	struct frame *fr2;
-	struct style *sty1;
-	struct style *sty2;
 	struct slide s;
 	struct presentation p;
 
 	gtk_init(&argc, &argv);
 
-	sty1 = calloc(1, sizeof(struct style));
-	sty1->lop.pad_l = 0.0;
-	sty1->lop.pad_r = 0.0;
-	sty1->lop.pad_t = 0.0;
-	sty1->lop.pad_b = 0.0;
-	sty1->lop.margin_l = 0.0;
-	sty1->lop.margin_r = 0.0;
-	sty1->lop.margin_t = 0.0;
-	sty1->lop.margin_b = 0.0;
-	sty1->lop.x = 0.0;
-	sty1->lop.y = 0.0;
-	sty1->lop.w = 1.0;
-	sty1->lop.w_units = UNITS_FRAC;
-	sty1->lop.h = 1.0;
-	sty1->lop.h_units = UNITS_FRAC;
-	sty1->name = strdup("Default");
-
-	sty2 = calloc(1, sizeof(struct style));
-	sty2->lop.pad_l = 10.0;
-	sty2->lop.pad_r = 10.0;
-	sty2->lop.pad_t = 10.0;
-	sty2->lop.pad_b = 10.0;
-	sty2->lop.margin_l = 5.0;
-	sty2->lop.margin_r = 5.0;
-	sty2->lop.margin_t = 5.0;
-	sty2->lop.margin_b = 5.0;
-	sty2->lop.x = 0.0;
-	sty2->lop.y = 0.0;
-	sty2->lop.w = 1.0;
-	sty2->lop.w_units = UNITS_FRAC;
-	sty2->lop.h = 1.0;
-	sty2->lop.h_units = UNITS_FRAC;
-	sty2->name = strdup("Text frame");
-
-	fr2 = calloc(1, sizeof(struct frame));
-	if ( fr2 == NULL ) return 1;
-	fr2->sc = "\\font[Sorts Mill Goudy 32]Lorem ipsum dolor sit amet, consect-etur adipiscing elit.\n\\font[Serif 17]Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. \\font[Edrip 32]{Nam tincidunt congue enim, ut porta lorem \\font[Edrip Bold 32]{lacinia} consectetur.} Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. \\font[Serif Bold 17]{Cum sociis natoque penatibus et magnis dis parturient} montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est.";
-	//fr2->sc = "Lorem ipsum AT";
-	fr2->children = NULL;
-	fr2->num_children = 0;
-	fr2->style = sty2;
-	fr2->lop_from_style = 1;
-
 	fr = calloc(1, sizeof(struct frame));
 	if ( fr == NULL ) return 1;
-	fr->sc = "";
-	fr->children = calloc(2, sizeof(struct frame *));
-	if ( fr->children == NULL ) return 1;
-	fr->children[0] = fr2;
-	fr->style = sty1;
-	fr->lop_from_style = 1;
-	fr->num_children = 1;
+	fr->children = NULL;
+	fr->num_children = 0;
+	fr->scblocks = sc_parse(sc);
+	if ( fr->scblocks == NULL ) {
+		fprintf(stderr, "SC parse failed.\n");
+		return 1;
+	}
 
 	s.top = fr;
 	s.rendered_edit = NULL;
diff --git a/tests/storycode_test.c b/tests/storycode_test.c
index 7d73c41..1cd4d61 100644
--- a/tests/storycode_test.c
+++ b/tests/storycode_test.c
@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
 	            "\\wibble{}\\f{wibble \\bg[muhu]{wobble}}\\frib[\\f] f");
 	if ( r ) v = 1;
 
-	r = test_sc("A B C \\wibble");
+	r = test_sc("A B C \\wibble\\\\w");
 	if ( r ) v = 1;
 
 	return v;