--- gforth/wf.fs	2001/08/05 22:23:45	1.10
+++ gforth/wf.fs	2002/07/26 08:35:15	1.15
@@ -2,6 +2,13 @@
 
 require string.fs
 
+: -scan ( addr u char -- addr' u' )
+  >r  BEGIN  dup  WHILE  1- 2dup + c@ r@ =  UNTIL  THEN
+  rdrop ;
+: -$split ( addr u char -- addr1 u1 addr2 u2 )
+  >r 2dup r@ -scan 2dup + c@ r> = negate over + >r
+  2swap r> /string ;
+
 \ tag handling
 
 : .' '' parse postpone SLiteral postpone type ; immediate
@@ -30,6 +37,7 @@ s" " tag-option $!
 
 \ environment handling
 
+Variable end-sec
 Variable oldenv
 Variable envs 30 0 [DO] 0 , [LOOP]
 
@@ -40,20 +48,37 @@ Variable envs 30 0 [DO] 0 , [LOOP]
     2dup < IF  env$ cell+ $@ /tag  env$ cell+ $off  THEN
     drop oldenv ! ;
 : +env  1 envs +! ;
-: -env -1 envs +! env? ;
+: -env end-sec @ envs @ 2 > or  IF  -1 envs +! env?  THEN ;
 : -envs envs @ 0 ?DO  -env cr  LOOP ;
 : >env ( addr u -- ) +env env env? ;
 
 \ alignment
 
+Variable table-format
+Variable table#
+Variable table-start
+
 : >align ( c -- )
     CASE
+	'l OF  s" left"      align=  ENDOF
+	'r OF  s" right"     align=  ENDOF
+	'c OF  s" center"    align=  ENDOF
+	'< OF  s" left"      align=  ENDOF
+	'> OF  s" right"     align=  ENDOF
+	'= OF  s" center"    align=  ENDOF
+	'~ OF  s" absmiddle" align=  ENDOF
+    ENDCASE ;
+
+: >talign ( c -- )
+    CASE
 	'l OF  s" left"   align=  ENDOF
 	'r OF  s" right"  align=  ENDOF
 	'c OF  s" center" align=  ENDOF
 	'< OF  s" left"   align=  ENDOF
 	'> OF  s" right"  align=  ENDOF
-	'| OF  s" center" align=  ENDOF
+	'= OF  s" center" align=  ENDOF
+	digit? IF  0 <# #S #> s" rowspan" opt
+	    table# @ 1+ table-start ! THEN 0
     ENDCASE ;
 
 : >border ( c -- )
@@ -121,6 +146,13 @@ Variable do-icon
 
 Defer parse-line
 
+: .img ( addr u -- ) dup >r '| -$split  dup r> = IF  2swap  THEN 
+    dup IF  2swap alt=  ELSE  2drop  THEN
+    tag-option $@len >r over c@ >align  tag-option $@len r> = 1+ /string
+    tag-option $@len >r over c@ >border tag-option $@len r> = 1+ /string
+    2dup .img-size src= s" img" tag ;
+: >img ( -- )   '{ parse type '} parse .img ;
+
 : alt-suffix ( -- )
     link-suffix $@len 2 - link-suffix $!len
     s" [" link-suffix 0 $ins
@@ -156,31 +188,34 @@ Defer parse-line
     link-sig $@ r/o open-file IF  drop  EXIT  THEN
     close-file throw
     ."  (" link-sig $@ href= s" a" tag
-    s" icons/sig.gif" '- >border src= s" img" tag ." sig" s" /a" tag ." )" ;
+    s" |-icons/sig.gif" .img ." sig" s" /a" tag ." )" ;
 
 : link-options ( addr u -- addr' u' )
     do-size off  do-icon on
     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" compare 0= [IF] 
