* algebra/seg.spad.pamphlet (SegmentCategory): Extend

	ConvertibleFrom S.
	* algebra/newpoint.spad.pamphlet (PointCategory): Extend
	ConvertibleFrom List R.
	* algebra/misc.spad.pamphlet (SingletonAsOrderedSet): Now
	ConvertibleTo Symbol.
	* algebra/integer.spad.pamphlet (RomanNumeral): Now
	ConvertibleFrom Symbol.
	* algebra/float.spad.pamphlet (Float): Now ConvertibleFrom SF.
	* algebra/sex.spad.pamphlet (SExpressionCategory): Extend
	ConvertibleFrom Str, ConvertibleFrom Sym, ConvertibleFrom Int,
	ConvertibleFrom Flt, ConvertibleFrom List %.

1 files changed, 12 insertions, 14 deletions

diff --git a/src/algebra/newpoint.spad.pamphlet b/src/algebra/newpoint.spad.pamphlet
index bd2b658e..b6479605 100644
--- a/src/algebra/newpoint.spad.pamphlet
+++ b/src/algebra/newpoint.spad.pamphlet
@@ -26,20 +26,18 @@
 ++ may be plotted via the graphics facilities.  Functions are provided for
 ++ defining points and handling elements of points.
  
-PointCategory(R:Ring) : Category == VectorCategory(R) with
-  point: List R -> %
-    ++ point(l) returns a point category defined by a list l of elements from 
-    ++ the domain R.
-  dimension: % -> PositiveInteger
-    ++ dimension(s) returns the dimension of the point category s.
-  convert: List R -> %
-    ++ convert(l) takes a list of elements, l, from the domain Ring and 
-    ++ returns the form of point category.
-  cross: (%,%) -> %
-      ++ cross(p,q) computes the cross product of the two points \spad{p}
-      ++ and \spad{q}. Error if the p and q are not 3 dimensional
-  extend : (%,List R) -> %
-	++ extend(x,l,r) \undocumented
+PointCategory(R:Ring) : Category ==
+  Join(VectorCategory(R),ConvertibleFrom List R) with
+    point: List R -> %
+      ++ point(l) returns a point category defined by a list l of elements from 
+      ++ the domain R.
+    dimension: % -> PositiveInteger
+      ++ dimension(s) returns the dimension of the point category s.
+    cross: (%,%) -> %
+	++ cross(p,q) computes the cross product of the two points \spad{p}
+	++ and \spad{q}. Error if the p and q are not 3 dimensional
+    extend : (%,List R) -> %
+	  ++ extend(x,l,r) \undocumented
 
 @
 \section{domain POINT Point}