June 2005 - climacs-cvs@common-lisp.net - mailman3.common-lisp.net

[climacs-cvs] CVS update: climacs/gui.lisp climacs/undo.lisp
by rstrandh＠common-lisp.net 28 Jun '05

28 Jun '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv15953 Modified Files: gui.lisp undo.lisp Log Message: Fixed a few bugs in the calls to undo and redo (thanks to Dirk Gerrits for reporting these) Date: Tue Jun 28 07:02:35 2005 Author: rstrandh Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.147 climacs/gui.lisp:1.148 --- climacs/gui.lisp:1.147 Wed Jun 22 20:35:59 2005 +++ climacs/gui.lisp Tue Jun 28 07:02:34 2005 @@ -1300,11 +1300,13 @@ ;;; Undo/redo (define-named-command com-undo () - (undo (undo-tree (buffer (current-window)))) + (handler-case (undo (undo-tree (buffer (current-window)))) + (no-more-undo () (beep) (display-message "No more undo"))) (full-redisplay (current-window))) (define-named-command com-redo () - (redo (undo-tree (buffer (current-window)))) + (handler-case (redo (undo-tree (buffer (current-window)))) + (no-more-undo () (beep) (display-message "No more redo"))) (full-redisplay (current-window))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Index: climacs/undo.lisp diff -u climacs/undo.lisp:1.1 climacs/undo.lisp:1.2 --- climacs/undo.lisp:1.1 Mon Jan 24 14:12:52 2005 +++ climacs/undo.lisp Tue Jun 28 07:02:34 2005 @@ -65,8 +65,8 @@ (:documentation "Protocol class for all undo trees")) (defclass standard-undo-tree (undo-tree) - ((current-record :initform nil :accessor current-record) - (leaf-record :initform nil :accessor leaf-record) + ((current-record :accessor current-record) + (leaf-record :accessor leaf-record) (redo-path :initform '() :accessor redo-path) (children :initform '() :accessor children) (depth :initform 0 :reader depth)) @@ -74,7 +74,8 @@ (defmethod initialize-instance :after ((tree standard-undo-tree) &rest args) (declare (ignore args)) - (setf (current-record tree) tree)) + (setf (current-record tree) tree + (leaf-record tree) tree)) (defclass undo-record () () (:documentation "The protocol class for all undo records."))

1 0

[climacs-cvs] CVS update: papers/ilc2005/syntax/climacs-slides.slidemacs
by bmastenbrook＠common-lisp.net 24 Jun '05

24 Jun '05

Update of /project/climacs/cvsroot/papers/ilc2005/syntax In directory common-lisp.net:/tmp/cvs-serv22804 Modified Files: climacs-slides.slidemacs Log Message: Commit the slides I actually used Date: Fri Jun 24 16:54:06 2005 Author: bmastenbrook Index: papers/ilc2005/syntax/climacs-slides.slidemacs diff -u papers/ilc2005/syntax/climacs-slides.slidemacs:1.5 papers/ilc2005/syntax/climacs-slides.slidemacs:1.6 --- papers/ilc2005/syntax/climacs-slides.slidemacs:1.5 Wed Jun 22 19:01:38 2005 +++ papers/ilc2005/syntax/climacs-slides.slidemacs Fri Jun 24 16:54:06 2005 @@ -15,8 +15,13 @@ } slide "Climacs" { * "An editor in the Emacs tradition" -* "A framework for syntax-capable editing" * "A CLIM application" +* "A framework for syntax-capable editing" +} +slide "Syntax-capable editing" { +* "What's syntax-capable editing?" +* "Editing with rich information derived from lexical properties" +* "Two quick demos" } slide "CLIM" { * "The Common Lisp Interface Manager" @@ -134,7 +139,7 @@ slide "Parse tree display, cont." { * "Or it could be any CLIM presentation:" url "http://www.common-lisp.net/project/climacs/" -reveal "Another presentation" "Hello, world!" +reveal "Click me!" "Hello, world!" * "Where's the information for that popup?" } slide "Advantages of Earley" {

1 0

[climacs-cvs] CVS update: climacs/slidemacs-gui.lisp
by bmastenbrook＠common-lisp.net 22 Jun '05

22 Jun '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv15901 Modified Files: slidemacs-gui.lisp Log Message: MORE RED PRESENTATIONS Date: Wed Jun 22 20:36:13 2005 Author: bmastenbrook Index: climacs/slidemacs-gui.lisp diff -u climacs/slidemacs-gui.lisp:1.15 climacs/slidemacs-gui.lisp:1.16 --- climacs/slidemacs-gui.lisp:1.15 Tue Jun 21 18:51:05 2005 +++ climacs/slidemacs-gui.lisp Wed Jun 22 20:36:13 2005 @@ -300,7 +300,9 @@ (define-presentation-method present (object (type slidemacs-url) stream (view textual-view) &key &allow-other-keys) - (display-text-with-wrap-for-pane object stream)) + (with-drawing-options (stream :ink +blue+) + (surrounding-output-with-border (stream :shape :underline) + (display-text-with-wrap-for-pane object stream)))) (define-command (com-browse-to-url :name "Browse To URL" :command-table global-command-table @@ -341,8 +343,18 @@ stream (view textual-view) &key &allow-other-keys) (with-slots (button-label) object - (display-text-with-wrap-for-pane (slidemacs-entity-string button-label) - stream))) + (let (record) + (with-output-to-output-record (stream 'standard-sequence-output-record rec) + (display-text-with-wrap-for-pane (slidemacs-entity-string button-label) + stream) + (setf record rec)) + (multiple-value-bind (sx sy) (stream-cursor-position stream) + (setf (output-record-position record) (values sx sy)) + (with-bounding-rectangle* (x1 y1 x2 y2) record + (draw-rectangle* stream x1 y1 x2 y2 :filled t :line-thickness 1 :ink (make-rgb-color 1.0 0.7 0.7)) + (stream-add-output-record stream record) + (stream-increment-cursor-position stream (- x2 x1) + (- y2 y1))))))) (define-command (com-reveal-text :name "Reveal Text In Window" :command-table global-command-table @@ -525,11 +537,11 @@ (syntax (syntax buffer))) (typecase syntax (slidemacs-gui-syntax - (climacs-gui::set-syntax (make-instance 'slidemacs-editor-syntax - :buffer buffer))) + (setf (syntax buffer) (make-instance 'slidemacs-editor-syntax + :buffer buffer))) (slidemacs-editor-syntax - (climacs-gui::set-syntax (make-instance 'slidemacs-gui-syntax - :buffer buffer)))))) + (setf (syntax buffer) (make-instance 'slidemacs-gui-syntax + :buffer buffer)))))) (climacs-gui::global-set-key '(#\= :control) 'com-next-talking-point) (climacs-gui::global-set-key '(#\- :control) 'com-previous-talking-point)

