14 files changed, 151 insertions, 4 deletions
diff --git a/src/algebra/aggcat.spad.pamphlet b/src/algebra/aggcat.spad.pamphlet
index 8ed6c354..39ddc2d5 100644
--- a/src/algebra/aggcat.spad.pamphlet
+++ b/src/algebra/aggcat.spad.pamphlet
@@ -4,14 +4,17 @@
 \title{\$SPAD/src/algebra aggcat.spad}
 \author{Michael Monagan, Manuel Bronstein, Richard Jenks, Stephen Watt}
 \maketitle
+
 \begin{abstract}
 \end{abstract}
-\eject
+
 \tableofcontents
 \eject
+
 \section{category AGG Aggregate}
 <<category AGG Aggregate>>=
-
+import Boolean
+import NonNegativeInteger
 )abbrev category AGG Aggregate
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -64,8 +67,16 @@ Aggregate: Category == Type with
     size?(a,n) == #a = n
 
 @
+
 \section{category HOAGG HomogeneousAggregate}
+
 <<category HOAGG HomogeneousAggregate>>=
+import Boolean
+import OutputForm
+import SetCategory
+import Aggregate
+import CoercibleTo OutputForm
+import Evalable
 )abbrev category HOAGG HomogeneousAggregate
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -145,7 +156,10 @@ HomogeneousAggregate(S:Type): Category == Aggregate with
 @
 
 \section{category CLAGG Collection}
+
 <<category CLAGG Collection>>=
+import Boolean
+import HomogeneousAggregate
 )abbrev category CLAGG Collection
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -230,7 +244,10 @@ Collection(S:Type): Category == HomogeneousAggregate(S) with
 @
 
 \section{category BGAGG BagAggregate}
+
 <<category BGAGG BagAggregate>>=
+import HomogeneousAggregate
+import List
 )abbrev category BGAGG BagAggregate
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -264,8 +281,12 @@ BagAggregate(S:Type): Category == HomogeneousAggregate S with
      x
 
 @
+
 \section{category SKAGG StackAggregate}
+
 <<category SKAGG StackAggregate>>=
+import NonNegativeInteger
+import BagAggregate
 )abbrev category SKAGG StackAggregate
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -297,8 +318,12 @@ StackAggregate(S:Type): Category == BagAggregate S with
 
 
 @
+
 \section{category QUAGG QueueAggregate}
+
 <<category QUAGG QueueAggregate>>=
+import NonNegativeInteger
+import BagAggregate
 )abbrev category QUAGG QueueAggregate
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -336,8 +361,12 @@ QueueAggregate(S:Type): Category == BagAggregate S with
      ++ Error: if q is empty.
 
 @
+
 \section{category DQAGG DequeueAggregate}
+
 <<category DQAGG DequeueAggregate>>=
+import StackAggregate
+import QueueAggregate
 )abbrev category DQAGG DequeueAggregate
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -387,8 +416,11 @@ DequeueAggregate(S:Type):
      ++ the top (front) element is now the bottom (back) element, and so on.
 
 @
+
 \section{category PRQAGG PriorityQueueAggregate}
+
 <<category PRQAGG PriorityQueueAggregate>>=
+import BagAggregate
 )abbrev category PRQAGG PriorityQueueAggregate
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -414,8 +446,12 @@ PriorityQueueAggregate(S:OrderedSet): Category == BagAggregate S with
      ++ values from priority queue q1.
 
 @
+
 \section{category DIOPS DictionaryOperations}
 <<category DIOPS DictionaryOperations>>=
+import Boolean
+import Collection
+import BagAggregate
 )abbrev category DIOPS DictionaryOperations
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -464,8 +500,12 @@ DictionaryOperations(S:SetCategory): Category ==
 				      [x::OutputForm for x in parts s])
 
 @
+
 \section{category DIAGG Dictionary}
+
 <<category DIAGG Dictionary>>=
+import Boolean
+import DictionaryOperations
 )abbrev category DIAGG Dictionary
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -509,8 +549,12 @@ Dictionary(S:SetCategory): Category ==
        t
 
 @
