diff --git a/package.lisp b/package.lisp index a13c3f93ca7669077371d55645a243cee7c92867..ac49303e828e23e57a468ce04a8099f2a57d6308 100644 --- a/package.lisp +++ b/package.lisp @@ -1,7 +1,7 @@ #+xcvb (module ()) (cl:defpackage #:scribble - (:use #:common-lisp #:meta :fare-utils :asdf-utils :fare-quasiquote :named-readtables) + (:use #:common-lisp #:meta :fare-utils :asdf/driver :fare-quasiquote :named-readtables) #+(or clisp sbcl ccl) (:import-from #+clisp :gray #+sbcl :sb-gray #+ccl :ccl :stream-line-column) @@ -28,6 +28,4 @@ #:combine-column-modifiers #:stream-line-column-harder #:read-stream-to-pos - - )) diff --git a/scribble.asd b/scribble.asd index 9cc089e98b92127a76260fed3181574a9fa006a4..97ee3f3da8b493b3007ce750e2d82a3d3590820b 100644 --- a/scribble.asd +++ b/scribble.asd @@ -10,6 +10,6 @@ and the other is a port to CL of Bigloo's Skribe syntax." ((:file "package") (:file "utilities" :depends-on ("package")) (:file "stream-line-column" :depends-on ("package")) - (:file "racket" :depends-on ("package")) + (:file "racket" :depends-on ("utilities")) (:file "skribe" :depends-on ("utilities")) (:file "readtables" :depends-on ("racket" "skribe")))) diff --git a/skribe.lisp b/skribe.lisp index e2025bd3eaa37b7f3bfa18619226e65a93c0b991..4f016f0d7b6a3a43034d66315092018c31997960 100644 --- a/skribe.lisp +++ b/skribe.lisp @@ -20,7 +20,7 @@ to enable compile-time preprocessing") (defun pp (x) "Default preprocessing of Scribble strings: compile-time identity. Globally, locally or lexically alter the binding of symbol-function scribble:pp -in your macros so as to customize the behaviour of preprocessing" +in your macros so as to customize the behavior of preprocessing" (let ((f *scribble-preprocessor*)) (if f (funcall f x) x))) @@ -42,12 +42,12 @@ in your macros so as to customize the behaviour of preprocessing" scribble returns from the list of components in parsed bracketed text") (defparameter *scribble-default-head* 'cl:list - "Scribble customization parameter: assuming default scribble-list behaviour, + "Scribble customization parameter: assuming default scribble-list behavior, modify the head of the form returned to combine at runtime the multiple components of the bracketed text being parsed") (defun default-scribble-list (&rest list) - "Default behaviour for returning components of bracketed text" + "Default behavior for returning components of bracketed text" (if (null (cdr list)) (car list) ; returns nil when no components (apply 'do-scribble-list list)))