--- gforth/wf.fs	2001/07/17 13:14:12	1.3
+++ gforth/wf.fs	2001/07/24 21:21:26	1.8
@@ -20,6 +20,9 @@ s" " tag-option $!
     s' "' tag-option $+! ;
 : href= ( addr u -- )  s" href" opt ;
 : src=  ( addr u -- )  s" src" opt ;
+: alt=  ( addr u -- )  s" alt" opt ;
+: width=  ( addr u -- )  s" width" opt ;
+: height=  ( addr u -- )  s" height" opt ;
 : align= ( addr u -- ) s" align" opt ;
 : mailto: ( addr u -- ) s'  href="mailto:' tag-option $+!
     tag-option $+! s' "' tag-option $+! ;
@@ -40,6 +43,65 @@ Variable envs 10 0 [DO] 0 , [LOOP]
 : -envs envs @ 0 ?DO  -env cr  LOOP ;
 : >env ( addr u -- ) +env env env? ;
 
+\ alignment
+
+: >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
+    ENDCASE ;
+
+\ image handling
+
+Create imgbuf $20 allot
+
+Create pngsig $89 c, $50 c, $4E c, $47 c, $0D c, $0A c, $1A c, $0A c,
+Create jfif   $FF c, $D8 c, $FF c, $E0 c, $00 c, $10 c, $4A c, $46 c,
+              $49 c, $46 c,
+
+: b@ ( addr -- x )   0 swap 4 bounds ?DO  8 lshift I c@ +  LOOP ;
+: 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 ;
+: gif-size ( -- w h )
+    imgbuf 6 + c@ imgbuf 7 + c@ 8 lshift +
+    imgbuf 8 + c@ imgbuf 9 + c@ 8 lshift + ;
+
+: png? ( -- flag )
+    pngsig 8 imgbuf over compare 0= ;
+: png-size ( -- w h )
+    imgbuf $10 + b@ imgbuf $14 + b@ ;
+
+: jpg? ( -- flag )
+    jfif 10 imgbuf over compare 0= ;
+: jpg-size ( fd -- w h )  >r
+    2.  BEGIN
+	2dup r@ reposition-file throw
+	imgbuf $10 r@ read-file throw 0<>
+	imgbuf bw@ $FFC0 $FFD0 within 0= and  WHILE
+	imgbuf 2 + bw@ 2 + 0 d+  REPEAT
+    2drop imgbuf 5 + bw@ imgbuf 7 + bw@  rdrop ;
+
+: img-size ( fd -- w h )  >r
+    gif? IF  gif-size  rdrop EXIT  THEN
+    jpg? IF  r> jpg-size  EXIT  THEN
+    png? IF  png-size  rdrop EXIT  THEN
+    0 0 ;
+
+: .img-size ( addr u -- )
+    r/o open-file throw >r
+    imgbuf $20 r@ read-file throw drop
+    r@ img-size
+    r> close-file throw
+    ?dup IF  0 <# #S #> width=   THEN
+    ?dup IF  0 <# #S #> height=  THEN ;
+
 \ link creation
 
 Variable link
@@ -48,18 +110,32 @@ Variable iconpath
 
 Variable do-size
 
-: link-icon? ( -- )
-    link $@ '. $split link-suffix $! 2drop s" .*" link-suffix $+!
+Defer parse-line
+
+: alt-suffix ( -- )
+    link-suffix $@len 2 - link-suffix $!len
+    s" [" link-suffix 0 $ins
+    s" ]" link-suffix $+!
+    link-suffix $@ alt= ;
+
+: get-icon ( addr u -- )  iconpath @ IF  2drop  EXIT  THEN
+    link-suffix $! s" .*" link-suffix $+!
     s" icons" open-dir throw >r
     BEGIN
 	pad $100 r@ read-dir throw  WHILE
 	pad swap 2dup link-suffix $@ filename-match
 	IF  s" icons/" iconpath $! iconpath $+!
-	    iconpath $@ src= s" img" tag true
+	    iconpath $@ 2dup .img-size src=
+	    alt-suffix  s" img" tag true
 	ELSE  2drop  false  THEN
-    UNTIL  ELSE  drop  THEN \ ELSE  '( emit link-suffix $@ 2 - type ') emit  THEN
+    UNTIL  ELSE  drop  THEN
     r> close-dir throw ;
 
