9 files changed, 26 insertions, 32 deletions
diff --git a/src/algebra/color.spad.pamphlet b/src/algebra/color.spad.pamphlet
index 32d76dd3..990e0e76 100644
--- a/src/algebra/color.spad.pamphlet
+++ b/src/algebra/color.spad.pamphlet
@@ -130,7 +130,7 @@ Color(): Exports == Implementation where
     yellow()  == [11::I,1]
     green()   == [14::I,1]
     blue()    == [22::I,1]
-    sample()  == red()
+    sample    == red()
     hue c     == c.hue
     i:PositiveInteger * c:% == i::SF * c
     numberOfHues() == totalHues 
diff --git a/src/algebra/data.spad.pamphlet b/src/algebra/data.spad.pamphlet
index bcb80de0..07f9144f 100644
--- a/src/algebra/data.spad.pamphlet
+++ b/src/algebra/data.spad.pamphlet
@@ -114,12 +114,12 @@ SystemInteger(N: PositiveInteger): Public == Private where
   Private == SubDomain(Integer, length #1 <= N) add
     import %icst0: % from Foreign Builtin
     sample == %icst0
-    min == per(-shift(1,N-1))
-    max == per(shift(1,N-1)-1)
+    min: % == per(-shift(1,N-1))
+    max: % == per(shift(1,N-1)-1)
     size() == (rep max - rep min + 1)::NonNegativeInteger
     index i == per (i + rep min - 1)
     lookup x == (rep x - rep min + 1)::PositiveInteger
-    random() == per random(rep max())$Integer
+    random() == per random(rep max)$Integer
 
 @
 
@@ -200,8 +200,8 @@ SystemNonNegativeInteger(N: PositiveInteger): Public == Private where
     import %bitior: (%,%) -> % from Foreign Builtin
     import %bitnot: % -> %     from Foreign Builtin
 
-    min == %icst0
-    max == per((shift(1,N)-1) : NonNegativeInteger)
+    min: % == %icst0
+    max: % == per((shift(1,N)-1) : NonNegativeInteger)
     sample == min
     bitand(x,y) == %bitand(x,y)
     bitior(x,y) == %bitior(x,y)
diff --git a/src/algebra/ffnb.spad.pamphlet b/src/algebra/ffnb.spad.pamphlet
index 95b5c316..673fd906 100644
--- a/src/algebra/ffnb.spad.pamphlet
+++ b/src/algebra/ffnb.spad.pamphlet
@@ -650,7 +650,7 @@ divisor of the order of the multiplicative group"
 
     extensionDegree(): PositiveInteger == extdeg
 
-    sizeOfGroundField() == size()$GF pretend NNI
+    sizeOfGroundField == size()$GF pretend NNI
 
     definingPolynomial() == defpol
 
diff --git a/src/algebra/matrix.spad.pamphlet b/src/algebra/matrix.spad.pamphlet
index 2dbe4cc8..04bbb1fe 100644
--- a/src/algebra/matrix.spad.pamphlet
+++ b/src/algebra/matrix.spad.pamphlet
@@ -464,7 +464,7 @@ SquareMatrix(ndim,R): Exports == Implementation where
  
     if R has Field then
  
-      dimension() == (m * n) :: CardinalNumber
+      dimension == (m * n) :: CardinalNumber
  
       inverse x ==
         (u := inverse rep x) case "failed" => "failed"
diff --git a/src/algebra/regset.spad.pamphlet b/src/algebra/regset.spad.pamphlet
index 46a30486..7247474b 100644
--- a/src/algebra/regset.spad.pamphlet
+++ b/src/algebra/regset.spad.pamphlet
@@ -1447,8 +1447,6 @@ RegularTriangularSet(R,E,V,P) : Exports == Implementation where
        construct(map!(f,rep(ts))$LP)$$
      member? (p,ts) ==
        member?(p,rep(ts))$LP
-     unitIdealIfCan() ==
-       "failed"::Union($,"failed")
      roughUnitIdeal? ts ==
        false
      coerce(ts:$) : OutputForm ==
diff --git a/src/algebra/sregset.spad.pamphlet b/src/algebra/sregset.spad.pamphlet
index a476fd73..472c3f47 100644
--- a/src/algebra/sregset.spad.pamphlet
+++ b/src/algebra/sregset.spad.pamphlet
@@ -1238,8 +1238,6 @@ SquareFreeRegularTriangularSet(R,E,V,P) : Exports == Implementation where
        construct(map!(f,rep(ts))$LP)$$
      member? (p,ts) ==
        member?(p,rep(ts))$LP
-     unitIdealIfCan() ==
-       "failed"::Union($,"failed")
      roughUnitIdeal? ts ==
        false
      coerce(ts:$) : OutputForm ==
diff --git a/src/algebra/triset.spad.pamphlet b/src/algebra/triset.spad.pamphlet
index 2ddac8a7..50b56350 100644
--- a/src/algebra/triset.spad.pamphlet
+++ b/src/algebra/triset.spad.pamphlet
@@ -550,8 +550,6 @@ GeneralTriangularSet(R,E,V,P) : Exports == Implementation where
      member? (p,ts) ==
        member?(p,rep(ts))$LP
 
-     unitIdealIfCan() ==
-       "failed"::Union($,"failed")
      roughUnitIdeal? ts ==
        false
 
diff --git a/src/algebra/view3D.spad.pamphlet b/src/algebra/view3D.spad.pamphlet
index 89da76fe..9d8daed2 100644
--- a/src/algebra/view3D.spad.pamphlet
+++ b/src/algebra/view3D.spad.pamphlet
@@ -566,23 +566,23 @@ ThreeDimensionalViewport(): Exports == Implementation where
       viewport
          -- the key (now set to 0) should be what the viewport returns
 
-    viewThetaDefault    == convert(deref defaultTheta)@F
+    viewThetaDefault()  == convert(deref defaultTheta)@F
     viewThetaDefault  t == 
       setref(defaultTheta,convert(t)@SF)
       t
-    viewPhiDefault      == convert(deref defaultPhi)@F
+    viewPhiDefault()    == convert(deref defaultPhi)@F
     viewPhiDefault    t == 
       setref(defaultPhi,convert(t)@SF)
       t
-    viewZoomDefault     == convert(deref defaultZoom)@F
+    viewZoomDefault()   == convert(deref defaultZoom)@F
     viewZoomDefault   t == 
       setref(defaultZoom,convert(t)@SF)
       t
-    viewDeltaXDefault   == convert(deref defaultDeltaX)@F
+    viewDeltaXDefault() == convert(deref defaultDeltaX)@F
     viewDeltaXDefault t == 
       setref(defaultDeltaX,convert(t)@SF)
       t
-    viewDeltaYDefault   == convert(deref defaultDeltaY)@F
+    viewDeltaYDefault() == convert(deref defaultDeltaY)@F
     viewDeltaYDefault t == 
       setref(defaultDeltaY,convert(t)@SF)
       t
diff --git a/src/algebra/viewDef.spad.pamphlet b/src/algebra/viewDef.spad.pamphlet
index 3eaa4787..78079747 100644
--- a/src/algebra/viewDef.spad.pamphlet
+++ b/src/algebra/viewDef.spad.pamphlet
@@ -152,12 +152,12 @@ ViewDefaultsPackage():Exports == Implementation where
     defaultClosed     : Reference(B)    := ref(false)
 
 --%Viewport window dimensions specifications
-    viewPosDefault   == [deref defaultXPos,deref defaultYPos]
+    viewPosDefault() == [deref defaultXPos,deref defaultYPos]
     viewPosDefault l ==
       #l < 2 => error "viewPosDefault expects a list with two elements"
       [setref(defaultXPos,first l),setref(defaultYPos,last l)]
 
-    viewSizeDefault   == [deref defaultWidth,deref defaultHeight]
+    viewSizeDefault() == [deref defaultWidth,deref defaultHeight]
     viewSizeDefault l ==
       #l < 2 => error "viewSizeDefault expects a list with two elements"
       [setref(defaultWidth,first l),setref(defaultHeight,last l)]
@@ -174,39 +174,39 @@ ViewDefaultsPackage():Exports == Implementation where
       defaultHeight     : Reference(PI)   := ref(427::PI)
 
 --%2D graphical output specifications
-    pointColorDefault   == deref defaultPointColor
+    pointColorDefault() == deref defaultPointColor
     pointColorDefault p == setref(defaultPointColor,p)
 
-    lineColorDefault   == deref defaultLineColor
+    lineColorDefault() == deref defaultLineColor
     lineColorDefault p == setref(defaultLineColor,p)
 
-    axesColorDefault   == deref defaultAxesColor
+    axesColorDefault() == deref defaultAxesColor
     axesColorDefault p == setref(defaultAxesColor,p)
 
-    unitsColorDefault   == deref defaultUnitsColor
+    unitsColorDefault() == deref defaultUnitsColor
     unitsColorDefault p == setref(defaultUnitsColor,p)
 
-    pointSizeDefault   == deref defaultPointSize
+    pointSizeDefault() == deref defaultPointSize
     pointSizeDefault x == setref(defaultPointSize,x)
 
 
 --%3D specific stuff
-    var1StepsDefault   == deref defaultVar1Steps
+    var1StepsDefault() == deref defaultVar1Steps
     var1StepsDefault i == setref(defaultVar1Steps,i)
 
-    var2StepsDefault   == deref defaultVar2Steps
+    var2StepsDefault() == deref defaultVar2Steps
     var2StepsDefault i == setref(defaultVar2Steps,i)
 
-    tubePointsDefault   == deref defaultTubePoints
+    tubePointsDefault() == deref defaultTubePoints
     tubePointsDefault i == setref(defaultTubePoints,i)
 
-    tubeRadiusDefault   == deref defaultTubeRadius
+    tubeRadiusDefault() == deref defaultTubeRadius
     tubeRadiusDefault f == setref(defaultTubeRadius,convert(f)@SF)
 
 --%File output stuff
-    viewWriteAvailable == writeAvailable
+    viewWriteAvailable() == writeAvailable
 
-    viewWriteDefault == deref defaultThingsToWrite
+    viewWriteDefault() == deref defaultThingsToWrite
 
     viewWriteDefault listOfThings ==
       thingsToWrite : L S := []