[cl-typesetting-devel] Some small patches

[Peter Seibel]

Peter Seibel <peter at javamonkey.com> writes:

> Here are some patches that I've had lying around in my version of
> cl-typesetting that allow it to compile cleanly on some of the more
> picky Common Lisp's.

Oh, another problem I had when compiling with with SBCL was that the
iterate source files are in DOS mode which causes ~<newline> format
directives to fail since they look to Lisp like ~<carrige return>
which isn't a valid format directive. I worked around it by
dos2unix'ing the files but I don't know if there's a better long term
solution? Does subversion have any facility to fix line endings for
text files so folks who check them out onto Unix machines get Unix
line endings and Windows folks get Windows CRLFs?

-Peter

>
>
> Index: cl-typesetting/boxes.lisp
> ===================================================================
> --- cl-typesetting/boxes.lisp	(revision 66)
> +++ cl-typesetting/boxes.lisp	(working copy)
> @@ -166,11 +166,11 @@
>  (defmethod adjust-box-dy (box dy baseline)
>    nil)
>  
> -(defgeneric v-split ((box v-mode-mixin) dx dy)
> +(defgeneric v-split (box dx dy)
>   ;;; Split a v-mode box vertically into two parts
>    ;; Args: dx - area width, dy - area height
>    ;; Values: box-fitted, box-left, dy-left
> - (:method (box dx dy)
> + (:method ((box v-mode-mixin) dx dy)
>    (declare (ignore dx))
>    (if (> (dy box) dy)
>        (values nil box dy)
> Index: cl-typesetting/hyphenation-fp.lisp
> ===================================================================
> --- cl-typesetting/hyphenation-fp.lisp	(revision 66)
> +++ cl-typesetting/hyphenation-fp.lisp	(working copy)
> @@ -293,8 +293,8 @@
>      (setf (exception-trie hyphen-trie) (hyphen-make-trie exceptions 0))
>      ))
>  
> -(setf *american-hyphen-trie* (make-instance 'hyphen-trie :language :american))
> -(setf *french-hyphen-trie* (make-instance 'hyphen-trie :language :french))
> +(defparameter *american-hyphen-trie* (make-instance 'hyphen-trie :language :american))
> +(defparameter *french-hyphen-trie* (make-instance 'hyphen-trie :language :french))
>  (read-hyphen-file *american-hyphen-trie*)
>  (read-hyphen-file *french-hyphen-trie*)
>  
>
> -- 
> Peter Seibel                                      peter at javamonkey.com
>
>          Lisp is the red pill. -- John Fraser, comp.lang.lisp
>
> _______________________________________________
> cl-typesetting-devel site list
> cl-typesetting-devel at common-lisp.net
> http://common-lisp.net/mailman/listinfo/cl-typesetting-devel
>

-- 
Peter Seibel                                      peter at javamonkey.com

         Lisp is the red pill. -- John Fraser, comp.lang.lisp