1 0

[climacs-cvs] CVS update: climacs/gui.lisp climacs/pane.lisp
by bmastenbrook＠common-lisp.net 22 Jun '05

22 Jun '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv15864 Modified Files: gui.lisp pane.lisp Log Message: Add an :after method on (setf syntax) for buffers; this updates the top and bottom marks correctly Date: Wed Jun 22 20:35:59 2005 Author: bmastenbrook Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.146 climacs/gui.lisp:1.147 --- climacs/gui.lisp:1.146 Sat Jun 18 04:01:56 2005 +++ climacs/gui.lisp Wed Jun 22 20:35:59 2005 @@ -904,13 +904,6 @@ (psetf (offset (mark pane)) (offset (point pane)) (offset (point pane)) (offset (mark pane))))) -(defun set-syntax (syntax) - (let* ((pane (current-window)) - (buffer (buffer pane))) - (setf (syntax buffer) syntax) - (setf (offset (low-mark buffer)) 0 - (offset (high-mark buffer)) (size buffer)))) - (define-named-command com-set-syntax () (let* ((pane (current-window)) (buffer (buffer pane))) @@ -919,9 +912,7 @@ (progn (beep) (display-message "No such syntax") (return-from com-set-syntax nil))) - :buffer (buffer (point pane)))) - (setf (offset (low-mark buffer)) 0 - (offset (high-mark buffer)) (size buffer)))) + :buffer (buffer (point pane)))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Index: climacs/pane.lisp diff -u climacs/pane.lisp:1.26 climacs/pane.lisp:1.27 --- climacs/pane.lisp:1.26 Mon May 9 16:47:45 2005 +++ climacs/pane.lisp Wed Jun 22 20:35:59 2005 @@ -210,6 +210,10 @@ 'basic-syntax :buffer (implementation buffer)) point (clone-mark (low-mark buffer) :right)))) +(defmethod (setf syntax) :after (syntax (buffer climacs-buffer)) + (setf (offset (low-mark buffer)) 0 + (offset (high-mark buffer)) (size buffer))) + (defclass climacs-pane (application-pane) ((buffer :initform (make-instance 'climacs-buffer) :accessor buffer) (point :initform nil :initarg :point :accessor point) @@ -250,7 +254,7 @@ (with-slots (buffer top bot scan) pane (setf top (clone-mark (low-mark buffer) :left) bot (clone-mark (high-mark buffer) :right))) - (setf (stream-default-view pane) (make-instance 'climacs-textual-view)) + (setf (stream-default-view pane) (make-instance 'climacs-textual-view)) (with-slots (space-width tab-width) (stream-default-view pane) (let* ((medium (sheet-medium pane)) (style (medium-text-style medium)))

1 0

[climacs-cvs] CVS update: papers/ilc2005/syntax/climacs-slides.slidemacs
by bmastenbrook＠common-lisp.net 22 Jun '05

22 Jun '05

Update of /project/climacs/cvsroot/papers/ilc2005/syntax In directory common-lisp.net:/tmp/cvs-serv10265 Modified Files: climacs-slides.slidemacs Log Message: Add the current version of the slides Date: Wed Jun 22 19:01:38 2005 Author: bmastenbrook Index: papers/ilc2005/syntax/climacs-slides.slidemacs diff -u papers/ilc2005/syntax/climacs-slides.slidemacs:1.4 papers/ilc2005/syntax/climacs-slides.slidemacs:1.5 --- papers/ilc2005/syntax/climacs-slides.slidemacs:1.4 Sat Jun 18 04:02:10 2005 +++ papers/ilc2005/syntax/climacs-slides.slidemacs Wed Jun 22 19:01:38 2005 @@ -8,24 +8,28 @@ venue "International Lisp Conference 2005" date } slide "Outline" { -* "What is Climacs?" -* "Abstractions for buffer representation" -* "Abstractions for syntax analysis" -* "Future directions" +* "What is Climacs? Why Climacs?" +* "How does it work?" +* "What will it do in the future?" * "Demos" } slide "Climacs" { * "An editor in the Emacs tradition" * "A framework for syntax-capable editing" * "A CLIM application" -* "Protocols for buffer implementation and syntax analysis" } slide "CLIM" { * "The Common Lisp Interface Manager" * "Standard for user interfaces and graphics in Common Lisp" * "Free implementation in McCLIM" } -slide "Comparable editors" { +slide "Climacs in CLIM" { +* "Display implemented with arbitrary CLIM methods" +* "Here's a presentation:" +reveal "This is a presentation object" "... and this is something it +can do" +} +slide "Historical editors" { * "ZMacs - the famous Lisp machine editor" * "SEdit, the InterLisp structure editor" * "Hemlock, CMUCL's editor" @@ -62,23 +66,36 @@ * "Support for incremental lexers and parsers" * "BYO or use the included Earley parser" } -slide "Syntax protocol, cont." -{ -* "Two major kinds of syntax modes" -* "Per-window parsing functions" -* "Per-buffer parsing functions" +slide "Lexer and Parser" { +* "Incremental lexer creates objects for each lexeme" +* "Parser parses lexemes into production classes" +* "In Earley parser, parsing rules can include any code" } -slide "Syntax protocol, cont." -{ -* "Per-window parsing keeps parse tree up to date in window area" -* "Useful when parser function is slow" -* "Not suitable when parse tree is used for something else" +graph "Sample parser class hierarchy" { +horizontal +root "parse-tree" +edge from "parse-tree" to "ttcn3-parse-tree" +edge from "ttcn3-parse-tree" to "ttcn3-entry" +edge from "ttcn3-entry" to "ttcn3-lexeme" +edge from "ttcn3-lexeme" to /lexeme classes/ +edge from "ttcn3-entry" to /parser production classes/ +edge from "ttcn3-entry" to "empty-ttcn3-terminals" +edge from "ttcn3-entry" to "ttcn3-nonterminal" +edge from "ttcn3-entry" to "ttcn3-terminal" +} +slide "Parser invocation: update-syntax" { +* "(update-syntax buffer (syntax buffer))" +* "buffer has two slots containing marks: top and bot" +* "top and bot denote the region which is out-of-date" +* "Application can call its own parser or invoke Climacs' Earley +parser" } slide "Syntax protocol, cont." { +* "Specializing update-syntax implements per-buffer parsing" * "Per-buffer parsing keeps whole buffer parse tree up to date" * "Useful when parser function is fast, or" -* "when parse tree is used for another application" +* "when complete parse tree is used for another application" } slide "Per-window parsing" { @@ -87,33 +104,38 @@ * "TTCN-3" * "HTML" } +slide "Parser invocation: update-syntax-for-display" { +* "Pane calls update-syntax-for-display with on-screen region" +* "Application updates syntax in the on-screen region" +* "Parsing is based on already up-to-date off-screen region" +} +slide "Syntax protocol, cont." +{ +* "Specializing update-syntax-for-display implements per-window parsing" +* "Per-window parsing keeps parse tree up to date in window area" +* "Useful when parser function is slow" +* "Not suitable when parse tree is used for something else" +} slide "Per-buffer parsing" { * "New Lisp syntax (parsing is fast)" * "Slidemacs syntax (used for slide display)" * "Tabcode editor (used for tablature display)" } -slide "Lexer and Parser" { -* "Incremental lexer creates objects for each lexeme" -* "Parser parses lexemes into production classes" -* "In Earley parser, parsing rules can include any code" +slide "Display" { +* "Climacs is a good CLIM citizen" +* "This means you can use any presentation type or display in a syntax" } -graph "Sample parser class hierarchy" { -horizontal -root "parse-tree" -edge from "parse-tree" to "ttcn3-parse-tree" -edge from "ttcn3-parse-tree" to "ttcn3-entry" -edge from "ttcn3-entry" to "ttcn3-lexeme" -edge from "ttcn3-lexeme" to /lexeme classes/ -edge from "ttcn3-entry" to /parser production classes/ -edge from "ttcn3-entry" to "empty-ttcn3-terminals" -edge from "ttcn3-entry" to "ttcn3-nonterminal" -edge from "ttcn3-entry" to "ttcn3-terminal" +slide "Parse tree display" { +* "Application controls display of parse tree" +* "Could be a simple colorised display of text..." +* "... or a specialized display of the parse tree" } -slide "Parser invocation" { -* "Climacs calls update-syntax-for-display or update-syntax" -* "Parser is passed top and bottom marks of out-of-date region" -* "Application can call its own parser or invoke Climacs' Earley parser" +slide "Parse tree display, cont." { +* "Or it could be any CLIM presentation:" +url "http://www.common-lisp.net/project/climacs/" +reveal "Another presentation" "Hello, world!" +* "Where's the information for that popup?" } slide "Advantages of Earley" { * "No grammar preprocessing required" @@ -126,11 +148,6 @@ * "Slidemacs grammar is acceptably fast on Earley parser, but not all languages are; worst case complexity is O(n^3)" } -slide "Parse tree display" { -* "Application controls display of parse tree" -* "Could be a simple colorised display of text..." -* "... or a specialized display of the parse tree" -} slide "Future directions" { * "More improvements to McCLIM (speed, completeness)" * "Better Lisp mode" @@ -151,10 +168,12 @@ } slide "Demos" { * "Lisp mode and incremental parser" +* "Prolog mode" * "Slidemacs mode" * "Tabcode editor" } slide "Thanks!" { * /Questions?/ +url "http://www.common-lisp.net/project/climacs/" } }

1 0

[climacs-cvs] CVS update: climacs/slidemacs-gui.lisp climacs/slidemacs.lisp
by bmastenbrook＠common-lisp.net 21 Jun '05

21 Jun '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv18270 Modified Files: slidemacs-gui.lisp slidemacs.lisp Log Message: MORE PRESENTATION OBJECTS: urls and reveal buttons Date: Tue Jun 21 18:51:05 2005 Author: bmastenbrook Index: climacs/slidemacs-gui.lisp diff -u climacs/slidemacs-gui.lisp:1.14 climacs/slidemacs-gui.lisp:1.15 --- climacs/slidemacs-gui.lisp:1.14 Mon Jun 20 19:33:11 2005 +++ climacs/slidemacs-gui.lisp Tue Jun 21 18:51:05 2005 @@ -80,7 +80,7 @@ (let ((*handle-whitespace* nil)) (call-next-method))) -(defun undisplay-text-with-wrap-for-pane (text pane) +(defun display-text-with-wrap-for-pane (text pane) (let* ((text (substitute #\space #\newline text)) (split (remove "" @@ -295,6 +295,79 @@ (display-text-with-wrap-for-pane bullet-text pane)) (terpri pane)))) +(define-presentation-type slidemacs-url () :inherit-from 'string) + +(define-presentation-method present (object (type slidemacs-url) + stream (view textual-view) + &key &allow-other-keys) + (display-text-with-wrap-for-pane object stream)) + +(define-command (com-browse-to-url :name "Browse To URL" + :command-table global-command-table + :menu t + :provide-output-destination-keyword t) + ((url 'slidemacs-url :prompt "url")) + #+sbcl + (sb-ext:run-program "/usr/bin/open" (list url))) + +(define-presentation-to-command-translator browse-url-translator + (slidemacs-url com-browse-to-url global-command-table + :gesture :select + :documentation "Browse To URL" + :pointer-documentation "Browse To URL") + (presentation) + (list (presentation-object presentation))) + +(defmethod display-parse-tree ((entity url-point) (syntax slidemacs-gui-syntax) pane) + (stream-write-string pane " ") + (with-text-style (pane `(:sans-serif :roman ,(getf *slidemacs-sizes* :bullet))) + (with-slots (url-string) entity + (display-parse-tree url-string syntax pane)))) + +(defmethod display-parse-tree ((entity url-string) (syntax slidemacs-gui-syntax) pane) + (with-slots (slidemacs-string) entity + (let ((is-italic (typep (slot-value slidemacs-string 'item) + 'slidemacs-italic-string)) + (bullet-text (slidemacs-entity-string entity))) + (if is-italic + (with-text-face (pane :italic) + (present bullet-text 'slidemacs-url :stream pane)) + (present bullet-text 'slidemacs-url :stream pane)) + (terpri pane)))) + +(define-presentation-type reveal-button () :inherit-from t) + +(define-presentation-method present (object (type reveal-button) + stream (view textual-view) + &key &allow-other-keys) + (with-slots (button-label) object + (display-text-with-wrap-for-pane (slidemacs-entity-string button-label) + stream))) + +(define-command (com-reveal-text :name "Reveal Text In Window" + :command-table global-command-table + :menu t + :provide-output-destination-keyword t) + ((text 'string :prompt "text")) + (let ((stream (open-window-stream))) + (with-text-style (stream `(:sans-serif :roman ,(getf *slidemacs-sizes* :bullet))) + (write-string text stream)))) + +(define-presentation-to-command-translator reveal-text-translator + (reveal-button com-reveal-text global-command-table + :gesture :select + :documentation "Reveal Text In Window" + :pointer-documentation "Reveal Text In Window") + (presentation) + (with-slots (reveal-text) (presentation-object presentation) + (list (slidemacs-entity-string reveal-text)))) + +(defmethod display-parse-tree ((entity reveal-button-point) (syntax slidemacs-gui-syntax) pane) + (write-string " " pane) + (with-text-style (pane `(:sans-serif :roman ,(getf *slidemacs-sizes* :bullet))) + (present entity 'reveal-button :stream pane)) + (terpri pane)) + #+(or) (defun draw-picture (stream pattern) (multiple-value-bind (x y) Index: climacs/slidemacs.lisp diff -u climacs/slidemacs.lisp:1.5 climacs/slidemacs.lisp:1.6 --- climacs/slidemacs.lisp:1.5 Sat Jun 18 15:58:49 2005 +++ climacs/slidemacs.lisp Tue Jun 21 18:51:05 2005 @@ -290,13 +290,20 @@ nonempty-list-of-bullets block-close) (:= slidemacs-slide-keyword "slide") (:= slidemacs-slide-name slidemacs-string) - (:= nonempty-list-of-bullets (nonempty-list-of slidemacs-bullet-or-picture)) - (:= slidemacs-bullet-or-picture (or slidemacs-bullet picture-node)) + (:= nonempty-list-of-bullets (nonempty-list-of slidemacs-bullet-types)) + (:= slidemacs-bullet-types (or slidemacs-bullet picture-node url-point reveal-button-point)) (:= slidemacs-bullet bullet talking-point) (:= talking-point slidemacs-string) (:= picture-node picture-keyword picture-pathname) (:= picture-keyword "picture") - (:= picture-pathname slidemacs-string)) + (:= picture-pathname slidemacs-string) + (:= url-point url-keyword url-string) + (:= url-keyword "url") + (:= url-string slidemacs-string) + (:= reveal-button-point reveal-keyword button-label reveal-text) + (:= reveal-keyword "reveal") + (:= button-label slidemacs-string) + (:= reveal-text slidemacs-string)) (defmethod display-parse-tree ((entity slidemacs-terminal) (syntax slidemacs-editor-syntax) pane) (with-slots (item) entity

1 0

[climacs-cvs] CVS update: climacs/slidemacs-gui.lisp
by bmastenbrook＠common-lisp.net 20 Jun '05

20 Jun '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv31653 Modified Files: slidemacs-gui.lisp Log Message: Stub out some junk code Date: Mon Jun 20 19:33:11 2005 Author: bmastenbrook Index: climacs/slidemacs-gui.lisp diff -u climacs/slidemacs-gui.lisp:1.13 climacs/slidemacs-gui.lisp:1.14 --- climacs/slidemacs-gui.lisp:1.13 Sun Jun 19 19:17:34 2005 +++ climacs/slidemacs-gui.lisp Mon Jun 20 19:33:11 2005 @@ -64,12 +64,13 @@ (let ((*current-slideset* (slidemacs-entity-string slidemacs-slideset-name)) (*did-display-a-slide* nil) (*postscript-display* t)) - (display-parse-tree slideset-info syntax stream) - (traverse-list-entry nonempty-list-of-slides - 'slidemacs-all-slide-types - (lambda (slide) - (new-page stream) - (display-parse-tree slide syntax stream)))))) + (with-translation (stream 20 70) + (display-parse-tree slideset-info syntax stream) + (traverse-list-entry nonempty-list-of-slides + 'slidemacs-all-slide-types + (lambda (slide) + (new-page stream) + (display-parse-tree slide syntax stream))))))) (defmethod display-parse-tree ((parse-tree slidemacs-slideset-keyword) (syntax slidemacs-gui-syntax) pane) (format *debug-io* "Oops!~%") @@ -118,9 +119,7 @@ :slideset-info 32)) (defmethod display-parse-tree ((parse-tree slideset-info) (syntax slidemacs-gui-syntax) pane) - (with-text-style (pane `(:sans-serif :bold ,(getf *slidemacs-sizes* :slideset-title))) - (when *postscript-display* - (loop repeat 2 do (terpri pane))) + (with-text-style (pane `(:sans-serif :bold ,(getf *slidemacs-sizes* :slideset-title))) (display-text-with-wrap-for-pane *current-slideset* pane) (terpri pane)) @@ -260,13 +259,11 @@ :merge-duplicates t :duplicate-test #'equal :graph-type :tree - :move-cursor nil + :move-cursor t )))))) (defmethod display-parse-tree ((entity slidemacs-slide-name) (syntax slidemacs-gui-syntax) pane) - (with-text-style (pane `(:sans-serif :bold ,(getf *slidemacs-sizes* :title))) - (when *postscript-display* - (loop repeat 2 do (terpri pane))) + (with-text-style (pane `(:sans-serif :bold ,(getf *slidemacs-sizes* :title))) (display-text-with-wrap-for-pane (slidemacs-entity-string entity) pane) (terpri pane))) @@ -298,6 +295,7 @@ (display-text-with-wrap-for-pane bullet-text pane)) (terpri pane)))) +#+(or) (defun draw-picture (stream pattern) (multiple-value-bind (x y) (stream-cursor-position stream) @@ -311,25 +309,27 @@ (make-translation-transformation x y) pattern))))) +#+(or) (defparameter *picture-cache* (make-hash-table :test #'equal)) +#+(or) (defun load-and-cache-xpm (pathname) nil - #+nil (let ((hash-key (cons pathname (file-write-date pathname)))) (let ((pattern (gethash hash-key *picture-cache*))) (if pattern pattern (setf (gethash hash-key *picture-cache*) (climi::xpm-parse-file pathname)))))) +#+(or) (defmethod display-parse-tree ((entity picture-node) (syntax slidemacs-gui-syntax) pane) (with-slots (picture-pathname) entity (let ((real-pathname (slidemacs-entity-string picture-pathname))) (if (probe-file real-pathname) (let ((pattern (load-and-cache-xpm real-pathname))) (format *debug-io* "Loaded ~S!~%" real-pathname) - (with-output-recording-options (pane nil t) + (with-output-recording-options (pane :record nil :draw t) (draw-picture pane pattern))) (with-text-style (pane `(:sans-serif :roman ,(getf *slidemacs-sizes* :bullet))) (display-text-with-wrap-for-pane (format nil "Missing picture ~S" real-pathname) pane)))))) @@ -369,7 +369,7 @@ (with-open-file (file-stream file :direction :output :if-exists :supersede) (with-output-to-postscript-stream - (stream file-stream) + (stream file-stream :orientation :landscape :device-type :letter) (with-drawing-options (stream :ink *slidemacs-gui-ink*) (with-slots (top bot point) pane (let ((syntax (syntax (buffer pane))))

