Changeset 14311 for lang/gauche/oldtype

Timestamp:

06/20/08 23:57:48 (5 years ago)

Author:

kiyoka

Message:

Made the contents of RSS feed's <description> cotain full text.
Supported null line for Wiki format.

Location:

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype

Files:

• format.scm (modified) (1 diff)
• oldtype.kahua (modified) (8 diffs)
• page.scm (modified) (2 diffs)
• parse.scm (modified) (1 diff)
• staticimg/preview_list.html (modified) (1 diff)
• util.kahua (modified) (2 diffs)
• util.scm (modified) (2 diffs)

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/format.scm

@@ -139 +139 @@
                       ((pre-ol2)     (cons "## "    (rec arg)))
                       ((pre-ol3)     (cons "### "   (rec arg)))
-                      ((h1)          (cons "[] "    (rec (cdr arg))))
-                      ((h2)          (cons "* "     (rec (cdr arg))))
-                      ((h3)          (cons "** "    (rec (cdr arg))))
-                      ((h4)          (cons "*** "   (rec (cdr arg))))
-                      ((h5)          (cons "**** "  (rec (cdr arg))))
-                      ((h6)          (cons "***** " (rec (cdr arg))))
+                      ((h1)          (cons "[] "    (rec arg)))
+                      ((h2)          (cons "* "     (rec arg)))
+                      ((h3)          (cons "** "    (rec arg)))
+                      ((h4)          (cons "*** "   (rec arg)))
+                      ((h5)          (cons "**** "  (rec arg)))
+                      ((h6)          (cons "***** " (rec arg)))
                       ((wiki-macro)  (oldtype:wiki-macro->plain arg))
                       ((wiki-name)   (oldtype:wikiname->plain (car arg)))
                       ((hr)          (list "----\n"))
+                      ((@)           '())
+                      ((@@)          '())
                       (else
                        (format "!!Error : no such tag \"~a\"!!" name)))

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/oldtype.kahua

@@ -99 +99 @@
               (tr/
                (td/ "lineno")
-               (td/ lineno))
-              (tr/
-               (td/ "EmacsLisp")
-               (td/ (format ";; (oldtype-openfile \"~a\" ~a)" (name-of oldtype-page) lineno))))
+               (td/ lineno)))
              (h2/ "Information of This Page.")
              (pre/
@@ -114 +111 @@
                 (get-text-list oldtype-page)))))
             ""
+            lineno
             ))))
    nodeset))
