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/expexpan.spad.pamphlet b/src/algebra/expexpan.spad.pamphlet
index 34ab10d2..346bf3eb 100644
--- a/src/algebra/expexpan.spad.pamphlet
+++ b/src/algebra/expexpan.spad.pamphlet
@@ -36,7 +36,7 @@
 ++   in computing limits involving functions with essential singularities.
 ExponentialOfUnivariatePuiseuxSeries(FE,var,cen):_
       Exports == Implementation where
-  FE  : Join(Field,OrderedSet)
+  FE  : Field
   var : Symbol
   cen : FE
   UPXS ==> UnivariatePuiseuxSeries(FE,var,cen)
@@ -75,7 +75,7 @@ ExponentialOfUnivariatePuiseuxSeries(FE,var,cen):_
       ordf < ordg => false
       (fCoef := coefficient(f,ordf)) = (gCoef := coefficient(g,ordg)) =>
         reductum(f) < reductum(g)
-      fCoef < gCoef  -- this is "random" if FE is EXPR INT
+      before?(fCoef,gCoef)  -- this is "random" if FE is EXPR INT
 
     coerce(f:%):OutputForm ==
       ("%e" :: OutputForm) ** ((coerce$Rep)(complete f)@OutputForm)
@@ -107,7 +107,7 @@ ExponentialOfUnivariatePuiseuxSeries(FE,var,cen):_
 ++   degree.
 UnivariatePuiseuxSeriesWithExponentialSingularity(R,FE,var,cen):_
   Exports == Implementation where
-  R   : Join(OrderedSet,RetractableTo Integer,_
+  R   : Join(RetractableTo Integer,_
              LinearlyExplicitRingOver Integer,GcdDomain)
   FE  : Join(AlgebraicallyClosedField,TranscendentalFunctionCategory,_
              FunctionSpace R)
@@ -381,7 +381,7 @@ UnivariatePuiseuxSeriesWithExponentialSingularity(R,FE,var,cen):_
 ++   are quotients of sums, where each term in the sum is a univariate Puiseux
 ++   series times the exponential of a univariate Puiseux series.
 ExponentialExpansion(R,FE,var,cen): Exports == Implementation where
-  R   : Join(OrderedSet,RetractableTo Integer,_
+  R   : Join(RetractableTo Integer,_
              LinearlyExplicitRingOver Integer,GcdDomain)
   FE  : Join(AlgebraicallyClosedField,TranscendentalFunctionCategory,_
              FunctionSpace R)