0
@@ -1,4 +1,4 @@
0
-;; Nukefile for PagePacker
0
+;; Nukefile for NuPagePacker
0
 
0
 ;; source files
0
 (set @c_files     (filelist "^objc/.*.c$"))
0
@@ -10,6 +10,13 @@
0
 (@resources << "resources/diyp3h_core_1up.pdf")
0
 (@resources << "resources/PagePacker.sdef")
0
 
0
+;; application description
0
+(set @application "NuPagePacker")
0
+(set @application_identifier   "nu.programming.NuPagePacker")
0
+(set @application_icon_file "NuPPApp.icns")
0
+(set @application_help_folder "PagePackerHelp")
0
+
0
+;; specify the entire Info.plist here:
0
 (set @info
0
      (dict "CFBundleDevelopmentRegion" "English"
0
            "CFBundleDocumentTypes"  
0
@@ -33,19 +40,13 @@
0
            "NSPrincipalClass" "NSApplication"
0
            "OSAScriptingDefinition" "PagePacker.sdef"))
0
 
0
-;; application description
0
-(set @application "NuPagePacker")
0
-(set @application_identifier   "nu.programming.nupagepacker")
0
-(set @application_icon_file "NuPPApp.icns")
0
-(set @application_help_folder "PagePackerHelp")
0
-
0
-;; build configuration
0
-(set @cc "gcc")
0
-(set @cflags "-g -O3 -DMACOSX ")
0
-(set @mflags "-fobjc-exceptions")
0
-
0
+;; build tasks
0
 (compilation-tasks)
0
 (application-tasks)
0
-
0
 (task "default" => "application")
0
 
0
+;; this copies the Nu.framework into the application so that it can be run on systems without Nu.
0
+(task "finalize" => "application" is
0
+      (SH "mkdir -p '#{@application_dir}/Contents/Frameworks'")
0
+      (SH "ditto /Library/Frameworks/Nu.framework '#{@application_dir}/Contents/Frameworks/Nu.framework'")
0
+      (SH "install_name_tool -change 'Nu.framework/Versions/A/Nu' '@executable_path/../Frameworks/Nu.framework/Versions/A/Nu'  '#{@application_dir}/Contents/MacOS/#{@application}'"))

0
@@ -3,29 +3,33 @@
0
 ;;
0
 ;; @copyright Copyright (c) 2007 Tim Burks, Neon Design Technology, Inc.
0
 
0
-(load "nu")      	;; essentials
0
-(load "cocoa")		;; wrapped frameworks
0
-(load "console")	;; interactive console
0
-(load "packer")		;; application code
0
-
0
-;; unfortunately, these initialize methods aren't called automatically, so we call them here.
0
+(load "Nu:nu")      ;; essentials
0
+(load "Nu:cocoa")	;; wrapped frameworks
0
+(load "Nu:console")	;; interactive console
0
+(load "bridged")    ;; more bridged declarations
0
+(load "helpers")	;; some helper functions
0
+(load "packer")		;; the main application code
0
+
0
+;; Initialize methods for Nu classes aren't (yet) called automatically, so we call them here.
0
 (PackerView initialize) 
0
 (PreferenceController initialize)
0
 (DraggingSourcePDFView initialize)
0
 
0
+;; The console is too much fun to omit.
0
 (set SHOW_CONSOLE_AT_STARTUP nil)
0
 
0
+;; The main application controller.
0
 (class AppController is NSObject
0
      (imethod (void) applicationDidFinishLaunching: (id) sender is
0
           (set $console ((NuConsoleWindowController alloc) init))
0
           (if SHOW_CONSOLE_AT_STARTUP ($console toggleConsole:self))
0
           ((CatalogController sharedCatalogController) showWindow:nil)))
0
 
0
-(load "scripting")  ;; scripting support, must be loaded after AppControler is defined
0
+(load "scripting")   ;; scripting support must be loaded after AppControler is defined
0
 
