Updated formattting

src/chain-complexes.lisp

@@ -389,7 +389,8 @@
       (unless (eq :less (funcall cmpr (-gnrt mark2) (-gnrt mark1)))
 	(setf *wrong-cmbn* cmbn)
 	(error "In the combination located by *WRONG-CMBN*, the generators:~@
-                    ~A and ~A are in a wrong order." (cdar mark2) (cdar mark1)))))
+                    ~A and ~A are in a wrong order." (cdar mark2)
+		    (cdar mark1)))))
   cmbn)
 
 
@@ -490,6 +491,7 @@
 			      (if (cmbn-zero-p cmbn)
 				  (zero-cmbn (+ (cmbn-degr cmbn) degr))
 				  (mrph-cmbn scmpr tcmpr intr
-                           cmbn (svref (rslts mrph) (cmbn-degr cmbn))))
+					     cmbn (svref (rslts mrph)
+							 (cmbn-degr cmbn))))
 			    ;;                     (profiler-off mrph)
 			    )))))))))

src/chcm-elementary-op.lisp

@@ -215,7 +215,8 @@
 	   (unless (and (eq (grmd sorc1) (grmd sorc2))
 			(eq (grmd trgt1) (grmd trgt2))
 			(= degr1 degr2))
-            (error "In 2MRPH-SBTR, ~A and ~A may not be subtracteded." mrph1 mrph2))
+	     (error "In 2MRPH-SBTR, ~A and ~A may not be subtracteded."
+		    mrph1 mrph2))
 	   (when (eq (first (orgn mrph1)) 'zero-mrph)
 	     (return-from sbtr mrph2))
 	   (when (eq (first (orgn mrph2)) 'zero-mrph)

src/classes.lisp

@@ -514,4 +514,3 @@
 (DEFSTRUCT (GBAR (:print-function gbar-print))
   (dmns -1 :type fixnum)
   (list () :type list))
-

src/combinations.lisp

@@ -167,7 +167,8 @@
 		   :degr degr
 		   :list (mapcar #'(lambda (term)
 				     (declare (type term term))
-                               (with-term (cffc gnrt) term
+				     (with-term
+					 (cffc gnrt) term
 					 (term (- cffc) gnrt)))
 				 list)))))
 
@@ -185,7 +186,8 @@
 		       :degr degr
 		       :list (mapcar #'(lambda (term)
 					 (declare (type term term))
-                                  (with-term (cffc gnrt) term
+					 (with-term
+					     (cffc gnrt) term
 					     (term (* n cffc) gnrt)))
 				     list))))))
 
@@ -195,8 +197,10 @@
    (type cmprf cmpr)
    (type cmbn cmbn1 cmbn2))
   (the cmbn
-      (with-cmbn (degr1 list1) cmbn1
+       (with-cmbn
-      (with-cmbn (degr2 list2) cmbn2
+	   (degr1 list1) cmbn1
+	   (with-cmbn
+	       (degr2 list2) cmbn2
 	       (unless (= degr1 degr2)
 		 (error "In ADD, the combination arguments have different degrees ~D and ~D."
 			degr1 degr2))
@@ -208,8 +212,10 @@
 		     (mark1 list1)
 		     (mark2 list2))
 		 (declare (list pre-rslt mark1 mark2))
-            (with--term (cffc1 gnrt1) mark1
+		 (with--term
-            (with--term (cffc2 gnrt2) mark2
+		     (cffc1 gnrt1) mark1
+		     (with--term
+			 (cffc2 gnrt2) mark2
 			 (tagbody
 			  :begin
 			    (ecase (funcall cmpr gnrt1 gnrt2)
@@ -255,8 +261,10 @@
    (type cmprf cmpr)
    (type cmbn cmbn1 cmbn2))
   (the cmbn
-      (with-cmbn (degr1 list1) cmbn1
+       (with-cmbn
-      (with-cmbn (degr2 list2) cmbn2
+	   (degr1 list1) cmbn1
+	   (with-cmbn
+	       (degr2 list2) cmbn2
 	       (unless (= degr1 degr2)
 		 (error "In SBTR, the combination arguments have different degrees ~D and ~D."
 			degr1 degr2))
@@ -268,8 +276,10 @@
 		     (mark1 list1)
 		     (mark2 list2))
 		 (declare (list pre-rslt mark1 mark2))
-            (with--term (cffc1 gnrt1) mark1
+		 (with--term
-            (with--term (cffc2 gnrt2) mark2
+		     (cffc1 gnrt1) mark1
+		     (with--term
+			 (cffc2 gnrt2) mark2
 			 (tagbody
 			  :begin
 			    (ecase (funcall cmpr gnrt1 gnrt2)
@@ -307,7 +317,8 @@
 				  (nreconc pre-rslt
 					   (mapcar #'(lambda (term)
 						       (declare (cons term))
-                                        (with-term (cffc gnrt) term
+						       (with-term
+							   (cffc gnrt) term
 							   (term (- cffc) gnrt)))
 						   mark2)))
 			    (go :exit)
@@ -327,8 +338,10 @@
    (fixnum n1 n2)
    (type cmbn cmbn1 cmbn2))
   (the cmbn
-      (with-cmbn (degr1 list1) cmbn1
+       (with-cmbn
-      (with-cmbn (degr2 list2) cmbn2
+	   (degr1 list1) cmbn1
+	   (with-cmbn
+	       (degr2 list2) cmbn2
 	       (unless (= degr1 degr2)
 		 (error "In 2N-2CMBN, the combination arguments have different degrees ~D and ~D."
 			degr1 degr2))
@@ -340,8 +353,10 @@
 		     (mark1 list1)
 		     (mark2 list2))
 		 (declare (list pre-rslt mark1 mark2))
-            (with--term (cffc1 gnrt1) mark1
+		 (with--term
-            (with--term (cffc2 gnrt2) mark2
+		     (cffc1 gnrt1) mark1
+		     (with--term
+			 (cffc2 gnrt2) mark2
 			 (setf cffc1 (* n1 cffc1)
 			       cffc2 (* n2 cffc2))
 			 (tagbody
@@ -382,8 +397,10 @@
 					       mark2
 					       (mapcar #'(lambda (term)
 							   (declare (cons term))
-                                           (with-term (cffc gnrt) term
+							   (with-term
-                                              (term (* n2 cffc) gnrt)))
+							       (cffc gnrt) term
+							       (term (* n2 cffc)
+								     gnrt)))
 						       mark2))))
 			    (go :exit)
 			  :cmbn2-is-finished
@@ -393,8 +410,10 @@
 					       mark1
 					       (mapcar #'(lambda (term)
 							   (declare (cons term))
-                                           (with-term (cffc gnrt) term
+							   (with-term
-                                              (term (* n1 cffc) gnrt)))
+							       (cffc gnrt) term
+							       (term (* n1 cffc)
+								     gnrt)))
 						       mark1))))
 			  :exit))
 		     (make-cmbn

src/various.lisp

@@ -96,6 +96,3 @@
 #|
 (done))
 |#
-
-
-