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, 3 insertions, 3 deletions

diff --git a/src/algebra/oderf.spad.pamphlet b/src/algebra/oderf.spad.pamphlet
index 08ba4213..bc256aef 100644
--- a/src/algebra/oderf.spad.pamphlet
+++ b/src/algebra/oderf.spad.pamphlet
@@ -679,7 +679,7 @@ ODETools(F, LODO): Exports == Implementation where
 ++ This package is intended for use
 ++ by the differential equations solver but not at top-level.
 ODEIntegration(R, F): Exports == Implementation where
-  R: Join(OrderedSet, EuclideanDomain, RetractableTo Integer,
+  R: Join(EuclideanDomain, RetractableTo Integer,
           LinearlyExplicitRingOver Integer, CharacteristicZero)
   F: Join(AlgebraicallyClosedFunctionSpace R, TranscendentalFunctionCategory,
                                               PrimitiveFunctionCategory)
@@ -753,7 +753,7 @@ ODEIntegration(R, F): Exports == Implementation where
     isQlog f ==
       is?(f, 'log) => [1, first argument(retract(f)@K)]
       (v := isTimes f) case List(F) and (#(l := v::List(F)) <= 3) =>
-          l := reverse_! sort_! l
+          l := reverse! sort!(before?,l)
           is?(first l, 'log) and ((u := isQ rest l) case Q) =>
               [u::Q, first argument(retract(first(l))@K)]
           "failed"
@@ -768,7 +768,7 @@ ODEIntegration(R, F): Exports == Implementation where
 ++ Date Last Updated: 3 February 1994
 ++ Description: Solution of linear ordinary differential equations, constant coefficient case.
 ConstantLODE(R, F, L): Exports == Implementation where
-  R: Join(OrderedSet, EuclideanDomain, RetractableTo Integer,
+  R: Join(EuclideanDomain, RetractableTo Integer,
           LinearlyExplicitRingOver Integer, CharacteristicZero)
   F: Join(AlgebraicallyClosedFunctionSpace R,
           TranscendentalFunctionCategory, PrimitiveFunctionCategory)