--- gforth/wf.fs 2001/07/23 13:16:11 1.7 +++ gforth/wf.fs 2001/07/29 20:19:25 1.9 @@ -84,7 +84,7 @@ Create jfif $FF c, $D8 c, $FF c, $E0 c 2. BEGIN 2dup r@ reposition-file throw imgbuf $10 r@ read-file throw 0<> - imgbuf bw@ $FFC0 <> and WHILE + imgbuf bw@ $FFC0 $FFD0 within 0= and WHILE imgbuf 2 + bw@ 2 + 0 d+ REPEAT 2drop imgbuf 5 + bw@ imgbuf 7 + bw@ rdrop ; @@ -109,6 +109,9 @@ Variable link-suffix Variable iconpath Variable do-size +Variable do-icon + +Defer parse-line : alt-suffix ( -- ) link-suffix $@len 2 - link-suffix $!len @@ -129,8 +132,11 @@ Variable do-size UNTIL ELSE drop THEN r> close-dir throw ; -: link-icon? ( -- ) iconpath @ IF iconpath $off THEN - link '. ['] get-icon $iter ; +: link-icon? ( -- ) do-icon @ 0= ?EXIT + iconpath @ IF iconpath $off THEN + link $@ + 1- c@ '/ = IF s" index.html" ELSE link $@ THEN + 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 @@ -138,19 +144,26 @@ Variable do-size r> close-file throw ; : link-options ( addr u -- addr' u' ) - do-size off - over c@ '% = over 0> and IF do-size on 1 /string THEN ; + 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 ; + +: parse-string ( addr u -- ) + evaluate-input cell new-tib #tib ! tib ! + ['] parse-line catch pop-file throw ; -: .link ( -- ) '[ parse type '] parse '| $split +: .link ( addr u -- ) '| $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? ; +: >link ( -- ) '[ parse type '] parse .link ; -: .img ( -- ) '{ parse type '} parse '| $split +: .img ( addr u -- ) '| $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 ; +: >img ( -- ) '{ parse type '} parse .img ; \ line handling @@ -160,10 +173,19 @@ Variable do-size r> parse 2swap tagged ; : .text ( -- ) >in @ >r char drop - source r@ /string >in @ r> - nip type ; + source r@ /string >in @ r> - nip + bounds ?DO I c@ + case + '& of ." &" endof + '< of ." <" endof + dup emit + endcase + LOOP ; Create do-words $100 0 [DO] ' .text , [LOOP] +:noname '( emit 1 >in +! ; '( cells do-words + ! + : bind-char ( xt -- ) char cells do-words + ! ; : char>tag ( -- ) char >r @@ -174,47 +196,80 @@ char>tag * b char>tag _ em char>tag # code -' .link bind-char [ -' .img bind-char { +' >link bind-char [ +' >img bind-char { : do-word ( char -- ) cells do-words + perform ; -: parse-line ( -- ) - BEGIN char? do-word source nip >in @ = UNTIL ; +: word? ( -- addr u ) >in @ >r bl sword r> >in ! ; + +wordlist Constant autoreplacements + +:noname ( -- ) + BEGIN char? do-word source nip >in @ = UNTIL ; is parse-line + +: parse-line+ ( -- ) + BEGIN + word? autoreplacements search-wordlist + IF execute bl sword 2drop + source >in @ 1- /string drop c@ bl = >in +! + ELSE char? do-word THEN + source nip >in @ = UNTIL ; : parse-to ( char -- ) >r BEGIN char? dup r@ <> WHILE do-word source nip >in @ = UNTIL ELSE drop THEN r> parse type ; +\ autoreplace + +: autoreplace ( <[string|url]> -- ) + get-current autoreplacements set-current + Create set-current + here 0 , '[ parse 2drop '] parse rot $! + DOES> $@ .link ; + \ paragraph handling : parse-par ( -- ) - BEGIN parse-line cr refill WHILE + BEGIN parse-line+ cr refill WHILE source nip 0= UNTIL THEN ; : par ( addr u -- ) env? 2dup tag parse-par /tag cr cr ; -: line ( addr u -- ) env? 2dup tag parse-line /tag cr cr ; +: line ( addr u -- ) env? 2dup tag parse-line+ /tag cr cr ; \ 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 ; +: :: interpret ; +: . end-sec on indentlevel off ; +: :code s" pre" >env + BEGIN source >in @ /string type cr refill WHILE + source s" :endcode" compare 0= UNTIL THEN + -env ; : \ postpone \ ; definitions @@ -248,14 +303,15 @@ definitions \ parse a section +: section-line ( -- ) >in off + bl sword longtags search-wordlist + IF 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 ; + refill-loop ; \ HTML head @@ -309,9 +365,24 @@ Variable style$ 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# @@ -327,5 +398,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