--- cBlorb\Chapter 1\Text Files.w	2010-03-24 18:06:58.000000000 -0400
+++ cBlorb-fixed\Chapter 1\Text Files.w	2010-08-21 06:07:08.000000000 -0400
@@ -141,13 +141,13 @@
 @<Open the text file@> =
 	if (strlen(filename) >= MAX_FILENAME_LENGTH) {
 		if (serious) fatal_fs("filename too long", filename);
 		error_1("filename too long", filename);
 		return;
 	}
-	HANDLE = fopen(filename, "r");
+	HANDLE = fopen(filename, "rb");
 	if (HANDLE == NULL) {
 		if (message == NULL) return;
 		if (serious) fatal_fs(message, filename);
 		else { error_1(message, filename); return; }
 	}
 
--- cBlorb\Chapter 3\Links and Auxiliary Files.w	2009-04-16 06:12:48.000000000 -0400
+++ cBlorb-fixed\Chapter 3\Links and Auxiliary Files.w	2010-08-25 05:27:28.000000000 -0400
@@ -100,20 +100,20 @@
 		if (size != -1L) @<Write a description of the rough file size@>
 	}
 	fprintf(COPYTO, ")");
 	close_style(COPYTO, "filetype");
 }
 
-@ We round down to the nearest KB, MB, GB, TB or byte, as appropriate. Although
+@ We round down to the nearest kB, MB, GB, TB or byte, as appropriate. Although
 this will describe a 1-byte auxiliary file as ``1 bytes'', the contingency seems
 remote.
 
 @<Write a description of the rough file size@> =
 	char *units = "&nbsp;bytes";
 	long int remainder = 0;
-	if (size > 1024L) { remainder = size % 1024L; size /= 1024L; units = "KB"; }
+	if (size > 1024L) { remainder = size % 1024L; size /= 1024L; units = "kB"; }
 	if (size > 1024L) { remainder = size % 1024L; size /= 1024L; units = "MB"; }
 	if (size > 1024L) { remainder = size % 1024L; size /= 1024L; units = "GB"; }
 	if (size > 1024L) { remainder = size % 1024L; size /= 1024L; units = "TB"; }
 	fprintf(COPYTO, ",&nbsp;%d", (int) size);
 	if ((size < 100L) && (remainder >= 103L)) fprintf(COPYTO, ".%d", (int) (remainder/103L));
 	fprintf(COPYTO, "%s", units);
--- cBlorb\Chapter 3\Website Maker.w	2010-06-12 06:30:44.000000000 -0400
+++ cBlorb-fixed\Chapter 3\Website Maker.w	2010-08-25 05:43:20.000000000 -0400
@@ -399,13 +399,14 @@
 
 @<Correct the comment nesting level ready for next time@> =
 	int i;
 	for (i=0; line[i]; i++) {
 		if (line[i] == '[') scan_comment_nesting++;
 		if (line[i] == ']') scan_comment_nesting--;
-		if (line[i] == '\"') scan_quoted_matter = (scan_quoted_matter)?FALSE:TRUE;
+		if (scan_comment_nesting == 0 && line[i] == '\"') scan_quoted_matter = (scan_quoted_matter)?FALSE:TRUE;
+
 	}
 
 @
 
 @<Start a new table here and return@> =
 	current_table = CREATE(table);
@@ -716,13 +717,14 @@
 @<Filter out lines for the preface@> =
 	segment *first_segment = FIRST_OBJECT(segment);
 	if ((first_segment) && (line_count == first_segment->begins_at - 1) && (line[0] == 0))
 		return FALSE; /* don't bother to typeset a blank line just before the first segment is reached */
 	
 	if ((first_segment) && (line_count == first_segment->begins_at)) {
-		typeset_contents_listing(TRUE);
+		if (!SOURCENOTES_mode)
+			typeset_contents_listing(TRUE);
 		return TRUE;
 	}
 
 @ The segment pages are easier: in this case we allow the line only if it
 lies inside the segment, and otherwise suppress it. Once we've gone beyond
 the segment, we don't need to read any further, so we return |TRUE|.
