Commit Diff


commit - 2a60333bac6c807055d7d87aa9eaff5ffd18e587
commit + ed992560fbc706d9790080ef4361e6a48790dd69
blob - 41ac7d2f633699e5e7ac35be07034581ade67a55
blob + 577086ff4ac12eb079c791252762ac8c120c4d48
--- teach.c
+++ teach.c
@@ -133,7 +133,7 @@ pause(void)
 	clock_gettime(CLOCK_MONOTONIC, &t0);
 	putchar('\n');
 	printscores();
-	fputs("- pause (press Return to continue, ^D to quit) - ", stdout);
+	fputs("\n - pause (press Return to continue, ^D to quit) - ", stdout);
 	sound('&');		/* <AS> wait */
 	while ((input = getchar()) != '\n' && input != 4) ;
 	clock_gettime(CLOCK_MONOTONIC, &t1);
@@ -147,7 +147,7 @@ pause(void)
 	}
 	sound('\a');		/* <KA> attention / start of transmission */
 	sound('\n');		/* inter-word pause */
-	puts("\r                                                ");
+	fputs("\r                                                 \r", stdout);
 
 	return 0;
 }
@@ -320,22 +320,28 @@ teach(void)
 	vartime = initvar;
 	srand(time(NULL));
 
-	puts("Type what you hear!\n"
-	    "Try to be accurate.  You will become faster automatically.\n"
-	    "At any time, press Space for a hint, Return to pause,"
-	    " or ^D to quit.");
-	fputs("Training:", stdout);
-	for (i = 0; i < nactive; i++)
-		printf(" %c", toupper(alphabet[i]));
-	putchar('\n');
-	fputs(" - press Return to begin - ", stdout);
+	puts("\n"
+	    "    Type what you hear!\n"
+	    "\n"
+	    "    Try to be accurate.  You will become faster automatically.\n"
+	    "    At any time, press Space for a hint, Return to pause,"
+	    " or ^D to quit.\n");
+	fputs("    Training:", stdout);
+	for (i = 0; i < nactive; i++) {
+		if (i % 36 == 0)
+			fputs("\n   ", stdout);
+		putchar(' ');
+		putchar(toupper(alphabet[i]));
+	}
+	puts("");
+	fputs("\n - press Return to begin - ", stdout);
 	while ((input = getchar()) != '\n' && input != 4) ;
 	if (input == 4)
 		puts("^D");
 	else if (input == '\n') {
 		sound('\a');	/* <KA> attention / start of transmission */
 		sound('\n');	/* inter-word pause */
-		puts("\r                          ");
+		fputs("\r                          \r", stdout);
 	}
 
 	clock_gettime(CLOCK_MONOTONIC, &tbegin);