0
 (set NSApp (NSApplication sharedApplication))
0
 
0
-;; this makes the application window take focus when we've started it from the terminal
0
+;; this makes the application window take focus when we've started it from the terminal (like when we type "nuke run")
0
 (NSApp activateIgnoringOtherApps:YES)
0
 
0
 ;; run the main Cocoa event loop

0
@@ -2,27 +2,23 @@
0
 ;; @discussion PagePacker in Nu.
0
 ;;
0
 ;; @copyright Copyright (c) 2007 Tim Burks, Neon Design Technology, Inc.
0
+;; Substantially derived from original Objective-C source code by Aaron Hillegass.
0
+;; See objc/PagePacker.m for the copyright notice for the original code.
0
 
0
-;; these declarations would be unnecessary if Nu is enhanced to read the Apple BridgeSupport files.
0
-(global kPDFDisplaySinglePage 0)
0
-(global NSDragOperationCopy 1)
0
-(global NSPDFPboardType "Apple PDF pasteboard type")
0
-(global NSDragPboard "Apple CFPasteboard drag")
0
-(global NSRectClip (NuBridgedFunction functionWithName:"NSRectClip" signature:"v{_NSRect}"))
0
-(global NSIntersectionRect (NuBridgedFunction functionWithName:"NSIntersectionRect" signature:"{_NSRect}{_NSRect}{_NSRect}"))
0
-(global NSPointInRect (NuBridgedFunction functionWithName:"NSPointInRect" signature:"i{_NSPoint}{_NSRect}"))
0
-(global NSFilenamesPboardType "NSFilenamesPboardType")
0
-(global NSIntersectsRect (NuBridgedFunction functionWithName:"NSIntersectsRect" signature:"i{_NSRect}{_NSRect}"))
0
-(global NSInsetRect (NuBridgedFunction functionWithName:"NSInsetRect" signature:"{_NSRect}{_NSRect}ff"))
0
-(global NSSquareLineCapStyle 2)
0
+(global BLOCK_COUNT 8) ;; We display 8 pages in a PagePacker document.  There is no easy way to change this.
0
 
0
+;; @class CatalogController
0
+;; @discussion This class controls the display of the PDF source document.
0
+;; Pages can be dragged from this document into the PagePacker document view. 
0
 (class CatalogController is NSWindowController
0
      (ivar (id) pdfView
0
            (id) pageSlider
0
            (id) pageField
0
            (int) currentPageIndex)
0
      
0
-     (set sharedCatalogController nil) ;; Nu closures make this a class variable
0
+     (set sharedCatalogController nil) ;; Since the assignment is made inside the class declaration, Nu closures make this a class variable.
0
+     
0
+     (+ sharedCatalogController is sharedCatalogController)
0
      
0
      (- init is
0
         (super initWithWindowNibName:"CatalogController")
0
@@ -31,8 +27,6 @@
0
         (set @currentPageIndex 0)
0
         self)
0
      
0
-     (+ sharedCatalogController is sharedCatalogController)
0
-     
0
      (- windowDidLoad is
0
         (set path ((NSBundle mainBundle) pathForResource:"diyp3h_core_1up" ofType:@"pdf"))
0
         (set url (NSURL fileURLWithPath:path))
0
@@ -85,6 +79,8 @@
0
         (self changeToPage:(- @currentPageIndex 1))
0
         (@pageSlider setIntValue:@currentPageIndex)))
0
 
0
+;; @class MyDocument
0
+;; @discussion This is the main PagePacker document.
0
 (class MyDocument 
0
      
0
      (- (id)init is
0
@@ -112,17 +108,8 @@
0
         (if @packerView (self updateUI))
0
         YES))
0
 
