* algebra/coerce.spad.pamphlet (CoercibleFrom): New.

	(ConvertibleFrom): Likewise.
	(RetractableTo): Use it.
	* algebra/Makefile.pamphlet (axiom_algebra_layer_0): Include
	KRCFROM and KVTFROM.
	* share/algebra/: Update databases.

1 files changed, 0 insertions, 299 deletions

diff --git a/src/algebra/strap/TSETCAT-.lsp b/src/algebra/strap/TSETCAT-.lsp
index da0e9e85..10ae2d9c 100644
--- a/src/algebra/strap/TSETCAT-.lsp
+++ b/src/algebra/strap/TSETCAT-.lsp
@@ -1150,302 +1150,3 @@
                                   43 2 0 11 0 99 100 1 0 114 0 115 2 0
                                   11 9 0 118 2 0 11 0 0 19)))))
           '|lookupComplete|)) 
-
-(SETQ |$CategoryFrame|
-      (|put| '|TriangularSetCategory&| '|isFunctor|
-             '(((|coHeight| ((|NonNegativeInteger|) $)) T (ELT $ 130))
-               ((|extend| ($ $ |#5|)) T (ELT $ 127))
-               ((|select| ((|Union| |#5| "failed") $ |#4|)) T
-                (ELT $ 119))
-               ((|algebraic?| ((|Boolean|) |#4| $)) T (ELT $ 118))
-               ((|algebraicVariables| ((|List| |#4|) $)) T (ELT $ 115))
-               ((|rest| ((|Union| $ "failed") $)) T (ELT $ 112))
-               ((|last| ((|Union| |#5| "failed") $)) T (ELT $ 110))
-               ((|first| ((|Union| |#5| "failed") $)) T (ELT $ 109))
-               ((|reduceByQuasiMonic| (|#5| |#5| $)) T (ELT $ 98))
-               ((|collectQuasiMonic| ($ $)) T (ELT $ 120))
-               ((|removeZero| (|#5| |#5| $)) T (ELT $ 94))
-               ((|initiallyReduce| (|#5| |#5| $)) T (ELT $ 81))
-               ((|headReduce| (|#5| |#5| $)) T (ELT $ 78))
-               ((|stronglyReduce| (|#5| |#5| $)) T (ELT $ 75))
-               ((|rewriteSetWithReduction|
-                    ((|List| |#5|) (|List| |#5|) $
-                     (|Mapping| |#5| |#5| |#5|)
-                     (|Mapping| (|Boolean|) |#5| |#5|)))
-                T (ELT $ 73))
-               ((|reduce|
-                    (|#5| |#5| $ (|Mapping| |#5| |#5| |#5|)
-                          (|Mapping| (|Boolean|) |#5| |#5|)))
-                T (ELT $ 69))
-               ((|initiallyReduced?| ((|Boolean|) $)) T (ELT $ 107))
-               ((|headReduced?| ((|Boolean|) $)) T (ELT $ 105))
-               ((|stronglyReduced?| ((|Boolean|) $)) T (ELT $ 102))
-               ((|autoReduced?|
-                    ((|Boolean|) $
-                     (|Mapping| (|Boolean|) |#5| (|List| |#5|))))
-                T (ELT $ 100))
-               ((|initiallyReduced?| ((|Boolean|) |#5| $)) T
-                (ELT $ 67))
-               ((|headReduced?| ((|Boolean|) |#5| $)) T (ELT $ 63))
-               ((|stronglyReduced?| ((|Boolean|) |#5| $)) T (ELT $ 60))
-               ((|reduced?|
-                    ((|Boolean|) |#5| $
-                     (|Mapping| (|Boolean|) |#5| |#5|)))
-                T (ELT $ 31))
-               ((|normalized?| ((|Boolean|) $)) T (ELT $ 103))
-               ((|normalized?| ((|Boolean|) |#5| $)) T (ELT $ 58))
-               ((|quasiComponent|
-                    ((|Record| (|:| |close| (|List| |#5|))
-                         (|:| |open| (|List| |#5|)))
-                     $))
-                T (ELT $ 55))
-               ((|degree| ((|NonNegativeInteger|) $)) T (ELT $ 52))
-               ((|initials| ((|List| |#5|) $)) T (ELT $ 49))
-               ((|basicSet|
-                    ((|Union| (|Record| (|:| |bas| $)
-                                  (|:| |top| (|List| |#5|)))
-                              "failed")
-                     (|List| |#5|) (|Mapping| (|Boolean|) |#5|)
-                     (|Mapping| (|Boolean|) |#5| |#5|)))
-                T (ELT $ 45))
-               ((|basicSet|
-                    ((|Union| (|Record| (|:| |bas| $)
-                                  (|:| |top| (|List| |#5|)))
-                              "failed")
-                     (|List| |#5|) (|Mapping| (|Boolean|) |#5| |#5|)))
-                T (ELT $ 43))
-               ((|infRittWu?| ((|Boolean|) $ $)) T (ELT $ 27))
-               ((|collectUpper| ($ $ |#4|)) T (ELT $ 122))
-               ((|collectUnder| ($ $ |#4|)) T (ELT $ 121))
-               ((|mvar| (|#4| $)) T (ELT $ 108))
-               ((|retractIfCan| ((|Union| $ "failed") (|List| |#5|))) T
-                (ELT $ 126))
-               ((|coerce| ((|List| |#5|) $)) T (ELT $ 113))
-               ((|construct| ($ (|List| |#5|))) T (ELT $ 124))
-               ((|reduce| (|#5| (|Mapping| |#5| |#5| |#5|) $)) T
-                (ELT $ NIL))
-               ((|reduce| (|#5| (|Mapping| |#5| |#5| |#5|) $ |#5|)) T
-                (ELT $ NIL))
-               ((|select| ($ (|Mapping| (|Boolean|) |#5|) $)) T
-                (ELT $ NIL))
-               ((|reduce|
-                    (|#5| (|Mapping| |#5| |#5| |#5|) $ |#5| |#5|))
-                T (ELT $ NIL))
-               ((|coerce| ((|OutputForm|) $)) T (ELT $ NIL))
-               ((= ((|Boolean|) $ $)) T (ELT $ 19)))
-             (|addModemap| '|TriangularSetCategory&|
-                 '(|TriangularSetCategory&| |#1| |#2| |#3| |#4| |#5|)
-                 '((CATEGORY |domain|
-                       (SIGNATURE |coHeight|
-                           ((|NonNegativeInteger|) |#1|))
-                       (SIGNATURE |extend| (|#1| |#1| |#5|))
-                       (SIGNATURE |select|
-                           ((|Union| |#5| "failed") |#1| |#4|))
-                       (SIGNATURE |algebraic?| ((|Boolean|) |#4| |#1|))
-                       (SIGNATURE |algebraicVariables|
-                           ((|List| |#4|) |#1|))
-                       (SIGNATURE |rest|
-                           ((|Union| |#1| "failed") |#1|))
-                       (SIGNATURE |last|
-                           ((|Union| |#5| "failed") |#1|))
-                       (SIGNATURE |first|
-                           ((|Union| |#5| "failed") |#1|))
-                       (SIGNATURE |reduceByQuasiMonic|
-                           (|#5| |#5| |#1|))
-                       (SIGNATURE |collectQuasiMonic| (|#1| |#1|))
-                       (SIGNATURE |removeZero| (|#5| |#5| |#1|))
-                       (SIGNATURE |initiallyReduce| (|#5| |#5| |#1|))
-                       (SIGNATURE |headReduce| (|#5| |#5| |#1|))
-                       (SIGNATURE |stronglyReduce| (|#5| |#5| |#1|))
-                       (SIGNATURE |rewriteSetWithReduction|
-                           ((|List| |#5|) (|List| |#5|) |#1|
-                            (|Mapping| |#5| |#5| |#5|)
-                            (|Mapping| (|Boolean|) |#5| |#5|)))
-                       (SIGNATURE |reduce|
-                           (|#5| |#5| |#1| (|Mapping| |#5| |#5| |#5|)
-                                 (|Mapping| (|Boolean|) |#5| |#5|)))
-                       (SIGNATURE |initiallyReduced?|
-                           ((|Boolean|) |#1|))
-                       (SIGNATURE |headReduced?| ((|Boolean|) |#1|))
-                       (SIGNATURE |stronglyReduced?|
-                           ((|Boolean|) |#1|))
-                       (SIGNATURE |autoReduced?|
-                           ((|Boolean|) |#1|
-                            (|Mapping| (|Boolean|) |#5| (|List| |#5|))))
-                       (SIGNATURE |initiallyReduced?|
-                           ((|Boolean|) |#5| |#1|))
-                       (SIGNATURE |headReduced?|
-                           ((|Boolean|) |#5| |#1|))
-                       (SIGNATURE |stronglyReduced?|
-                           ((|Boolean|) |#5| |#1|))
-                       (SIGNATURE |reduced?|
-                           ((|Boolean|) |#5| |#1|
-                            (|Mapping| (|Boolean|) |#5| |#5|)))
-                       (SIGNATURE |normalized?| ((|Boolean|) |#1|))
-                       (SIGNATURE |normalized?|
-                           ((|Boolean|) |#5| |#1|))
-                       (SIGNATURE |quasiComponent|
-                           ((|Record| (|:| |close| (|List| |#5|))
-                                (|:| |open| (|List| |#5|)))
-                            |#1|))
-                       (SIGNATURE |degree|
-                           ((|NonNegativeInteger|) |#1|))
-                       (SIGNATURE |initials| ((|List| |#5|) |#1|))
-                       (SIGNATURE |basicSet|
-                           ((|Union| (|Record| (|:| |bas| |#1|)
-                                      (|:| |top| (|List| |#5|)))
-                                     "failed")
-                            (|List| |#5|) (|Mapping| (|Boolean|) |#5|)
-                            (|Mapping| (|Boolean|) |#5| |#5|)))
-                       (SIGNATURE |basicSet|
-                           ((|Union| (|Record| (|:| |bas| |#1|)
-                                      (|:| |top| (|List| |#5|)))
-                                     "failed")
-                            (|List| |#5|)
-                            (|Mapping| (|Boolean|) |#5| |#5|)))
-                       (SIGNATURE |infRittWu?| ((|Boolean|) |#1| |#1|))
-                       (SIGNATURE |collectUpper| (|#1| |#1| |#4|))
-                       (SIGNATURE |collectUnder| (|#1| |#1| |#4|))
-                       (SIGNATURE |mvar| (|#4| |#1|))
-                       (SIGNATURE |retractIfCan|
-                           ((|Union| |#1| "failed") (|List| |#5|)))
-                       (SIGNATURE |coerce| ((|List| |#5|) |#1|))
-                       (SIGNATURE |construct| (|#1| (|List| |#5|)))
-                       (SIGNATURE |reduce|
-                           (|#5| (|Mapping| |#5| |#5| |#5|) |#1|))
-                       (SIGNATURE |reduce|
-                           (|#5| (|Mapping| |#5| |#5| |#5|) |#1| |#5|))
-                       (SIGNATURE |select|
-                           (|#1| (|Mapping| (|Boolean|) |#5|) |#1|))
-                       (SIGNATURE |reduce|
-                           (|#5| (|Mapping| |#5| |#5| |#5|) |#1| |#5|
-                                 |#5|))
-                       (SIGNATURE |coerce| ((|OutputForm|) |#1|))
-                       (SIGNATURE = ((|Boolean|) |#1| |#1|)))
-                   (|TriangularSetCategory| |#2| |#3| |#4| |#5|)
-                   (|IntegralDomain|) (|OrderedAbelianMonoidSup|)
-                   (|OrderedSet|)
-                   (|RecursivePolynomialCategory| |#2| |#3| |#4|))
-                 T '|TriangularSetCategory&|
-                 (|put| '|TriangularSetCategory&| '|mode|
-                        '(|Mapping|
-                             (CATEGORY |domain|
-                                 (SIGNATURE |coHeight|
-                                     ((|NonNegativeInteger|) |#1|))
-                                 (SIGNATURE |extend| (|#1| |#1| |#5|))
-                                 (SIGNATURE |select|
-                                     ((|Union| |#5| "failed") |#1|
-                                      |#4|))
-                                 (SIGNATURE |algebraic?|
-                                     ((|Boolean|) |#4| |#1|))
-                                 (SIGNATURE |algebraicVariables|
-                                     ((|List| |#4|) |#1|))
-                                 (SIGNATURE |rest|
-                                     ((|Union| |#1| "failed") |#1|))
-                                 (SIGNATURE |last|
-                                     ((|Union| |#5| "failed") |#1|))
-                                 (SIGNATURE |first|
-                                     ((|Union| |#5| "failed") |#1|))
-                                 (SIGNATURE |reduceByQuasiMonic|
-                                     (|#5| |#5| |#1|))
-                                 (SIGNATURE |collectQuasiMonic|
-                                     (|#1| |#1|))
-                                 (SIGNATURE |removeZero|
-                                     (|#5| |#5| |#1|))
-                                 (SIGNATURE |initiallyReduce|
-                                     (|#5| |#5| |#1|))
-                                 (SIGNATURE |headReduce|
-                                     (|#5| |#5| |#1|))
-                                 (SIGNATURE |stronglyReduce|
-                                     (|#5| |#5| |#1|))
-                                 (SIGNATURE |rewriteSetWithReduction|
-                                     ((|List| |#5|) (|List| |#5|) |#1|
-                                      (|Mapping| |#5| |#5| |#5|)
-                                      (|Mapping| (|Boolean|) |#5| |#5|)))
-                                 (SIGNATURE |reduce|
-                                     (|#5| |#5| |#1|
-                                      (|Mapping| |#5| |#5| |#5|)
-                                      (|Mapping| (|Boolean|) |#5| |#5|)))
-                                 (SIGNATURE |initiallyReduced?|
-                                     ((|Boolean|) |#1|))
-                                 (SIGNATURE |headReduced?|
-                                     ((|Boolean|) |#1|))
-                                 (SIGNATURE |stronglyReduced?|
-                                     ((|Boolean|) |#1|))
-                                 (SIGNATURE |autoReduced?|
-                                     ((|Boolean|) |#1|
-                                      (|Mapping| (|Boolean|) |#5|
-                                       (|List| |#5|))))
-                                 (SIGNATURE |initiallyReduced?|
-                                     ((|Boolean|) |#5| |#1|))
-                                 (SIGNATURE |headReduced?|
-                                     ((|Boolean|) |#5| |#1|))
-                                 (SIGNATURE |stronglyReduced?|
-                                     ((|Boolean|) |#5| |#1|))
-                                 (SIGNATURE |reduced?|
-                                     ((|Boolean|) |#5| |#1|
-                                      (|Mapping| (|Boolean|) |#5| |#5|)))
-                                 (SIGNATURE |normalized?|
-                                     ((|Boolean|) |#1|))
-                                 (SIGNATURE |normalized?|
-                                     ((|Boolean|) |#5| |#1|))
-                                 (SIGNATURE |quasiComponent|
-                                     ((|Record|
-                                       (|:| |close| (|List| |#5|))
-                                       (|:| |open| (|List| |#5|)))
-                                      |#1|))
-                                 (SIGNATURE |degree|
-                                     ((|NonNegativeInteger|) |#1|))
-                                 (SIGNATURE |initials|
-                                     ((|List| |#5|) |#1|))
-                                 (SIGNATURE |basicSet|
-                                     ((|Union|
-                                       (|Record| (|:| |bas| |#1|)
-                                        (|:| |top| (|List| |#5|)))
-                                       "failed")
-                                      (|List| |#5|)
-                                      (|Mapping| (|Boolean|) |#5|)
-                                      (|Mapping| (|Boolean|) |#5| |#5|)))
-                                 (SIGNATURE |basicSet|
-                                     ((|Union|
-                                       (|Record| (|:| |bas| |#1|)
-                                        (|:| |top| (|List| |#5|)))
-                                       "failed")
-                                      (|List| |#5|)
-                                      (|Mapping| (|Boolean|) |#5| |#5|)))
-                                 (SIGNATURE |infRittWu?|
-                                     ((|Boolean|) |#1| |#1|))
-                                 (SIGNATURE |collectUpper|
-                                     (|#1| |#1| |#4|))
-                                 (SIGNATURE |collectUnder|
-                                     (|#1| |#1| |#4|))
-                                 (SIGNATURE |mvar| (|#4| |#1|))
-                                 (SIGNATURE |retractIfCan|
-                                     ((|Union| |#1| "failed")
-                                      (|List| |#5|)))
-                                 (SIGNATURE |coerce|
-                                     ((|List| |#5|) |#1|))
-                                 (SIGNATURE |construct|
-                                     (|#1| (|List| |#5|)))
-                                 (SIGNATURE |reduce|
-                                     (|#5| (|Mapping| |#5| |#5| |#5|)
-                                      |#1|))
-                                 (SIGNATURE |reduce|
-                                     (|#5| (|Mapping| |#5| |#5| |#5|)
-                                      |#1| |#5|))
-                                 (SIGNATURE |select|
-                                     (|#1| (|Mapping| (|Boolean|) |#5|)
-                                      |#1|))
-                                 (SIGNATURE |reduce|
-                                     (|#5| (|Mapping| |#5| |#5| |#5|)
-                                      |#1| |#5| |#5|))
-                                 (SIGNATURE |coerce|
-                                     ((|OutputForm|) |#1|))
-                                 (SIGNATURE = ((|Boolean|) |#1| |#1|)))
-                             (|TriangularSetCategory| |#2| |#3| |#4|
-                                 |#5|)
-                             (|IntegralDomain|)
-                             (|OrderedAbelianMonoidSup|) (|OrderedSet|)
-                             (|RecursivePolynomialCategory| |#2| |#3|
-                                 |#4|))
-                        |$CategoryFrame|))))