--- gforth/wf.fs	2001/09/06 18:37:23	1.13
+++ gforth/wf.fs	2003/01/20 19:17:59	1.17
@@ -99,19 +99,19 @@ Create jfif   $FF c, $D8 c, $FF c, $E0 c
 : bw@ ( addr -- x )  0 swap 2 bounds ?DO  8 lshift I c@ +  LOOP ;
 
 : gif? ( -- flag )
-    s" GIF89a" imgbuf over compare 0=
-    s" GIF87a" imgbuf over compare 0= or ;
+    s" GIF89a" imgbuf over str=
+    s" GIF87a" imgbuf over str= or ;
 : gif-size ( -- w h )
     imgbuf 8 + c@ imgbuf 9 + c@ 8 lshift +
     imgbuf 6 + c@ imgbuf 7 + c@ 8 lshift + ;
 
 : png? ( -- flag )
-    pngsig 8 imgbuf over compare 0= ;
+    pngsig 8 imgbuf over str= ;
 : png-size ( -- w h )
     imgbuf $14 + b@ imgbuf $10 + b@ ;
 
 : jpg? ( -- flag )
-    jfif 10 imgbuf over compare 0= ;
+    jfif 10 imgbuf over str= ;
 : jpg-size ( fd -- w h )  >r
     2.  BEGIN
 	2dup r@ reposition-file throw
@@ -195,9 +195,19 @@ Defer parse-line
     over c@ '% = over 0> and IF  do-size on  1 /string  THEN
     over c@ '\ = over 0> and IF  do-icon off 1 /string  THEN ;
 
+s" Gforth" environment? [IF] s" 0.5.0" str= [IF] 
+: parse-string ( c-addr u -- ) \ core,block
+    loadfilename 2@ 2>r
+    s" *evaluated string*" loadfilename 2! \ "*evaluated string*"
+    push-file #tib ! >tib !
+    >in off blk off loadfile off -1 loadline !
+    ['] parse-line catch
+    pop-file 2r> loadfilename 2! throw ;
+[ELSE]
 : parse-string ( addr u -- )
     evaluate-input cell new-tib #tib ! tib !
     ['] parse-line catch pop-file throw ;
+[THEN] [THEN]
 
 : .link ( addr u -- ) dup >r '| -$split  dup r> = IF  2swap  THEN 
     link-options link $!
@@ -287,7 +297,7 @@ wordlist Constant autoreplacements
 : get-rest ( addr -- ) 0 parse -trailing rot $! ;
 Create $lf 1 c, #lf c,
 : get-par ( addr -- )  >r  s" " r@ $+!
-    BEGIN  0 parse 2dup s" ." compare  WHILE
+    BEGIN  0 parse 2dup s" ." str= 0=  WHILE
 	r@ $@len IF  $lf count r@ $+!  THEN  r@ $+!
 	refill 0= UNTIL  ELSE  2drop  THEN
     rdrop ;
@@ -299,7 +309,32 @@ Variable toc-link
 : >last ( addr link -- link' )
     BEGIN  dup @  WHILE  @  REPEAT  ! 0 ;
 
-: toc, ( n -- ) , 0 parse '| -$split 2swap here 0 , $! here 0 , $! ;
+Variable create-navs
+Variable nav$
+Variable nav-name
+Variable nav-file
+Create nav-buf 0 c,
+: nav+ ( char -- )  nav-buf c! nav-buf 1 nav-file $+! ;
+
+: >nav ( addr u -- addr' u' )
+    nav-name $!  create-navs @ 0=
+    IF  s" navigate/nav.scm" r/w create-file throw create-navs !  THEN
+    s' (script-fu-nav-file "' nav$ $! nav-name $@ nav$ $+!
+    s' " "./navigate/' nav$ $+!  s" " nav-file $!
+    nav-name $@ 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
+	LOOP
+    nav-file $@ nav$ $+! s' .jpg")' nav$ $+!
+    nav$ $@ create-navs @ write-line throw
+    s" [" nav$ $! nav-name $@ nav$ $+!
+    s" |-navigate/" nav$ $+! nav-file $@ nav$ $+! s" .jpg" nav$ $+!
+    nav$ $@ ;
+
+: toc, ( n -- ) , '| parse >nav here 0 , $! 0 parse here 0 , $! ;
 : up-toc   align here toc-link >last , 0 toc, ;
 : top-toc  align here toc-link >last , 1 toc, ;
 : this-toc align here toc-link >last , 2 toc, ;
@@ -370,7 +405,7 @@ longtags set-current
 : . end-sec on 0 indent ;
 : :code s" pre" >env
     BEGIN  source >in @ /string type cr refill  WHILE
-	source s" :endcode" compare 0= UNTIL  THEN
+	source s" :endcode" str= UNTIL  THEN
   -env ;
 : \ postpone \ ;