version 1.32, 2005/01/16 13:29:21
|
version 1.38, 2005/06/28 15:22:45
|
Line 42 require string.fs
|
Line 42 require string.fs
|
case |
case |
'& of ." &" endof |
'& of ." &" endof |
'< of ." <" endof |
'< of ." <" endof |
|
'¤ of ." €" endof |
dup emit |
dup emit |
endcase |
endcase |
LOOP ; |
LOOP ; |
Line 51 require string.fs
|
Line 52 require string.fs
|
Variable indentlevel |
Variable indentlevel |
Variable tag-option |
Variable tag-option |
Variable tag-class |
Variable tag-class |
|
Variable default-class |
s" " tag-option $! |
s" " tag-option $! |
s" " tag-class $! |
s" " tag-class $! |
|
s" " default-class $! |
|
|
: tag ( addr u -- ) '< emit type |
: tag ( addr u -- ) '< emit type |
tag-class $@len IF .\" class=\"" tag-class $@ type '" emit THEN |
tag-class $@len IF .\" class=\"" tag-class $@ type '" emit THEN |
tag-option $@ type |
tag-option $@ type |
'> emit |
'> emit |
s" " tag-option $! s" " tag-class $! ; |
s" " tag-option $! default-class $@ tag-class $! ; |
: tag/ ( addr u -- ) s" /" tag-option $+! tag ; |
: tag/ ( addr u -- ) s" /" tag-option $+! tag ; |
: /tag ( addr u -- ) '< emit '/ emit type '> emit ; |
: /tag ( addr u -- ) '< emit '/ emit type '> emit ; |
: tagged ( addr1 u1 addr2 u2 -- ) 2dup 2>r tag .type 2r> /tag ; |
: tagged ( addr1 u1 addr2 u2 -- ) 2dup 2>r tag .type 2r> /tag ; |
Line 79 s" " tag-class $!
|
Line 82 s" " tag-class $!
|
: class= ( addr u -- ) |
: class= ( addr u -- ) |
tag-class $@len IF s" " tag-class $+! THEN |
tag-class $@len IF s" " tag-class $+! THEN |
tag-class $+! ; |
tag-class $+! ; |
|
: dclass= ( addr u -- ) 2dup class= |
|
default-class $! ; |
: indent= ( -- ) |
: indent= ( -- ) |
indentlevel @ 0 <# #S 'p hold #> class= ; |
indentlevel @ 0 <# #S 'p hold #> class= ; |
: mailto: ( addr u -- ) s' href="mailto:' tag-option $+! |
: mailto: ( addr u -- ) s' href="mailto:' tag-option $+! |
Line 92 Variable envs 30 0 [DO] 0 , [LOOP]
|
Line 97 Variable envs 30 0 [DO] 0 , [LOOP]
|
|
|
: env$ ( -- addr ) envs dup @ 1+ cells + ; |
: env$ ( -- addr ) envs dup @ 1+ cells + ; |
: env ( addr u -- ) env$ $! ; |
: env ( addr u -- ) env$ $! ; |
: env? ( -- ) envs @ oldenv @ |
: env? ( -- ) envs @ oldenv @ over oldenv ! |
2dup > IF env$ $@ tag THEN |
2dup > IF env$ $@ tag THEN |
2dup < IF env$ cell+ $@ /tag env$ cell+ $off THEN |
2dup < IF env$ cell+ $@ /tag env$ cell+ $off THEN |
drop oldenv ! ; |
2drop ; |
: +env 1 envs +! ; |
: +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 ; |
: -envs envs @ 0 ?DO -env cr LOOP ; |
|
: -tenvs envs @ 1 ?DO -env cr LOOP ; |
: >env ( addr u -- ) +env env env? ; |
: >env ( addr u -- ) +env env env? ; |
|
|
\ alignment |
\ alignment |
Line 182 Create jfif $FF c, $D8 c, $FF c, $E0 c
|
Line 188 Create jfif $FF c, $D8 c, $FF c, $E0 c
|
f$ dup >r 0<= |
f$ dup >r 0<= |
IF '0 emit |
IF '0 emit |
ELSE scratch r@ min type r@ precision - zeros THEN |
ELSE scratch r@ min type r@ precision - zeros THEN |
'. emit r@ negate zeros |
r@ negate zeros |
scratch r> 0 max /string 0 max -zeros type ; |
scratch r> 0 max /string 0 max -zeros |
|
dup IF '. emit THEN type ; |
|
|
|
12.9e FConstant pixels |
|
|
: size-does> ( -- ) DOES> ( -- ) |
: size-does> ( -- ) DOES> ( -- ) |
." img." dup body> >name .name |
." img." dup body> >name .name |
2@ ." { width: " |
2@ ." { width: " |
s>d d>f 13.8e f/ f.size ." em; height: " |
s>d d>f pixels f/ f.size ." em; height: " |
s>d d>f 13.8e f/ f.size ." em; }" cr ; |
s>d d>f pixels f/ f.size ." em; }" cr ; |
|
|
: size-css ( file< > -- ) |
: size-css ( file< > -- ) |
outfile-id >r |
outfile-id >r |
Line 289 Defer parse-line
|
Line 298 Defer parse-line
|
|
|
: link-warn? ( -- ) \ local links only |
: link-warn? ( -- ) \ local links only |
link $@ ': scan nip ?EXIT |
link $@ ': scan nip ?EXIT |
link $@ '# $split 2drop r/o open-file nip IF |
link $@ '# $split 2drop dup IF |
s" Dead Link '" stderr write-file throw |
r/o open-file nip IF |
link $@ stderr write-file throw |
s" Dead Link '" stderr write-file throw |
s\" ' !!!\n" stderr write-file throw |
link $@ stderr write-file throw |
THEN ; |
s\" ' !!!\n" stderr write-file throw |
|
THEN |
|
ELSE 2drop THEN ; |
|
|
: link-options ( addr u -- addr' u' ) |
: link-options ( addr u -- addr' u' ) |
do-size off do-icon on do-expand off |
do-size off do-icon on do-expand off |
Line 462 Create nav-buf 0 c,
|
Line 473 Create nav-buf 0 c,
|
Variable toc-name |
Variable toc-name |
Variable toc-index |
Variable toc-index |
6 Value /toc-line |
6 Value /toc-line |
|
true Value toc-image |
|
|
: .toc-entry ( toc flag -- ) |
: .toc-entry ( toc flag -- ) |
swap cell+ dup @ swap cell+ dup cell+ $@ 2dup href= s" a" tag |
swap cell+ dup @ swap cell+ dup cell+ $@ 2dup href= |
'# scan 1 /string toc-name $@ compare >r |
'# scan 1 /string toc-name $@ compare >r |
$@ .img swap |
$@ toc-image IF s" a" tag .img swap |
IF |
IF |
case |
case |
2 of s" ^]|-@/arrow_up.jpg" .img endof |
2 of s" ^]|-@/arrow_up.jpg" .img endof |
3 of |
3 of |
r@ 0= IF s" *]|-@/circle.jpg" |
r@ 0= IF s" *]|-@/circle.jpg" |
ELSE s" v]|-@/arrow_down.jpg" THEN .img endof |
ELSE s" v]|-@/arrow_down.jpg" THEN .img endof |
endcase |
endcase |
|
ELSE |
|
case |
|
0 of s" ^]|-@/arrow_up.jpg" .img endof |
|
1 of s" >]|-@/arrow_right.jpg" .img endof |
|
2 of s" *]|-@/circle.jpg" .img endof |
|
3 of s" v]|-@/arrow_down.jpg" .img endof |
|
endcase |
|
THEN |
|
s" a" /tag ." <!--" cr ." -->" |
ELSE |
ELSE |
case |
'[ skip 2dup '| scan nip - 2swap swap |
0 of s" ^]|-@/arrow_up.jpg" .img endof |
IF |
1 of s" >]|-@/arrow_right.jpg" .img endof |
CASE |
2 of s" *]|-@/circle.jpg" .img endof |
2 OF s" up" class= ENDOF |
3 of s" v]|-@/arrow_down.jpg" .img endof |
3 OF r@ 0= IF s" circle" ELSE s" down" THEN class= ENDOF |
endcase |
ENDCASE |
|
ELSE |
|
CASE |
|
0 OF s" up" class= ENDOF |
|
1 OF s" right" class= ENDOF |
|
2 OF s" circle" class= ENDOF |
|
3 OF s" down" class= ENDOF |
|
ENDCASE |
|
THEN |
|
s" a" tag parse-string s" a" /tag |
THEN |
THEN |
s" a" /tag rdrop ." <!--" cr ." -->" |
rdrop |
1 toc-index +! toc-index @ /toc-line mod 0= |
1 toc-index +! toc-index @ /toc-line mod 0= |
IF s" br" tag/ THEN ; |
IF -env cr s" p" >env THEN ; |
|
|
: print-toc ( -- ) toc-index off cr s" menu" id= s" div" >env cr |
: print-toc ( -- ) toc-index off cr |
|
toc-image IF s" img-menu" ELSE s" menu" THEN id= |
|
s" div" >env cr s" p" >env |
0 parse |
0 parse |
dup 0= IF toc-name $! 0 ELSE |
dup 0= IF toc-name $! 0 ELSE |
toc-name $! toc-name $@ id= s" " s" a" tagged 2 |
toc-name $! toc-name $@ id= s" " s" a" tagged 2 |
Line 495 Variable toc-index
|
Line 527 Variable toc-index
|
dup cell+ @ 3 = r@ 0= and IF rdrop 1 >r ( s" br" tag/ cr ) 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+ @ r@ >= IF dup r@ 2 = .toc-entry THEN |
dup cell+ @ 2 = r@ 2 = and IF s" br" tag/ toc-index off THEN |
dup cell+ @ 2 = r@ 2 = and IF s" br" tag/ toc-index off THEN |
REPEAT drop rdrop -env cr ; |
REPEAT drop rdrop -env -env cr ; |
|
|
\ handle global tags |
\ handle global tags |
|
|
Line 517 Variable divs
|
Line 549 Variable divs
|
longtags set-current |
longtags set-current |
|
|
: --- 0 indent cr s" hr" tag/ cr ; |
: --- 0 indent cr s" hr" tag/ cr ; |
: * 1 indent s" h1" par +indent ; |
: * 1 indent s" h1" dclass= s" h1" par +indent s" " dclass= ; |
: ** 1 indent s" h2" par +indent ; |
: ** 1 indent s" h2" dclass= s" h2" par +indent s" " dclass= ; |
: *** 2 indent s" h3" par +indent ; |
: *** 2 indent s" h3" dclass= s" h3" par +indent s" " dclass= ; |
: -- 0 indent cr print-toc ; |
: -- 0 indent cr print-toc ; |
: && 0 parse id= ; |
: && 0 parse id= ; |
: - s" ul" env s" li" par ; |
: - s" ul" env s" li" par ; |
Line 528 longtags set-current
|
Line 560 longtags set-current
|
: : s" dl" env s" dd" par ; |
: : s" dl" env s" dd" par ; |
: -<< s" ul" env env? s" li" >env ; |
: -<< s" ul" env env? s" li" >env ; |
: +<< s" ol" 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 ; |
: :<< s" dl" env env? s" dd" >env ; |
: p<< s" p" >env ; |
: p<< s" p" >env ; |
: << +env ; |
: << +env ; |
: <* s" center" class= ; |
: <* s" center" class= ; |
: <red s" #ff0000" s" color" opt s" font" >env ; |
: <red s" p" >env s" #ff0000" s" color" opt s" font" >env parse-par ; |
: red> -env ; |
: red> -env -env ; |
: >> -env ; |
: >> -env ; |
: *> ; |
: *> ; |
: :: interpret ; |
: :: interpret ; |
: . end-sec on 0 indent ; |
: . end-sec on 0 indent ; |
: :code s" pre" >env |
: :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 |
source s" :endcode" str= UNTIL THEN |
-env ; |
-env ; |
: :code-file s" pre" >env |
: :code-file s" pre" >env |
Line 613 definitions
|
Line 645 definitions
|
ELSE source nip IF >in off s" p" par THEN THEN ; |
ELSE source nip IF >in off s" p" par THEN THEN ; |
: parse-section ( -- ) end-sec off |
: parse-section ( -- ) end-sec off |
BEGIN refill WHILE |
BEGIN refill WHILE |
section-par end-sec @ UNTIL THEN ; |
section-par end-sec @ UNTIL THEN end-sec off ; |
|
|
\ HTML head |
\ HTML head |
|
|
Variable css-file |
Variable css-file |
|
Variable content |
|
Variable lang |
|
|
: .title ( addr u -- ) |
: lang@ ( -- addr u ) |
.' <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//en" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' cr |
lang @ IF lang $@ ELSE s" en" THEN ; |
s" html" >env s" head" >env cr |
: .css ( -- ) |
s" Content-Type" s" http-equiv" opt |
|
s" text/xhtml; charset=iso-8859-1" s" content" opt |
|
s" meta" tag/ |
|
css-file @ IF css-file $@len IF |
css-file @ IF css-file $@len IF |
s" StyleSheet" s" rel" opt |
s" StyleSheet" s" rel" opt |
css-file $@ href= |
css-file $@ href= |
s" text/css" s" type" opt s" link" tag/ |
s" text/css" s" type" opt s" link" tag/ cr |
THEN THEN |
THEN THEN ; |
|
: .title ( addr u -- ) 1 envs ! oldenv off |
|
.' <!DOCTYPE html' cr |
|
.' PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"' cr |
|
.' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' 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 |
s" title" tagged cr |
-env ; |
-env ; |
|
|
Line 653 Variable orig-date
|
Line 694 Variable orig-date
|
s" Mail|@/mail.gif" .img mail $@ mailto: mail-name $@ s" a" tagged |
s" Mail|@/mail.gif" .img mail $@ mailto: mail-name $@ s" a" tagged |
public-key @ IF |
public-key @ IF |
public-key $@ href= s" a" tag |
public-key $@ href= s" a" tag |
s" PGP key|@/gpg.asc.gif" .img s" a" /tag |
s" PGP key|-@/gpg.asc.gif" .img s" a" /tag |
THEN |
THEN |
-envs ; |
-envs ; |
|
|
Line 663 Variable orig-date
|
Line 704 Variable orig-date
|
'< sword -trailing mail-name $! '> sword mail $! ; |
'< sword -trailing mail-name $! '> sword mail $! ; |
: pgp-key ( -- ) |
: pgp-key ( -- ) |
bl sword -trailing public-key $! ; |
bl sword -trailing public-key $! ; |
|
: charset ( -- ) s" text/xhtml; charset=" content $! |
|
bl sword -trailing content $+! ; |
|
|
|
charset iso-8859-1 |
|
|
: created ( -- ) |
: created ( -- ) |
bl sword orig-date $! ; |
bl sword orig-date $! ; |
: icons |
: icons |
bl sword icon-prefix $! ; |
bl sword icon-prefix $! ; |
|
: lang |
|
bl sword lang $! ; |
: expands '# sword expand-prefix $! bl sword expand-postfix $! ; |
: expands '# sword expand-prefix $! bl sword expand-postfix $! ; |
|
|
icons icons |
icons icons |
Line 699 Variable style$
|
Line 747 Variable style$
|
s" wf-temp.wf" r/w create-file throw >r |
s" wf-temp.wf" r/w create-file throw >r |
r@ write-file r> close-file throw |
r@ write-file r> close-file throw |
push-file s" wf-temp.wf" r/o open-file throw loadfile ! |
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 |
loadfile @ close-file swap 2dup or |
pop-file drop throw throw |
pop-file drop throw throw |
s" wf-temp.wf" delete-file throw ; |
s" wf-temp.wf" delete-file throw ; |
Line 742 DOES> @ cells last-entry @ + get-par ;
|
Line 790 DOES> @ cells last-entry @ + get-par ;
|
|
|
: db-par ( -- ) LT postpone p<< postpone >r |
: db-par ( -- ) LT postpone p<< postpone >r |
BEGIN db-line refill WHILE next-char '. = UNTIL 1 >in +! THEN |
BEGIN db-line refill WHILE next-char '. = UNTIL 1 >in +! THEN |
postpone rdrop LT postpone >> ; immediate |
postpone rdrop ( LT postpone >> ) ; immediate |