Index: trunk/nv/position.hh
===================================================================
--- trunk/nv/position.hh	(revision 121)
+++ trunk/nv/position.hh	(revision 132)
@@ -32,29 +32,29 @@
 		position lr;
 		/**
-		 *Creates a new rectangle assigned to {0, 0, 0, 0}.
+		 * Creates a new rectangle assigned to {0, 0, 0, 0}.
 		 */
 		rectangle() : ul(), lr() {}
 		
 		/**
-		 *Creates a new rectangle given a position.
-		 *
-		 *@param p The position to assign the rectangle to.
+		 * Creates a new rectangle given a position.
+		 *
+		 * @param p The position to assign the rectangle to.
 		 */
 		rectangle( position p ) : ul(p), lr(p) {}
 		
 		/**
-		 *Creates a new rectangle given an upper-left and lower-right position.
-		 *
-		 *@param aul The position of the upper-left corner of the rectangle.
-		 *@param alr The position of the lower-right corner of the rectangle.
+		 * Creates a new rectangle given an upper-left and lower-right position.
+		 *
+		 * @param aul The position of the upper-left corner of the rectangle.
+		 * @param alr The position of the lower-right corner of the rectangle.
 		 */
 		rectangle( position aul, position alr ) : ul(aul), lr(alr) {}
 		
 		/**
-		 *Creates a new rectangle given an upper-left position, width, and height.
-		 *
-		 *@param aul The position of the upper-left corner of the rectangle.
-		 *@param width The width of the rectangle.
-		 *@param height The height of the rectangle.
+		 * Creates a new rectangle given an upper-left position, width, and height.
+		 *
+		 * @param aul The position of the upper-left corner of the rectangle.
+		 * @param width The width of the rectangle.
+		 * @param height The height of the rectangle.
 		 */
 		rectangle( position aul, value_type width, value_type height ) : ul(aul), lr(aul + position(width,height)) {}
@@ -66,33 +66,33 @@
         
         /**
-         * Explicit Copy constructor
+         * Explicit Copy assignment operator
          */
         rectangle& operator= (const rectangle& r) { ul = r.ul; lr = r.lr; return *this; }
 		
 		/**
-		 *Sets the dimensions of the rectangle without moving the upper-left of the rectangle.
-		 *
-		 *@param d The new dimensions of the rectangle.
+		 * Sets the dimensions of the rectangle without moving the upper-left of the rectangle.
+		 *
+		 * @param d The new dimensions of the rectangle.
 		 */
 		rectangle& dim( dimension d ) { lr = ul + d; return *this; }
 
 		/**
-		 *Moves the rectangle to a new position while maintaining its size.
-		 *
-		 *@param p The new position of the rectangle's upper-left corner.
+		 * Moves the rectangle to a new position while maintaining its size.
+		 *
+		 * @param p The new position of the rectangle's upper-left corner.
 		 */
 		rectangle& pos( position p )  { lr = p + (lr - ul); lr = p; return *this; }
 
 		/**
-		 *Sets the dimensions of the rectangle without moving the upper-left of the rectangle.
-		 *
-		 *@param d The new dimensions of the rectangle.
+		 * Sets the dimensions of the rectangle without moving the upper-left of the rectangle.
+		 *
+		 * @param d The new dimensions of the rectangle.
 		 */
 		void set_dimension( dimension d ) { lr = ul + d; }
 		
 		/**
-		 *Moves the rectangle to a new position while maintaining its size.
-		 *
-		 *@param p The new position of the rectangle's upper-left corner.
+		 * Moves the rectangle to a new position while maintaining its size.
+		 *
+		 * @param p The new position of the rectangle's upper-left corner.
 		 */
 		void set_position( position p ) { lr = p + (lr - ul); ul = p; }