0
-(function PointInRect (point rect)
0
-     (and (>= (point first) (rect first))
0
-          (>= (point second) (rect second))
0
-          (<= (point first) (+ (rect first) (rect third)))
0
-          (<= (point second) (+ (rect second) (rect fourth)))))
0
-
0
-(function distanceSquaredBetweenPoints (p1 p2)
0
-     (set deltax (- (p1 first) (p2 first)))
0
-     (set deltay (- (p1 second) (p2 second)))
0
-     (+ (* deltax deltax) (* deltay deltay)))
0
-
0
+;; @class DragingSourcePDFView
0
+;; @discussion This class controls the view of the source document.
0
 (class DraggingSourcePDFView is PDFView 
0
      (ivar (id) mouseDownEvent)
0
      
0
@@ -132,7 +119,7 @@
0
      (- (id) hitTest:(NSPoint) aPoint is
0
         (if (PointInRect aPoint (self frame)) 
0
             (then self)
0
-            (else nil))) ;; in the most hard-won conclusion of this project, this should be NULL and not nil.
0
+            (else nil)))
0
      
0
      (- (BOOL) shouldDelayWindowOrderingForEvent:(id) theEvent is YES)
0
      
0
@@ -173,12 +160,8 @@
0
      (- (void) mouseUp:(id) e is
0
         (set @mouseDownEvent nil)))
0
 
0
-(function pdfFromAttributedStringOfSize (attStr sz)
0
-     (set v ((TextDisplayView alloc) initWithPageSize:sz attributedString:attStr))
0
-     (v dataWithPDFInsideRect:(v bounds)))
0
-
0
-(set BLOCK_COUNT 8)
0
-
0
+;; @class PackModel
0
+;; @discussion This class describes the PagePacker document.
0
 (class PackModel is NSObject
0
      (ivar (id) pageInfos (id) undoManager)
0
      
0
@@ -303,6 +286,8 @@
0
                    forPage:(+ i j)))
0
         (+ i j)))
0
 
0
+;; @class PageInfo
0
+;; @discussion This class describes an individual page in a PagePacker document.
0
 (class PageInfo is NSObject 
0
      (ivar (id) imageRep (int) pageOfRep)
0
      
0
@@ -334,38 +319,31 @@
0
      (- (id)description is
0
         "<PageInfo: #{(@imageRep description)}, #{@pageOfRep}>"))
0
 
0
-(function insetRect (rect x y)
0
-     (list (+ (rect first) x) (+ (rect second) y) (- (rect third) x x) (- (rect fourth) y y)))
0
-
0
-(function isLeftSide (pageNum) (or (eq pageNum 0) (> pageNum 4)))
0
-
0
-(function NSMinX (rect) 
0
-     (set x1 (rect first))
0
-     (set x2 (+ (rect first) (rect third)))
0
-     (if (< x1 x2) (then x1) (else x2)))
0
-
0
-(function NSMaxX (rect) 
0
-     (set x1 (rect first))
0
-     (set x2 (+ (rect first) (rect third)))
0
-     (if (> x1 x2) (then x1) (else x2)))
0
-
0
-(function NSMinY (rect) 
0
-     (set y1 (rect second))
0
-     (set y2 (+ (rect second) (rect fourth)))
0
-     (if (< y1 y2) (then y1) (else y2)))
0
-
0
-(function NSMaxY (rect) 
0
-     (set y1 (rect second))
0
-     (set y2 (+ (rect second) (rect fourth)))
0
-     (if (> y1 y2) (then y1) (else y2)))
0
-
0
-(function HalfX (r) (+ (r first) (* 0.5 (r third))))
0
-(function QuarterY (r) (+ (r second) (* 0.25 (r fourth))))
0
-(function HalfY (r) (+ (r second) (* 0.5 (r fourth))))
0
-(function ThreeQuarterY (r) (+ (r second) (* 0.75 (r fourth))))
0
-
0
-(global BUTTON_MARGIN 4.0)
0
+;; @class RoundCloseButtonCell
0
+;; @discussion This class provides a custom button cell for use in the PackerView display.
0
+(class RoundCloseButtonCell is NSButtonCell 
0
+     (- (void)drawWithFrame:(NSRect)cellFrame inView:(id)controlView is        
0
+        (if (NSGraphicsContext currentContextDrawingToScreen) 
0
+            (if (self isHighlighted) 
0
+                (then ((NSColor orangeColor) set))
0
+                (else ((NSColor blueColor) set)))
0
+            (NSBezierPath fillRect:cellFrame)
0
+            (NSBezierPath setDefaultLineWidth:3)
0
+            ((NSColor whiteColor) set)
0
+            (NSBezierPath strokeRect:cellFrame)
0
+            (set p ((NSBezierPath alloc) init))
0
+            (p setLineWidth:3.0)
0
+            (p setLineCapStyle:NSSquareLineCapStyle)
0
+            (set xRect (NSInsetRect cellFrame 9 7))
0
+            (p moveToPoint:(list (xRect first) (xRect second)))
0
+            (p lineToPoint:(list (+ (xRect first) (xRect third)) (+ (xRect second) (xRect fourth))))
0
+            (p moveToPoint:(list (xRect first)  (+ (xRect second) (xRect fourth))))
0
+            (p lineToPoint:(list (+ (xRect first) (xRect third)) (xRect second)))
0
+            ((NSColor whiteColor) set)
0
+            (p stroke))))
0
 
