* algebra/algfunc.spad.pamphlet: Quote symbols.

	* algebra/combfunc.spad.pamphlet: Likewise.
	* algebra/drawopt.spad.pamphlet: Likewise.
	* algebra/efstruc.spad.pamphlet: Likewise.
	* algebra/elemntry.spad.pamphlet: Likewise.
	* algebra/expr.spad.pamphlet: Likewise.
	* algebra/exprode.spad.pamphlet: Likewise.
	* algebra/float.spad.pamphlet: Likewise.
	* algebra/gaussian.spad.pamphlet: Likewise.
	* algebra/intaux.spad.pamphlet: Likewise.
	* algebra/irexpand.spad.pamphlet: Likewise.
	* algebra/laplace.spad.pamphlet: Likewise.
	* algebra/limitps.spad.pamphlet: Likewise.
	* algebra/liouv.spad.pamphlet: Likewise.
	* algebra/list.spad.pamphlet: Likewise.
	* algebra/lmdict.spad.pamphlet: Likewise.
	* algebra/manip.spad.pamphlet: Likewise.
	* algebra/matcat.spad.pamphlet: Likewise.
	* algebra/matrix.spad.pamphlet: Likewise.
	* algebra/mkfunc.spad.pamphlet: Likewise.
	* algebra/mset.spad.pamphlet: Likewise.
	* algebra/oct.spad.pamphlet: Likewise.
	* algebra/op.spad.pamphlet: Likewise.
	* algebra/patmatch1.spad.pamphlet: Likewise.
	* algebra/pattern.spad.pamphlet: Likewise.
	* algebra/quat.spad.pamphlet: Likewise.
	* algebra/sets.spad.pamphlet: Likewise.
	* algebra/transsolve.spad.pamphlet: Likewise.
	* algebra/vector.spad.pamphlet: Likewise.

1 files changed, 46 insertions, 45 deletions

diff --git a/src/algebra/drawopt.spad.pamphlet b/src/algebra/drawopt.spad.pamphlet
index 107d5d3d..21acd672 100644
--- a/src/algebra/drawopt.spad.pamphlet
+++ b/src/algebra/drawopt.spad.pamphlet
@@ -164,48 +164,47 @@ DrawOption(): Exports == Implementation where
   -- these lists will become tuples in a later version
   lengthI tup == # tup
 