+
 \section{category MDAGG MultiDictionary}
+
 <<category MDAGG MultiDictionary>>=
+import NonNegativeInteger
+import DictionaryOperations
 )abbrev category MDAGG MultiDictionary
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -541,8 +585,12 @@ MultiDictionary(S:SetCategory): Category == DictionaryOperations S with
 -- to become duplicates: % -> Iterator(D,D)
 
 @
+
 \section{category SETAGG SetAggregate}
+
 <<category SETAGG SetAggregate>>=
+import SetCategory
+import Collection
 )abbrev category SETAGG SetAggregate
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -622,7 +670,10 @@ SetAggregate(S:SetCategory):
 @
 
 \section{category FSAGG FiniteSetAggregate}
+
 <<category FSAGG FiniteSetAggregate>>=
+import Dictionary
+import SetAggregate
 )abbrev category FSAGG FiniteSetAggregate
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -713,8 +764,12 @@ FiniteSetAggregate(S:SetCategory): Category ==
        reduce("min", l)
 
 @
+
 \section{category MSETAGG MultisetAggregate}
+
 <<category MSETAGG MultisetAggregate>>=
+import MultiDictionary
+import SetAggregate
 )abbrev category MSETAGG MultisetAggregate
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -732,8 +787,13 @@ MultisetAggregate(S:SetCategory):
  Category == Join(MultiDictionary S, SetAggregate S)
 
 @
+
 \section{category OMSAGG OrderedMultisetAggregate}
+
 <<category OMSAGG OrderedMultisetAggregate>>=
+import MultisetAggregate
+import PriorityQueueAggregate
+import List
 )abbrev category OMSAGG OrderedMultisetAggregate
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
@@ -758,8 +818,12 @@ OrderedMultisetAggregate(S:OrderedSet): Category ==
 	++ min(u) returns the smallest entry in the multiset aggregate u.
 
 @
+
 \section{category KDAGG KeyedDictionary}
+
 <<category KDAGG KeyedDictionary>>=
+import Dictionary
+import List
 )abbrev category KDAGG KeyedDictionary
 ++ Author: Michael Monagan; revised by Manuel Bronstein and Richard Jenks
 ++ Date Created: August 87 through August 88
diff --git a/src/algebra/any.spad.pamphlet b/src/algebra/any.spad.pamphlet
index af9c3f2e..e832356e 100644
--- a/src/algebra/any.spad.pamphlet
+++ b/src/algebra/any.spad.pamphlet
@@ -78,7 +78,9 @@ Maybe(T: CoercibleTo OutputForm): Public == Private where
 
 
 \section{package NONE1 NoneFunctions1}
+
 <<package NONE1 NoneFunctions1>>=
+import None
 )abbrev package NONE1 NoneFunctions1
 ++ Author:
 ++ Date Created:
@@ -185,8 +187,12 @@ Any(): SetCategory with
        error "function any must have a domain as first argument"
 
 @
+
 \section{package ANY1 AnyFunctions1}
+
 <<package ANY1 AnyFunctions1>>=
+import Boolean
+import Any
 )abbrev package ANY1 AnyFunctions1
 ++ Author:
 ++ Date Created:
@@ -237,7 +243,10 @@ AnyFunctions1(S:Type): with
 @
 
 \section{domain PROPERTY Property}
+
 <<domain PROPERTY Property>>=
+import Symbol
+import SExpression
 )abbrev domain PROPERTY Property
 ++ Author: Gabriel Dos Reis
 ++ Date Created: October 24, 2007
diff --git a/src/algebra/catdef.spad.pamphlet b/src/algebra/catdef.spad.pamphlet
index 628130a2..b2d2c42e 100644
--- a/src/algebra/catdef.spad.pamphlet
+++ b/src/algebra/catdef.spad.pamphlet
@@ -94,7 +94,9 @@ AbelianMonoid(): Category == AbelianSemiGroup with
 
 
 \section{category ABELSG AbelianSemiGroup}
+
 <<category ABELSG AbelianSemiGroup>>=