0
+;; @class PackerView
0
+;; @discussion This class provides a view of a PagePacker document.
0
 (class PackerView
0
      (ivar (id) packModel
0
            (id) foldLines
0
@@ -375,7 +353,12 @@
0
            (int) dropPage
0
            (int) dragStart)
0
      
0
-     (set numberAttributes nil) ;; pseudo-class variable
0
+     (set numberAttributes nil) ;; a class variable to hold the attribute dictionary for displayed numbers.
0
+     (set buttonMargin 4.0)     ;; a class variable that specifies the position of our custom close buttons.
0
+     
0
+     ;; determine whether a page is on the left or right side of the PageView display.
0
+     ;; Because this function is defined in the class declaration, it is effectively local (private) to this class.
0
+     (function isLeftSide (pageNum) (or (eq pageNum 0) (> pageNum 4)))
0
      
0
      (+ (void) initialize is
0
         (set numberAttributes ((NSMutableDictionary alloc) init))
0
@@ -665,10 +648,9 @@
0
              (do (i)
0
                  (if (@packModel pageIsFilled:i)                      
0
                      (set fullRect (self fullRectForPage:i))
0
-                     (set buttonRect (list
0
-                                          (- (NSMaxX fullRect) (+ 30 BUTTON_MARGIN))
0
-                                          (+ (NSMinY fullRect) BUTTON_MARGIN)
0
-                                          30 25))
0
+                     (set buttonRect (list (- (NSMaxX fullRect) (+ 30 buttonMargin))
0
+                                           (+ (NSMinY fullRect) buttonMargin)
0
+                                           30 25))
0
                      (set button ((NSButton alloc) initWithFrame:buttonRect))
0
                      (button setCell:((RoundCloseButtonCell alloc) init))
0
                      (button setTag:i)
0
@@ -731,17 +713,13 @@
0
             (if @showsImageableRect 
0
                 ((NSColor blueColor) set)
0
                 (NSBezierPath setDefaultLineWidth:1.0)
0
-                (NSBezierPath strokeRect:@imageablePageRect))
0
-            
0
+                (NSBezierPath strokeRect:@imageablePageRect))            
0
             (if (>= @dropPage 0) 
0
-                (set dropColor (NSColor colorWithDeviceRed:0.8
0
-                                        green:0.5
0
-                                        blue:0.5
0
-                                        alpha:0.3))
0
-                (dropColor set)
0
+                ((NSColor colorWithDeviceRed:0.8 green:0.5 blue:0.5 alpha:0.3) set)
0
                 (NSBezierPath fillRect:(self fullRectForPage:@dropPage))))))
0
 
