gforth: gforth/wf.fs

Diff for /gforth/wf.fs between version 1.34 and 1.55

-version 1.34, Wed Mar 30 21:57:12 2005 UTC
+version 1.55, Tue Jul 15 16:11:49 2008 UTC
  Line 1
  Line 1
  Line 1
  \ wiki forth
- \ Copyright (C) 2003,2004 Free Software Foundation, Inc.
+ \ Copyright (C) 2003,2004,2005,2006,2007,2008 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
+ \ as published by the Free Software Foundation, either version 3
  \ of the License, or (at your option) any later version.
  \ This program is distributed in the hope that it will be useful,
  Line 15
  Line 15
  Line 15
  \ 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
+ \ 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
- Line 31
+ Line 30
  Line 31
  Line 30
  : parse" ( -- addr u ) '" parse 2drop '" parse ;
  : .' '' parse postpone SLiteral postpone type ; immediate
  : s' '' parse postpone SLiteral ; immediate
+ : .upcase ( addr u -- )  bounds ?DO  I c@ toupper emit  LOOP ;
  \ character recoding
  Line 42
  Line 42
  Line 42
          case
              '& of  ." &amp;"  endof
              '< of  ." &lt;"   endof
-             '¤ of  ." &euro;" endof
+ \           &164 of  ." &euro;" endof
              dup emit
          endcase
      LOOP ;
  Line 52
  Line 52
  Line 52
  Variable indentlevel
  Variable tag-option
  Variable tag-class
+ Variable default-class
  s" " tag-option $!
  s" " tag-class $!
+ s" " default-class $!
  : tag ( addr u -- ) '< emit type
      tag-class $@len IF  .\"  class=\"" tag-class $@ type '" emit  THEN
      tag-option $@ type
      '> emit
-     s" " tag-option $! s" " tag-class $! ;
+     s" " tag-option $! default-class $@ tag-class $! ;
  : tag/ ( addr u -- )  s"  /" tag-option $+! tag ;
  : /tag ( addr u -- ) '< emit '/ emit type '> emit ;
  : tagged ( addr1 u1 addr2 u2 -- )  2dup 2>r tag .type 2r> /tag ;
  : opt ( addr u opt u -- )  s"  " tag-option $+!
-     tag-option $+! s' ="' tag-option $+! tag-option $+!
+     tag-option $+! s' ="' tag-option $+!
+ \    BEGIN  dup  WHILE  '& $split >r >r tag-option $+! r> r>
+ \           dup IF  s" %26" tag-option $+!  THEN
+ \    REPEAT  2drop
+     tag-option $+!
      s' "' tag-option $+! ;
  : n>string ( n -- addr u )  0 <# #S #> ;
  : xy>string ( x y -- )  swap 0 <# #S 'x hold 2drop 0 #S 's hold #> ;
- Line 80
+ Line 86
  Line 80
  Line 86
  : class= ( addr u -- )
      tag-class $@len IF  s"  " tag-class $+!  THEN
      tag-class $+! ;
+ : dclass= ( addr u -- )  2dup class=
+     default-class $! ;
  : indent= ( -- )
      indentlevel @ 0 <# #S 'p hold #> class= ;
  : mailto: ( addr u -- ) s'  href="mailto:' tag-option $+!
- Line 188
+ Line 196
  Line 188
  Line 196
    scratch r> 0 max /string 0 max -zeros
    dup IF  '. emit  THEN  type ;
+.9e FConstant pixels
+ FVariable factor  1e factor f!
  : size-does> ( -- )  DOES> ( -- )
      ." img." dup body> >name .name
 @ ." { 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< > -- )
      outfile-id >r
- Line 210
+ Line 221
  Line 210
  Line 221
 dup img-sizes search-wordlist  IF  drop 2drop
      ELSE
          get-current >r img-sizes set-current
-         nextname Create 2dup , , size-does>
+         nextname Create 2dup
+         s>d d>f factor f@ f* f>d d>s ,
+         s>d d>f factor f@ f* f>d d>s ,
+         size-does>
          r> set-current
      THEN ;
