--- gforth/wf.fs 2004/12/31 13:23:58 1.30 +++ gforth/wf.fs 2005/03/30 21:57:12 1.34 @@ -34,7 +34,7 @@ require string.fs \ character recoding -[IFDEF] 8-bit-io 8-bit-io [THEN] +[IFDEF] maxascii $100 to maxascii 8-bit-io [THEN] \ UTF-8 IO fails with .type: : .type ( addr u -- ) @@ -42,6 +42,7 @@ require string.fs case '& of ." &" endof '< of ." <" endof + '¤ of ." €" endof dup emit endcase LOOP ; @@ -92,13 +93,14 @@ Variable envs 30 0 [DO] 0 , [LOOP] : env$ ( -- addr ) envs dup @ 1+ cells + ; : env ( addr u -- ) env$ $! ; -: env? ( -- ) envs @ oldenv @ +: env? ( -- ) envs @ oldenv @ over oldenv ! 2dup > IF env$ $@ tag THEN 2dup < IF env$ cell+ $@ /tag env$ cell+ $off THEN - drop oldenv ! ; + 2drop ; : +env 1 envs +! ; -: -env end-sec @ envs @ 2 > or IF -1 envs +! env? THEN ; +: -env end-sec @ envs @ 1 > or IF -1 envs +! env? THEN ; : -envs envs @ 0 ?DO -env cr LOOP ; +: -tenvs envs @ 1 ?DO -env cr LOOP ; : >env ( addr u -- ) +env env env? ; \ alignment @@ -182,8 +184,9 @@ Create jfif $FF c, $D8 c, $FF c, $E0 c f$ dup >r 0<= IF '0 emit ELSE scratch r@ min type r@ precision - zeros THEN - '. emit r@ negate zeros - scratch r> 0 max /string 0 max -zeros type ; + r@ negate zeros + scratch r> 0 max /string 0 max -zeros + dup IF '. emit THEN type ; : size-does> ( -- ) DOES> ( -- ) ." img." dup body> >name .name @@ -232,6 +235,7 @@ Variable icon-tmp Variable do-size Variable do-icon +Variable do-expand Defer parse-line @@ -288,16 +292,19 @@ Defer parse-line : link-warn? ( -- ) \ local links only link $@ ': scan nip ?EXIT - link $@ '# $split 2drop r/o open-file nip IF - s" Dead Link '" stderr write-file throw - link $@ stderr write-file throw - s\" ' !!!\n" stderr write-file throw - THEN ; + link $@ '# $split 2drop dup IF + r/o open-file nip IF + s" Dead Link '" stderr write-file throw + link $@ stderr write-file throw + s\" ' !!!\n" stderr write-file throw + THEN + ELSE 2drop THEN ; : 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 ; + do-size off do-icon on do-expand off + over c@ '% = over 0> and IF do-size on 1 /string THEN + over c@ '\ = over 0> and IF do-icon off 1 /string THEN + over c@ '* = over 0> and IF do-expand on 1 /string THEN ; s" Gforth" environment? [IF] s" 0.5.0" str= [IF] : parse-string ( c-addr u -- ) \ core,block @@ -312,10 +319,21 @@ s" Gforth" environment? [IF] s" 0.5.0" s ['] parse-line catch pop-file throw ; [THEN] [THEN] +Variable expand-link +Variable expand-prefix +Variable expand-postfix + +: ?expand ( addr u -- ) expand-link $! + do-expand @ IF + expand-prefix $@ expand-link 0 $ins + expand-postfix $@ expand-link $+! THEN + expand-link $@ ; + : .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? + link $@ ?expand + href= s" a" tag link-icon? parse-string s" a" /tag link-size? link-sig? link-warn? ; : >link ( -- ) '[ parse type '] parse .link ; @@ -388,7 +406,8 @@ wordlist Constant autoreplacements \ 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? @@ -472,7 +491,7 @@ Variable toc-index 1 toc-index +! toc-index @ /toc-line mod 0= IF s" br" tag/ THEN ; -: print-toc ( -- ) toc-index off cr s" menu" id= s" div" >env cr +: print-toc ( -- ) toc-index off cr s" menu" class= s" div" >env cr 0 parse dup 0= IF toc-name $! 0 ELSE toc-name $! toc-name $@ id= s" " s" a" tagged 2 @@ -514,19 +533,19 @@ longtags set-current : : s" dl" env s" dd" par ; : -<< s" ul" env env? s" li" >env ; : +<< s" ol" env env? s" li" >env ; -: ?<< s" dl" env env? s" dt" >env ; +\ : ?<< s" dl" env env? s" dt" >env ; \ not allowed : :<< s" dl" env env? s" dd" >env ; : p<< s" p" >env ; : << +env ; : <* s" center" class= ; -: env ; -: red> -env ; +: env s" #ff0000" s" color" opt s" font" >env parse-par ; +: red> -env -env ; : >> -env ; : *> ; : :: interpret ; : . end-sec on 0 indent ; : :code s" pre" >env - BEGIN source >in @ /string type cr refill WHILE + BEGIN source >in @ /string .type cr refill WHILE source s" :endcode" str= UNTIL THEN -env ; : :code-file s" pre" >env @@ -599,23 +618,32 @@ definitions ELSE source nip IF >in off s" p" par THEN THEN ; : parse-section ( -- ) end-sec off BEGIN refill WHILE - section-par end-sec @ UNTIL THEN ; + section-par end-sec @ UNTIL THEN end-sec off ; \ HTML head Variable css-file +Variable content +Variable lang -: .title ( addr u -- ) - .' ' cr - s" html" >env s" head" >env cr - s" Content-Type" s" http-equiv" opt - s" text/xhtml; charset=iso-8859-1" s" content" opt - s" meta" tag/ +: lang@ ( -- addr u ) + lang @ IF lang $@ ELSE s" en" THEN ; +: .css ( -- ) css-file @ IF css-file $@len IF - s" StyleSheet" s" rel" opt - css-file $@ href= - s" text/css" s" type" opt s" link" tag/ - THEN THEN + s" StyleSheet" s" rel" opt + css-file $@ href= + s" text/css" s" type" opt s" link" tag/ cr + THEN THEN ; +: .title ( addr u -- ) 1 envs ! oldenv off + .' ' cr + s" http://www.w3.org/1999/xhtml" s" xmlns" opt + lang@ s" xml:lang" opt lang@ s" lang" opt + s" html" >env cr s" head" >env cr + s" Content-Type" s" http-equiv" opt + content $@ s" content" opt + s" meta" tag/ cr .css s" title" tagged cr -env ; @@ -649,10 +677,19 @@ Variable orig-date '< sword -trailing mail-name $! '> sword mail $! ; : pgp-key ( -- ) bl sword -trailing public-key $! ; +: charset ( -- ) s" text/xhtml; charset=" content $! + bl sword -trailing content $+! ; + +charset iso-8859-1 + : created ( -- ) bl sword orig-date $! ; : icons bl sword icon-prefix $! ; +: lang + bl sword lang $! ; +: expands '# sword expand-prefix $! bl sword expand-postfix $! ; + icons icons Variable style$ @@ -683,7 +720,7 @@ Variable style$ 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 + parse-par -env parse-section loadfile @ close-file swap 2dup or pop-file drop throw throw s" wf-temp.wf" delete-file throw ; @@ -726,4 +763,4 @@ DOES> @ cells last-entry @ + get-par ; : db-par ( -- ) LT postpone p<< postpone >r BEGIN db-line refill WHILE next-char '. = UNTIL 1 >in +! THEN - postpone rdrop LT postpone >> ; immediate + postpone rdrop ( LT postpone >> ) ; immediate