+import PositiveInteger
 )abbrev category ABELSG AbelianSemiGroup
 ++ Author:
 ++ Date Created:
@@ -155,8 +157,11 @@ Algebra(R:CommutativeRing): Category ==
   coerce(x:R):% == x * 1$%
 
 @
+
 \section{category BASTYPE BasicType}
+
 <<category BASTYPE BasicType>>=
+import Boolean
 )abbrev category BASTYPE BasicType
 --% BasicType
 ++ Author:
@@ -178,7 +183,9 @@ BasicType(): Category == with
       _~_=(x:%,y:%) : Boolean == not(x=y)
 
 @
+
 \section{category BMODULE BiModule}
+
 <<category BMODULE BiModule>>=
 )abbrev category BMODULE BiModule
 ++ Author:
@@ -1255,7 +1262,9 @@ OrderedRing(): Category == Join(OrderedAbelianGroup,Ring,Monoid) with
 @
 
 \section{category ORDSET OrderedSet}
+
 <<category ORDSET OrderedSet>>=
+import Boolean
 )abbrev category ORDSET OrderedSet
 ++ Author:
 ++ Date Created:
@@ -1578,7 +1587,9 @@ Rng(): Category == Join(AbelianGroup,SemiGroup)
 @ 
 
 \section{category SGROUP SemiGroup}
+
 <<category SGROUP SemiGroup>>=
+import PositiveInteger
 )abbrev category SGROUP SemiGroup
 ++ Author:
 ++ Date Created:
diff --git a/src/algebra/drawopt.spad.pamphlet b/src/algebra/drawopt.spad.pamphlet
index 3e5658aa..26437f52 100644
--- a/src/algebra/drawopt.spad.pamphlet
+++ b/src/algebra/drawopt.spad.pamphlet
@@ -218,8 +218,12 @@ DrawOption(): Exports == Implementation where
     "failed"
 
 @
+
 \section{package DROPT1 DrawOptionFunctions1}
+
 <<package DROPT1 DrawOptionFunctions1>>=
+import Symbol
+import List DrawOption
 )abbrev package DROPT1 DrawOptionFunctions1
 ++ This package \undocumented{}
 DrawOptionFunctions1(S:Type): Exports == Implementation where
diff --git a/src/algebra/equation2.spad.pamphlet b/src/algebra/equation2.spad.pamphlet
index 8ae385bb..25a5f2cf 100644
--- a/src/algebra/equation2.spad.pamphlet
+++ b/src/algebra/equation2.spad.pamphlet
@@ -223,8 +223,11 @@ Equation(S: Type): public == private where
             [subst(lhs eq1,eq3),subst(rhs eq1,eq3)]
 
 @
+
 \section{package EQ2 EquationFunctions2}
+
 <<package EQ2 EquationFunctions2>>=
+import Equation
 )abbrev package EQ2 EquationFunctions2
 ++ Author:
 ++ Date Created:
diff --git a/src/algebra/ituple.spad.pamphlet b/src/algebra/ituple.spad.pamphlet
index 84eaa8c2..3d62dfc6 100644
--- a/src/algebra/ituple.spad.pamphlet
+++ b/src/algebra/ituple.spad.pamphlet
@@ -48,8 +48,11 @@ InfiniteTuple(S:Type): Exports == Implementation where
 --      coerce(x)$Stream(S)
 
 @
+
 \section{package ITFUN2 InfiniteTupleFunctions2}
+
 <<package ITFUN2 InfiniteTupleFunctions2>>=
+import InfiniteTuple
 )abbrev package ITFUN2 InfiniteTupleFunctions2
 InfiniteTupleFunctions2(A:Type,B:Type): Exports == Implementation where
   ++ Functions defined on streams with entries in two sets.
@@ -65,8 +68,12 @@ InfiniteTupleFunctions2(A:Type,B:Type): Exports == Implementation where
       map(f,x pretend Stream(A))$StreamFunctions2(A,B) pretend IT(B)
 
 @
+
 \section{package ITFUN3 InfiniteTupleFunctions3}