+: parse-string ( c-addr u -- ) \ core,block
+    loadfilename# @ >r
+    1 loadfilename# ! \ "*evaluated string*"
+    push-file #tib ! >tib !
+    >in off blk off loadfile off -1 loadline !
+    ['] parse-line catch
+    pop-file r> loadfilename# ! throw ;
+[ELSE]
 : parse-string ( addr u -- )
     evaluate-input cell new-tib #tib ! tib !
     ['] parse-line catch pop-file throw ;
+[THEN] [THEN]
 
-: .link ( addr u -- ) '| $split 
+: .link ( addr u -- ) dup >r '| -$split  dup r> = IF  2swap  THEN 
     link-options link $!
     link $@len 0= IF  2dup link $! s" .html" link $+!  THEN
     link $@ href= s" a" tag link-icon?
     parse-string s" a" /tag link-size? link-sig? ;
 : >link ( -- )  '[ parse type '] parse .link ;
 
-: .img ( addr u -- ) '| $split 
-    dup IF  2swap alt=  ELSE  2drop  THEN
-    tag-option $@len >r over c@ >align  tag-option $@len r> = 1+ /string
-    tag-option $@len >r over c@ >border tag-option $@len r> = 1+ /string
-    2dup .img-size src= s" img" tag ;
-: >img ( -- )   '{ parse type '} parse .img ;
-
 \ line handling
 
 : char? ( -- c )  >in @ char swap >in ! ;
@@ -208,12 +243,15 @@ Create do-words  $100 0 [DO] ' .text , [
 :noname bl sword postpone SLiteral r@ postpone Literal
     postpone parse-tag postpone ; r> cells do-words + ! ;
 
+: >tag '\ parse type '\ parse tag ;
+
 char>tag * b
 char>tag _ em
 char>tag # code
 
 ' >link bind-char [
 ' >img  bind-char {
+' >tag  bind-char \
 
 : do-word ( char -- )  cells do-words + perform ;
 
