diff --git a/asoft_presenter.c b/asoft_presenter.c index 4b736c97..d541fe1d 100644 --- a/asoft_presenter.c +++ b/asoft_presenter.c @@ -149,7 +149,7 @@ static void generate_slide(int num, int max, char*filename) { int line_num; FILE *fff; - char string[BUFSIZ],*result; + char string[BUFSIZ],*result,type[BUFSIZ]; /* line numbers start at 100 and run LINES_PER_SLIDE per slide */ line_num=100+(num*LINES_PER_SLIDE); @@ -174,13 +174,30 @@ static void generate_slide(int num, int max, char*filename) { } else { - printf("%d VTAB 1\n",line_num); line_num++; - while(1) { - result=fgets(string,BUFSIZ,fff); - if (result==NULL) break; - string[strlen(string)-1]='\0'; - printf("%d PRINT \"%s\"\n",line_num,string); line_num++; - } + result=fgets(type,BUFSIZ,fff); + + if (strstr(type,"HGR2")) { + printf("%d HGR2\n",line_num); line_num++; + printf("%d PRINT CHR$(4);\"BLOAD TITLE.IMG,A$4000\"\n", + line_num); line_num++; + } + else if (strstr(type,"HGR")) { + + } + else if (strstr(type,"80COL")) { + + } + else if (strstr(type,"40COL")) { + + printf("%d VTAB 1\n",line_num); line_num++; + while(1) { + result=fgets(string,BUFSIZ,fff); + if (result==NULL) break; + string[strlen(string)-1]='\0'; + printf("%d PRINT \"%s\"\n",line_num,string); line_num++; + } + } + fclose(fff); } diff --git a/presenter_demo/Makefile b/presenter_demo/Makefile index 5c14f08f..52fcaab9 100644 --- a/presenter_demo/Makefile +++ b/presenter_demo/Makefile @@ -4,13 +4,13 @@ LFLAGS = all: presenter_demo.dsk -presenter_demo.dsk: PRESENTER_DEMO VINCE.IMG +presenter_demo.dsk: PRESENTER_DEMO TITLE.IMG ../dos33 presenter_demo.dsk SAVE A PRESENTER_DEMO - ../dos33 presenter_demo.dsk SAVE B VINCE.IMG + ../dos33 presenter_demo.dsk SAVE B TITLE.IMG -VINCE.IMG: vince.pcx ../pcx2hgr - ../pcx2hgr vince.pcx > VINCE.IMG +TITLE.IMG: title.pcx ../pcx2hgr + ../pcx2hgr title.pcx > TITLE.IMG PRESENTER_DEMO: demo.bas ../tokenize_asoft < demo.bas > PRESENTER_DEMO diff --git a/presenter_demo/info b/presenter_demo/info index 9589e24e..5029399d 100644 --- a/presenter_demo/info +++ b/presenter_demo/info @@ -12,4 +12,5 @@ slide_rapl_intro slide_rapl_continued slide_rapl_more slide_rapl_finish +slide_title END_SLIDES \ No newline at end of file diff --git a/presenter_demo/slide_rapl_continued b/presenter_demo/slide_rapl_continued index cd5bbf20..80b2969d 100644 --- a/presenter_demo/slide_rapl_continued +++ b/presenter_demo/slide_rapl_continued @@ -1,3 +1,3 @@ -40col +40COL RAPL CONTINUE * Is freally awesome diff --git a/presenter_demo/slide_rapl_finish b/presenter_demo/slide_rapl_finish index d9c104ea..03976c34 100644 --- a/presenter_demo/slide_rapl_finish +++ b/presenter_demo/slide_rapl_finish @@ -1,3 +1,3 @@ -40col +40COL RAPL LAST * Is really awesome diff --git a/presenter_demo/slide_rapl_more b/presenter_demo/slide_rapl_more index 488ebef6..bcdfb12b 100644 --- a/presenter_demo/slide_rapl_more +++ b/presenter_demo/slide_rapl_more @@ -1,3 +1,3 @@ -40col +40COL RAPL MORE * Is really awesome diff --git a/presenter_demo/slide_title b/presenter_demo/slide_title new file mode 100644 index 00000000..de4f8ce6 --- /dev/null +++ b/presenter_demo/slide_title @@ -0,0 +1,2 @@ +HGR2 +TITLE.IMG diff --git a/presenter_demo/title.pcx b/presenter_demo/title.pcx new file mode 100644 index 00000000..23300e12 Binary files /dev/null and b/presenter_demo/title.pcx differ