1 0

[climacs-cvs] CVS update: climacs/slidemacs-gui.lisp
by bmastenbrook＠common-lisp.net 19 Jun '05

19 Jun '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv5491 Modified Files: slidemacs-gui.lisp Log Message: Postscript export is getting there... Date: Sun Jun 19 19:17:35 2005 Author: bmastenbrook Index: climacs/slidemacs-gui.lisp diff -u climacs/slidemacs-gui.lisp:1.12 climacs/slidemacs-gui.lisp:1.13 --- climacs/slidemacs-gui.lisp:1.12 Sat Jun 18 15:58:49 2005 +++ climacs/slidemacs-gui.lisp Sun Jun 19 19:17:34 2005 @@ -41,7 +41,7 @@ (1- (end-offset entity))) 'string)) -(defparameter *no-check-point* nil) +(defparameter *postscript-display* nil) (defmethod display-parse-tree ((parse-tree slidemacs-slideset) (syntax slidemacs-gui-syntax) pane) (with-slots (slideset-info nonempty-list-of-slides slidemacs-slideset-name) parse-tree @@ -63,16 +63,13 @@ (with-slots (slideset-info nonempty-list-of-slides slidemacs-slideset-name) parse-tree (let ((*current-slideset* (slidemacs-entity-string slidemacs-slideset-name)) (*did-display-a-slide* nil) - (*no-check-point* t)) + (*postscript-display* t)) (display-parse-tree slideset-info syntax stream) - (new-page stream) (traverse-list-entry nonempty-list-of-slides 'slidemacs-all-slide-types (lambda (slide) - (format *debug-io* "Displaying slide ~S~%" - slide) - (display-parse-tree slide syntax stream) - (new-page stream)))))) + (new-page stream) + (display-parse-tree slide syntax stream)))))) (defmethod display-parse-tree ((parse-tree slidemacs-slideset-keyword) (syntax slidemacs-gui-syntax) pane) (format *debug-io* "Oops!~%") @@ -82,7 +79,7 @@ (let ((*handle-whitespace* nil)) (call-next-method))) -(defmethod display-text-with-wrap-for-pane (text (pane climacs-pane)) +(defun undisplay-text-with-wrap-for-pane (text pane) (let* ((text (substitute #\space #\newline text)) (split (remove "" @@ -113,10 +110,6 @@ (write-string word pane)))) (terpri pane))) -(defmethod display-text-with-wrap-for-pane (text pane) - (stream-write-string pane text) - (terpri pane)) - (defparameter *slidemacs-sizes* '(:title 48 :bullet 32 @@ -126,6 +119,8 @@ (defmethod display-parse-tree ((parse-tree slideset-info) (syntax slidemacs-gui-syntax) pane) (with-text-style (pane `(:sans-serif :bold ,(getf *slidemacs-sizes* :slideset-title))) + (when *postscript-display* + (loop repeat 2 do (terpri pane))) (display-text-with-wrap-for-pane *current-slideset* pane) (terpri pane)) @@ -178,7 +173,7 @@ (slidemacs-entity-string opt-date-string) pane))))) (defmethod display-parse-tree ((parse-tree slidemacs-slide) (syntax slidemacs-gui-syntax) pane) - (when (or *no-check-point* + (when (or *postscript-display* (with-slots (point) pane (and (mark>= point (start-offset parse-tree)) (mark<= point (end-offset parse-tree))))) @@ -202,7 +197,7 @@ (b)))) (defmethod display-parse-tree ((parse-tree slidemacs-graph-slide) (syntax slidemacs-gui-syntax) pane) - (when (or *no-check-point* + (when (or *postscript-display* (with-slots (point) pane (and (mark>= point (start-offset parse-tree)) (mark<= point (end-offset parse-tree))))) @@ -270,6 +265,8 @@ (defmethod display-parse-tree ((entity slidemacs-slide-name) (syntax slidemacs-gui-syntax) pane) (with-text-style (pane `(:sans-serif :bold ,(getf *slidemacs-sizes* :title))) + (when *postscript-display* + (loop repeat 2 do (terpri pane))) (display-text-with-wrap-for-pane (slidemacs-entity-string entity) pane) (terpri pane))) @@ -277,7 +274,7 @@ (defmethod display-parse-tree ((entity slidemacs-bullet) (syntax slidemacs-gui-syntax) pane) (stream-write-string pane " ") (with-text-style (pane `(:sans-serif :roman ,(getf *slidemacs-sizes* :bullet))) - (if (and (not *no-check-point*) + (if (and (not *postscript-display*) (with-slots (point) pane (and (mark>= point (start-offset entity)) (mark<= point (end-offset entity))))) @@ -318,6 +315,8 @@ (make-hash-table :test #'equal)) (defun load-and-cache-xpm (pathname) + nil + #+nil (let ((hash-key (cons pathname (file-write-date pathname)))) (let ((pattern (gethash hash-key *picture-cache*))) (if pattern pattern @@ -366,8 +365,8 @@ ;;; It's not necessary to draw the cursor, and in fact quite confusing ))) -(defun postscript-print-pane (pane) - (with-open-file (file-stream "slides.ps" :direction :output +(defun postscript-print-pane (pane file) + (with-open-file (file-stream file :direction :output :if-exists :supersede) (with-output-to-postscript-stream (stream file-stream) @@ -467,28 +466,10 @@ (climacs-gui::global-set-key '(#\- :control :meta) 'com-first-talking-point) (climacs-gui::global-set-key '(#\s :control :meta) 'com-flip-slidemacs-syntax) -(defun next-text-size (size) - (if (symbolp size) 16 ;obviously - (+ size 4))) - -(defun prev-text-size (size) - (if (symbolp size) 12 ;obviously - (if (> size 4) - (- size 4) - size))) - -(climacs-gui::define-named-command com-increase-text-size () - (symbol-macrolet ((style (medium-text-style (sheet-medium (climacs-gui::current-window))))) - (format *debug-io* "Size is ~S~%" (text-style-size style)) - (setf style (make-text-style (text-style-family style) - (text-style-face style) - (next-text-size (text-style-size style)))) - (format *debug-io* "Size is now ~S~%" (text-style-size style))) - (full-redisplay (climacs-gui::current-window))) - -(climacs-gui::define-named-command com-decrease-text-size () - (symbol-macrolet ((style (medium-text-style (sheet-medium (climacs-gui::current-window))))) - (setf style (make-text-style (text-style-family style) - (text-style-face style) - (prev-text-size (text-style-size style))))) - (full-redisplay (climacs-gui::current-window))) \ No newline at end of file +(climacs-gui::define-named-command com-postscript-print-presentation () + (let ((pane (climacs-gui::current-window))) + (if (not (and (typep pane 'climacs-pane) + (typep (syntax (buffer pane)) 'slidemacs-gui-syntax))) + (beep) + (let ((file (accept 'climacs-gui::completable-pathname :prompt "Output to"))) + (postscript-print-pane pane file))))) \ No newline at end of file

1 0

[climacs-cvs] CVS update: climacs/slidemacs-gui.lisp climacs/slidemacs.lisp
by bmastenbrook＠common-lisp.net 18 Jun '05

18 Jun '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv3112 Modified Files: slidemacs-gui.lisp slidemacs.lisp Log Message: Partial but buggy support for printing slides to postscript Date: Sat Jun 18 15:58:49 2005 Author: bmastenbrook Index: climacs/slidemacs-gui.lisp diff -u climacs/slidemacs-gui.lisp:1.11 climacs/slidemacs-gui.lisp:1.12 --- climacs/slidemacs-gui.lisp:1.11 Sat Jun 18 04:01:56 2005 +++ climacs/slidemacs-gui.lisp Sat Jun 18 15:58:49 2005 @@ -56,8 +56,8 @@ (slot-exists-p list-entry 'items) (slot-exists-p list-entry 'item) (typep (slot-value list-entry 'item) unit-type)) - (funcall function (slot-value list-entry 'item)) - (traverse-list-entry (slot-value list-entry 'items) unit-type function))) + (traverse-list-entry (slot-value list-entry 'items) unit-type function) + (funcall function (slot-value list-entry 'item)))) (defmethod display-parse-tree-for-postscript ((parse-tree slidemacs-slideset) (syntax slidemacs-gui-syntax) stream) (with-slots (slideset-info nonempty-list-of-slides slidemacs-slideset-name) parse-tree @@ -67,8 +67,10 @@ (display-parse-tree slideset-info syntax stream) (new-page stream) (traverse-list-entry nonempty-list-of-slides - 'slidemacs-slide + 'slidemacs-all-slide-types (lambda (slide) + (format *debug-io* "Displaying slide ~S~%" + slide) (display-parse-tree slide syntax stream) (new-page stream)))))) @@ -80,7 +82,7 @@ (let ((*handle-whitespace* nil)) (call-next-method))) -(defun display-text-with-wrap-for-pane (text pane) +(defmethod display-text-with-wrap-for-pane (text (pane climacs-pane)) (let* ((text (substitute #\space #\newline text)) (split (remove "" @@ -111,6 +113,10 @@ (write-string word pane)))) (terpri pane))) +(defmethod display-text-with-wrap-for-pane (text pane) + (stream-write-string pane text) + (terpri pane)) + (defparameter *slidemacs-sizes* '(:title 48 :bullet 32 @@ -183,11 +189,23 @@ (display-parse-tree slidemacs-slide-name syntax pane) (display-parse-tree nonempty-list-of-bullets syntax pane)))) +(defmacro possibly-capturing-and-flipping-output-twice + (pane conditional &body body) + `(flet ((b () ,@body)) + (if ,conditional + (let ((rec (with-new-output-record (,pane) + (b)))) + (with-bounding-rectangle* + (x1 y1 x2 y2) rec + (draw-rectangle* ,pane x1 y1 x2 y2 :ink +flipping-ink+) + (draw-rectangle* ,pane x1 y1 x2 y2 :ink +flipping-ink+))) + (b)))) + (defmethod display-parse-tree ((parse-tree slidemacs-graph-slide) (syntax slidemacs-gui-syntax) pane) (when (or *no-check-point* (with-slots (point) pane - (when (and (mark>= point (start-offset parse-tree)) - (mark<= point (end-offset parse-tree)))))) + (and (mark>= point (start-offset parse-tree)) + (mark<= point (end-offset parse-tree))))) (when (boundp '*did-display-a-slide*) (setf *did-display-a-slide* t)) (with-slots (slidemacs-slide-name orientation list-of-roots list-of-edges) @@ -222,37 +240,33 @@ (push-if-italic to-vertex) (pushnew (cons from to) edges :test #'equal)))))) - (let (record) - (with-new-output-record (pane 'standard-sequence-output-record rec) - (format-graph-from-roots - roots - (lambda (node stream) - (with-text-style (pane `(:sans-serif - ,(if (find node italic :test #'equal) - :italic :roman) - ,(getf *slidemacs-sizes* :graph-node))) - (surrounding-output-with-border (pane :shape :drop-shadow) - (present node 'string :stream stream)))) - (lambda (node) - (loop for edge in edges - if (equal (car edge) node) - collect (cdr edge))) - :orientation orientation-val - ;;:generation-separation "xxxxxx" - :arc-drawer - (lambda (stream obj1 obj2 x1 y1 x2 y2) - (declare (ignore obj1 obj2)) - (draw-arrow* stream x1 y1 x2 y2 :line-thickness 1 :head-length 8 :head-width 4)) - :merge-duplicates t - :duplicate-test #'equal - :graph-type :tree - ) - (setf record rec)) - ;; Isn't this a hack? - (with-bounding-rectangle* - (x1 y1 x2 y2) record - (draw-rectangle* pane x1 y1 x2 y2 :ink +flipping-ink+) - (draw-rectangle* pane x1 y1 x2 y2 :ink +flipping-ink+))))))) + (possibly-capturing-and-flipping-output-twice + pane (typep pane 'climacs-pane) + (format-graph-from-roots + roots + (lambda (node stream) + (with-text-style (pane `(:sans-serif + ,(if (find node italic :test #'equal) + :italic :roman) + ,(getf *slidemacs-sizes* :graph-node))) + (surrounding-output-with-border (pane :shape :drop-shadow) + (present node 'string :stream stream)))) + (lambda (node) + (loop for edge in edges + if (equal (car edge) node) + collect (cdr edge))) + :orientation orientation-val + ;;:generation-separation "xxxxxx" + :stream pane + :arc-drawer + (lambda (stream obj1 obj2 x1 y1 x2 y2) + (declare (ignore obj1 obj2)) + (draw-arrow* stream x1 y1 x2 y2 :line-thickness 1 :head-length 8 :head-width 4)) + :merge-duplicates t + :duplicate-test #'equal + :graph-type :tree + :move-cursor nil + )))))) (defmethod display-parse-tree ((entity slidemacs-slide-name) (syntax slidemacs-gui-syntax) pane) (with-text-style (pane `(:sans-serif :bold ,(getf *slidemacs-sizes* :title))) @@ -261,7 +275,7 @@ (terpri pane))) (defmethod display-parse-tree ((entity slidemacs-bullet) (syntax slidemacs-gui-syntax) pane) - (stream-increment-cursor-position pane (space-width pane) 0) + (stream-write-string pane " ") (with-text-style (pane `(:sans-serif :roman ,(getf *slidemacs-sizes* :bullet))) (if (and (not *no-check-point*) (with-slots (point) pane @@ -272,9 +286,9 @@ (call-next-method)))) (defmethod display-parse-tree ((entity bullet) (syntax slidemacs-gui-syntax) pane) - (stream-increment-cursor-position pane (space-width pane) 0) + (stream-write-string pane " ") (present (lexeme-string entity) 'string :stream pane) - (stream-increment-cursor-position pane (space-width pane) 0)) + (stream-write-string pane " ")) (defmethod display-parse-tree ((entity talking-point) (syntax slidemacs-gui-syntax) pane) (with-slots (slidemacs-string) entity Index: climacs/slidemacs.lisp diff -u climacs/slidemacs.lisp:1.4 climacs/slidemacs.lisp:1.5 --- climacs/slidemacs.lisp:1.4 Sat Jun 18 04:01:56 2005 +++ climacs/slidemacs.lisp Sat Jun 18 15:58:49 2005 @@ -394,10 +394,12 @@ (handle-whitespace pane (buffer pane) *white-space-start* (start-offset entity)) (setf *white-space-start* (end-offset entity)))) -(defmethod display-parse-tree :around ((entity slidemacs-parse-tree) syntax pane) - (with-slots (top bot) pane - (when (and (end-offset entity) (mark> (end-offset entity) top)) - (call-next-method)))) +(defmethod display-parse-tree :around ((entity slidemacs-parse-tree) (syntax slidemacs-editor-syntax) pane) + (if (not (typep syntax 'slidemacs-gui-syntax)) + (with-slots (top bot) pane + (when (and (end-offset entity) (mark> (end-offset entity) top)) + (call-next-method))) + (call-next-method))) (defmethod redisplay-pane-with-syntax ((pane climacs-pane) (syntax slidemacs-editor-syntax) current-p) (with-slots (top bot) pane

1 0

[climacs-cvs] CVS update: papers/ilc2005/syntax/climacs-slides.slidemacs
by bmastenbrook＠common-lisp.net 18 Jun '05

18 Jun '05

Update of /project/climacs/cvsroot/papers/ilc2005/syntax In directory common-lisp.net:/tmp/cvs-serv25071 Modified Files: climacs-slides.slidemacs Log Message: Current state of the slides Date: Sat Jun 18 04:02:10 2005 Author: bmastenbrook Index: papers/ilc2005/syntax/climacs-slides.slidemacs diff -u papers/ilc2005/syntax/climacs-slides.slidemacs:1.3 papers/ilc2005/syntax/climacs-slides.slidemacs:1.4 --- papers/ilc2005/syntax/climacs-slides.slidemacs:1.3 Fri Jun 17 03:15:09 2005 +++ papers/ilc2005/syntax/climacs-slides.slidemacs Sat Jun 18 04:02:10 2005 @@ -1,8 +1,19 @@ slideset "Syntax Analysis in the Climacs Text Editor" { -info { author "Brian Mastenbrook" +info { author "Brian Mastenbrook (presenting)" institution "Motorola, Inc." +author "Christophe Rhodes" +institution "Department of Computing, Goldsmiths College" +author "Robert Strandh" +institution "Université Bordeaux 1" venue "International Lisp Conference 2005" date } +slide "Outline" { +* "What is Climacs?" +* "Abstractions for buffer representation" +* "Abstractions for syntax analysis" +* "Future directions" +* "Demos" +} slide "Climacs" { * "An editor in the Emacs tradition" * "A framework for syntax-capable editing" @@ -14,10 +25,24 @@ * "Standard for user interfaces and graphics in Common Lisp" * "Free implementation in McCLIM" } +slide "Comparable editors" { +* "ZMacs - the famous Lisp machine editor" +* "SEdit, the InterLisp structure editor" +* "Hemlock, CMUCL's editor" +* "FRED Resembles Emacs Deliberately" +} +graph "Climacs Overview" { +vertical +root "Buffer abstraction" +edge from "Buffer abstraction" to "Syntax protocol" +edge from "Syntax protocol" to "Syntax-aware applications" +edge from "Syntax-aware applications" to "Climacs application" +edge from "Climacs application" to "CLIM" +} slide "Buffer protocol" { -* "Multiple buffer implementations" * "Protocol for editable sequence of objects" +* "Multiple buffer implementations" * "Mark implementation (left and right-sticky marks)" } slide "Buffer protocol, cont." @@ -28,20 +53,7 @@ } slide "Buffer protocol, cont." { -* "Gap buffer has good performance for localized editing operations" -* "Noticable delay to move gap in some situations" -* "Circular gap buffer improves performance in edge cases" -* "Slow to find line / column of given mark" -} -slide "Buffer protocol, cont." -{ -* "Better implementation could combine hemlock-like doubly-linked lists of lines with gap buffer" -* "Doubly-linked list of gap buffers would act as multiple-gap buffer" -* "LRU scheme to convert lines to compact representation" -} -slide "Buffer protocol, cont." -{ -* "Implementation using functional data structures" +* "Another implementation using functional data structures" * "Efficient undo across multiple undo histories" } slide "Syntax protocol" @@ -84,8 +96,10 @@ slide "Lexer and Parser" { * "Incremental lexer creates objects for each lexeme" * "Parser parses lexemes into production classes" +* "In Earley parser, parsing rules can include any code" } graph "Sample parser class hierarchy" { +horizontal root "parse-tree" edge from "parse-tree" to "ttcn3-parse-tree" edge from "ttcn3-parse-tree" to "ttcn3-entry" @@ -96,6 +110,22 @@ edge from "ttcn3-entry" to "ttcn3-nonterminal" edge from "ttcn3-entry" to "ttcn3-terminal" } +slide "Parser invocation" { +* "Climacs calls update-syntax-for-display or update-syntax" +* "Parser is passed top and bottom marks of out-of-date region" +* "Application can call its own parser or invoke Climacs' Earley parser" +} +slide "Advantages of Earley" { +* "No grammar preprocessing required" +* "Accepts full class of context-free grammars" +} +slide "Incremental parsers" { +* "Earley parser can be slow on some grammars" +* "New Lisp mode uses a LR shift/reduce parser and keeps entire +buffer up-to-date" +* "Slidemacs grammar is acceptably fast on Earley parser, but not all +languages are; worst case complexity is O(n^3)" +} slide "Parse tree display" { * "Application controls display of parse tree" * "Could be a simple colorised display of text..." @@ -108,14 +138,23 @@ * "Slidemacs GUI-mode editor" } slide "Future directions, cont." { -* "Beter resynchronization on parse errors" +* "LALR parser generator" +* "Better resynchronization on parse errors" * "More syntax modules" * "Other applications (news readers, mail) using Climacs for editable buffers" } +slide "Conclusion" { +* "Climacs has an exciting future" +* "Flexible buffer protocol enables more abstract editing operations" +* "Syntax protocol enables rich applications" +} slide "Demos" { * "Lisp mode and incremental parser" * "Slidemacs mode" * "Tabcode editor" +} +slide "Thanks!" { +* /Questions?/ } }

1 0