--- gforth/wf.fs	2003/01/20 19:17:59	1.17
+++ gforth/wf.fs	2003/07/14 20:57:07	1.20
@@ -1,5 +1,23 @@
 \ wiki forth
 
+\ Copyright (C) 2003 Free Software Foundation, Inc.
+
+\ This file is part of Gforth.
+
+\ Gforth is free software; you can redistribute it and/or
+\ modify it under the terms of the GNU General Public License
+\ as published by the Free Software Foundation; either version 2
+\ of the License, or (at your option) any later version.
+
+\ This program is distributed in the hope that it will be useful,
+\ but WITHOUT ANY WARRANTY; without even the implied warranty of
+\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+\ GNU General Public License for more details.
+
+\ You should have received a copy of the GNU General Public License
+\ along with this program; if not, write to the Free Software
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+
 require string.fs
 
 : -scan ( addr u char -- addr' u' )
@@ -175,6 +193,7 @@ Defer parse-line
 : link-icon? ( -- )  do-icon @ 0= ?EXIT
     iconpath @  IF  iconpath $off  THEN
     link $@ + 1- c@ '/ = IF  s" index.html"  ELSE  link $@  THEN
+    '# $split 2drop
     BEGIN  '. $split 2swap 2drop dup  WHILE
 	2dup get-icon  REPEAT  2drop ;
 
@@ -197,12 +216,11 @@ Defer parse-line
 
 s" Gforth" environment? [IF] s" 0.5.0" str= [IF] 
 : parse-string ( c-addr u -- ) \ core,block
-    loadfilename 2@ 2>r
-    s" *evaluated string*" loadfilename 2! \ "*evaluated string*"
+    s" *evaluated string*" loadfilename>r
     push-file #tib ! >tib !
     >in off blk off loadfile off -1 loadline !
     ['] parse-line catch
-    pop-file 2r> loadfilename 2! throw ;
+    pop-file r>loadfilename throw ;
 [ELSE]
 : parse-string ( addr u -- )
     evaluate-input cell new-tib #tib ! tib !
@@ -211,7 +229,7 @@ s" Gforth" environment? [IF] s" 0.5.0" s
 
 : .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 $@len 0= IF  2dup link $! ( s" .html" link $+! ) THEN
     link $@ href= s" a" tag link-icon?
     parse-string s" a" /tag link-size? link-sig? ;
 : >link ( -- )  '[ parse type '] parse .link ;
@@ -463,12 +481,16 @@ Variable mail
 Variable mail-name
 Variable orig-date
 
+: .lastmod
+    ." Last modified: " time&date rot 0 u.r swap 1-
+    s" janfebmaraprmayjunjulaugsepoctnovdec" rot 3 * /string 3 min type
+    0 u.r ;
+
 : .trailer
     s" address" >env s" center" >env
     orig-date @ IF  ." Created " orig-date $@ type ." . "  THEN
-    ." Last modified: " time&date rot 0 u.r swap 1-
-    s" janfebmaraprmayjunjulaugsepoctnovdec" rot 3 * /string 3 min type
-    0 u.r ."  by "
+    .lastmod
+ ."  by "
     s" Mail|icons/mail.gif" .img mail $@ mailto: mail-name $@ s" a" tagged
     -envs ;