--- gforth/wf.fs 2001/07/16 14:59:51 1.1
+++ gforth/wf.fs 2001/07/17 13:14:12 1.3
@@ -5,9 +5,24 @@ require string.fs
\ tag handling
: .' '' parse postpone SLiteral postpone type ; immediate
+: s' '' parse postpone SLiteral ; immediate
-: tag ( addr u -- ) '< emit type '> emit ;
+Variable tag-option
+s" " tag-option $!
+
+: tag ( addr u -- ) '< emit type tag-option $@ type '> emit
+ s" " tag-option $! ;
: /tag ( addr u -- ) '< emit '/ emit type '> emit ;
+: tagged ( addr1 u1 addr2 u2 -- ) 2dup 2>r tag type 2r> /tag ;
+
+: opt ( addr u opt u -- ) s" " tag-option $+!
+ tag-option $+! s' ="' tag-option $+! tag-option $+!
+ s' "' tag-option $+! ;
+: href= ( addr u -- ) s" href" opt ;
+: src= ( addr u -- ) s" src" opt ;
+: align= ( addr u -- ) s" align" opt ;
+: mailto: ( addr u -- ) s' href="mailto:' tag-option $+!
+ tag-option $+! s' "' tag-option $+! ;
\ environment handling
@@ -23,11 +38,15 @@ Variable envs 10 0 [DO] 0 , [LOOP]
: +env 1 envs +! ;
: -env -1 envs +! env? ;
: -envs envs @ 0 ?DO -env cr LOOP ;
+: >env ( addr u -- ) +env env env? ;
\ link creation
Variable link
Variable link-suffix
+Variable iconpath
+
+Variable do-size
: link-icon? ( -- )
link $@ '. $split link-suffix $! 2drop s" .*" link-suffix $+!
@@ -35,26 +54,32 @@ Variable link-suffix
BEGIN
pad $100 r@ read-dir throw WHILE
pad swap 2dup link-suffix $@ filename-match
- IF .' 
' true
+ IF s" icons/" iconpath $! iconpath $+!
+ iconpath $@ src= s" img" tag true
ELSE 2drop false THEN
- UNTIL ELSE '( emit link-suffix $@ 2 - type ') emit THEN
+ UNTIL ELSE drop THEN \ ELSE '( emit link-suffix $@ 2 - type ') emit THEN
r> close-dir throw ;
-: link-size? ( -- )
+: 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)"
r> close-file throw ;
-: .link ( -- ) '[ parse type '] parse '| $split link $!
+: link-options ( addr u -- addr' u' )
+ do-size off
+ over c@ '% = over 0> and IF do-size on 1 /string THEN ;
+
+: .link ( -- ) '[ parse type '] parse '| $split
+ link-options link $!
link $@len 0= IF 2dup link $! s" .html" link $+! THEN
- link-icon? .' ' type s" a" /tag
+ link-icon? link $@ href= s" a" tagged
link-size? ;
\ line handling
: parse-tag ( addr u char -- )
>r r@ parse type
- 2dup tag r> parse type /tag ;
+ r> parse 2swap tagged ;
: .bold ( -- ) s" b" '* parse-tag ;
: .em ( -- ) s" em" '_ parse-tag ;
@@ -87,18 +112,51 @@ Variable end-sec
longtags set-current
-: --- s" hr" tag ;
+: --- cr s" hr" tag cr ;
: * s" h1" line ;
: ** s" h2" line ;
: *** s" h3" line ;
: - s" ul" env s" li" par ;
: + s" ol" env s" li" par ;
: << +env ;
+: <* s" center" >env ;
: >> -env ;
+: *> -env ;
: . end-sec on ;
: \ postpone \ ;
definitions
+
+\ Table
+
+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# +! ;
+: |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 ;
+
+longtags set-current
+
+: <| s" table" >env bl sword table-format $! ;
+: |> -env ;
+: +| |line
+ BEGIN
+ |h '| parse type
+ >in @ >r char r> >in ! '+ = UNTIL line| ;
+: -| |line
+ BEGIN
+ |d '| parse type
+ >in @ >r char r> >in ! '- = UNTIL line| ;
+
+definitions
\ parse a section
@@ -115,10 +173,9 @@ definitions
: .title ( addr u -- )
.' ' cr
- s" html" +env env env?
- s" head" +env env env?
+ s" html" >env s" head" >env
.' ' cr
- s" title" tag type s" title" /tag cr
+ s" title" tagged cr
-env ;
\ HTML trailer
@@ -127,12 +184,11 @@ Variable mail
Variable mail-name
: .trailer
- s" address" tag
- ." Changed last on " time&date rot 0 u.r swap 1-
+ s" address" >env s" center" >env
+ ." Last modified: " time&date rot 0 u.r swap 1-
s" janfebmaraprmayjunjulaugsepoctnovdec" rot 3 * /string 3 min type
- 0 u.r
- .' by ' mail-name $@ type s" a" /tag
- s" address" /tag
+ 0 u.r ." by "
+ mail $@ mailto: mail-name $@ s" a" tagged
-envs ;
\ top word
@@ -150,3 +206,23 @@ Variable mail-name
r> to outfile-id
dup 0< IF throw ELSE drop THEN ;
+\ simple text data base
+
+: get-rest ( addr -- ) 0 parse -trailing rot $! ;
+
+Variable last-entry
+Variable field#
+
+: table: ( xt n -- ) Create , , 1 field# !
+ DOES> 2@ >in @ >r longtags set-current
+ Create definitions swap , r> >in !
+ here last-entry !
+ dup 0 DO 0 , LOOP
+ 1 DO s" " last-entry @ I cells + $! LOOP
+ last-entry @ get-rest
+ DOES> dup cell+ swap perform ;
+
+: field: Create field# @ , 1 field# +!
+DOES> @ cells last-entry @ + get-rest ;
+
+: >field ' >body @ cells postpone Literal postpone + ; immediate