+
 <<package ITFUN3 InfiniteTupleFunctions3>>=
+import InfiniteTuple
+import Stream
 )abbrev package ITFUN3 InfiniteTupleFunctions3
 InfiniteTupleFunctions3(A:Type, B:Type,C:Type): Exports
  == Implementation where
diff --git a/src/algebra/mkfunc.spad.pamphlet b/src/algebra/mkfunc.spad.pamphlet
index bb7b4a5c..4e49cf43 100644
--- a/src/algebra/mkfunc.spad.pamphlet
+++ b/src/algebra/mkfunc.spad.pamphlet
@@ -252,8 +252,11 @@ MakeFunction(S:ConvertibleTo InputForm): Exports == Implementation where
       name
 
 @
+
 \section{package MKUCFUNC MakeUnaryCompiledFunction}
+
 <<package MKUCFUNC MakeUnaryCompiledFunction>>=
+import Symbol
 )abbrev package MKUCFUNC MakeUnaryCompiledFunction
 ++ Tools for making compiled functions from top-level expressions
 ++ Author: Manuel Bronstein
@@ -290,8 +293,11 @@ MakeUnaryCompiledFunction(S, D, I): Exports == Implementation where
       unaryFunction compile(function(e, declare DI, x), t)
 
 @
+
 \section{package MKBCFUNC MakeBinaryCompiledFunction}
+
 <<package MKBCFUNC MakeBinaryCompiledFunction>>=
+import Symbol
 )abbrev package MKBCFUNC MakeBinaryCompiledFunction
 ++ Tools for making compiled functions from top-level expressions
 ++ Author: Manuel Bronstein
diff --git a/src/algebra/omdev.spad.pamphlet b/src/algebra/omdev.spad.pamphlet
index 070de7bb..ea5dd518 100644
--- a/src/algebra/omdev.spad.pamphlet
+++ b/src/algebra/omdev.spad.pamphlet
@@ -56,6 +56,13 @@ OpenMathEncoding(): SetCategory with
 @
 \section{domain OMDEV OpenMathDevice}
 <<domain OMDEV OpenMathDevice>>=
+import Void
+import String
+import Integer
+import DoubleFloat
+import String
+import Symbol
+import OpenMathEncoding
 )abbrev domain OMDEV OpenMathDevice
 ++ Author: Vilya Harvey
 ++ Date Created:
@@ -223,6 +230,11 @@ OpenMathDevice(): with
 @
 \section{domain OMCONN OpenMathConnection}
 <<domain OMCONN OpenMathConnection>>=
+import Void
+import Boolean
+import SingleInteger
+import String
+import OpenMathDevice
 )abbrev domain OMCONN OpenMathConnection
 ++ Author: Vilya Harvey
 ++ Date Created:
diff --git a/src/algebra/out.spad.pamphlet b/src/algebra/out.spad.pamphlet
index 19388b78..72172044 100644
--- a/src/algebra/out.spad.pamphlet
+++ b/src/algebra/out.spad.pamphlet
@@ -4,13 +4,20 @@
 \title{\$SPAD/src/algebra out.spad}
 \author{Stephen M. Watt, Robert S. Sutor}
 \maketitle
+
 \begin{abstract}
 \end{abstract}
-\eject
+
 \tableofcontents
 \eject
+
 \section{package OUT OutputPackage}
+
 <<package OUT OutputPackage>>=
+import Void
+import String
+import OutputForm
+import List Any
 )abbrev package OUT OutputPackage
 ++ Author: Stephen M. Watt
 ++ Date Created: February 1986
diff --git a/src/algebra/plot.spad.pamphlet b/src/algebra/plot.spad.pamphlet
index 01877c29..979e635e 100644
--- a/src/algebra/plot.spad.pamphlet
+++ b/src/algebra/plot.spad.pamphlet
@@ -568,8 +568,13 @@ Plot(): Exports == Implementation where
       prefix("PLOT" :: OUT, reverse_! f)
 
 @
+
 \section{package PLOT1 PlotFunctions1}
