* algebra/float.spad.pamphlet (Float): Tidy.

	* algebra/fortmac.spad.pamphlet (MachineInteger): Likewise.
	* algebra/fspace.spad.pamphlet (FunctionSpace): Likewise.
	* algebra/integer.spad.pamphlet (Integer): Likewise.
	* algebra/mkfunc.spad.pamphlet (InputForm): Likewise.
	* algebra/newpoly.spad.pamphlet (RecursivePolynomialCategory):
	Likewise. 
	* input/knot.input.pamphlet: Likewise.
	* input/knot2.input.pamphlet: Likewise.
	* input/mult3d.input.pamphlet: Likewise.
	* input/multKnot.input.pamphlet: Likewise.
	* input/r21bugsbig.input.pamphlet: Likewise.
	* input/tutchap2.input.pamphlet: Likewise.

6 files changed, 11 insertions, 11 deletions

diff --git a/src/input/knot.input.pamphlet b/src/input/knot.input.pamphlet
index 073e649d..b9e0e467 100644
--- a/src/input/knot.input.pamphlet
+++ b/src/input/knot.input.pamphlet
@@ -25,8 +25,8 @@ torusKnot(p,q,r) ==
   b := 1
   ab := a+b
   fac := 2*ab/(1.1*ab-sin(q*t))
-  Title := concat("Torus Knot of Type (", concat(p::String, 
-                  concat(",", concat(q::String, ")"))))
+  Title := concat("Torus Knot of Type (", concat(string p, 
+                  concat(",", concat(string q, ")"))))
   Curve := curve(a*fac*cos(p*t), a*fac*sin(p*t), b*fac*cos(q*t))
   r = 0 => draw(Curve, t=0..2*%pi, title == Title)
   draw(Curve, t=0..2*%pi, tubeRadius == r, title == Title)
diff --git a/src/input/knot2.input.pamphlet b/src/input/knot2.input.pamphlet
index 01caa665..9f4d1b8a 100644
--- a/src/input/knot2.input.pamphlet
+++ b/src/input/knot2.input.pamphlet
@@ -37,7 +37,7 @@ knot := tubePlot(sin t * cos(PQ*t),cos t * cos(PQ*t),cos t * sin(PQ*t),
                       f, theRange, 0.1::SF, 6, "open" )
 
 -- make a viewport out of it
-makeViewport3D(knot, concat ["knot",p::String,q::String])$VIEW3D
+makeViewport3D(knot, concat ["knot", string p,string q])$VIEW3D
 @
 \eject
 \begin{thebibliography}{99}
diff --git a/src/input/mult3d.input.pamphlet b/src/input/mult3d.input.pamphlet
index 4920aaf9..179d72e5 100644
--- a/src/input/mult3d.input.pamphlet
+++ b/src/input/mult3d.input.pamphlet
@@ -57,8 +57,8 @@ torusInKnot(p,q,r) ==
   b := 1
   ab := a+b
   fac := 2*ab/(1.1*ab-sin(q*t))
-  Title := concat("Torus Knot of Type (", concat(p::String, 
-                  concat(",", concat(q::String, ")"))))
+  Title := concat("Torus Knot of Type (", concat(string p, 
+                  concat(",", concat(string q, ")"))))
   Curve := curve(a*fac*cos(p*t), a*fac*sin(p*t), b*fac*cos(q*t))
   r = 0 => draw(Curve, t=0..2*%pi, title == Title)
   draw(Curve, t=0..2*%pi, tubeRadius == r, title == Title, space == sp)
diff --git a/src/input/multKnot.input.pamphlet b/src/input/multKnot.input.pamphlet
index c051a0fb..572cc9e1 100644
--- a/src/input/multKnot.input.pamphlet
+++ b/src/input/multKnot.input.pamphlet
@@ -23,8 +23,8 @@ torusInKnot(p,q,r) ==
   b := 1
   ab := a+b
   fac := 2*ab/(1.1*ab-sin(q*t))
-  Title := concat("Torus Knot of Type (", concat(p::String, 
-                  concat(",", concat(q::String, ")"))))
+  Title := concat("Torus Knot of Type (", concat(string p, 
+                  concat(",", concat(string q, ")"))))
   Curve := curve(a*fac*cos(p*t), a*fac*sin(p*t), b*fac*cos(q*t))
   r = 0 => draw(Curve, t=0..2*%pi, title == Title)
   draw(Curve, t=0..2*%pi, tubeRadius == r, title == Title, space == sp)
diff --git a/src/input/r21bugsbig.input.pamphlet b/src/input/r21bugsbig.input.pamphlet
index 9affe00e..db21cf26 100644
--- a/src/input/r21bugsbig.input.pamphlet
+++ b/src/input/r21bugsbig.input.pamphlet
@@ -19,7 +19,7 @@
 n : PositiveInteger := 5
 UZn : List(PositiveInteger) := [i for i in 1 .. n-1 | gcd(i,n) = 1]
 -- K = Q(t), corps des fractions rationnelles a Phi(n) indeterminees sur Q
-vars : List(Symbol) := [concat("t", i::String)::Symbol for i in 0 ..#UZn-1] ;
+vars : List(Symbol) := [concat("t", string i)::Symbol for i in 0 ..#UZn-1] ;
 Zt := DistributedMultivariatePolynomial(vars, Integer) ;   K :=Fraction(Zt) ;
 t : List(K) := [v::K for v in vars]
 -- ATTENTION : on specialise certains des indeterminees
diff --git a/src/input/tutchap2.input.pamphlet b/src/input/tutchap2.input.pamphlet
index ae81f5f3..83fd148a 100644
--- a/src/input/tutchap2.input.pamphlet
+++ b/src/input/tutchap2.input.pamphlet
@@ -83,14 +83,14 @@ halfSum(x, y) == (x + y)/2
 halfSum(1, 3)
 halfSum(1.5, 2.5)
 halfSum(2, 4)
-f(n)==#((2^n)::String)   
+f(n)==#(string(2^n))   
 f(20)
-f(n) == (local length; length := #((2^n)::String);     _
+f(n) == (local length; length := #(string(2^n));     _
                  if length > 120 then "Too long!" else length)
 f 100
 f 1000
 f(n : PositiveInteger) : Any ==                   _
-          (local length; length := #((2^n)::String);      _
+          (local length; length := #(string(2^n));      _
            if length > 120 then "Too long!" else length)
 f 0
 g1(x) == 2*x