Changeset 8262 for lang/gauche

Timestamp:

03/22/08 00:45:00 (5 years ago)

Author:

kiyoka

Message:

Released stable version. (0.1.9)

Location:

lang/gauche/oldtype/branches/stable

Files:

• Kahua/oldtype/oldtype/format.scm (modified) (1 diff)
• Kahua/oldtype/oldtype/oldtype-mode.el (modified) (5 diffs)
• Kahua/oldtype/oldtype/oldtype.kahua (modified) (3 diffs)
• Kahua/oldtype/oldtype/util.kahua (modified) (1 diff)
• Kahua/oldtype/oldtype/util.scm (modified) (2 diffs)
• Kahua/oldtype/oldtype/version.kahua (modified) (1 diff)
• Makefile (modified) (1 diff)
• bin/ot_RecentChanges (modified) (2 diffs)
• edit/Test.ot (modified) (1 diff)
• src/Makefile (modified) (1 diff)

lang/gauche/oldtype/branches/stable/Kahua/oldtype/oldtype/format.scm

@@ -24 +24 @@
 ;;;  IN THE SOFTWARE.
 ;;;
-;;; $Id: format.scm 290 2008-03-01 01:55:39Z kiyoka $
+;;; $Id: format.scm 289 2008-03-01 01:50:33Z kiyoka $
 ;;;
 ;;; Modified by kiyoka to implement OldType wiki formatter.

lang/gauche/oldtype/branches/stable/Kahua/oldtype/oldtype/oldtype-mode.el

@@ -5 +5 @@
 ;;   Copyright (C) 2007 Kiyoka Nishiyama
 ;;
-;;     $Id: oldtype-mode.el 289 2008-03-01 01:50:33Z kiyoka $
+;;     $Id: oldtype-mode.el 242 2008-02-02 09:58:22Z kiyoka $
 ;;
 ;; This file is part of oldtype-mode
@@ -29 +29 @@
 ;;
 ;; ChangeLog:
+;;   [0.0.4]
+;;     1. Added image displaying feature for ##(amazon  asincode)  command.
+;;     2. Added image displaying feature for ##(youtube videocode) command.
+;;
 ;;   [0.0.3]
-;;     1. Added ##(amazon ASIN) command.
+;;     1. Supported URL to ##(amazon ASIN) command conversion feature.  ( C-c C-c key )
 ;;
 ;;   [0.0.2]
 ;;     1. Added ##(todo),##(undo) command.
 ;;     2. Added oldtype-openfile( wikiname ) function.
-
+;; 
 ;;   [0.0.1]
 ;;     1. first release
 ;;
 ;;
