===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/sp,v
retrieving revision 1.10
retrieving revision 1.12
diff -u -p -r1.10 -r1.12
--- OpenXM_contrib2/asir2000/lib/sp	2002/06/21 00:34:21	1.10
+++ OpenXM_contrib2/asir2000/lib/sp	2004/01/07 08:23:11	1.12
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/lib/sp,v 1.9 2001/10/12 06:07:05 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/lib/sp,v 1.11 2003/02/07 09:25:58 noro Exp $ 
 */
 /* 
 	sp : functions related to algebraic number fields
@@ -63,6 +63,20 @@ extern ASCENT,GCDTIME,UFTIME,RESTIME,SQTIME,PRINT$
 extern Ord$
 extern USE_PARI_FACTOR$
 
+/* gen_sp can handle non-monic poly */
+
+def gen_sp(P)
+{
+	P = ptozp(P);
+	V = var(P);
+	D = deg(P,V);
+	LC = coef(P,D,V);
+	F = LC^(D-1)*subst(P,V,V/LC);
+	/* F must be monic */
+	L = sp(F);
+	return cons(map(subst,car(L),V,LC*V),cdr(L));
+}
+
 def sp(P)
 {
 	RESTIME=UFTIME=GCDTIME=SQTIME=0;
@@ -789,8 +803,11 @@ def norm_ch_lag(V,VM,P,P0) {
 
 def cr_gcda(P1,P2)
 {
-	if ( !(V = var(P1)) || !var(P2) )
-		return 1;
+	if ( !var(P1) )
+		return P2;
+	else if ( !var(P2) )
+		return P1;
+	V = var(P1);
 	EXT = union_sort(getalgtreep(P1),getalgtreep(P2));
 	if ( EXT == [] )
 		return gcd(P1,P2);