+: link-icon? ( -- )  iconpath @  IF  iconpath $off  THEN
+    link $@
+    BEGIN  '. $split 2swap 2drop dup  WHILE
+	2dup get-icon  REPEAT  2drop ;
+
 : link-size? ( -- )  do-size @ 0= ?EXIT
     link $@ r/o open-file IF  drop  EXIT  THEN >r
     r@ file-size throw $400 um/mod nip ."  (" 0 u.r ." k)"
@@ -69,31 +145,55 @@ Variable do-size
     do-size off
     over c@ '% = over 0> and IF  do-size on  1 /string  THEN ;
 
+: parse-string ( addr u -- )
+    evaluate-input cell new-tib #tib ! tib !
+    ['] parse-line catch pop-file throw ;
+
 : .link ( -- )  '[ parse type '] parse '| $split
     link-options link $!
     link $@len 0= IF  2dup link $! s" .html" link $+!  THEN
-    link-icon? link $@ href= s" a" tagged
-    link-size? ;
+    link-icon? link $@ href= s" a" tag
+    parse-string s" a" /tag  link-size? ;
+
+: .img ( -- ) '{ parse type '} parse '| $split
+    dup IF  2swap alt=  ELSE  2drop  THEN
+    tag-option $@len >r over c@ >align tag-option $@len r> = 1+ /string
+    2dup .img-size src= s" img" tag ;
 
 \ line handling
 
+: char? ( -- c )  >in @ char swap >in ! ;
 : parse-tag ( addr u char -- )
     >r r@ parse type
     r> parse 2swap tagged ;
 
-: .bold ( -- )  s" b" '* parse-tag ;
-: .em   ( -- )  s" em" '_ parse-tag ;
+: .text ( -- ) 	>in @ >r char drop
+    source r@ /string >in @ r> - nip type ;
+
+Create do-words  $100 0 [DO] ' .text , [LOOP]
+
+: bind-char ( xt -- )  char cells do-words + ! ;
+
+: char>tag ( -- ) char >r
+:noname bl sword postpone SLiteral r@ postpone Literal
+    postpone parse-tag postpone ; r> cells do-words + ! ;
 
-: parse-line ( -- )
-    BEGIN  >in @ >r char r> >in !
-	CASE
-	    '* OF .bold ENDOF
-	    '_ OF .em   ENDOF
-	    '[ OF .link ENDOF
-	    >in @ >r char drop
-	    source r@ /string >in @ r> - nip type
-	ENDCASE
-	source nip >in @ = UNTIL ;
+char>tag * b
+char>tag _ em
+char>tag # code
+
+' .link bind-char [
+' .img  bind-char {
+
+: do-word ( char -- )  cells do-words + perform ;
+
+:noname ( -- )
+    BEGIN  char? do-word source nip >in @ = UNTIL ; is parse-line
+
+: parse-to ( char -- ) >r
+    BEGIN  char? dup r@ <> WHILE
+	do-word source nip >in @ = UNTIL  ELSE  drop  THEN
+    r> parse type ;
 
 \ paragraph handling
 
@@ -106,23 +206,32 @@ Variable do-size
 
 \ handle global tags
 
+Variable indentlevel
+: indent ( n -- )  indentlevel @
+    2dup < IF  2dup swap DO  -env -env  LOOP  THEN
+    2dup > IF  2dup      DO  s" dl" >env  LOOP  THEN
+    2dup = IF  -env  THEN
+    drop indentlevel ! s" dt" >env ;
+: +indent ( -- )  -env s" dd" >env ;
+
 wordlist constant longtags
 
 Variable end-sec
 
 longtags set-current
 
-: --- cr s" hr" tag cr ;
-: * s" h1" line ;
-: ** s" h2" line ;
-: *** s" h3" line ;
+: --- 1 indent cr s" hr" tag cr +indent ;
+: *   1 indent s" h1" line +indent ;
+: **  1 indent s" h2" line +indent ;
+: *** 2 indent s" h3" line +indent ;
 : - s" ul" env s" li" par ;
 : + s" ol" env s" li" par ;
 : << +env ;
 : <* s" center" >env ;
 : >> -env ;
 : *> -env ;
