From c1b37e50e7bef73905e28868cf83a78009c465e5 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sun, 15 Jul 2018 16:03:11 -0400
Subject: [PATCH] asoft_presenter: fix whitespace

---
 asoft_presenter/Makefile          |   2 +-
 asoft_presenter/asoft_presenter.c | 943 ++++++++++++++++--------------
 2 files changed, 491 insertions(+), 454 deletions(-)

diff --git a/asoft_presenter/Makefile b/asoft_presenter/Makefile
index e9ba0a45..91da7d63 100644
--- a/asoft_presenter/Makefile
+++ b/asoft_presenter/Makefile
@@ -7,7 +7,7 @@ asoft_presenter:	asoft_presenter.o
 			$(CC) $(LFLAGS) -o asoft_presenter asoft_presenter.o
 
 asoft_presenter.o:	asoft_presenter.c
-			$(CC) $(CLFAGS) -c asoft_presenter.c
+			$(CC) $(CFLAGS) -c asoft_presenter.c
 
 
 install:	
diff --git a/asoft_presenter/asoft_presenter.c b/asoft_presenter/asoft_presenter.c
index 0447e1e1..0d8ee8d6 100644
--- a/asoft_presenter/asoft_presenter.c
+++ b/asoft_presenter/asoft_presenter.c
@@ -4,76 +4,76 @@
 
 static void generate_keyhandler(void) {
 
-  printf("9000 REM ******************\n");
-  printf("9002 REM * GET KEYPRESSES *\n");
-  printf("9004 REM ******************\n");
+	printf("9000 REM ******************\n");
+	printf("9002 REM * GET KEYPRESSES *\n");
+	printf("9004 REM ******************\n");
 
-  printf("9006 N%%=2\n");
+	printf("9006 N%%=2\n");
 
-  /* memory location -16384 holds keyboard strobe */
-  /* Loop until a key is pressed.                 */
-  printf("9008 X=PEEK(-16384): IF X < 128 THEN 9008\n");
-  /* get the key value, convert to ASCII */
-  printf("9010 X=PEEK(-16368)-128\n");
-  /* Exit if escape or Q pressed */
-  printf("9020 IF X=27 OR X=81 THEN TEXT:HOME:END\n");
-  /* increment page count if space or -> */
-  printf("9030 IF X=21 OR X=32 THEN P%%=P%%+1:N%%=3\n");
-  /* decrement page count if <- */
-  printf("9040 IF X=8 THEN P%%=P%%-1:N%%=1\n");
-  /* keep from going off the end */
-  printf("9050 IF P%%>TP%% THEN P%%=TP%%\n");
-  printf("9060 IF P%%<0 THEN P%%=0\n");
-  printf("9070 RETURN\n");
+	/* memory location -16384 holds keyboard strobe */
+	/* Loop until a key is pressed.                 */
+	printf("9008 X=PEEK(-16384): IF X < 128 THEN 9008\n");
+	/* get the key value, convert to ASCII */
+	printf("9010 X=PEEK(-16368)-128\n");
+	/* Exit if escape or Q pressed */
+	printf("9020 IF X=27 OR X=81 THEN TEXT:HOME:END\n");
+	/* increment page count if space or -> */
+	printf("9030 IF X=21 OR X=32 THEN P%%=P%%+1:N%%=3\n");
+	/* decrement page count if <- */
+	printf("9040 IF X=8 THEN P%%=P%%-1:N%%=1\n");
+	/* keep from going off the end */
+	printf("9050 IF P%%>TP%% THEN P%%=TP%%\n");
+	printf("9060 IF P%%<0 THEN P%%=0\n");
+	printf("9070 RETURN\n");
 }
 
 
 static void generate_footer(char *left, char *center, int cols) {
 
-  int center_len,center_count,i,right_count;
+	int center_len,center_count,i,right_count;
 
-  printf("10000 REM ****************\n");
-  printf("10001 REM * PRINT FOOTER *\n");
-  printf("10002 REM ****************\n");
-  /* make text black on white; move to bottom line */
-  printf("10003 HOME: INVERSE : VTAB 24\n");
+	printf("10000 REM ****************\n");
+	printf("10001 REM * PRINT FOOTER *\n");
+	printf("10002 REM ****************\n");
+	/* make text black on white; move to bottom line */
+	printf("10003 HOME: INVERSE : VTAB 24\n");
 
-  printf("10005 X$=STR$(P%%)+\"/\":X$=X$+STR$(TP%%)\n");
-  printf("10007 L%%=LEN(X$)\n");
+	printf("10005 X$=STR$(P%%)+\"/\":X$=X$+STR$(TP%%)\n");
+	printf("10007 L%%=LEN(X$)\n");
 
-  printf("10010 PRINT \"%s",left);
-  
-  center_len=strlen(center);
-  center_count=(cols-center_len)/2;
-  center_count-=strlen(left);
+	printf("10010 PRINT \"%s",left);
 
-  if (center_count<0) {
-     fprintf(stderr,"Error! can't fit text in footer\n");
-     center_count=0;
-  }
+	center_len=strlen(center);
+	center_count=(cols-center_len)/2;
+	center_count-=strlen(left);
 
-  for(i=0;i<center_count;i++) printf(" ");
-  printf("%s\";\n",center);
+	if (center_count<0) {
+		fprintf(stderr,"Error! can't fit text in footer\n");
+		center_count=0;
+	}
 
-  right_count=cols-strlen(left)-center_count-center_len;
+	for(i=0;i<center_count;i++) printf(" ");
+	printf("%s\";\n",center);
 
-  printf("10012 FOR I=0 TO %d-L%%:PRINT \" \";: NEXT I\n",right_count-1);
+	right_count=cols-strlen(left)-center_count-center_len;
 
-  printf("10014 PRINT LEFT$(X$,L%%-1);\n");
-  
-  /* set last character to the right most char of the total pages */
-  /* without scrolling.                                           */
-  printf("10015 TP$=STR$(TP%%) : X$=RIGHT$(TP$,1) : X=VAL(X$): POKE 2039,X+48\n"); 
-  /* reset text, move cursor up */
-  printf("10020 NORMAL : VTAB 1: PRINT\"\"\n");
-  printf("10030 RETURN\n");
+	printf("10012 FOR I=0 TO %d-L%%:PRINT \" \";: NEXT I\n",right_count-1);
+
+	printf("10014 PRINT LEFT$(X$,L%%-1);\n");
+
+	/* set last character to the right most char of the total pages */
+	/* without scrolling.                                           */
+	printf("10015 TP$=STR$(TP%%) : X$=RIGHT$(TP$,1) : X=VAL(X$): POKE 2039,X+48\n"); 
+	/* reset text, move cursor up */
+	printf("10020 NORMAL : VTAB 1: PRINT\"\"\n");
+	printf("10030 RETURN\n");
 }
 
 static void print_line(unsigned char c, int num) {
 
-   int i;
+	int i;
 
-   for(i=0;i<num;i++) printf("%c",c);
+	for(i=0;i<num;i++) printf("%c",c);
 
 }
 