-(defconst oldtype-version "0.0.3")
+(defconst oldtype-version "0.0.4")
 
 (defconst oldtype-wikiname-face 'oldtype-wikiname-face)
@@ -305 +309 @@
 ;;
 (defun oldtype-install-fontification ()
+  ;;
+  ;; "4873113482"
+  ;;   => "http://images.amazon.com/images/P/4873113482.09.MZZZZZZZ_.jpg"
+  ;;
+  ;; test pattern:
+  ;;   (amazon-asincode-to-url "4873113482")
+  ;;
+  (defun amazon-asincode-to-url (asincode)
+    (format "http://images.amazon.com/images/P/%s.09.MZZZZZZZ_.jpg" asincode))
+
+  (defun youtube-video-to-url (videocode)
+    (format "http://img.youtube.com/vi/%s/1.jpg" videocode))
+
   (defun code-linep (pos)
     (save-excursion
@@ -329 +346 @@
         (_image-pattern
          "\\(##[(]img[ ]+\\)\\([^)]+\\)\\([)]\\)")
+        (_various-webservice-pattern
+         "\\(##[(]\\(amazon\\|youtube\\)[ ]+\\)\\([^)]+\\)\\([)]\\)")
         (_simple-command-pattern
          "\\(##[(]\\(todo\\|done\\)[)]\\)"))
@@ -362 +381 @@
              t)
 
+            ;; ##(amazon asincode), ##(youtube asincode), 
+            (,_various-webservice-pattern
+             3
+             (let* ((beg       (match-beginning 1))
+                    (command   (match-string-no-properties 2))
+                    (value     (match-string-no-properties 3))
+                    (end       (match-end 4)))
+               (compose-region beg
+                               end
+                               oldtype-image-icon-string)
+               (oldtype-remove-image beg
+                                     end)
+               (oldtype-insert-image-file beg
+                                          end
+                                          `(
+                                            (src . 
+                                                 ,(case (intern command)
+                                                    (amazon
+                                                     (amazon-asincode-to-url value))
+                                                    (youtube
+                                                     (youtube-video-to-url value))
+                                                    (nil
+                                                     ""))))))
+             t)
+            
             ;; ##(todo), ##(done) ...
             (,_simple-command-pattern

lang/gauche/oldtype/branches/stable/Kahua/oldtype/oldtype/oldtype.kahua

@@ -11 +11 @@
 (use oldtype.util)
 (use oldtype.kahualib)
+(use srfi-1)
 (load "oldtype/version.kahua")
 (load "oldtype/util.kahua")
@@ -152 +153 @@
                                          (if (oldtype:is-editable wikiname)
                                              (div/ (@/ (style "padding-left:  5em;")
-                                                       (onClick (format "otEditStart( ~a );" lineno)))
+                                                       (onDblClick (format "otEditStart( ~a );" lineno)))
                                                    _rest)
                                              (div/ (@/ (style "padding-left:  5em;"))
@@ -269 +270 @@
                  (oldtype:google-searchbox)))
           (br/)
-          (h1/ wikiname)
+          (h1/ wikiname  " "  (oldtype:hatena-bookmarks wikiname))
           barcode
           (hr/)

lang/gauche/oldtype/branches/stable/Kahua/oldtype/oldtype/util.kahua

@@ -330 +330 @@
   (file-exists?
    (gen-sexp-filename wikiname)))
+
+(define (oldtype:kahua-app-args)
+  (let1 alist
+        (map
+         (lambda (a b)
+           (cons a b))
+         (iota (length (kahua-app-args)))
+         (kahua-app-args))
+
+        (map
+         (lambda (key value)
+           (cons (string->symbol (cdr key))
+                 (cdr value)))
+         (filter (lambda (x) (= 0 (modulo (car x) 2)))  alist)
+         (filter (lambda (x) (= 1 (modulo (car x) 2)))  alist))))
+
+(define (oldtype:get-fqdn)
+  (assq-ref (oldtype:kahua-app-args) 'fqdn))
+
+(define (oldtype:hatena-bookmarks wikiname)
+  (let1 path (if (string=? wikiname "index")
+                 "/"
+                 (oldtype:gen-page-path wikiname))
+        (node-set/
+         (a/ (@/ (href (string-append "http://b.hatena.ne.jp/entry/http://" (oldtype:get-fqdn) path)))
+             (img/ (@/ (src "http://d.hatena.ne.jp/images/b_entry_de.gif"))))
+         (img/ (@/ (src (string-append "http://b.hatena.ne.jp/entry/image/http://" (oldtype:get-fqdn) path)))))))

lang/gauche/oldtype/branches/stable/Kahua/oldtype/oldtype/util.scm

@@ -108 +108 @@
 ;;   "2007-09-25T12:54:09.955196Z"
 ;; result:
-;;   ((nanosecond . 0) (second . 9) (minute . 54) (hour . 12) (day . 25) (month . 9) (year . 2007) (zone-offset . 9))
+;;   ((nanosecond . 0) (second . 9) (minute . 54) (hour . 12) (day . 25) (month . 9) (year . 2007) (zone-offset . 0))
 (define (oldtype:date-string->date-alist str)
   (let* ((splitted (map string->number (string-split str #/[TZ.\-:]/)))
@@ -119 +119 @@
                      (second splitted) ;;month
                      (first  splitted) ;;year
-                     +9 ;;zone-offset
+                     0 ;;zone-offset
                      )))
     `(

lang/gauche/oldtype/branches/stable/Kahua/oldtype/oldtype/version.kahua

@@ -7 +7 @@
 
 ;;---------------------------------------------------------
-(define *oldtype-version* "0.1.8")
+(define *oldtype-version* "0.1.9")

lang/gauche/oldtype/branches/stable/Makefile

@@ -7 +7 @@
         tar xfC ../stable.tar ../branches/stable
         /bin/rm -f ../stable.tar
+        cat ./config.sh | sed 's/OT_MASTER=nil/OT_MASTER=t/' | sed 's/site-unstable/site-stable/' > ../branches/stable/config.sh

lang/gauche/oldtype/branches/stable/bin/ot_RecentChanges

@@ -1 +1 @@
 #!/bin/bash
+DISPLAY_LINES=30
 
 . ${OT_HOME}/bin/lib.sh
@@ -24 +25 @@
       echo "- CHANGED ${commit_date}: [[${name}]] by ([[${commit_author}]])"
   fi
-done | sort -r > ${OT_EDITHOME}/edit/!RecentChanges.ot.tmp
+done | sort -r | head -${DISPLAY_LINES} > ${OT_EDITHOME}/edit/!RecentChanges.ot.tmp
 if [ -s ${OT_EDITHOME}/edit/!RecentChanges.ot.tmp ]; then
   /bin/mv -f ${OT_EDITHOME}/edit/!RecentChanges.ot.tmp ${OT_EDITHOME}/edit/!RecentChanges.ot

lang/gauche/oldtype/branches/stable/edit/Test.ot

@@ -1 @@
-* 行指向のWiki記法
-このページはOldTypeの記法の実験を兼ねています。
-どんなことが出来るかはサンプルを見てもらえれば大体わかるはずです。
+* UnitTest用のサンプルファイル
 
-** 段落
-!行頭から文章を始めると、1行1段落になります。
-!次の行です。
-行頭から文章を始めると、1行1段落になります。
-次の行です。
-
-** 引用
-! 行頭に1つ以上のスペースを入れると、引用になります。
-! 次の行です。
- 行頭に1つ以上のスペースを入れると、引用になります。
- 次の行です。
-
-** WikiName
-! 表記:
-!   [[Test:FormatSample]]
-!   [[FileDoesNotExist]]
-- [[Test:フォーマットサンプル]]
-箇条書きの下位レベルの文章
-- [[ThisNameDoesNotExist]]
-
-
-** 外部リンク
-! 表記:
-!   [[http://www.sumibi.org/|Sumibi.org]]
-!   http://www.sumibi.org/
-!   http://farm2.static.flickr.com/1041/611353730_691b8e1771_m.jpg
-- [[http://www.sumibi.org/|Sumibi.org]]へのリンク
-- http://www.sumibi.org/
-- http://farm2.static.flickr.com/1041/611353730_691b8e1771_m.jpg
-** 画像
-! 表記:
-!   ##(img ../img/sasami_face48.png)
-- ささみのアイコン
-  ##(img ../img/sasami_face48.png)
-! 表記:
-!   ##(img http://farm2.static.flickr.com/1041/611353730_691b8e1771_m.jpg)
-- 途中で寝ちゃいました...
-  ##(img http://farm2.static.flickr.com/1041/611353730_691b8e1771_m.jpg)
-
-** 見出し
-
-! 表記:
-!* 1番目
-!** 2番目
-!*** 3番目
-* 1番目
-** 2番目
-*** 3番目
-
-
-** 箇条書き
-! 表記:
-!- 1番目
-!-- 2番目
-!--- 3番目
-- 1番目
--- 2番目
---- 3番目
-
-! 表記:
-!# 1番目
-!## 2番目
-!### 3番目
-# 1番目
-## 2番目
-### 3番目
-
-! 表記:
-!----
-----
-

lang/gauche/oldtype/branches/stable/src/Makefile

@@ -19 +19 @@
 svninfo:
         svn --xml info ${OTSAMPLE} > info.xml
-        ./oldtype_svninfo shell < info.xml
-
-t:
-        ./oldtype_svninfo shell < /tmp/t.xml
+        gosh -I ../Kahua/oldtype ./oldtype_svninfo shell < info.xml