Merge branch '0.7b' of git@github.com:280north/cappuccino into 0.7b

AppKit/CPAlert.j

@@ -56,7 +56,9 @@ var CPAlertWarningImage,
     CPAlertInformationImage,
     CPAlertErrorImage;
 
-/*
+/*!
+    @ingroup appkit
+    
     CPAlert is an alert panel that can be displayed modally to present the
     user with a message and one or more options.
 

AppKit/CPAnimation.j

@@ -48,7 +48,10 @@ CPAnimationLinear       = 3;
 
 ACTUAL_FRAME_RATE = 0;
 
-/*! @class CPAnimation
+/*! 
+    @ingroup appkit
+    @class CPAnimation
+
     Manages an animation. Contains timing and progress information.
 
     @par Delegate Methods

AppKit/CPApplication.j

@@ -41,7 +41,9 @@ CPRunStoppedResponse    = -1000;
 CPRunAbortedResponse    = -1001;
 CPRunContinuesResponse  = -1002;
 
-/*! @class CPApplication
+/*! 
+    @ingroup appkit
+    @class CPApplication
 
     CPApplication is THE way to start up the Cappucino framework for your application to use.
     Every GUI application has exactly one instance of CPApplication (or of a custom subclass of

AppKit/CPBezierPath.j

@@ -32,6 +32,17 @@
 var DefaultLineWidth = 1.0;
 
 
+/*! 
+    @ingroup appkit
+    @class CPBezierPath
+
+    A CPBezierPath allows you to create paths for drawing to the screen using a simpler API than CoreGraphics.
+    Paths can form any shape, including regular polgyons like squares and triangles; circles, arcs; or complex
+    line segments. 
+    
+    A path can be stroked and filled using the relevant method. The currently active fill and stroke color will
+    be used, which can be set by calling setFill: and setStroke: on any CPColor object (or set: for both).
+*/
 
 @implementation CPBezierPath : CPObject
 {

AppKit/CPButton.j

@@ -95,7 +95,9 @@ CPChangeBackgroundCellMask  = CPBackgroundButtonMask;
 
 CPButtonStateMixed  = CPThemeState("mixed");
 
-/*! @class CPButton
+/*! 
+    @ingroup appkit
+    @class CPButton
 
     CPButton is a subclass of CPControl that
     intercepts mouse-down events and sends an action message to a

AppKit/CPClipView.j

@@ -25,7 +25,9 @@
 #include "CoreGraphics/CGGeometry.h"
 
 
-/*! @class CPClipView
+/*! 
+    @ingroup appkit
+    @class CPClipView
 
     CPClipView allows you to define a clip rect and display only that portion of its containing view.  
     It is used to hold the document view in a CPScrollView.

AppKit/CPCollectionView.j

@@ -29,7 +29,9 @@
 @import <AppKit/CPView.j>
 
 
-/*! @class CPCollectionView
+/*! 
+    @ingroup appkit
+    @class CPCollectionView
 
     This class displays an array as a grid of objects, where each object is represented by a view. 
     The view is controlled by creating a CPCollectionViewItem and specifying its view, then 

AppKit/CPColor.j

@@ -49,7 +49,9 @@ var cachedBlackColor,
     cachedShadowColor,
     cachedClearColor;
 
-/*! @code CPColor
+/*! 
+    @ingroup appkit
+    @code CPColor
 
     <code>CPColor</code> can be used to represent color
     in an RGB or HSB model with an optional transparency value.</p>

AppKit/CPColorPanel.j

@@ -52,7 +52,9 @@ CPSliderColorPickerMode = 2;
 CPColorPickerViewWidth  = 265,
 CPColorPickerViewHeight = 370;
 
-/*! @class CPColorPanel
+/*! 
+    @ingroup appkit
+    @class CPColorPanel
 
     CPColorPanel provides a reusable panel that can be used
     displayed on screen to prompt the user for a color selection. To

AppKit/CPColorPicker.j

@@ -23,7 +23,9 @@
 @import <Foundation/CPObject.j>
 @import "CPColorPanel.j"
 
-/*! @class CPColorPicker
+/*! 
+    @ingroup appkit
+    @class CPColorPicker
 
     CPColorPicker is an abstract superclass for all color picker subclasses. If you want a particular color picker, use CPColorPanel's <code>setPickerMode:</code> method. The simplest way to implement your own color picker is to create a subclass of CPColorPicker.
 */

AppKit/CPColorWell.j

@@ -29,7 +29,9 @@
 
 var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiveNotification";
 
-/*! @class CPColorWell
+/*! 
+    @ingroup appkit
+    @class CPColorWell
 
     CPColorWell is a CPControl for selecting and displaying a single color value. An example of a CPColorWell object (or simply color well) is found in CPColorPanel, which uses a color well to display the current color selection.</p>
 

AppKit/CPControl.j

@@ -80,7 +80,9 @@ CPControlTextDidEndEditingNotification      = "CPControlTextDidEndEditingNotific
 
 var CPControlBlackColor     = [CPColor blackColor];
 
-/*! @class CPControl
+/*! 
+    @ingroup appkit
+    @class CPControl
 
     CPControl is an abstract superclass used to implement user interface elements. As a subclass of CPView and CPResponder it has the ability to handle screen drawing and handling user input.
 */

AppKit/CPCookie.j

@@ -24,7 +24,9 @@
 @import <Foundation/CPString.j>
 
 
-/*! @class CPCookie
+/*! 
+    @ingroup appkit
+    @class CPCookie
     CPCookie is the Cappuccino interface to a web browser cookie. You can set the name
 */
 @implementation CPCookie : CPObject

AppKit/CPDocument.j

@@ -80,7 +80,9 @@ CPDocumentDidFailToSaveNotification = @"CPDocumentDidFailToSaveNotification";
 
 var CPDocumentUntitledCount = 0;
 
-/*! @class CPDocument
+/*! 
+    @ingroup appkit
+    @class CPDocument
 
     CPDocument is used to represent a document/file in a Cappuccino application.
     In a document-based application, generally multiple documents are open simutaneously

AppKit/CPDocumentController.j

@@ -28,7 +28,9 @@
 
 var CPSharedDocumentController = nil;
 
-/*! @class CPDocumentController
+/*! 
+    @ingroup appkit
+    @class CPDocumentController
     This class is responsible for managing an application's open documents.
 */
 @implementation CPDocumentController : CPObject

AppKit/CPEvent.j

@@ -190,7 +190,9 @@ CPDOMEventTouchCancel                   = "touchcancel";
 var _CPEventPeriodicEventPeriod         = 0,
     _CPEventPeriodicEventTimer          = nil;
 
-/*! @class CPEvent
+/*! 
+    @ingroup appkit
+    @class CPEvent
     CPEvent encapsulates the details of a Cappuccino keyboard or mouse event.
 */
 @implementation CPEvent : CPObject

AppKit/CPFlashMovie.j

@@ -22,7 +22,9 @@
 
 @import <Foundation/CPObject.j>
 
-/*! @class CPFlashMovie
+/*! 
+    @ingroup appkit
+    @class CPFlashMovie
 
     CPFlashMovie is used to represent a Flash movie in the Cappuccino framework.
 */

AppKit/CPFlashView.j

@@ -24,7 +24,9 @@
 @import "CPFlashMovie.j"
 @import "CPView.j"
 
-
+/*!
+    @ingroup appkit
+*/
 @implementation CPFlashView : CPView
 {
     CPFlashMovie    _flashMovie;

AppKit/CPFont.j

@@ -25,7 +25,9 @@ var _CPFonts                = {};
 
 #define _CPCachedFont(aName, aSize, isBold) _CPFonts[(isBold ? @"bold " : @"") + ROUND(aSize) + @"px '" + aName + @"'"]
 
-/*! @class CPFont
+/*! 
+    @ingroup appkit
+    @class CPFont
 
     The CPFont class allows control of the fonts used for displaying text anywhere on the screen. The primary method for getting a particular font is through one of the class methods that take a name and/or size as arguments, and return the appropriate CPFont.
 */

AppKit/CPFontManager.j

@@ -28,6 +28,9 @@
 var CPSharedFontManager     = nil,
     CPFontManagerFactory    = Nil;
 
+/*!
+    @ingroup appkit
+*/
 @implementation CPFontManager : CPObject
 {
     CPArray _availableFonts;

AppKit/CPGeometry.j

@@ -33,6 +33,11 @@ CPMakePoint = CGPointMake;
 CPMakeSize = CGSizeMake;
 CPMakeRect = CGRectMake;
 
+/*!
+    @addtogroup appkit
+    @{
+*/
+
 /*!
   Creates a copy of a specified point and returns the copy
   @group CGPoint
@@ -498,3 +503,7 @@ function CPPointMakeZero()
 {
     return CPPointMake(0, 0, 0);
 }
+
+/*! 
+    @}
+*/

AppKit/CPGraphicsContext.j

@@ -23,6 +23,7 @@
 var CPGraphicsContextCurrent    = nil;
 
 /*!
+    @ingroup appkit
     Provides an interface for drawing to the screen.
 */
 @implementation CPGraphicsContext : CPObject

AppKit/CPImage.j

@@ -58,7 +58,9 @@ function CPImageInBundle(aFilename, aSize, aBundle)
 
 @end
 
-/*! @class CPImage
+/*! 
+    @ingroup appkit
+    @class CPImage
 
     CPImage is used to represent images in the Cappuccino framework. It supports loading
     all image types supported by the browser.

AppKit/CPImageView.j

@@ -58,7 +58,9 @@ var LEFT_SHADOW_INSET       = 3.0,
     VERTICAL_SHADOW_INSET   = TOP_SHADOW_INSET + BOTTOM_SHADOW_INSET,
     HORIZONTAL_SHADOW_INSET = LEFT_SHADOW_INSET + RIGHT_SHADOW_INSET;
 
-/*! @class CPImageView
+/*! 
+    @ingroup appkit
+    @class CPImageView
 
     This class is a control that displays an image.
 */

AppKit/CPMenu.j

@@ -48,9 +48,12 @@ var _CPMenuBarVisible               = NO,
     _CPMenuBarAttributes            = nil,
     _CPMenuBarSharedWindow          = nil;
 
-/*! @class CPMenu
+/*! 
+    @ingroup appkit
+    @class CPMenu
 
-    Menus provide the user with a list of actions and/or submenus. Submenus themselves are full fledged menus and so a heirarchical structure appears.
+    Menus provide the user with a list of actions and/or submenus. Submenus themselves are full fledged menus 
+    and so a heirarchical structure appears.
 */
 @implementation CPMenu : CPObject
 {
@@ -183,7 +186,7 @@ var _CPMenuBarVisible               = NO,
     }
     
     if (!highlightColor)
-        [_CPMenuBarAttributes setObject:[CPColor colorWithCalibratedRed:81.0 / 255.0 green:83.0 / 255.0 blue:109.0 / 255.0 alpha:1.0] forKey:@"CPMenuBarHighlightColor"];
+        [_CPMenuBarAttributes setObject:[CPColor colorWithCalibratedRed:94.0/255.0 green:130.0/255.0 blue:186.0/255.0 alpha:1.0] forKey:@"CPMenuBarHighlightColor"];
     
     if (!highlightTextColor)
         [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarHighlightTextColor"];

AppKit/CPMenuItem.j

@@ -28,7 +28,9 @@
 @import <AppKit/CPMenu.j>
 @import <AppKit/CPView.j>
 
-/*! @class CPMenuItem
+/*! 
+    @ingroup appkit
+    @class CPMenuItem
 
     A CPMenuItem is added to a CPMenu.
     It has an action and a target for that action to be sent to

AppKit/CPPanel.j

@@ -26,7 +26,9 @@
 CPOKButton      = 1;
 CPCancelButton  = 0;
 
-/*! @class CPPanel
+/*! 
+    @ingroup appkit
+    @class CPPanel
 
     The CPPanel class defines objects that manage the panels of the Cappuccino user interface. A panel is a window that serves an auxiliary function within an application. It generally displays controls that the user can act on to give instructions to the application or to modify the contents of a standard window.</p>
 

AppKit/CPPasteboard.j

@@ -42,7 +42,9 @@ CPImagePboardType       = @"CPImagePboardType";
 
 var CPPasteboards = nil;
 
-/*! @class CPPasteboard
+/*! 
+    @ingroup appkit
+    @class CPPasteboard
 
     CPPasteBoard is the object responsible for cut/copy/paste and drag&drop operations. 
 */

AppKit/CPPopUpButton.j

@@ -32,7 +32,9 @@ var VISIBLE_MARGIN  = 7.0;
 
 CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
-/*! @class CPPopUpButton
+/*! 
+    @ingroup appkit
+    @class CPPopUpButton
 
     A CPPopUpButton contains a pop-up menu of items that a user can select from.
 */

AppKit/CPProgressIndicator.j

@@ -49,7 +49,9 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     CPProgressIndicatorStyleIdentifiers     = nil,
     CPProgressIndicatorStyleSizes           = nil;
 
-/*! @class CPProgressIndicator
+/*! 
+    @ingroup appkit
+    @class CPProgressIndicator
 
     This class is used in a Cappuccino GUI to display the progress of a
     function or task. If the duration of the task is unknown, there is

AppKit/CPRadio.j

@@ -25,7 +25,43 @@
 
 @import "CPButton.j"
 
+/*!
+    @ingroup appkit
+    
+    from this mailing list thread:
+    http://groups.google.com/group/objectivej/browse_thread/thread/7c41cbd9cbee9ea3    
+    
+    -----------------------------------
+    
+    Creating a checkbox is easy enough:
+    
+    checkbox = [[CPCheckBox alloc] initWithFrame:aFrame];
+    
+    That's basically all there is to it. Radio buttons are very similar,
+    the key difference is the introduction of a new class CPRadioGroup,
+    which defines which radio buttons are part of the same group:
+    
+    [myRadioButton setRadioGroup:aRadioGroup];
+    
+    Every radio button receives a unique radio group by default (so if you
+    do nothing further, they will all behave independently), but you can
+    use an existing radio button's group with other buttons as so:
+    
+    button1 = [[CPRadio alloc] initWithFrame:aFrame];
+    ...
+    button2 = [[CPRadio alloc] initWithFrame:aFrame radioGroup:[button1
+    radioGroup]];
+    ...
+    button3 = [[CPRadio alloc] initWithFrame:aFrame radioGroup:[button1
+    radioGroup]];
+    ...etc...
+    
+    Here, all the radio buttons will act "together". [[button1 radioGroup]
+    allRadios] returns every button that's part of this group, and
+    [[button1 radioGroup] selectedRadio] returns the currently selected
+    option.
 
+*/
 @implementation CPRadio : CPButton
 {
     CPRadioGroup    _radioGroup;

AppKit/CPResponder.j

@@ -33,6 +33,7 @@ CPRightArrowKeyCode = 39;
 CPDownArrowKeyCode  = 40;
 
 /*!
+    @ingroup appkit
     @class CPResponder
     
     Subclasses of CPResonder can be part of the responder chain.

AppKit/CPScrollView.j

@@ -27,7 +27,9 @@
 #include "CoreGraphics/CGGeometry.h"
 
 
-/*! @class CPScrollView
+/*! 
+    @ingroup appkit
+    @class CPScrollView
 
     Used to display views that are too large for the viewing area. the CPScrollView
     places scroll bars on the side of the view to allow the user to scroll and see the entire

AppKit/CPScroller.j

@@ -41,8 +41,9 @@ CPNoScrollerParts           = 0;
 CPOnlyScrollerArrows        = 1;
 CPAllScrollerParts          = 2;
 
-/*! @class CPScroller
-    
+/*! 
+    @ingroup appkit
+    @class CPScroller    
 */
 
 var PARTS_ARRANGEMENT   = [CPScrollerKnobSlot, CPScrollerDecrementLine, CPScrollerIncrementLine, CPScrollerKnob],

AppKit/CPSecureTextField.j

@@ -1,7 +1,9 @@
 
 @import "CPTextField.j"
 
-
+/*!
+    @ingroup appkit
+*/
 @implementation CPSecureTextField : CPTextField
 {
 }

AppKit/CPSegmentedControl.j

@@ -42,7 +42,9 @@ CPSegmentSwitchTrackingSelectAny = 1;
 */
 CPSegmentSwitchTrackingMomentary = 2;
 
-/*! @class CPSegmentedControl
+/*! 
+    @ingroup appkit
+    @class CPSegmentedControl
 
     This class is a horizontal button with multiple segments.
 */

AppKit/CPShadow.j

@@ -23,7 +23,9 @@
 @import <Foundation/CPObject.j>
 
 
-/*! @class CPShadow
+/*! 
+    @deprecated 
+    @class CPShadow
 
     Instances of this class contain the attributes of a drop shadow used in Cappuccino.
 */

AppKit/CPShadowView.j

@@ -46,6 +46,10 @@ var LIGHT_LEFT_INSET    = 3.0,
     HEAVY_TOP_INSET     = 5.0,
     HEAVY_BOTTOM_INSET  = 5.0;
 
+/*!
+    @ingroup appkit
+*/
+
 @implementation CPShadowView : CPView
 {
     CPShadowWeight  _weight;

AppKit/CPSlider.j

@@ -29,6 +29,10 @@
 CPLinearSlider      = 0;
 CPCircularSlider    = 1;
 
+/*!
+    @ingroup appkit
+*/
+
 @implementation CPSlider : CPControl
 {
     double          _minValue;

AppKit/CPSplitView.j

@@ -34,6 +34,10 @@ CPSplitViewWillResizeSubviewsNotification = @"CPSplitViewWillResizeSubviewsNotif
 var CPSplitViewHorizontalImage = nil,
     CPSplitViewVerticalImage = nil;
 
+/*!
+    @ingroup appkit
+*/
+
 @implementation CPSplitView : CPView
 {
     id          _delegate;

AppKit/CPTabView.j

@@ -69,7 +69,9 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     CPTabViewWillSelectTabViewItemSelector          = 4,
     CPTabViewDidChangeNumberOfTabViewItemsSelector  = 8;
 
-/*! @class CPTabView
+/*! 
+    @ingroup appkit
+    @class CPTabView
 
     This class represents a view that has multiple subviews (CPTabViewItem) presented as individual tabs.
     Only one CPTabViewItem is shown at a time, and other CPTabViewItems can be made visible

AppKit/CPTabViewItem.j

@@ -44,7 +44,9 @@ CPBackgroundTab = 1;
 */
 CPPressedTab    = 2;
 
-/*! @class CPTabView
+/*! 
+    @ingroup appkit
+    @class CPTabViewItem
 
     The class representation of an item in a CPTabView. One tab view item
     can be shown at a time in a CPTabView.

AppKit/CPTableColumn.j

@@ -47,7 +47,9 @@ CPTableColumnUserResizingMask   = 2;
 #define PurgableInfoView(anInfo) ((anInfo).view)
 #define PurgableInfoRow(anInfo) ((anInfo).row)
 
-/*! @class CPTableColumn
+/*! 
+    @ingroup appkit
+    @class CPTableColumn
 
     An CPTableColumn object mainly keeps information about the width of the column, its minimum and maximum width; whether the column can be edited or resized; and the cells used to draw the column header and the data in the column. You can change all these attributes of the column by calling the appropriate methods. Please note that the table column does not hold nor has access to the data to be displayed in the column; this data is maintained in the table view's data source.</p>
     

AppKit/CPTableView.j

@@ -43,7 +43,13 @@ var _CPTableViewWillDisplayCellSelector                         = 1 << 0,
     _CPTableViewHeightOfRowSelector                             = 1 << 6;
     
 /*
-    CPTableView is located within the AppKit framework and is used to display tables. It uses a delegate model for getting its data i.e. you give it an object that provides it with the data it should display.
+    @ingroup appkit
+    
+    This class is not yet stable.
+    
+    CPTableView is located within the AppKit framework and is used to display tables. 
+    It uses a delegate model for getting its data i.e. you give it an object that provides 
+    it with the data it should display.
     
     @ignore
 */

AppKit/CPTextField.j

@@ -113,6 +113,7 @@ CPTextFieldStateRounded     = CPThemeState("rounded");
 CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 /*!
+    @ingroup appkit
     This control displays editable text in a Cappuccino application.
 */
 @implementation CPTextField : CPControl

AppKit/CPTheme.j

@@ -27,6 +27,11 @@
 var CPThemesByName      = { },
     CPThemeDefaultTheme = nil;
 
+
+/*!
+    @ingroup appkit
+*/
+
 @implementation CPTheme : CPObject
 {
     CPString        _name;

AppKit/CPThemeBlend.j

@@ -26,6 +26,9 @@
 @import <AppKit/_CPCibCustomResource.j>
 @import <AppKit/_CPCibKeyedUnarchiver.j>
 
+/*!
+    @ingroup appkit
+*/
 
 @implementation CPThemeBlend : CPObject
 {

AppKit/CPToolbar.j

@@ -54,6 +54,7 @@ var CPToolbarsByIdentifier              = nil;
 var CPToolbarConfigurationsByIdentifier = nil;
 
 /*!
+    @ingroup appkit
     @class CPToolbar
     
     A CPToolbar is displayed at the top of a window with multiple

AppKit/CPToolbarItem.j

@@ -56,7 +56,9 @@ CPToolbarShowFontsItemIdentifier        = @"CPToolbarShowFontsItemIdentifier";
 CPToolbarCustomizeToolbarItemIdentifier = @"CPToolbarCustomizeToolbarItemIdentifier";
 CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
 
-/*! @class CPToolbarItem
+/*! 
+    @ingroup appkit
+    @class CPToolbarItem
 
     A representation of an item in a CPToolbar.
 */

AppKit/CPView.j

@@ -100,7 +100,9 @@ var DOMElementPrototype         = nil,
     CustomLayoutSubviewsViews           = {};
 #endif
 
-/*! @class CPView
+/*! 
+    @ingroup appkit
+    @class CPView
 
     <p>CPView is a class which provides facilities for drawing
     in a window and receiving events. It is the superclass of many of the visual

AppKit/CPWebView.j

@@ -42,6 +42,10 @@ CPWebViewScrollNative                           = 2;
 
 // FIXME: somehow make CPWebView work with CPScrollView instead of native scrollbars (is this even possible?)
 
+/*!
+    @ingroup appkit
+*/
+
 @implementation CPWebView : CPView
 {
     CPScrollView    _scrollView;

AppKit/CPWindow/CPWindow.j

@@ -187,7 +187,9 @@ var SHADOW_MARGIN_LEFT      = 20.0,
 var CPWindowSaveImage       = nil,
     CPWindowSavingImage     = nil;
 
-/*! @class CPWindow
+/*! 
+    @ingroup appkit
+    @class CPWindow
 
     An CPWindow instance represents a window, panel or menu on the screen.</p>
 

AppKit/CPWindowController.j

@@ -30,7 +30,9 @@
 #include "Platform/Platform.h"
 
 
-/*! @class CPWindowController
+/*! 
+    @ingroup appkit
+    @class CPWindowController
 
     An instance of a CPWindowController manages a CPWindow. It has methods
     that get called when the window is loading, and after the window has loaded. In the

AppKit/Cib/CPCib.j

@@ -38,6 +38,10 @@ CPCibReplacementClasses = @"CPCibReplacementClasses";
     
 var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
+/*!
+    @ingroup appkit
+*/
+
 @implementation CPCib : CPObject
 {
     CPData      _data;

AppKit/CoreGraphics/CGContext.j

@@ -74,6 +74,11 @@ kCGBlendModeXOR             = 25;
 kCGBlendModePlusDarker      = 26;
 kCGBlendModePlusLighter     = 27;
 
+/*!
+    @defgroup coregraphics CoreGraphics
+    @{
+*/
+
 /*!
     This function is just here for source compatability.
     It does nothing.
@@ -94,9 +99,15 @@ function CGContextRetain(aContext)
     return aContext;
 }
 
+/*!
+@cond
+*/
 // BEGIN CANVAS IF
 if (!CPFeatureIsCompatible(CPHTMLCanvasFeature))
 {
+/*!
+@endcond
+*/
 
 /*!
     Creates a new graphics state, which describes all the current values for drawing.
@@ -498,7 +509,13 @@ function CGContextSetAlpha(aContext, anAlpha)
     aContext.gState.alpha = MAX(MIN(anAlpha, 1.0), 0.0);
 }
 
+/*!
+@cond
+*/
 }   // END CANVAS IF
+/*!
+@endcond
+*/
 
 // GOOD.
 /*!
@@ -662,6 +679,13 @@ function CGContextStrokeRoundedRectangleInRect(aContext, aRect, aRadius, ne, se,
     CGContextStrokePath(aContext);
 }
 
+/*! 
+    @}
+*/
+
+/*!
+@cond
+*/
 if (CPFeatureIsCompatible(CPHTMLCanvasFeature))
 {
 #include "CGContextCanvas.j"
@@ -670,3 +694,6 @@ else if (CPFeatureIsCompatible(CPVMLFeature))
 {
 #include "CGContextVML.j"
 }
+/*!
+@endcond
+*/

AppKit/CoreGraphics/CGGeometry.j

@@ -70,6 +70,11 @@ _function(CGInsetMakeZero())
 _function(CGInsetMakeCopy(anInset))
 _function(CGInsetIsEmpty(anInset))
 
+/*!
+    @addtogroup appkit
+    @{
+*/
+
 /*!
     Returns a <code>BOOL</code> indicating whether CGRect <code>lhsRect</code>
     contains CGRect <code>rhsRect</code>.
@@ -223,3 +228,6 @@ function CPStringFromCGInset(anInset)
     return '{' + anInset.top + ", " + anInset.left + ", " + anInset.bottom + ", " + anInset.right + '}';
 }
 
+/*! 
+    @} 
+*/

AppKit/CoreGraphics/CGPath.j

@@ -36,6 +36,11 @@ kCGPathElementCloseSubpath          = 4;
 kCGPathElementAddArc                = 5;
 kCGPathElementAddArcToPoint         = 6;
 
+/*!
+    @addtogroup coregraphics
+    @{
+*/
+
 /*!
     Returns a new CGPath object.
 */
@@ -368,3 +373,8 @@ function CGPathIsEmpty(aPath)
 {
     return !aPath || aPath.count == 0;
 }
+
+/*!
+    @}
+*/
+

Foundation/CPArray.j

@@ -86,7 +86,9 @@
 
 @end
 
-/*! @class CPArray
+/*! 
+    @ingroup foundation
+    @class CPArray
     A mutable array class backed by a JavaScript Array.
     There is also a CPMutableArray class,
     but it is just a child class of this class with an

Foundation/CPBundle.j

@@ -25,6 +25,9 @@
 
 @import "CPURLRequest.j"
 
+/*! 
+    @ingroup foundation
+*/
 
 @implementation CPBundle : CPObject
 {

Foundation/CPCoder.j

@@ -24,7 +24,9 @@
 @import "CPException.j"
 
 
-/*! @class CPCoder
+/*! 
+    @ingroup foundation
+    @class CPCoder
     Top-level class defining methods for use when archiving (encoding) objects to a byte array 
     or file, and when restoring (decoding) objects. 
 */

Foundation/CPCountedSet.j

@@ -1,6 +1,9 @@
 
 @import "CPSet.j"
 
+/*!
+    @ingroup foundation
+*/
 @implementation CPCountedSet : CPMutableSet
 {
     Object  _counts;

Foundation/CPData.j

@@ -23,6 +23,9 @@
 @import "CPObject.j"
 @import "CPString.j"
 
+/*!
+    @ingroup foundation
+*/
 
 @implementation CPData : CPObject
 {

Foundation/CPDate.j

@@ -26,6 +26,9 @@
 
 var CPDateReferenceDate = new Date(Date.UTC(2001,1,1,0,0,0,0));
 
+/*!
+    @ingroup foundation
+*/
 @implementation CPDate : CPObject
 { 
 }

Foundation/CPDictionary.j

@@ -57,7 +57,9 @@
 
 @end
 
-/*!  @class CPDictionary
+/*!  
+    @ingroup foundation
+    @class CPDictionary
      A dictionary is the standard way of passing around key-value pairs in
      the Cappuccino framework. It is similar to the
      <a href="http://java.sun.com/javase/6/docs/api/index.html">Java map interface</a>,

Foundation/CPEnumerator.j

@@ -22,6 +22,9 @@
 
 @import "CPObject.j"
 
+/*! 
+    @ingroup foundation
+*/
 
 /*! @class CPEnumerator
     CPEnumerator is a superclass (with useless method bodies)

Foundation/CPException.j

@@ -30,7 +30,9 @@ CPUnsupportedMethodException        = "CPUnsupportedMethodException";
 CPRangeException                    = "CPRangeException";
 CPInternalInconsistencyException    = "CPInternalInconsistencyException";
 
-/*! @class CPException
+/*! 
+    @ingroup foundation
+    @class CPException
     An example of throwing an exception in Objective-J:
 <pre>
 // some code here...

Foundation/CPIndexSet.j

@@ -24,7 +24,9 @@
 @import "CPObject.j"
 
 
-/*! @class CPIndexSet
+/*! 
+    @ingroup foundation
+    @class CPIndexSet
     Instances of this class are collections of numbers. Each integer can appear in a collection only once.
 */
 @implementation CPIndexSet : CPObject

Foundation/CPInvocation.j

@@ -24,7 +24,9 @@
 @import "CPException.j"
 
 
-/*! @class CPInvocation
+/*! 
+    @ingroup foundation
+    @class CPInvocation
     A CPInvocation is an object representation of a message sent to an object.
 */
 @implementation CPInvocation : CPObject

Foundation/CPJSONPConnection.j

@@ -25,6 +25,10 @@
 
 CPJSONPConnectionCallbacks = {};
 
+/*! 
+    @ingroup foundation
+*/
+
 /*! @class CPJSONPConnection
     Important note: CPJSONPConnection is <strong>only</strong> for JSONP APIs.
     If aren't sure you <strong>need</strong>

Foundation/CPKeyedArchiver.j

@@ -60,7 +60,9 @@ var _CPKeyedArchiverStringClass                         = Nil,
 }
 @end
 
-/*! @class CPKeyedArchiver
+/*! 
+    @ingroup foundation
+    @class CPKeyedArchiver
 
     Implements keyed archiving of object graphs. Archiving means to
     write data out in a format that be read in again later, or possibly
@@ -95,6 +97,7 @@ var _CPKeyedArchiverStringClass                         = Nil,
     @param object the object to be replaced
     @param newObject the replacement object
 */
+
 @implementation CPKeyedArchiver : CPCoder
 {
     id                      _delegate;

Foundation/CPKeyedUnarchiver.j

@@ -50,7 +50,9 @@ var _CPKeyedUnarchiverArrayClass                                            = Ni
     _CPKeyedUnarchiverDataClass                                             = Nil,
     _CPKeyedUnarchiverArchiverValueClass                                    = Nil;
 
-/*
+/*!
+    @ingroup foundation
+
     CPKeyedUnarchiver is used for creating objects out of
     coded files or CPData objects that were created by
     CPKeyedArchiver. More specifically, this class unarchives

Foundation/CPNotification.j

@@ -24,7 +24,9 @@
 @import "CPException.j"
 
 
-/*! @class CPNotification
+/*! 
+    @ingroup foundation
+    @class CPNotification
     Represents a notification for posting to an CPNotificationCenter. Consists of a name, an object, and an optional dictionary. The notification center will check for observers registered to receive either notifications with the name, the object, or both and pass the notification instance on to them.
 
     To create a notification use one of the class methods. The default init method will throw a

Foundation/CPNotificationCenter.j

@@ -25,6 +25,9 @@
 @import "CPNotification.j"
 @import "CPException.j"
 
+/*! 
+    @ingroup foundation
+*/
 
 var CPNotificationDefaultCenter = nil;
 

Foundation/CPNull.j

@@ -25,7 +25,9 @@
 
 var CPNullSharedNull = nil;
 
-/*! @class CPNull
+/*! 
+    @ingroup foundation
+    @class CPNull
     This class is used as an object representation of <code>nil</code>. This is handy when a collection
     only accepts objects as values, but you would like a <code>nil</code> representation in there.
 */

Foundation/CPNumber.j

@@ -27,7 +27,9 @@
 var __placeholder = new Number(),
     _CPNumberHashes = { };
 
-/*! @class CPNumber
+/*! 
+    @ingroup foundation
+    @class CPNumber
     This class primarily exists for source compatability. The JavaScript
     <code>Number</code> type can be changed on the fly based on context,
     so there is no need to call any of these methods. 

Foundation/CPObject.j

@@ -21,6 +21,7 @@
  */
 
 /*!
+    @ingroup foundation
     @class CPObject
     
     CPObject is the root class for most Cappuccino classes. Like in Objective-C,

Foundation/CPRange.j

@@ -20,6 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/*!
+    @addtogroup foundation
+    @{
+*/
+
 /*!
     Makes a CPRange.
     @param location the location for new range
@@ -164,3 +169,7 @@ function CPRangeFromString(aString)
     
     return { location:parseInt(aString.substr(1, comma - 1)), length:parseInt(aString.substring(comma + 1, aString.length)) };
 }
+
+/*!
+    @}
+*/

Foundation/CPRunLoop.j

@@ -137,7 +137,9 @@ var _CPRunLoopPerformPool           = [],
 
 var CPRunLoopLastNativeRunLoop = 0;
 
-/*! @class CPRunLoop
+/*! 
+    @ingroup foundation
+    @class CPRunLoop
 
     CPRunLoop instances handle various utility tasks that must be performed repetitively in an application, such as processing input events.
 

Foundation/CPSet.j

@@ -14,7 +14,9 @@
 @import "CPNumber.j"
 @import "CPEnumerator.j"
 
-
+/*!
+    @ingroup foundation
+*/
 @implementation CPSet : CPObject
 {
     Object      _contents;

Foundation/CPSortDescriptor.j

@@ -43,7 +43,9 @@ CPOrderedSame           =  0;
 */
 CPOrderedDescending     =  1;
 
-/*! @class CPSortDescriptor
+/*! 
+    @ingroup foundation
+    @class CPSortDescriptor
     A CPSortDescriptor holds the attributes necessary to describe how
     to sort a set of objects. The sort descriptor instance holds a property key path
     to the sort item of the objects to compare, the method selector to call for sorting and the sort order.

Foundation/CPString.j

@@ -58,7 +58,9 @@ CPNumericSearch         = 64;
 
 var CPStringHashes      = new objj_dictionary();
 
-/*! @class CPString
+/*! 
+    @ingroup foundation
+    @class CPString
     CPString is an object that allows management of strings. Because CPString is
     based on the JavaScript <code>String</code> object, CPStrings are immutable, although the
     class does have methods that create new CPStrings generated from modifications to the

Foundation/CPTimer.j

@@ -25,7 +25,9 @@
 @import "CPDate.j"
 @import "CPRunLoop.j"
 
-
+/*! 
+    @ingroup foundation
+*/
 @implementation CPTimer : CPObject
 {
     CPTimeInterval      _timeInterval;

Foundation/CPURLConnection.j

@@ -35,6 +35,8 @@ var XMLHTTPRequestUninitialized = 0,
 var CPURLConnectionDelegate = nil;
 
 /*
+    @ingroup foundation
+
     An interface to downloading content at a specified URL. Using one of the
     class methods, you can obtain the data.
     

Foundation/CPURLRequest.j

@@ -23,7 +23,9 @@
 @import "CPObject.j"
 
 
-/*! @class CPURLRequest
+/*! 
+    @ingroup foundation
+    @class CPURLRequest
     A helper object for CPURLConnection, that contains
     data obtained during the life of a request.
 */

Foundation/CPURLResponse.j

@@ -30,6 +30,7 @@
     CPString    _textEncodingName;
 */
 /*!
+    @ingroup foundation
     Contains protocol agnostic information about a request to a specific URL.
 */
 @implementation CPURLResponse : CPObject

Foundation/CPUndoManager.j

@@ -151,7 +151,9 @@ var _CPUndoGroupingParentKey        = @"_CPUndoGroupingParentKey",
 
 @end
 
-/*! @class CPUndoManager
+/*! 
+    @ingroup foundation
+    @class CPUndoManager
     CPUndoManager provides a general mechanism supporting implementation of user action "undo" in applications. Essentially, it allows you to store sequences of messages and receivers that need to be invoked to undo or redo an action. The various methods in this class provide for grouping of sets of actions, execution of undo or redo actions, and tuning behavior parameters such as the size of the undo stack. Each application entity with its own editing history (e.g., a document) should have its own undo manager instance. Obtain an instance through a simple <code>[[CPUndoManager alloc] init]</code> message.
 */
 @implementation CPUndoManager : CPObject

Foundation/CPValue.j

@@ -24,7 +24,9 @@
 @import "CPCoder.j"
 
 
-/*! @class CPValue
+/*! 
+    @ingroup foundation
+    @class CPValue
     The class can be subclassed to hold different types of scalar values.
 */
 @implementation CPValue : CPObject

Rakefile

@@ -54,13 +54,32 @@ file_d $TOOLS_DOWNLOAD_INSTALLER => [$TOOLS_INSTALLER] do
 end
 
 task :objj_gem do
-    subrake('Tools/Rake', :objj_gem)
+    #subrake('Tools/Rake', :objj_gem)
 end
 
 task :tools_download => [$TOOLS_DOWNLOAD_ENV, $TOOLS_DOWNLOAD_EDITORS, $TOOLS_DOWNLOAD_README, $TOOLS_DOWNLOAD_INSTALLER, :objj_gem]
 
 task :starter_download => [$STARTER_DOWNLOAD_APPLICATION, $STARTER_DOWNLOAD_README]
 
+task :deploy => [:tools_download, :starter_download, :docs] do
+    #copy the docs into the starter pack
+    cp_r(File.join($DOCUMENTATION_BUILD, 'html', '.'), File.join($STARTER_DOWNLOAD, 'Documentation'))
+
+    cappuccino_output_path = File.join($BUILD_DIR, 'Cappuccino')
+
+    #zip the starter pack
+    starter_zip_output = File.join($BUILD_DIR, 'Cappuccino', 'Starter.zip')
+    rm_rf(starter_zip_output)
+
+    `cd #{cappuccino_output_path} && zip -r -8 Starter.zip Starter`
+
+    #zip the tools pack
+    tools_zip_output = File.join($BUILD_DIR, 'Cappuccino', 'Tools.zip')
+    rm_rf(tools_zip_output)
+
+    `cd #{cappuccino_output_path} && zip -r -8 Tools.zip Tools`
+end
+
 file_d $STARTER_DOWNLOAD_APPLICATION => [$TOOLS_DOWNLOAD_ENV] do
 
     ENV['PATH'] = "#{File.join($TOOLS_DOWNLOAD_ENV, 'bin')}:#{ENV['PATH']}"
@@ -98,10 +117,14 @@ task :test => [:build] do
 end
 
 task :docs do
-  system %{doxygen #{$DOXYGEN_CONFIG} }
-  rm_rf $DOCUMENTATION_BUILD
-  mv "Documentation", $DOCUMENTATION_BUILD
-  rm "debug.txt"
+    if executable_exists? "doxygen"
+      system %{doxygen #{$DOXYGEN_CONFIG} }
+      rm_rf $DOCUMENTATION_BUILD
+      mv "debug.txt", "Documentation"
+      mv "Documentation", $DOCUMENTATION_BUILD
+    else
+        puts 'doxygen not installed. skipping documentation generation.'
+    end
 end
 
 task :submodules do

Tools/Documentation/Cappuccino.doxygen

@@ -130,7 +130,7 @@ FILE_PATTERNS          = *.c \
                          *.vhdl \
                          *.j
 RECURSIVE              = YES
-EXCLUDE                = AppKit/Cib \
+EXCLUDE                = AppKit/Themes \
                          AppKit/CPOutlineView.j \
                          AppKit/CPTableColumn.j \
                          AppKit/CPTableView.j