SymProg/OM-Lead.git

			@@ -162,27 +162,27 @@

			;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

			(temp-base (cond (avoid-repetitions (setq looplist
			(temp-base (cond (avoid-repetitions (let ((looplist
			(remove nil (loop for a in temp-base
			collect (if
			(car
			(remove nil
			(mapcar #'(lambda (l) (eq (car l) (cadr l)))
			(mat-trans_oml (list first a))))) nil a))))
			(mat-trans_oml (list first a))))) nil a)))))

			(if (null looplist) (list (loop repeat (length (first temp-base)) collect -1)) looplist))
			(if (null looplist) (list (loop repeat (length (first temp-base)) collect -1)) looplist)))
			(t temp-base)))


			(temp-base (cond (voice-tie1
			(let ((voice-tie1 (- voice-tie1 1)))
			(setq looplist (remove nil
			(let* ((voice-tie1 (- voice-tie1 1))
			(looplist (remove nil
			(loop for a in temp-base
			collect

			(cond ((eq (nth voice-tie1 a) (nth voice-tie1 first)) a)
			((eq (nth voice-tie1 a) -1) a)
			(t nil)))))
			((eq (nth voice-tie1 first) -1) a)
			(t nil))))))
			(if (null looplist)
			(loop for a in temp-base
			collect
			@@ -191,14 +191,14 @@
			(t temp-base)))

			(temp-base (cond (voice-tie2
			(let ((voice-tie2 (- voice-tie2 1)))
			(setq looplist (remove nil
			(let* ((voice-tie2 (- voice-tie2 1))
			(looplist (remove nil
			(loop for a in temp-base
			collect

			(cond ((eq (nth voice-tie2 a) (nth voice-tie2 first)) a)
			((eq (nth voice-tie2 a) -1) a)
			(t nil)))))
			((eq (nth voice-tie2 first) -1) a)
			(t nil))))))
			(if (null looplist)
			(loop for a in temp-base
			collect
			@@ -207,14 +207,14 @@
			(t temp-base)))

			(temp-base (cond (voice-tie3
			(let ((voice-tie3 (- voice-tie3 1)))
			(setq looplist (remove nil
			(let* ((voice-tie3 (- voice-tie3 1))
			(looplist (remove nil
			(loop for a in temp-base
			collect

			(cond ((eq (nth voice-tie3 a) (nth voice-tie3 first)) a)
			((eq (nth voice-tie3 a) -1) a)
			(t nil)))))
			((eq (nth voice-tie3 first) -1) a)
			(t nil))))))
			(if (null looplist)
			(loop for a in temp-base
			collect
			@@ -223,14 +223,14 @@
			(t temp-base)))

			(temp-base (cond (voice-tie4
			(let ((voice-tie4 (- voice-tie4 1)))
			(setq looplist (remove nil
			(let* ((voice-tie4 (- voice-tie4 1))
			(looplist (remove nil
			(loop for a in temp-base
			collect

			(cond ((eq (nth voice-tie4 a) (nth voice-tie4 first)) a)
			((eq (nth voice-tie4 a) -1) a)
			(t nil)))))
			((eq (nth voice-tie4 first) -1) a)
			(t nil))))))
			(if (null looplist)
			(loop for a in temp-base
			collect
			@@ -238,56 +238,68 @@
			looplist)))
			(t temp-base)))


			;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
			(temp-base (cond (voice-interval1
			(setq looplist (remove nil (loop for a in temp-base
			(let ((looplist (remove nil (loop for a in temp-base
			collect
			(if (or (find (- (nth 0 a) (nth 0 first)) voice-interval1)
			(eq (nth 0 first) -1)) a))))
			(eq (nth 0 first) -1)) a)))))
			(if (null looplist)
			(loop for a in temp-base
			collect
			(subs-posn_oml a 0 -1)) looplist))
			(subs-posn_oml a 0 -1)) looplist)))
			(t temp-base)))

			(temp-base (cond (voice-interval2
			(setq looplist (remove nil (loop for a in temp-base
			(let ((looplist (remove nil (loop for a in temp-base
			collect
			(if (or (find (- (nth 1 a) (nth 1 first)) voice-interval2)
			(eq (nth 1 first) -1)) a))))
			(eq (nth 1 first) -1)) a)))))
			(if (null looplist)
			(loop for a in temp-base
			collect
			(subs-posn_oml a 1 -1)) looplist))
			(subs-posn_oml a 1 -1)) looplist)))
			(t temp-base)))

			(temp-base (cond (voice-interval3
			(setq looplist (remove nil (loop for a in temp-base
			(let ((looplist (remove nil (loop for a in temp-base
			collect
			(if (or (find (- (nth 2 a) (nth 2 first)) voice-interval3)
			(eq (nth 2 first) -1)) a))))
			(eq (nth 2 first) -1)) a)))))
			(if (null looplist)
			(loop for a in temp-base
			collect
			(subs-posn_oml a 2 -1)) looplist))
			(subs-posn_oml a 2 -1)) looplist)))
			(t temp-base)))

			(temp-base (cond (voice-interval4
			(setq looplist (remove nil (loop for a in temp-base
			(let ((looplist (remove nil (loop for a in temp-base
			collect
			(if (or (find (- (nth 3 a) (nth 3 first)) voice-interval4)
			(eq (nth 3 first) -1)) a))))
			(eq (nth 3 first) -1)) a)))))
			(if (null looplist)
			(loop for a in temp-base
			collect
			(subs-posn_oml a 3 -1)) looplist))
			(subs-posn_oml a 3 -1)) looplist)))
			(t temp-base)))


			;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
			(temp-base (cond (voice-counter1
			(setq looplist (remove nil

			(cond ((and (or (eq -1 (nth (1- (first (car voice-counter1))) first))
			(eq -1 (nth (1- (second (car voice-counter1))) first))) counter-interval1)

			(remove nil (loop for a in temp-base
			collect (let* ((instr-a (1- (first (car voice-counter1)))) ;0
			(instr-b (1- (second (car voice-counter1))))
			(voice-i (- (nth instr-b a) (nth instr-a a))) )
			(if (find voice-i counter-interval1) a)))))

			((or (eq -1 (nth (1- (first (car voice-counter1))) first))
			(eq -1 (nth (1- (second (car voice-counter1))) first))) temp-base)

			(t (let ((looplist (remove nil
			(loop for a in temp-base
			collect
			(let* ((instr-a (1- (first (car voice-counter1)))) ;0
			@@ -295,7 +307,12 @@
			(delta-a (- (nth instr-a a) (nth instr-a first)))
			(delta-b (- (nth instr-b a) (nth instr-b first)))
			(rule (second voice-counter1)))
			(cond (counter-interval1
			(cond




			(counter-interval1
			(if (eq rule (cond ((and (or (and (< 0 delta-a) (< 0 delta-b))
			(and (> 0 delta-a) (> 0 delta-b))
			(and (= 0 delta-a) (= 0 delta-b)))
			@@ -309,28 +326,41 @@
			a))


			(t (if (equal rule (cond ((or (and (< 0 delta-a) (< 0 delta-b))
			(t (if (eq rule (cond ((or (and (< 0 delta-a) (< 0 delta-b))
			(and (> 0 delta-a) (> 0 delta-b))
			(and (= 0 delta-a) (= 0 delta-b))) 'parallel)
			((or (and (< 0 delta-a) (> 0 delta-b))
			(and (> 0 delta-a) (< 0 delta-b))) 'contrary)
			((or (and (or (< 0 delta-a) (> 0 delta-a)) (= 0 delta-b))
			(and (= 0 delta-a) (or (< 0 delta-b) (> 0 delta-b)))) 'seiten)))
			a)))))))
			a))))))))



			(if (null looplist)
			(loop for a in temp-base
			collect
			(subs-posn_oml a (1- (first (car voice-counter1))) -1)) looplist))
			(subs-posn_oml a (1- (first (car voice-counter1))) -1)) looplist)))))



			(t temp-base)))

			(temp-base (cond (voice-counter2
			(setq looplist (remove nil

			(cond ((and (or (eq -1 (nth (1- (first (car voice-counter2))) first))
			(eq -1 (nth (1- (second (car voice-counter2))) first))) counter-interval2)

			(remove nil (loop for a in temp-base
			collect (let* ((instr-a (1- (first (car voice-counter2)))) ;0
			(instr-b (1- (second (car voice-counter2))))
			(voice-i (- (nth instr-b a) (nth instr-a a))) )
			(if (find voice-i counter-interval2) a)))))

			((or (eq -1 (nth (1- (first (car voice-counter2))) first))
			(eq -1 (nth (1- (second (car voice-counter2))) first))) temp-base)

			(t (let ((looplist (remove nil
			(loop for a in temp-base
			collect
			(let* ((instr-a (1- (first (car voice-counter2)))) ;0
			@@ -338,7 +368,12 @@
			(delta-a (- (nth instr-a a) (nth instr-a first)))
			(delta-b (- (nth instr-b a) (nth instr-b first)))
			(rule (second voice-counter2)))
			(cond (counter-interval2
			(cond




			(counter-interval2
			(if (eq rule (cond ((and (or (and (< 0 delta-a) (< 0 delta-b))
			(and (> 0 delta-a) (> 0 delta-b))
			(and (= 0 delta-a) (= 0 delta-b)))
			@@ -352,28 +387,41 @@
			a))


			(t (if (equal rule (cond ((or (and (< 0 delta-a) (< 0 delta-b))
			(t (if (eq rule (cond ((or (and (< 0 delta-a) (< 0 delta-b))
			(and (> 0 delta-a) (> 0 delta-b))
			(and (= 0 delta-a) (= 0 delta-b))) 'parallel)
			((or (and (< 0 delta-a) (> 0 delta-b))
			(and (> 0 delta-a) (< 0 delta-b))) 'contrary)
			((or (and (or (< 0 delta-a) (> 0 delta-a)) (= 0 delta-b))
			(and (= 0 delta-a) (or (< 0 delta-b) (> 0 delta-b)))) 'seiten)))
			a)))))))
			a))))))))



			(if (null looplist)
			(loop for a in temp-base
			collect
			(subs-posn_oml a (1- (first (car voice-counter2))) -1)) looplist))
			(subs-posn_oml a (1- (first (car voice-counter2))) -1)) looplist)))))



			(t temp-base)))

			(temp-base (cond (voice-counter3
			(setq looplist (remove nil

			(cond ((and (or (eq -1 (nth (1- (first (car voice-counter3))) first))
			(eq -1 (nth (1- (second (car voice-counter3))) first))) counter-interval3)

			(remove nil (loop for a in temp-base
			collect (let* ((instr-a (1- (first (car voice-counter3)))) ;0
			(instr-b (1- (second (car voice-counter3))))
			(voice-i (- (nth instr-b a) (nth instr-a a))) )
			(if (find voice-i counter-interval3) a)))))

			((or (eq -1 (nth (1- (first (car voice-counter3))) first))
			(eq -1 (nth (1- (second (car voice-counter3))) first))) temp-base)

			(t (let ((looplist (remove nil
			(loop for a in temp-base
			collect
			(let* ((instr-a (1- (first (car voice-counter3)))) ;0
			@@ -381,7 +429,12 @@
			(delta-a (- (nth instr-a a) (nth instr-a first)))
			(delta-b (- (nth instr-b a) (nth instr-b first)))
			(rule (second voice-counter3)))
			(cond (counter-interval3
			(cond




			(counter-interval3
			(if (eq rule (cond ((and (or (and (< 0 delta-a) (< 0 delta-b))
			(and (> 0 delta-a) (> 0 delta-b))
			(and (= 0 delta-a) (= 0 delta-b)))
			@@ -395,21 +448,21 @@
			a))


			(t (if (equal rule (cond ((or (and (< 0 delta-a) (< 0 delta-b))
			(t (if (eq rule (cond ((or (and (< 0 delta-a) (< 0 delta-b))
			(and (> 0 delta-a) (> 0 delta-b))
			(and (= 0 delta-a) (= 0 delta-b))) 'parallel)
			((or (and (< 0 delta-a) (> 0 delta-b))
			(and (> 0 delta-a) (< 0 delta-b))) 'contrary)
			((or (and (or (< 0 delta-a) (> 0 delta-a)) (= 0 delta-b))
			(and (= 0 delta-a) (or (< 0 delta-b) (> 0 delta-b)))) 'seiten)))
			a)))))))
			a))))))))



			(if (null looplist)
			(loop for a in temp-base
			collect
			(subs-posn_oml a (1- (first (car voice-counter3))) -1)) looplist))
			(subs-posn_oml a (1- (first (car voice-counter3))) -1)) looplist)))))



			@@ -417,7 +470,20 @@


			(temp-base (cond (voice-counter4
			(setq looplist (remove nil

			(cond ((and (or (eq -1 (nth (1- (first (car voice-counter4))) first))
			(eq -1 (nth (1- (second (car voice-counter4))) first))) counter-interval4)

			(remove nil (loop for a in temp-base
			collect (let* ((instr-a (1- (first (car voice-counter4)))) ;0
			(instr-b (1- (second (car voice-counter4))))
			(voice-i (- (nth instr-b a) (nth instr-a a))) )
			(if (find voice-i counter-interval4) a)))))

			((or (eq -1 (nth (1- (first (car voice-counter4))) first))
			(eq -1 (nth (1- (second (car voice-counter4))) first))) temp-base)

			(t (let ((looplist (remove nil
			(loop for a in temp-base
			collect
			(let* ((instr-a (1- (first (car voice-counter4)))) ;0
			@@ -425,7 +491,12 @@
			(delta-a (- (nth instr-a a) (nth instr-a first)))
			(delta-b (- (nth instr-b a) (nth instr-b first)))
			(rule (second voice-counter4)))
			(cond (counter-interval4
			(cond




			(counter-interval4
			(if (eq rule (cond ((and (or (and (< 0 delta-a) (< 0 delta-b))
			(and (> 0 delta-a) (> 0 delta-b))
			(and (= 0 delta-a) (= 0 delta-b)))
			@@ -439,21 +510,21 @@
			a))


			(t (if (equal rule (cond ((or (and (< 0 delta-a) (< 0 delta-b))
			(t (if (eq rule (cond ((or (and (< 0 delta-a) (< 0 delta-b))
			(and (> 0 delta-a) (> 0 delta-b))
			(and (= 0 delta-a) (= 0 delta-b))) 'parallel)
			((or (and (< 0 delta-a) (> 0 delta-b))
			(and (> 0 delta-a) (< 0 delta-b))) 'contrary)
			((or (and (or (< 0 delta-a) (> 0 delta-a)) (= 0 delta-b))
			(and (= 0 delta-a) (or (< 0 delta-b) (> 0 delta-b)))) 'seiten)))
			a)))))))
			a))))))))



			(if (null looplist)
			(loop for a in temp-base
			collect
			(subs-posn_oml a (1- (first (car voice-counter4))) -1)) looplist))
			(subs-posn_oml a (1- (first (car voice-counter4))) -1)) looplist)))))



			@@ -461,7 +532,20 @@


			(temp-base (cond (voice-counter5
			(setq looplist (remove nil

			(cond ((and (or (eq -1 (nth (1- (first (car voice-counter5))) first))
			(eq -1 (nth (1- (second (car voice-counter5))) first))) counter-interval5)

			(remove nil (loop for a in temp-base
			collect (let* ((instr-a (1- (first (car voice-counter5)))) ;0
			(instr-b (1- (second (car voice-counter5))))
			(voice-i (- (nth instr-b a) (nth instr-a a))) )
			(if (find voice-i counter-interval5) a)))))

			((or (eq -1 (nth (1- (first (car voice-counter5))) first))
			(eq -1 (nth (1- (second (car voice-counter5))) first))) temp-base)

			(t (let ((looplist (remove nil
			(loop for a in temp-base
			collect
			(let* ((instr-a (1- (first (car voice-counter5)))) ;0
			@@ -469,7 +553,12 @@
			(delta-a (- (nth instr-a a) (nth instr-a first)))
			(delta-b (- (nth instr-b a) (nth instr-b first)))
			(rule (second voice-counter5)))
			(cond (counter-interval5
			(cond




			(counter-interval5
			(if (eq rule (cond ((and (or (and (< 0 delta-a) (< 0 delta-b))
			(and (> 0 delta-a) (> 0 delta-b))
			(and (= 0 delta-a) (= 0 delta-b)))
			@@ -483,21 +572,21 @@
			a))


			(t (if (equal rule (cond ((or (and (< 0 delta-a) (< 0 delta-b))
			(t (if (eq rule (cond ((or (and (< 0 delta-a) (< 0 delta-b))
			(and (> 0 delta-a) (> 0 delta-b))
			(and (= 0 delta-a) (= 0 delta-b))) 'parallel)
			((or (and (< 0 delta-a) (> 0 delta-b))
			(and (> 0 delta-a) (< 0 delta-b))) 'contrary)
			((or (and (or (< 0 delta-a) (> 0 delta-a)) (= 0 delta-b))
			(and (= 0 delta-a) (or (< 0 delta-b) (> 0 delta-b)))) 'seiten)))
			a)))))))
			a))))))))



			(if (null looplist)
			(loop for a in temp-base
			collect
			(subs-posn_oml a (1- (first (car voice-counter5))) -1)) looplist))
			(subs-posn_oml a (1- (first (car voice-counter5))) -1)) looplist)))))



			@@ -505,7 +594,20 @@


			(temp-base (cond (voice-counter6
			(setq looplist (remove nil

			(cond ((and (or (eq -1 (nth (1- (first (car voice-counter6))) first))
			(eq -1 (nth (1- (second (car voice-counter6))) first))) counter-interval6)

			(remove nil (loop for a in temp-base
			collect (let* ((instr-a (1- (first (car voice-counter6)))) ;0
			(instr-b (1- (second (car voice-counter6))))
			(voice-i (- (nth instr-b a) (nth instr-a a))) )
			(if (find voice-i counter-interval6) a)))))

			((or (eq -1 (nth (1- (first (car voice-counter6))) first))
			(eq -1 (nth (1- (second (car voice-counter6))) first))) temp-base)

			(t (let ((looplist (remove nil
			(loop for a in temp-base
			collect
			(let* ((instr-a (1- (first (car voice-counter6)))) ;0
			@@ -513,7 +615,12 @@
			(delta-a (- (nth instr-a a) (nth instr-a first)))
			(delta-b (- (nth instr-b a) (nth instr-b first)))
			(rule (second voice-counter6)))
			(cond (counter-interval6
			(cond




			(counter-interval6
			(if (eq rule (cond ((and (or (and (< 0 delta-a) (< 0 delta-b))
			(and (> 0 delta-a) (> 0 delta-b))
			(and (= 0 delta-a) (= 0 delta-b)))
			@@ -527,21 +634,21 @@
			a))


			(t (if (equal rule (cond ((or (and (< 0 delta-a) (< 0 delta-b))
			(t (if (eq rule (cond ((or (and (< 0 delta-a) (< 0 delta-b))
			(and (> 0 delta-a) (> 0 delta-b))
			(and (= 0 delta-a) (= 0 delta-b))) 'parallel)
			((or (and (< 0 delta-a) (> 0 delta-b))
			(and (> 0 delta-a) (< 0 delta-b))) 'contrary)
			((or (and (or (< 0 delta-a) (> 0 delta-a)) (= 0 delta-b))
			(and (= 0 delta-a) (or (< 0 delta-b) (> 0 delta-b)))) 'seiten)))
			a)))))))
			a))))))))



			(if (null looplist)
			(loop for a in temp-base
			collect
			(subs-posn_oml a (1- (first (car voice-counter6))) -1)) looplist))
			(subs-posn_oml a (1- (first (car voice-counter6))) -1)) looplist)))))