--- gforth/wf.fs	2006/10/08 11:30:56	1.48
+++ gforth/wf.fs	2007/12/31 17:34:58	1.52
@@ -1,6 +1,6 @@
 \ wiki forth
 
-\ Copyright (C) 2003,2004,2005 Free Software Foundation, Inc.
+\ Copyright (C) 2003,2004,2005,2006,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -331,7 +331,7 @@ s" Gforth" environment? [IF] s" 0.5.0" s
 [ELSE]
 : parse-string ( addr u -- )
     evaluate-input cell new-tib #tib ! tib !
-    ['] parse-line catch pop-file rethrow ;
+    ['] parse-line catch pop-file throw ;
 [THEN] [THEN]
 
 Variable expand-link
@@ -354,7 +354,7 @@ Variable expand-postfix
 
 \ line handling
 
-: char? ( -- c )  >in @ char swap >in ! ;
+: char? ( -- c )  >in @ char swap >in ! $FF umin ;
 
 : parse-tag ( addr u char -- )
     >r r@ parse .type
@@ -456,9 +456,10 @@ Create nav-buf 0 c,
     bounds ?DO
 	I c@  dup 'A 'Z 1+ within IF  bl + nav+
 	ELSE  dup 'a 'z 1+ within IF  nav+
-	ELSE  dup '0 '9 1+ within IF  nav+
-	ELSE  dup  bl = swap '- = or IF  '- nav+
-	THEN  THEN  THEN  THEN
+	    ELSE  dup '0 '9 1+ within IF  nav+
+		ELSE  dup  bl = over '- = or IF  '- nav+
+		    ELSE  nav+
+		    THEN  THEN  THEN  THEN
     LOOP ;
 : >nav ( addr u -- addr' u' )
     nav-name $!  create-navs @ 0=
@@ -519,7 +520,7 @@ true Value toc-image
 		3  OF  s" down" class=  ENDOF
 	    ENDCASE
 	THEN
-	s" a" tag parse-string s" a" /tag
+	s" a" tag parse-string s" a" /tag ." <!--" cr ." -->"
     THEN
     rdrop
     1 toc-index +! toc-index @ /toc-line mod 0=