@@ -101,168 +101,168 @@
 		position ll() const { return position( ul.x, lr.y ); }
 		/**
-		 *Gets the dimensions of the rectangle.  Synonym for get_size.
-		 *
-		 *@returns The dimensions of the rectangle.
-		 *@see get_size
+		 * Gets the dimensions of the rectangle.  Synonym for get_size.
+		 *
+		 * @returns The dimensions of the rectangle.
+		 * @see get_size
 		 */
 		dimension get_dimension() const { return lr - ul; }
 
 		/**
-		 *Gets the position of the upper-left corner of the rectangle.
-		 *
-		 *@returns The position of the rectangle's upper-left corner.
+		 * Gets the position of the upper-left corner of the rectangle.
+		 *
+		 * @returns The position of the rectangle's upper-left corner.
 		 */
 		position  get_position() const { return ul; }
 
 		/**
-		 *Gets the dimensions of the rectangle.  Synonym for get_dimension.
-		 *
-		 *@returns The dimensions of the rectangle.
-		 *@see get_dimension
+		 * Gets the dimensions of the rectangle.  Synonym for get_dimension.
+		 *
+		 * @returns The dimensions of the rectangle.
+		 * @see get_dimension
 		 */
 		dimension get_size() const { return lr - ul; }
 
 		/**
-		 *Gets the center of the rectangle.
-		 *
-		 *@returns The center of the rectangle.
+		 * Gets the center of the rectangle.
+		 *
+		 * @returns The center of the rectangle.
 		 */
 		position get_center() const { return ( lr + ul ) / 2; }
 
 		/**
-		 *Gets the width of the rectangle.
-		 *
-		 *@returns The width of the rectangle.
+		 * Gets the width of the rectangle.
+		 *
+		 * @returns The width of the rectangle.
 		 */
 		value_type get_width() const { return lr.x - ul.x; }
 
 		/**
-		 *Gets the height of the rectangle.
-		 *
-		 *@returns The height of the rectangle.
+		 * Gets the height of the rectangle.
+		 *
+		 * @returns The height of the rectangle.
 		 */
 		value_type get_height() const { return lr.y - ul.y; }
 
 		/**
-		 *Gets the area of the rectangle.
-		 *
-		 *@returns The area of the rectangle.
+		 * Gets the area of the rectangle.
+		 *
+		 * @returns The area of the rectangle.
 		 */
 		value_type get_area() const { return (lr.y - ul.y) * (lr.x - ul.x); }
 
 		/**
-		 *Checks to see if the rectangle is backwards.
-		 *
-		 *@returns True if the rectangle's upper-left is above and left (or equal to) the rectangle's lower-right, false if it is not.
+		 * Checks to see if the rectangle is backwards.
+		 *
+		 * @returns True if the rectangle's upper-left is above and left (or equal to) the rectangle's lower-right, false if it is not.
 		 */
 		bool is_valid() const {	return lr.x >= ul.x && lr.y >= ul.y; }
 
 		/**
-		 *Enlarges the rectangle by a given amount.  Each side is adjusted by the given amount, e.g. expanding by 1 increases the width and height by 2 each.
-		 *
-		 *@param value The amount to adjust each sides by.
+		 * Enlarges the rectangle by a given amount.  Each side is adjusted by the given amount, e.g. expanding by 1 increases the width and height by 2 each.
+		 *
+		 * @param value The amount to adjust each sides by.
 		 */
 		void expand( value_type value ) { position p(value,value); ul -= p; lr += p; }
 
 		/**
-		 *Reduces the rectangle by a given amount.  Each side is adjusted by the given amount, e.g. shrinking by 1 decreases the width and height by 2 each.
-		 *
-		 *@param value The amount to adjust each side by.
+		 * Reduces the rectangle by a given amount.  Each side is adjusted by the given amount, e.g. shrinking by 1 decreases the width and height by 2 each.
+		 *
+		 * @param value The amount to adjust each side by.
 		 */
 		void shrink( value_type value ) { position p(value,value); ul += p; lr -= p; }
 
 		/**
-		 *Gets a rectangle that is an expanded version of this rectangle.
-		 *
-		 *@param value The amount to adjust each side by.
-		 *@returns An expanded rectangle.
-		 *@see expand
+		 * Gets a rectangle that is an expanded version of this rectangle.
+		 *
+		 * @param value The amount to adjust each side by.
+		 * @returns An expanded rectangle.
+		 * @see expand
 		 */
 		rectangle expanded( int value ) { position p(value,value); return rectangle(ul-p, lr+p); }
 
 		/**
-		 *Gets a rectangle that is a shrunk version of this rectangle.
-		 *
-		 *@param value The amount to adjust each side by.
-		 *@returns A shrunk rectangle.
-		 *@see shrink
+		 * Gets a rectangle that is a shrunk version of this rectangle.
+		 *
+		 * @param value The amount to adjust each side by.
+		 * @returns A shrunk rectangle.
+		 * @see shrink
 		 */
 		rectangle shrinked( int value ) { position p(value,value); return rectangle(ul+p, lr-p); }
 		
 		/**
-		 *Shifts the rectangle by a given amount.
-		 *
-		 *@param pos The amount to shift the rectangle by.
+		 * Shifts the rectangle by a given amount.
+		 *
+		 * @param pos The amount to shift the rectangle by.
 		 */
 		rectangle& operator+=( const position& pos ) { ul += pos; lr += pos; return (*this); }
 
 		/**
-		 *Returns a rectangle shifted by a given amount.
-		 *
-		 *@param pos The amount to shift by. 
-		 *@returns The shifted rectangle.
+		 * Returns a rectangle shifted by a given amount.
+		 *
+		 * @param pos The amount to shift by. 
+		 * @returns The shifted rectangle.
 		 */
 		rectangle operator+( const position& pos ) const {	rectangle r(*this); return r += pos; }
 
 		/**
-		 *Shifts the rectangle by a given amount.
-		 *
-		 *@param pos The amount to shift the rectangle by.
+		 * Shifts the rectangle by a given amount.
+		 *
+		 * @param pos The amount to shift the rectangle by.
 		 */
 		rectangle& operator-=( const position& pos ) { ul -= pos; lr -= pos; return (*this); }
 
 		/**
-		 *Returns a rectangle shifted by a given amount.
-		 *
-		 *@oaram pos The amount to shift by.
-		 *@returns The shifted rectangle.
+		 * Returns a rectangle shifted by a given amount.
+		 *
+		 * @param pos The amount to shift by.
+		 * @returns The shifted rectangle.
 		 */
 		rectangle operator-( const position& pos ) const {	rectangle r(*this); return r -= pos; }
 
 		/**
-		 *Compares two rectangles to see if they are the same.
-		 *
-		 *@param r The rectangle to compare to.
-		 *@returns True if the rectangles have the same positions and dimensions, false otherwise.
+		 * Compares two rectangles to see if they are the same.
+		 *
+		 * @param r The rectangle to compare to.
+		 * @returns True if the rectangles have the same positions and dimensions, false otherwise.
 		 */
 		bool operator==( const rectangle& r ) const { return r.ul == ul && r.lr == lr; }
 
 		/**
-		 *Compares two rectangles to see if they are different.
-		 *
-		 *@param r The rectangle to compare to.
-		 *@returns True if the rectangles have different positions or dimensions, false otherwise.
+		 * Compares two rectangles to see if they are different.
+		 *
+		 * @param r The rectangle to compare to.
+		 * @returns True if the rectangles have different positions or dimensions, false otherwise.
 		 */
 		bool operator!=( const rectangle& r ) const { return r.ul != ul || r.lr != lr; }
 
 		/**
-		 *Checks if a position is within the bounds of this rectangle.
-		 *
-		 *@param r The position to check.
-		 *@returns True if the position is inside or on the edge of the rectangle, false otherwise.
+		 * Checks if a position is within the bounds of this rectangle.
+		 *
+		 * @param r The position to check.
+		 * @returns True if the position is inside or on the edge of the rectangle, false otherwise.
 		 */
 		bool contains( const position& r ) const{ return lr.y >= r.y && ul.y <= r.y && lr.x >= r.x && ul.x <= r.x; }
 
 		/**
-		 *Checks if a rectangle is within the bounds of this rectangle.
-		 *
-		 *@param r The rectangle to check.
-		 *@returns True if the entire rectangle to check is inside or on the edge of this rectangle, false otherwise.
+		 * Checks if a rectangle is within the bounds of this rectangle.
+		 *
+		 * @param r The rectangle to check.
+		 * @returns True if the entire rectangle to check is inside or on the edge of this rectangle, false otherwise.
 		 */
 		bool contains( const rectangle& r ) const { return contains( r.ul ) && contains( r.lr ); }
 
 		/**
-		 *Checks if another rectangle overlaps this one.
-		 *
-		 *@param r The rectangle to check.
-		 *@returns True if any part of the rectangle to check overlaps this rectangle, false otherwise.
+		 * Checks if another rectangle overlaps this one.
+		 *
+		 * @param r The rectangle to check.
+		 * @returns True if any part of the rectangle to check overlaps this rectangle, false otherwise.
 		 */
 		bool collides( const rectangle& r ) const { return lr.y > r.ul.y && ul.y < r.lr.y && lr.x > r.ul.x && ul.x < r.lr.x; }
 
 		/**
-		 *Limits the region of the rectangle to the inidicated rectangle.
-		 *
-		 *@param r The rectangle that this rectangle is confined to.
-		 *@returns True if the rectangle was changed, false otherwise.
+		 * Limits the region of the rectangle to the inidicated rectangle.
+		 *
+		 * @param r The rectangle that this rectangle is confined to.
+		 * @returns True if the rectangle was changed, false otherwise.
 		 */
 		bool clamp_to( const rectangle& r )
@@ -276,8 +276,8 @@
 
 		/**
-		 *Limits the size of the rectangle to the given rectangle's size.
-		 *
-		 *@param r The rectangle representing the maximum dimensions this rectangle can be.
-		 *@returns True if the rectangle needed to be resized, false otherwise.
+		 * Limits the size of the rectangle to the given rectangle's size.
+		 *
+		 * @param r The rectangle representing the maximum dimensions this rectangle can be.
+		 * @returns True if the rectangle needed to be resized, false otherwise.
 		 */
 		bool constrain_to( const rectangle& r )
@@ -290,5 +290,5 @@
 
 		/**
-		 *Fixes an invalid rectangle.
+		 * Fixes an invalid rectangle.
 		 */
 		void repair() 
@@ -299,7 +299,7 @@
 
 		/**
-		 *Expands the rectangle to just include the given point.
-		 *
-		 *@param p The point to include in the rectangle.
+		 * Expands the rectangle to just include the given point.
+		 *
+		 * @param p The point to include in the rectangle.
 		 */
 		void include_point( position p )