@@ -81,56 +81,56 @@ static void print_line(unsigned char c, int num) {
 
 static void center_comment(unsigned char c, int max_len, char *string) {
 
-   int half_len;
+	int half_len;
 
-   half_len=(max_len-strlen(string))/2;
+	half_len=(max_len-strlen(string))/2;
 
-   print_line(' ',half_len);
-   printf("%s",string);
-   /* handle strings of odd length */
-   print_line(' ',max_len-half_len-strlen(string));
+	print_line(' ',half_len);
+	printf("%s",string);
+	/* handle strings of odd length */
+	print_line(' ',max_len-half_len-strlen(string));
 }
 
 static void generate_initial_comment(char *title, char *author, char *email) {
 
-  int max_len;
+	int max_len;
 
-   max_len=strlen(title);
-   if (max_len<strlen(author)) max_len=strlen(author);
-   if (max_len<strlen(email)) max_len=strlen(email);
+	max_len=strlen(title);
+	if (max_len<strlen(author)) max_len=strlen(author);
+	if (max_len<strlen(email)) max_len=strlen(email);
 
-   printf("2 REM ");
-   print_line('*',max_len+4);
-   printf("\n");
+	printf("2 REM ");
+	print_line('*',max_len+4);
+	printf("\n");
 
-   printf("4 REM * ");
-   center_comment(' ',max_len,title);
-   printf(" *\n");
+	printf("4 REM * ");
+	center_comment(' ',max_len,title);
+	printf(" *\n");
 
-   printf("6 REM * ");
-   center_comment(' ',max_len,author);
-   printf(" *\n");
+	printf("6 REM * ");
+	center_comment(' ',max_len,author);
+	printf(" *\n");
 
-   printf("8 REM * ");
-   center_comment(' ',max_len,email);
-   printf(" *\n");
+	printf("8 REM * ");
+	center_comment(' ',max_len,email);
+	printf(" *\n");
 
-   printf("9 REM ");
-   print_line('*',max_len+4);
-   printf("\n");
+	printf("9 REM ");
+	print_line('*',max_len+4);
+	printf("\n");
 
-} 
+}
 
 struct project_info {
-  char *title;
-  char *author;
-  char *email;
-  int slides;
+	char *title;
+	char *author;
+	char *email;
+	int slides;
 };
 
 struct footer_info {
-  char *left;
-  char *center;
+	char *left;
+	char *center;
 };
 
 #define SLIDE_40COL	0