-: . end-sec on ;
+: :: also forth interpret previous ;
+: . end-sec on indentlevel off ;
 : \ postpone \ ;
 
 definitions
@@ -132,40 +241,37 @@ definitions
 Variable table-format
 Variable table#
 
-: |tag  table-format $@ table# @ /string drop c@
-    CASE
-	'l OF  s" left"   align=  ENDOF
-	'r OF  s" right"  align=  ENDOF
-	'c OF  s" center" align=  ENDOF
-    ENDCASE  >env  1 table# +! ;
+: |tag  table-format $@ table# @ /string drop c@ >align
+    >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 ;
 : line|  -env -env cr ;
 
+: next-char ( -- char )  source drop >in @ + c@ ;
+
 longtags set-current
 
 : <| s" table" >env bl sword table-format $! ;
 : |> -env ;
 : +| |line
     BEGIN
-	|h '| parse type
-	>in @ >r char r> >in ! '+ =  UNTIL line| ;
+	|h '| parse-to next-char '+ =  UNTIL line| ;
 : -| |line
     BEGIN
-	|d '| parse type
-	>in @ >r char r> >in ! '- =  UNTIL line| ;
+	|d '| parse-to next-char '- =  UNTIL line| ;
 
 definitions
 
 \ parse a section
 
+: section-line ( -- )  >in off
+    bl sword find-name
+    ?dup IF  name>int execute
+    ELSE  source nip IF  >in off s" p" par  THEN  THEN ;
 : refill-loop ( -- )  end-sec off
-    BEGIN  refill  WHILE  >in off
-	bl sword find-name
-	?dup IF  name>int execute
-	ELSE  source nip IF  >in off s" p" par  THEN  THEN
-	end-sec @ UNTIL  THEN ;
+    BEGIN  refill  WHILE
+	section-line end-sec @ UNTIL  THEN ;
 : parse-section ( -- )
     get-order  longtags 1 set-order  refill-loop set-order ;
 
@@ -193,22 +299,52 @@ Variable mail-name
 
 \ top word
 
+: parse" ( -- addr u ) '" parse 2drop '" parse ;
+
 : maintainer
-    bl sword mail $! '" parse 2drop '" parse mail-name $! ;
+    bl sword mail $! parse" mail-name $! ;
+
+Variable style$
+: style> style$ @ 0= IF  s" " style$ $!  THEN  style$ $@ tag-option $! ;
+: >style tag-option $@ style$ $! s" " tag-option $! ;
+
+: style  style> opt >style ;
+: background ( -- )  parse" s" background" style ;
+: text ( -- )  parse" s" text" style ;
+    warnings @ warnings off
+: link ( -- )  parse" s" link" style ;
+    warnings !
+: vlink ( -- ) parse" s" vlink" style ;
+: marginheight ( -- ) parse" s" marginheight" style ;
 
 : wf ( -- )
     outfile-id >r
     bl sword r/w create-file throw to outfile-id
-    '" parse 2drop '" parse .title
-    +env s" body" env
+    parse" .title
+    +env style> s" body" env env?
     ['] parse-section catch .trailer
     outfile-id close-file throw
     r> to outfile-id
     dup 0< IF  throw  ELSE  drop  THEN ;
 
+: eval-par ( addr u -- )
+  s" wf-temp.wf" r/w create-file throw >r
+  r@ write-file r> close-file throw
+  push-file s" wf-temp.wf" r/o open-file throw loadfile !
+  parse-par parse-section
+  loadfile @ close-file swap 2dup or
+  pop-file  drop throw throw
+  s" wf-temp.wf" delete-file throw ;
+
 \ simple text data base
 
 : 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
+	r@ $@len IF  $lf count r@ $+!  THEN  r@ $+!
+	refill 0= UNTIL  ELSE  2drop  THEN
+    rdrop ;
 
 Variable last-entry
 Variable field#
@@ -224,5 +360,7 @@ Variable field#
 
 : field:  Create field# @ , 1 field# +!
 DOES> @ cells last-entry @ + get-rest ;
+: par:  Create field# @ , 1 field# +!
+DOES> @ cells last-entry @ + get-par ;
 
 : >field  ' >body @ cells postpone Literal postpone + ; immediate