r11859: Canonicalize whitespace

[umlisp-orf.git] / class-support.lisp

diff --git a/class-support.lisp b/class-support.lisp
index 69d696556571505de9c54332981959681cbe3e8e..758c505b5a90a042f281ddcf664408b1ac2f874b 100644 (file)
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -100,9 +100,9 @@
 
 (defun check-ui (ui start-char len)
   (when (and (stringp ui)
-            (= (length ui) (1+ len))
-            (char-equal start-char (schar ui 0))
-            (ignore-errors (parse-integer ui :start 1)))
+             (= (length ui) (1+ len))
+             (char-equal start-char (schar ui 0))
+             (ignore-errors (parse-integer ui :start 1)))
     t))
 
 
@@ -121,23 +121,23 @@
       (or (not is-term) is-english)))
 
 (defun print-umlsclass (obj &key (stream *standard-output*)
-                       (vid :compact-text)
-                       (file-wrapper nil) (english-only t) (subobjects nil)
-                       (refvars nil) (link-printer nil))
+                        (vid :compact-text)
+                        (file-wrapper nil) (english-only t) (subobjects nil)
+                        (refvars nil) (link-printer nil))
   (view obj :stream stream :vid vid :subobjects subobjects
-       :file-wrapper file-wrapper
-       :filter (if english-only nil #'english-term-filter)
-       :link-printer link-printer
-       :refvars refvars))
+        :file-wrapper file-wrapper
+        :filter (if english-only nil #'english-term-filter)
+        :link-printer link-printer
+        :refvars refvars))
 
 (defmacro define-lookup-display (newfuncname lookup-func)
   "Defines functions for looking up and displaying objects"
   `(defun ,newfuncname  (keyval &key (stream *standard-output*) (vid :compact-text)
-                        (file-wrapper t) (english-only nil) (subobjects nil))
+                         (file-wrapper t) (english-only nil) (subobjects nil))
      (let ((obj (funcall ,lookup-func keyval)))
        (print-umlsclass obj :stream stream :vid vid
-                       :file-wrapper file-wrapper :english-only english-only
-                       :subobjects subobjects)
+                        :file-wrapper file-wrapper :english-only english-only
+                        :subobjects subobjects)
        obj)))
 
 (define-lookup-display display-con #'find-ucon-cui)
@@ -169,14 +169,14 @@
 
 (defmethod mesh-number ((ustr ustr))
   (let ((codes
-        (map-and-remove-nils
-         (lambda (sat)
-           (when (and (string-equal "MSH" (sab sat))
-                      (string-equal "MN" (atn sat)))
-             (atv sat)))
-         (s#sat ustr))))
+         (map-and-remove-nils
+          (lambda (sat)
+            (when (and (string-equal "MSH" (sab sat))
+                       (string-equal "MN" (atn sat)))
+              (atv sat)))
+          (s#sat ustr))))
     (if (= 1 (length codes))
-       (car codes)
+        (car codes)
       codes)))
 
 (defun ucon-ustrs (ucon)
@@ -184,8 +184,8 @@
   (let (res)
     (dolist (term (s#term ucon) (nreverse res))
       (dolist (str (s#str term))
-       (push str res)))))
-                    
+        (push str res)))))
+
 
 (defmethod pfstr ((uterm uterm))
   "Return the preferred string for a uterm"
@@ -268,65 +268,65 @@
     (setq stt (subseq stt 1)))
   (loop for c across stt
       collect
-       (cond
-        ((char-equal #\C c)
-         "Upper/lower case")
-        ((char-equal #\W c)
-         "Word order")
-        ((char-equal #\S c)
-         "Singular")
-        ((char-equal #\P c)
-         "Plural")
-        ((char-equal #\O c)
-         "Other"))))
-
-           
+        (cond
+         ((char-equal #\C c)
+          "Upper/lower case")
+         ((char-equal #\W c)
+          "Word order")
+         ((char-equal #\S c)
+          "Singular")
+         ((char-equal #\P c)
+          "Plural")
+         ((char-equal #\O c)
+          "Other"))))
+
+
 (defun ucon-parents (con &optional sab)
   (ucon-ancestors con sab t))
 
 (defun ucon-ancestors (ucon &optional sab single-level)
   "Returns a list of ancestor lists for a concept"
   (let* ((parent-rels (filter-urels-by-rel (s#rel ucon) "par"))
-        (anc nil))
+         (anc nil))
     (when sab
-      (setq parent-rels (delete-if-not 
-                        (lambda (rel) (string-equal sab (sab rel)))
-                        parent-rels)))
+      (setq parent-rels (delete-if-not
+                         (lambda (rel) (string-equal sab (sab rel)))
+                         parent-rels)))
     (dolist (rel parent-rels (nreverse anc))
       (let ((parent (find-ucon-cui (cui2 rel))))
-       (push
-        (if single-level
-            (list parent)
-          (list* parent (car (ucon-ancestors parent (sab rel) nil))))
-        anc)))))
+        (push
+         (if single-level
+             (list parent)
+           (list* parent (car (ucon-ancestors parent (sab rel) nil))))
+         anc)))))
 
 (defgeneric cxt-ancestors (obj))
 (defmethod cxt-ancestors ((con ucon))
   (loop for term in (s#term con)
       append (cxt-ancestors term)))
-                   
+
 
 (defmethod cxt-ancestors ((term uterm))
   (loop for str in (s#str term)
       append (cxt-ancestors str)))
-    
+
 (defmethod cxt-ancestors ((str ustr))
   "Return the ancestory contexts of a ustr"
   (let* ((anc (remove-if-not
-              (lambda (cxt) (string-equal "ANC" (cxl cxt)))
-              (s#cxt str)))
-        (num-contexts (if anc
-                          (apply #'max (mapcar (lambda (cxt) (cxn cxt)) anc))
-                        0))
-        (anc-lists '()))
+               (lambda (cxt) (string-equal "ANC" (cxl cxt)))
+               (s#cxt str)))
+         (num-contexts (if anc
+                           (apply #'max (mapcar (lambda (cxt) (cxn cxt)) anc))
+                         0))
+         (anc-lists '()))
     (dotimes (i num-contexts (nreverse anc-lists))
       (let* ((anc-this-cxn (remove-if-not
-                           (lambda (cxt) (= (1+ i) (cxn cxt))) anc)))
-       (push
-        (sort anc-this-cxn (lambda (a b) (< (rnk a) (rnk b))))
-        anc-lists)))))
+                            (lambda (cxt) (= (1+ i) (cxn cxt))) anc)))
+        (push
+         (sort anc-this-cxn (lambda (a b) (< (rnk a) (rnk b))))
+         anc-lists)))))
+
 
-  
 #+scl
 (dolist (c '(urank udef usat uso ucxt ustr ulo uterm usty urel ucoc uatx ucon uxw uxnw uxns lexterm labr lagr lcmp lmod lnom lprn lprp lspl ltrm ltyp lwd sdef sstr sstre1 sstre2 usrl))
     (let ((cl (find-class c)))