+
 <<package PLOT1 PlotFunctions1>>=
+import Symbol
+import Segment DoubleFloat
+import Plot
 )abbrev package PLOT1 PlotFunctions1
 ++ Authors: R.T.M. Bronstein, C.J. Williamson
 ++ Date Created: Jan 1989
diff --git a/src/algebra/print.spad.pamphlet b/src/algebra/print.spad.pamphlet
index 8d836394..b43a86ed 100644
--- a/src/algebra/print.spad.pamphlet
+++ b/src/algebra/print.spad.pamphlet
@@ -4,13 +4,18 @@
 \title{\$SPAD/src/algebra print.spad}
 \author{Scott Morrison}
 \maketitle
+
 \begin{abstract}
 \end{abstract}
-\eject
+
 \tableofcontents
 \eject
+
 \section{package PRINT PrintPackage}
+
 <<package PRINT PrintPackage>>=
+import Void
+import OutputForm
 )abbrev package PRINT PrintPackage
 ++ Author: Scott Morrison
 ++ Date Created: Aug. 1, 1990
diff --git a/src/algebra/seg.spad.pamphlet b/src/algebra/seg.spad.pamphlet
index 63036d6c..935c8794 100644
--- a/src/algebra/seg.spad.pamphlet
+++ b/src/algebra/seg.spad.pamphlet
@@ -260,8 +260,11 @@ SegmentBinding(S:Type): Type with
        variable(b)::OutputForm = segment(b)::OutputForm
 
 @
+
 \section{package SEGBIND2 SegmentBindingFunctions2}
+
 <<package SEGBIND2 SegmentBindingFunctions2>>=
+import SegmentBinding
 )abbrev package SEGBIND2 SegmentBindingFunctions2
 ++ Author:
 ++ Date Created:
diff --git a/src/algebra/stream.spad.pamphlet b/src/algebra/stream.spad.pamphlet
index 8bd55a61..0cb271b5 100644
--- a/src/algebra/stream.spad.pamphlet
+++ b/src/algebra/stream.spad.pamphlet
@@ -1128,8 +1128,11 @@ Stream(S): Exports == Implementation where
 --      mapp(f,x,y,a)
 
 @
+
 \section{package STREAM1 StreamFunctions1}
+
 <<package STREAM1 StreamFunctions1>>=
+import Stream
 )abbrev package STREAM1 StreamFunctions1
 ++ Authors: Burge, Watt; updated by Clifton J. Williamson
 ++ Date Created: July 1986
@@ -1152,8 +1155,11 @@ StreamFunctions1(S:Type): Exports == Implementation where
       concat(frst x,concat(rst x,concat rst z))
 
 @
+
 \section{package STREAM2 StreamFunctions2}
+
 <<package STREAM2 StreamFunctions2>>=
+import Stream
 )abbrev package STREAM2 StreamFunctions2
 ++ Authors: Burge, Watt; updated by Clifton J. Williamson
 ++ Date Created: July 1986
@@ -1211,8 +1217,11 @@ StreamFunctions2(A:Type,B:Type): Exports == Implementation where
 --    h(frst x,rreduce(b,h,rst x))
 
 @
+
 \section{package STREAM3 StreamFunctions3}
+
 <<package STREAM3 StreamFunctions3>>=
+import Stream
 )abbrev package STREAM3 StreamFunctions3
 ++ Authors: Burge, Watt; updated by Clifton J. Williamson
 ++ Date Created: July 1986
diff --git a/src/algebra/system.spad.pamphlet b/src/algebra/system.spad.pamphlet
index 4dc98339..57eb4eaa 100644
--- a/src/algebra/system.spad.pamphlet
+++ b/src/algebra/system.spad.pamphlet
@@ -54,6 +54,8 @@ System(): Public == Private where
 \section{package MSYSCMD MoreSystemCommands}
 
 <<package MSYSCMD MoreSystemCommands>>=
+import Void
+import String
 )abbrev package MSYSCMD MoreSystemCommands
 ++ Author:
 ++ Date Created: