* 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, 361 deletions

diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp
index dead66e8..97591c7a 100644
--- a/src/algebra/strap/OUTFORM.lsp
+++ b/src/algebra/strap/OUTFORM.lsp
@@ -969,365 +969,4 @@
                                   0 0 0 0 85)))))
           '|lookupComplete|)) 
 
-(SETQ |$CategoryFrame|
-      (|put| '|OutputForm| '|isFunctor|
-             '(((SEGMENT ($ $)) T (ELT $ 96))
-               ((SEGMENT ($ $ $)) T (ELT $ 95))
-               ((|not| ($ $)) T (ELT $ 94))
-               ((|or| ($ $ $)) T (ELT $ 93))
-               ((|and| ($ $ $)) T (ELT $ 92))
-               ((|exquo| ($ $ $)) T (ELT $ 91))
-               ((|quo| ($ $ $)) T (ELT $ 90))
-               ((|rem| ($ $ $)) T (ELT $ 89))
-               ((|div| ($ $ $)) T (ELT $ 88))
-               ((** ($ $ $)) T (ELT $ 87)) ((/ ($ $ $)) T (ELT $ 86))
-               ((* ($ $ $)) T (ELT $ 85)) ((- ($ $)) T (ELT $ 84))
-               ((- ($ $ $)) T (ELT $ 83)) ((+ ($ $ $)) T (ELT $ 82))
-               ((>= ($ $ $)) T (ELT $ 81)) ((<= ($ $ $)) T (ELT $ 80))
-               ((> ($ $ $)) T (ELT $ 79)) ((< ($ $ $)) T (ELT $ 78))
-               ((~= ($ $ $)) T (ELT $ 77)) ((= ($ $ $)) T (ELT $ 17))
-               ((|blankSeparate| ($ (|List| $))) T (ELT $ 57))
-               ((|semicolonSeparate| ($ (|List| $))) T (ELT $ 53))
-               ((|commaSeparate| ($ (|List| $))) T (ELT $ 52))
-               ((|pile| ($ (|List| $))) T (ELT $ 51))
-               ((|paren| ($ (|List| $))) T (ELT $ 63))
-               ((|paren| ($ $)) T (ELT $ 62))
-               ((|bracket| ($ (|List| $))) T (ELT $ 61))
-               ((|bracket| ($ $)) T (ELT $ 60))
-               ((|brace| ($ (|List| $))) T (ELT $ 59))
-               ((|brace| ($ $)) T (ELT $ 58))
-               ((|int| ($ $ $ $)) T (ELT $ 135))
-               ((|int| ($ $ $)) T (ELT $ 134))
-               ((|int| ($ $)) T (ELT $ 133))
-               ((|prod| ($ $ $ $)) T (ELT $ 132))
-               ((|prod| ($ $ $)) T (ELT $ 131))
-               ((|prod| ($ $)) T (ELT $ 130))
-               ((|sum| ($ $ $ $)) T (ELT $ 129))
-               ((|sum| ($ $ $)) T (ELT $ 128))
-               ((|sum| ($ $)) T (ELT $ 127))
-               ((|overlabel| ($ $ $)) T (ELT $ 112))
-               ((|overbar| ($ $)) T (ELT $ 106))
-               ((|prime| ($ $ (|NonNegativeInteger|))) T (ELT $ 111))
-               ((|prime| ($ $)) T (ELT $ 108))
-               ((|dot| ($ $ (|NonNegativeInteger|))) T (ELT $ 110))
-               ((|dot| ($ $)) T (ELT $ 107))
-               ((|quote| ($ $)) T (ELT $ 105))
-               ((|supersub| ($ $ (|List| $))) T (ELT $ 74))
-               ((|scripts| ($ $ (|List| $))) T (ELT $ 71))
-               ((|presuper| ($ $ $)) T (ELT $ 67))
-               ((|presub| ($ $ $)) T (ELT $ 66))
-               ((|super| ($ $ $)) T (ELT $ 65))
-               ((|sub| ($ $ $)) T (ELT $ 64))
-               ((|binomial| ($ $ $)) T (ELT $ 97))
-               ((|differentiate| ($ $ (|NonNegativeInteger|))) T
-                (ELT $ 126))
-               ((|rarrow| ($ $ $)) T (ELT $ 121))
-               ((|assign| ($ $ $)) T (ELT $ 119))
-               ((|slash| ($ $ $)) T (ELT $ 118))
-               ((|over| ($ $ $)) T (ELT $ 117))
-               ((|root| ($ $ $)) T (ELT $ 116))
-               ((|root| ($ $)) T (ELT $ 115))
-               ((|zag| ($ $ $)) T (ELT $ 114))
-               ((|matrix| ($ (|List| (|List| $)))) T (ELT $ 50))
-               ((|box| ($ $)) T (ELT $ 113))
-               ((|label| ($ $ $)) T (ELT $ 120))
-               ((|string| ($ $)) T (ELT $ 104))
-               ((|elt| ($ $ (|List| $))) T (ELT $ 99))
-               ((|infix?| ((|Boolean|) $)) T (ELT $ 98))
-               ((|postfix| ($ $ $)) T (ELT $ 103))
-               ((|infix| ($ $ $ $)) T (ELT $ 102))
-               ((|infix| ($ $ (|List| $))) T (ELT $ 101))
-               ((|prefix| ($ $ (|List| $))) T (ELT $ 100))
-               ((|vconcat| ($ (|List| $))) T (ELT $ 76))
-               ((|hconcat| ($ (|List| $))) T (ELT $ 75))
-               ((|vconcat| ($ $ $)) T (ELT $ 46))
-               ((|hconcat| ($ $ $)) T (ELT $ 38))
-               ((|center| ($ $)) T (ELT $ 42))
-               ((|right| ($ $)) T (ELT $ 44))
-               ((|left| ($ $)) T (ELT $ 43))
-               ((|center| ($ $ (|Integer|))) T (ELT $ 39))
-               ((|right| ($ $ (|Integer|))) T (ELT $ 41))
-               ((|left| ($ $ (|Integer|))) T (ELT $ 40))
-               ((|rspace| ($ (|Integer|) (|Integer|))) T (ELT $ 47))
-               ((|vspace| ($ (|Integer|))) T (ELT $ 45))
-               ((|hspace| ($ (|Integer|))) T (ELT $ 37))
-               ((|superHeight| ((|Integer|) $)) T (ELT $ 34))
-               ((|subHeight| ((|Integer|) $)) T (ELT $ 33))
-               ((|height| ((|Integer|))) T (ELT $ 35))
-               ((|width| ((|Integer|))) T (ELT $ 36))
-               ((|height| ((|Integer|) $)) T (ELT $ 32))
-               ((|width| ((|Integer|) $)) T (ELT $ 31))
-               ((|doubleFloatFormat| ((|String|) (|String|))) T
-                (ELT $ 8))
-               ((|empty| ($)) T (ELT $ 13))
-               ((|outputForm| ($ (|DoubleFloat|))) T (ELT $ 25))
-               ((|outputForm| ($ (|String|))) T (ELT $ 30))
-               ((|outputForm| ($ (|Symbol|))) T (ELT $ 23))
-               ((|outputForm| ($ (|Integer|))) T (ELT $ 21))
-               ((|messagePrint| ((|Void|) (|String|))) T (ELT $ 15))
-               ((|message| ($ (|String|))) T (ELT $ 14))
-               ((|print| ((|Void|) $)) T (ELT $ 10))
-               ((|latex| ((|String|) $)) T (ELT $ NIL))
-               ((|hash| ((|SingleInteger|) $)) T (ELT $ NIL))
-               ((|coerce| ((|OutputForm|) $)) T (ELT $ 19))
-               ((= ((|Boolean|) $ $)) T (ELT $ 16))
-               ((~= ((|Boolean|) $ $)) T (ELT $ NIL)))
-             (|addModemap| '|OutputForm| '(|OutputForm|)
-                 '((|Join| (|SetCategory|)
-                           (CATEGORY |domain|
-                               (SIGNATURE |print| ((|Void|) $))
-                               (SIGNATURE |message| ($ (|String|)))
-                               (SIGNATURE |messagePrint|
-                                   ((|Void|) (|String|)))
-                               (SIGNATURE |outputForm| ($ (|Integer|)))
-                               (SIGNATURE |outputForm| ($ (|Symbol|)))
-                               (SIGNATURE |outputForm| ($ (|String|)))
-                               (SIGNATURE |outputForm|
-                                   ($ (|DoubleFloat|)))
-                               (SIGNATURE |empty| ($))
-                               (SIGNATURE |doubleFloatFormat|
-                                   ((|String|) (|String|)))
-                               (SIGNATURE |width| ((|Integer|) $))
-                               (SIGNATURE |height| ((|Integer|) $))
-                               (SIGNATURE |width| ((|Integer|)))
-                               (SIGNATURE |height| ((|Integer|)))
-                               (SIGNATURE |subHeight| ((|Integer|) $))
-                               (SIGNATURE |superHeight|
-                                   ((|Integer|) $))
-                               (SIGNATURE |hspace| ($ (|Integer|)))
-                               (SIGNATURE |vspace| ($ (|Integer|)))
-                               (SIGNATURE |rspace|
-                                   ($ (|Integer|) (|Integer|)))
-                               (SIGNATURE |left| ($ $ (|Integer|)))
-                               (SIGNATURE |right| ($ $ (|Integer|)))
-                               (SIGNATURE |center| ($ $ (|Integer|)))
-                               (SIGNATURE |left| ($ $))
-                               (SIGNATURE |right| ($ $))
-                               (SIGNATURE |center| ($ $))
-                               (SIGNATURE |hconcat| ($ $ $))
-                               (SIGNATURE |vconcat| ($ $ $))
-                               (SIGNATURE |hconcat| ($ (|List| $)))
-                               (SIGNATURE |vconcat| ($ (|List| $)))
-                               (SIGNATURE |prefix| ($ $ (|List| $)))
-                               (SIGNATURE |infix| ($ $ (|List| $)))
-                               (SIGNATURE |infix| ($ $ $ $))
-                               (SIGNATURE |postfix| ($ $ $))
-                               (SIGNATURE |infix?| ((|Boolean|) $))
-                               (SIGNATURE |elt| ($ $ (|List| $)))
-                               (SIGNATURE |string| ($ $))
-                               (SIGNATURE |label| ($ $ $))
-                               (SIGNATURE |box| ($ $))
-                               (SIGNATURE |matrix|
-                                   ($ (|List| (|List| $))))
-                               (SIGNATURE |zag| ($ $ $))
-                               (SIGNATURE |root| ($ $))
-                               (SIGNATURE |root| ($ $ $))
-                               (SIGNATURE |over| ($ $ $))
-                               (SIGNATURE |slash| ($ $ $))
-                               (SIGNATURE |assign| ($ $ $))
-                               (SIGNATURE |rarrow| ($ $ $))
-                               (SIGNATURE |differentiate|
-                                   ($ $ (|NonNegativeInteger|)))
-                               (SIGNATURE |binomial| ($ $ $))
-                               (SIGNATURE |sub| ($ $ $))
-                               (SIGNATURE |super| ($ $ $))
-                               (SIGNATURE |presub| ($ $ $))
-                               (SIGNATURE |presuper| ($ $ $))
-                               (SIGNATURE |scripts| ($ $ (|List| $)))
-                               (SIGNATURE |supersub| ($ $ (|List| $)))
-                               (SIGNATURE |quote| ($ $))
-                               (SIGNATURE |dot| ($ $))
-                               (SIGNATURE |dot|
-                                   ($ $ (|NonNegativeInteger|)))
-                               (SIGNATURE |prime| ($ $))
-                               (SIGNATURE |prime|
-                                   ($ $ (|NonNegativeInteger|)))
-                               (SIGNATURE |overbar| ($ $))
-                               (SIGNATURE |overlabel| ($ $ $))
-                               (SIGNATURE |sum| ($ $))
-                               (SIGNATURE |sum| ($ $ $))
-                               (SIGNATURE |sum| ($ $ $ $))
-                               (SIGNATURE |prod| ($ $))
-                               (SIGNATURE |prod| ($ $ $))
-                               (SIGNATURE |prod| ($ $ $ $))
-                               (SIGNATURE |int| ($ $))
-                               (SIGNATURE |int| ($ $ $))
-                               (SIGNATURE |int| ($ $ $ $))
-                               (SIGNATURE |brace| ($ $))
-                               (SIGNATURE |brace| ($ (|List| $)))
-                               (SIGNATURE |bracket| ($ $))
-                               (SIGNATURE |bracket| ($ (|List| $)))
-                               (SIGNATURE |paren| ($ $))
-                               (SIGNATURE |paren| ($ (|List| $)))
-                               (SIGNATURE |pile| ($ (|List| $)))
-                               (SIGNATURE |commaSeparate|
-                                   ($ (|List| $)))
-                               (SIGNATURE |semicolonSeparate|
-                                   ($ (|List| $)))
-                               (SIGNATURE |blankSeparate|
-                                   ($ (|List| $)))
-                               (SIGNATURE = ($ $ $))
-                               (SIGNATURE ~= ($ $ $))
-                               (SIGNATURE < ($ $ $))
-                               (SIGNATURE > ($ $ $))
-                               (SIGNATURE <= ($ $ $))
-                               (SIGNATURE >= ($ $ $))
-                               (SIGNATURE + ($ $ $))
-                               (SIGNATURE - ($ $ $))
-                               (SIGNATURE - ($ $))
-                               (SIGNATURE * ($ $ $))
-                               (SIGNATURE / ($ $ $))
-                               (SIGNATURE ** ($ $ $))
-                               (SIGNATURE |div| ($ $ $))
-                               (SIGNATURE |rem| ($ $ $))
-                               (SIGNATURE |quo| ($ $ $))
-                               (SIGNATURE |exquo| ($ $ $))
-                               (SIGNATURE |and| ($ $ $))
-                               (SIGNATURE |or| ($ $ $))
-                               (SIGNATURE |not| ($ $))
-                               (SIGNATURE SEGMENT ($ $ $))
-                               (SIGNATURE SEGMENT ($ $)))))
-                 T '|OutputForm|
-                 (|put| '|OutputForm| '|mode|
-                        '(|Mapping|
-                             (|Join| (|SetCategory|)
-                                     (CATEGORY |domain|
-                                      (SIGNATURE |print| ((|Void|) $))
-                                      (SIGNATURE |message|
-                                       ($ (|String|)))
-                                      (SIGNATURE |messagePrint|
-                                       ((|Void|) (|String|)))
-                                      (SIGNATURE |outputForm|
-                                       ($ (|Integer|)))
-                                      (SIGNATURE |outputForm|
-                                       ($ (|Symbol|)))
-                                      (SIGNATURE |outputForm|
-                                       ($ (|String|)))
-                                      (SIGNATURE |outputForm|
-                                       ($ (|DoubleFloat|)))
-                                      (SIGNATURE |empty| ($))
-                                      (SIGNATURE |doubleFloatFormat|
-                                       ((|String|) (|String|)))
-                                      (SIGNATURE |width|
-                                       ((|Integer|) $))
-                                      (SIGNATURE |height|
-                                       ((|Integer|) $))
-                                      (SIGNATURE |width| ((|Integer|)))
-                                      (SIGNATURE |height|
-                                       ((|Integer|)))
-                                      (SIGNATURE |subHeight|
-                                       ((|Integer|) $))
-                                      (SIGNATURE |superHeight|
-                                       ((|Integer|) $))
-                                      (SIGNATURE |hspace|
-                                       ($ (|Integer|)))
-                                      (SIGNATURE |vspace|
-                                       ($ (|Integer|)))
-                                      (SIGNATURE |rspace|
-                                       ($ (|Integer|) (|Integer|)))
-                                      (SIGNATURE |left|
-                                       ($ $ (|Integer|)))
-                                      (SIGNATURE |right|
-                                       ($ $ (|Integer|)))
-                                      (SIGNATURE |center|
-                                       ($ $ (|Integer|)))
-                                      (SIGNATURE |left| ($ $))
-                                      (SIGNATURE |right| ($ $))
-                                      (SIGNATURE |center| ($ $))
-                                      (SIGNATURE |hconcat| ($ $ $))
-                                      (SIGNATURE |vconcat| ($ $ $))
-                                      (SIGNATURE |hconcat|
-                                       ($ (|List| $)))
-                                      (SIGNATURE |vconcat|
-                                       ($ (|List| $)))
-                                      (SIGNATURE |prefix|
-                                       ($ $ (|List| $)))
-                                      (SIGNATURE |infix|
-                                       ($ $ (|List| $)))
-                                      (SIGNATURE |infix| ($ $ $ $))
-                                      (SIGNATURE |postfix| ($ $ $))
-                                      (SIGNATURE |infix?|
-                                       ((|Boolean|) $))
-                                      (SIGNATURE |elt|
-                                       ($ $ (|List| $)))
-                                      (SIGNATURE |string| ($ $))
-                                      (SIGNATURE |label| ($ $ $))
-                                      (SIGNATURE |box| ($ $))
-                                      (SIGNATURE |matrix|
-                                       ($ (|List| (|List| $))))
-                                      (SIGNATURE |zag| ($ $ $))
-                                      (SIGNATURE |root| ($ $))
-                                      (SIGNATURE |root| ($ $ $))
-                                      (SIGNATURE |over| ($ $ $))
-                                      (SIGNATURE |slash| ($ $ $))
-                                      (SIGNATURE |assign| ($ $ $))
-                                      (SIGNATURE |rarrow| ($ $ $))
-                                      (SIGNATURE |differentiate|
-                                       ($ $ (|NonNegativeInteger|)))
-                                      (SIGNATURE |binomial| ($ $ $))
-                                      (SIGNATURE |sub| ($ $ $))
-                                      (SIGNATURE |super| ($ $ $))
-                                      (SIGNATURE |presub| ($ $ $))
-                                      (SIGNATURE |presuper| ($ $ $))
-                                      (SIGNATURE |scripts|
-                                       ($ $ (|List| $)))
-                                      (SIGNATURE |supersub|
-                                       ($ $ (|List| $)))
-                                      (SIGNATURE |quote| ($ $))
-                                      (SIGNATURE |dot| ($ $))
-                                      (SIGNATURE |dot|
-                                       ($ $ (|NonNegativeInteger|)))
-                                      (SIGNATURE |prime| ($ $))
-                                      (SIGNATURE |prime|
-                                       ($ $ (|NonNegativeInteger|)))
-                                      (SIGNATURE |overbar| ($ $))
-                                      (SIGNATURE |overlabel| ($ $ $))
-                                      (SIGNATURE |sum| ($ $))
-                                      (SIGNATURE |sum| ($ $ $))
-                                      (SIGNATURE |sum| ($ $ $ $))
-                                      (SIGNATURE |prod| ($ $))
-                                      (SIGNATURE |prod| ($ $ $))
-                                      (SIGNATURE |prod| ($ $ $ $))
-                                      (SIGNATURE |int| ($ $))
-                                      (SIGNATURE |int| ($ $ $))
-                                      (SIGNATURE |int| ($ $ $ $))
-                                      (SIGNATURE |brace| ($ $))
-                                      (SIGNATURE |brace|
-                                       ($ (|List| $)))
-                                      (SIGNATURE |bracket| ($ $))
-                                      (SIGNATURE |bracket|
-                                       ($ (|List| $)))
-                                      (SIGNATURE |paren| ($ $))
-                                      (SIGNATURE |paren|
-                                       ($ (|List| $)))
-                                      (SIGNATURE |pile| ($ (|List| $)))
-                                      (SIGNATURE |commaSeparate|
-                                       ($ (|List| $)))
-                                      (SIGNATURE |semicolonSeparate|
-                                       ($ (|List| $)))
-                                      (SIGNATURE |blankSeparate|
-                                       ($ (|List| $)))
-                                      (SIGNATURE = ($ $ $))
-                                      (SIGNATURE ~= ($ $ $))
-                                      (SIGNATURE < ($ $ $))
-                                      (SIGNATURE > ($ $ $))
-                                      (SIGNATURE <= ($ $ $))
-                                      (SIGNATURE >= ($ $ $))
-                                      (SIGNATURE + ($ $ $))
-                                      (SIGNATURE - ($ $ $))
-                                      (SIGNATURE - ($ $))
-                                      (SIGNATURE * ($ $ $))
-                                      (SIGNATURE / ($ $ $))
-                                      (SIGNATURE ** ($ $ $))
-                                      (SIGNATURE |div| ($ $ $))
-                                      (SIGNATURE |rem| ($ $ $))
-                                      (SIGNATURE |quo| ($ $ $))
-                                      (SIGNATURE |exquo| ($ $ $))
-                                      (SIGNATURE |and| ($ $ $))
-                                      (SIGNATURE |or| ($ $ $))
-                                      (SIGNATURE |not| ($ $))
-                                      (SIGNATURE SEGMENT ($ $ $))
-                                      (SIGNATURE SEGMENT ($ $)))))
-                        |$CategoryFrame|)))) 
-
 (MAKEPROP '|OutputForm| 'NILADIC T)