- Line 244
+ Line 258
  Line 244
  Line 258
      ELSE  2swap icon-tmp $! icon-prefix $@ icon-tmp $+! icon-tmp $+!
          icon-tmp $@  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@ >border tag-class $@len r> = 1+ /string
 dup .img-size src= s" img" tag/ ;
- Line 323
+ Line 337
  Line 323
  Line 337
  Variable expand-prefix
  Variable expand-postfix
- : ?expand ( addr u -- )  expand-link $!
+ : ?expand ( addr u -- addr u' )  expand-link $!
      do-expand @ IF
          expand-prefix $@ expand-link 0 $ins
          expand-postfix $@ expand-link $+!  THEN
+>r
+     BEGIN  expand-link $@ r@ /string  WHILE
+             r> 1+ >r
+             c@ '& = IF  s" amp;" expand-link r@ $ins  THEN
+     REPEAT  drop rdrop
      expand-link $@ ;
  : .link ( addr u -- ) dup >r '| -$split  dup r> = IF  2swap  THEN
- Line 339
+ Line 358
  Line 339
  Line 358
  \ line handling
- : char? ( -- c )  >in @ char swap >in ! ;
+ : char? ( -- c )  >in @ char swap >in ! $FF umin ;
  : parse-tag ( addr u char -- )
      >r r@ parse .type
- Line 442
+ Line 461
  Line 442
  Line 461
          I c@  dup 'A 'Z 1+ within IF  bl + nav+
          ELSE  dup 'a 'z 1+ within IF  nav+
          ELSE  dup '0 '9 1+ within IF  nav+
-         ELSE  dup  bl = swap '- = or IF  '- nav+
+                 ELSE  dup  bl = over '- = or IF  '- nav+
+                     ELSE  nav+
          THEN  THEN  THEN  THEN
      LOOP ;
  : >nav ( addr u -- addr' u' )
- Line 467
+ Line 487
  Line 467
  Line 487
  Variable toc-name
  Variable toc-index
 Value /toc-line
+ true Value toc-image
  : .toc-entry ( toc flag -- )
-     swap cell+ dup @ swap cell+ dup cell+ $@ 2dup href= s" a" tag
+     swap cell+ dup @ swap cell+ dup cell+ $@ 2dup ?expand href=
      '# scan 1 /string toc-name $@ compare >r
-     $@ .img swap
+     $@ toc-image IF  s" a" tag .img swap
      IF
          case
 of  s" ^]|-@/arrow_up.jpg" .img  endof
- Line 487
+ Line 508
  Line 487
  Line 508
 of  s" v]|-@/arrow_down.jpg" .img  endof
          endcase
      THEN
-     s" a" /tag rdrop ." <!--" cr ." -->"
+         s" a" /tag ." <!--" cr ." -->"
+     ELSE
+         '[ skip  2dup '| scan nip - 2swap swap
+         IF
+             CASE
+OF  s" up" class=  ENDOF
+OF  r@ 0= IF  s" circle" ELSE  s" down"  THEN class=  ENDOF
+             ENDCASE
+         ELSE
+             CASE
+ OF  s" up" class=  ENDOF
+ OF  s" right" class=  ENDOF
+ OF  s" circle" class=  ENDOF
+ OF  s" down" class=  ENDOF
+             ENDCASE
+         THEN
+         s" a" tag parse-string s" a" /tag ." <!--" cr ." -->"
+     THEN
+     rdrop
 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" class= 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
 parse
      dup 0= IF  toc-name $! 0  ELSE
          toc-name $! toc-name $@ id= s" " s" a" tagged  2
- Line 500
+ Line 541
  Line 500
  Line 541
          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+ @ 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
- Line 522
+ Line 563
  Line 522
  Line 563
  longtags set-current
  : --- 0 indent cr s" hr" tag/ cr ;
- : *   1 indent s" h1" par +indent ;
+ : *   1 indent +indent s" h1" dclass= s" h1" par s" " dclass= ;
- : **  1 indent s" h2" par +indent ;
+ : **  1 indent +indent s" h2" dclass= s" h2" par s" " dclass= ;
- : *** 2 indent s" h3" par +indent ;
+ : *** 2 indent +indent s" h3" dclass= s" h3" par s" " dclass= ;
  : --  0 indent cr print-toc ;
  : &&  0 parse id= ;
  : -   s" ul" env s" li" par ;
- Line 623
+ Line 664
  Line 623
  Line 664
  \ HTML head
  Variable css-file
+ Variable print-file
+ Variable ie-css-file
  Variable content
- Variable lang
+ Variable _charset
+ Variable _lang
+ Variable _favicon
  : lang@  ( -- addr u )
-     lang @ IF  lang $@  ELSE  s" en"  THEN ;
+     _lang @ IF  _lang $@  ELSE  s" en"  THEN ;
  : .css ( -- )
      css-file @ IF  css-file $@len IF
              s" StyleSheet" s" rel" opt
-             css-file $@ href=
+             css-file $@ href= s" screen" s" media" opt
+             s" text/css" s" type" opt s" link" tag/ cr
+         THEN  THEN
+     ie-css-file @ IF
+         ." <!--[if lt IE 7.0]>" cr
+         .'    <style type="text/css">@import url(' ie-css-file $@ type ." );</style>" cr
+         ." <![endif]-->" cr
+     THEN ;
+ : .print ( -- )
+     print-file @ IF  print-file $@len IF
+            s" StyleSheet" s" rel" opt
+            print-file $@ href= s" print" s" media" opt
              s" text/css" s" type" opt s" link" tag/ cr
          THEN  THEN ;
  : .title ( addr u -- )  1 envs ! oldenv off
+     _charset $@ s" utf-8" str= 0=
+     IF  .' <?xml version="1.0" encoding="' _charset $@ .upcase .' "?>' cr  THEN
      .' <!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
      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" meta" tag/ cr .css .print
+     _favicon @ IF
+         s" shortcut icon" s" rel" opt
+         _favicon $@ href=
+         s" image/x-icon" s" type" opt
+         s" link" tag/ cr  THEN
      s" title" tagged cr
      -env ;
- Line 667
+ Line 730
  Line 667
  Line 730
      s" Mail|@/mail.gif" .img mail $@ mailto: mail-name $@ s" a" tagged
      public-key @ IF
          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
      -envs ;
- Line 678
+ Line 741
  Line 678
  Line 741
  : pgp-key ( -- )
      bl sword -trailing public-key $! ;
  : charset ( -- )  s" text/xhtml; charset=" content $!
-     bl sword -trailing content $+! ;
+     bl sword -trailing 2dup content $+! _charset $! ;
  charset iso-8859-1
- Line 687
+ Line 750
  Line 687
  Line 750
  : icons
      bl sword icon-prefix $! ;
  : lang
-     bl sword lang $! ;
+     bl sword _lang $! ;
+ : favicon
+     bl sword _favicon $! ;
  : expands '# sword expand-prefix $! bl sword expand-postfix $! ;
  icons icons
- Line 705
+ Line 770
  Line 705
  Line 770
  : vlink ( -- ) parse" s" vlink" style ;
  : marginheight ( -- ) parse" s" marginheight" style ;
  : css ( -- ) parse" css-file $! ;
+ : print-css ( -- ) parse" print-file $! ;
+ : ie-css ( -- ) parse" ie-css-file $! ;
  : wf ( -- )
      outfile-id >r

-Generate output suitable for use with a patch program
+Legend:



Removed from v.1.34
 


changed lines


 
Added in v.1.55
 Legend:



Removed from v.1.34
 


changed lines


 
Added in v.1.55
-Removed from v.1.34
+Added in v.1.55

CVS Admin

gforth: gforth/wf.fs

Diff for /gforth/wf.fs between version 1.34 and 1.55

ViewCVS and CVS Help