@@ -143,430 +143,467 @@ struct footer_info {
 #define MAX_SLIDES 89
 
 struct slide_info {
-  int type;
-  char *filename;
+	int type;
+	char *filename;
 };
 
 #define LINES_PER_SLIDE 100
 
 static void print_number(int line_num, int x, int y, char *string) {
-  int i,first=1,ourx=x;
-  printf("%d",line_num);
-  for(i=0;i<strlen(string);i++) {
-     printf("%s XDRAW %d AT %d,%d ",
-	    first?" ":":",(string[i]-'0')+1,
-	    ourx,y);
-     first=0;
-     ourx+=10;
-  }
-  printf("\n");
-
-
+	int i,first=1,ourx=x;
+	printf("%d",line_num);
+	for(i=0;i<strlen(string);i++) {
+		printf("%s XDRAW %d AT %d,%d ",
+			first?" ":":",(string[i]-'0')+1,
+			ourx,y);
+		first=0;
+		ourx+=10;
+	}
+	printf("\n");
 }
 
 void center_print(int line_num,char *string,int cols) {
 
-   int i,centering=(cols-strlen(string))/2;
-   
-   printf("%d PRINT ",line_num);
-   if (centering<5) {
-      printf("\"");
-      for(i=0;i<centering;i++) printf(" ");
-   }
-   else {
-      printf("SPC(%d);\"",centering);
-   }
-   printf("%s\"\n",string);
-   
+	int i,centering=(cols-strlen(string))/2;
+
+	printf("%d PRINT ",line_num);
+	if (centering<5) {
+		printf("\"");
+		for(i=0;i<centering;i++) printf(" ");
+	}
+	else {
+		printf("SPC(%d);\"",centering);
+	}
+	printf("%s\"\n",string);
 }
 
-static void print_til_eof(FILE *fff,int *line_num) {	
-   
-   char *result;
-   char string[BUFSIZ];
-   
-   while(1) {
-      result=fgets(string,BUFSIZ,fff);
-      if (result==NULL) break;
-      
-      if (string[0]=='\n') {
-	 printf("%d PRINT\n",*line_num);                        (*line_num)++;
-	 continue;
-      }
-      
-      string[strlen(string)-1]='\0';
-      	   
-      if ((string[0]=='%') && (string[1]=='c') && (string[2]=='%')) {
-	 center_print(*line_num,string+3,40);                    (*line_num)++;
-      } else {	     
-	 printf("%d PRINT \"%s\"\n",*line_num,string);          (*line_num)++;
-      }
-   }
+static void print_til_eof(FILE *fff,int *line_num) {
+
+	char *result;
+	char string[BUFSIZ];
+
+	while(1) {
+		result=fgets(string,BUFSIZ,fff);
+		if (result==NULL) break;
+
+		if (string[0]=='\n') {
+			printf("%d PRINT\n",*line_num);
+			(*line_num)++;
+			continue;
+		}
+		string[strlen(string)-1]='\0';
+
+		if ((string[0]=='%') && (string[1]=='c') && (string[2]=='%')) {
+			center_print(*line_num,string+3,40);
+			(*line_num)++;
+		} else {
+			printf("%d PRINT \"%s\"\n",*line_num,string);
+			(*line_num)++;
+		}
+	}
 }
 
 static void generate_slide(int num, int max, char*filename) {
 
-   int line_num;
-   FILE *fff;
-   char string[BUFSIZ],*result,type[BUFSIZ];
+	int line_num;
+	FILE *fff;
+	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);
+	/* line numbers start at 100 and run LINES_PER_SLIDE per slide */
+	line_num=100+(num*LINES_PER_SLIDE);
 
-   /* print a REMARK block */
-   printf("%d REM ",line_num);                                 line_num++;
-   print_line('*',strlen(filename)+8);
-   printf("\n");
-   printf("%d REM *** %s ***\n",line_num,filename);            line_num++;
-   printf("%d REM ",line_num);                                 line_num++;
-   print_line('*',strlen(filename)+8);
-   printf("\n");
+	/* print a REMARK block */
+	printf("%d REM ",line_num);				line_num++;
+	print_line('*',strlen(filename)+8);
+	printf("\n");
+	printf("%d REM *** %s ***\n",line_num,filename);	line_num++;
+	printf("%d REM ",line_num);				line_num++;
+	print_line('*',strlen(filename)+8);
+	printf("\n");
 
-   /* print the footer */
-   printf("%d GOSUB 10000\n",line_num);                        line_num++;
+	/* print the footer */
+	printf("%d GOSUB 10000\n",line_num);			line_num++;
 
-   /* generate the slide */
+	/* generate the slide */
 
-   fff=fopen(filename,"r");
-   if (fff==NULL) {
-     fprintf(stderr,"Couldn't open %s!\n",filename);
-   }
-   else {
-      /* assume we load ourselves high */
-     int address=0x1000;
-     int num_plots=0,plot,color;
-     double maxx,maxy,x,y;
-     int applex,appley,hplot_num,first=1;
-     int xpoints,ypoints;
-     int axesx,axesy;
-     char axes_string[BUFSIZ];
+	fff=fopen(filename,"r");
+	if (fff==NULL) {
+		fprintf(stderr,"Couldn't open %s!\n",filename);
+	}
+	else {
+		/* assume we load ourselves high */
+		int address=0x1000;
+		int num_plots=0,plot,color;
+		double maxx,maxy,x,y;
+		int applex,appley,hplot_num,first=1;
+		int xpoints,ypoints;
+		int axesx,axesy;
+		char axes_string[BUFSIZ];
 
 #define HPLOTS_ON_LINE 6
 
-     result=fgets(type,BUFSIZ,fff);
+		result=fgets(type,BUFSIZ,fff);
 
-     if (strstr(type,"HGR_PLOT")) {
-        printf("%d IF ST%%=1 GOTO %d\n",line_num,line_num+3);      line_num++;
-        printf("%d PRINT CHR$(4);\"BLOAD NUM.SHAPE,A$1000\"\n",line_num); line_num++;
-        printf("%d POKE 232,%d: POKE 233,%d : ROT=0: SCALE=3: ST%%=1\n",   
-	       line_num,address&0xff,(address>>8)&0xff);           line_num++;
+		if (strstr(type,"HGR_PLOT")) {
+			printf("%d IF ST%%=1 GOTO %d\n",line_num,line_num+3);
+							line_num++;
+			printf("%d PRINT CHR$(4);\"BLOAD NUM.SHAPE,A$1000\"\n",
+				line_num);		line_num++;
+			printf("%d POKE 232,%d: POKE 233,%d : "
+				"ROT=0: SCALE=3: ST%%=1\n",
+				line_num,address&0xff,(address>>8)&0xff);
+							line_num++;
+			printf("%d HGR\n",line_num);	line_num++;
 
-	printf("%d HGR\n",line_num);                               line_num++;
+			/* get the size */
+			while(1) {
+				result=fgets(string,BUFSIZ,fff);
+				if (result==NULL) break;
+				if ((string[0]=='#') || (string[0]=='\n')) {
+					continue;
+				}
+				sscanf(string,"%lf %lf",&maxx,&maxy);
+				break;
+			}
 
-	/* get the size */
-	while(1) {   
-	   result=fgets(string,BUFSIZ,fff);
-	   if (result==NULL) break;
-      	   if ((string[0]=='#') || (string[0]=='\n')) continue;
-	   sscanf(string,"%lf %lf",&maxx,&maxy);
-	   break;
+			/* Draw the Axes */
+			printf("%d HCOLOR=3:HPLOT 0,0 TO 0,159: "
+				"HPLOT 1,1 TO 1,159\n",
+				line_num);			line_num++;
+			printf("%d HPLOT 0,159 TO 279,159\n",
+				line_num);			line_num++;
+
+			/* get the axes ticks */
+
+			while(1) {
+				result=fgets(string,BUFSIZ,fff);
+				if (result==NULL) break;
+				if ((string[0]=='#') || (string[0]=='\n')) {
+					continue;
+				}
+				sscanf(string,"%d %d",&xpoints,&ypoints);
+				break;
+			}
+
+			printf("%d FOR I=0 TO 279 STEP %d: "
+				"HPLOT I,155 TO I,159: NEXT I\n",
+				line_num,280/xpoints);		line_num++;
+
+			printf("%d FOR I=159 TO 0 STEP -%d: "
+				"HPLOT 0,I TO 4,I: NEXT I\n",
+				line_num,160/ypoints);		line_num++;
+
+
+			/* Look for START */
+			while(1) {
+				result=fgets(string,BUFSIZ,fff);
+				if (result==NULL) break;
+				if ((string[0]=='#') || (string[0]=='\n')) {
+					continue;
+				}
+				if (strstr(string,"START")) break;
+			}
+
+
+			/* Number the Axes */
+			while(1) {
+				result=fgets(string,BUFSIZ,fff);
+				if (result==NULL) break;
+				if ((string[0]=='#') || (string[0]=='\n')) {
+					continue;
+				}
+				if (strstr(string,"STOP")) break;
+				sscanf(string,"%d %d %s",
+					&axesx,&axesy,axes_string);
+				print_number(line_num,axesx,axesy,axes_string);
+								line_num++;
+			}
+
+			/* get number of plots */
+			while(1) {
+				result=fgets(string,BUFSIZ,fff);
+				if (result==NULL) break;
+				if ((string[0]=='#') || (string[0]=='\n')) {
+					continue;
+				}
+				sscanf(string,"%d",&num_plots);
+				break;
+			}
+
+			for(plot=0;plot<num_plots;plot++) {
+				first=1;
+
+				/* Look for START */
+				while(1) {
+				      result=fgets(string,BUFSIZ,fff);
+	      				if (result==NULL) break;
+      	      				if ((string[0]=='#') || (string[0]=='\n')) {
+						continue;
+					}
+					if (strstr(string,"START")) break;
+				}
+
+				/* get the color of the plot */
+				while(1) {
+					result=fgets(string,BUFSIZ,fff);
+					if (result==NULL) break;
+					if ((string[0]=='#') || (string[0]=='\n')) {
+						continue;
+					}
+					sscanf(string,"%d",&color);
+					break;
+				}
+				printf("%d HCOLOR=%d\n",line_num,color);
+				line_num++;
+
+				/* Plot the points */
+				while(1) {
+					result=fgets(string,BUFSIZ,fff);
+					if (result==NULL) break;
+					if ((string[0]=='#') || (string[0]=='\n')) {
+						continue;
+					}
+					if (strstr(string,"STOP")) break;
+
+					sscanf(string,"%lf %lf",&x,&y);
+					applex=(int)((x/maxx)*280.0);
+					appley=159-(int)((y/maxy)*160.0);
+					if (first) {
+						printf("%d HPLOT %d,%d ",
+							line_num,applex,appley);
+								line_num++;
+						hplot_num=1;
+						first=0;
+					}
+					else if (hplot_num%HPLOTS_ON_LINE!=0) {
+						printf("TO %d,%d ",applex,appley);
+						hplot_num++;
+					} else {
+						printf("\n%d HPLOT TO %d,%d ",
+							line_num,applex,appley);
+								line_num++;
+							hplot_num++;
+					}
+				}
+				printf("\n");
+			}
+
+			/* Print remaining text */
+			printf("%d VTAB 21\n",line_num);	line_num++;
+			print_til_eof(fff,&line_num);
+		}
+		else if (strstr(type,"HGR2")) {
+			/* cheat and use HGR page 1 but text turned off */
+			printf("%d HGR:POKE -16302,0\n",line_num);
+								line_num++;
+
+			while(1) {
+				result=fgets(string,BUFSIZ,fff);
+				if (result==NULL) break;
+				if ((string[0]=='#') || (string[0]=='\n')) {
+					continue;
+				}
+			}
+			string[strlen(string)-1]='\0';
+			printf("%d PRINT CHR$(4);\"BLOAD %s,A$2000\"\n",
+				line_num,string);		line_num++;
+		}
+		else if (strstr(type,"HGR")) {
+			printf("%d HGR\n",line_num);		line_num++;
+			while(1) {
+				result=fgets(string,BUFSIZ,fff);
+				if (result==NULL) break;
+				if ((string[0]=='#') || (string[0]=='\n')) {
+					continue;
+				}
+				break;
+			}
+			string[strlen(string)-1]='\0';
+			printf("%d PRINT CHR$(4);\"BLOAD %s,A$2000\"\n",
+				line_num,string);
+								line_num++;
+			/* print rest of stuff */
+			printf("%d VTAB 21\n",line_num);	line_num++;
+
+			print_til_eof(fff,&line_num);
+
+		}
+		else if (strstr(type,"80COL")) {
+
+		}
+		else if (strstr(type,"40COL")) {
+
+			printf("%d TEXT:VTAB 1\n",line_num);	line_num++;
+			print_til_eof(fff,&line_num);
+		}
+
+		fclose(fff);
 	}
 
-	/* Draw the Axes */
-	printf("%d HCOLOR=3:HPLOT 0,0 TO 0,159: HPLOT 1,1 TO 1,159\n",
-	       line_num);                                        line_num++;
-	printf("%d HPLOT 0,159 TO 279,159\n",
-	       line_num);                                        line_num++;
-
-
-	/* get the axes ticks */
-
-	while(1) {   
-	   result=fgets(string,BUFSIZ,fff);
-	   if (result==NULL) break;
-      	   if ((string[0]=='#') || (string[0]=='\n')) continue;
-	   sscanf(string,"%d %d",&xpoints,&ypoints);
-	   break;
-	}
-
-	printf("%d FOR I=0 TO 279 STEP %d: "
-	       "HPLOT I,155 TO I,159: NEXT I\n",
-	       line_num,280/xpoints);                            line_num++;
-
-	printf("%d FOR I=159 TO 0 STEP -%d: "
-	       "HPLOT 0,I TO 4,I: NEXT I\n",
-	       line_num,160/ypoints);                            line_num++;
-
-	/* Look for START */
-	while(1) {
-	   result=fgets(string,BUFSIZ,fff);
-	   if (result==NULL) break;
-      	   if ((string[0]=='#') || (string[0]=='\n')) continue;
-	   if (strstr(string,"START")) break;
-	}
-
-
-	/* Number the Axes */
-	while(1) {   
-	   result=fgets(string,BUFSIZ,fff);
-	   if (result==NULL) break;
-      	   if ((string[0]=='#') || (string[0]=='\n')) continue;
-	   if (strstr(string,"STOP")) break;
-	   sscanf(string,"%d %d %s",&axesx,&axesy,axes_string);
-	   print_number(line_num,axesx,axesy,axes_string);	  line_num++;
-	}
-	
-
-
-	/* get number of plots */
-	while(1) {
-	   result=fgets(string,BUFSIZ,fff);   
-	   if (result==NULL) break;
-      	   if ((string[0]=='#') || (string[0]=='\n')) continue;
-	   sscanf(string,"%d",&num_plots);
-	   break;
-	}
-
-	for(plot=0;plot<num_plots;plot++) {
-	   first=1;
-
-	   /* Look for START */
-	   while(1) {
-	      result=fgets(string,BUFSIZ,fff);
-	      if (result==NULL) break;
-      	      if ((string[0]=='#') || (string[0]=='\n')) continue;
-	      if (strstr(string,"START")) break;
-	   }
-
-	   /* get the color of the plot */
-	   while(1) {
-	      result=fgets(string,BUFSIZ,fff);
-	      if (result==NULL) break;
-	      if ((string[0]=='#') || (string[0]=='\n')) continue;
-	      sscanf(string,"%d",&color);
-	      break;
-	   }
-	   printf("%d HCOLOR=%d\n",line_num,color);                line_num++;
-
-	   /* Plot the points */
-	   while(1) {
-	      result=fgets(string,BUFSIZ,fff);
-	      if (result==NULL) break;
-      	      if ((string[0]=='#') || (string[0]=='\n')) continue;
-	      if (strstr(string,"STOP")) break;
-
-	      sscanf(string,"%lf %lf",&x,&y);
-	      applex=(int)((x/maxx)*280.0);
-	      appley=159-(int)((y/maxy)*160.0);
-	      if (first) {
-	         printf("%d HPLOT %d,%d ",line_num,applex,appley); line_num++;
-		 hplot_num=1;
-	         first=0;
-	      }
-	      else if (hplot_num%HPLOTS_ON_LINE!=0) {
-	         printf("TO %d,%d ",applex,appley);
-		 hplot_num++;
-	      } else {
-	         printf("\n%d HPLOT TO %d,%d ",
-			line_num,applex,appley);                   line_num++;
-		 hplot_num++;
-	      }
-	   }
-	   printf("\n");
-	}
-
-	/* Print remaining text */
-	printf("%d VTAB 21\n",line_num);                       line_num++;
-	print_til_eof(fff,&line_num);
-     }
-     else if (strstr(type,"HGR2")) {
-	/* cheat and use HGR page 1 but text turned off */
-        printf("%d HGR:POKE -16302,0\n",line_num);                           line_num++;
-	
-	while(1) {
-	   result=fgets(string,BUFSIZ,fff);
-	   if (result==NULL) break;
-      	   if ((string[0]=='#') || (string[0]=='\n')) continue;	   
-	}
-	string[strlen(string)-1]='\0';
-        printf("%d PRINT CHR$(4);\"BLOAD %s,A$2000\"\n",
-	       line_num,string);                                line_num++;
-     }
-     else if (strstr(type,"HGR")) {
-        printf("%d HGR\n",line_num);                            line_num++;
-	while(1) {
-	   result=fgets(string,BUFSIZ,fff);
-	   if (result==NULL) break;
-      	   if ((string[0]=='#') || (string[0]=='\n')) continue;
-	   break;
-	}
-	string[strlen(string)-1]='\0';
-        printf("%d PRINT CHR$(4);\"BLOAD %s,A$2000\"\n",
-	       line_num,string);                                line_num++;
-	/* print rest of stuff */
-	printf("%d VTAB 21\n",line_num);                       line_num++;
-	
-	print_til_eof(fff,&line_num);
-
-     }
-     else if (strstr(type,"80COL")) {
-
-     }
-     else if (strstr(type,"40COL")) {
-
-        printf("%d TEXT:VTAB 1\n",line_num);                     line_num++;
-	print_til_eof(fff,&line_num);
-
-     }
-
-
-      fclose(fff);
-   }
-
-   /* wait for keypress and move to next slide */
-   printf("%d GOSUB 9000\n",line_num);                         line_num++;
-   printf("%d ON N%% GOTO %d,%d,%d\n",
-	  line_num,
-          /* previous */
-	  num==0?(100+(num*LINES_PER_SLIDE)):(100+((num-1)*LINES_PER_SLIDE)),
-	  /* current  */
-	  100+(num*LINES_PER_SLIDE),                      
-	  /* next */
-	  num<(max-1)?(100+((num+1)*LINES_PER_SLIDE)):
-                      (100+(num*LINES_PER_SLIDE))); 
+	/* wait for keypress and move to next slide */
+	printf("%d GOSUB 9000\n",line_num);			line_num++;
+	printf("%d ON N%% GOTO %d,%d,%d\n",
+		line_num,
+		/* previous */
+		num==0?(100+(num*LINES_PER_SLIDE)):
+			(100+((num-1)*LINES_PER_SLIDE)),
+		/* current  */
+		100+(num*LINES_PER_SLIDE),
+		/* next */
+		num<(max-1)?(100+((num+1)*LINES_PER_SLIDE)):
+			(100+(num*LINES_PER_SLIDE)));
 }
 
 int main(int argc, char **argv) {
 
-   int i;
-   char project_directory[BUFSIZ];
-   char filename[BUFSIZ],string[BUFSIZ];
-   char *result;
-   FILE *fff;
+	int i;
+	char project_directory[BUFSIZ];
+	char filename[BUFSIZ],string[BUFSIZ];
+	char *result;
+	FILE *fff;
 
-   struct project_info info;
-   struct footer_info footer;
-   struct slide_info slides[MAX_SLIDES];
+	struct project_info info;
+	struct footer_info footer;
+	struct slide_info slides[MAX_SLIDES];
 
-   if (argc<2) {
-      fprintf(stderr,"\n");
-      fprintf(stderr,"USAGE: %s DIR\n",argv[0]);
-      fprintf(stderr,"\tWhere DIR contains presentation info\n\n");
-      exit(1);
-   }
+	if (argc<2) {
+		fprintf(stderr,"\n");
+		fprintf(stderr,"USAGE: %s DIR\n",argv[0]);
+		fprintf(stderr,"\tWhere DIR contains presentation info\n\n");
+		exit(1);
+	}
 
-   /* read in project info */
-   strncpy(project_directory,argv[1],BUFSIZ);
-   sprintf(filename,"%s/info",project_directory);
+	/* read in project info */
+	strncpy(project_directory,argv[1],BUFSIZ);
+	sprintf(filename,"%s/info",project_directory);
 
-   fff=fopen(filename,"r");
-   if (fff==NULL) {
-      fprintf(stderr,"Error!  Could not open %s\n",filename);
-      exit(1);
-   }
+	fff=fopen(filename,"r");
+	if (fff==NULL) {
+		fprintf(stderr,"Error!  Could not open %s\n",filename);
+		exit(1);
+	}
 
-   /* Get Title */
-   while(1) {
-      result=fgets(string,BUFSIZ,fff);
-      if (result==NULL) {
-	 fprintf(stderr,"Unexpected EOF finding TITLE in %s\n",filename);
-	 exit(1);
-      }
-      if (!strncmp("TITLE",string,5)) break;
-   }
-   result=fgets(string,BUFSIZ,fff);
-   string[strlen(string)-1]='\0';
-   info.title=strdup(string);
+	/* Get Title */
+	while(1) {
+		result=fgets(string,BUFSIZ,fff);
+		if (result==NULL) {
+			fprintf(stderr,
+				"Unexpected EOF finding TITLE in %s\n",
+				filename);
+			exit(1);
+		}
+		if (!strncmp("TITLE",string,5)) break;
+	}
+	result=fgets(string,BUFSIZ,fff);
+	string[strlen(string)-1]='\0';
+	info.title=strdup(string);
 
-   /* Get Author */
-   while(1) {
-      result=fgets(string,BUFSIZ,fff);
-      if (result==NULL) {
-	 fprintf(stderr,"Unexpected EOF finding AUTHOR in %s\n",filename);
-	 exit(1);
-      }
-      if (!strncmp("AUTHOR",string,6)) break;
-   }
-   result=fgets(string,BUFSIZ,fff);
-   string[strlen(string)-1]='\0';
-   info.author=strdup(string);
+	/* Get Author */
+	while(1) {
+		result=fgets(string,BUFSIZ,fff);
+		if (result==NULL) {
+			fprintf(stderr,
+				"Unexpected EOF finding AUTHOR in %s\n",
+				filename);
+			exit(1);
+		}
+		if (!strncmp("AUTHOR",string,6)) break;
+	}
+	result=fgets(string,BUFSIZ,fff);
+	string[strlen(string)-1]='\0';
+	info.author=strdup(string);
 
-   /* Get E-mail */
-   while(1) {
-      result=fgets(string,BUFSIZ,fff);
-      if (result==NULL) {
-	 fprintf(stderr,"Unexpected EOF finding EMAIL in %s\n",filename);
-	 exit(1);
-      }
-      if (!strncmp("EMAIL",string,5)) break;
-   }
-   result=fgets(string,BUFSIZ,fff);
-   string[strlen(string)-1]='\0';
-   info.email=strdup(string);
+	/* Get E-mail */
+	while(1) {
+		result=fgets(string,BUFSIZ,fff);
+		if (result==NULL) {
+			fprintf(stderr,
+				"Unexpected EOF finding EMAIL in %s\n",
+				filename);
+			exit(1);
+		}
+		if (!strncmp("EMAIL",string,5)) break;
+	}
+	result=fgets(string,BUFSIZ,fff);
+	string[strlen(string)-1]='\0';
+	info.email=strdup(string);
 
-   /* Get list of slides */
+	/* Get list of slides */
 
-   while(1) {
-      result=fgets(string,BUFSIZ,fff);
-      if (result==NULL) {
-	 fprintf(stderr,"Unexpected EOF finding SLIDES in %s\n",filename);
-	 exit(1);
-      }
-      if (!strncmp("SLIDES",string,6)) break;
-   }
+	while(1) {
+		result=fgets(string,BUFSIZ,fff);
+		if (result==NULL) {
+			fprintf(stderr,
+				"Unexpected EOF finding SLIDES in %s\n",
+				filename);
+			exit(1);
+		}
+		if (!strncmp("SLIDES",string,6)) break;
+	}
 
-   info.slides=0;
+	info.slides=0;
 
-   while(1) {
-      result=fgets(string,BUFSIZ,fff);
-      if (result==NULL) {
-	 fprintf(stderr,"Unexpected EOF finding END_SLIDES in %s\n",filename);
-	 exit(1);
-      }
-      if ((string[0]=='#') || (string[0]=='\n')) continue;
-      if (!strncmp("END_SLIDES",string,10)) break;
+	while(1) {
+		result=fgets(string,BUFSIZ,fff);
+		if (result==NULL) {
+			fprintf(stderr,
+				"Unexpected EOF finding END_SLIDES in %s\n",
+				filename);
+			exit(1);
+		}
+		if ((string[0]=='#') || (string[0]=='\n')) continue;
+		if (!strncmp("END_SLIDES",string,10)) break;
 
-      string[strlen(string)-1]='\0';
-      slides[info.slides].filename=strdup(string);
+		string[strlen(string)-1]='\0';
+		slides[info.slides].filename=strdup(string);
 
-      info.slides++;
-   }
+		info.slides++;
+	}
 
-   if (result==NULL) fprintf(stderr,"Error reading!\n");
+	if (result==NULL) fprintf(stderr,"Error reading!\n");
 
-   fclose(fff);
+	fclose(fff);
 
-   /************************/
-   /* read in footer info  */
-   /************************/
+	/************************/
+	/* read in footer info  */
+	/************************/
 
-   strncpy(project_directory,argv[1],BUFSIZ);
-   sprintf(filename,"%s/footer",project_directory);
+	strncpy(project_directory,argv[1],BUFSIZ);
+	sprintf(filename,"%s/footer",project_directory);
 
-   fff=fopen(filename,"r");
-   if (fff==NULL) {
-      fprintf(stderr,"Error!  Could not open %s\n",filename);
-      exit(1);
-   }
+	fff=fopen(filename,"r");
+	if (fff==NULL) {
+		fprintf(stderr,"Error!  Could not open %s\n",filename);
+		exit(1);
+	}
 
-   result=fgets(string,BUFSIZ,fff);
-   string[strlen(string)-1]='\0';
-   footer.left=strdup(string);
+	result=fgets(string,BUFSIZ,fff);
+	string[strlen(string)-1]='\0';
+	footer.left=strdup(string);
 
-   result=fgets(string,BUFSIZ,fff);
-   string[strlen(string)-1]='\0';
-   footer.center=strdup(string);
+	result=fgets(string,BUFSIZ,fff);
+	string[strlen(string)-1]='\0';
+	footer.center=strdup(string);
 
-   fclose(fff);
-   
-
-   /**************************/
-   /* Generate the program   */
-   /**************************/
-
-   /* Print the initial program remarks */
-   generate_initial_comment(info.title,info.author,info.email);
-
-   printf("20 HOME\n");
-   printf("30 P%%=0 : TP%%=%d: ST%%=0\n",info.slides-1);
-
-   for(i=0;i<info.slides;i++) {
-     generate_slide(i,info.slides,slides[i].filename);
-   }
-
-   generate_keyhandler();
-   generate_footer(footer.left,footer.center,40);
+	fclose(fff);
 
 
-   return 0;
+	/**************************/
+	/* Generate the program   */
+	/**************************/
+
+	/* Print the initial program remarks */
+	generate_initial_comment(info.title,info.author,info.email);
+
+	printf("20 HOME\n");
+	printf("30 P%%=0 : TP%%=%d: ST%%=0\n",info.slides-1);
+
+	for(i=0;i<info.slides;i++) {
+		generate_slide(i,info.slides,slides[i].filename);
+	}
+
+	generate_keyhandler();
+	generate_footer(footer.left,footer.center,40);
+
+	return 0;
 }