@@ -275 +273 @@
 
 
-(define (standard-page wikiname barcode nodes first-line)
+(define (standard-page wikiname barcode nodes first-line . rest-arg)
   (html/ (head/ (title/ (string-append wikiname " / " first-line))
                 (link/ (@/ (rel "stylesheet") (type "text/css")
@@ -292 +290 @@
                 (if (eq? 'w3m (oldtype-user-agent))
                     (div/
-                     (format " ;; (oldtype-openfile \"~a\" 1)" wikiname)
+                     (format " ;; (oldtype-openfile \"~a\" ~d)" wikiname (if (not (null? rest-arg))
+                                                                             (car rest-arg)
+                                                                             1))
                      (br/))
                     (text/ ""))
@@ -315 +315 @@
                 (span/ (@/ (class "forw3m"))))
           (br/)
-          (h1/
-           wikiname
-           " "
-           (a/ (@/ (href (oldtype:gen-rss-path wikiname))
-                   (class "help")
-                   (title "This is RSS feed URL"))
-               (oldtype:icon-image 'rss))
-           (oldtype:hatena-bookmarks wikiname))
+          (h1/ wikiname
+               " "
+               (a/ (@/ (href (oldtype:gen-rss-path wikiname))
+                       (class "help")
+                       (title "This is RSS feed URL"))
+                   (oldtype:icon-image 'rss))
+               (a/ (@/ (href (oldtype:gen-plain-path wikiname))
+                       (class "help")
+                       (title "PLAIN TEXT"))
+                   (oldtype:icon-image 'plain))
+               (oldtype:hatena-bookmarks wikiname))
           barcode
           (hr/)
@@ -341 +344 @@
             (#/^[ ]*$/ x)
             (#/^[ ]*##/ x))))
-    (get-text-list oldtype-page))))
+    (get-plain-list oldtype-page))))
 
 
@@ -367 +370 @@
   (let ((wikiname (or wikiname "index")))
     (show-page/page wikiname)))
+
+
+(define-entry (show-plain wikiname)
+  (let* ((wikiname (or wikiname "index"))
+         (oldtype-page (oldtype:load-page (kahua-site-root) wikiname)))
+    (html/
+     (head/
+      (title/ (string-append wikiname)))
+     (body/
+      (pre/
+       (string-join
+        (get-plain-list oldtype-page)
+        "\n"))))))
 
 
@@ -400 +416 @@
                 (item/
                  (title/            (string-append (name-of e) "::" (oldtype-first-line e)))
-                 (description/      (oldtype-first-line e))
+                 (description/      (string-join (get-plain-list e) "<br>"))
                  (link/             (string-append base-url "show-page/" (uri-encode-string (name-of e))
                                                    (if (< 1 lineno)

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/page.scm

@@ -57 +57 @@
           get-text
           get-text-list
+          get-plain-list
           get-rss-entry-pages
           ))
@@ -138 +139 @@
   (vector->list (text-of (timeline-of self))))
 
+(define-method get-plain-list ((self <oldtype-page>))
+  (vector->list (plain-of self)))
+
 
 (define-method _get-rss-lineno-list ((self <oldtype-page>))

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/parse.scm

@@ -208 +208 @@
       (case (token-type tok)
         ((eof)  (reverse! seed))
-        ((null) (block (next-token ctx) ctx (cons `(div (@@ (lineno ,line-no)) (p-normal "\n")) seed)))
+        ((null) (block (next-token ctx) ctx (cons `(div (@@ (lineno ,line-no)) (p-normal " \n")) seed)))
         ((hr)   (block (next-token ctx) ctx (cons `(div (@@ (lineno ,line-no)) (hr)) seed)))
         ((open-single-verb)

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/staticimg/preview_list.html

@@ -8 +8 @@
 <img src="icon.person.png"/>
 <img src="dot16.png" /> 
-img src="dot18.png" /> 
+<img src="dot18.png" /> 
 <img src="dot20.png" /> 
 <img src="icon.accept.png" /> 

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/util.kahua

@@ -226 +226 @@
     ((rss)
      (img/ (@/ (src (string-append (oldtype:static-image-path) "icon.rss.png"))
-               (alt "RSS") (class "icon"))))
+               (alt "RSS"))))
+    ((plain)
+     (img/ (@/ (src (string-append (oldtype:static-image-path) "icon.article_text.png"))
+               (alt "PLAIN"))))
     (else
      `(p/ ,(format "!!Error : no such icon-image \"~a\"!!" sym)))))
@@ -347 +350 @@
    "/get-rss/" wikiname))
 
+(define (oldtype:gen-plain-path wikiname)
+  (string-append
+   "/show-plain/" wikiname))
+
 (define (oldtype:expand-wiki-name name)
   (let1 url-name

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/util.scm

@@ -1 +1 @@
 ;;;
-;;; oldtype/format.scm - format wiki pages (backward compatibility module)
-;;;
-;;;  Copyright (c) 2003-2006 Shiro Kawai, All rights reserved.
+;;; oldtype/util.scm - util for OldType
+;;;
+;;;  Copyright (c) 2008 Kiyoka Nishiyama, All rights reserved.
 ;;;
 ;;;  Permission is hereby granted, free of charge, to any person
@@ -25 +25 @@
 ;;;
 ;;; $Id: util.scm 199 2008-01-13 11:16:43Z kiyoka $
-;;;
-;;; Modified by kiyoka to implement OldType wiki formatter.
-;;; I renamed namespace of wiliki- 'oldtype-' to avoid collision of
-;;; installation.
 ;;;