[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/play/zone.el
From: |
Thien-Thi Nguyen |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/play/zone.el |
Date: |
Fri, 17 Dec 2004 06:59:25 -0500 |
Index: emacs/lisp/play/zone.el
diff -c emacs/lisp/play/zone.el:1.17 emacs/lisp/play/zone.el:1.18
*** emacs/lisp/play/zone.el:1.17 Thu Dec 16 17:13:22 2004
--- emacs/lisp/play/zone.el Fri Dec 17 11:47:16 2004
***************
*** 146,152 ****
(erase-buffer)
(setq buffer-undo-list t
truncate-lines t
! tab-width (zone-orig tab-width))
(insert text)
(untabify (point-min) (point-max))
(set-window-start (selected-window) (point-min))
--- 146,153 ----
(erase-buffer)
(setq buffer-undo-list t
truncate-lines t
! tab-width (zone-orig tab-width)
! line-spacing (zone-orig line-spacing))
(insert text)
(untabify (point-min) (point-max))
(set-window-start (selected-window) (point-min))
***************
*** 446,455 ****
(defsubst zone-cpos (pos)
(buffer-substring pos (1+ pos)))
! (defsubst zone-replace-char (direction char-as-string new-value)
! (delete-char direction)
(aset char-as-string 0 new-value)
! (insert char-as-string))
(defsubst zone-park/sit-for (pos seconds)
(let ((p (point)))
--- 447,456 ----
(defsubst zone-cpos (pos)
(buffer-substring pos (1+ pos)))
! (defsubst zone-replace-char (count del-count char-as-string new-value)
! (delete-char (or del-count (- count)))
(aset char-as-string 0 new-value)
! (dotimes (i count) (insert char-as-string)))
(defsubst zone-park/sit-for (pos seconds)
(let ((p (point)))
***************
*** 460,469 ****
(defun zone-fret (wbeg pos)
(let* ((case-fold-search nil)
(c-string (zone-cpos pos))
(hmm (cond
((string-match "[a-z]" c-string) (upcase c-string))
((string-match "[A-Z]" c-string) (downcase c-string))
! (t " "))))
(do ((i 0 (1+ i))
(wait 0.5 (* wait 0.8)))
((= i 20))
--- 461,471 ----
(defun zone-fret (wbeg pos)
(let* ((case-fold-search nil)
(c-string (zone-cpos pos))
+ (cw-ceil (ceiling (char-width (aref c-string 0))))
(hmm (cond
((string-match "[a-z]" c-string) (upcase c-string))
((string-match "[A-Z]" c-string) (downcase c-string))
! (t (propertize " " 'display `(space :width ,cw-ceil))))))
(do ((i 0 (1+ i))
(wait 0.5 (* wait 0.8)))
((= i 20))
***************
*** 496,511 ****
(recenter 0)
(sit-for 0)))
! (defun zone-fall-through-ws (c ww wbeg wend)
! (let ((fall-p nil) ; todo: move outward
! (wait 0.15))
! (while (when (= 32 (char-after (+ (point) ww 1)))
(setq fall-p t)
(delete-char 1)
! (insert " ")
! (forward-char ww)
(when (< (point) wend)
! (delete-char 1)
(insert c)
(forward-char -1)
(zone-park/sit-for wbeg (setq wait (* wait 0.8))))))
--- 498,522 ----
(recenter 0)
(sit-for 0)))
! (defun zone-fall-through-ws (c wbeg wend)
! (let* ((cw-ceil (ceiling (char-width (aref c 0))))
! (spaces (make-string cw-ceil 32))
! (col (current-column))
! (wait 0.15)
! newpos fall-p)
! (while (when (save-excursion
! (next-line 1)
! (and (= col (current-column))
! (setq newpos (point))
! (string= spaces (buffer-substring-no-properties
! newpos (+ newpos cw-ceil)))
! (setq newpos (+ newpos (1- cw-ceil)))))
(setq fall-p t)
(delete-char 1)
! (insert spaces)
! (goto-char newpos)
(when (< (point) wend)
! (delete-char cw-ceil)
(insert c)
(forward-char -1)
(zone-park/sit-for wbeg (setq wait (* wait 0.8))))))
***************
*** 523,529 ****
wend (window-end))
(catch 'done
(while (not (input-pending-p))
! (setq mc 0)
;; select non-ws character, but don't miss too much
(goto-char (+ wbeg (random (- wend wbeg))))
(while (looking-at "[ \n\f]")
--- 534,540 ----
wend (window-end))
(catch 'done
(while (not (input-pending-p))
! (setq mc 0 wend (window-end))
;; select non-ws character, but don't miss too much
(goto-char (+ wbeg (random (- wend wbeg))))
(while (looking-at "[ \n\f]")
***************
*** 535,551 ****
(when fret-p (zone-fret wbeg p))
(goto-char p)
(setq c (zone-cpos p)
! fall-p (zone-fall-through-ws c ww wbeg wend)))
;; assuming current-column has not changed...
(when (and pancake-p
fall-p
(< (count-lines (point-min) (point))
wh))
! (zone-replace-char 1 c ?@)
! (zone-park/sit-for wbeg 0.137)
! (zone-replace-char -1 c ?*)
! (zone-park/sit-for wbeg 0.137)
! (zone-replace-char -1 c ?_))))))
(defun zone-pgm-drip-fretfully ()
(zone-pgm-drip t))
--- 546,561 ----
(when fret-p (zone-fret wbeg p))
(goto-char p)
(setq c (zone-cpos p)
! fall-p (zone-fall-through-ws c wbeg wend)))
;; assuming current-column has not changed...
(when (and pancake-p
fall-p
(< (count-lines (point-min) (point))
wh))
! (let ((cw (ceiling (char-width (aref c 0)))))
! (zone-replace-char cw 1 c ?@) (zone-park/sit-for wbeg 0.137)
! (zone-replace-char cw nil c ?*) (zone-park/sit-for wbeg 0.137)
! (zone-replace-char cw nil c ?_)))))))
(defun zone-pgm-drip-fretfully ()
(zone-pgm-drip t))
***************
*** 652,658 ****
(setq s (zone-cpos (point))
c (aref s 0))
(zone-replace-char
! 1 s (cond ((or (> top (point))
(< bot (point))
(or (> 11 (setq col (current-column)))
(< rtc col)))
--- 662,669 ----
(setq s (zone-cpos (point))
c (aref s 0))
(zone-replace-char
! (char-width c)
! t s (cond ((or (> top (point))
(< bot (point))
(or (> 11 (setq col (current-column)))
(< rtc col)))
- [Emacs-diffs] Changes to emacs/lisp/play/zone.el, Thien-Thi Nguyen, 2004/12/11
- [Emacs-diffs] Changes to emacs/lisp/play/zone.el, Thien-Thi Nguyen, 2004/12/15
- [Emacs-diffs] Changes to emacs/lisp/play/zone.el, Thien-Thi Nguyen, 2004/12/15
- [Emacs-diffs] Changes to emacs/lisp/play/zone.el, Thien-Thi Nguyen, 2004/12/16
- [Emacs-diffs] Changes to emacs/lisp/play/zone.el, Thien-Thi Nguyen, 2004/12/16
- [Emacs-diffs] Changes to emacs/lisp/play/zone.el,
Thien-Thi Nguyen <=
- [Emacs-diffs] Changes to emacs/lisp/play/zone.el, Thien-Thi Nguyen, 2004/12/17