0
-
0
+;; @class TextDisplayView
0
+;; @discussion This helper class is used to generate PDF representations of strings.
0
 (class TextDisplayView is NSView
0
      (ivar (id) attString (NSSize) pageSize)
0
      
0
@@ -758,13 +736,19 @@
0
         (set bounds (NSInsetRect (self bounds) 3 3))
0
         (@attString drawInRect:bounds)))
0
 
0
+;; use the above class to generate a PDF for an attribute string.
0
+(function pdfFromAttributedStringOfSize (attStr sz)
0
+     (set v ((TextDisplayView alloc) initWithPageSize:sz attributedString:attStr))
0
+     (v dataWithPDFInsideRect:(v bounds)))
0
+
0
+;; some internal constants
0
 (global PaperSizeChangedNotification "PaperSizeChangedNotification")
0
 (global PaperSizeKey "PaperSize")
0
 (global FontFamilyKey "FontFamily")
0
 (global FontSizeKey "FontSize")
0
-(global LETTER_PAPER_ID 0)
0
-(global A4_PAPER_ID 1)
0
 
0
+;; @class PreferenceController
0
+;; @discussion This class controls the application's preference window.
0
 (class PreferenceController is NSWindowController
0
      (ivar (id) paperPopUp (id) textFontField (id) textFont)
0
      
0
@@ -780,20 +764,12 @@
0
         self)
0
      
0
      (+ (void)initialize is
0
-        (set factoryDefaults ((NSMutableDictionary alloc) init))
0
-        (factoryDefaults setObject:(NSNumber numberWithInt:0)
0
-             forKey:PaperSizeKey)
0
-        (factoryDefaults setObject:@"Helvetica"
0
-             forKey:FontFamilyKey)
0
-        (factoryDefaults setObject:(NSNumber numberWithFloat:8.0)
0
-             forKey:FontSizeKey)
0
-        
0
-        ((NSUserDefaults standardUserDefaults) registerDefaults:factoryDefaults))
0
+        ((NSUserDefaults standardUserDefaults) registerDefaults:(dict PaperSizeKey 0
0
+                                                                      FontFamilyKey "Helvetica"
0
+                                                                      FontSizeKey 8.0)))
0
      
