Partial fix for AW/193 and AW/334.

	* algebra/algfunc.spad.pamphlet: Remove OrderedSet requirements.
	* algebra/combfunc.spad.pamphlet: Likewise.
	* algebra/defintef.spad.pamphlet: Likewise.
	* algebra/defintrf.spad.pamphlet: Likewise.
	* algebra/degred.spad.pamphlet: Likewise.
	* algebra/efstruc.spad.pamphlet: Likewise.
	* algebra/elemntry.spad.pamphlet: Likewise.
	* algebra/expexpan.spad.pamphlet: Likewise.
	* algebra/expr.spad.pamphlet: Likewise.
	* algebra/expr2ups.spad.pamphlet: Likewise.
	* algebra/exprode.spad.pamphlet: Likewise.
	* algebra/fortran.spad.pamphlet: Likewise.
	* algebra/fr.spad.pamphlet: Likewise.
	* algebra/fraction.spad.pamphlet: Likewise.
	* algebra/fs2expxp.spad.pamphlet: Likewise.
	* algebra/fspace.spad.pamphlet: Likewise.
	* algebra/funcpkgs.spad.pamphlet: Likewise.
	* algebra/gaussian.spad.pamphlet: Likewise.
	* algebra/genups.spad.pamphlet: Likewise.
	* algebra/intalg.spad.pamphlet: Likewise.
	* algebra/intef.spad.pamphlet: Likewise.
	* algebra/integrat.spad.pamphlet: Likewise.
	* algebra/intpm.spad.pamphlet: Likewise.
	* algebra/irexpand.spad.pamphlet: Likewise.
	* algebra/kl.spad.pamphlet: Likewise.
	* algebra/laplace.spad.pamphlet: Likewise.
	* algebra/limitps.spad.pamphlet: Likewise.
	* algebra/liouv.spad.pamphlet: Likewise.
	* algebra/manip.spad.pamphlet: Likewise.
	* algebra/nlode.spad.pamphlet: Likewise.
	* algebra/odeef.spad.pamphlet: Likewise.
	* algebra/oderf.spad.pamphlet: Likewise.
	* algebra/openmath.spad.pamphlet: Likewise.
	* algebra/patmatch1.spad.pamphlet: Likewise.
	* algebra/patmatch2.spad.pamphlet: Likewise.
	* algebra/pfo.spad.pamphlet: Likewise.
	* algebra/polycat.spad.pamphlet: Likewise.
	* algebra/primelt.spad.pamphlet: Likewise.
	* algebra/rdeef.spad.pamphlet: Likewise.
	* algebra/rdesys.spad.pamphlet: Likewise.
	* algebra/rule.spad.pamphlet: Likewise.
	* algebra/solverad.spad.pamphlet: Likewise.
	* algebra/sum.spad.pamphlet: Likewise.
	* algebra/transsolve.spad.pamphlet: Likewise.
	* testsuite/interpreter/aw-193.input: New.
	* testsuite/interpreter/aw-334.input: Likewise.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/algebra/efstruc.spad.pamphlet b/src/algebra/efstruc.spad.pamphlet
index 320842e5..381030eb 100644
--- a/src/algebra/efstruc.spad.pamphlet
+++ b/src/algebra/efstruc.spad.pamphlet
@@ -112,7 +112,7 @@ TangentExpansions(R:Field): Exports == Implementation where
 ++   which are not considered simplifications.
 ++ Keywords: elementary, function, structure.
 ElementaryFunctionStructurePackage(R,F): Exports == Implementation where
-  R : Join(IntegralDomain, OrderedSet, RetractableTo Integer,
+  R : Join(IntegralDomain, RetractableTo Integer,
            LinearlyExplicitRingOver Integer)
   F : Join(AlgebraicallyClosedField, TranscendentalFunctionCategory,
            FunctionSpace R)
@@ -506,7 +506,7 @@ ElementaryFunctionStructurePackage(R,F): Exports == Implementation where
 ++   F and FG should be the same type of function space.
 ++ Keywords: trigonometric, function, manipulation.
 InnerTrigonometricManipulations(R,F,FG): Exports == Implementation where
-  R  : Join(IntegralDomain, OrderedSet)
+  R  : IntegralDomain
   F  : Join(FunctionSpace R, RadicalCategory,
             TranscendentalFunctionCategory)
   FG : Join(FunctionSpace Complex R, RadicalCategory,
@@ -672,7 +672,7 @@ InnerTrigonometricManipulations(R,F,FG): Exports == Implementation where
 ++   trigonometric functions to complex exponentials and logarithms, and back.
 ++ Keywords: trigonometric, function, manipulation.
 TrigonometricManipulations(R, F): Exports == Implementation where
-  R : Join(GcdDomain, OrderedSet, RetractableTo Integer,
+  R : Join(GcdDomain, RetractableTo Integer,
            LinearlyExplicitRingOver Integer)
   F : Join(AlgebraicallyClosedField, TranscendentalFunctionCategory,
            FunctionSpace R)
@@ -816,7 +816,7 @@ TrigonometricManipulations(R, F): Exports == Implementation where
 ++   compute the real and imaginary parts of complex functions.
 ++ Keywords: complex, function, manipulation.
 ComplexTrigonometricManipulations(R, F): Exports == Implementation where
-  R : Join(IntegralDomain, OrderedSet, RetractableTo Integer)
+  R : Join(IntegralDomain, RetractableTo Integer)
   F : Join(AlgebraicallyClosedField, TranscendentalFunctionCategory,
            FunctionSpace Complex R)