@@ -271,31 +309,57 @@ Variable toc-link
 : >last ( addr link -- link' )
     BEGIN  dup @  WHILE  @  REPEAT  ! 0 ;
 
-: toc, ( n -- ) , '| parse here 0 , $! here 0 , get-rest ;
+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, ;
 : sub-toc  align here toc-link >last , 3 toc, ;
+: new-toc  toc-link off ;
 
 Variable toc-name
 
 : .toc-entry ( toc flag -- )
     swap cell+ dup @ swap cell+ dup cell+ $@ 2dup href= s" a" tag
-    1 /string toc-name $@ compare >r
+    '# scan 1 /string toc-name $@ compare >r
     $@ .img swap
     IF
 	case
-	    2 of  s" -icons/arrow_up.jpg" .img  endof
+	    2 of  s" ^]|-icons/arrow_up.jpg" .img  endof
 	    3 of
-		r@ 0= IF s" -icons/circle.jpg"
-		    ELSE s" -icons/arrow_down.jpg"  THEN  .img  endof
+		r@ 0= IF s" *]|-icons/circle.jpg"
+		    ELSE s" v]|-icons/arrow_down.jpg"  THEN  .img  endof
 	endcase
     ELSE
 	case
-	    0 of  s" -icons/arrow_up.jpg" .img  endof
-	    1 of  s" -icons/arrow_right.jpg" .img  endof
-	    2 of  s" -icons/circle.jpg" .img  endof
-	    3 of  s" -icons/arrow_down.jpg" .img  endof
+	    0 of  s" ^]|-icons/arrow_up.jpg" .img  endof
+	    1 of  s" >]|-icons/arrow_right.jpg" .img  endof
+	    2 of  s" *]|-icons/circle.jpg" .img  endof
+	    3 of  s" v]|-icons/arrow_down.jpg" .img  endof
 	endcase
     THEN
     s" a" /tag rdrop
@@ -305,9 +369,9 @@ Variable toc-name
 	toc-name $! toc-name $@ name= s" " s" a" tagged  2
     THEN  >r
     toc-link  BEGIN  @ dup  WHILE
-	dup cell+ @ 3 = r@ 0= and IF  rdrop 1 >r s" br" tag  THEN
+	dup cell+ @ 3 = r@ 0= and IF  rdrop 1 >r s" br" tag cr  THEN
 	dup cell+ @ r@ >= IF  dup r@ 2 = .toc-entry  THEN
-	dup cell+ @ 2 = r@ 2 = and IF  s" br" tag  THEN
+	dup cell+ @ 2 = r@ 2 = and IF  s" br" tag cr  THEN
     REPEAT  drop rdrop  cr ;
 
 \ handle global tags
@@ -317,12 +381,10 @@ Variable indentlevel
     2dup < IF swap DO  -env -env  LOOP  EXIT THEN
     2dup > IF      DO  s" dl" >env s" dt" >env  LOOP EXIT THEN
     2dup = IF drop IF  -env  s" dt" >env  THEN THEN ;
-: +indent ( -- )  -env s" dd" >env ;
+: +indent ( -- )  indentlevel @ IF  -env s" dd" >env  THEN ;
 
 wordlist constant longtags
 
-Variable end-sec
-
 longtags set-current
 
 : --- 0 indent cr s" hr" tag cr +indent ;
@@ -330,6 +392,7 @@ longtags set-current
 : **  1 indent s" h2" line +indent ;
 : *** 2 indent s" h3" line +indent ;
 : -- 0 indent cr print-toc ;
+: && 0 parse name= s" " s" a" tagged ;
 : - s" ul" env s" li" par ;
 : + s" ol" env s" li" par ;
 : << +env ;
@@ -339,7 +402,7 @@ longtags set-current
 : >> -env ;
 : *> -env ;
 : :: interpret ;
-: . end-sec on indentlevel off ;
+: . end-sec on 0 indent ;
 : :code s" pre" >env
     BEGIN  source >in @ /string type cr refill  WHILE
 	source s" :endcode" compare 0= UNTIL  THEN
@@ -350,22 +413,20 @@ definitions
     
 \ Table
 
-Variable table-format
-Variable table#
-
-: |tag  table-format $@ table# @ /string drop c@ >align
+: |tag  table-format $@ table# @ /string drop c@ >talign
     >env  1 table# +! ;
-: |d  table# @ IF  -env  THEN  s" td" |tag ;
-: |h  table# @ IF  -env  THEN  s" th" |tag ;
-: |line  s" tr" >env  table# off ;
+: |d  table# @ table-start @ > IF  -env  THEN  s" td" |tag ;
+: |h  table# @ table-start @ > IF  -env  THEN  s" th" |tag ;
+: |line  s" tr" >env  table-start @ table# ! ;
 : line|  -env -env cr ;
 
 : next-char ( -- char )  source drop >in @ + c@ ;
 
 longtags set-current
 
-: <| s" table" >env bl sword table-format $! ;
-: |> -env ;
+: <| bl sword table-format $! table-start off bl sword
+    dup IF  s" border" opt  ELSE  2drop  THEN s" table" >env ;
+: |> -env -env cr cr ;
 : +| |line
     BEGIN
 	|h '| parse-to next-char '+ =  UNTIL line| ;
@@ -400,9 +461,11 @@ definitions
 
 Variable mail
 Variable mail-name
+Variable orig-date
 
 : .trailer
     s" address" >env s" center" >env
+    orig-date @ IF  ." Created " orig-date $@ type ." . "  THEN
     ." Last modified: " time&date rot 0 u.r swap 1-
     s" janfebmaraprmayjunjulaugsepoctnovdec" rot 3 * /string 3 min type
     0 u.r ."  by "
@@ -413,8 +476,10 @@ Variable mail-name
 
 : parse" ( -- addr u ) '" parse 2drop '" parse ;
 
-: maintainer
+: maintainer ( -- )
     bl sword mail $! parse" mail-name $! ;
+: created ( -- )
+    bl sword orig-date $! ;
 
 Variable style$
 : style> style$ @ 0= IF  s" " style$ $!  THEN  style$ $@ tag-option $! ;