0
-     (+ (id)sharedPreferenceController is
0
-        
0
-        (unless sharedPreferenceController
0
-                ((PreferenceController alloc) init))	   
0
+     (+ (id)sharedPreferenceController is       
0
+        (unless sharedPreferenceController ((PreferenceController alloc) init))	   
0
         sharedPreferenceController)
0
      
0
      (- (int)paperSizeID is
0
@@ -801,71 +777,38 @@
0
      
0
      (- (void)setPaperSizeID:(int)i is
0
         ((NSUserDefaults standardUserDefaults) setInteger:i forKey:PaperSizeKey)
0
-        (set userInfo (NSMutableDictionary dictionary))
0
-        (userInfo setObject:(NSValue valueWithSize:(self paperSize))
0
-             forKey:"PaperSize")
0
-        ((NSNotificationCenter defaultCenter) postNotificationName:PaperSizeChangedNotification
0
+        ((NSNotificationCenter defaultCenter) 
0
+         postNotificationName:PaperSizeChangedNotification
0
          object:self
0
-         userInfo:userInfo))
0
+         userInfo:(dict PaperSizeKey (NSValue valueWithSize:(self paperSize)))))
0
      
0
      (- (NSSize)paperSize is
0
-        (set i (self paperSizeID))
0
-        (if (eq i 0)
0
-            (then ;; letter
0
-                  '(612 792))
0
-            (else ;; assume it's A4
0
-                  '(595 842))))
0
+        (case (self paperSizeID)
0
+              (0 '(612 792))				;; LETTER
0
+              (else '(595 842)))) 			;; assume it's A4
0
      
0
      (- (void)windowDidLoad is
0
-        (set i (self paperSizeID))
0
-        (@paperPopUp selectItemWithTag:i)
0
+        (@paperPopUp selectItemWithTag:(self paperSizeID))
0
         (@textFontField setStringValue:(self fontDescription)))
0
      
0
      (- (void)paperChosen:(id)sender is
0
-        (set i (@paperPopUp selectedTag))
0
-        (self setPaperSizeID:i))
0
+        (self setPaperSizeID:(@paperPopUp selectedTag)))
0
      
0
      (- (id) textFont is @textFont)
0
      
0
      (- (void) setTextFont:(id) f is
0
         (set @textFont f)
0
-        (set ud (NSUserDefaults standardUserDefaults))
0
-        (ud setObject:(f familyName) forKey:FontFamilyKey)
0
-        (ud setFloat:(f pointSize) forKey:FontSizeKey)
0
+        (set userDefaults (NSUserDefaults standardUserDefaults))
0
+        (userDefaults setObject:(f familyName) forKey:FontFamilyKey)
0
+        (userDefaults setFloat:(f pointSize) forKey:FontSizeKey)
0
         (@textFontField setStringValue:(self fontDescription)))  
0
      
0
      (- (id) fontDescription is
0
-        (set f (self textFont))
0
-        "#{(f displayName)} - #{(f pointSize)}")
0
+        "#{((self textFont) displayName)} - #{((self textFont) pointSize)}")
0
      
0
      (- (void)changeFont:(id)sender is
0
-        (set newFont (sender convertFont:@textFont))
0
-        (self setTextFont:newFont))
0
+        (self setTextFont:(sender convertFont:@textFont)))
0
      
0
      (- (void)chooseFont:(id)sender is
0
-        (set fm (NSFontManager sharedFontManager))
0
-        (fm setSelectedFont:@textFont isMultiple:NO)
0
-        (set fp (NSFontPanel sharedFontPanel))
0
-        (fp makeKeyAndOrderFront:nil)))
0
-
0
-(class RoundCloseButtonCell is NSButtonCell 
0
-     (- (void)drawWithFrame:(NSRect)cellFrame inView:(id)controlView is        
0
-        (if (NSGraphicsContext currentContextDrawingToScreen) 
0
-            (if (self isHighlighted) 
0
-                (then ((NSColor orangeColor) set))
0
-                (else ((NSColor blueColor) set)))
0
-            (NSBezierPath fillRect:cellFrame)
0
-            (NSBezierPath setDefaultLineWidth:3)
0
-            ((NSColor whiteColor) set)
0
-            (NSBezierPath strokeRect:cellFrame)
0
-            (set p ((NSBezierPath alloc) init))
0
-            (p setLineWidth:3.0)
0
-            (p setLineCapStyle:NSSquareLineCapStyle)
0
-            (set xRect  (NSInsetRect cellFrame 9 7))
0
-            (p moveToPoint:(list (xRect first) (xRect second)))
0
-            (p lineToPoint:(list (+ (xRect first) (xRect third)) (+ (xRect second) (xRect fourth))))
0
-            (p moveToPoint:(list (xRect first)  (+ (xRect second) (xRect fourth))))
0
-            (p lineToPoint:(list (+ (xRect first) (xRect third)) (xRect second)))
0
-            ((NSColor whiteColor) set)
0
-            (p stroke))))
0
-
0
+        ((NSFontManager sharedFontManager) setSelectedFont:@textFont isMultiple:NO)
0
+        ((NSFontPanel sharedFontPanel) makeKeyAndOrderFront:nil)))
0
\ No newline at end of file

0
@@ -2,6 +2,8 @@
0
 ;; @discussion PagePacker scripting support in Nu.
0
 ;;
0
 ;; @copyright Copyright (c) 2007 Tim Burks, Neon Design Technology, Inc.
0
+;; Substantially derived from original Objective-C source code by Aaron Hillegass.
0
+;; See objc/PagePacker.m for the copyright notice for the original code.
0
 
0
 (class NSObject
0