@@ -738,18 +740,22 @@
 number, and typeset. All other material is ignored.
 
 @<Typeset the line in [SOURCENOTES] mode@> =
 	int i;
 	for (i=0; line[i]; i++) {
 		if ((line[i] == '[') && (line[i+1] == '*')) {
+			int comment_level = 1;
 			fprintf(SPAGE, "<p><a name=\"note%d\"></a>", next_footnote_number);
 			open_style(SPAGE, "notetext");
+			fprintf(SPAGE, "<a href=\"#note%dref\">[%d]</a>. ", next_footnote_number, next_footnote_number);
 			fprintf(SPAGE, "[%d]. ", next_footnote_number);
 			next_footnote_number++;
 			i+=2;
-			while ((line[i]) && (line[i] != ']')) {
+			while (line[i]) {
+				if (line[i] == '[') ++comment_level;
+				if (line[i] == ']' && --comment_level == 0) break;
 				fprintf(SPAGE, "%c", line[i++]);
 			}
 			close_style(SPAGE, "notetext");
 			fprintf(SPAGE, "</p>\n");
 		}
 	}
@@ -911,29 +917,33 @@
 	}
 
 @ The following enters or exits quoted-matter mode, and is structured so that
 the quotation marks are not coloured -- only the material inside them.
 
 Our code in handling quoted and comment matter is greatly simplified by the
-fact that a valid Inform text cannot contain mismatched square brackets, and
-nor can a valid comment contain mismatched quotation marks.
+fact that a valid Inform text cannot contain mismatched square brackets, however,
+a valid comment can contain mismatched quotation marks.
 
 @<Typeset a double quotation mark outside of a comment@> =
 	if (quoted_matter) change_style(SPAGE, NULL);
 	fprintf(SPAGE, "&quot;");
 	if (quoted_matter == FALSE) change_style(SPAGE, "quote");
 	quoted_matter = (quoted_matter)?FALSE:TRUE;
 
 @ On the other hand, the squares around a comment {\it do} pick up the colour
 of the commentary within them. Asterisked comments must end in the same paragraph
-as they begin, and must not contain nested further comments.
+as they begin.
 
 @<Typeset an open square bracket outside of a string@> =
 	if (line[i+1] == '*') {
 		/* advance past the end of the asterisked comment */
-		while ((line[i]) && (line[i+1] != ']')) i++; if (line[i]) i++;
+		int comment_level = 1;
+		for (i+=2; line[i]; ++i) {
+			if (line[i] == '[') ++comment_level;
+			if (line[i] == ']' && --comment_level == 0) break;
+		} 
 		@<Typeset a footnote cue@>;
 	} else {
 		comment_nesting++;
 		if (comment_nesting == 1) change_style(SPAGE, "comment");
 		fprintf(SPAGE, "[");
 	}
@@ -959,19 +969,20 @@
 	change_style(SPAGE, NULL);
 	fprintf(SPAGE, "-)");
 	i6_matter = FALSE;
 
 @ The ``cue'' of a footnote is the reference in the body of the text, which
 is conventionally printed as a superscript number. We leave that to the
-span |linknotes| if we have CSS, and otherwise render in grey superscript.
+span |notecue| if we have CSS, and otherwise render in grey superscript.
 
 @<Typeset a footnote cue@> =
-	open_style(SPAGE, "linknotes");
+	fprintf(SPAGE, "<a name=\"note%dref\"></a>", next_footnote_number);
+	open_style(SPAGE, "notecue");
 	fprintf(SPAGE, "<a href=\"#note%d\">[%d]</a>",
 		next_footnote_number, next_footnote_number);
-	close_style(SPAGE, "linknotes");
+	close_style(SPAGE, "notecue");
 	next_footnote_number++;
 
 @ That just leaves the little contents listings -- one for the source, and
 another for the documentation (if any).
 
 @c