Diff for /gforth/wf.fs between versions 1.51 and 1.55

version 1.51, 2007/07/19 13:28:18 version 1.55, 2008/07/15 16:11:49
Line 1 Line 1
 \ wiki forth  \ wiki forth
   
 \ Copyright (C) 2003,2004,2005,2006 Free Software Foundation, Inc.  \ Copyright (C) 2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
 \ Gforth is free software; you can redistribute it and/or  \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License  \ modify it under the terms of the GNU General Public License
 \ as published by the Free Software Foundation; either version 2  \ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.  \ of the License, or (at your option) any later version.
   
 \ This program is distributed in the hope that it will be useful,  \ This program is distributed in the hope that it will be useful,
Line 15 Line 15
 \ GNU General Public License for more details.  \ GNU General Public License for more details.
   
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software  \ along with this program. If not, see http://www.gnu.org/licenses/.
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  
   
 require string.fs  require string.fs
   
Line 259  Defer parse-line Line 258  Defer parse-line
     ELSE  2swap icon-tmp $! icon-prefix $@ icon-tmp $+! icon-tmp $+!      ELSE  2swap icon-tmp $! icon-prefix $@ icon-tmp $+! icon-tmp $+!
         icon-tmp $@  THEN          icon-tmp $@  THEN
     dup >r '| -$split  dup r> = IF  2swap  THEN       dup >r '| -$split  dup r> = IF  2swap  THEN 
     dup IF  2swap alt=  ELSE  2drop  THEN      dup IF  2swap alt=  ELSE  2drop s" " alt=  THEN
     tag-class $@len >r over c@ >align  tag-class $@len r> = 1+ /string      tag-class $@len >r over c@ >align  tag-class $@len r> = 1+ /string
     tag-class $@len >r over c@ >border tag-class $@len r> = 1+ /string      tag-class $@len >r over c@ >border tag-class $@len r> = 1+ /string
     2dup .img-size src= s" img" tag/ ;      2dup .img-size src= s" img" tag/ ;
Line 338  Variable expand-link Line 337  Variable expand-link
 Variable expand-prefix  Variable expand-prefix
 Variable expand-postfix  Variable expand-postfix
   
 : ?expand ( addr u -- )  expand-link $!  : ?expand ( addr u -- addr u' )  expand-link $!
     do-expand @ IF      do-expand @ IF
         expand-prefix $@ expand-link 0 $ins          expand-prefix $@ expand-link 0 $ins
         expand-postfix $@ expand-link $+!  THEN          expand-postfix $@ expand-link $+!  THEN
       0 >r
       BEGIN  expand-link $@ r@ /string  WHILE
               r> 1+ >r
               c@ '& = IF  s" amp;" expand-link r@ $ins  THEN
       REPEAT  drop rdrop
     expand-link $@ ;      expand-link $@ ;
   
 : .link ( addr u -- ) dup >r '| -$split  dup r> = IF  2swap  THEN   : .link ( addr u -- ) dup >r '| -$split  dup r> = IF  2swap  THEN 
Line 486  Variable toc-index Line 490  Variable toc-index
 true Value toc-image  true Value toc-image
   
 : .toc-entry ( toc flag -- )  : .toc-entry ( toc flag -- )
     swap cell+ dup @ swap cell+ dup cell+ $@ 2dup href=      swap cell+ dup @ swap cell+ dup cell+ $@ 2dup ?expand href=
     '# scan 1 /string toc-name $@ compare >r      '# scan 1 /string toc-name $@ compare >r
     $@ toc-image IF  s" a" tag .img swap      $@ toc-image IF  s" a" tag .img swap
         IF          IF
Line 559  Variable divs Line 563  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" dclass= s" h1" par +indent s" " dclass= ;  : *   1 indent +indent s" h1" dclass= s" h1" par s" " dclass= ;
 : **  1 indent s" h2" dclass= s" h2" par +indent s" " dclass= ;  : **  1 indent +indent s" h2" dclass= s" h2" par s" " dclass= ;
 : *** 2 indent s" h3" dclass= s" h3" par +indent s" " dclass= ;  : *** 2 indent +indent s" h3" dclass= s" h3" par 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 690  Variable _favicon Line 694  Variable _favicon
     _charset $@ s" utf-8" str= 0=      _charset $@ s" utf-8" str= 0=
     IF  .' <?xml version="1.0" encoding="' _charset $@ .upcase .' "?>' cr  THEN      IF  .' <?xml version="1.0" encoding="' _charset $@ .upcase .' "?>' cr  THEN
     .' <!DOCTYPE html' cr      .' <!DOCTYPE html' cr
     .'   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"' cr      .'   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"' cr
     .'   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' cr      .'   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' cr
     s" http://www.w3.org/1999/xhtml" s" xmlns" opt      s" http://www.w3.org/1999/xhtml" s" xmlns" opt
     lang@ s" xml:lang" opt lang@ s" lang" opt      lang@ s" xml:lang" opt lang@ s" lang" opt
     s" html" >env cr s" head" >env cr      s" html" >env cr s" head" >env cr

Removed from v.1.51  
changed lines
  Added in v.1.55


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>