-  viewpoint vp == 
-    ["viewpoint"::Symbol, vp::Any]
-
-  title s == ["title"::Symbol, s::Any]
-  style s == ["style"::Symbol, s::Any]
-  toScale b == ["toScale"::Symbol, b::Any]
-  clip(b:Boolean) == ["clipBoolean"::Symbol, b::Any]
-  adaptive b == ["adaptive"::Symbol, b::Any]
-
-  pointColor(x:Float) == ["pointColorFloat"::Symbol, x::Any]
-  pointColor(c:PAL) == ["pointColorPalette"::Symbol, c::Any]
-  curveColor(x:Float) == ["curveColorFloat"::Symbol, x::Any]
-  curveColor(c:PAL) == ["curveColorPalette"::Symbol, c::Any]
-  colorFunction(f:SF -> SF) == ["colorFunction1"::Symbol, f::Any]
-  colorFunction(f:(SF,SF) -> SF) == ["colorFunction2"::Symbol, f::Any]
-  colorFunction(f:(SF,SF,SF) -> SF) == ["colorFunction3"::Symbol, f::Any]
+  viewpoint vp == ['viewpoint, vp::Any]
+
+  title s == ['title, s::Any]
+  style s == ['style, s::Any]
+  toScale b == ['toScale, b::Any]
+  clip(b:Boolean) == ['clipBoolean, b::Any]
+  adaptive b == ['adaptive, b::Any]
+
+  pointColor(x:Float) == ['pointColorFloat, x::Any]
+  pointColor(c:PAL) == ['pointColorPalette, c::Any]
+  curveColor(x:Float) == ['curveColorFloat, x::Any]
+  curveColor(c:PAL) == ['curveColorPalette, c::Any]
+  colorFunction(f:SF -> SF) == ['colorFunction1, f::Any]
+  colorFunction(f:(SF,SF) -> SF) == ['colorFunction2, f::Any]
+  colorFunction(f:(SF,SF,SF) -> SF) == ['colorFunction3, f::Any]
   clip(tup:List SEG) == 
     length tup > 3 =>
       error "clip: at most 3 segments may be specified"
-    ["clipSegment"::Symbol, tup::Any]
-  coordinates f == ["coordinates"::Symbol, f::Any]
-  tubeRadius x == ["tubeRadius"::Symbol, x::Any]
+    ['clipSegment, tup::Any]
+  coordinates f == ['coordinates, f::Any]
+  tubeRadius x == ['tubeRadius, x::Any]
   range(tup:List Segment Float) == 
     ((n := length tup) > 3) =>
       error "range: at most 3 segments may be specified"
     n < 2 =>
       error "range: at least 2 segments may be specified"
-    ["rangeFloat"::Symbol, tup::Any]
+    ['rangeFloat, tup::Any]
   range(tup:List Segment Fraction Integer) == 
     ((n := lengthR tup) > 3) =>
       error "range: at most 3 segments may be specified"
     n < 2 =>
       error "range: at least 2 segments may be specified"
-    ["rangeRat"::Symbol, tup::Any]
-
-  ranges s               == ["ranges"::Symbol, s::Any]
-  space s                == ["space"::Symbol, s::Any]
-  var1Steps s            == ["var1Steps"::Symbol, s::Any]
-  var2Steps s            == ["var2Steps"::Symbol, s::Any]
-  tubePoints s           == ["tubePoints"::Symbol, s::Any]
-  coord s                == ["coord"::Symbol, s::Any]
-  unit s                 == ["unit"::Symbol, s::Any]
+    ['rangeRat, tup::Any]
+
+  ranges s               == ['ranges, s::Any]
+  space s                == ['space, s::Any]
+  var1Steps s            == ['var1Steps, s::Any]
+  var2Steps s            == ['var2Steps, s::Any]
+  tubePoints s           == ['tubePoints, s::Any]
+  coord s                == ['coord, s::Any]
+  unit s                 == ['unit, s::Any]
   coerce(x:%):OutputForm == x.keyword::OutputForm = x.value::OutputForm
   x:% = y:%              == x.keyword = y.keyword and x.value = y.value
 
@@ -336,84 +335,84 @@ DrawOptionFunctions0(): Exports == Implementation where
 
  Implementation ==> add
   adaptive(l,s) ==
-    (u := option(l, "adaptive"::Symbol)$DrawOptionFunctions1(Boolean))
+    (u := option(l,'adaptive)$DrawOptionFunctions1(Boolean))
       case "failed" => s
     u::Boolean
 
   clipBoolean(l,s) ==
-    (u := option(l, "clipBoolean"::Symbol)$DrawOptionFunctions1(Boolean))
+    (u := option(l,'clipBoolean)$DrawOptionFunctions1(Boolean))
       case "failed" => s
     u::Boolean
 
   title(l, s) ==
-    (u := option(l, "title"::Symbol)$DrawOptionFunctions1(String))
+    (u := option(l,'title)$DrawOptionFunctions1(String))
       case "failed" => s
     u::String
 
   viewpoint(l, vp) ==
-    (u := option(l, "viewpoint"::Symbol)$DrawOptionFunctions1(VIEWPT))
+    (u := option(l,'viewpoint)$DrawOptionFunctions1(VIEWPT))
       case "failed" => vp
     u::VIEWPT
 
   style(l, s) ==
-    (u := option(l, "style"::Symbol)$DrawOptionFunctions1(String))
+    (u := option(l,'style)$DrawOptionFunctions1(String))
       case "failed" => s
     u::String
 
   toScale(l,s) ==
-    (u := option(l, "toScale"::Symbol)$DrawOptionFunctions1(Boolean))
+    (u := option(l,'toScale)$DrawOptionFunctions1(Boolean))
       case "failed" => s
     u::Boolean
 
   pointColorPalette(l,s) ==
-    (u := option(l, "pointColorPalette"::Symbol)$DrawOptionFunctions1(PAL))
+    (u := option(l,'pointColorPalette)$DrawOptionFunctions1(PAL))
       case "failed" => s
     u::PAL
 
   curveColorPalette(l,s) ==
-    (u := option(l, "curveColorPalette"::Symbol)$DrawOptionFunctions1(PAL))
+    (u := option(l,'curveColorPalette)$DrawOptionFunctions1(PAL))
       case "failed" => s
     u::PAL
 
 
 
   ranges(l, s) ==
-    (u := option(l, "ranges"::Symbol)$DrawOptionFunctions1(RANGE))
+    (u := option(l,'ranges)$DrawOptionFunctions1(RANGE))
       case "failed" => s
     u::RANGE
 
   space(l) ==
-    (u := option(l, "space"::Symbol)$DrawOptionFunctions1(SPACE3))
+    (u := option(l,'space)$DrawOptionFunctions1(SPACE3))
       case "failed" => create3Space()$SPACE3
     u::SPACE3
 
   var1Steps(l,s) ==
-    (u := option(l, "var1Steps"::Symbol)$DrawOptionFunctions1(PositiveInteger))
+    (u := option(l,'var1Steps)$DrawOptionFunctions1(PositiveInteger))
       case "failed" => s
     u::PositiveInteger
 
   var2Steps(l,s) ==
-    (u := option(l, "var2Steps"::Symbol)$DrawOptionFunctions1(PositiveInteger))
+    (u := option(l,'var2Steps)$DrawOptionFunctions1(PositiveInteger))
       case "failed" => s
     u::PositiveInteger
 
   tubePoints(l,s) ==
-    (u := option(l, "tubePoints"::Symbol)$DrawOptionFunctions1(PositiveInteger))
+    (u := option(l,'tubePoints)$DrawOptionFunctions1(PositiveInteger))
       case "failed" => s
     u::PositiveInteger
 
   tubeRadius(l,s) ==
-    (u := option(l, "tubeRadius"::Symbol)$DrawOptionFunctions1(Float))
+    (u := option(l,'tubeRadius)$DrawOptionFunctions1(Float))
       case "failed" => s
     u::Float
 
   coord(l,s) ==
-    (u := option(l, "coord"::Symbol)$DrawOptionFunctions1(POINT->POINT))
+    (u := option(l,'coord)$DrawOptionFunctions1(POINT->POINT))
       case "failed" => s
     u::(POINT->POINT)
 
   units(l,s) ==
-    (u := option(l, "unit"::Symbol)$DrawOptionFunctions1(UNIT))
+    (u := option(l,'unit)$DrawOptionFunctions1(UNIT))
       case "failed" => s
     u::UNIT
 
@@ -422,6 +421,8 @@ DrawOptionFunctions0(): Exports == Implementation where
 <<license>>=
 --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 --All rights reserved.
+--Copyright (C) 2007-2009, Gabriel Dos Reis.
+--All rights reserved.
 --
 --Redistribution and use in source and binary forms, with or without
 --modification, are permitted provided that the following conditions are